From 1fdeed80f759d4069b6e673bfc65511e3fed9c03 Mon Sep 17 00:00:00 2001
From: "timeless%mac.com" <timeless%mac.com>
Date: Mon, 9 Jul 2001 18:41:07 +0000
Subject: [PATCH] Bugzilla Bug 70857 [XUL Syntax] Replace <boxDerivedTag
 align="horizontal|vertical"> with <boxDerivedTag
 orient="horizontal|vertical"> patch by andersma@luther.edu r=timeless
 sr=blake

---
 .../composer/content/TextEditorAppShell.xul   |  14 +-
 editor/ui/composer/content/editor.xul         |  28 +-
 .../composer/content/editorPrefsOverlay.xul   |   4 +-
 editor/ui/composer/content/pref-composer.xul  |  42 +-
 editor/ui/composer/content/pref-editing.xul   |  38 +-
 editor/ui/composer/content/sidebar-editor.xul |   8 +-
 editor/ui/dialogs/content/EdAdvancedEdit.xul  |  30 +-
 editor/ui/dialogs/content/EdColorPicker.xul   |  26 +-
 editor/ui/dialogs/content/EdColorProps.xul    |  30 +-
 .../ui/dialogs/content/EdConvertToTable.xul   |   6 +-
 editor/ui/dialogs/content/EdDialogOverlay.xul |   8 +-
 .../ui/dialogs/content/EdDialogTemplate.xul   |   4 +-
 editor/ui/dialogs/content/EdDictionary.xul    |   4 +-
 editor/ui/dialogs/content/EdHLineProps.xul    |  14 +-
 editor/ui/dialogs/content/EdImageMap.xul      |  16 +-
 .../ui/dialogs/content/EdImageMapHotSpot.xul  |  10 +-
 editor/ui/dialogs/content/EdImageProps.xul    |  78 +-
 editor/ui/dialogs/content/EdInsSrc.xul        |  10 +-
 editor/ui/dialogs/content/EdInsertChars.xul   |  18 +-
 editor/ui/dialogs/content/EdInsertTable.xul   |  14 +-
 editor/ui/dialogs/content/EdLinkProps.xul     |  28 +-
 editor/ui/dialogs/content/EdListProps.xul     |  18 +-
 .../ui/dialogs/content/EdNamedAnchorProps.xul |   4 +-
 editor/ui/dialogs/content/EdPageProps.xul     |   2 +-
 editor/ui/dialogs/content/EdSpellCheck.xul    |  16 +-
 editor/ui/dialogs/content/EdTableProps.xul    |  84 +-
 editor/ui/dialogs/content/EditConflict.xul    |   8 +-
 .../dialogs/content/EditorSaveAsCharset.xul   |  10 +-
 embedding/browser/chrome/content/mini-nav.xul |  26 +-
 .../browser/chrome/content/simple-shell.xul   |  14 +-
 .../ui/helperAppDlg/nsHelperAppDlg.xul        |  24 +-
 .../cookie/resources/content/pref-cookies.xul |  14 +-
 .../cookie/resources/content/pref-images.xul  |  18 +-
 extensions/cview/resources/content/cview.xul  |  16 +-
 extensions/help/resources/content/help.xul    |  32 +-
 .../inspector/resources/content/inspector.xul |   4 +-
 .../resources/content/inspectorOverlay.xul    |  32 +-
 .../resources/content/keysetOverlay.xul       |   2 +-
 .../content/prefs/pref-inspector.xul          |  34 +-
 .../resources/content/prefs/pref-sidebar.xul  |  14 +-
 .../resources/content/prefs/prefs.xul         |   2 +-
 .../resources/content/prefs/prefsOverlay.xul  |   2 +-
 .../content/search/modules/commandOverlay.xul |   2 +-
 .../search/modules/findFiles/dialog.xul       |  18 +-
 .../search/modules/junkImgs/dialog.xul        |  18 +-
 .../content/search/modules/popupOverlay.xul   |   2 +-
 .../resources/content/sidebar/sidebar.xul     |  16 +-
 .../resources/content/statusbarOverlay.xul    |   4 +-
 .../resources/content/tests/allskin.xul       |   2 +-
 .../resources/content/toolboxOverlay.xul      |  12 +-
 .../resources/content/utilWindow.xul          |   8 +-
 .../content/viewers/dom/columnsDialog.xul     |   2 +-
 .../content/viewers/dom/commandOverlay.xul    |   2 +-
 .../content/viewers/dom/findDialog.xul        |  20 +-
 .../content/viewers/dom/keysetOverlay.xul     |   2 +-
 .../content/viewers/dom/popupOverlay.xul      |   2 +-
 .../viewers/styleRules/commandOverlay.xul     |   2 +-
 .../viewers/styleRules/keysetOverlay.xul      |   2 +-
 .../viewers/styleRules/popupOverlay.xul       |   2 +-
 .../content/viewers/styleRules/styleRules.xul |   4 +-
 extensions/irc/xul/content/chatzilla.xul      |   4 +-
 extensions/irc/xul/content/pref-irc.xul       |   6 +-
 extensions/irc/xul/tests/test3.xul            |  16 +-
 .../resources/content/P3PBadPrivacyInfo.xul   |  14 +-
 .../resources/content/P3PInProgressInfo.xul   |  10 +-
 .../resources/content/P3PNoPrivacyInfo.xul    |  14 +-
 .../content/P3PPartialPrivacyInfo.xul         |  14 +-
 .../resources/content/P3PPrivacyMetInfo.xul   |  14 +-
 .../content/P3PPrivacyNotMetInfo.xul          |  14 +-
 extensions/p3p/resources/content/pref-P3P.xul | 832 +++++++++---------
 .../p3p/resources/content/pref-P3Pcust.xul    |  12 +-
 .../p3p/resources/content/privacyOverlay.xul  |   2 +-
 .../transformiix/resources/buster/buster.xul  |  32 +-
 .../Transformiix/content/transformiix.xul     |  20 +-
 .../venkman/resources/content/tests/eval.xul  |   2 +-
 .../venkman/resources/content/venkman.xul     |   2 +-
 .../resources/content/history/history.xul     |   2 +-
 .../content/vfd/editBindingsTest.xul          |  18 +-
 .../vixen/resources/content/vfd/scratch.xul   |   2 +-
 .../vixen/resources/content/vfd/vfd.xul       |   2 +-
 .../vixen/resources/content/vfdScratch.xul    |  12 +-
 .../resources/content/vfdScratchDocument.xul  |   2 +-
 .../resources/content/vxKeysetOverlay.xul     |   2 +-
 .../wallet/cookieviewer/CookieViewer.xul      |  34 +-
 .../resources/content/CookieViewer.xul        |   2 +-
 extensions/wallet/editor/WalletAddress.xul    |   8 +-
 .../wallet/editor/WalletConcatenated.xul      |  16 +-
 extensions/wallet/editor/WalletCredit.xul     |   8 +-
 extensions/wallet/editor/WalletEditor.xul     |  30 +-
 extensions/wallet/editor/WalletEmploy.xul     |   4 +-
 extensions/wallet/editor/WalletMisc.xul       |  20 +-
 extensions/wallet/editor/WalletName.xul       |   4 +-
 extensions/wallet/editor/WalletPhone.xul      |   4 +-
 .../wallet/editor/WalletUrlspecific.xul       |   8 +-
 extensions/wallet/editor/WalletViewer.xul     |   6 +-
 extensions/wallet/editor/privacy.xul          |   4 +-
 .../resources/content/WalletAddress.xul       |   8 +-
 .../resources/content/WalletConcatenated.xul  |  16 +-
 .../editor/resources/content/WalletCredit.xul |   8 +-
 .../editor/resources/content/WalletEditor.xul |   2 +-
 .../editor/resources/content/WalletEmploy.xul |   4 +-
 .../editor/resources/content/WalletMisc.xul   |  20 +-
 .../editor/resources/content/WalletName.xul   |   4 +-
 .../editor/resources/content/WalletPhone.xul  |   4 +-
 .../resources/content/WalletUrlspecific.xul   |   8 +-
 .../editor/resources/content/WalletViewer.xul |   6 +-
 .../resources/content/pref-passwords.xul      |  22 +-
 .../wallet/resources/content/pref-wallet.xul  |  18 +-
 .../content/walletNavigatorOverlay.xul        |   4 +-
 .../wallet/signonviewer/SignonViewer.xul      |  34 +-
 .../resources/content/SignonViewer.xul        |   2 +-
 .../wallet/walletpreview/WalletPreview.xul    |  16 +-
 .../resources/content/WalletPreview.xul       |   2 +-
 extensions/xml-rpc/test/xml-rpc.xul           |  10 +-
 extensions/xmlterm/ui/content/xmlterm.xul     |   2 +-
 extensions/xmlterm/ui/content/xmlterm2.xul    |   2 +-
 intl/strres/tests/strres-test.xul             |  30 +-
 layout/html/tests/table/bugs/bug12012.xul     |  14 +-
 layout/html/tests/table/bugs/bug12287.xul     |   6 +-
 layout/html/tests/table/bugs/bug28856.xul     |   2 +-
 layout/xul/base/src/outliner/outliner.xul     |   2 +-
 .../content/pref-addressbookOverlay.xul       |   2 +-
 .../resources/content/pref-addressing.xul     |  30 +-
 .../resources/content/pref-directory-add.xul  |  30 +-
 .../content/pref-editdirectories.xul          |  12 +-
 .../content/abAddressBookNameDialog.xul       |  10 +-
 .../resources/content/abCardOverlay.xul       | 302 +++----
 .../resources/content/abCardViewOverlay.xul   |  42 +-
 .../resources/content/abEditCardDialog.xul    |   6 +-
 .../resources/content/abEditListDialog.xul    |   6 +-
 .../resources/content/abListOverlay.xul       |  40 +-
 .../resources/content/abMailListDialog.xul    |  10 +-
 .../resources/content/abNewCardDialog.xul     |  10 +-
 .../content/abSelectAddressesDialog.xul       |  48 +-
 .../resources/content/addressbook.xul         |  58 +-
 .../resources/content/AccountManager.xul      |  14 +-
 .../prefs/resources/content/AccountWizard.xul |  10 +-
 .../resources/content/SmtpServerEdit.xul      |   8 +-
 .../resources/content/SmtpServerList.xul      |  12 +-
 .../prefs/resources/content/am-addressing.xul |  10 +-
 .../prefs/resources/content/am-advanced.xul   |   2 +-
 .../prefs/resources/content/am-copies.xul     |  36 +-
 .../content/am-identity-advanced.xul          |  10 +-
 .../resources/content/am-imap-advanced.xul    |   8 +-
 .../base/prefs/resources/content/am-main.xul  |  26 +-
 .../prefs/resources/content/am-offline.xul    |  57 +-
 .../prefs/resources/content/am-server-top.xul |   2 +-
 .../prefs/resources/content/am-server.xul     |  72 +-
 .../content/am-serverwithnoidentities.xul     |   8 +-
 .../base/prefs/resources/content/am-smtp.xul  |  14 +-
 .../prefs/resources/content/aw-accname.xul    |  14 +-
 .../resources/content/aw-accounttype.xul      |  11 +-
 .../base/prefs/resources/content/aw-done.xul  |  10 +-
 .../prefs/resources/content/aw-identity.xul   |  18 +-
 .../base/prefs/resources/content/aw-login.xul |  26 +-
 .../prefs/resources/content/aw-newsserver.xul |  14 +-
 .../prefs/resources/content/aw-server.xul     |  34 +-
 .../prefs/resources/content/custreceipt.xul   |  20 +-
 .../resources/content/mailPrefsOverlay.xul    |  10 +-
 .../content/pref-advanced_overlay.xul         |   4 +-
 .../content/pref-appearance_overlay.xul       |   8 +-
 .../prefs/resources/content/pref-mailnews.xul |  38 +-
 .../prefs/resources/content/pref-receipts.xul |   4 +-
 .../resources/content/pref-tree_overlay.xul   |   2 +-
 .../content/pref-viewing_messages.xul         |  26 +-
 .../resources/content/smtpEditOverlay.xul     |  28 +-
 .../base/resources/content/downloadMsgs.xul   |   6 +-
 .../base/resources/content/folderProps.xul    |   6 +-
 .../content/mac/platformMailnewsOverlay.xul   |   2 +-
 .../content/mail3PaneWindowVertLayout.xul     |  40 +-
 .../content/mailNavigatorOverlay.xul          |   2 +-
 .../base/resources/content/mailOverlay.xul    |   2 +-
 .../resources/content/mailTasksOverlay.xul    |   6 +-
 .../resources/content/mailWindowOverlay.xul   |  20 +-
 .../base/resources/content/messagePane.xul    |   8 +-
 .../base/resources/content/messageWindow.xul  |  10 +-
 mailnews/base/resources/content/messenger.xul |  28 +-
 .../resources/content/msgAccountCentral.xul   |  48 +-
 .../resources/content/msgHdrViewOverlay.xul   |   4 +-
 .../base/resources/content/msgPrintEngine.xul |   2 +-
 .../resources/content/msgSelectOffline.xul    |  14 +-
 .../base/resources/content/msgSynchronize.xul |  20 +-
 .../resources/content/newFolderDialog.xul     |  16 +-
 .../resources/content/openSaveAttachment.xul  |  22 +-
 .../resources/content/renameFolderDialog.xul  |   8 +-
 mailnews/base/resources/content/sendMsgs.xul  |   6 +-
 mailnews/base/resources/content/subscribe.xul |  20 +-
 .../search/resources/content/FilterEditor.xul |   4 +-
 .../resources/content/FilterListDialog.xul    |   4 +-
 .../search/resources/content/SearchDialog.xul |  34 +-
 .../resources/content/SearchOptions.xul       |   8 +-
 .../resources/content/searchTermOverlay.xul   |  14 +-
 .../content/pref-composing_messages.xul       |  38 +-
 .../resources/content/pref-formatting.xul     |   6 +-
 .../resources/content/MsgAttachPage.xul       |  10 +-
 .../content/addressingWidgetOverlay.xul       |   2 +-
 .../resources/content/askSendFormat.xul       |  38 +-
 .../resources/content/messengercompose.xul    |  34 +-
 .../resources/content/sendProgress.xul        |  18 +-
 .../resources/content/fieldMapExport.xul      |  30 +-
 .../resources/content/fieldMapImport.xul      |  12 +-
 .../import/resources/content/importDialog.xul |  34 +-
 .../resources/content/downloadheaders.xul     |  14 +-
 .../resources/content/no_space.xul            |  16 +-
 .../content/profileMigrationProgress.xul      |  18 +-
 .../resources/content/confirmMigration.xul    |  16 +-
 .../resources/content/createProfileWizard.xul |   8 +-
 profile/resources/content/deleteProfile.xul   |   8 +-
 profile/resources/content/newProfile1_2.xul   |  12 +-
 .../resources/content/profileSelection.xul    |  34 +-
 profile/resources/content/selectLang.xul      |   2 +-
 rdf/resources/dom-test-1.xul                  |   6 +-
 rdf/resources/dom-test-7.xul                  |  10 +-
 rdf/resources/dom-test-8.xul                  |   6 +-
 .../domds/resources/DOMDataSourceViewer.xul   |  14 +-
 themes/classic/global/mac/splitter.css        |   8 +-
 themes/classic/global/win/global.css          |   2 +-
 .../tests/viewer/samples/checkboxTest.xul     |   2 +-
 .../tests/viewer/samples/scrollbarTest1.xul   |   4 +-
 .../tests/viewer/samples/scrollbarTest2.xul   |   8 +-
 webshell/tests/viewer/samples/sliderTest1.xul |   2 +-
 .../tests/viewer/samples/toolbarTest1.xul     |   6 +-
 xpfe/browser/resources/content/metadata.xul   |  28 +-
 .../resources/content/navigator-toolbars.xul  |  16 +-
 xpfe/browser/resources/content/navigator.xul  |   6 +-
 xpfe/browser/resources/content/pageInfo.xul   |  26 +-
 .../browser/resources/content/toolbarTest.xul |  32 +-
 xpfe/browser/resources/content/viewSource.xul |   6 +-
 xpfe/browser/samples/collapsing.xul           |  10 +-
 xpfe/browser/samples/colorpicker.xul          |  14 +-
 xpfe/browser/samples/dexopenchrome.xul        |  12 +-
 xpfe/browser/samples/hidetoolicon.xul         |   6 +-
 xpfe/browser/samples/tab.xul                  |  68 +-
 xpfe/browser/samples/widgets.xul              |  74 +-
 xpfe/browser/samples/xpmenu.xul               |   2 +-
 xpfe/browser/src/navigator-test1.xul          |  46 +-
 .../resources/content/askViewZoom.xul         |  12 +-
 .../resources/content/openLocation.xul        |  24 +-
 .../resources/content/taskbarOverlay.xul      |  12 +-
 .../resources/content/tasksOverlay.xul        |  18 +-
 .../resources/content/utilityOverlay.xul      |  21 +-
 .../autocomplete/test/autocomplete_test.xul   |   2 +-
 .../bookmarks/resources/addBookmark.xul       |   2 +-
 .../bookmarks/resources/bm-panel.xul          |   4 +-
 .../bookmarks/resources/bm-props.xul          |  10 +-
 .../bookmarks/resources/bookmarksPanel.xul    |   4 +-
 .../bookmarks/resources/findBookmark.xul      |   2 +-
 .../bookmarks/resources/pref-bookmarks.xul    |  18 +-
 .../console/resources/content/console.xul     |   4 +-
 xpfe/components/directory/directory.xul       |   4 +-
 .../filepicker/res/content/filepicker.xul     |  10 +-
 xpfe/components/find/resources/finddialog.xul |   4 +-
 .../find/resources/replacedialog.xul          |   6 +-
 .../history/resources/findHistory.xul         |   2 +-
 .../history/resources/history-test.xul        |   4 +-
 .../permissions/content/cookieViewer.xul      |   2 +-
 .../resources/content/fontScalingOverlay.xul  |   4 +-
 .../resources/content/pref-advanced.xul       |  14 +-
 .../resources/content/pref-appearance.xul     |  10 +-
 .../content/pref-applications-edit.xul        |  30 +-
 .../content/pref-applications-new.xul         |   6 +-
 .../resources/content/pref-applications.xul   |  18 +-
 .../resources/content/pref-cache.xul          |  18 +-
 .../content/pref-calibrate-screen.xul         |  18 +-
 .../resources/content/pref-charset.xul        |  28 +-
 .../resources/content/pref-colors.xul         |  50 +-
 .../resources/content/pref-debug.xul          |  14 +-
 .../resources/content/pref-debug1.xul         |  10 +-
 .../resources/content/pref-debug2.xul         |  10 +-
 .../resources/content/pref-download.xul       |   6 +-
 .../resources/content/pref-fonts.xul          |  38 +-
 .../resources/content/pref-history.xul        |  30 +-
 .../resources/content/pref-languages-add.xul  |   6 +-
 .../resources/content/pref-languages.xul      |  18 +-
 .../resources/content/pref-mousewheel.xul     |  54 +-
 .../resources/content/pref-navigator.xul      |  34 +-
 .../resources/content/pref-offline.xul        |  16 +-
 .../resources/content/pref-policies.xul       |  22 +-
 .../resources/content/pref-proxies.xul        |  34 +-
 .../resources/content/pref-proxy-manual.xul   |  40 +-
 .../resources/content/pref-search.xul         |  18 +-
 .../resources/content/pref-security.xul       |   2 +-
 .../resources/content/pref-smart_browsing.xul |  26 +-
 .../resources/content/pref-smartupdate.xul    |  18 +-
 .../resources/content/pref-themes.xul         |  22 +-
 .../resources/content/pref-winhooks.xul       |   6 +-
 .../prefwindow/resources/content/pref.xul     |   2 +-
 xpfe/components/regviewer/regviewer.xul       |  10 +-
 xpfe/components/search/resources/find.xul     |  12 +-
 .../search/resources/findresults.xul          |   8 +-
 xpfe/components/search/resources/internet.xul |  12 +-
 .../search/resources/internetresults.xul      |  18 +-
 .../search/resources/search-editor.xul        |  38 +-
 .../search/resources/search-panel.xul         |   4 +-
 xpfe/components/search/resources/search.xul   |   2 +-
 .../sidebar/resources/customize.xul           |  30 +-
 xpfe/components/sidebar/resources/preview.xul |   6 +-
 .../sidebar/resources/sidebarOverlay.xul      |  30 +-
 .../timebomb/resources/content/expireText.xul |   4 +-
 .../timebomb/resources/content/warn.xul       |   4 +-
 .../ucth/resources/helperAppDldProgress.xul   |  32 +-
 .../ucth/resources/helperAppLauncher.xul      |  40 +-
 .../ucth/resources/unknownContent.xul         |  18 +-
 .../xfer/resources/downloadProgress.xul       |  24 +-
 xpfe/global/resources/content/about.xul       |  10 +-
 .../global/resources/content/commonDialog.xul |  32 +-
 .../content/mac/platformDialogOverlay.xul     |  17 +-
 .../content/os2/platformDialogOverlay.xul     |  16 +-
 .../global/resources/content/selectDialog.xul |  12 +-
 .../content/unix/platformDialogOverlay.xul    |  16 +-
 .../resources/content/unix/printdialog.xul    |  32 +-
 .../content/win/platformDialogOverlay.xul     |  16 +-
 .../resources/content/wizardOverlay.xul       |   4 +-
 xpinstall/res/content/institems.xul           |  14 +-
 xpinstall/res/content/xpistatus.xul           |  20 +-
 315 files changed, 2962 insertions(+), 2954 deletions(-)

diff --git a/editor/ui/composer/content/TextEditorAppShell.xul b/editor/ui/composer/content/TextEditorAppShell.xul
index 9eea54f04176..99c6a3be39c7 100644
--- a/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/editor/ui/composer/content/TextEditorAppShell.xul
@@ -46,7 +46,7 @@
         titlemodifier="&textEditorWindow.titlemodifier;"
         titlemenuseparator="&editorWindow.titlemodifiermenuseparator;"
         windowtype="composer:text"
-        align="vertical"
+        orient="vertical"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode"
@@ -134,11 +134,11 @@ editor.xul has these - do we need them?
     </toolbar>    
   </toolbox>
 
-  <box id="sidebar-parent" flex="1">
+  <hbox id="sidebar-parent" flex="1">
     <!-- From sidebarOverlay.xul -->
-    <box id="sidebar-box" class="chromeclass-extrachrome" hidden="true"/>
+    <hbox id="sidebar-box" class="chromeclass-extrachrome" hidden="true"/>
     <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
-    <box id="appcontent" orient="vertical" flex="1">
+    <vbox id="appcontent" flex="1">
 
       <editor type="content-primary" id="content-frame" src="about:blank" flex="1"/>
 
@@ -150,9 +150,9 @@ editor.xul has these - do we need them?
         <statusbarpanel id="statusText" label="&statusText.label;" flex="1" crop="right"/>
       </statusbar>
 
-    </box> <!-- appcontent -->
-  </box><!-- sidebar-parent -->
+    </vbox> <!-- appcontent -->
+  </hbox><!-- sidebar-parent -->
 
-  <box id="taskbar" class="toolbox-bottom"/>
+  <hbox id="taskbar" class="toolbox-bottom"/>
 
 </window>
diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index ae836b459520..eaca7c6a55cb 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -180,19 +180,19 @@
     <button id="linkButton"/>
     <button id="namedAnchorButton"/>
     <spring flex="1"/>
-    <box id="throbber-box" autostretch="never">
+    <hbox id="throbber-box" autostretch="never">
       <button id="navigator-throbber" oncommand="goClickThrobber('editor.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
         <observes element="Editor:Throbber" attribute="busy"/>
       </button>
-    </box> 
+    </hbox> 
   </toolbar>
   <toolbar id="FormatToolbar" persist="collapsed" tbautostretch="never">
     <!-- We need this else menulists get stretched -->
-    <box autostretch="never">
+    <hbox autostretch="never">
       <!-- from editorOverlay -->
       <menulist id="ParagraphSelect"/>
       <stack id="ColorButtons"/>
-    </box>
+    </hbox>
 
     <button id="DecreaseFontSizeButton"/>
     <button id="IncreaseFontSizeButton"/>
@@ -229,12 +229,12 @@
 </toolbox>
 
 <!-- sidebar/toolbar/content/status -->
-<box id="sidebar-parent" flex="1">
+<hbox id="sidebar-parent" flex="1">
   <!-- From sidebarOverlay.xul -->
-  <box id="sidebar-box" class="chromeclass-extrachrome" hidden="true"/>
+  <hbox id="sidebar-box" class="chromeclass-extrachrome" hidden="true"/>
   <splitter id="sidebar-splitter" class="chromeclass-extrachrome" hidden="true"/>
 
-  <box id="appcontent" orient="vertical" flex="1">
+  <vbox id="appcontent" flex="1">
     <deck id="ContentWindowDeck" index="0" flex="1">
       <!-- KLUDGE:  Temporary fix for bug 34414:
            The current editor tag doesn't have a view, 
@@ -243,28 +243,28 @@
       <stack>
         <editor type="content-primary" id="content-frame" src="about:blank" context="editorContentContext" flex="1"/>
       </stack>
-      <box align="vertical">
+      <vbox>
         <text class="label" id="doctype-text" style="width:1em" crop="right"/>
         <textbox class="source-editor plain" id="content-source" multiline="true" rows="1"
                    flex="1" style="width:1em; height:1em;"/>
-      </box>
+      </vbox>
     </deck>
 
-    <box id="EditModeToolbar" hidden="false" autostretch="never" valign="middle" persist="collapsed">
+    <hbox id="EditModeToolbar" hidden="false" autostretch="never" valign="middle" persist="collapsed">
       <tabs id="EditModeTabs" class="tabs-bottom" flex="1">
         <tab id="NormalModeButton"/>
         <tab id="TagModeButton"/>
         <tab id="SourceModeButton"/>
         <tab id="PreviewModeButton"/>
     </tabs>
-    </box>
+    </hbox>
 
-  </box> <!-- appcontent -->
-</box><!-- sidebar-parent -->
+  </vbox> <!-- appcontent -->
+</hbox><!-- sidebar-parent -->
 
     <!-- Some of this is from globarOverlay.xul -->
     <statusbar id="status-bar">
-      <box id="component-bar"/>
+      <hbox id="component-bar"/>
       <statusbarpanel id="statusText" label="&statusText.label;" flex="1" crop="right"/>
       <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
       <resizer class="window-diagonal" />
diff --git a/editor/ui/composer/content/editorPrefsOverlay.xul b/editor/ui/composer/content/editorPrefsOverlay.xul
index bcf7ba108e0c..36e1e18f4e29 100644
--- a/editor/ui/composer/content/editorPrefsOverlay.xul
+++ b/editor/ui/composer/content/editorPrefsOverlay.xul
@@ -25,12 +25,12 @@
   </script>         
 
   <!-- editor startup toggle -->
-  <titledbox id="generalStartupPreferences">           
+  <groupbox id="generalStartupPreferences">           
     <checkbox id="generalStartupEditor" wsm_persist="true" position="3"
               label="&editorCheck.label;" accesskey="&editorCheck.accesskey;"
               pref="true" preftype="bool" prefstring="general.startup.editor"
               prefattribute="checked"/>         
-  </titledbox>
+  </groupbox>
 
   <!-- category tree entries for editor -->
   <treechildren id="panelChildren">
diff --git a/editor/ui/composer/content/pref-composer.xul b/editor/ui/composer/content/pref-composer.xul
index e738a8010b4a..ce537bc8e531 100644
--- a/editor/ui/composer/content/pref-composer.xul
+++ b/editor/ui/composer/content/pref-composer.xul
@@ -43,12 +43,12 @@
         
   <popupset id="aTooltipSet" />
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
   <!-- Recent files menu -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&recentFiles.title;"/>
-    <box align="horizontal" autostretch="never" valign="middle">
+    <hbox autostretch="never" valign="middle">
       <text value="&documentsInMenu;"/>
       <textbox
         id="recentFiles"
@@ -61,11 +61,11 @@
         prefstring="editor.history.url_maximum"
         prefattribute="value"
       />
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
 <!-- HTML formatting on output -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&savingFiles.title;"/>
     <spring class="spacer"/>
     <radiogroup orient="vertical" autostretch="never"
@@ -91,9 +91,9 @@
         tooltiptext= "&reformat.tooltip;"
       />
     </radiogroup>
-  </titledbox>
+  </groupbox>
   
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&tableEditing.label;"/>
     <checkbox 
       label     = "&maintainTableStructure.label;"
@@ -106,7 +106,7 @@
       prefattribute="checked"
     />
     <separator class = "thin"/>
-    <box autostretch="never" valign="top">
+    <hbox autostretch="never" valign="top">
       <text class="label"
         value="&pressingTheDeleteKey.label;" 
         tooltip = "aTooltip" tooltiptext="&pressingTheDeleteKey.tooltip;"
@@ -121,13 +121,13 @@
         <radio group="tableDeleteKey" value="0" label="&deleteCell.label;" accesskey="&deleteCell.accesskey;"/>
         <radio group="tableDeleteKey" value="1" label="&deleteContent.label;" accesskey="&deleteContent.accesskey;" />
       </radiogroup>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
 <!-- Take out Auto-Save; not supported at this time
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&saving;"/>
-    <box align="horizontal" valign="middle">
+    <hbox valign="middle">
       <checkbox 
         label      = "&AutoSaveCheck;"
         id         = "shouldAutoSave"
@@ -149,14 +149,14 @@
         prefattribute="value"
       />
       <text value="&minText;" />
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 -->
 
 <!-- External Editors are not supported at this time
-    <titledbox orient="vertical">
+    <groupbox orient="vertical">
           <label value="&exterLegend.label;"/> 
-    <box>
+    <hbox>
       <checkbox 
         name  = "htmlSourceEditorCheckbox"
         label = "&htmlSource;"
@@ -176,9 +176,9 @@
         name  = ""
         label = "&chooseButton.label;"
       />
-    </box>
+    </hbox>
 
-    <box>
+    <hbox>
       <checkbox 
         name  = "htmlImageEditorCheckbox" 
         label = "&imageeditor;"
@@ -195,8 +195,8 @@
         prefstring = "editor.image_editor"
       />
       <button class="dialog" label="&chooseButton.label;" />
-    </box> 
+    </hbox> 
 
-  </titledbox>
+  </groupbox>
   -->
 </window>
diff --git a/editor/ui/composer/content/pref-editing.xul b/editor/ui/composer/content/pref-editing.xul
index 3d731ed069ef..e845a299d781 100644
--- a/editor/ui/composer/content/pref-editing.xul
+++ b/editor/ui/composer/content/pref-editing.xul
@@ -43,19 +43,19 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
   <vbox>
     <text class="label small-margin" value="&authorName.label;"/>
-    <box>
+    <hbox>
       <textbox id="editorAuthor" flex="1"
                  pref="true" preftype="string" prefstring="editor.author"
                  prefattribute="value"/>
       <spring flex="1"/>
-    </box>
+    </hbox>
   </vbox>
   <spring class="smallspacer"/>
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&pageColorHeader;"/> 
     <radiogroup id="useCustomColors" orient="vertical" autostretch="never"  
                 pref="true" preftype="bool" prefstring="editor.use_custom_colors"
@@ -70,7 +70,7 @@
           accesskey="&customColors.accesskey;" 
           oncommand="UseCustomColors()"/>
     </radiogroup>
-    <box class="big-left-margin">
+    <hbox class="big-left-margin">
       <grid>
         <columns><column/><column/></columns>
         <rows>
@@ -78,11 +78,11 @@
             <text class="label" id="Text" value="&normalText.label;&colon.character;" />
             <stack>
               <button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="textCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
             <data id="textData" pref="true" preftype="color" prefstring="editor.text_color" prefattribute="value" wsm_attributes="value"/>
           </row>
@@ -90,11 +90,11 @@
             <text class="label" id="Link" value="&linkText.label;&colon.character;" />
             <stack>
               <button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="linkCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
             <data id="linkData" pref="true" preftype="color" prefstring="editor.link_color" prefattribute="value" wsm_attributes="value"/>
           </row>
@@ -102,11 +102,11 @@
             <text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
             <stack>
               <button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="activeCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
             <data id="aLinkData" pref="true" preftype="color" prefstring="editor.active_link_color" prefattribute="value" wsm_attributes="value"/>
           </row>
@@ -114,11 +114,11 @@
             <text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
             <stack>
               <button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="visitedCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
               <data id="fLinkData" pref="true" preftype="color" prefstring="editor.followed_link_color" prefattribute="value" wsm_attributes="value"/>
             </stack>
           </row>
@@ -126,11 +126,11 @@
             <text class="label" id="Background" value="&background.label;" />
             <stack>
               <button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="backgroundCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
             <data id="backgroundColorData" pref="true" preftype="color" prefstring="editor.background_color" prefattribute="value" wsm_attributes="value"/>
           </row>
@@ -148,10 +148,10 @@
         <spring flex="1"/>
       </vbox>
       <spring flex="1"/>
-    </box>
+    </hbox>
     <spring class="spacer"/>
     <text class="label small-margin" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
-    <box valign="middle" autostretch="never">
+    <hbox valign="middle" autostretch="never">
       <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width: 23em" flex="1">
         <observes element="backgroundImageData" attribute="disabled"/>
       </textbox>
@@ -160,6 +160,6 @@
         <observes element="backgroundImageData" attribute="disabled"/>
       </button>
       <data id="backgroundImageData" pref="true" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 </window>
diff --git a/editor/ui/composer/content/sidebar-editor.xul b/editor/ui/composer/content/sidebar-editor.xul
index 64fb3a2c219a..1ba0c98cfa4d 100644
--- a/editor/ui/composer/content/sidebar-editor.xul
+++ b/editor/ui/composer/content/sidebar-editor.xul
@@ -36,8 +36,8 @@
                'NC:EditorSidebarRoot');" orient="vertical">
 
 <script src="chrome://communicator/content/sidebar/sidebar.js" />
-<box id="sidebox" orient="vertical" flex="1">
- <box class="sidebartitle">
+<vbox id="sidebox" flex="1">
+ <hbox class="sidebartitle">
   <spring flex="1"/>
   <button class="dialog borderless paneltitle" 
         label="&sidebar.reload.label;"
@@ -45,6 +45,6 @@
   <button class="borderless paneltitle" 
         label="&sidebar.customize.label;" 
         oncommand="var dialogWindow=customize();" />
- </box>
-</box>
+ </hbox>
+</vbox>
 </window>
diff --git a/editor/ui/dialogs/content/EdAdvancedEdit.xul b/editor/ui/dialogs/content/EdAdvancedEdit.xul
index a0503542e69f..a20a898a1e0a 100644
--- a/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -59,10 +59,10 @@
 
   <broadcaster id="args" value=""/>
 
-  <box autostretch="never">
+  <hbox autostretch="never">
     <text class="label" value="&currentattributesfor.label;"/>
     <text class="label header" id="tagLabel"/>
-  </box>
+  </hbox>
   
   <separator class="thin"/>
   
@@ -76,7 +76,7 @@
       <!-- ============================================================== -->
       <!--                        HTML Attributes                         -->
       <!-- ============================================================== -->
-      <box flex="1" orient="vertical">
+      <vbox flex="1">
         <tree id="HTMLATree" 
           class="AttributesTree inset" 
           flex="1"
@@ -96,11 +96,11 @@
           </treehead>
           <treechildren id="HTMLAList" flex="1"/>
         </tree>
-        <box valign="middle" autostretch="never" flex="1">
+        <hbox valign="middle" autostretch="never" flex="1">
           <text class="label" value="&editAttribute.label;"/>
           <spring flex="1"/>
           <button class="dialog" label="&removeAttribute.label;" oncommand="RemoveHTMLAttribute();"/>
-        </box>
+        </hbox>
         <grid>
           <columns>
             <column flex="1"/><column flex="1"/>
@@ -124,11 +124,11 @@
             </row>
           </rows>
         </grid>
-      </box>
+      </vbox>
       <!-- ============================================================== -->
       <!--                         CSS Attributes                         -->
       <!-- ============================================================== -->
-      <box flex="1" orient="vertical">
+      <vbox flex="1">
         <tree id="CSSATree" class="AttributesTree inset" flex="1"
           onselect="onSelectCSSTreeItem();"
           onclick="onSelectCSSTreeItem();"
@@ -146,11 +146,11 @@
           </treehead>
           <treechildren id="CSSAList" flex="1"/>
         </tree>
-        <box valign="middle" autostretch="never" flex="1">
+        <hbox valign="middle" autostretch="never" flex="1">
           <text class="label" value="&editAttribute.label;"/>
           <spring flex="1"/>
           <button class="dialog" label="&removeAttribute.label;" oncommand="RemoveCSSAttribute();"/>
-        </box>
+        </hbox>
         <grid>
           <columns>
             <column flex="1"/><column flex="1"/>
@@ -169,11 +169,11 @@
             </row>
           </rows>
         </grid>
-      </box>
+      </vbox>
       <!-- ============================================================== -->
       <!--                    JavaScript Event Handlers                   -->
       <!-- ============================================================== -->
-      <box flex="1" orient="vertical">
+      <vbox flex="1">
         <tree id="JSEATree" class="AttributesTree inset" flex="1"
           onselect="onSelectJSETreeItem();"
           onclick="onSelectJSETreeItem();"
@@ -191,11 +191,11 @@
           </treehead>
           <treechildren id="JSEAList" flex="1"/>
         </tree>
-        <box valign="middle" autostretch="never" flex="1">
+        <hbox valign="middle" autostretch="never" flex="1">
           <text class="label" value="&editAttribute.label;"/>
           <spring flex="1"/>
           <button class="dialog" label="&removeAttribute.label;" oncommand="RemoveJSEAttribute()"/>
-        </box>
+        </hbox>
         <grid>
           <columns>
             <column flex="1"/><column flex="1"/>
@@ -214,10 +214,10 @@
             </row>
           </rows>
         </grid>
-      </box>
+      </vbox>
     </tabpanels>
   </tabbox>
   <spring class="spacer"/>
-  <box id="okCancelHelpButtonsRight"/> 
+  <hbox id="okCancelHelpButtonsRight"/> 
 
 </window>
diff --git a/editor/ui/dialogs/content/EdColorPicker.xul b/editor/ui/dialogs/content/EdColorPicker.xul
index d14e49de8363..8dd55d407a2e 100644
--- a/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/editor/ui/dialogs/content/EdColorPicker.xul
@@ -44,53 +44,53 @@
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <keyset id="dialogKeys"/>
-  <box id="TableOrCellGroup" valign="middle" autostretch="never" collapsed="true">
+  <hbox id="TableOrCellGroup" valign="middle" autostretch="never" collapsed="true">
     <text value="&background.label;"/>
     <radiogroup id="1" orient="horizontal">
       <radio group="1" id="TableRadio" label="&table.label;"/>
       <radio group="1" id="CellRadio"  label="&cell.label;"/>
   </radiogroup>
-  </box>
+  </hbox>
   <colorpicker id="ColorPicker" palettename="standard" 
     persist="palettename"
     onselect="SelectColor();"/>
 <!-- Web palette is not implemented???
-  <box valign="middle" autostretch="never">
+  <hbox valign="middle" autostretch="never">
     <text class="label" value="&palette.label;"/>
     <radio id="StandardPalette" label="&standardPalette.label;" oncommand="ChangePalette('standard')"/>
     <radio id="WebPalette" label="&webPalette.label;" oncommand="ChangePalette('web')"/>
-  </box>
+  </hbox>
 -->
   <spring class="spacer"/>
-  <box orient="vertical" flex="1">
+  <vbox flex="1">
     <stack valign="middle" autostretch="never">
       <button id="LastPickedButton" class="dialog" label="&lastPickedColor.label;" 
         style="margin-left:0px; margin-right: 0px;"
         onclick="SelectLastPickedColor();"/>
-      <box style="margin-left: 5px"  mousethrough="always">
-        <box orient="vertical" autostretch="never">
+      <hbox style="margin-left: 5px"  mousethrough="always">
+        <vbox autostretch="never">
           <spring flex="1"/>
           <spring id="LastPickedColor"
                       LastTextColor="" LastBackgroundColor=""
                       persist="LastTextColor LastBackgroundColor"/>
           <spring flex="1"/>
-        </box>
+        </vbox>
         <spring flex="1"/>
-      </box>
+      </hbox>
     </stack>
     <text class="label" value="&setColor1.label;"/>
     <text class="label" value="&setColor2.label;"/>
     <text class="label" value="&setColorExample.label;"/>
-    <box valign="middle" autostretch="never" flex="1=">
+    <hbox valign="middle" autostretch="never" flex="1=">
       <textbox id="ColorInput" style="width: 8em" oninput="SetColorSwatch()"/>
       <spring flex="1"/>
       <spring id="ColorPickerSwatch"/>
       <spring flex="1"/>
       <button id="DefaultColorButton" class="dialog" label="&default.label;" 
         style="margin-right:0px;" oncommand="RemoveColor()"/>
-    </box>
-  </box>
+    </hbox>
+  </vbox>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/> 
+  <hbox id="okCancelButtons"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdColorProps.xul b/editor/ui/dialogs/content/EdColorProps.xul
index e0bc2713884f..75da50876338 100644
--- a/editor/ui/dialogs/content/EdColorProps.xul
+++ b/editor/ui/dialogs/content/EdColorProps.xul
@@ -47,7 +47,7 @@
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&pageColors.label;"/>
     <radiogroup id="pageColorGroup" orient="vertical" autostretch="never">
       <radio group="pageColorGroup" id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
@@ -55,7 +55,7 @@
       <radio group="pageColorGroup" id="CustomColorsRadio" label="&customColorsRadio.label;" oncommand="UseCustomColors()"
         tooltip="aTooltip"     tooltiptext="&customColorsRadio.tooltip;" />
     </radiogroup>
-    <box class="big-left-margin">
+    <hbox class="big-left-margin">
       <grid>
         <columns><column/><column/></columns>
         <rows>
@@ -63,55 +63,55 @@
             <text class="label" id="Text" value="&normalText.label;&colon.character;" />
             <stack>
               <button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="textCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
           </row>
           <row valign="middle" autostretch="never">
             <text class="label" id="Link" value="&linkText.label;&colon.character;" />
             <stack>
               <button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="linkCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
           </row>
           <row valign="middle" autostretch="never">
             <text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
             <stack>
               <button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="activeCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
           </row>
           <row valign="middle" autostretch="never">
             <text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
             <stack>
               <button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="visitedCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
           </row>
           <row valign="middle" autostretch="never">
             <text class="label" id="Background" value="&background.label;" />
             <stack>
               <button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
-              <box autostretch="never" valign="middle" mousethrough="always">
+              <hbox autostretch="never" valign="middle" mousethrough="always">
                 <spring flex="1"/>
                 <spring id="backgroundCW" class="color-well"/>
                 <spring flex="1"/>
-              </box>
+              </hbox>
             </stack>
           </row>
         </rows>
@@ -128,9 +128,9 @@
         <spring flex="1"/>
       </vbox>
       <spring flex="1"/>
-    </box>
+    </hbox>
     <spring class="spacer"/>
-  </titledbox>
+  </groupbox>
   <spring class="spacer"/>
   <text class="label" value="&backgroundImage.label;"/>
   <grid flex="1">
@@ -151,5 +151,5 @@
     </rows>
   </grid>
   <separator class="groove"/>
-  <box id="okCancelButtons"/> 
+  <hbox id="okCancelButtons"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdConvertToTable.xul b/editor/ui/dialogs/content/EdConvertToTable.xul
index fcf421c2d2cd..744502e29448 100644
--- a/editor/ui/dialogs/content/EdConvertToTable.xul
+++ b/editor/ui/dialogs/content/EdConvertToTable.xul
@@ -51,14 +51,14 @@
   <radiogroup id="SepRadioGroup" orient="vertical" persist="index character" index="0" character="">
     <radio group="SepRadioGroup" id="comma"    label="&commaRadio.label;"    oncommand="SelectCharacter('0');"/>
     <radio group="SepRadioGroup" id="space"    label="&spaceRadio.label;"    oncommand="SelectCharacter('1');"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <radio group="SepRadioGroup" id="other"  label="&otherRadio.label;"    oncommand="SelectCharacter('2');"/>
       <textbox class="narrow" id="SepCharacterInput" oninput="InputSepCharacter()"/>
-    </box>
+    </hbox>
   </radiogroup> 
   <spring class="spacer"/>
   <checkbox id="DeleteSepCharacter" label="&deleteCharCheck.label;" oncommand="SelectCharacter('1');"/>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/editor/ui/dialogs/content/EdDialogOverlay.xul b/editor/ui/dialogs/content/EdDialogOverlay.xul
index 36d76f08a00e..594175626a96 100644
--- a/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -28,15 +28,15 @@
      xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<box id="AdvancedEdit" orient="vertical"  flex="1">
-  <box flex="1" style="margin-top: 0.2em" autostretch="never">
+<vbox id="AdvancedEdit"  flex="1">
+  <hbox flex="1" style="margin-top: 0.2em" autostretch="never">
     <!-- This will right-align the button -->
     <spring flex="1"/>
     <button class="dialog" id="AdvancedEditButton1" oncommand="onAdvancedEdit()" label="&AdvancedEditButton.label;"
             tooltip="aTooltip" tooltiptext="&AdvancedEditButton.tooltip;"/>
-  </box>
+  </hbox>
   <separator class="groove"/>
-</box>
+</vbox>
 
 <!-- Extra buttons to use when just button is needed
      E.g. Image Properties Dialog switches position between 2 locations
diff --git a/editor/ui/dialogs/content/EdDialogTemplate.xul b/editor/ui/dialogs/content/EdDialogTemplate.xul
index b9272c2b3021..7ba71b93e12d 100644
--- a/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -46,7 +46,7 @@
   <keyset id="dialogKeys"/>
 
   <!-- from EdDialogOverlay -->
-  <box id="AdvancedEdit"/>
+  <hbox id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
-	<box id="okCancelButtons"/> 
+	<hbox id="okCancelButtons"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdDictionary.xul b/editor/ui/dialogs/content/EdDictionary.xul
index 154de9fd4927..76a837002bd3 100644
--- a/editor/ui/dialogs/content/EdDictionary.xul
+++ b/editor/ui/dialogs/content/EdDictionary.xul
@@ -61,14 +61,14 @@
         <tree rows="8" class="list" id="DictionaryList" flex="1">
           <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
-        <box orient="vertical" flex="1">
+        <vbox flex="1">
           <button class="dialog"  id="ReplaceWord" oncommand="ReplaceWord()" label="&ReplaceButton.label;"/>
           <spring class="spacer"/>
           <button class="dialog"  id="RemoveWord" oncommand="RemoveWord()" label="&RemoveButton.label;"/>
           <spring class="spacer"/>
           <spring flex="1"/>
           <button class="exit-dialog" id="close" label="&CloseButton.label;" default="true" oncommand="Close();"/>  
-        </box>
+        </vbox>
       </row>
     </rows>
   </grid>
diff --git a/editor/ui/dialogs/content/EdHLineProps.xul b/editor/ui/dialogs/content/EdHLineProps.xul
index 1a4e1d170718..4a436c52164d 100644
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/editor/ui/dialogs/content/EdHLineProps.xul
@@ -48,7 +48,7 @@
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
   
-  <titledbox orient="vertical"><label value="&dimensionsBox.label;"/>
+  <groupbox orient="vertical"><label value="&dimensionsBox.label;"/>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
@@ -66,24 +66,24 @@
       </rows>
     </grid>        
     <checkbox id="3dShading" label="&threeDShading.label;" />
-  </titledbox>
-  <titledbox><label align="left" value="&alignmentBox.label;"/>
+  </groupbox>
+  <groupbox><label align="left" value="&alignmentBox.label;"/>
     <radiogroup id="alignmentGroup" orient="horizontal">
       <spring class="spacer"/>
       <radio group="alignmentGroup" id="leftAlign" label="&leftRadio.value;" />
       <radio group="alignmentGroup" id="centerAlign" label="&centerRadio.value;" />
       <radio group="alignmentGroup" id="rightAlign" label="&rightRadio.value;" />
     </radiogroup>
-  </titledbox>
+  </groupbox>
   <spring class="spacer"/>
-  <box>
+  <hbox>
     <button class="dialog"  id="SaveDefault" label="&saveSettings.label;" 
          oncommand="onSaveDefault()"
          tooltip="aTooltip" tooltiptext="&saveSettings.tooltip;" />
     <spring flex="1"/>
     <button id="AdvancedEditButton"/>
-  </box>
+  </hbox>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/editor/ui/dialogs/content/EdImageMap.xul b/editor/ui/dialogs/content/EdImageMap.xul
index 14fb2004d8de..5a43b81b4319 100644
--- a/editor/ui/dialogs/content/EdImageMap.xul
+++ b/editor/ui/dialogs/content/EdImageMap.xul
@@ -42,8 +42,8 @@
     width="640" height="480">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js" />
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js" />
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <!-- Methods for Image Map only -->
@@ -140,16 +140,16 @@
 </toolbar> 
 </toolbox>
 
-<box id="outer-box" flex="1">
+<hbox id="outer-box" flex="1">
 
   <toolbar id="toolbox" orient="vertical">
-  <box orient="vertical">
+  <vbox>
     <button id="pointerButton" class="tool" toggled="1" oncommand="changeTool(event, 'pointer');"/>
     <button id="rectButton" class="tool" oncommand="changeTool(event, 'rect');"/>
     <button id="cirButton" class="tool" oncommand="changeTool(event, 'cir');"/>
     <button id="polyButton" class="tool" oncommand="changeTool(event, 'poly');"/>
     <spring flex="1"/>
-  </box>
+  </vbox>
   </toolbar>
 
   <!-- Content Area -->
@@ -160,15 +160,15 @@
     onclick="top.clickMouse(event)" 
   />
 
-</box>
+</hbox>
 
   <!-- from EdDialogOverlay -->
   <!-- not sure if this is needed, but put it in just in case 
-  <box id="AdvancedEditButton"/> -->
+  <hbox id="AdvancedEditButton"/> -->
 
   <separator class="groove"/>
 
   <!-- from global dialogOverlay -->
-  <box id="okCancelHelpButtonsRight"/>
+  <hbox id="okCancelHelpButtonsRight"/>
 
 </window>
diff --git a/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 7ad090e9c2c4..3a75fc59b0f0 100644
--- a/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -45,7 +45,7 @@
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
 
-  <titledbox orient="vertical" flex="1">
+  <groupbox orient="vertical" flex="1">
     <label id="titleInput" value="&link.label;"/>
 
     <grid>
@@ -66,9 +66,9 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical" flex="1">
+  <groupbox orient="vertical" flex="1">
     <label id="targetLabel" value="&targetFieldset.label;"/>
     <grid>
       <columns><column/><column/><column/></columns>
@@ -94,8 +94,8 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/editor/ui/dialogs/content/EdImageProps.xul
index 6a02f10addd5..243d69347d29 100644
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -54,7 +54,7 @@
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&locationBox.label;"/>
     <!--/////// Src URL and ALT Text //////-->
     <grid>
@@ -87,9 +87,9 @@
       </rows>
     </grid>
     <spring class="spacer"/>
-  </titledbox>
+  </groupbox>
   <spring class="spacer"/>
-  <box valign="middle" autostretch="never"> 
+  <hbox valign="middle" autostretch="never"> 
     <button 
       class   = "dialog" 
       id      = "MoreFewerButton" 
@@ -98,41 +98,41 @@
       tooltip = "aTooltip" tooltiptext = "&MoreFewerButton.tooltip;"
       persist = "more"/>
     <spring class="spacer"/>
-    <titledbox style="padding: 4px">
-      <box id="preview-image-box" valign="middle" autostretch="never">
+    <groupbox style="padding: 4px">
+      <hbox id="preview-image-box" valign="middle" autostretch="never">
         <spring flex="1"/>
         <html id="preview-image-holder"/>
         <spring flex="1"/>
-      </box>
-      <box id="PreviewSize" orient="vertical" collapsed="true">
+      </hbox>
+      <vbox id="PreviewSize" collapsed="true">
         <spring flex="1"/>
         <text class="label" value="&actualSize.label;"/>
-        <box orient="horizontal">
+        <hbox>
           <text class="label" value="&widthEditField.label;"/>
           <spring flex="1"/>
           <text id="PreviewWidth" class="label"/>
-        </box>
-        <box orient="horizontal">
+        </hbox>
+        <hbox>
           <text class="label" value="&heightEditField.label;"/>
           <spring flex="1"/>
           <text id="PreviewHeight" class="label"/>
-        </box>
+        </hbox>
         <spring flex="1"/>
-      </box>
-    </titledbox>
+      </vbox>
+    </groupbox>
     <spring flex="1"/>
     <!-- From EdDialogOverlay.xul -->
     <button id="AdvancedEditButton"/>
-  </box>
+  </hbox>
   <spring class="spacer"/>
   <!-- Area that shows and hides via MoreFewerButton --> 
-  <box id="MoreSection" orient="vertical" flex="1">
-    <box>
-      <box orient="vertical">
+  <vbox id="MoreSection" flex="1">
+    <hbox>
+      <vbox>
         <!-- //////// Image Dimensions //////// -->
-        <titledbox orient="vertical" flex="1">
+        <groupbox orient="vertical" flex="1">
           <label id="dimensionsLabel" value="&dimensionsBox.label;"/>
-          <box>
+          <hbox>
             <radiogroup id="imgSizeGroup" orient="vertical">
               <radio
                 group   = "imgSizeGroup"
@@ -148,15 +148,15 @@
                 oncommand = "doDimensionEnabling();" />
             </radiogroup>
             <spring flex="1"/>
-            <box orient="vertical">
+            <vbox>
               <spring flex="1"/>
               <!--////// CONSTRAIN DIMENSIONS //////-->
               <checkbox id="constrainCheckbox" label="&constrainCheckbox.label;"
                    oncommand="ToggleConstrain()"
                    tooltip="aTooltip" tooltiptext="&constrainCheckbox.tooltip;"/>
-            </box>
+            </vbox>
             <spring flex="1"/>
-          </box>
+          </hbox>
           <spring class="spacer"/>
           <grid class="big-left-margin">
             <columns><column/><column/><column flex="1"/></columns>
@@ -194,11 +194,11 @@
             </rows>          
           </grid>
           <spring flex="1"/>
-        </titledbox>
+        </groupbox>
         <!--////// IMAGE MAP BUTTONS //////-->
-        <titledbox orient="vertical" flex="1">
+        <groupbox orient="vertical" flex="1">
            <label id="imagemapLabel" value="&imagemapBox.label;"/>
-           <box flex="1" equalsize="always">
+           <hbox flex="1" equalsize="always">
 
 <!-- Hide Image Map Editor. Not ready for prime time yet
             <button
@@ -216,15 +216,15 @@
               label   = "&removeImageMapButton.label;"
               flex    = "1"/>
             <spring flex="1"/><!-- remove when we restore Image Map Editor -->
-            </box>
+            </hbox>
           <spring class="spacer"/>
-        </titledbox>
-      </box> <!-- vert. box on bottom left side -->
+        </groupbox>
+      </vbox> <!-- vert. box on bottom left side -->
 
       <!-- Bottom Right Region -->
-      <box orient="vertical" flex="1">
+      <vbox flex="1">
         <!--//////// Alignment ////////-->
-        <titledbox flex="1" orient="vertical">
+        <groupbox flex="1" orient="vertical">
           <label id="alignLabel" value="&alignment.label;"/>
           <spring class="spacer"/>
           <menulist id="alignTypeSelect" class="align-menu">
@@ -237,10 +237,10 @@
               <menuitem class="align-menu" value="left"  label="&wrapRightPopup.value;"/>
             </menupopup>
           </menulist>
-        </titledbox>
+        </groupbox>
 
         <!--//////// Borders and Spacing ////////-->
-        <titledbox flex="1">
+        <groupbox flex="1">
           <label id="spacingLabel" value="&spacingBox.label;"/>
           <grid>
             <columns><column/><column/><column/></columns>
@@ -288,19 +288,19 @@
               </row>
             </rows>
           </grid>
-        </titledbox>
-      </box> <!-- Bottom Right region -->
-    </box> <!-- The horizontal box -->
+        </groupbox>
+      </vbox> <!-- Bottom Right region -->
+    </hbox> <!-- The horizontal box -->
   
     <!-- buttons along bottom -->
     <spring class="spacer"/>
-    <box>
+    <hbox>
       <spring flex="1"/>
       <!-- From EdDialogOverlay -->
       <button id="AdvancedEditButton2"/>
-    </box>
-  </box> <!-- END OF MORE/FEWER SECTION -->
+    </hbox>
+  </vbox> <!-- END OF MORE/FEWER SECTION -->
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelHelpButtonsRight"/> 
+  <hbox id="okCancelHelpButtonsRight"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdInsSrc.xul b/editor/ui/dialogs/content/EdInsSrc.xul
index 30543a0741d0..d486643196b8 100644
--- a/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/editor/ui/dialogs/content/EdInsSrc.xul
@@ -46,19 +46,19 @@
   <keyset id="dialogKeys"/>
 
   <text class="label" id="srcMessage" value="&sourceEditField.label;"/>
-  <box orient="vertical" flex="1" style="width: 30em; height: 20em;">
+  <vbox flex="1" style="width: 30em; height: 20em;">
     <textbox id="srcInput" multiline="true" rows="1" style="width: 1em" flex="1"/>
-  </box>
+  </vbox>
   <!-- Will this accept the embedded HTML tags? -->
-  <box>
+  <hbox>
     <spring class="bigspacer"/>
     <text value="&example.label;"/>
     <text class="bold" value="&exampleOpenTag.label;"/>
     <text class="bold italic" value="&exampleText.label;"/>
     <text class="bold" value="&exampleCloseTag.label;"/>
-  </box>
+  </hbox>
   <spring class="spacer"/>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
-	<box id="okCancelButtons"/> 
+	<hbox id="okCancelButtons"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdInsertChars.xul b/editor/ui/dialogs/content/EdInsertChars.xul
index 5b86e7221b83..bd8f4973783f 100644
--- a/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/editor/ui/dialogs/content/EdInsertChars.xul
@@ -44,7 +44,7 @@
   <keyset id="dialogKeys"/>
   <broadcaster id="args" value=""/>
 
-  <titledbox orient="vertical"><label value="&category.label;"/>
+  <groupbox orient="vertical"><label value="&category.label;"/>
     <radiogroup id="CatGrp" orient="vertical" persist="category letter_index char_index">
       <radio group="CatGrp" id="AccentUpper" label="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio group="CatGrp" id="AccentLower" label="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
@@ -53,20 +53,20 @@
       <radio group="CatGrp" id="Symbol"      label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
     </radiogroup> 
     <spring class="spacer"/>
-  </titledbox>
-  <box>
-    <box orient="vertical" flex="1">
+  </groupbox>
+  <hbox>
+    <vbox flex="1">
       <!-- value is set in JS from editor.properties strings -->
       <text class="label" id="LatinL_Label" value="&letter.label;"/>
       <menulist class="larger" flex="1" id="LatinL" oncommand="SelectLatinLetter()"/>
-    </box>
-    <box orient="vertical" flex="1">
+    </vbox>
+    <vbox flex="1">
       <text class="label" id="LatinM_Label" value="&character.label;"/>
       <menulist class="larger" flex="1" id="LatinM" oncommand="SelectLatinModifier()"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
 
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/editor/ui/dialogs/content/EdInsertTable.xul b/editor/ui/dialogs/content/EdInsertTable.xul
index a0c01fa1c39c..79dfa3326801 100644
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/editor/ui/dialogs/content/EdInsertTable.xul
@@ -37,7 +37,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     persist="screenX screenY"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -48,7 +48,7 @@
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
-  <titledbox orient="vertical"><label value="&size.label;"/>
+  <groupbox orient="vertical"><label value="&size.label;"/>
     <grid>
       <columns><column/><column/><column/></columns>
       <rows>
@@ -71,16 +71,16 @@
       </rows>
     </grid>
     <spring class="spacer"/>
-  </titledbox>
+  </groupbox>
   <spring class="spacer"/>
-  <box valign="middle" autostretch="never">
+  <hbox valign="middle" autostretch="never">
     <text class="label align-right" text-align="right" value="&borderEditField.label;"
         tooltip="aTooltip" tooltiptext="&borderEditField.tooltip;" />
     <textbox class="narrow" id="borderInput" oninput="forceInteger(this.id)" />
     <text class="label" value="&pixels.label;"/>  
-  </box>
+  </hbox>
   <!-- from EdDialogOverlay -->
-  <box id="AdvancedEdit"/>
+  <hbox id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/> 
+  <hbox id="okCancelButtons"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/editor/ui/dialogs/content/EdLinkProps.xul
index 66b9d86e09bb..a729401f73fc 100644
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -46,24 +46,24 @@
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
 
-  <box orient="vertical" style="min-width: 20em">
-    <titledbox orient="vertical"><label id="linkTextCaption" align="left"/>
+  <vbox style="min-width: 20em">
+    <groupbox orient="vertical"><label id="linkTextCaption" align="left"/>
       <text class="label" id="linkTextMessage"/> 
 	    <textbox id="linkTextInput" flex="1" oninput="ChangeText()"/>
-    </titledbox>
+    </groupbox>
 
-    <titledbox orient="vertical"><label value="&LinkURLBox.label;"/>
+    <groupbox orient="vertical"><label value="&LinkURLBox.label;"/>
       <text class="label" value="&LinkURLEditField.label;"/>
-      <box autostretch="never" valign="middle">
+      <hbox autostretch="never" valign="middle">
         <textbox id="hrefInput" flex="1" style="min-width: 18em" oninput="ChangeLocation()"/>
         <button class="dialog" id="ChooseFile" flex="1"/>
-      </box>
+      </hbox>
       <html class="wrap" flex="1" id="RemoveLinkMsg" style="margin-bottom: 7px">&RemoveLinkMsg.label;</html>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <button class="dialog" id="MoreFewerButton" align="left" oncommand="onMoreFewer()" persist="more"/>
-      </box>
+      </hbox>
       <spring class="spacer"/>
-      <box id="MoreSection" orient="vertical">
+      <vbox id="MoreSection">
         <spring class="spacer"/>
         <text class="label" align="left" value="&NamedAnchorMsg.label;"/>
         <tree rows="4" class="list" id="NamedAnchorList" onselect="SelectNamedAnchor()">
@@ -75,11 +75,11 @@
           <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
         <text class="label" flex="1" value="&HeadingMsg2.label;"/>
-      </box>
-    </titledbox>
-  </box>
+      </vbox>
+    </groupbox>
+  </vbox>
   <!-- from EdDialogOverlay -->
-  <box id="AdvancedEdit"/>
+  <hbox id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelHelpButtonsRight"/> 
+  <hbox id="okCancelHelpButtonsRight"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdListProps.xul b/editor/ui/dialogs/content/EdListProps.xul
index 5fab32c569d9..d6e08d39435b 100644
--- a/editor/ui/dialogs/content/EdListProps.xul
+++ b/editor/ui/dialogs/content/EdListProps.xul
@@ -32,7 +32,7 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -43,7 +43,7 @@
   <broadcaster id="args" value=""/>
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
 
-  <titledbox orient="vertical" flex="1"><label value="&ListType.label;"/>
+  <groupbox orient="vertical" flex="1"><label value="&ListType.label;"/>
     <menulist id="ListType" oncommand="SelectListType()">
       <menupopup>
         <menuitem label="&none.value;"/>
@@ -56,25 +56,25 @@
       <radio group="RadioGroup" id="ChangeAll"      label="&changeEntireListRadio.label;"/>
       <radio group="RadioGroup" id="ChangeSelected" label="&changeSelectedRadio.label;"/>
     </radiogroup>
-  </titledbox>
+  </groupbox>
   <spring class="spacer"/>
 
   <!-- message text and list items are set in JS 
        text value should be identical to string with id=BulletStyle in editor.properties 
   -->
-  <titledbox orient="vertical" flex="1"><label id="BulletStyleLabel" value="&bulletStyle.label;"/>
+  <groupbox orient="vertical" flex="1"><label id="BulletStyleLabel" value="&bulletStyle.label;"/>
     <menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()"/>
     <spring class="spacer"/>
-    <box>
+    <hbox>
       <text class="label" id="StartingNumberLabel" value="&startingNumber.label;"/>
       <textbox class="narrow" id="StartingNumber" oninput="forceInteger(this.id)"/>
       <spring/>
-    </box>
+    </hbox>
     <html id="StartExample" class="wrap" flex="1" style="width: 1em">&startingHelp.label;</html>
-  </titledbox>
+  </groupbox>
   <!-- from EdDialogOverlay -->
-  <box id="AdvancedEdit"/>
+  <hbox id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/> 
+  <hbox id="okCancelButtons"/> 
 
 </window>
diff --git a/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 6a65dc1007ef..546f45aa2664 100644
--- a/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -52,8 +52,8 @@
              tooltip="aTooltip" tooltiptext="&nameInput.tooltip;"/>
   <spring class="spacer"/>
   <!-- from EdDialogOverlay -->
-  <box id="AdvancedEdit"/>
+  <hbox id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
-  <box id="okCancelButtons"/> 
+  <hbox id="okCancelButtons"/> 
 
 </window>
diff --git a/editor/ui/dialogs/content/EdPageProps.xul b/editor/ui/dialogs/content/EdPageProps.xul
index 96371a91bd08..3aa407c7155f 100644
--- a/editor/ui/dialogs/content/EdPageProps.xul
+++ b/editor/ui/dialogs/content/EdPageProps.xul
@@ -73,5 +73,5 @@
   <spring class="bigspacer"/>
   <html class="wrap" flex="1">&EditHEADSource.label;</html>
   <separator class="groove"/>
-  <box id="okCancelButtons"/> 
+  <hbox id="okCancelButtons"/> 
 </window>
diff --git a/editor/ui/dialogs/content/EdSpellCheck.xul b/editor/ui/dialogs/content/EdSpellCheck.xul
index 90b742326ab3..72e746070424 100644
--- a/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -59,10 +59,10 @@
       </row>
       <row valign="middle" autostretch="never">
         <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
-        <box valign="middle" autostretch="never" flex="1">
+        <hbox valign="middle" autostretch="never" flex="1">
           <textbox id="ReplaceWordInput" oninput="ChangeReplaceWord()"/>
           <button class="dialog" id="CheckWord" oncommand="CheckWord()" label="&checkwordButton.label;"/>
-        </box>
+        </hbox>
       </row>
     </rows>
   </grid>
@@ -77,7 +77,7 @@
             <treecol flex="1"/>
           </treecolgroup>
         </tree>
-        <box orient="vertical">
+        <vbox>
           <grid flex="1" autostretch="never">
             <columns><column class="spell-check" flex="1"/><column class="spell-check" flex="1"/></columns>
             <rows>
@@ -93,11 +93,11 @@
           </grid>
           <spring flex="1"/>
           <text class="label" value="&userDictionary.label;"/>
-          <box flex="1" autostretch="never">
+          <hbox flex="1" autostretch="never">
             <button class="dialog spell-check" id="AddToDictionary" oncommand="AddToDictionary()" label="&addToUserDictionaryButton.label;" />
             <button class="dialog spell-check" id="EditDictionary"  oncommand="EditDictionary()" label="&editUserDictionaryButton.label;"   />
-          </box>
-        </box>
+          </hbox>
+        </vbox>
       </row>
       <row>
         <text class="label" value ="&languagePopup.label;"/>
@@ -106,10 +106,10 @@
       <row>
         <menulist id="LanguageMenulist" oncommand="SelectLanguage()"/>
          <!-- contents are appended by JS -->
-        <box flex="1">
+        <hbox flex="1">
           <button class="dialog spell-check" id="Recheck" label="&recheckButton.label;" oncommand="Recheck()"/>
           <button class="dialog spell-check" id="Close"   label="&closeButton.label;"   oncommand="onClose()"/>
-        </box>
+        </hbox>
       </row>
     </rows>
   </grid>
diff --git a/editor/ui/dialogs/content/EdTableProps.xul b/editor/ui/dialogs/content/EdTableProps.xul
index a17f349d77b2..1c2f5e8dce76 100644
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/editor/ui/dialogs/content/EdTableProps.xul
@@ -55,8 +55,8 @@
     <tabpanels orient="vertical" id="TabPanels">
 
       <!-- TABLE PANEL -->
-      <box id="TablePanel" orient="vertical">
-        <titledbox><label value="&size.label;"/>
+      <vbox id="TablePanel">
+        <groupbox><label value="&size.label;"/>
           <grid>
             <columns><column/><column/></columns>
             <rows>
@@ -81,8 +81,8 @@
               </row>
             </rows>
           </grid>
-        </titledbox>
-        <titledbox orient="vertical"><label align="left" value="&tableBorderSpacing.label;"/>
+        </groupbox>
+        <groupbox orient="vertical"><label align="left" value="&tableBorderSpacing.label;"/>
         <grid>
           <columns><column/><column/><column/></columns>
           <rows>
@@ -103,9 +103,9 @@
             </row>
           </rows>
         </grid>
-        </titledbox>
+        </groupbox>
         <!-- Table Alignment and Caption -->
-        <box flex="1" valign="middle" autostretch="never">
+        <hbox flex="1" valign="middle" autostretch="never">
           <text class="label" value="&tableAlignment.label;"/>
           <menulist id="TableAlignList">
             <menupopup>
@@ -123,35 +123,35 @@
               <menuitem label="&tableCaptionBelow.label;" value="bottom"/>
             </menupopup>
           </menulist>
-        </box>
+        </hbox>
         <separator class="groove"/>
-        <box valign="middle" autostretch="never">
+        <hbox valign="middle" autostretch="never">
           <text class="label" value="&backgroundColor.label;"/>
           <stack>
             <button class="dialog color-button" oncommand="GetColorAndUpdate('tableBackgroundCW');"/>
-            <box autostretch="never" valign="middle" mousethrough="always">
+            <hbox autostretch="never" valign="middle" mousethrough="always">
               <spring flex="1"/>
               <spring id="tableBackgroundCW" class="color-well"/>
               <spring flex="1"/>
-            </box>
+            </hbox>
           </stack>
           <spring class="spacer"/>
           <text class="label" id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
-        </box>
+        </hbox>
         <separator class="groove"/>
-        <box flex="1" autostretch="never">
+        <hbox flex="1" autostretch="never">
           <spring flex="1"/>
           <!-- From EdDialogOvlerlay.xul -->
           <button class="dialog" id="AdvancedEditButton"/>
-        </box>
+        </hbox>
         <spring flex="1"/>
-      </box><!-- Table Panel -->
+      </vbox><!-- Table Panel -->
 
       <!-- CELL PANEL -->
-      <box id="CellPanel" orient="vertical">
-        <titledbox autostretch="never" valign="middle">
+      <vbox id="CellPanel">
+        <groupbox autostretch="never" valign="middle">
           <label value="&cellSelection.label;"/>
-          <box orient="vertical">
+          <vbox>
             <menulist id="SelectionList" oncommand="ChangeSelection(event.target.value)" flex="1">
               <menupopup>
                 <!-- JS code assumes order is Cell, Row, Column -->
@@ -160,20 +160,20 @@
                 <menuitem label="&cellSelectColumn.label;" value="3"/>
               </menupopup>
             </menulist>
-            <box flex="1">
+            <hbox flex="1">
               <button id="PreviousButton" class="dialog"             label="&cellSelectPrevious.label;" oncommand="MoveSelection(0)" flex="1"/>
               <button id="NextButton"     class="dialog align-right" label="&cellSelectNext.label;"     oncommand="MoveSelection(1)" flex="1"/>
-            </box>
-          </box>
+            </hbox>
+          </vbox>
           <spring class="bigspacer"/>
-          <box orient="vertical" flex="1">
+          <vbox flex="1">
             <text class="label" value="&applyBeforeChange1.label;"/>
             <text class="label" value="&applyBeforeChange2.label;"/>
-          </box>
-        </titledbox>
-        <box autostretch="never">
-          <!-- cell size titledbox -->
-          <titledbox><label align="left" value="&size.label;"/>
+          </vbox>
+        </groupbox>
+        <hbox autostretch="never">
+          <!-- cell size groupbox -->
+          <groupbox><label align="left" value="&size.label;"/>
             <grid>
               <columns><column/><column/><column/></columns>
               <rows>
@@ -192,9 +192,9 @@
               </rows>
             </grid>
             <spring class="bigspacer"/>
-          </titledbox>
+          </groupbox>
           <!-- Alignment -->
-          <titledbox><label value="&cellContentAlignment.label;"/>
+          <groupbox><label value="&cellContentAlignment.label;"/>
             <grid>
               <columns><column/><column/><column/></columns>
               <rows>
@@ -221,10 +221,10 @@
                 </row>
               </rows>
             </grid>
-          </titledbox>
-        </box>
+          </groupbox>
+        </hbox>
         <spring class="spacer"/>
-        <box valign="middle" autostretch="never">
+        <hbox valign="middle" autostretch="never">
           <checkbox id="CellStyleCheckbox" label="&cellStyle.label;"/>
           <menulist id="CellStyleList" oncommand="SetCheckbox('CellStyleCheckbox');">
             <menupopup>
@@ -240,36 +240,36 @@
               <menuitem label="&cellNoWrap.label;" value="nowrap"/>
             </menupopup>
           </menulist>
-        </box>
+        </hbox>
         <separator class="groove"/>
-        <box valign="middle" autostretch="never">
+        <hbox valign="middle" autostretch="never">
           <checkbox id="CellColorCheckbox" label="&backgroundColor.label;"/>
           <stack>
             <button class="dialog color-button" oncommand="GetColorAndUpdate('cellBackgroundCW');" flex="1"/>
-            <box autostretch="never" valign="middle" mousethrough="always">
+            <hbox autostretch="never" valign="middle" mousethrough="always">
               <spring flex="1"/>
               <spring id="cellBackgroundCW" class="color-well"/>
               <spring flex="1"/>
-            </box>
+            </hbox>
           </stack>
           <spring class="spacer"/>
           <text class="label" id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
-        </box>
+        </hbox>
         <separator class="groove"/>
-        <box autostretch="never">
+        <hbox autostretch="never">
           <html  class="wrap" flex="1" style="width: 1em">&cellUseCheckboxHelp.label;</html>
           <!-- From EdDialogOvlerlay.xul -->
           <button class="dialog" id="AdvancedEditButton2"/>
-        </box>
+        </hbox>
         <spring flex="1"/>
-      </box><!-- Cell Panel -->
+      </vbox><!-- Cell Panel -->
 
     </tabpanels> 
     <spring class="spacer"/>
     <!-- from EdDialogOverlay -->
-    <box>
+    <hbox>
       <spring flex="1"/>
-      <box id="okCancelHelpButtonsRight"/> 
-    </box>
+      <hbox id="okCancelHelpButtonsRight"/> 
+    </hbox>
   </tabbox>
 </window>
diff --git a/editor/ui/dialogs/content/EditConflict.xul b/editor/ui/dialogs/content/EditConflict.xul
index f066629a6db2..b3b3fc26e31a 100644
--- a/editor/ui/dialogs/content/EditConflict.xul
+++ b/editor/ui/dialogs/content/EditConflict.xul
@@ -49,17 +49,17 @@
   <spring class="bigspacer"/>
   <text class="label" value ="&conflictResolve.label;"/>
   <spring class="bigspacer"/>
-  <box flex="1">
+  <hbox flex="1">
     <spring class="bigspacer"/>
     <button class="dialog" label="&keepCurrentPageButton.label;"
             flex="1" oncommand="KeepCurrentPage()"/>
     <spring class="bigspacer"/>
-  </box>
-  <box flex="1">
+  </hbox>
+  <hbox flex="1">
     <spring class="bigspacer"/>
     <button class="dialog" label="&useOtherPageButton.label;"
             flex="1" oncommand="UseOtherPage()"/>
     <spring class="bigspacer"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/editor/ui/dialogs/content/EditorSaveAsCharset.xul b/editor/ui/dialogs/content/EditorSaveAsCharset.xul
index 90215340f063..e1250c6cad2a 100644
--- a/editor/ui/dialogs/content/EditorSaveAsCharset.xul
+++ b/editor/ui/dialogs/content/EditorSaveAsCharset.xul
@@ -48,23 +48,23 @@
     <broadcaster id="args" value=""/>
     <keyset id="dialogKeys"/>
 
-    <titledbox orient="vertical"><label align="left" value="&documentTitleTitle.label;"/>
+    <groupbox orient="vertical"><label align="left" value="&documentTitleTitle.label;"/>
         <!-- Text labels filled in from editor.properties -->
         <text id="EnterTitleLabel" class="label"/> 
         <textbox id="TitleInput" oninput="TitleChanged();"/>
         <html id="TitleHelp" class="label wrap" style="width:1em" />
-    </titledbox>
+    </groupbox>
 
-    <titledbox orient="vertical" flex="1"><label value="&documentCharsetTitle.label;"/>
+    <groupbox orient="vertical" flex="1"><label value="&documentCharsetTitle.label;"/>
         <text class="label" value="&documentCharsetDesc.label;"/>
         <tree class="list" id="CharsetTree" rows="7" flex="1" onselect="SelectCharset();">
             <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
-    </titledbox>
+    </groupbox>
 
     <checkbox id="ExportToText" label="&documentExportToText.label;" />
     <separator class="groove"/>
  
     <!-- from global dialogOverlay -->
-    <box id="okCancelButtons"/> 
+    <hbox id="okCancelButtons"/> 
 </window>
diff --git a/embedding/browser/chrome/content/mini-nav.xul b/embedding/browser/chrome/content/mini-nav.xul
index 1f509580af31..898b472ca7d6 100644
--- a/embedding/browser/chrome/content/mini-nav.xul
+++ b/embedding/browser/chrome/content/mini-nav.xul
@@ -34,7 +34,7 @@ Contributor(s): ______________________________________. -->
 <window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical"
+  orient="vertical"
   title="Embedding"
   onload="MiniNavStartup()"
   onunload="MiniNavShutdown()">
@@ -70,32 +70,32 @@ Contributor(s): ______________________________________. -->
        for embedding -->
   <toolbox>
     <toolbar id="nav-bar">
-      <box id="nav-bar-inner" autostretch="never" flex="1" style="min-width: 0px;">
+      <hbox id="nav-bar-inner" autostretch="never" flex="1" style="min-width: 0px;">
         <button id="back-button" crop="right" onclick="BrowserBack()" label="&backButton.label;"/>  
         <button id="forward-button" crop="right" onclick="BrowserForward()" label="&forwardButton.label;"/>  
         <button id="reload-button" crop="right" onclick="BrowserReload()" label="&reloadButton.label;"/>
         <button id="stop-button" crop="right" onclick="BrowserStop()" label="&stopButton.label;"/>
-        <box class="box-toolbar-group" flex="1">
-          <box autostretch="never" valign="middle" flex="1">
+        <hbox class="box-toolbar-group" flex="1">
+          <hbox autostretch="never" valign="middle" flex="1">
             <textbox autocomplete="true" timeout="300"
 		 	                 searchSessionType="urlbar" id="urlbar"
                        onkeypress="if( event.keyCode == 13 ) { BrowserLoadURL(); }"/>  
-          </box>
-        </box>
-      </box>
+          </hbox>
+        </hbox>
+      </hbox>
     </toolbar>
   </toolbox>
 
-  <box flex="1" >
-    <box id="appcontent" flex="100%">
+  <hbox flex="1" >
+    <hbox id="appcontent" flex="100%">
       <!-- this box is temporary, pending XBLified <browser> -->
-      <box id="browser" context="context" flex="1">
+      <hbox id="browser" context="context" flex="1">
         <!-- type attribute is used by frame construction to locate iframes
              intended to hold (html) content -->
         <browser context="context" type="content-primary" id="content"
                  src="about:blank" flex="1"/>
-      </box>
-    </box>
-  </box>
+      </hbox>
+    </hbox>
+  </hbox>
 
 </window>
diff --git a/embedding/browser/chrome/content/simple-shell.xul b/embedding/browser/chrome/content/simple-shell.xul
index aec897fea32e..0b60b8c339c3 100644
--- a/embedding/browser/chrome/content/simple-shell.xul
+++ b/embedding/browser/chrome/content/simple-shell.xul
@@ -25,22 +25,22 @@ Contributor(s): ______________________________________. -->
 <window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical"
+  orient="vertical"
   title="Embedding">
 
 <!-- attach the browser key set to the content window -->
 <keyset/>
 
-  <box flex="1" >
-    <box id="appcontent" flex="100%">
+  <hbox flex="1" >
+    <hbox id="appcontent" flex="100%">
       <!-- this box is temporary, pending XBLified <browser> -->
-      <box id="browser" context="context" flex="1">
+      <hbox id="browser" context="context" flex="1">
         <!-- type attribute is used by frame construction to locate iframes
              intended to hold (html) content -->
         <browser context="context" type="content-primary" id="content"
           src="about:blank" flex="1"/>
-      </box>
-    </box>
-  </box>
+      </hbox>
+    </hbox>
+  </hbox>
 
 </window>
diff --git a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul
index 95a283418647..181fee7c7a5f 100644
--- a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul
+++ b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul
@@ -42,7 +42,7 @@
         onload="dialog.initDialog()"
         style="width: 40em;"
         class="dialog"
-        align="vertical">
+        orient="vertical">
 
             
     <keyset id="dialogKeys"/>
@@ -60,44 +60,44 @@
       <separator orient="horizontal" class="thin"/>
       <radiogroup id="mode" orient="vertical" oncommand="dialog.toggleChoice()">
         <hbox flex="1">
-          <box autostretch="never" flex = "1">
+          <hbox autostretch="never" flex="1">
             <radio id="openUsing" flex="1"
                    group="mode"
                    label="&openUsing.label;"
                    accesskey="&openUsing.accesskey;"/>
-          </box>
+          </hbox>
                
-          <box class="indent" autostretch="never">
+          <hbox class="indent" autostretch="never">
             <button id="chooseApp"
                     class="dialog"
                     label="&chooseApp.label;"
                     accesskey="&chooseApp.accesskey;"
                     oncommand="dialog.chooseApp()"/>
-          </box>
+          </hbox>
         </hbox>
         <vbox>
-          <box autostretch="never">
+          <hbox autostretch="never">
             <radio id="saveToDisk"
                        group="mode"
                        label="&saveToDisk.label;"
                        accesskey="&saveToDisk.accesskey;"/>
-          </box>
+          </hbox>
         </vbox>
       </radiogroup>
       <separator orient="horizontal" class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox id="alwaysAskMe" label="&alwaysAsk.label;" accesskey="&alwaysAsk.accesskey;"/>
-      </box>
+      </hbox>
     </vbox>
 
     <separator class="groove"/>
 
-    <box>
+    <hbox>
       <button class="dialog" id="default.set" label="&default.set.label;" accesskey="&default.set.accesskey;"
         oncommand="dialog.setDefault()"/>
       <spring flex="1"/>
-      <box id="okCancelButtonsRight"/>
-    </box>
+      <hbox id="okCancelButtonsRight"/>
+    </hbox>
            
     <!-- Localizable strings (from .dtd) -->
     <strings style="display:none;">
diff --git a/extensions/cookie/resources/content/pref-cookies.xul b/extensions/cookie/resources/content/pref-cookies.xul
index f149375397e7..52743755e373 100644
--- a/extensions/cookie/resources/content/pref-cookies.xul
+++ b/extensions/cookie/resources/content/pref-cookies.xul
@@ -59,9 +59,9 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
+  <hbox class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&cookiePolicy.label;"/>
 
     <html>&cookieDetails;</html>
@@ -79,22 +79,22 @@
 
     <separator/>
 
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
                 pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
                 prefattribute="checked"/>
-    </box>
+    </hbox>
 
     <separator/>
 
-    <box autostretch="never" halign="right">
+    <hbox autostretch="never" halign="right">
       <button class="dialog" label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"
               id="viewCookieButton" pref="true" preftype="bool"
               prefstring="pref.advanced.cookies.disable_button.view_cookies" prefattribute="disabled"/>
       <button class="dialog" label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"
               id="moreInformation" pref="true" preftype="bool"
               prefstring="pref.advanced.cookies.disable_button.more_info" prefattribute="disabled"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/cookie/resources/content/pref-images.xul b/extensions/cookie/resources/content/pref-images.xul
index 02c432faf071..7153b9db2f3a 100644
--- a/extensions/cookie/resources/content/pref-images.xul
+++ b/extensions/cookie/resources/content/pref-images.xul
@@ -75,9 +75,9 @@
 
   <broadcaster id="haveImageBlocking" hidden="true"/>
 
-  <box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
+  <hbox class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
 
-  <titledbox orient="vertical" id="imagesArea">
+  <groupbox orient="vertical" id="imagesArea">
     <label value="&imageBlocking.label;"/>
 
     <html>&imageDetails;</html>
@@ -99,25 +99,25 @@
 
     <separator observes="haveImageBlocking"/>
 
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="networkImageWarnAboutImages" label="&warnAboutImages.label;"
                 accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
                 pref="true" preftype="bool" prefattribute="checked"
                 prefstring="network.image.warnAboutImages"/>
-    </box>
+    </hbox>
 
     <separator observes="haveImageBlocking"/>
 
-    <box autostretch="never" halign="right">
+    <hbox autostretch="never" halign="right">
       <button class="dialog" id="viewImages" label="&viewImages.label;"
               accesskey="&viewImages.accesskey;" oncommand="viewImages();"
               observes="haveImageBlocking"
               pref="true" preftype="bool"
               prefstring="pref.advanced.images.disable_button.view_image" prefattribute="disabled"/>
-    </box>
+    </hbox>
 
-  </titledbox>
-  <titledbox orient="vertical">
+  </groupbox>
+  <groupbox orient="vertical">
     <label value="&animLoopingTitle.label;"/>
     <radiogroup id="imageLooping" orient="vertical" autostretch="never"
                 pref="true" preftype="string" prefstring="image.animation_mode"
@@ -129,6 +129,6 @@
         <radio group="imageLooping" value="none" label="&animLoopNever.label;"
                accesskey="&animLoopNever.accesskey;"/>
     </radiogroup>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/cview/resources/content/cview.xul b/extensions/cview/resources/content/cview.xul
index 9b3b3fac7771..b2f55ada252d 100644
--- a/extensions/cview/resources/content/cview.xul
+++ b/extensions/cview/resources/content/cview.xul
@@ -40,7 +40,7 @@
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns:xpcom="http://www.mozilla.org/NC-xpcom#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical" onload="onLoad();" onunload="onUnload();"
+        orient="vertical" onload="onLoad();" onunload="onUnload();"
         persist="width height" title="XPCOM Component Viewer">
 <!--
   note the xmlns:xpcom in the <window> tag, it's used in the <rule>s
@@ -120,8 +120,8 @@
     </menubar>
   </toolbox>
 
-  <box id="outer-box" flex="1">
-    <box id="component-box" align="vertical" flex="1" width="50%">
+  <hbox id="outer-box" flex="1">
+    <vbox id="component-box" flex="1" width="50%">
     <text id="component-label" value="Components..." crop="right"
       autostretch="never"/>
 <!--
@@ -190,13 +190,13 @@
         </treerow>
       </treehead>
     </tree>
-    </box>
+    </vbox>
 
-    <splitter id="main-splitter" align="vertical" collapse="before">
+    <splitter id="main-splitter" orient="vertical" collapse="before">
       <grippy/>
     </splitter>
 
-    <box id="interface-box" align="vertical" flex="1" width="50%">
+    <vbox id="interface-box" flex="1" width="50%">
     <text id="interface-label" value="Interfaces..." crop="right"
       autostretch="never"/>
     <tree id="interface-list" container="true" datasources="rdf:null" flex="1"
@@ -245,7 +245,7 @@
         </treerow>
       </treehead>
     </tree>
-    </box>
+    </vbox>
 
-  </box>
+  </hbox>
 </window>
diff --git a/extensions/help/resources/content/help.xul b/extensions/help/resources/content/help.xul
index 44704a38bd0c..07c055bb6a21 100644
--- a/extensions/help/resources/content/help.xul
+++ b/extensions/help/resources/content/help.xul
@@ -24,7 +24,7 @@
 
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
-  <box orient="vertical" flex="1">
+  <vbox flex="1">
 
     <!-- button bar -->
     <toolbox id="help-toolbox" class="toolbox-top" deferattached="true">
@@ -64,16 +64,16 @@
     <separator class="groovy-thin"/>
 
     <!-- the two help panes (sidebar & content) -->
-    <box flex="1">
+    <hbox flex="1">
 
-      <box id="helpsidebar-box" orient="vertical">
+      <vbox id="helpsidebar-box">
 
-        <box orient="vertical" id="help-subset">
+        <vbox id="help-subset">
           <!-- these we will want to clean up or style better -->
 	  <text value="&t1.label;"/>
           <text value="&t2.label;"/>
           <text value="&t3.label;"/>
-        </box>
+        </vbox>
 
         <tabbox orient="vertical" flex="1">
           <tabs orient="horizontal">
@@ -81,7 +81,7 @@
             <tab label="&tab2.label;"/>
           </tabs>
           <tabpanels flex="1">
-            <box id="help-toc">
+            <hbox id="help-toc">
               <tree id="help-toc-tree" ref="urn:root" flex="1*"
                     datasources="chrome://help/locale/help-toc.rdf"
                     containment="http://home.netscape.com/NC-rdf#subheadings">
@@ -127,17 +127,17 @@
                 <treechildren flex="1*"/>
 
               </tree>
-            </box>
+            </hbox>
 
-            <box id="help-index">
+            <hbox id="help-index">
               <!-- right now this makes the toc as wide as the content area -->
               <iframe flex="1" style="min-width: 0px; width: 0px;" 
 		src="chrome://help/locale/help_index.html" />
-            </box>
+            </hbox>
 
           </tabpanels>
         </tabbox>
-      </box>
+      </vbox>
 
       <splitter id="helpsidebar-splitter"
                 collapse="before"
@@ -149,15 +149,15 @@
       </splitter>
 
       <!-- this stuff lifted from navigator.xul -->
-      <box id="appcontent" align="vertical" flex="3">
+      <vbox id="appcontent" flex="3">
         <!-- this box is temporary, pending XBLified <browser> -->
-        <box id="browser" flex="1">
+        <hbox id="browser" flex="1">
           <!-- type attribute is used by frame construction to locate iframes
                intended to hold (html) content -->
           <browser context="context" type="content-primary" id="help-content"
                    src="about:blank" flex="1"/>
-        </box>
-      </box>
-    </box>
-  </box>
+        </hbox>
+      </vbox>
+    </hbox>
+  </vbox>
 </window>
diff --git a/extensions/inspector/resources/content/inspector.xul b/extensions/inspector/resources/content/inspector.xul
index eb25c7cc8046..f6249ce5bac8 100644
--- a/extensions/inspector/resources/content/inspector.xul
+++ b/extensions/inspector/resources/content/inspector.xul
@@ -35,9 +35,9 @@
     <toolbar id="tbInspectorPrimary"/>
   </toolbox>
 
-  <box id="bxInspectorMain" flex="1"/>
+  <hbox id="bxInspectorMain" flex="1"/>
   
-  <box id="bxStatus"/>
+  <hbox id="bxStatus"/>
 </window>
 
         
diff --git a/extensions/inspector/resources/content/inspectorOverlay.xul b/extensions/inspector/resources/content/inspectorOverlay.xul
index 114d7fab0db9..c0c3c909c2f8 100644
--- a/extensions/inspector/resources/content/inspectorOverlay.xul
+++ b/extensions/inspector/resources/content/inspectorOverlay.xul
@@ -28,49 +28,49 @@
   <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchTreeBuilder.js"/>
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
 
-  <box id="bxInspectorMain" orient="vertical">
+  <vbox id="bxInspectorMain">
 
-    <box id="bxInspectorPanes" orient="horizontal" flex="1" hide="true">
-      <box id="bxDocPane" class="viewer-pane" flex="1" orient="vertical">
-        <box id="bxDocHeader" class="viewer-pane-header" autostretch="never">
+    <hbox id="bxInspectorPanes" flex="1" hide="true">
+      <vbox id="bxDocPane" class="viewer-pane" flex="1">
+        <hbox id="bxDocHeader" class="viewer-pane-header" autostretch="never">
           <menubutton class="viewer-list" ins-role="viewer-list" disabled="true"/>
           <text class="viewer-title" ins-role="viewer-title" flex="1"/>
           <menubutton class="viewer-menu" ins-role="viewer-menu" disabled="true"/>
-        </box>
+        </hbox>
         <iframe id="ifDocViewer" class="viewer-iframe" flex="1" ins-role="viewer-iframe"/>
-      </box>
+      </vbox>
       
       <splitter orient="vertical" collapse="before">
         <grippy/>
       </splitter>
 
-      <box id="bxObjectPane" class="viewer-pane" flex="1" orient="vertical">
-        <box id="bxObjHeader" class="viewer-pane-header" autostretch="never">
+      <vbox id="bxObjectPane" class="viewer-pane" flex="1">
+        <hbox id="bxObjHeader" class="viewer-pane-header" autostretch="never">
           <menubutton class="viewer-list" ins-role="viewer-list" disabled="true"/>
           <text class="viewer-title" ins-role="viewer-title" flex="1"/>
           <menubutton class="viewer-menu" ins-role="viewer-menu" disabled="true"/>
-        </box>
+        </hbox>
         <iframe id="ifObjViewer" class="viewer-iframe" flex="1" ins-role="viewer-iframe"/>
-      </box>
-    </box>
+      </vbox>
+    </hbox>
 
     <splitter id="splBrowser" class="titled-splitter" 
         onopen="inspector.onSplitterOpen(this)"
         value="Browser" closebutton="true" collapse="after"/>
-    <box id="bxBrowser" flex="1">
+    <hbox id="bxBrowser" flex="1">
       <browser id="ifBrowser" type="content-primary" flex="1" src="about:blank"/>
-    </box>
+    </hbox>
 
     <splitter id="splSearch" class="titled-splitter" 
         onopen="inspector.onSplitterOpen(this)"
         value="Search Results" closebutton="true" collapse="after"/>
-    <box id="bxSearch" orient="vertical">
+    <vbox id="bxSearch">
       <tree id="trSearch" flex="1" context="ppSearchResults" datasources="rdf:null">
         <template/>
       </tree>
     
       <!-- TEMPORARY UNTIL FIX FOR 54237 -->
       <browser id="inSearchServiceLoader" height="1"/>
-    </box>
-  </box>
+    </vbox>
+  </vbox>
 </overlay>
diff --git a/extensions/inspector/resources/content/keysetOverlay.xul b/extensions/inspector/resources/content/keysetOverlay.xul
index 4d7b8a87b0f7..82bf3c546a4d 100644
--- a/extensions/inspector/resources/content/keysetOverlay.xul
+++ b/extensions/inspector/resources/content/keysetOverlay.xul
@@ -36,4 +36,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/prefs/pref-inspector.xul b/extensions/inspector/resources/content/prefs/pref-inspector.xul
index 6e5291606354..efebc44a4be3 100644
--- a/extensions/inspector/resources/content/prefs/pref-inspector.xul
+++ b/extensions/inspector/resources/content/prefs/pref-inspector.xul
@@ -28,12 +28,12 @@
 
   ]]/>
 
-  <box class="box-smallheader" title="&Inspector.label;"/>
+  <hbox class="box-smallheader" title="&Inspector.label;"/>
 
-  <box id="bxGeneralPrefs">
-    <titledbox>
+  <hbox id="bxGeneralPrefs">
+    <groupbox>
       <label value="Element Blinking"/>
-      <box orient="vertical">
+      <vbox>
         <grid>
           <columns>
             <column/>
@@ -42,42 +42,42 @@
           <rows>
             <row autostretch="never">
               <text value="Border Color"/>
-              <box autostretch="never">
+              <hbox autostretch="never">
                 <colorpicker id="cprElBorderColor" type="button"
                   pref="true" preftype="color" prefstring="inspector.blink.border-color" prefattribute="color"/>
-              </box>
+              </hbox>
             </row>
             <row autostretch="never">
               <text value="Border Width"/>
-              <box autostretch="never">
+              <hbox autostretch="never">
                 <textbox id="txfElBorderWidth" style="width: 4em"
                   pref="true" preftype="int" prefstring="inspector.blink.border-width" prefattribute="value"/>
                 <text value="(px)"/>
-              </box>
+              </hbox>
             </row>
             <row autostretch="never">
               <text value="Blink Duration"/>
-              <box autostretch="never">
+              <hbox autostretch="never">
                 <textbox id="txfElDuration" style="width: 4em"
                   pref="true" preftype="int" prefstring="inspector.blink.duration" prefattribute="value"/>
                 <text value="(s)"/>
-              </box>
+              </hbox>
             </row>
             <row autostretch="never">
               <text value="Blink Speed"/>
-              <box autostretch="never">
+              <hbox autostretch="never">
                 <textbox id="txfElSpeed" style="width: 4em"
                   pref="true" preftype="int" prefstring="inspector.blink.speed" prefattribute="value"/>
                 <text value="(ms)"/>
-               </box>
+               </hbox>
             </row>
           </rows>
         </grid>
-        <box autostretch="never">
+        <hbox autostretch="never">
           <checkbox id="cbElOn" label="Blink Selected Element"
               pref="true" preftype="bool" prefstring="inspector.blink.on" prefattribute="checked"/>
-        </box>
-      </box>
-    </titledbox>
-  </box>
+        </hbox>
+      </vbox>
+    </groupbox>
+  </hbox>
 </window>
diff --git a/extensions/inspector/resources/content/prefs/pref-sidebar.xul b/extensions/inspector/resources/content/prefs/pref-sidebar.xul
index eb349389ac32..aab133949687 100644
--- a/extensions/inspector/resources/content/prefs/pref-sidebar.xul
+++ b/extensions/inspector/resources/content/prefs/pref-sidebar.xul
@@ -12,15 +12,15 @@
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
   <script type="application/x-javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
 
-  <box class="box-smallheader" title="&Sidebar.label;"/>
+  <hbox class="box-smallheader" title="&Sidebar.label;"/>
 
-  <box id="bxSidebarPrefs">
-    <box id="bxSidebarInstalled" collapsed="true" flex="1">
+  <hbox id="bxSidebarPrefs">
+    <hbox id="bxSidebarInstalled" collapsed="true" flex="1">
       <text value="The sidebar panel is currently installed."/>
-    </box>
-    <box id="bxSidebarNotInstalled" collapsed="true" flex="1" orient="vertical">
+    </hbox>
+    <vbox id="bxSidebarNotInstalled" collapsed="true" flex="1">
       <text value="The sidebar panel is not currently installed.  Click the 'Install' button to add it to your sidebar."/>
       <button label="Install" onclick="gSidebarPrefs.installSidebar()"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
 </window>
diff --git a/extensions/inspector/resources/content/prefs/prefs.xul b/extensions/inspector/resources/content/prefs/prefs.xul
index feaf3b697031..92ea30bd7e9e 100644
--- a/extensions/inspector/resources/content/prefs/prefs.xul
+++ b/extensions/inspector/resources/content/prefs/prefs.xul
@@ -18,5 +18,5 @@
     <tabpanels id="tabpanelsPrefs" flex="1"/>
   </tabbox>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 </window>
diff --git a/extensions/inspector/resources/content/prefs/prefsOverlay.xul b/extensions/inspector/resources/content/prefs/prefsOverlay.xul
index 9bb4fa794613..24206fbf3444 100644
--- a/extensions/inspector/resources/content/prefs/prefsOverlay.xul
+++ b/extensions/inspector/resources/content/prefs/prefsOverlay.xul
@@ -22,4 +22,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/search/modules/commandOverlay.xul b/extensions/inspector/resources/content/search/modules/commandOverlay.xul
index e1c94ca334c7..dcb6d84fe559 100644
--- a/extensions/inspector/resources/content/search/modules/commandOverlay.xul
+++ b/extensions/inspector/resources/content/search/modules/commandOverlay.xul
@@ -20,4 +20,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul b/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
index f00229b7dc2a..802cc25d1cc8 100644
--- a/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
+++ b/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
@@ -17,20 +17,20 @@
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
   
-  <box orient="vertical">
-    <box autostretch="never">
+  <vbox>
+    <hbox autostretch="never">
       <text id="txSearchFor" value="&txSearchFor.label;"/>
       <textbox id="txfSearchFor" style="width: 25em;" persist="true"/>
-    </box>
-    <box autostretch="never">
+    </hbox>
+    <hbox autostretch="never">
       <text id="txSearchPath" value="&txSearchPath.label;"/>
       <textbox id="txfSearchPath" style="width: 25em;" persist="true"/>
       <button id="btnSearchPathBrowser" label="Browse" onclick="dialog.browse()" persist="true"/>
-    </box>
-    <box autostretch="never">
+    </hbox>
+    <hbox autostretch="never">
       <checkbox id="cbRecurse" label="&cbRecurse.label;"/>
-    </box>    
-  </box>
+    </hbox>    
+  </vbox>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 </window>
diff --git a/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul b/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
index 3e3d46661c62..dcd77f225c59 100644
--- a/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
+++ b/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
@@ -17,23 +17,23 @@
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
 
-  <box orient="vertical">
+  <vbox>
     <html style="width: 400px">&junkImgsDescription;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text id="txSearchPath" value="Search Path:"/>
       <textbox id="txfSearchPath" flex="1" style="width: 25em;" persist="true"/>
       <button id="btnSearchPathBrowser" value="Browse" onclick="dialog.browse()"/>
-    </box>
+    </hbox>
     <!--
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text id="txRemotePath" value="Target URL:"/>
       <textbox id="txfRemotePath" flex="1" persist="true"/>
-    </box>
-    <box autostretch="never">
+    </hbox>
+    <hbox autostretch="never">
       <checkbox id="cbIsSkin" label="Target is a Skin" checked="true" persist="true"/>
-    </box>
+    </hbox>
     -->
-  </box>
+  </vbox>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 </window>
diff --git a/extensions/inspector/resources/content/search/modules/popupOverlay.xul b/extensions/inspector/resources/content/search/modules/popupOverlay.xul
index 2eae4edabb1e..03ac86741ab7 100644
--- a/extensions/inspector/resources/content/search/modules/popupOverlay.xul
+++ b/extensions/inspector/resources/content/search/modules/popupOverlay.xul
@@ -25,4 +25,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/sidebar/sidebar.xul b/extensions/inspector/resources/content/sidebar/sidebar.xul
index 40c9fca87e9e..a90ca8bbb328 100644
--- a/extensions/inspector/resources/content/sidebar/sidebar.xul
+++ b/extensions/inspector/resources/content/sidebar/sidebar.xul
@@ -43,23 +43,23 @@
       <tab label="Node"/>
     </tabs>
     <tabpanels flex="1">
-      <box id="bxDocPane" flex="1" orient="vertical">
-        <box id="bxDocHeader" autostretch="never">
+      <vbox id="bxDocPane" flex="1">
+        <hbox id="bxDocHeader" autostretch="never">
           <menubutton class="viewer-list" ins-role="viewer-list" disabled="true"/>
           <text class="viewer-title" ins-role="viewer-title" flex="1"/>
           <menubutton class="viewer-menu" ins-role="viewer-menu" disabled="true"/>
-        </box>
+        </hbox>
         <iframe id="ifDocViewer" class="viewer-iframe" flex="1" ins-role="viewer-iframe"/>
-      </box>
+      </vbox>
       
-      <box id="bxObjectPane" flex="1" orient="vertical">
-        <box id="bxObjHeader" autostretch="never">
+      <vbox id="bxObjectPane" flex="1">
+        <hbox id="bxObjHeader" autostretch="never">
           <menubutton class="viewer-list" ins-role="viewer-list" disabled="true"/>
           <text class="viewer-title" ins-role="viewer-title" flex="1"/>
           <menubutton class="viewer-menu" ins-role="viewer-menu" disabled="true"/>
-        </box>
+        </hbox>
         <iframe id="ifObjViewer" class="viewer-iframe" flex="1" ins-role="viewer-iframe"/>
-      </box>
+      </vbox>
     </tabpanels>
   </tabbox>
 </window>
diff --git a/extensions/inspector/resources/content/statusbarOverlay.xul b/extensions/inspector/resources/content/statusbarOverlay.xul
index d4e98a1cede7..7db58f701267 100644
--- a/extensions/inspector/resources/content/statusbarOverlay.xul
+++ b/extensions/inspector/resources/content/statusbarOverlay.xul
@@ -3,9 +3,9 @@
 <overlay id="ovStatusbar"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <box id="bxStatus">
+  <hbox id="bxStatus">
     <progressmeter id="pmStatus" mode="normal" value="0"/>
     <text id="txStatus" value="Ready"/>
-  </box>
+  </hbox>
 
 </overlay>
diff --git a/extensions/inspector/resources/content/tests/allskin.xul b/extensions/inspector/resources/content/tests/allskin.xul
index becf097b670a..cd8d23c34c45 100644
--- a/extensions/inspector/resources/content/tests/allskin.xul
+++ b/extensions/inspector/resources/content/tests/allskin.xul
@@ -79,4 +79,4 @@
 
 </window>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/toolboxOverlay.xul b/extensions/inspector/resources/content/toolboxOverlay.xul
index bebbbaf4cfac..83c49edb6488 100644
--- a/extensions/inspector/resources/content/toolboxOverlay.xul
+++ b/extensions/inspector/resources/content/toolboxOverlay.xul
@@ -51,17 +51,17 @@
 
   <toolbar id="tbInspectorPrimary">
 
-    <box id="bxURLBar" flex="1" autostretch="never" valign="middle">
+    <hbox id="bxURLBar" flex="1" autostretch="never" valign="middle">
       <text id="txDocument" class="toolbar-header1" value="&txDocument.label;"/>
-      <box id="bxURLBarContainer" flex="1">
-        <box autostretch="never" valign="middle" flex="1">
+      <hbox id="bxURLBarContainer" flex="1">
+        <hbox autostretch="never" valign="middle" flex="1">
           <image id="imgURLBarIcon"/>
 
           <textbox
             id="tfURLBar" class="plain" flex="1" 
             observes="cmdGotoURL"
             tooltip="PPTooltip" tooltiptext="Enter a URL to inspect"/>  
-        </box>
+        </hbox>
 
         <menubutton id="mbHistory" class="menubutton-icon">
 
@@ -87,10 +87,10 @@
           </menupopup>
 
         </menubutton>
-      </box>
+      </hbox>
 
       <button class="button-toolbar-3" label="&btnInspect.label;" observes="cmdGotoURL"/>
-    </box>
+    </hbox>
 
   </toolbar>
 
diff --git a/extensions/inspector/resources/content/utilWindow.xul b/extensions/inspector/resources/content/utilWindow.xul
index c8d20013a5e6..27b37ac8c4d7 100644
--- a/extensions/inspector/resources/content/utilWindow.xul
+++ b/extensions/inspector/resources/content/utilWindow.xul
@@ -8,13 +8,13 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
     <spring flex="1"/>
-    <box id="bxOuter" orient="horizontal" flex="1">
+    <hbox id="bxOuter" flex="1">
       <spring flex="1"/>
-      <box id="bxCenter" autostretch="never"/>
+      <hbox id="bxCenter" autostretch="never"/>
       <spring flex="1"/>
-    </box>
+    </hbox>
     <spring flex="1"/>
 
 </window>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul b/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul
index 08e64d0d1e20..b25813ba07ea 100644
--- a/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul
+++ b/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul
@@ -16,7 +16,7 @@
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
 
-  <box id="bxColumns" flex="1" orient="vertical"
+  <vbox id="bxColumns" flex="1"
     ondragdrop="dialog.onDragDropIn(event);"
     ondraggesture="dialog.onDragGesture(event);"/>
 </window>
diff --git a/extensions/inspector/resources/content/viewers/dom/commandOverlay.xul b/extensions/inspector/resources/content/viewers/dom/commandOverlay.xul
index 81d04a9dc41e..7adec1037a6f 100644
--- a/extensions/inspector/resources/content/viewers/dom/commandOverlay.xul
+++ b/extensions/inspector/resources/content/viewers/dom/commandOverlay.xul
@@ -27,4 +27,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/dom/findDialog.xul b/extensions/inspector/resources/content/viewers/dom/findDialog.xul
index cf306a66c2bc..4dcb0c951f3c 100644
--- a/extensions/inspector/resources/content/viewers/dom/findDialog.xul
+++ b/extensions/inspector/resources/content/viewers/dom/findDialog.xul
@@ -24,7 +24,7 @@
     <key id="kClose" keycode="VK_ESCAPE" observes="cmdClose"/>
   </keyset>
 
-  <box orient="vertical" autostretch="never">
+  <vbox autostretch="never">
     <grid>
       <columns>
         <column/>
@@ -41,27 +41,27 @@
         </row>
       </rows>
     </grid>
-    <box orient="horizontal" autostretch="never" style="vertical-align: top">
-      <titledbox id="tbxType">
+    <hbox autostretch="never" style="vertical-align: top">
+      <groupbox id="tbxType">
         <label value="Search By"/>
         <radiogroup id="rgType" orient="vertical">
           <radio id="rdType_id" label="ID" oncommand="dialog.toggleType('id')"/>
           <radio id="rdType_tag" label="Tag" oncommand="dialog.toggleType('tag')"/>
           <radio id="rdType_attr" label="Attribute" oncommand="dialog.toggleType('attr')"/>
         </radiogroup>
-      </titledbox>
-      <titledbox id="tbxDirection" hide="true">
+      </groupbox>
+      <groupbox id="tbxDirection" hide="true">
         <label value="Direction"/>
         <radiogroup id="rgDirection" orient="horizontal">
           <radio id="rdDir_up" label="Up"/>
           <radio id="rdDir_down" label="Down"/>
         </radiogroup>
-      </titledbox>
-    </box>
-  </box>
+      </groupbox>
+    </hbox>
+  </vbox>
 
-  <box orient="vertical">
+  <vbox>
     <button label="Find" observes="cmdFind" default="true"/>
     <button label="Close" observes="cmdClose"/>
-  </box>
+  </vbox>
 </window>
diff --git a/extensions/inspector/resources/content/viewers/dom/keysetOverlay.xul b/extensions/inspector/resources/content/viewers/dom/keysetOverlay.xul
index d734916592cf..3ebc1c78c253 100644
--- a/extensions/inspector/resources/content/viewers/dom/keysetOverlay.xul
+++ b/extensions/inspector/resources/content/viewers/dom/keysetOverlay.xul
@@ -12,4 +12,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/dom/popupOverlay.xul b/extensions/inspector/resources/content/viewers/dom/popupOverlay.xul
index 5b904e24ac6d..2f19beffb8aa 100644
--- a/extensions/inspector/resources/content/viewers/dom/popupOverlay.xul
+++ b/extensions/inspector/resources/content/viewers/dom/popupOverlay.xul
@@ -69,4 +69,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/styleRules/commandOverlay.xul b/extensions/inspector/resources/content/viewers/styleRules/commandOverlay.xul
index 48c9c9e37190..d30f9046edd5 100644
--- a/extensions/inspector/resources/content/viewers/styleRules/commandOverlay.xul
+++ b/extensions/inspector/resources/content/viewers/styleRules/commandOverlay.xul
@@ -10,4 +10,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/styleRules/keysetOverlay.xul b/extensions/inspector/resources/content/viewers/styleRules/keysetOverlay.xul
index d734916592cf..3ebc1c78c253 100644
--- a/extensions/inspector/resources/content/viewers/styleRules/keysetOverlay.xul
+++ b/extensions/inspector/resources/content/viewers/styleRules/keysetOverlay.xul
@@ -12,4 +12,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/styleRules/popupOverlay.xul b/extensions/inspector/resources/content/viewers/styleRules/popupOverlay.xul
index 8ecc343874a2..1441dd96f473 100644
--- a/extensions/inspector/resources/content/viewers/styleRules/popupOverlay.xul
+++ b/extensions/inspector/resources/content/viewers/styleRules/popupOverlay.xul
@@ -13,4 +13,4 @@
 
 </overlay>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul b/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
index 5e5597cbe906..238fba49a56c 100644
--- a/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
+++ b/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
@@ -43,7 +43,7 @@
 
   <!--============================= CONTENT ============================== -->
 
-  <box orient="vertical">
+  <vbox>
     <tree id="trStyleRules"
       flex="1" context="ppStyleRuleContext"
       onselect="viewer.onRuleSelect()"
@@ -99,7 +99,7 @@
 
       <treechildren flex="1"/>
     </tree>
-  </box>
+  </vbox>
 
   <splitter orient="horizontal" collapse="after">
     <grippy/>
diff --git a/extensions/irc/xul/content/chatzilla.xul b/extensions/irc/xul/content/chatzilla.xul
index 19971b72de92..fd1af8bcf0a0 100644
--- a/extensions/irc/xul/content/chatzilla.xul
+++ b/extensions/irc/xul/content/chatzilla.xul
@@ -35,7 +35,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical" onload="onLoad();" onunload="onUnload();"
+        orient="vertical" onload="onLoad();" onunload="onUnload();"
         onclose="return onClose();"
         persist="width height" windowtype="irc:chatzilla">
 
@@ -199,7 +199,7 @@
   
       </vbox> <!-- user-list-box -->
 
-      <splitter id="main-splitter" align="vertical" collapse="before"
+      <splitter id="main-splitter" orient="vertical" collapse="before"
         persist="collapsed left">
         <grippy/>
       </splitter>
diff --git a/extensions/irc/xul/content/pref-irc.xul b/extensions/irc/xul/content/pref-irc.xul
index 46a9f46ffeff..bdf8c0453026 100644
--- a/extensions/irc/xul/content/pref-irc.xul
+++ b/extensions/irc/xul/content/pref-irc.xul
@@ -26,14 +26,14 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
-        align="vertical" title="&window.title;"
+        orient="vertical" title="&window.title;"
         onload="if( parent.handle ) parent.handle.onpageload( 'pref-irc' ); else parent.queuedTag = 'pref-irc';">
 
-  <box class="header" align="horizontal">  
+  <hbox class="header">  
     <button class="left-header-text" label="&lHeader;"/>
     <spring class="header-spring" flex="1"/>
     <button class="right-header-text" label="&rHeader;"/>
-  </box>
+  </hbox>
 
 <html:fieldset style="width: 100%;">
 
diff --git a/extensions/irc/xul/tests/test3.xul b/extensions/irc/xul/tests/test3.xul
index 29ae3f9d4318..65fc6c689645 100644
--- a/extensions/irc/xul/tests/test3.xul
+++ b/extensions/irc/xul/tests/test3.xul
@@ -35,7 +35,7 @@ resource:///irc/tests/test3.xul
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical" onload="onLoad();" onunload="onUnload();">
+        orient="vertical" onload="onLoad();" onunload="onUnload();">
 
 <html:script src="resource:///irc/js/lib/utils.js"/>
 <html:script src="resource:///irc/js/lib/connection-xpcom.js"/>
@@ -98,21 +98,21 @@ resource:///irc/tests/test3.xul
   </toolbar>
 </toolbox>
 
-<box id="outer-box" align="vertical" flex="1">
-  <box id="inner-box" align="horizontal" flex="1">
+<vbox id="outer-box" flex="1">
+  <hbox id="inner-box" flex="1">
     <html:div id="quickList" class="quick-list" flex="0" width="150px">
     </html:div>
-    <splitter id="main-splitter" align="vertical" collapse="before"/>
-    <box align="vertical" flex="1">
+    <splitter id="main-splitter" orient="vertical" collapse="before"/>
+    <vbox flex="1">
       <html:iframe id="it-doesnt-matter-anyway" class="output-container"
        src="about:blank" flex="1"/>
     <!--
       <html:textarea id="input" class="input-window"/>
     -->
       <html:input type="text" id="input" class="input-window"/>
-    </box>
-  </box>
-</box>
+    </vbox>
+  </hbox>
+</vbox>
 
 <toolbox>
   <toolbar id="status-bar">
diff --git a/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul b/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul
index e241c9d71d3a..6c7ecb2bfb74 100644
--- a/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul
+++ b/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul
@@ -38,15 +38,15 @@
         title="&privacyInfo.title;"
         onload="Init()">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/P3PBadPrivacyInfo.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/P3PBadPrivacyInfo.js"/>
 
-  <box class="box-smallheader" title="&privacyinfo.header;"/>
+  <hbox class="box-smallheader" title="&privacyinfo.header;"/>
 
   <text class="header" value="&badpolicy.text;"/>
 
   <separator/>
-  <box flex="1">
+  <hbox flex="1">
     <tree id="privacyTree" flex="1" datasources="rdf:null" ref="NC:P3PPolicyRoot"
           containment="http://home.netscape.com/NC-rdf#P3PEntries">
 
@@ -115,13 +115,13 @@
         </rule>
       </template>
     </tree>
-  </box>
+  </hbox>
 
   <separator/>
-  <box align="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PInProgressInfo.xul b/extensions/p3p/resources/content/P3PInProgressInfo.xul
index 59ec3d29b9d5..3e2577e87d61 100644
--- a/extensions/p3p/resources/content/P3PInProgressInfo.xul
+++ b/extensions/p3p/resources/content/P3PInProgressInfo.xul
@@ -36,10 +36,10 @@
         title="&privacyInfo.title;"
         onload="Init()">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/P3PInProgressInfo.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/P3PInProgressInfo.js"/>
 
-  <box class="box-smallheader" title="&privacyinfo.header;"/>
+  <hbox class="box-smallheader" title="&privacyinfo.header;"/>
 
   <text class="header" value="&inprogress1.text;"/>
   <text class="header" value="&inprogress2.text;"/>
@@ -50,11 +50,11 @@
 
   <separator/>
   <spring flex="1"/>
-  <box align="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button id="refresh" value="&refreshButton.label;" onclick="doRefreshButton()"/>
     <button id="cancel"  value="&cancelButton.label;"  onclick="doCancelButton()"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul b/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul
index eb6a9787ace4..60afbc80fd9d 100644
--- a/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul
+++ b/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul
@@ -36,15 +36,15 @@
         title="&privacyInfo.title;"
         onload="Init()">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/P3PNoPrivacyInfo.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/P3PNoPrivacyInfo.js"/>
 
-  <box class="box-smallheader" title="&privacyinfo.header;"/>
+  <hbox class="box-smallheader" title="&privacyinfo.header;"/>
 
   <text class="header" value="&nopolicy.text;"/>
 
   <separator/>
-  <box flex="1">
+  <hbox flex="1">
     <tree id="privacyTree" flex="1" datasources="rdf:null" ref="NC:P3PPolicyRoot"
           containment="http://home.netscape.com/NC-rdf#P3PEntries">
 
@@ -113,14 +113,14 @@
         </rule>
       </template>
     </tree>
-  </box>
+  </hbox>
 
   <separator/>
   <spring flex="1"/>
-  <box align="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul b/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul
index 601ee60180ec..92fa7afdceaf 100644
--- a/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul
+++ b/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul
@@ -38,15 +38,15 @@
         title="&privacyInfo.title;"
         onload="Init()">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/P3PPartialPrivacyInfo.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/P3PPartialPrivacyInfo.js"/>
 
-  <box class="box-smallheader" title="&privacyinfo.header;"/>
+  <hbox class="box-smallheader" title="&privacyinfo.header;"/>
 
   <text class="header" value="&partialpolicy.text;"/>
 
   <separator/>
-  <box flex="1">
+  <hbox flex="1">
     <tree id="privacyTree" flex="1" datasources="rdf:null" ref="NC:P3PPolicyRoot"
           containment="http://home.netscape.com/NC-rdf#P3PEntries">
 
@@ -115,13 +115,13 @@
         </rule>
       </template>
     </tree>
-  </box>
+  </hbox>
 
   <separator/>
-  <box align="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul b/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul
index 3374111d0453..de2fde76e7b6 100644
--- a/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul
+++ b/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul
@@ -38,15 +38,15 @@
         title="&privacyInfo.title;"
         onload="Init()">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/P3PPrivacyMetInfo.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/P3PPrivacyMetInfo.js"/>
 
-  <box class="box-smallheader" title="&privacyinfo.header;"/>
+  <hbox class="box-smallheader" title="&privacyinfo.header;"/>
 
   <text class="header" value="&policymet.text;"/>
 
   <separator/>
-  <box flex="1">
+  <hbox flex="1">
     <tree id="privacyTree" flex="1" datasources="rdf:null" ref="NC:P3PPolicyRoot"
           containment="http://home.netscape.com/NC-rdf#P3PEntries">
 
@@ -115,13 +115,13 @@
         </rule>
       </template>
     </tree>
-  </box>
+  </hbox>
 
   <separator/>
-  <box align="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul b/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul
index da0a9ceef7d7..6f7c09f61c94 100644
--- a/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul
+++ b/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul
@@ -38,15 +38,15 @@
         title="&privacyInfo.title;"
         onload="Init()">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/P3PPrivacyNotMetInfo.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/P3PPrivacyNotMetInfo.js"/>
 
-  <box class="box-smallheader" title="&privacyinfo.header;"/>
+  <hbox class="box-smallheader" title="&privacyinfo.header;"/>
 
   <text class="header" value="&policynotmet.text;"/>
 
   <separator/>
-  <box flex="1">
+  <hbox flex="1">
     <tree id="privacyTree" flex="1" datasources="rdf:null" ref="NC:P3PPolicyRoot"
           containment="http://home.netscape.com/NC-rdf#P3PEntries">
 
@@ -115,13 +115,13 @@
         </rule>
       </template>
     </tree>
-  </box>
+  </hbox>
 
   <separator/>
-  <box align="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/pref-P3P.xul b/extensions/p3p/resources/content/pref-P3P.xul
index 7c719c0ce651..0ff2cd3ba65c 100644
--- a/extensions/p3p/resources/content/pref-P3P.xul
+++ b/extensions/p3p/resources/content/pref-P3P.xul
@@ -33,7 +33,7 @@
         title="&window.title;"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-P3P.xul');">
 
-  <script language="JavaScript">
+  <html:script type="application/x-javascript">
     <![CDATA[
       _elementIDs = ["P3PServiceEnabled",
 
@@ -182,15 +182,15 @@
     ]]>
   </script>
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/pref/prefutilities.js"/>
-  <html:script language="JavaScript" src="chrome://communicator/content/pref/pref-P3P.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/pref-P3P.js"/>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
   <!-- P3P Enable/Disable Box -->
-  <titledbox orient="vertical">
-    <title><text value="&service.label;"/></title>
+  <groupbox orient="vertical">
+    <label><text value="&service.label;"/></label>
     <checkbox id="P3PServiceEnabled"
               value="&enable.label;"
               oncommand="DoEnableService( )"
@@ -220,10 +220,10 @@
                 value="&warningposttonopolicy.label;"
                 class="indent"
                 pref="true" preftype="bool" prefstring="P3P.warningposttonopolicy" prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
-    <title><text value="&selection.label;"/></title>
+  <groupbox orient="vertical">
+    <label><text value="&selection.label;"/></label>
     <html>&selection.desc;</html>
     <radiogroup id="P3PLevel"
                 orient="vertical"
@@ -246,19 +246,19 @@
              value="&customlevel.label;"
              oncommand="DoMapLevel();"/>
       <separator/>
-      <box align="horizontal">
+      <hbox>
         <button id="customizebutton" value="&customize.label;"
                 accesskey="&custom.accesskey;"
                 oncommand="doCustomize();"/>
         <spring flex="1"/>
-      </box>
+      </hbox>
     </radiogroup>
-  </titledbox>
+  </groupbox>
 
-  <box orient="vertical" flex="1" hidden="true">
-    <box id="custombox" orient="vertical" flex="1">
-      <box orient="horizontal" flex="1">
-        <box orient="horizontal" flex="1">
+  <vbox flex="1" hidden="true">
+    <vbox id="custombox" flex="1">
+      <hbox flex="1">
+        <hbox flex="1">
           <tree id="categoryTree" flex="1"
                 onselect="var categoryTree = document.getElementById('categoryTree');
                           if (categoryTree) {
@@ -444,26 +444,26 @@
 
             </treechildren>
           </tree>
-        </box>
+        </hbox>
 
-        <box orient="vertical" flex="1">
+        <vbox flex="1">
           <deck id="purposeDeck" flex="1">
             <!-- deck index 0 -->
-            <box orient="vertical" style="width:100px" flex="1"/>
+            <vbox style="width:100px" flex="1"/>
 
             <!-- deck index 1 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superphysical.label;"/>
               <html>&superphysical.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 2 -->
-            <box orient="vertical" style="width:100px">>
+            <vbox style="width:100px">>
               <text class="header" value="physical"/>
               <html>&physical.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -471,8 +471,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PPhysicalAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.admin" prefattribute="checked"
                                   />
@@ -480,10 +480,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.physical.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PPhysicalDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.develop" prefattribute="checked"
                                   />
@@ -494,12 +494,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.physical.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PPhysicalCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.customization" prefattribute="checked"
                                   />
@@ -513,10 +513,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.physical.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PPhysicalCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.current" prefattribute="checked"
                                   />
@@ -527,35 +527,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.physical.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PPhysicalOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PPhysicalSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.physical.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 3 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="location"/>
               <html>&location.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -563,8 +563,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PLocationAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.location.admin" prefattribute="checked"
                                   />
@@ -572,10 +572,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.location.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PLocationDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.location.develop" prefattribute="checked"
                                   />
@@ -586,12 +586,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.location.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PLocationCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.location.customization" prefattribute="checked"
                                   />
@@ -605,10 +605,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.location.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PLocationCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.location.current" prefattribute="checked"
                                   />
@@ -619,41 +619,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.location.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PLocationOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.location.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PLocationSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.location.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 4 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superonline.label;"/>
               <html>&superonline.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 5 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="online"/>
               <html>&online.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -661,8 +661,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3POnlineAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.online.admin" prefattribute="checked"
                                   />
@@ -670,10 +670,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.online.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3POnlineDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.online.develop" prefattribute="checked"
                                   />
@@ -684,12 +684,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.online.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3POnlineCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.online.customization" prefattribute="checked"
                                   />
@@ -703,10 +703,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.online.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3POnlineCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.online.current" prefattribute="checked"
                                   />
@@ -717,41 +717,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.online.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3POnlineOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.online.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3POnlineSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.online.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 6 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superuserid.label;"/>
               <html>&superuserid.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 7 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="computer"/>
               <html>&computer.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -759,8 +759,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PComputerAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.admin" prefattribute="checked"
                                   />
@@ -768,10 +768,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.computer.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PComputerDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.develop" prefattribute="checked"
                                   />
@@ -782,12 +782,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.computer.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PComputerCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.customization" prefattribute="checked"
                                   />
@@ -801,10 +801,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.computer.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PComputerCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.current" prefattribute="checked"
                                   />
@@ -815,35 +815,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.computer.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PComputerOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PComputerSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.computer.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 8 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="state"/>
               <html>&state.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -851,8 +851,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PStateAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.state.admin" prefattribute="checked"
                                   />
@@ -860,10 +860,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.state.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PStateDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.state.develop" prefattribute="checked"
                                   />
@@ -874,12 +874,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.state.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PStateCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.state.customization" prefattribute="checked"
                                   />
@@ -893,10 +893,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.state.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PStateCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.state.current" prefattribute="checked"
                                   />
@@ -907,35 +907,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.state.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PStateOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.state.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PStateSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.state.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 9 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="uniqueid"/>
               <html>&uniqueid.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -943,8 +943,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PUniqueIDAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.admin" prefattribute="checked"
                                   />
@@ -952,10 +952,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PUniqueIDDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.develop" prefattribute="checked"
                                   />
@@ -966,12 +966,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PUniqueIDCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.customization" prefattribute="checked"
                                   />
@@ -985,10 +985,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PUniqueIDCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.current" prefattribute="checked"
                                   />
@@ -999,35 +999,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PUniqueIDOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PUniqueIDSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.uniqueid.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 10 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="government"/>
               <html>&government.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1035,8 +1035,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PGovernmentAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.government.admin" prefattribute="checked"
                                   />
@@ -1044,10 +1044,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.government.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PGovernmentDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.government.develop" prefattribute="checked"
                                   />
@@ -1058,12 +1058,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.government.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PGovernmentCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.government.customization" prefattribute="checked"
                                   />
@@ -1077,10 +1077,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.government.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PGovernmentCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.government.current" prefattribute="checked"
                                   />
@@ -1091,41 +1091,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.government.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PGovernmentOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.government.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PGovernmentSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.government.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 11 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superpurchase.label;"/>
               <html>&superpurchase.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 12 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="purchase"/>
               <html>&purchase.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1133,8 +1133,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PPurchaseAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.admin" prefattribute="checked"
                                   />
@@ -1142,10 +1142,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.purchase.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PPurchaseDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.develop" prefattribute="checked"
                                   />
@@ -1156,12 +1156,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.purchase.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PPurchaseCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.customization" prefattribute="checked"
                                   />
@@ -1175,10 +1175,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.purchase.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PPurchaseCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.current" prefattribute="checked"
                                   />
@@ -1189,41 +1189,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.purchase.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PPurchaseOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PPurchaseSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.purchase.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 13 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superpersonal.label;"/>
               <html>&superpersonal.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 14 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="financial"/>
               <html>&financial.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1231,8 +1231,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PFinancialAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.admin" prefattribute="checked"
                                   />
@@ -1240,10 +1240,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.financial.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PFinancialDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.develop" prefattribute="checked"
                                   />
@@ -1254,12 +1254,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.financial.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PFinancialCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.customization" prefattribute="checked"
                                   />
@@ -1273,10 +1273,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.financial.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PFinancialCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.current" prefattribute="checked"
                                   />
@@ -1287,35 +1287,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.financial.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PFinancialOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PFinancialSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.financial.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 15 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="health"/>
               <html>&health.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1323,8 +1323,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PHealthAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.health.admin" prefattribute="checked"
                                   />
@@ -1332,10 +1332,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.health.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PHealthDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.health.develop" prefattribute="checked"
                                   />
@@ -1346,12 +1346,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.health.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PHealthCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.health.customization" prefattribute="checked"
                                   />
@@ -1365,10 +1365,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.health.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PHealthCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.health.current" prefattribute="checked"
                                   />
@@ -1379,35 +1379,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.health.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PHealthOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.health.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PHealthSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.health.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 16 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="political"/>
               <html>&political.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1415,8 +1415,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PPoliticalAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.political.admin" prefattribute="checked"
                                   />
@@ -1424,10 +1424,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.political.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PPoliticalDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.political.develop" prefattribute="checked"
                                   />
@@ -1438,12 +1438,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.political.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PPoliticalCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.political.customization" prefattribute="checked"
                                   />
@@ -1457,10 +1457,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.political.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PPoliticalCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.political.current" prefattribute="checked"
                                   />
@@ -1471,41 +1471,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.political.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PPoliticalOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.political.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PPoliticalSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.political.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 17 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superhistory.label;"/>
               <html>&superhistory.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 18 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="navigation"/>
               <html>&navigation.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1513,8 +1513,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PNavigationAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.admin" prefattribute="checked"
                                   />
@@ -1522,10 +1522,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.navigation.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PNavigationDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.develop" prefattribute="checked"
                                   />
@@ -1536,12 +1536,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.navigation.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PNavigationCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.customization" prefattribute="checked"
                                   />
@@ -1555,10 +1555,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.navigation.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PNavigationCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.current" prefattribute="checked"
                                   />
@@ -1569,35 +1569,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.navigation.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PNavigationOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PNavigationSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.navigation.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 19 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="interactive"/>
               <html>&interactive.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1605,8 +1605,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PInteractiveAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.admin" prefattribute="checked"
                                   />
@@ -1614,10 +1614,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.interactive.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PInteractiveDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.develop" prefattribute="checked"
                                   />
@@ -1628,12 +1628,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.interactive.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PInteractiveCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.customization" prefattribute="checked"
                                   />
@@ -1647,10 +1647,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.interactive.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PInteractiveCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.current" prefattribute="checked"
                                   />
@@ -1661,41 +1661,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.interactive.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PInteractiveOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PInteractiveSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.interactive.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 20 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superdemographic.label;"/>
               <html>&superdemographic.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 21 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="demographic"/>
               <html>&demographic.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1703,8 +1703,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PDemographicAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.admin" prefattribute="checked"
                                   />
@@ -1712,10 +1712,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.demographic.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PDemographicDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.develop" prefattribute="checked"
                                   />
@@ -1726,12 +1726,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.demographic.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PDemographicCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.customization" prefattribute="checked"
                                   />
@@ -1745,10 +1745,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.demographic.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PDemographicCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.current" prefattribute="checked"
                                   />
@@ -1759,35 +1759,35 @@
                                   pref="true" preftype="bool" prefstring="P3P.demographic.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PDemographicOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PDemographicSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.demographic.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 22 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="preference"/>
               <html>&preference.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1795,8 +1795,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PPreferenceAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.admin" prefattribute="checked"
                                   />
@@ -1804,10 +1804,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.preference.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PPreferenceDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.develop" prefattribute="checked"
                                   />
@@ -1818,12 +1818,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.preference.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PPreferenceCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.customization" prefattribute="checked"
                                   />
@@ -1837,10 +1837,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.preference.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PPreferenceCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.current" prefattribute="checked"
                                   />
@@ -1851,41 +1851,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.preference.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PPreferenceOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PPreferenceSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.preference.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 23 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&supercontent.label;"/>
               <html>&supercontent.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 24 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="content"/>
               <html>&content.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1893,8 +1893,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3PContentAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.content.admin" prefattribute="checked"
                                   />
@@ -1902,10 +1902,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.content.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3PContentDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.content.develop" prefattribute="checked"
                                   />
@@ -1916,12 +1916,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.content.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3PContentCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.content.customization" prefattribute="checked"
                                   />
@@ -1935,10 +1935,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.content.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3PContentCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.content.current" prefattribute="checked"
                                   />
@@ -1949,41 +1949,41 @@
                                   pref="true" preftype="bool" prefstring="P3P.content.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3PContentOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.content.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3PContentSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.content.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
 
             <!-- deck index 25 -->
-            <box orient="vertical" style="width:100px" flex="1">
+            <vbox style="width:100px" flex="1">
               <text class="header" value="&superother.label;"/>
               <html>&superother.tip;</html>
-            </box>
+            </vbox>
 
             <!-- deck index 26 -->
-            <box orient="vertical" style="width:100px">
+            <vbox style="width:100px">
               <text class="header" value="other"/>
               <html>&other.tip;</html>
               <spring flex="1"/>
-              <titledbox orient="horizontal">
-                <title><text value="&purpose.label;" tooltip="purposetip"/></title>
+              <groupbox orient="horizontal">
+                <label><text value="&purpose.label;" tooltip="purposetip"/></label>
                 <grid>
                   <columns>
                     <column flex="1"/>
@@ -1991,8 +1991,8 @@
                   </columns>
                   <rows>
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&superadmin.label;" tooltip="superadmintip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superadmin.label;" tooltip="superadmintip"/></label>
                         <checkbox id="P3POtherAdmin" value="admin" tooltip="admintip"
                                   pref="true" preftype="bool" prefstring="P3P.other.admin" prefattribute="checked"
                                   />
@@ -2000,10 +2000,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.other.historical" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&superdevelopment.label;" tooltip="superdevelopmenttip"/></label>
                         <checkbox id="P3POtherDevelop" value="develop" tooltip="developtip"
                                   pref="true" preftype="bool" prefstring="P3P.other.develop" prefattribute="checked"
                                   />
@@ -2014,12 +2014,12 @@
                                   pref="true" preftype="bool" prefstring="P3P.other.individual-analysis" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <titledbox orient="vertical">
-                        <title><text value="&supercustomize.label;" tooltip="supercustomizetip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercustomize.label;" tooltip="supercustomizetip"/></label>
                         <checkbox id="P3POtherCustomization" value="customization" tooltip="customizationtip"
                                   pref="true" preftype="bool" prefstring="P3P.other.customization" prefattribute="checked"
                                   />
@@ -2033,10 +2033,10 @@
                                   pref="true" preftype="bool" prefstring="P3P.other.individual-decision" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
 
-                      <titledbox orient="vertical">
-                        <title><text value="&supercontact.label;" tooltip="supercontacttip"/></title>
+                      <groupbox orient="vertical">
+                        <label><text value="&supercontact.label;" tooltip="supercontacttip"/></label>
                         <checkbox id="P3POtherCurrent" value="current" tooltip="currenttip"
                                   pref="true" preftype="bool" prefstring="P3P.other.current" prefattribute="checked"
                                   />
@@ -2047,30 +2047,30 @@
                                   pref="true" preftype="bool" prefstring="P3P.other.telemarketing" prefattribute="checked"
                                   />
                         <spring flex="1"/>
-                      </titledbox>
+                      </groupbox>
                     </row>
 
                     <row flex="1">
-                      <box orient="vertical">
+                      <vbox>
                         <checkbox id="P3POtherOther-purpose" value="other-purpose" tooltip="other-purposetip"
                                   pref="true" preftype="bool" prefstring="P3P.other.other-purpose" prefattribute="checked"
                                   />
-                      </box>
+                      </vbox>
                     </row>
                   </rows>
                 </grid>
-              </titledbox>
+              </groupbox>
 
-              <titledbox orient="vertical">
-                <title><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></title>
+              <groupbox orient="vertical">
+                <label><text value="&sharingtitle.label;" tooltip="sharingtitletip"/></label>
                 <checkbox id="P3POtherSharing" value="&sharing.label;" tooltip="sharingtip"
                           pref="true" preftype="bool" prefstring="P3P.other.sharing" prefattribute="checked"
                           />
-              </titledbox>
-            </box>
+              </groupbox>
+            </vbox>
           </deck>
-        </box>
-      </box>
+        </vbox>
+      </hbox>
 
       <separator/>
       <checkbox id="showhelp" value="&showhelp.label;"/>
@@ -2279,6 +2279,6 @@
         </popup>
       </popupset>
 
-    </box>
-  </box>
+    </vbox>
+  </vbox>
 </window>
diff --git a/extensions/p3p/resources/content/pref-P3Pcust.xul b/extensions/p3p/resources/content/pref-P3Pcust.xul
index 12b6331b2b26..6f3535029f88 100644
--- a/extensions/p3p/resources/content/pref-P3Pcust.xul
+++ b/extensions/p3p/resources/content/pref-P3Pcust.xul
@@ -33,14 +33,14 @@
                 orient="vertical"
                 onload="Init();">
 
-  <html:script language="JavaScript" src="chrome://global/content/strres.js" />
-  <html:script language="JavaScript" src="chrome://communicator/content/pref/pref-P3P.js"/>
-  <html:script language="JavaScript" src="chrome://communicator/content/pref/pref-P3Pcust.js"/>
-  <html:script language="JavaScript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/pref-P3P.js"/>
+  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/pref-P3Pcust.js"/>
+  <html:script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
-  <box id="insertboxhere" orient="vertical" flex="1"/>
+  <vbox id="insertboxhere" flex="1"/>
 
   <separator class="groove"/>
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/extensions/p3p/resources/content/privacyOverlay.xul b/extensions/p3p/resources/content/privacyOverlay.xul
index 19074633b800..daaf8283e096 100644
--- a/extensions/p3p/resources/content/privacyOverlay.xul
+++ b/extensions/p3p/resources/content/privacyOverlay.xul
@@ -29,7 +29,7 @@
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript" src="chrome://communicator/content/privacyUI.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/privacyUI.js" />
 
   <statusbarpanel id="privacy-button" onclick="displayPrivacyInfo()" tooltip="aTooltip"/>
 
diff --git a/extensions/transformiix/resources/buster/buster.xul b/extensions/transformiix/resources/buster/buster.xul
index e6d5a4407dd6..8da3b7456846 100644
--- a/extensions/transformiix/resources/buster/buster.xul
+++ b/extensions/transformiix/resources/buster/buster.xul
@@ -27,12 +27,12 @@
         xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="loaderstuff()"
-        align="vertical">
-<script type="text/javascript" src="DiffDOM.js" />
-<script type="text/javascript" src="txTools.js" />
-<script type="text/javascript" src="xulTxTools.js" />
-<script type="text/javascript" src="DumpDOM.js" />
-<box align="horizontal">
+        orient="vertical">
+<script type="application/x-javascript" src="DiffDOM.js" />
+<script type="application/x-javascript" src="txTools.js" />
+<script type="application/x-javascript" src="xulTxTools.js" />
+<script type="application/x-javascript" src="DumpDOM.js" />
+<hbox>
   <button label="load tests" oncommand="refresh_xalan()" />
   <button label="check all" oncommand="check(true)" />
   <button label="uncheck all" oncommand="check(false)" />
@@ -40,14 +40,14 @@
   <button label="hide checked" oncommand="hide_checked(true)" />
   <button label="hide unchecked" oncommand="hide_checked(false)" />
   <button label="run checked tests" oncommand="dump_checked()" />
-</box>
-<box align="horizontal">
+</hbox>
+<hbox>
   <text value="Xalan base directory: " class="head" />
   <textbox id="xalan_base" persist="value"/>
   <button label="browse..." oncommand="browse_base_dir()" />
-</box>
-<box align="horizontal">
-<titledbox align="horizontal"><label value="search" />
+</hbox>
+<hbox>
+<groupbox orient="horizontal"><label value="search" />
   <button label="Search for " oncommand="select()"/>
   <textbox style="width: 10em;" id="search-name" persist="value" /><text value=" in " />
   <menulist id="search-field" persist="data">
@@ -57,14 +57,14 @@
       <menuitem value="3" label="Comment" />
     </menupopup>
   </menulist>
-</titledbox>
-<spring flex="1" /></box>
-<box align="horizontal"><titledbox align="horizontal"><label value="stats" />
+</groupbox>
+<spring flex="1" /></hbox>
+<hbox><groupbox orient="horizontal"><label value="stats" />
   <text value="tests run: "/><text id="tests_run" value="0" />
   <text value="  tests passed: "/><text id="tests_passed" value="0"/>
   <text value="  tests failed: "/><text id="tests_failed" value="0"/>
-</titledbox>  
-<spring flex="1" /></box>
+</groupbox>  
+<spring flex="1" /></hbox>
 
 <outliner id="out" flex="1">
   <outlinercol id="name" label="Name" flex="1"/>
diff --git a/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul b/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul
index d671e6428c60..03526421e197 100755
--- a/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul
+++ b/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul
@@ -34,19 +34,19 @@
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical" onload="onLoadTransformiix();">
+        orient="vertical" onload="onLoadTransformiix();">
 
 <script type="application/x-javascript" src="chrome://Transformiix/content/transformiix.js"/>
 <script type="application/x-javascript" src="resource:/res/samples/DumpDOM.js"/>
 
-<box id="tool-box" flex="1" align="horizontal">
-</box>
-<box flex="10" align="horizontal">
-   <box flex="50" align="vertical">
-     <iframe id="xml-source" class="doc-container" align="horizontal" src="about:blank" flex="1"/>
-    <iframe id="xsl-source" class="doc-container" align="horizontal" src="about:blank" flex="1"/>
-  </box>
-  <iframe id="result-doc" class="doc-container" align="vertical" src="about:blank" flex="50"/>
-</box>
+<hbox id="tool-box" flex="1">
+</hbox>
+<hbox flex="10">
+   <vbox flex="50">
+     <iframe id="xml-source" class="doc-container" orient="horizontal" src="about:blank" flex="1"/>
+    <iframe id="xsl-source" class="doc-container" orient="horizontal" src="about:blank" flex="1"/>
+  </vbox>
+  <iframe id="result-doc" class="doc-container" orient="vertical" src="about:blank" flex="50"/>
+</hbox>
 
 </window>
diff --git a/extensions/venkman/resources/content/tests/eval.xul b/extensions/venkman/resources/content/tests/eval.xul
index 5f04c09b2d60..2d36ff1c5da8 100644
--- a/extensions/venkman/resources/content/tests/eval.xul
+++ b/extensions/venkman/resources/content/tests/eval.xul
@@ -5,7 +5,7 @@
 
 <window
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  id="main-window" align="vertical" onclose="onClose();">
+  id="main-window" orient="vertical" onclose="onClose();">
 
   <script>
     <![CDATA[
diff --git a/extensions/venkman/resources/content/venkman.xul b/extensions/venkman/resources/content/venkman.xul
index f1dcad3541ae..ab316e00188f 100644
--- a/extensions/venkman/resources/content/venkman.xul
+++ b/extensions/venkman/resources/content/venkman.xul
@@ -44,7 +44,7 @@
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
-<window id="main-window" align="vertical"
+<window id="main-window" orient="vertical"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="console.onLoad();" onunload="return console.onUnload();"
diff --git a/extensions/vixen/resources/content/history/history.xul b/extensions/vixen/resources/content/history/history.xul
index 0b71cbdfba8c..2b685bc30385 100644
--- a/extensions/vixen/resources/content/history/history.xul
+++ b/extensions/vixen/resources/content/history/history.xul
@@ -80,4 +80,4 @@
   </tree>
   
 </window>      
-  
\ No newline at end of file
+  
diff --git a/extensions/vixen/resources/content/vfd/editBindingsTest.xul b/extensions/vixen/resources/content/vfd/editBindingsTest.xul
index 6ae8eb2ed097..2bcaf203eb2b 100644
--- a/extensions/vixen/resources/content/vfd/editBindingsTest.xul
+++ b/extensions/vixen/resources/content/vfd/editBindingsTest.xul
@@ -7,13 +7,13 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         orient="vertical">
   
-  <box moz-vixen="true" orient="vertical" flex="1">
-    <box><text value="Foopy" style="border: 1px solid green"/><spring flex="1"/></box>
-    <box><text value="Noopy" style="border: 1px solid green"/><spring flex="1"/></box>
-  </box>
-  <box moz-vixen="true" orient="vertical">
-    <box><text value="Foopy 2" style="border: 1px solid green"/><spring flex="1"/></box>
-    <box><text value="Noopy 2" style="border: 1px solid green"/><spring flex="1"/></box>
-  </box>
+  <vbox moz-vixen="true" flex="1">
+    <hbox><text value="Foopy" style="border: 1px solid green"/><spring flex="1"/></hbox>
+    <hbox><text value="Noopy" style="border: 1px solid green"/><spring flex="1"/></hbox>
+  </hbox>
+  <vbox moz-vixen="true">
+    <hbox><text value="Foopy 2" style="border: 1px solid green"/><spring flex="1"/></hbox>
+    <hbox><text value="Noopy 2" style="border: 1px solid green"/><spring flex="1"/></hbox>
+  </hbox>
  
-</window>        
\ No newline at end of file
+</window>        
diff --git a/extensions/vixen/resources/content/vfd/scratch.xul b/extensions/vixen/resources/content/vfd/scratch.xul
index a7e0685fe629..538cf078dc52 100644
--- a/extensions/vixen/resources/content/vfd/scratch.xul
+++ b/extensions/vixen/resources/content/vfd/scratch.xul
@@ -5,4 +5,4 @@
 <window id="scratch" orient="vertical" class="dialog" title="Untitled1"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-</window>        
\ No newline at end of file
+</window>        
diff --git a/extensions/vixen/resources/content/vfd/vfd.xul b/extensions/vixen/resources/content/vfd/vfd.xul
index a4b74c4b4311..e6639627a57c 100644
--- a/extensions/vixen/resources/content/vfd/vfd.xul
+++ b/extensions/vixen/resources/content/vfd/vfd.xul
@@ -30,4 +30,4 @@
   <iframe id="vfdDocument" name="vfdDocument" src="about:blank" style="width:0px;" flex="1"/>
 
 </window>      
-  
\ No newline at end of file
+  
diff --git a/extensions/vixen/resources/content/vfdScratch.xul b/extensions/vixen/resources/content/vfdScratch.xul
index f7368eb0156a..5975f278dd2e 100644
--- a/extensions/vixen/resources/content/vfdScratch.xul
+++ b/extensions/vixen/resources/content/vfdScratch.xul
@@ -33,12 +33,12 @@
 
   <tabbox id="scratchView" flex="1" orient="vertical">
     <tabpanels flex="1">
-      <box orient="vertical">
+      <vbox>
         <iframe name="vfView" id="vfView" flex="1"
                 style="overflow: auto;"
                 src="chrome://vixen/content/vfdScratchDocument.xul"/>
-      </box>
-      <box orient="vertical">
+      </vbox>
+      <vbox>
         <tree id="domTree" style="height: 0px; width: 0px;" flex="1">
           <treehead>
             <treerow>
@@ -60,15 +60,15 @@
             </treeitem>
           </treechildren>
         </tree> 
-        <box>
+        <hbox>
           <button class="button-toolbar" label="Insert Node"/>
           <button class="button-toolbar" label="Remove Node"/>
           <toolbarseparator/>
           <button class="button-toolbar" label="Add Attribute"/>
           <button class="button-toolbar" label="Remove Attribute"/>
           <spring flex="1"/>
-        </box>
-      </box>
+        </hbox>
+      </vbox>
     </tabpanels>
     <tabs>
       <tab label="Designer"/>
diff --git a/extensions/vixen/resources/content/vfdScratchDocument.xul b/extensions/vixen/resources/content/vfdScratchDocument.xul
index 399165758725..b4c6ec8002e6 100644
--- a/extensions/vixen/resources/content/vfdScratchDocument.xul
+++ b/extensions/vixen/resources/content/vfdScratchDocument.xul
@@ -32,4 +32,4 @@
         
 </window>
 
-        
\ No newline at end of file
+        
diff --git a/extensions/vixen/resources/content/vxKeysetOverlay.xul b/extensions/vixen/resources/content/vxKeysetOverlay.xul
index 3912405767b6..a9d114ab65bb 100644
--- a/extensions/vixen/resources/content/vxKeysetOverlay.xul
+++ b/extensions/vixen/resources/content/vxKeysetOverlay.xul
@@ -22,4 +22,4 @@
          
 </overlay>
 
-         
\ No newline at end of file
+         
diff --git a/extensions/wallet/cookieviewer/CookieViewer.xul b/extensions/wallet/cookieviewer/CookieViewer.xul
index eb5adf2be6fd..01debbb67fbb 100644
--- a/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -51,7 +51,7 @@
       <tab id="imagesTab" hidden="true" label="&tab.bannedimages.label;"/>
     </tabs>
     <tabpanels id="panel" flex="1">
-      <box class="tabpanel" id="system" flex="1" orient="vertical">
+      <vbox class="tabpanel" id="system" flex="1">
           <text class="label" value="&div.cookiesonsystem.label;"/>
           <separator class="thin"/>
           <tree id="cookietree" class="inset" style="height: 10em;"
@@ -76,7 +76,7 @@
             </treehead>
             <treechildren id="cookieList" flex="1"/>
           </tree>
-          <titledbox>
+          <groupbox>
             <label value="&treehead.infoselected.label;"/>
             <!-- labels -->
             <grid flex="1">
@@ -111,8 +111,8 @@
                 </row>
               </rows>
             </grid>
-          </titledbox>
-          <box>
+          </groupbox>
+          <hbox>
             <button id="removeCookies" class="dialog push" disabled="true"
                           label="&button.removecookie.label;"
                           oncommand="DeleteCookieSelected();"/>
@@ -120,14 +120,14 @@
                           label="&button.removeallcookies.label;"
                           oncommand="DeleteAllCookies();"/>
             <!--  todo: <button id="restoreCookies" class="dialog push" disabled="true" label="&button.restorecookie.label;" oncommand="RestoreCookies();"/> -->
-          </box>
+          </hbox>
           <separator class="thin"/>
-          <box autostretch="never">
+          <hbox autostretch="never">
             <checkbox id="checkbox" label="&checkbox.label;" />
-          </box>
-      </box>
+          </hbox>
+      </vbox>
       
-      <box class="tabpanel" id="servers" flex="1" orient="vertical">
+      <vbox class="tabpanel" id="servers" flex="1">
           <text class="label" value="&div.bannedservers.label;"/>
           <separator class="thin"/>
           <tree id="cookiepermissionstree" class="inset" flex="1"
@@ -150,17 +150,17 @@
             </treehead>
             <treechildren flex="1" id="cookiePermList"/>
           </tree>
-          <box>
+          <hbox>
             <button id="removePermissions" class="dialog push" disabled="true" 
                           label="&removepermission.label;" 
                           oncommand="DeleteCookiePermissionSelected();"/>
             <button id="removeAllPermissions" class="dialog push"
                           label="&removeallpermissions.label;" 
                           oncommand="DeleteAllCookiePermissions();"/>
-          </box>
-      </box>
+          </hbox>
+      </vbox>
 
-      <box class="tabpanel" id="images" hidden="true" flex="1" orient="vertical">
+      <vbox class="tabpanel" id="images" hidden="true" flex="1">
           <text class="label" value="&div.bannedimages.label;"/>
           <separator class="thin"/>
           <tree id="imagepermissionstree" class="inset" flex="1" style="height: 0px;"
@@ -183,20 +183,20 @@
             </treehead>
             <treechildren flex="1" id="imagePermList"/>
           </tree>
-          <box>
+          <hbox>
             <button id="removeImages" class="dialog push" disabled="true"
                           label="&removeimage.label;" 
                           oncommand="DeleteImagePermissionSelected();"/>
             <button id="removeAllImages" class="dialog push"
                           label="&removeallimages.label;" 
                           oncommand="DeleteAllImagePermissions();"/>
-          </box>
-      </box>
+          </hbox>
+      </vbox>
 
     </tabpanels>
   </tabbox>
   
   <separator class="thin"/>
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul b/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul
index ecc6b6b2182f..205b08fc605b 100644
--- a/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul
+++ b/extensions/wallet/cookieviewer/resources/content/CookieViewer.xul
@@ -1 +1 @@
-Dummy placeholder until these directories are hooked up correctly.
\ No newline at end of file
+Dummy placeholder until these directories are hooked up correctly.
diff --git a/extensions/wallet/editor/WalletAddress.xul b/extensions/wallet/editor/WalletAddress.xul
index c2848884761f..b117eb82c048 100644
--- a/extensions/wallet/editor/WalletAddress.xul
+++ b/extensions/wallet/editor/WalletAddress.xul
@@ -47,7 +47,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&address.title;"/>
     <grid class="indent" flex="1">
 
@@ -110,7 +110,7 @@
 
         <row>
           <html>&addressZipcode.label;</html>
-          <box>
+          <hbox>
           <menulist id="postalcode.prefix" editable="true" autoSelectMenuitem="false" flex="55%" width="0"
                     onchange="Append(this)">
             <menupopup>
@@ -124,7 +124,7 @@
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
@@ -162,6 +162,6 @@
 
     </grid>
 
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletConcatenated.xul b/extensions/wallet/editor/WalletConcatenated.xul
index ac48f658003f..35c579bf03e8 100644
--- a/extensions/wallet/editor/WalletConcatenated.xul
+++ b/extensions/wallet/editor/WalletConcatenated.xul
@@ -63,7 +63,7 @@
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatPrimary.title;"/>
     <grid class="indent" flex="1">
       <columns>
@@ -194,9 +194,9 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatShipping.title;"/>
     <grid class="indent">
       <columns>
@@ -327,9 +327,9 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatBilling.title;"/>
     <grid class="indent">
       <columns>
@@ -460,9 +460,9 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatOther.title;"/>label
     <grid class="indent">
       <columns>
@@ -513,6 +513,6 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletCredit.xul b/extensions/wallet/editor/WalletCredit.xul
index 4f4fbff18ae7..370319f0b264 100644
--- a/extensions/wallet/editor/WalletCredit.xul
+++ b/extensions/wallet/editor/WalletCredit.xul
@@ -46,7 +46,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&credit.title;"/>
     <grid class="indent" flex="1">
 
@@ -79,7 +79,7 @@
 
         <row>
           <html>&creditExpires.label;</html>
-          <box>
+          <hbox>
             <html>&creditExpiresMonth.label;</html>
             <menulist id="card.expdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -94,7 +94,7 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
@@ -109,6 +109,6 @@
        </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletEditor.xul b/extensions/wallet/editor/WalletEditor.xul
index 10a09522ee3e..dfd9c43b8da5 100644
--- a/extensions/wallet/editor/WalletEditor.xul
+++ b/extensions/wallet/editor/WalletEditor.xul
@@ -40,14 +40,14 @@
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <keyset id="dialogKeys"/>
            
-    <box id="system" flex="100%" orient="vertical">
+    <vbox id="system" flex="100%">
       <spring style="height: 7px;"/>
       <text class="label" value="&div.walletdataonsystem.label;"/>
       <separator orient="horizontal" class="groove"/>
       <spring style="height: 10px;"/>
-      <box id="system1" flex="100%" orient="horizontal">
+      <hbox id="system1" flex="100%">
         <spring style="width: 7px;"/>
-        <box orient="vertical">
+        <vbox>
           <text class="label" value="&treehead.schemaname.label;"/>
           <tree multiple="true" id="schematree" class="inset"
              style="height: 250px;" orient="vertical" onclick="ViewEntries();">
@@ -56,13 +56,13 @@
             </treecolgroup>
             <treechildren id="schemalist" flex="1"/>
           </tree>
-          <box orient="horizontal">
+          <hbox>
             <button id="removeSchema" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSchema();"/>
             <button id="addSchema" class="dialog push" disabled="false" label="&button.addschema.label;" oncommand="AddSchema();"/>
-          </box>
-        </box>
+          </hbox>
+        </vbox>
         <spring style="width: 7px;"/>
-        <box orient="vertical">
+        <vbox>
           <text class="label" id="entrytext" value2="&treehead.entries.label;" value3="&treehead.entries1.label;"/>
           <tree multiple="true" id="entrytree" class="inset"
             style="height: 113px;" orient="vertical" onclick="ViewSynonyms();">
@@ -80,27 +80,27 @@
             </treecolgroup>
             <treechildren flex="1" id="synonymslist"/>
           </tree>
-        </box>
+        </vbox>
         <spring style="width: 7px;"/>
-        <box orient="vertical">
+        <vbox>
           <spring style="height: 15px;"/>
           <button id="removeEntry" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteEntry();"/>
           <button id="addEntry" class="dialog push" disabled="false" label="&button.addentry.label;" oncommand="AddEntry();"/>
           <spring style="height: 93px;"/>
           <button id="removeSynonym" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSynonym();"/>
           <button id="addSynonym" class="dialog push" disabled="false" label="&button.addsynonym.label;" oncommand="AddSynonym();"/>
-        </box>
+        </vbox>
         <spring style="width: 7px;"/>
-      </box>
-    </box>
+      </hbox>
+    </vbox>
     <separator orient="horizontal" class="groove"/>
 
   <!-- from dialogOverlay.xul -->
   <spring style="height: 5px;"/>
-  <box orient="horizontal">
+  <hbox>
     <spring flex="100%"/>
-    <box id="okCancelButtons"/>
-  </box>
+    <hbox id="okCancelButtons"/>
+  </hbox>
   <spring style="height: 5px;"/>
 
 </window>
diff --git a/extensions/wallet/editor/WalletEmploy.xul b/extensions/wallet/editor/WalletEmploy.xul
index 6d23a27c1c8b..80c3cbfdcb2d 100644
--- a/extensions/wallet/editor/WalletEmploy.xul
+++ b/extensions/wallet/editor/WalletEmploy.xul
@@ -45,7 +45,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&employ.title;"/>
     <grid class="indent" flex="1">
 
@@ -89,6 +89,6 @@
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletMisc.xul b/extensions/wallet/editor/WalletMisc.xul
index 279905d40e8d..964e892a9b0c 100644
--- a/extensions/wallet/editor/WalletMisc.xul
+++ b/extensions/wallet/editor/WalletMisc.xul
@@ -48,7 +48,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&misc.title;"/>
     <grid class="indent" flex="1">
 
@@ -61,7 +61,7 @@
 
         <row>
           <html>&miscSS.label;</html>
-          <box>
+          <hbox>
             <menulist id="socsec.prefix" editable="true" autoSelectMenuitem="false" flex="33%" width="0"
                       onchange="Append(this)">
               <menupopup>
@@ -82,12 +82,12 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
           <html>&miscLicense.label;</html>
-          <box>
+          <hbox>
             <menulist id="license.number" editable="true" autoSelectMenuitem="false" flex="70" width="0"
                       onchange="Append(this)">
               <menupopup>
@@ -102,7 +102,7 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
@@ -117,7 +117,7 @@
 
         <row>
           <html>&miscBirthday.label;</html>
-          <box>
+          <hbox>
             <html>&miscBirthdayMonth.label;</html>
             <menulist id="bdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -139,12 +139,12 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
           <html>&miscAnniv.label;</html>
-          <box>
+          <hbox>
             <html>&miscAnnivMonth.label;</html>
             <menulist id="anniv.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -166,12 +166,12 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletName.xul b/extensions/wallet/editor/WalletName.xul
index dadb2464b866..1e0fd7895799 100644
--- a/extensions/wallet/editor/WalletName.xul
+++ b/extensions/wallet/editor/WalletName.xul
@@ -46,7 +46,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&name.title;"/>
     <grid class="indent" flex="1">
 
@@ -111,6 +111,6 @@
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletPhone.xul b/extensions/wallet/editor/WalletPhone.xul
index d6398c09a1b9..e9e28d0ae138 100644
--- a/extensions/wallet/editor/WalletPhone.xul
+++ b/extensions/wallet/editor/WalletPhone.xul
@@ -49,7 +49,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&phone.title;"/>
     <grid class="indent" flex="1">
 
@@ -209,6 +209,6 @@
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/WalletUrlspecific.xul b/extensions/wallet/editor/WalletUrlspecific.xul
index ff5c03ed4b68..2dec85f6acad 100644
--- a/extensions/wallet/editor/WalletUrlspecific.xul
+++ b/extensions/wallet/editor/WalletUrlspecific.xul
@@ -85,7 +85,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never" orient="vertical">
+  <groupbox class="tabpanel" autostretch="never" orient="vertical">
     <label value="&urlspecific.title;"/>
 
     <grid class="indent">
@@ -103,7 +103,7 @@
       </rows>
     </grid>
 
-    <box style="overflow: auto; height: 335px; width: 350px;">
+    <hbox style="overflow: auto; height: 335px; width: 350px;">
       <grid class="indent">
         <columns>
           <column width="115"/>
@@ -113,7 +113,7 @@
         <rows id="rows">
         </rows>
       </grid>
-    </box>
+    </hbox>
 
-  </titledbox>
+  </groupbox>
 </window>
diff --git a/extensions/wallet/editor/WalletViewer.xul b/extensions/wallet/editor/WalletViewer.xul
index 237ff2fbf8b6..787b2fb557b4 100644
--- a/extensions/wallet/editor/WalletViewer.xul
+++ b/extensions/wallet/editor/WalletViewer.xul
@@ -48,7 +48,7 @@
 
   <keyset id="dialogKeys"/>
 
-  <box flex="1">
+  <hbox flex="1">
     <!-- tree sidebar -->
     <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
 
@@ -59,10 +59,10 @@
       document.getElementById("panelFrame").setAttribute("tag", "" );
     ]]>
     </script>
-  </box>
+  </hbox>
 
   <separator/>
 
-  <box id="okCancelButtonsRight" />
+  <hbox id="okCancelButtonsRight" />
 
 </window>
diff --git a/extensions/wallet/editor/privacy.xul b/extensions/wallet/editor/privacy.xul
index 29da47efd399..e1ccd3d8f37b 100644
--- a/extensions/wallet/editor/privacy.xul
+++ b/extensions/wallet/editor/privacy.xul
@@ -66,10 +66,10 @@
 
   <!-- from dialogOverlay.xul -->
   <spring style="height: 5px;"/>
-  <box orient="horizontal">
+  <hbox>
     <spring flex="100%"/>
    <button class="right dialog" id="ok" label="&ok;" default="true" oncommand="doOKButton();"/> 
-  </box>
+  </hbox>
   <spring style="height: 5px;"/>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletAddress.xul b/extensions/wallet/editor/resources/content/WalletAddress.xul
index c2848884761f..b117eb82c048 100644
--- a/extensions/wallet/editor/resources/content/WalletAddress.xul
+++ b/extensions/wallet/editor/resources/content/WalletAddress.xul
@@ -47,7 +47,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&address.title;"/>
     <grid class="indent" flex="1">
 
@@ -110,7 +110,7 @@
 
         <row>
           <html>&addressZipcode.label;</html>
-          <box>
+          <hbox>
           <menulist id="postalcode.prefix" editable="true" autoSelectMenuitem="false" flex="55%" width="0"
                     onchange="Append(this)">
             <menupopup>
@@ -124,7 +124,7 @@
               <menuitem label="" len="0"/>
             </menupopup>
           </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
@@ -162,6 +162,6 @@
 
     </grid>
 
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletConcatenated.xul b/extensions/wallet/editor/resources/content/WalletConcatenated.xul
index ac48f658003f..35c579bf03e8 100644
--- a/extensions/wallet/editor/resources/content/WalletConcatenated.xul
+++ b/extensions/wallet/editor/resources/content/WalletConcatenated.xul
@@ -63,7 +63,7 @@
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatPrimary.title;"/>
     <grid class="indent" flex="1">
       <columns>
@@ -194,9 +194,9 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatShipping.title;"/>
     <grid class="indent">
       <columns>
@@ -327,9 +327,9 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatBilling.title;"/>
     <grid class="indent">
       <columns>
@@ -460,9 +460,9 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
-  <titledbox class="tabpanel" autostretch="never" hidden="true">
+  <groupbox class="tabpanel" autostretch="never" hidden="true">
     <label value="&concatOther.title;"/>label
     <grid class="indent">
       <columns>
@@ -513,6 +513,6 @@
 
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletCredit.xul b/extensions/wallet/editor/resources/content/WalletCredit.xul
index 4f4fbff18ae7..370319f0b264 100644
--- a/extensions/wallet/editor/resources/content/WalletCredit.xul
+++ b/extensions/wallet/editor/resources/content/WalletCredit.xul
@@ -46,7 +46,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&credit.title;"/>
     <grid class="indent" flex="1">
 
@@ -79,7 +79,7 @@
 
         <row>
           <html>&creditExpires.label;</html>
-          <box>
+          <hbox>
             <html>&creditExpiresMonth.label;</html>
             <menulist id="card.expdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -94,7 +94,7 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
@@ -109,6 +109,6 @@
        </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletEditor.xul b/extensions/wallet/editor/resources/content/WalletEditor.xul
index ecc6b6b2182f..205b08fc605b 100644
--- a/extensions/wallet/editor/resources/content/WalletEditor.xul
+++ b/extensions/wallet/editor/resources/content/WalletEditor.xul
@@ -1 +1 @@
-Dummy placeholder until these directories are hooked up correctly.
\ No newline at end of file
+Dummy placeholder until these directories are hooked up correctly.
diff --git a/extensions/wallet/editor/resources/content/WalletEmploy.xul b/extensions/wallet/editor/resources/content/WalletEmploy.xul
index 6d23a27c1c8b..80c3cbfdcb2d 100644
--- a/extensions/wallet/editor/resources/content/WalletEmploy.xul
+++ b/extensions/wallet/editor/resources/content/WalletEmploy.xul
@@ -45,7 +45,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&employ.title;"/>
     <grid class="indent" flex="1">
 
@@ -89,6 +89,6 @@
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletMisc.xul b/extensions/wallet/editor/resources/content/WalletMisc.xul
index 279905d40e8d..964e892a9b0c 100644
--- a/extensions/wallet/editor/resources/content/WalletMisc.xul
+++ b/extensions/wallet/editor/resources/content/WalletMisc.xul
@@ -48,7 +48,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&misc.title;"/>
     <grid class="indent" flex="1">
 
@@ -61,7 +61,7 @@
 
         <row>
           <html>&miscSS.label;</html>
-          <box>
+          <hbox>
             <menulist id="socsec.prefix" editable="true" autoSelectMenuitem="false" flex="33%" width="0"
                       onchange="Append(this)">
               <menupopup>
@@ -82,12 +82,12 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
           <html>&miscLicense.label;</html>
-          <box>
+          <hbox>
             <menulist id="license.number" editable="true" autoSelectMenuitem="false" flex="70" width="0"
                       onchange="Append(this)">
               <menupopup>
@@ -102,7 +102,7 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
@@ -117,7 +117,7 @@
 
         <row>
           <html>&miscBirthday.label;</html>
-          <box>
+          <hbox>
             <html>&miscBirthdayMonth.label;</html>
             <menulist id="bdate.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -139,12 +139,12 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
         <row>
           <html>&miscAnniv.label;</html>
-          <box>
+          <hbox>
             <html>&miscAnnivMonth.label;</html>
             <menulist id="anniv.month" editable="true" autoSelectMenuitem="false" flex="40%" width="0"
                       onchange="Append(this)">
@@ -166,12 +166,12 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-          </box>
+          </hbox>
         </row>
 
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletName.xul b/extensions/wallet/editor/resources/content/WalletName.xul
index dadb2464b866..1e0fd7895799 100644
--- a/extensions/wallet/editor/resources/content/WalletName.xul
+++ b/extensions/wallet/editor/resources/content/WalletName.xul
@@ -46,7 +46,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&name.title;"/>
     <grid class="indent" flex="1">
 
@@ -111,6 +111,6 @@
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletPhone.xul b/extensions/wallet/editor/resources/content/WalletPhone.xul
index d6398c09a1b9..e9e28d0ae138 100644
--- a/extensions/wallet/editor/resources/content/WalletPhone.xul
+++ b/extensions/wallet/editor/resources/content/WalletPhone.xul
@@ -49,7 +49,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never">
+  <groupbox class="tabpanel" autostretch="never">
     <label value="&phone.title;"/>
     <grid class="indent" flex="1">
 
@@ -209,6 +209,6 @@
       </rows>
 
     </grid>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletUrlspecific.xul b/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
index ff5c03ed4b68..2dec85f6acad 100644
--- a/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
+++ b/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
@@ -85,7 +85,7 @@
   <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
-  <titledbox class="tabpanel" autostretch="never" orient="vertical">
+  <groupbox class="tabpanel" autostretch="never" orient="vertical">
     <label value="&urlspecific.title;"/>
 
     <grid class="indent">
@@ -103,7 +103,7 @@
       </rows>
     </grid>
 
-    <box style="overflow: auto; height: 335px; width: 350px;">
+    <hbox style="overflow: auto; height: 335px; width: 350px;">
       <grid class="indent">
         <columns>
           <column width="115"/>
@@ -113,7 +113,7 @@
         <rows id="rows">
         </rows>
       </grid>
-    </box>
+    </hbox>
 
-  </titledbox>
+  </groupbox>
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletViewer.xul b/extensions/wallet/editor/resources/content/WalletViewer.xul
index 237ff2fbf8b6..787b2fb557b4 100644
--- a/extensions/wallet/editor/resources/content/WalletViewer.xul
+++ b/extensions/wallet/editor/resources/content/WalletViewer.xul
@@ -48,7 +48,7 @@
 
   <keyset id="dialogKeys"/>
 
-  <box flex="1">
+  <hbox flex="1">
     <!-- tree sidebar -->
     <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
 
@@ -59,10 +59,10 @@
       document.getElementById("panelFrame").setAttribute("tag", "" );
     ]]>
     </script>
-  </box>
+  </hbox>
 
   <separator/>
 
-  <box id="okCancelButtonsRight" />
+  <hbox id="okCancelButtonsRight" />
 
 </window>
diff --git a/extensions/wallet/resources/content/pref-passwords.xul b/extensions/wallet/resources/content/pref-passwords.xul
index baf97aa26d00..3757b28df92d 100644
--- a/extensions/wallet/resources/content/pref-passwords.xul
+++ b/extensions/wallet/resources/content/pref-passwords.xul
@@ -66,33 +66,33 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&signonHeader.label;"/>
     <html flex="1">&signonDescription.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="signonRememberSignons" label="&signonEnabled.label;" accesskey="&signonEnabled.accesskey;"
               pref="true" preftype="bool" prefstring="signon.rememberSignons"
               prefattribute="checked"/>
-    </box>
-    <box autostretch="never" halign="right">
+    </hbox>
+    <hbox autostretch="never" halign="right">
       <button class="dialog" label="&viewSignons.label;" accesskey="&viewSignons.accesskey;"
               oncommand="viewSignons();"
               id="viewStoredPassword" pref="true" preftype="bool"
               prefstring="pref.advanced.password.disable_button.view_stored_password" prefattribute="disabled"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&encryptHeader.label;"/>
     <html flex="1">&encryptDescription.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="encryptEnabled" label="&encryptEnabled.label;" accesskey="&encryptEnabled.accesskey;"
               pref="true" preftype="bool" prefstring="wallet.crypto"
               prefattribute="checked" oncommand="initReencryptCallback();"/>
-    </box>
+    </hbox>
 
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/resources/content/pref-wallet.xul b/extensions/wallet/resources/content/pref-wallet.xul
index 3a73ecabca54..576ead8ea45e 100644
--- a/extensions/wallet/resources/content/pref-wallet.xul
+++ b/extensions/wallet/resources/content/pref-wallet.xul
@@ -54,13 +54,13 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&walletHeader.label;"/>
     <html>&walletDescription.label;</html>
 <!--
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label"
             for="walletServer"
             value="&walletServer.label;"
@@ -71,9 +71,9 @@
                  preftype="string"
                  prefstring="wallet.Server"
                  prefattribute="value"/>
-    </box>
+    </hbox>
 -->
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="walletCaptureForms"
               label="&walletEnabled.label;"
               accesskey="&walletEnabled.accesskey;"
@@ -81,8 +81,8 @@
               preftype="bool"
               prefstring="wallet.captureForms"
               prefattribute="checked"/>
-    </box>
-    <box autostretch="never" halign="right">
+    </hbox>
+    <hbox autostretch="never" halign="right">
       <button class="dialog"
               label="&viewWallet.label;"
               accesskey="&viewWallet.accesskey;" 
@@ -95,7 +95,7 @@
               oncommand="viewWalletSites();"
               id="viewSiteButton" pref="true" preftype="bool"
               prefstring="pref.advanced.form.disable_button.view_sites" prefattribute="disabled"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
 </window>
diff --git a/extensions/wallet/resources/content/walletNavigatorOverlay.xul b/extensions/wallet/resources/content/walletNavigatorOverlay.xul
index c181c23b05fa..798b086addac 100644
--- a/extensions/wallet/resources/content/walletNavigatorOverlay.xul
+++ b/extensions/wallet/resources/content/walletNavigatorOverlay.xul
@@ -132,7 +132,7 @@
   <!-- Form toolbar items -->
 
 <!-- form toolbar is out
-  <box id="appcontent">
+  <hbox id="appcontent">
     <toolbar id="formToolbar"
              class="chromeclass-directories"
              tbautostretch="always"
@@ -164,7 +164,7 @@
               tooltiptext="&formView.tooltip;"/>
       <toolbarseparator/>
     </toolbar>
-  </box>
+  </hbox>
 -->
 
 </overlay>
diff --git a/extensions/wallet/signonviewer/SignonViewer.xul b/extensions/wallet/signonviewer/SignonViewer.xul
index 12d078eb0d9c..d353abaf2ef6 100644
--- a/extensions/wallet/signonviewer/SignonViewer.xul
+++ b/extensions/wallet/signonviewer/SignonViewer.xul
@@ -53,7 +53,7 @@
     </tabs>
     <tabpanels id="panel" flex="1">
       <!-- saved signons -->
-      <box id="savedsignons" flex="1" orient="vertical">
+      <vbox id="savedsignons" flex="1">
           <html>&spiel.signonsstored.label;</html>
           <separator class="thin"/>
           <tree id="signonstree" class="inset" style="height: 20em;"
@@ -77,16 +77,16 @@
             <treechildren id="savesignonlist" flex="1"/>
           </tree>
           <separator class="thin"/>
-          <box>
+          <hbox>
             <button id="removeSignon" disabled="true" class="dialog push"
                           label="&remove.label;" oncommand="DeleteSignon();"/>
             <button id="removeAllSignons" class="dialog push"
                           label="&removeall.label;"
                           oncommand="DeleteAllSignons();"/>
-          </box>
-      </box>
+          </hbox>
+      </vbox>
       <!-- ignored signon sites -->
-      <box id="ignoredsites" flex="1" orient="vertical">
+      <vbox id="ignoredsites" flex="1">
           <html>&spiel.signonsnotstored.label;</html>
           <separator class="thin"/>
           <tree id="ignoretree" class="inset" style="height: 20em;"
@@ -105,16 +105,16 @@
             <treechildren flex="1" id="ignoredlist"/>
           </tree>
           <separator class="thin"/>
-          <box>
+          <hbox>
             <button id="removeIgnoredSite" disabled="true" class="dialog push"
                           label="&remove.label;" oncommand="DeleteIgnoredSite();"/>
             <button id="removeAllSites" class="dialog push"
                           label="&removeall.label;"
                           oncommand="DeleteAllSites();"/>
-          </box>
-      </box>
+          </hbox>
+      </vbox>
       <!-- do not preview panel -->
-      <box class="tabpanel" id="nopreviewforms" flex="1" orient="vertical">
+      <vbox class="tabpanel" id="nopreviewforms" flex="1">
           <html>&spiel.nopreview.label;</html>
           <separator class="thin"/>
           <tree id="nopreviewtree" class="inset" style="height: 20em;" 
@@ -134,16 +134,16 @@
             <treechildren flex="1" id="nopreviewlist"/>
           </tree>
           <separator class="thin"/>
-          <box>
+          <hbox>
             <button id="removeNoPreview" disabled="true" class="dialog push"
                           label="&remove.label;" oncommand="DeleteNoPreviewForm();"/>
             <button id="removeAllNopreviews" class="dialog push"
                           label="&removeall.label;"
                           oncommand="DeleteAllNopreviews();"/>
-          </box>
-      </box>
+          </hbox>
+      </vbox>
       <!-- do not capture panel -->
-      <box class="tabpanel" id="nocaptureforms" flex="1" orient="vertical">
+      <vbox class="tabpanel" id="nocaptureforms" flex="1">
           <html>&spiel.nocapture.label;</html>
           <separator class="thin"/>
           <tree id="nocapturetree" class="inset" style="height: 20em;" 
@@ -162,19 +162,19 @@
             <treechildren flex="1" id="nocapturelist"/>
           </tree>
           <separator class="thin"/>
-          <box>
+          <hbox>
             <button id="removeNoCapture" disabled="true" class="dialog push"
                           label="&remove.label;" oncommand="DeleteNoCaptureForm();"/>
             <button id="removeAllNocaptures" class="dialog push"
                           label="&removeall.label;"
                           oncommand="DeleteAllNocaptures();"/>
-          </box>
-      </box>
+          </hbox>
+      </vbox>
     </tabpanels>
   </tabbox>
     
   <separator class="thin"/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
  
 </window>
diff --git a/extensions/wallet/signonviewer/resources/content/SignonViewer.xul b/extensions/wallet/signonviewer/resources/content/SignonViewer.xul
index ecc6b6b2182f..205b08fc605b 100644
--- a/extensions/wallet/signonviewer/resources/content/SignonViewer.xul
+++ b/extensions/wallet/signonviewer/resources/content/SignonViewer.xul
@@ -1 +1 @@
-Dummy placeholder until these directories are hooked up correctly.
\ No newline at end of file
+Dummy placeholder until these directories are hooked up correctly.
diff --git a/extensions/wallet/walletpreview/WalletPreview.xul b/extensions/wallet/walletpreview/WalletPreview.xul
index 38a18c400ae2..1c8fd6c64570 100644
--- a/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/extensions/wallet/walletpreview/WalletPreview.xul
@@ -28,7 +28,7 @@
 <window title="&windowtitle.label;"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical"
+        orient="vertical"
         class="dialog"
         onload="Startup()">
 
@@ -38,14 +38,14 @@
 
   <keyset id="dialogKeys"/>
            
-  <box>
+  <hbox>
     <text value="&heading.label;"/>
     <spring flex="100%"/>
     <button label="&viewdata.label;" oncommand="formShow();"/>
-  </box>
+  </hbox>
 
   <spring style="height: 20px;"/>
-  <box class="tabpanel" autostretch="never" style="overflow: auto; height: 260px;">
+  <hbox class="tabpanel" autostretch="never" style="overflow: auto; height: 260px;">
     <grid class="indent">
       <columns>
         <column width="25"/>
@@ -55,16 +55,16 @@
       <rows id="rows">
       </rows>
     </grid>
-  </box>
+  </hbox>
 
   <spring style="height: 20px;"/>
 
-  <box align="horizontal">
+  <hbox>
     <checkbox id="checkbox" label="&bypass.label;"/>
     <spring flex="100%"/>
-  </box>
+  </hbox>
 
   <spring style="height: 20px;"/>
 
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/extensions/wallet/walletpreview/resources/content/WalletPreview.xul b/extensions/wallet/walletpreview/resources/content/WalletPreview.xul
index ecc6b6b2182f..205b08fc605b 100644
--- a/extensions/wallet/walletpreview/resources/content/WalletPreview.xul
+++ b/extensions/wallet/walletpreview/resources/content/WalletPreview.xul
@@ -1 +1 @@
-Dummy placeholder until these directories are hooked up correctly.
\ No newline at end of file
+Dummy placeholder until these directories are hooked up correctly.
diff --git a/extensions/xml-rpc/test/xml-rpc.xul b/extensions/xml-rpc/test/xml-rpc.xul
index f4ee8fb9d5ea..766045a2443d 100644
--- a/extensions/xml-rpc/test/xml-rpc.xul
+++ b/extensions/xml-rpc/test/xml-rpc.xul
@@ -6,7 +6,7 @@
     style="margins: 5 5 5 5"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="javascript"><![CDATA[
+<script type="application/x-javascript"><![CDATA[
 function getClient() {
     return Components.classes['@mozilla.org/xml-rpc/client;1']
         .createInstance(Components.interfaces.nsIXmlRpcClient);
@@ -57,19 +57,19 @@ var Listener = {
 };
 ]]></script>
 
-<box orient="vertical" flex="1">
+<vbox flex="1">
 <spring flex="1"/>
 <text value="Enter a state code:"/>
 <textbox id="statecode"/>
 <text value="Statename:"/>
 <text id="statename" value=" "/>
 <spring flex="1"/>
-</box>
+</vbox>
 
-<box orient="vertical">
+<vbox>
 <spring flex="1"/>
 <button label="Call Async." onclick="callAsync()"/>
 <button label="Call Sync." onclick="callSync()"/>
 <spring flex="1"/>
-</box>
+</vbox>
 </window>
diff --git a/extensions/xmlterm/ui/content/xmlterm.xul b/extensions/xmlterm/ui/content/xmlterm.xul
index 1f29010b9158..6bfb27813ef9 100644
--- a/extensions/xmlterm/ui/content/xmlterm.xul
+++ b/extensions/xmlterm/ui/content/xmlterm.xul
@@ -33,7 +33,7 @@ NOTE: Put all the skin stuff in the content directory for the moment
 <window id="xmlterm-window" xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="StartupXMLTerm();"
-        title="xmlterm" align="vertical" width="586" height="412">
+        title="xmlterm" orient="vertical" width="586" height="412">
   
   <script src="chrome://xmlterm/content/XMLTermChrome.js"></script>
 
diff --git a/extensions/xmlterm/ui/content/xmlterm2.xul b/extensions/xmlterm/ui/content/xmlterm2.xul
index 13308e7d1eb6..a9719ac67b78 100644
--- a/extensions/xmlterm/ui/content/xmlterm2.xul
+++ b/extensions/xmlterm/ui/content/xmlterm2.xul
@@ -29,7 +29,7 @@
 <window id="xmlterm-window" xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="StartupXMLTerm();"
-        title="xmlterm2" align="vertical" width="740" height="484">
+        title="xmlterm2" orient="vertical" width="740" height="484">
   
   <script type="application/x-javascript" src="chrome://xmlterm/content/XMLTermChrome.js"/>
 
diff --git a/intl/strres/tests/strres-test.xul b/intl/strres/tests/strres-test.xul
index 70abaec66450..bda5a44dc672 100644
--- a/intl/strres/tests/strres-test.xul
+++ b/intl/strres/tests/strres-test.xul
@@ -13,55 +13,55 @@
         onload="onLoad()"
         class="dialog"> 
               
-	<html:script language="javascript" src="chrome://global/content/strres.js" />
+	<html:script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
-	<!--html:script language="javascript" src="resource:/res/strres-test.js" charset="Shift_JIS" / -->
-	<html:script language="javascript" src="resource:/res/strres-test.js" />
+	<!--html:script type="application/x-javascript" src="resource:/res/strres-test.js" charset="Shift_JIS" / -->
+	<html:script type="application/x-javascript" src="resource:/res/strres-test.js" />
                    
-	<box align="horizontal" flex="100%" style="width:30em;">
+	<hbox flex="100%" style="width:30em;">
                       
 		<html:div style="width: 45px; margin: 5px;">
 			<html:img src="chrome://navigator/skin/questionl.gif" width="32" height="32" border="0"/>
 		</html:div>
 
-    	<box align="vertical" flex="100%" style="height: 100%;">
+    	<vbox flex="100%" style="height: 100%;">
                   
     		<html:div style="width: 100%;">Enter the World Wide Web location (URL) you would like to open or 
 			</html:div>
 			<html:div style="width: 100%; margin-bottom: 0.5em;">use the Choose File... button to select a local file:
 			</html:div>
            
-        	<box align="horizontal">
+        	<hbox>
         		<html:input id="dialog.input" flex="100%" onkeyup="onTyping(event.keyCode)"/>
         		<button onclick="choose()" label="Choose File..." align="left"/>
-       		 </box>
+       		 </hbox>
                               
-        	<box align="horizontal" style="margin-bottom: 1em;">
+        	<hbox style="margin-bottom: 1em;">
         		<html:input type="checkbox" id="dialog.newWindow"/>
             	<html:label for="dialog.newWindow">Open in new window</html:label>
             	<spring flex="100%"/> 
-        	</box>
-        	<box align="horizontal" style="margin-bottom: 1em;">
+        	</hbox>
+        	<hbox style="margin-bottom: 1em;">
 				<spring flex="100%"/>
             	<html:label id = "labelPrompt">Strres Test: </html:label>
             	<html:label id = "testLabel">to be set!!</html:label>
                       
  				<spring flex="100%"/>
-        	</box>
+        	</hbox>
 
        		<spring flex="100%"/>
                    
-        	<box align="horizontal">
+        	<hbox>
 				<spring flex="100%"/>
             	<button id="dialog.ok" label="ok" onclick="open()" align="left"/>
 				<button id="dialog.test" value="test" onclick="strresTest()" align="left"/>
             	<button id="dialog.cancel" label="cancel: ??" onclick="cancel()" align="left"/>
 				<spring flex="100%"/>
-        	</box>
+        	</hbox>
                      
-		</box>
+		</vbox>
                     
-	</box>
+	</hbox>
 
          
  </window>
diff --git a/layout/html/tests/table/bugs/bug12012.xul b/layout/html/tests/table/bugs/bug12012.xul
index 075e639607c8..f505b79daeef 100644
--- a/layout/html/tests/table/bugs/bug12012.xul
+++ b/layout/html/tests/table/bugs/bug12012.xul
@@ -259,13 +259,13 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	onload="Boot()"
 	id="ApptsWindow"
-	align="horizontal">
+	orient="horizontal">
 
 	<html:script src="bug12012.js" />
 
 	<spring flex="1"/>
-	<box align="vertical"> <!-- fill all horizontal space -->
-		<box flex="1" id="main"> <!-- fill all vertical space -->
+	<vbox> <!-- fill all horizontal space -->
+		<hbox flex="1" id="main"> <!-- fill all vertical space -->
 
 			<html:div class="add" style="display: none">
 
@@ -452,9 +452,9 @@
 
 			</html:div>
 
-		</box>
+		</hbox>
 
-		<box id="tabs" align="horizontal">
+		<hbox id="tabs">
 			<spring flex="1"/>
 			<html:table>
 				<html:tr id="tabsTR">
@@ -473,7 +473,7 @@
 				</html:tr>
 			</html:table>
 			<spring flex="1"/>
-		</box> <!-- id="tabs" -->
-	</box>
+		</hbox> <!-- id="tabs" -->
+	</vbox>
 	<spring flex="1"/>
 </window>
diff --git a/layout/html/tests/table/bugs/bug12287.xul b/layout/html/tests/table/bugs/bug12287.xul
index 632bec7a5dec..0d35027e4a89 100644
--- a/layout/html/tests/table/bugs/bug12287.xul
+++ b/layout/html/tests/table/bugs/bug12287.xul
@@ -2,14 +2,14 @@
 
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/1999/xhtml" align="vertical"
+  xmlns:html="http://www.w3.org/1999/xhtml" orient="vertical"
   style="width: 300px">
-<box style="height:300px; border: 3px solid blue" align="vertical">
+<vbox style="height:300px; border: 3px solid blue">
 <html:table flex="1" style="height:100px; border: 5px solid red; padding:3px">
      <html:tr><html:td>Row 1 of 3</html:td></html:tr> 
          <html:tr><html:td>Row 2 of 3</html:td></html:tr> 
          <html:tr><html:td>Row 3 of 3</html:td></html:tr> 
 </html:table>
-</box>
+</vbox>
 </window>
 
diff --git a/layout/html/tests/table/bugs/bug28856.xul b/layout/html/tests/table/bugs/bug28856.xul
index ba7941f40082..c79c5463dab9 100644
--- a/layout/html/tests/table/bugs/bug28856.xul
+++ b/layout/html/tests/table/bugs/bug28856.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-align="vertical" style="width:100%;height:100%">
+orient="vertical" style="width:100%;height:100%">
 <tree flex="1">
   <treecolgroup>
     <treecol flex="1"/>
diff --git a/layout/xul/base/src/outliner/outliner.xul b/layout/xul/base/src/outliner/outliner.xul
index 2dbbb3003991..37529d4db714 100644
--- a/layout/xul/base/src/outliner/outliner.xul
+++ b/layout/xul/base/src/outliner/outliner.xul
@@ -41,4 +41,4 @@
     <button label="Clear View" oncommand="setView(document.getElementById('out'), null)"/>
 
   </hbox>
-</window>
\ No newline at end of file
+</window>
diff --git a/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul b/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul
index 9c35d9d0595b..340d0b9a7c58 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul
@@ -11,4 +11,4 @@
     </treeitem>
   </treechildren>
 
-</overlay>         
\ No newline at end of file
+</overlay>         
diff --git a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index 933762a07203..36aabffa6cc2 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -29,12 +29,12 @@
   ]]>
   </script>  
     
-  <box class="box-smallheader" title="&pane.title;"/>
+  <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <titledbox orient="vertical" class="small-margin">
+  <groupbox orient="vertical" class="small-margin">
     <label value="&emailCollectiontitle.label;"/>
   <html class="small-margin">&emailCollectiontext.label;</html>
-    <box orient="vertical" autostretch="never" class="indent">
+    <vbox autostretch="never" class="indent">
     <checkbox class="small-margin" id="emailCollectionIncoming" label="&emailCollectionIncomingEnable.label;"
               pref="true" preftype="bool" prefstring="mail.collect_email_address_incoming"
               prefattribute="checked"/>
@@ -44,26 +44,26 @@
     <checkbox class="small-margin" id="emailCollectionNewsgroup" label="&emailCollectionNewsgroupEnable.label;"
               pref="true" preftype="bool" prefstring="mail.collect_email_address_newsgroup"
               prefattribute="checked"/>
-	</box>
-    <box autostretch="never">
+    </vbox>
+    <hbox autostretch="never">
       <checkbox class="small-margin" id="enableCABsizeLimit" label="&useCABSizelimitPart1.label;"
                 pref="true" preftype="bool" prefstring="mail.collect_email_address_enable_size_limit"
                 prefattribute="checked"/>
       <textbox class="small-margin" id="CABsizeLimit" size="6" pref="true" preftype="int"
                prefstring="mail.collect_email_address_size_limit" prefattribute="value"/>
       <text id="useCABSizelimitPart2" class="label small-margin" value="&useCABSizelimitPart2.label;"/>
-    </box> 
-	</titledbox>
+    </hbox> 
+  </groupbox>
 	
-    <titledbox class="small-margin" orient="vertical"  id="addressAutocompletion">
+    <groupbox class="small-margin" orient="vertical"  id="addressAutocompletion">
       <label value="&addressingTitle.label;"/>
       <html class="small-margin">&autocompleteText.label;</html>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox class="small-margin" id="addressingAutocomplete" label="&addressingEnable.label;"
           pref="true" preftype="bool" prefstring="mail.enable_autocomplete"
           prefattribute="checked"/>
-      </box>
-      <box autostretch="never">
+      </hbox>
+      <hbox autostretch="never">
         <checkbox class="small-margin" id="autocompleteLDAP" label="&directories.label;" 
                   pref="true" preftype="bool" 
                   prefstring="ldap_2.autoComplete.useDirectory" 
@@ -82,16 +82,16 @@
                prefstring="pref.ldap.disable_button.edit_directories" 
                prefattribute="disabled"
                oncommand="onEditDirectories();"/>
-     </box>
+     </hbox>
      <!--
      <html class="small-margin">&matchText.label;</html>
-     <box autostretch="never">
+     <hbox autostretch="never">
        <checkbox class="small-margin" id="autocompleteSkipDirectory"
                  label="&skipDirectory.label;" 
                  pref="true" preftype="bool" 
                  prefstring="ldap_2.autoComplete.skipDirectoryIfLocalMatchFound"
                  prefattribute="checked"/>    
-     </box>
+     </hbox>
      -->
-   </titledbox>
+   </groupbox>
 </window>
diff --git a/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul b/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
index ea7a4237ea1a..64e0ab389218 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
@@ -38,7 +38,7 @@
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <keyset id="keyset"/>
-  <box id="editDirectory" align="vertical">
+  <vbox id="editDirectory">
 
     <tabbox orient="vertical" style="margin:5px">
       <tabs id="directoryTabBox">
@@ -47,7 +47,7 @@
       </tabs>
 	   
       <tabpanels id="directoryTabPanels" flex="1">
-         <box index="general" align="vertical" flex="1">
+         <vbox index="general" flex="1">
            <grid flex="1">
              <columns>
                <column/>
@@ -75,8 +75,8 @@
                </row>
              </rows>
            </grid>
-         </box>
-         <box index="advanced" align="vertical" flex="1" style="width:100%">
+         </vbox>
+         <vbox index="advanced" flex="1" style="width:100%">
            <grid flex="1">
              <columns>
                <column/>
@@ -88,18 +88,18 @@
                  <text class="label" value="&portNumber.label;" 
                        accesskey="&portNumber.accesskey;"
                        for="port"/>
-                 <box>
+                 <hbox>
                    <textbox id="port" size="6"/>
-                 </box>
+                 </hbox>
                </row>
                <row>
                  <text class="label" value="&return.label;" 
                        accesskey="&return.accesskey;"
                        for="results"/>
-                 <box autostretch="never">
+                 <hbox autostretch="never">
                    <textbox id="results" size="6"/>
                    <text class="label" value="&results.label;"/>
-                 </box>
+                 </hbox>
                </row>
                <row>
                  <text class="label" value="&searchFilter.label;" 
@@ -110,20 +110,20 @@
             </rows>
           </grid>
           <separator class="thin"/>
-          <box orient="horizontal">
+          <hbox>
             <html>&scope.label;</html>
-          </box>
-          <box orient="horizontal" class="indent">
+          </hbox>
+          <hbox class="indent">
             <radiogroup id="scope" orient="horizontal" autostretch="never">
               <radio group="scope" id="one" value="1" label="&scopeOneLevel.label;"/>
               <radio group="scope" id="sub" value="2" label="&scopeSubtree.label;"/>                
             </radiogroup>
-          </box>
-        </box>
+          </hbox>
+        </vbox>
       </tabpanels>
     </tabbox>
-  </box>
-  <box id="okCancelButtonsRight"/>
+  </vbox>
+  <hbox id="okCancelButtonsRight"/>
   
 </window>
         
diff --git a/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul b/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
index 76afbd462caf..f9faf3b70448 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
@@ -29,13 +29,13 @@ Rights Reserved.
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         class="color-dialog"
         style="-moz-user-focus: ignore;"
-        title="&window.title;" align="vertical"
+        title="&window.title;" orient="vertical"
         onload="onInitEditDirectories();">
 
   <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory.js"/>
 
     <html>&directoriesText.label;</html>
-    <box flex="1">
+    <hbox flex="1">
       <tree class="inset" id="directoriesTree" flex="1"
             datasources="rdf:null" onselect="selectDirectory();">
         <treecolgroup>
@@ -43,11 +43,11 @@ Rights Reserved.
         </treecolgroup>
         <treechildren id="directoriesTree_root" flex="1"/>
       </tree>
-      <box orient="vertical">
+      <vbox>
         <button id="addButton" label="&addDirectory.label;" oncommand="newDirectory();"/>
         <button id="editButton" label="&editDirectory.label;" oncommand="editDirectory();" disabled="true"/>
         <button id="removeButton" label="&deleteDirectory.label;" oncommand="removeDirectory();" disabled="true"/>
-      </box>
-    </box>
-    <box id="okCancelButtonsRight"/>
+      </vbox>
+    </hbox>
+    <hbox id="okCancelButtonsRight"/>
 </window>
diff --git a/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul b/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
index 283ba6213c27..610d4b728f2e 100644
--- a/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
@@ -28,16 +28,16 @@ Rights Reserved.
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	title="&title.label;"
-        align="vertical"
+        orient="vertical"
         class="dialog"
         onload="abNameOnLoad()"
         style="padding:10px"> 
         
-<script language="JavaScript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
 
 	<keyset id="dialogKeys"/>
 
-	<box orient="vertical" style="width:36em; min-height:12em">
+	<vbox style="width:36em; min-height:12em">
 		
 		<spring flex="1"/>
 
@@ -47,8 +47,8 @@ Rights Reserved.
 		
 		<spring flex="1"/>
 		
-		<box id="okCancelButtons"/>
+		<hbox id="okCancelButtons"/>
 		
-	</box>
+	</vbox>
 
 </window>
diff --git a/mailnews/addrbook/resources/content/abCardOverlay.xul b/mailnews/addrbook/resources/content/abCardOverlay.xul
index 5fe545341ccd..6c0d0f78d7b6 100644
--- a/mailnews/addrbook/resources/content/abCardOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardOverlay.xul
@@ -28,9 +28,9 @@ Rights Reserved.
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 </stringbundleset>
 
-<script language="JavaScript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>
 
-<box id="editcard" align="vertical">
+<vbox id="editcard">
 
 	<tabbox orient="vertical" style="margin:5px">
 	   <tabs id="abTabs">
@@ -42,65 +42,65 @@ Rights Reserved.
 	   <tabpanels id="abTabPanels" flex="1">
 
 			<!-- ** Name Tab ** -->
-			<box index="name" align="vertical" flex="1">
+			<vbox index="name" flex="1">
 				
-				<titledbox orient="vertical" flex="1">
+				<groupbox orient="vertical" flex="1">
           <label value="&Name.box;"/>
 		
-					<box align="vertical" style="width:100%">
-						<box orient="horizontal">
+					<vbox style="width:100%">
+						<hbox>
 							<spring flex="1"/>
 							<text for="FirstName" value="&FirstName.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="FirstName" flex="1" oninput="top.GenerateDisplayName()"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="LastName" value="&LastName.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="LastName" flex="1" oninput="top.GenerateDisplayName()"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="DisplayName" value="&DisplayName.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="DisplayName" flex="1" oninput="top.DisplayNameChanged()"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="NickName" value="&NickName.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="NickName" flex="1"/>
-							</box>
-						</box>
-					</box>
-				</titledbox>
+							</hbox>
+						</hbox>
+					</vbox>
+				</groupbox>
 
-				<titledbox orient="vertical" flex="1">
+				<groupbox orient="vertical" flex="1">
           <label value="&Internet.box;"/>
 		
-					<box align="vertical" style="width:100%">
-						<box orient="horizontal">
+					<vbox style="width:100%">
+						<hbox>
 							<spring flex="1"/>
 							<text for="PrimaryEmail" value="&PrimaryEmail.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="PrimaryEmail" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="SecondEmail" value="&SecondEmail.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="SecondEmail" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
-							<box orient="vertical" valign="middle">
+							</hbox>
+						</hbox>
+						<hbox>
+							<vbox valign="middle">
 							<text for="PreferMailFormatPopup" value="&PreferMailFormat.label;"/>
-							</box>
+							</vbox>
 							<menulist id="PreferMailFormatPopup">
 								<menupopup>
                   <menuitem value="0" label="&Unknown.label;"/>
@@ -108,220 +108,220 @@ Rights Reserved.
                   <menuitem value="2" label="&HTML.label;"/>
 								</menupopup>
 							</menulist>
-						</box>
-					</box>
-				</titledbox>
+						</hbox>
+					</vbox>
+				</groupbox>
 
-				<titledbox orient="vertical" flex="1">
+				<groupbox orient="vertical" flex="1">
           <label value="&Phones.box;"/>
 		
-					<box align="vertical" style="width:100%">
-						<box orient="horizontal">
+					<vbox style="width:100%">
+						<hbox>
 							<spring flex="1"/>
 							<text for="WorkPhone" value="&WorkPhone.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WorkPhone" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="HomePhone" value="&HomePhone.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="HomePhone" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="FaxNumber" value="&FaxNumber.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="FaxNumber" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="PagerNumber" value="&PagerNumber.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="PagerNumber" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="CellularNumber" value="&CellularNumber.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="CellularNumber" flex="1"/>
-							</box>
-						</box>
-					</box>
-				</titledbox>
-			</box>
+							</hbox>
+						</hbox>
+					</vbox>
+				</groupbox>
+			</vbox>
 			
 			<!-- ** Address Tab ** -->
-			<box index="address" align="vertical" flex="1">
+			<vbox index="address" flex="1">
 				
-				<titledbox orient="vertical" flex="1">
+				<groupbox orient="vertical" flex="1">
           <label value="&Home.box;"/>
 		
-					<box align="vertical" style="width:100%">
+					<vbox style="width:100%">
 		
-						<box orient="horizontal">
+						<hbox>
 							<spring flex="1"/>
 							<text for="HomeAddress" value="&HomeAddress.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="HomeAddress" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="HomeAddress2" value="&HomeAddress2.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="HomeAddress2" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="HomeCity" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="HomeState" value="&HomeState.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="HomeState" flex="1"/>
 								<spring class="stateZipSpacer"/>
 								<text for="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/>
 								<textbox id="HomeZipCode" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="HomeCountry" value="&HomeCountry.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="HomeCountry" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WebPage2" value="&HomeWebPage.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WebPage2" flex="1"/>
-							</box>
-						</box>
-					</box>
-				</titledbox>
+							</hbox>
+						</hbox>
+					</vbox>
+				</groupbox>
 
-				<titledbox orient="vertical" style="width:100%">
+				<groupbox orient="vertical" style="width:100%">
           <label value="&Work.box;"/>
 		
-					<box align="vertical" style="width:100%">
+					<vbox style="width:100%">
 		
-						<box orient="horizontal">
+						<hbox>
 							<spring flex="1"/>
 							<text for="JobTitle" value="&JobTitle.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="JobTitle" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="Department" value="&Department.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="Department" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="Company" value="&Company.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="Company" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WorkAddress" value="&WorkAddress.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WorkAddress" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WorkAddress2" value="&WorkAddress2.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WorkAddress2" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WorkCity" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WorkState" value="&WorkState.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WorkState" flex="1"/>
 								<spring class="stateZipSpacer"/>
 								<text for="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/>
 								<textbox id="WorkZipCode" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WorkCountry" value="&WorkCountry.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WorkCountry" flex="1"/>
-							</box>
-						</box>
-						<box orient="horizontal">
+							</hbox>
+						</hbox>
+						<hbox>
 							<spring flex="1"/>
 							<text for="WebPage1" value="&WorkWebPage.label;" class="CardEditLabel"/>
-							<box class="CardEditWidth">
+							<hbox class="CardEditWidth">
 								<textbox id="WebPage1" flex="1"/>
-							</box>
-						</box>
-					</box>
-				</titledbox>
+							</hbox>
+						</hbox>
+					</vbox>
+				</groupbox>
 
-			</box>
+			</vbox>
 
 			<!-- ** Other Tab ** -->
-			<box index="other" align="vertical" flex="1">
+			<vbox index="other" flex="1">
 				
-				<box align="vertical" class="alignBoxWithFieldset">
-					<box flex="1">
+				<vbox class="alignBoxWithFieldset">
+					<hbox flex="1">
 						<text for="Custom1" value="&Custom1.label;" class="CardEditLabel"/>
 						<textbox id="Custom1" flex="1"/>
-					</box>
-					<box flex="1">
+					</hbox>
+					<hbox flex="1">
 						<text for="Custom2" value="&Custom2.label;" class="CardEditLabel"/>
 						<textbox id="Custom2" flex="1"/>
-					</box>
-					<box flex="1">
+					</hbox>
+					<hbox flex="1">
 						<text for="Custom3" value="&Custom3.label;" class="CardEditLabel"/>
 						<textbox id="Custom3" flex="1"/>
-					</box>
-					<box flex="1">
+					</hbox>
+					<hbox flex="1">
 						<text for="Custom4" value="&Custom4.label;" class="CardEditLabel"/>
 						<textbox id="Custom4" flex="1"/>
-					</box>
-				</box>
+					</hbox>
+				</vbox>
 
-				<titledbox orient="vertical" style="width:100%">
+				<groupbox orient="vertical" style="width:100%">
           <label value="&Notes.box;"/>
 		
-					<box align="vertical" style="width:100%">
+					<vbox style="width:100%">
 						<textbox id="Notes" multiline="true" rows="15" wrap="virtual"/>
-					</box>
-				</titledbox>
+					</vbox>
+				</groupbox>
 
-      </box>
+      </vbox>
 
      </tabpanels> 
   </tabbox>
-</box>
+</vbox>
 
 </overlay>
 
diff --git a/mailnews/addrbook/resources/content/abCardViewOverlay.xul b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
index cedea36f2145..59883afb8781 100644
--- a/mailnews/addrbook/resources/content/abCardViewOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
@@ -25,26 +25,26 @@ Rights Reserved.
 		 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
 
-  <box id="CardViewBox" orient="vertical" flex="1">
+  <vbox id="CardViewBox" flex="1">
 	
-	<box id="CardViewInnerBox" orient="vertical" flex="1">
+	<vbox id="CardViewInnerBox" flex="1">
 		
 		<html hide="true" id="CardTitle"/>
 
-		<box orient="horizontal" style="width:100%" flex="1">
+		<hbox style="width:100%" flex="1">
 			
-			<box orient="vertical" flex="1" style="width:200px">
-				<box id="cvbName" class="cardViewGroup" orient="vertical">
+			<vbox flex="1" style="width:200px">
+				<vbox id="cvbName" class="cardViewGroup">
 					<html class="CardViewHeading" hide="true" id="cvhName"/>
 					<html class="CardViewText" hide="true" id="cvDisplayName"/>
 					<html class="CardViewText" hide="true" id="cvNickname"/>
 					<html class="CardViewText" hide="true" id="cvEmail1"/>
 					<html class="CardViewText" hide="true" id="cvEmail2"/>
-				</box>
+				</vbox>
 				
-				<box id="cvbHome" class="cardViewGroup" orient="vertical">
+				<vbox id="cvbHome" class="cardViewGroup">
 					<html class="CardViewHeading" hide="true" id="cvhHome">&home.heading;</html>
 					<html class="CardViewText" hide="true" id="cvHomeAddress"/>
 					<html class="CardViewText" hide="true" id="cvHomeAddress2"/>
@@ -53,31 +53,31 @@ Rights Reserved.
 					<html class="CardViewText" hide="true" id="cvHomeWebPageBox">
 						<html:p><html:a href="" id="cvHomeWebPage"/>
 					</html:p></html>
-				</box>
+				</vbox>
 
-				<box id="cvbOther" class="cardViewGroup" orient="vertical">
+				<vbox id="cvbOther" class="cardViewGroup">
 					<html class="CardViewHeading" hide="true" id="cvhOther">&other.heading;</html>
 					<html class="CardViewText" hide="true" id="cvCustom1"/>
 					<html class="CardViewText" hide="true" id="cvCustom2"/>
 					<html class="CardViewText" hide="true" id="cvCustom3"/>
 					<html class="CardViewText" hide="true" id="cvCustom4"/>
 					<html class="CardViewText" hide="true" id="cvNotes"/>
-				</box>
-			</box>
+				</vbox>
+			</vbox>
 			
 			<spring style="width:20px"/>
 
-			<box orient="vertical" flex="1" style="width:200px">
-				<box id="cvbPhone" class="cardViewGroup" orient="vertical">
+			<vbox flex="1" style="width:200px">
+				<vbox id="cvbPhone" class="cardViewGroup">
 					<html class="CardViewHeading" hide="true" id="cvhPhone">&phone.heading;</html>
 					<html class="CardViewText" hide="true" id="cvPhWork"/>
 					<html class="CardViewText" hide="true" id="cvPhHome"/>
 					<html class="CardViewText" hide="true" id="cvPhFax"/>
 					<html class="CardViewText" hide="true" id="cvPhCellular"/>
 					<html class="CardViewText" hide="true" id="cvPhPager"/>
-				</box>
+				</vbox>
 				
-				<box id="cvbWork" class="cardViewGroup" orient="vertical">
+				<vbox id="cvbWork" class="cardViewGroup">
 					<html class="CardViewHeading" hide="true" id="cvhWork">&work.heading;</html>
 					<html class="CardViewText" hide="true" id="cvJobTitle"/>
 					<html class="CardViewText" hide="true" id="cvDepartment"/>
@@ -89,13 +89,13 @@ Rights Reserved.
 					<html class="CardViewText" hide="true" id="cvWorkWebPageBox">
 						<html:p><html:a href="" id="cvWorkWebPage"/>
 					</html:p></html>
-				</box>
-			</box>
+				</vbox>
+			</vbox>
 
-		</box>
+		</hbox>
 
-	</box>
+	</vbox>
 
-</box>
+</vbox>
 
 </overlay>
diff --git a/mailnews/addrbook/resources/content/abEditCardDialog.xul b/mailnews/addrbook/resources/content/abEditCardDialog.xul
index 558313cdcc50..4475042a7330 100644
--- a/mailnews/addrbook/resources/content/abEditCardDialog.xul
+++ b/mailnews/addrbook/resources/content/abEditCardDialog.xul
@@ -29,15 +29,15 @@ Rights Reserved.
     id="abcardWindow"
 		onload="OnLoadEditCard()"
 		class="dialog"
-		align="vertical">
+		orient="vertical">
 
   <stringbundleset id="stringbundleset"/>
 
 	<keyset id="dialogKeys"/>
 
-	<box id="editcard"/>
+	<hbox id="editcard"/>
 	
-	<box id="okCancelButtons"/>
+	<hbox id="okCancelButtons"/>
 
 </window>
 
diff --git a/mailnews/addrbook/resources/content/abEditListDialog.xul b/mailnews/addrbook/resources/content/abEditListDialog.xul
index 82a00bde0bad..6e458c50e7ea 100644
--- a/mailnews/addrbook/resources/content/abEditListDialog.xul
+++ b/mailnews/addrbook/resources/content/abEditListDialog.xul
@@ -33,16 +33,16 @@ Rights Reserved.
 		onload="OnLoadEditList()"
         ondragover="return DragOverTree(event);"
         ondragdrop="return DropOnAddressListTree(event);"
-		align="vertical">
+		orient="vertical">
 
   <stringbundleset id="stringbundleset"/>
 
 	<keyset id="dialogKeys"/>
 
-	<box id="editlist"/>
+	<hbox id="editlist"/>
 		
 	<spring style="height:1em"/>
 		
-	<box id="okCancelButtons"/>
+	<hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/addrbook/resources/content/abListOverlay.xul b/mailnews/addrbook/resources/content/abListOverlay.xul
index 182f5a99090b..1e436002749c 100644
--- a/mailnews/addrbook/resources/content/abListOverlay.xul
+++ b/mailnews/addrbook/resources/content/abListOverlay.xul
@@ -31,38 +31,38 @@ Rights Reserved.
   <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
 
 
-<box id="editlist" align="vertical">
+<vbox id="editlist">
 
-	<box align="vertical" style="width:100%">
-		<box orient="horizontal">
+	<vbox style="width:100%">
+		<hbox>
 			<spring flex="1"/>
 			<text for="ListName" value="&ListName.label;" class="CardEditLabel"/>
-			<box class="CardEditWidth">
+			<hbox class="CardEditWidth">
 				<textbox id="ListName" flex="1"/>
-			</box>
-		</box>
-		<box orient="horizontal">
+			</hbox>
+		</hbox>
+		<hbox>
 			<spring flex="1"/>
 			<text for="ListNickName" value="&ListNickName.label;" class="CardEditLabel"/>
-			<box class="CardEditWidth">
+			<hbox class="CardEditWidth">
 				<textbox id="ListNickName" flex="1"/>
-			</box>
-		</box>
-		<box orient="horizontal">
+			</hbox>
+		</hbox>
+		<hbox>
 			<spring flex="1"/>
 			<text for="ListDescription" value="&ListDescription.label;" class="CardEditLabel"/>
-			<box class="CardEditWidth">
+			<hbox class="CardEditWidth">
 				<textbox id="ListDescription" flex="1"/>
-			</box>
-		</box>
-	</box>
+			</hbox>
+		</hbox>
+	</vbox>
 
 	<spring style="height:1em"/>
 		
 	<text value="&AddressTitle.label;"/>
 	<spring style="height:0.1em"/>
-	<box orient="horizontal"  flex="100%">
-		<box orient="vertical" flex="80%">
+	<hbox  flex="100%">
+		<vbox flex="80%">
 			<tree id="addressListTree" class="inset"
 				  rows="8"
 				  onclick="awClickEmptySpace(event.target, true)">
@@ -85,9 +85,9 @@ Rights Reserved.
 					</treeitem>
 				</treechildren>
 			</tree>
-		</box>
-	</box>
-</box>
+		</vbox>
+	</hbox>
+</vbox>
 
 </overlay>
 
diff --git a/mailnews/addrbook/resources/content/abMailListDialog.xul b/mailnews/addrbook/resources/content/abMailListDialog.xul
index 2e5805aff0ac..28973321b61c 100644
--- a/mailnews/addrbook/resources/content/abMailListDialog.xul
+++ b/mailnews/addrbook/resources/content/abMailListDialog.xul
@@ -34,13 +34,13 @@ Rights Reserved.
     onload="OnLoadMailList()"
         ondragover="return DragOverTree(event);"
         ondragdrop="return DropOnAddressListTree(event);"
-    align="vertical">
+    orient="vertical">
 
   <stringbundleset id="stringbundleset"/>
 
   <keyset id="dialogKeys"/>
 
-  <box orient="horizontal" autostretch="never" valign="center">
+  <hbox autostretch="never" valign="center">
     <text for="abPopup" value="&addToAddressBook.label;"/>
     <menulist id="abPopup">
       <menupopup id="abPopup-menupopup" ref="abdirectory://" datasources="rdf:addressdirectory">
@@ -53,14 +53,14 @@ Rights Reserved.
         </template> 
       </menupopup>
     </menulist>
-  </box>
+  </hbox>
 
   <spring style="height:1em"/>
 
-  <box id="editlist"/>
+  <hbox id="editlist"/>
     
   <spring style="height:1em"/>
     
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/addrbook/resources/content/abNewCardDialog.xul b/mailnews/addrbook/resources/content/abNewCardDialog.xul
index c6ead003fa05..cf13ef8c1aff 100644
--- a/mailnews/addrbook/resources/content/abNewCardDialog.xul
+++ b/mailnews/addrbook/resources/content/abNewCardDialog.xul
@@ -33,13 +33,13 @@ Rights Reserved.
     title="&editcardWindow.title;"
     onload="OnLoadNewCard()"
     class="dialog"
-    align="vertical">
+    orient="vertical">
 
   <stringbundleset id="stringbundleset"/>
 
   <keyset id="dialogKeys"/>
 
-  <box orient="horizontal" autostretch="never" valign="center">
+  <hbox autostretch="never" valign="center">
 
     <text for="abPopup" value="&chooseAddressBook.label;"/>
     <menulist id="abPopup">
@@ -54,12 +54,12 @@ Rights Reserved.
       </menupopup>
     </menulist>
 
-  </box>
+  </hbox>
   
   <spring style="height:1em"/>
     
-  <box id="editcard"/>
+  <hbox id="editcard"/>
   
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index 509747719ee1..f40e348a361f 100644
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -36,7 +36,7 @@ Rights Reserved.
         class="dialog"
         width="680" height="480"
         onload="OnLoadSelectAddress()"
-        align="vertical">
+        orient="vertical">
 
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
@@ -50,28 +50,28 @@ Rights Reserved.
   <popupset id="aTooltipSet"/>
 
   <!-- Main box, 3 pane and majority of buttons -->
-  <box align="horizontal" flex="100%">
+  <hbox flex="100%">
     <!-- 3 Pane box -->
-    <box id="3PaneBox" align="horizontal" orient="horizontal" flex="100%">
+    <hbox id="3PaneBox" flex="100%">
       
       <!-- dir tree -->
-      <box id="dirTreeBox" align="horizontal">
+      <hbox id="dirTreeBox">
         <tree id="dirTree" type="dialog" flex="1"/>
-      </box>
+      </hbox>
         
       <splitter id="vertical-splitter" collapse="before"  persist="state"/>
 
       <!-- Box that holds results pane, (to,cc,bcc buttons), and address bucket -->
-      <box id="results-bucket-tree-box" orient="vertical" flex="100%">
+      <vbox id="results-bucket-tree-box" flex="100%">
         <!-- Box that holds results pane and (to,cc,bcc buttons) -->
-        <box align="vertical" flex="100%">
+        <vbox flex="100%">
           <!-- results tree -->
-          <box id="resultsTreeBox" flex="100%" align="vertical">
+          <vbox id="resultsTreeBox" flex="100%">
             <tree id="resultsTree" flex="1"/>
-          </box>
+          </vbox>
           
           <!-- Box that holds (to,cc,bcc buttons) -->
-          <box id="addToBucketButtonBox" align="horizontal">
+          <hbox id="addToBucketButtonBox">
             <spring flex="50%"/>
             <button id="toButton" label="&toButton.label;" class="dialog" oncommand="SelectAddressToButton()"/> 
             <spring class="middle-button-spring"/>
@@ -79,42 +79,42 @@ Rights Reserved.
             <spring class="middle-button-spring"/>
             <button id="bccButton" label="&bccButton.label;" class="dialog" oncommand="SelectAddressBccButton()"/>  
             <spring flex="50%"/>
-          </box>
-        </box>
+          </hbox>
+        </vbox>
         
         <splitter id="bucket-splitter" collapse="before" persist="state"/>
         
         <!-- Address bucket -->
-        <box id="bucketBox" align="vertical">
+        <vbox id="bucketBox">
           <tree id="addressBucket" flex="1" multiple="true" onselect="top.DialogBucketPaneSelectionChanged();">
                         <treecolgroup>
               <treecol flex="1"/>
                         </treecolgroup>
             <treechildren id="bucketBody" flex="1"/>
           </tree>
-        </box>
+        </vbox>
         
-      </box>
-    </box>
+      </vbox>
+    </hbox>
     
     <!-- Box with buttons on right edge of window -->
-    <box id="rightColumnButtonBox" align="vertical">
-      <box align="vertical" flex="50%">
+    <vbox id="rightColumnButtonBox">
+      <vbox flex="50%">
         <spring class="third-column-spring"/>
         <button id="new" label="&newButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard()"/> 
         <spring class="third-column-spring"/>
         <button id="edit" label="&editButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
         <spring flex="100%"/>
-      </box>
-      <box align="vertical" flex="50%">
+      </vbox>
+      <vbox flex="50%">
         <spring flex="50%"/>
         <button id="remove" label="&removeButton.label;" class="dialog" oncommand="RemoveSelectedFromBucket()"/>  
         <spring flex="50%"/>
-      </box>
-    </box>
-  </box>
+      </vbox>
+    </vbox>
+  </hbox>
 
   <!-- OK & Cancel buttons -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index ada58424a087..a373763c2bff 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -45,7 +45,7 @@ Rights Reserved.
     id="addressbookWindow"
     height="450"
     width="750"
-    align="vertical"
+    orient="vertical"
     title="&addressbookWindow.title;"
     windowtype="mail:addressbook"
     persist="width height screenX screenY sizemode"
@@ -60,13 +60,13 @@ Rights Reserved.
 <resourcebundle id="resource_bundle_addressbook" />
 
   
-<script language="JavaScript" src="chrome://messenger/content/accountUtils.js"/>
-<script language="JavaScript" src="chrome://messenger/content/widgetglue.js"/>
-<script language="JavaScript" src="chrome://messenger/content/addressbook/addressbook.js"/>
-<script language="JavaScript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script language="JavaScript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
-<script language="JavaScript" src="chrome://messenger/content/msgPrintEngine.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
 
 <commandset id="tasksCommands">
   <commandset id="CommandUpdate_AddressBook"
@@ -220,7 +220,7 @@ Rights Reserved.
 	
 	<!-- toolbar -->
 		<toolbar class="toolbar-primary" id="abToolbar" persist="collapsed">
-			<box id="toolbar_button_box">
+			<hbox id="toolbar_button_box">
         <button class="button-toolbar-2 top" orient="vertical" id="button-newcard" label="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" oncommand="AbNewCard();"/>
         <button class="button-toolbar-2 top" orient="vertical" id="button-newlist" label="&newlistButton.label;" tooltip="aTooltip" tooltiptext="&newlistButton.tooltip;" oncommand="AbNewList();"/>
             	<toolbarseparator class="toolbarseparator-primary"/>
@@ -228,41 +228,41 @@ Rights Reserved.
         <button class="button-toolbar-2 top" orient="vertical" id="button-newmessage" label="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" oncommand="AbNewMessage();"/>
         <button class="button-toolbar-2 top" orient="vertical" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
 
-				<box orient="vertical" flex="100%">
-					<spring flex="1"/> 
-					<!--html id="searchlabel">&showNames.label;</html>
-					<textbox id="searchtext" type="text" align="bottom"/> 
-					<spring flex="1"/--> 
-				</box>
+        <vbox flex="100%">
+          <spring flex="1"/> 
+          <!--html id="searchlabel">&showNames.label;</html>
+          <textbox id="searchtext" type="text" align="bottom"/> 
+          <spring flex="1"/--> 
+        </vbox>
 
         <!--button id="button_stop" class="other28" align="top" label="&stopButton.label;" tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" disabled="true" oncommand="AbStop()"/>
         <button id="button_search" class="other28" align="top" label="&searchButton.label;" disabled="true" tooltip="aTooltip" tooltiptext="&searchButton.tooltip;" oncommand="AbSearch()"/-->
-			</box>
+     </hbox>
 
-     <box id="throbber-box" autostretch="never">
+     <hbox id="throbber-box" autostretch="never">
       <button id="navigator-throbber" oncommand='goClickThrobber("addressbook.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
         <observes element="broadcaster_throbber" attribute="busy"/>
       </button>
-     </box>
+     </hbox>
     </toolbar>
   </toolbox>
 
   <!-- The main address book three pane -->
-  <box  flex="1" style="min-width:150px">
+  <hbox  flex="1" style="min-width:150px">
     <!-- sidebar with dir tree -->
-    <box id="sidebar-box">
+    <hbox id="sidebar-box">
         <sidebarheader type="box" class="sidebarheader-main" label="&addressbook-sidebar-header.label;"/>
       
       <tree id="dirTree" flex="1000"/>
-    </box>
+    </hbox>
     <splitter id="sidebar-splitter" collapse="before" persist="state"/>
     
-    <box orient="vertical" flex="100%" style="min-width:100px">
+    <vbox flex="100%" style="min-width:100px">
 
       <!-- results tree -->
-      <box id="results_box" flex="1" orient="vertical">
+      <vbox id="results_box" flex="1">
         <tree id="resultsTree" flex="1" style="height:0px"/>
-      </box>
+      </vbox>
       
       <splitter id="results-splitter" collapse="after" persist="state"
               orient="vertical" autostretch="never">
@@ -270,19 +270,19 @@ Rights Reserved.
       </splitter>
       
       <!-- card view -->
-      <box id="CardViewOuterBox" flex="1">
-        <box id="CardViewBox" style="height:170px; min-height:1px; min-width:1px"/>
-      </box>
+      <hbox id="CardViewOuterBox" flex="1">
+        <hbox id="CardViewBox" style="height:170px; min-height:1px; min-width:1px"/>
+      </hbox>
     
       
 
-    </box>
+    </vbox>
     
  
-  </box>
+  </hbox>
   
   <statusbar id="status-bar" >
-    <box id="component-bar"/>
+    <hbox id="component-bar"/>
     <statusbarpanel id="statusText" class="status-bar" flex="1" value="&statusText.label;"/>  
     <statusbarpanel id="offline-status" class="statusbarpanel-icononly"/>           
     <resizer class="window-diagonal"/>
diff --git a/mailnews/base/prefs/resources/content/AccountManager.xul b/mailnews/base/prefs/resources/content/AccountManager.xul
index de1de2057213..bf9cc57cd5d0 100644
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@@ -22,8 +22,8 @@
 
   <keyset id="dialogKeys"/>
 
-  <box flex="1">
-    <box orient="vertical" flex="1">
+  <hbox flex="1">
+    <vbox flex="1">
       <tree datasources="rdf:msgaccountmanager" style="width:0px" flex="1"
             containment="http://home.netscape.com/NC-rdf#Settings"
             onselect="onAccountClick(event.target)" id="accounttree"
@@ -57,21 +57,21 @@
               pref="true" preftype="bool" prefattribute="disabled"
               prefstring="mail.disable_button.set_default_account"/>
   
-      <box >
+      <hbox >
         <!-- taking out for PR2
           <button class="dialog" disabled="true" label="&duplicateButton.label;" id="duplicateButton" oncommand="onDuplicateAccount();" flex="50%"/>
         -->
         <button class="dialog" disabled="true" label="&deleteButton.label;" oncommand="onDeleteAccount(event);" id="deleteButton" flex="50%"
                 pref="true" preftype="bool" prefattribute="disabled"
                 prefstring="mail.disable_button.delete_account"/>
-      </box>
-    </box>
+      </hbox>
+    </vbox>
   
     <iframe id="contentFrame" name="contentFrame" flex="6" style="width: 0px"/>
-  </box>
+  </hbox>
   
   <separator/>
   
-  <box id="okCancelHelpButtonsRight"/>
+  <hbox id="okCancelHelpButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/AccountWizard.xul b/mailnews/base/prefs/resources/content/AccountWizard.xul
index 4cdf71bd76b1..59bbc0ca9abf 100644
--- a/mailnews/base/prefs/resources/content/AccountWizard.xul
+++ b/mailnews/base/prefs/resources/content/AccountWizard.xul
@@ -45,12 +45,12 @@ Rights Reserved.
   <script type="application/x-javascript" src="chrome://messenger/content/AccountWizard.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/ispUtils.js"/>
 
-  <box orient="vertical" flex="1">
-    <box id="contentarea" flex="1">
+  <vbox flex="1">
+    <hbox id="contentarea" flex="1">
       <iframe flex="1" name="wizardContents" scrolling="auto" id="wizardContents"/>
-    </box>
+    </hbox>
 	<!-- if you change "wizardButtons", make sure to change AccountWizardOverlay.xul, too -->
-    <box id="wizardButtons"/>
-  </box>
+    <hbox id="wizardButtons"/>
+  </vbox>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/SmtpServerEdit.xul b/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
index eaa41f38c67d..1b3e80b90a5d 100644
--- a/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
@@ -34,14 +34,14 @@
   title="&smtpEditTitle.label;"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical"
+  orient="vertical"
   onload="onLoad();"
 >
 
-<script language="javascript" src="SmtpServerEdit.js"/>
+<script type="application/x-javascript" src="SmtpServerEdit.js"/>
 <keyset id="dialogKeys"/>
-<box id="smtpServerEditor"/>
+<hbox id="smtpServerEditor"/>
 <separator/>
-<box id="okCancelButtonsRight"/>
+<hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/SmtpServerList.xul b/mailnews/base/prefs/resources/content/SmtpServerList.xul
index 9202b6637b6f..3e9dcaf0b05d 100644
--- a/mailnews/base/prefs/resources/content/SmtpServerList.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerList.xul
@@ -39,7 +39,7 @@
 >
 
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-<script language="javascript" src="SmtpServerList.js"/>
+<script type="application/x-javascript" src="SmtpServerList.js"/>
 
 <keyset id="dialogKeys"/>
 
@@ -47,14 +47,14 @@
 
 <separator class="thin"/>
 
-<box>
+<hbox>
   <tree id="smtpTree" onselect="onSelectionChange(event);" class="inset" flex="1" style="height: 0px;">
     <treecolgroup>
       <treecol flex="1"/>
     </treecolgroup>
     <treechildren id="smtpTreeChildren" flex="1"/>
   </tree>
-  <box orient="vertical">
+  <vbox>
     <button id="addButton"
        oncommand="onAdd(event);" label="&smtpListAdd.label;"/>
     <button id="editButton" disabled="true"
@@ -63,11 +63,11 @@
        oncommand="onDelete(event);" label="&smtpListDelete.label;"/>
     <button id="setDefaultButton" disabled="true"
        oncommand="onSetDefault(event);" label="&smtpListSetDefault.label;"/>
-  </box>
-</box>
+  </vbox>
+</hbox>
 
 <separator/>
 
-<box id="okCancelButtonsRight" />
+<hbox id="okCancelButtonsRight" />
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-addressing.xul b/mailnews/base/prefs/resources/content/am-addressing.xul
index 1b780483fccb..06e5ba02d7c8 100644
--- a/mailnews/base/prefs/resources/content/am-addressing.xul
+++ b/mailnews/base/prefs/resources/content/am-addressing.xul
@@ -44,21 +44,21 @@ Contributors:
   <text hidden="true" wsm_persist="true" id="identity.overrideGlobalPref"
         pref="true" preftype="bool" prefattribute="value"
         prefstring="mail.identity.%identitykey%.overrideGlobal_Pref"/>
-  <box class="box-smallheader" title="&addressing.label;"/>
+  <hbox class="box-smallheader" title="&addressing.label;"/>
   
   <separator class="thin"/>
-  <box orient="vertical" flex="1">
+  <vbox flex="1">
     <html>&addressingText.label;</html>
 	<radiogroup orient="vertical" class="indent" id="ldapAutocomplete" wsm_persist="true" oncommand="enabling();">
       <radio group="ldapAutocomplete" id="useGlobalPref" value="0" label="&useGlobal.label;"/>
-      <box orient="horizontal" autostretch="never">
+      <hbox autostretch="never">
         <radio group="ldapAutocomplete" id="directories" value="1" label="&directories.label;"/>
         <menulist id="directoriesList" wsm_persist="true" flex="1">
           <menupopup oncreate="createDirectoriesList(false);" id="directoriesListPopup"/>
         </menulist>
         <button id="editButton" label="&editDirectories.label;" oncommand="onEditDirectories();"/>
-      </box>
+      </hbox>
     </radiogroup>
       
-  </box>
+  </vbox>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-advanced.xul b/mailnews/base/prefs/resources/content/am-advanced.xul
index 6110460c1969..d5a5375bc763 100644
--- a/mailnews/base/prefs/resources/content/am-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-advanced.xul
@@ -5,7 +5,7 @@
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      align="vertical">
+      orient="vertical">
 
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-copies.xul b/mailnews/base/prefs/resources/content/am-copies.xul
index 3fbe5bc41fb4..d83f7a552545 100644
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@@ -10,7 +10,7 @@
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       class="color-dialog"
       onload="parent.onPanelLoaded('am-copies.xul');"
-      align="vertical">
+      orient="vertical">
 
   <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
@@ -36,17 +36,17 @@
   <text hidden="true" wsm_persist="true" id="identity.draftsFolderPickerMode"/>
   <text hidden="true" wsm_persist="true" id="identity.tmplFolderPickerMode"/>
 
-  <box class="box-smallheader" title="&copyAndFolderTitle.label;"/>
+  <hbox class="box-smallheader" title="&copyAndFolderTitle.label;"/>
   
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&sendingPrefix.label;"/>
 
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox wsm_persist="true" id="identity.doFcc" label="&fccMailFolder.label;" 
                 pref="true" preftype="bool" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.fcc"
                 oncommand="setupFccItems();"/>
-    </box>
+    </hbox>
       <radiogroup id="doFcc" orient="vertical">
       <grid class="specialFolderPickerGrid">
         <columns>
@@ -77,29 +77,29 @@
     </radiogroup>
     <separator/>  
 
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox wsm_persist="true" id="identity.bccSelf" before="&bccAccount.label; &lt;" after="&gt;"
                 pref="true" preftype="bool" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.bcc_self"/>
-    </box>
+    </hbox>
     
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox wsm_persist="true" id="identity.bccOthers" label="&bccAddress.label;"
                 pref="true" preftype="bool" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.bcc_other"/>
       <textbox wsm_persist="true" id="identity.bccList" flex="1"
                pref="true" preftype="string" prefattribute="value"
                prefstring="mail.identity.%identitykey%.bcc_other_list"/>
-    </box>
+    </hbox>
 
-  </titledbox>
+  </groupbox>
   
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&specialFoldersTitle.label;"/>
 
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&keepDrafts.label;"/>
-    </box>
+    </hbox>
     
     <radiogroup id="messageDrafts" orient="vertical">
       <grid class="specialFolderPickerGrid">
@@ -128,9 +128,9 @@
       </grid>
     </radiogroup>
     <separator/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&keepTempltes.label;"/>
-    </box>
+    </hbox>
 	
     <radiogroup id="messageTemplates" orient="vertical">
       <grid class="specialFolderPickerGrid">
@@ -159,11 +159,11 @@
       </grid>
     </radiogroup>
       <separator class="thin"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox wsm_persist="true" id="identity.showSaveMsgDlg" label="&saveMessageDlg.label;"
                 pref="true" preftype="bool" prefattribute="value"
                 prefstring="mail.identity.%identitykey%.showSaveMsgDlg"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-identity-advanced.xul b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
index 698b0be09eca..0bad1cbe720e 100644
--- a/mailnews/base/prefs/resources/content/am-identity-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
@@ -29,14 +29,14 @@
 <window class="dialog"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&identityAdvanced.label;"
-  align="vertical"
+  orient="vertical"
   onload="onLoad();">
 
-  <script language="javascript" src="am-identity-advanced.js"/>
+  <script type="application/x-javascript" src="am-identity-advanced.js"/>
   
   <html style="width: 20em; ">&smtpDesc.label;</html>
   <separator class="thin"/>
-  <box autostretch="never">
+  <hbox autostretch="never">
     <text value="&smtpName.label;" class="label" for="smtpServerList"/>
     <menulist datasources="rdf:smtp"
               containment="http://home.netscape.com/NC-rdf#child"
@@ -57,10 +57,10 @@
         <!-- template will be inserted here -->
       </menupopup>
     </menulist>
-  </box>
+  </hbox>
         
   <separator/>
           
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-imap-advanced.xul b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
index edc465c60ee9..ffd14e928317 100644
--- a/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@@ -11,16 +11,16 @@
       style="padding: 10px"
       title="&imapAdvanced.label;"
       onload="onLoad();"
-      align="vertical">
+      orient="vertical">
 
 <keyset id="dialogKeys"/>
 
 <script src="am-imap-advanced.js"/>
 
-<box>
+<hbox>
   <text value="&serverDirectory.label;" class="label"/>
   <textbox imap_persist="true" id="serverDirectory"/>
-</box>
+</hbox>
 
 <checkbox imap_persist="true" id="usingSubscription" label="&usingSubscription.label;"/>
 
@@ -70,6 +70,6 @@
 <separator class="groove"/>
 <spring class="spacer"/>
 
-<box id="okCancelButtonsRight"/>
+<hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-main.xul b/mailnews/base/prefs/resources/content/am-main.xul
index b68aa6df4687..c3f5a1951fc0 100644
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@@ -14,19 +14,19 @@
     <stringbundle id="bundle_prefutilities" src="chrome://communicator/locale/pref/prefutilities.properties"/>
     <script type="application/x-javascript" src="chrome://messenger/content/am-main.js"/>
 
-    <box class="box-smallheader" title="&accountTitle.label;"/>
+    <hbox class="box-smallheader" title="&accountTitle.label;"/>
     
     <html>&accountSettingsDesc.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&accountName.label;" for="server.prettyName"/>
       <textbox wsm_persist="true" size="30" id="server.prettyName" flex="1"
                pref="true" preftype="string" prefattribute="value"
                prefstring="mail.server.%serverkey%.name"/>
-    </box>
+    </hbox>
     
     <separator class="thin"/>
     
-    <titledbox orient="vertical" flex="1" style="width: 20em !important;">
+    <groupbox orient="vertical" flex="1" style="width: 20em !important;">
       <label value="&identityTitle.label;"/>
       <html>&identityDesc.label;</html>
       <separator class="thin"/>
@@ -63,12 +63,12 @@
         </rows>
       </grid>
 
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox wsm_persist="true" id="identity.attachSignature" label="&signature.label;" flex="1"
                   pref="true" preftype="bool" prefattribute="value"
                   prefstring="mail.identity.%identitykey%.attach_signature"/>
-      </box>
-      <box autostretch="never" class="indent">
+      </hbox>
+      <hbox autostretch="never" class="indent">
         <textbox wsm_persist="true" id="identity.signature" datatype="nsILocalFile" flex="1" name="identity.signature"
                  pref="true" preftype="string" prefattribute="value"
                  prefstring="mail.identity.%identitykey%.sig_file"/>
@@ -77,27 +77,27 @@
                 wsm_persist="true" id="identity.sigbrowsebutton"
                 pref="true" preftype="bool" prefattribute="disabled"
                 prefstring="mail.identity.%identitykey%.sigbrowse.disable"/>
-      </box>
+      </hbox>
 
       <separator class="thin"/>
       
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox wsm_persist="true" id="identity.composeHtml" label="&useHtml.label;"
                   pref="true" preftype="bool" prefattribute="value"
                   prefstring="mail.identity.%identitykey%.compose_html"/>
-      </box>
+      </hbox>
 
       <spring flex="1"/>
 
-      <box>
+      <hbox>
         <spring flex="1"/>
         <button oncommand="onAdvanced();" label="&advancedButton.label;"
                 wsm_persist="true" id="identity.advancedbutton"
                 pref="true" preftype="bool" prefattribute="disabled"
                 prefstring="mail.identity.%identitykey%.advanced.disable"/>
         <text hidden="true" wsm_persist="true" id="identity.smtpServerKey" />
-      </box>
+      </hbox>
 
-    </titledbox>
+    </groupbox>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-offline.xul b/mailnews/base/prefs/resources/content/am-offline.xul
index 5dbd40dc7063..f95c126b6ce2 100644
--- a/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mailnews/base/prefs/resources/content/am-offline.xul
@@ -37,25 +37,25 @@ Contributors:
  
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/> 
 
-    <script type="text/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="text/javascript" src="chrome://messenger/content/am-offline.js"/>
+    <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
+    <script type="application/x-javascript" src="chrome://messenger/content/am-offline.js"/>
 
     <text hidden="true" wsm_persist="true" id="server.type"/>  
 
-    <box id="headertitle" class="box-smallheader"/>
+    <hbox id="headertitle" class="box-smallheader"/>
 
-    <titledbox orient="vertical" id="offlinepop.titlebox" hidable="true" hidefor="imap,nntp">
+    <groupbox orient="vertical" id="offlinepop.titlebox" hidable="true" hidefor="imap,nntp">
       <html iscontrolcontainer="true">&offlinePopDesc.label;</html>
-      <box iscontrolcontainer="true" orient="horizontal" autostretch="never">
+      <hbox iscontrolcontainer="true" autostretch="never">
         <checkbox  wsm_persist="true" id="offline.notDownload" 
             label="&offlineNotDownload.label;" accesskey="&offlineNotDownload.accesskey;"/>
         <textbox wsm_persist="true" id="offline.notDownloadMin" size="5" value="50"/> 
         <text class="label" value="&kb.label;"/>
-      </box>
+      </hbox>
 
-    </titledbox>
+    </groupbox>
 
-    <titledbox orient="vertical" id="offline.titlebox"  hidable="true" hidefor="pop3">
+    <groupbox orient="vertical" id="offline.titlebox"  hidable="true" hidefor="pop3">
       <label value="&offlineGroupTitle.label;"/>
 
     <html iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp">&offlineImapDesc.label;</html>
@@ -74,59 +74,66 @@ Contributors:
 
     <html iscontrolcontainer="true" hidable="true" hidefor="pop3,nntp">&selectButtonDesc.label;</html>
 
-    <box iscontrolcontainer="true" hidable="true" hidefor="pop3" orient="horizontal" align="right">
+    <hbox iscontrolcontainer="true" hidable="true" hidefor="pop3" align="right">
         <button label="&offlineSelect.label;" oncommand="onClickSelect()"/>
-    </box>
+    </hbox>
 
-    </titledbox>    
+    </groupbox>    
     
     <separator class="thin"/>
-    <titledbox orient="vertical" id="diskspace.titlebox"  hidable="true" hidefor="pop3">
+    <groupbox orient="vertical" id="diskspace.titlebox"  hidable="true" hidefor="pop3">
       <label value="&diskspaceGroupTitle.label;"/>
 
     <html iscontrolcontainer="true" hidable="true" hidefor="pop3">&offlineMsg.label;</html>
 
-    <box iscontrolcontainer="true" orient="horizontal" autostretch="never">
+    <hbox iscontrolcontainer="true" autostretch="never">
         <checkbox  wsm_persist="true" id="offline.notDownload"
             label="&offlineNotDownload.label;" accesskey="&offlineNotDownload.accesskey;"/>
         <textbox wsm_persist="true" id="offline.notDownloadMin" size="5" value="50"/> 
         <text class="label" value="&kb.label;"/>
-    </box>
+    </hbox>
+
+    <hbox iscontrolcontainer="true" autostretch="never">
+        <checkbox wsm_persist="true" id="offline.compactFolder" 
+            label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"/> 
+        <textbox wsm_persist="true" id="offline.compactFolderMin" size="5" value="100"/>
+        <text class="label" value="&kb.label;"/>
+    </hbox>
 
     
     <checkbox iscontrolcontainer="true" hidable="true" hidefor="pop3,imap" 
          wsm_persist="true" id="nntp.downloadUnread" label="&nntpDownloadUnread.label;" accesskey="&nntpDownloadUnread.accesskey;"/>
-    <box iscontrolcontainer="true" hidable="true" hidefor="pop3,imap" orient="horizontal" autostretch="never">
+    <hbox iscontrolcontainer="true" hidable="true" hidefor="pop3,imap" autostretch="never">
         <checkbox wsm_persist="true" id="nntp.downloadMsg" label="&nntpDownloadMsg.label;" accesskey="&nntpDownloadMsg.accesskey;"/>
         <textbox wsm_persist="true" id="nntp.downloadMsgMin" size="5" value="30"/>
         <text class="label" value="&daysAgo.label;"/>
-    </box>
+    </hbox>
 
     <separator/>
-    <box orient="vertical" iscontrolcontainer="true" hidable="true" hidefor="pop3,imap"  autostretch="never">  
+    <vbox iscontrolcontainer="true" hidable="true" hidefor="pop3,imap"  autostretch="never">  
     <html class="desc">&nntpCleanup.label;</html>
 
     <radiogroup orient="vertical"  wsm_persist="true" id="nntp.keepMsg" pref="true" preftype="int" prefattribute="data">
-        <box orient="horizontal" flex="1">
+        <hbox flex="1">
             <radio group="nntp.keepMsg" wsm_persist="true" id="nntp.keepOldMsg" data="2" label="&nntpKeepMsg.label;"/>
             <textbox wsm_persist="true" id="nntp.keepOldMsgMin" size="5" value="30"/>
             <text class="label" value="&days.label;"/>
-        </box>
+        </hbox>
         <radio group="nntp.keepMsg" wsm_persist="true" id="nntp.keepAllMsg" data="1" label="&nntpKeepAll.label;"/>
-        <box orient="horizontal" flex="1">
+        <hbox flex="1">
             <radio group="nntp.keepMsg" wsm_persist="true" id="nntp.keepNewMsg" data="3" label="&nntpKeepNew.label;"/>
             <textbox wsm_persist="true" id="nntp.keepNewMsgMin" size="5" value="30"/>
             <text class="label" value="&message.label;"/>
-        </box>
+        </hbox>
     </radiogroup>
 
     <checkbox  wsm_persist="true" id="nntp.keepUnread" label="&nntpKeepUnread.label;" checked="true"/>
-    <box orient="horizontal" flex="1">
+    <hbox flex="1">
         <checkbox wsm_persist="true" id="nntp.removeBody" label="&nntpRemoveBody.label;"/>
         <textbox wsm_persist="true" id="nntp.removeBodyMin" size="5" value="30"/>
         <text class="label" value="&days.label;"/>
-    </box>
-    </box>
-    </titledbox>
+    </hbox>
+    </vbox>
+    </groupbox>
    
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-server-top.xul b/mailnews/base/prefs/resources/content/am-server-top.xul
index a74020f15d70..572fe8d12fea 100644
--- a/mailnews/base/prefs/resources/content/am-server-top.xul
+++ b/mailnews/base/prefs/resources/content/am-server-top.xul
@@ -5,6 +5,6 @@
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      align="vertical">
+      orient="vertical">
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index fbd5da949694..7d7f450c9e96 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -44,7 +44,7 @@ Contributors:
   
   <text hidden="true" wsm_persist="true" id="server.type"/>
 
-  <box class="box-smallheader" title="&serverSettings.label;"/>
+  <hbox class="box-smallheader" title="&serverSettings.label;"/>
 
   <grid>
     <columns>
@@ -62,34 +62,34 @@ Contributors:
             <textbox wsm_persist="true" disabled="true" size="25" id="server.hostName"/>
       </row>
       <row autostretch="never">
-        <box iscontrolcontainer="true" autostretch="never">
+        <hbox iscontrolcontainer="true" autostretch="never">
             <text hidable="true" hidefor="nntp" class="label" id="userNameLabel" 
                   value="&userName.label;"/>
-        </box>
-        <box iscontrolcontainer="true" autostretch="never">
+        </hbox>
+        <hbox iscontrolcontainer="true" autostretch="never">
             <!-- XXX: when #14295 is fixed, remove disabled="true" -->
             <textbox hidable="true" hidefor="nntp" wsm_persist="true" disabled="true"
                      size="25" id="server.username"/>
-        </box>
+        </hbox>
       </row>
       <row>
-        <box autostretch="never">
+        <hbox autostretch="never">
             <text class="label" value="&port.label;"/>
-        </box>
-        <box autostretch="never">
+        </hbox>
+        <hbox autostretch="never">
             <textbox autostretch="never" wsm_persist="true" size="5" id="server.port"
                      pref="true" preftype="int" prefattribute="value"
                      prefstring="mail.server.%serverkey%.port"/>
-        </box>
+        </hbox>
       </row>
     </rows>
   </grid>
 
   <spring class="spacer"/>
 
-  <titledbox>
+  <groupbox>
   <label value="&serverSettings.label;"/>
-  <box orient="vertical" flex="1">
+  <vbox flex="1">
   <checkbox iscontrolcontainer="true" hidable="true" wsm_persist="true" id="server.isSecure"
             label="&isSecure.label;" hidefor="pop3" oncommand="secureSelect();"
             pref="true" preftype="bool" prefattribute="value"
@@ -103,7 +103,7 @@ Contributors:
   <checkbox iscontrolcontainer="true" hidable="true" wsm_persist="true" id="server.rememberPassword" hidefor="nntp"
             value="&savePassword.label;"/>
 -->
-  <box orient="horizontal" autostretch="never">
+  <hbox autostretch="never">
     <checkbox wsm_persist="true" id="server.doBiff" label="&biffStart.label;"
               oncommand="setupBiffUI();"
               pref="true" preftype="bool" prefattribute="value"
@@ -114,9 +114,9 @@ Contributors:
              prefstring="mail.server.%serverkey%.check_time"/>
     <text class="label" id="biffEnd" for="server.biffMinutes" value="&biffEnd.label;"
            observes="broadcaster_doBiff"/>
-  </box>
+  </hbox>
   <!-- POP3 -->
-  <box orient="vertical" iscontrolcontainer="true" autostretch="never">
+  <vbox iscontrolcontainer="true" autostretch="never">
     <checkbox hidable="true" class="indent" hidefor="imap,nntp"
               wsm_persist="true" id="server.downloadOnBiff"
               label="&downloadOnBiff.label;" observes="broadcaster_doBiff"
@@ -132,9 +132,9 @@ Contributors:
               label="&deleteOnServer.label;"
               pref="true" preftype="bool" prefattribute="value"
               prefstring="mail.server.%serverkey%.delete_mail_left_on_server"/>
-  </box>
+  </vbox>
   <!-- IMAP -->
-  <box iscontrolcontainer="true" autostretch="never">
+  <hbox iscontrolcontainer="true" autostretch="never">
     <text class="label" value="&deleteMessagePrefix.label;"/>
     <menulist hidable="true" hidefor="pop3,nntp" wsm_persist="true" id="imap.deleteModel"
               pref="true" preftype="int" prefattribute="value"
@@ -146,7 +146,7 @@ Contributors:
       </menupopup>
     </menulist>
     <spring flex="1"/>
-  </box>
+  </hbox>
   <separator class="thin"/>
 
   <checkbox hidable="true" hidefor="pop3,nntp" wsm_persist="true" id="imap.cleanupInboxOnExit"
@@ -158,15 +158,15 @@ Contributors:
             pref="true" preftype="bool" prefattribute="value"
             prefstring="mail.server.%serverkey%.empty_trash_on_exit"/>
 
-  <box iscontrolcontainer="true" flex="1">
-    <box flex="1">
+  <hbox iscontrolcontainer="true" flex="1">
+    <hbox flex="1">
       <spring flex="1"/>
       <button label="&advancedButton.label;"
               oncommand="openImapAdvanced(event);"
               wsm_persist="true" id="server.advancedbutton" 
               pref="true" preftype="bool" prefattribute="disabled" 
               prefstring="mail.server.%serverkey%.advanced.disable"/>
-    </box>
+    </hbox>
 
     <checkbox hidable="true" hidefor="pop3,nntp" hidden="true" wsm_persist="true" id="imap.dualUseFolders"
               pref="true" preftype="bool" prefattribute="value"
@@ -181,24 +181,24 @@ Contributors:
     <checkbox hidden="true" wsm_persist="true" id="imap.overrideNamespaces"
               pref="true" preftype="bool" prefattribute="value"
               prefstring="mail.server.%serverkey%.override_namespaces"/>
-  </box>
+  </hbox>
 
   <!-- NNTP -->
-  <box iscontrolcontainer="true" orient="horizontal">
+  <hbox iscontrolcontainer="true">
     <checkbox hidable="true" hidefor="pop3,imap" wsm_persist="true" id="nntp.notifyOn"
-                label="&maxMessagesStart.label;"
+              label="&maxMessagesStart.label;"
               pref="true" preftype="bool" prefattribute="value"
               prefstring="mail.server.%serverkey%.notify.on"/>
-    <box iscontrolcontainer="true" autostretch="never">
+    <hbox iscontrolcontainer="true" autostretch="never">
       <textbox wsm_persist="true" id="nntp.maxArticles" size="6"
                pref="true" preftype="int" prefattribute="value"
                prefstring="mail.server.%serverkey%.max_articles"/>
       <text class="label" for="nntp.maxArticles" value="&maxMessagesEnd.label;"/>
-    </box>
-  </box>
+    </hbox>
+  </hbox>
 <!-- take out for now - bug 45079
-    <box iscontrolcontainer="true" flex="100%">
-      <titledbox orient="vertical">
+    <hbox iscontrolcontainer="true" flex="100%">
+      <groupbox orient="vertical">
          <label class="header label" value="&abbreviate.label;"/>
 
          <radiogroup hidable="true" hidefor="pop3,imap" orient="vertical" wsm_persist="true"
@@ -208,25 +208,25 @@ Contributors:
            <radio group="nntp.abbreviate" wsm_persist="true" value="false" 
                   label="&abbreviateOff.label;"/>
          </radiogroup>
-      </titledbox>
-  </box>
+      </groupbox>
+    </hbox>
 -->
 
-  <box orient="vertical" iscontrolcontainer="true">
+  <vbox iscontrolcontainer="true">
     <text class="label" value="&newsrcFilePath.label;" for="nntp.newsrcFilePath"/>
     <textbox hidable="true" hidefor="imap,pop3" wsm_persist="true" id="nntp.newsrcFilePath"
                datatype="nsIFileSpec"
                pref="true" preftype="string" prefattribute="value"
                prefstring="mail.server.%serverkey%.newsrc.file"/>
-  </box>
-  </box>
-  </titledbox>
+  </vbox>
+  </vbox>
+  </groupbox>
   <spring flex="100%"/>
-    <box orient="vertical">
+    <vbox>
     <text class="label" value="&localPath.label;" for="server.localPath"/>
     <textbox wsm_persist="true" id="server.localPath"
             datatype="nsIFileSpec"
             pref="true" preftype="string" prefattribute="value"
             prefstring="mail.server.%serverkey%.directory"/>
-  </box>
+    </vbox>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
index 2359572de4ec..aaf6879b0347 100644
--- a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@@ -9,11 +9,11 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         class="color-dialog"
         onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');"
-        align="vertical">
+        orient="vertical">
 
   <script src="chrome://messenger/content/am-serverwithnoidentities.js"/>
 
-  <box class="box-smallheader" title="&accountTitle.label;"/>
+  <hbox class="box-smallheader" title="&accountTitle.label;"/>
 
   <html class="secDesc">&accountSettingsDesc.label;</html>
   <grid>
@@ -31,10 +31,10 @@
     </rows>
   </grid>
   <spring flex="1"/>
-  <box align="vertical">
+  <vbox>
     <text value="&localPath.label;"/>
     <textbox wsm_persist="true" size="60" id="server.localPath" datatype="nsIFileSpec"
              pref="true" preftype="string" prefattribute="value"
              prefstring="mail.server.%serverkey%.directory"/>
-  </box>
+  </vbox>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-smtp.xul b/mailnews/base/prefs/resources/content/am-smtp.xul
index 23ce31da3d03..b31036f94448 100644
--- a/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mailnews/base/prefs/resources/content/am-smtp.xul
@@ -13,28 +13,28 @@
   onload="onLoad();"
   orient="vertical">
 
-  <script language="javascript" src="am-smtp.js"/>
+  <script type="application/x-javascript" src="am-smtp.js"/>
 
-  <box class="box-smallheader" title="&smtpServer.label;"/>
+  <hbox class="box-smallheader" title="&smtpServer.label;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
 
   <html>&smtpDesc.label;</html>
 
   <separator/>
 
-  <box id="smtpServerEditor"/>
+  <hbox id="smtpServerEditor"/>
 
   <separator/>
   
-  <box>
+  <hbox>
     <spring flex="1"/>
     <button label="&advanced.label;" oncommand="onAdvanced(event);"
             wsm_persist="true" id="smtp.advancedbutton" 
             pref="true" preftype="bool" prefattribute="disabled" 
             prefstring="mail.smtpserver.%serverkey%.advanced.disable"/>
-  </box>
+  </hbox>
   
-  </titledbox>
+  </groupbox>
   
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-accname.xul b/mailnews/base/prefs/resources/content/aw-accname.xul
index b380757d1e9a..d7aaaca2fc9d 100644
--- a/mailnews/base/prefs/resources/content/aw-accname.xul
+++ b/mailnews/base/prefs/resources/content/aw-accname.xul
@@ -33,20 +33,20 @@ Rights Reserved.
         onload="parent.wizardManager.onPageLoad('accname');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-accname.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-accname.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
 
-  <box class="box-header" title="&accnameTitle.label;"/>
+  <hbox class="box-header" title="&accnameTitle.label;"/>
   
   <separator/>
   
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
     <html>&accnameDesc.label;</html>
     <separator class="thin"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&accnameLabel.label;" for="prettyName" style="width: 8em;"/>
       <textbox id="prettyName" size="40" wsm_persist="true" flex="1"/>
-    </box>
-  </box>
+    </hbox>
+  </vbox>
     
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-accounttype.xul b/mailnews/base/prefs/resources/content/aw-accounttype.xul
index f5193357d411..1bbf3f30c4bc 100644
--- a/mailnews/base/prefs/resources/content/aw-accounttype.xul
+++ b/mailnews/base/prefs/resources/content/aw-accounttype.xul
@@ -35,11 +35,11 @@ Rights Reserved.
 
   <script src="aw-accounttype.js"/>
   <script src="aw-wizardAdapter.js"/>
-  <box class="box-header" title="&accountTypeTitle.label;"/>
+  <hbox class="box-header" title="&accountTypeTitle.label;"/>
 
   <separator/>
   
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
 
     <html class="desc">&accountTypeDesc.label;</html>
     <html class="desc">&accountTypeDirections.label;</html>
@@ -50,8 +50,7 @@ Rights Reserved.
              wsm_persist="true"
              label="&accountTypeMail.label;"/>
   
-      <box orient="vertical"
-           datasources="rdf:ispdefaults" 
+      <vbox datasources="rdf:ispdefaults" 
            containment="http://home.netscape.com/NC-rdf#providers"
            id="ispBox"
            ref="NC:ispinfo">
@@ -63,11 +62,11 @@ Rights Reserved.
                       label="rdf:http://home.netscape.com/NC-rdf#wizardLongName"/>
           </rule>
        </template>
-      </box>
+      </vbox>
       <radio group="acctyperadio" id="newsaccount" value="newsaccount"
              wsm_persist="true"
              label="&accountTypeNews.label;"/>
     </radiogroup>
-  </box>
+  </vbox>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-done.xul b/mailnews/base/prefs/resources/content/aw-done.xul
index f5d138ac46ec..a955c9d85882 100644
--- a/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mailnews/base/prefs/resources/content/aw-done.xul
@@ -33,11 +33,11 @@ Rights Reserved.
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
   <script src="chrome://messenger/content/aw-done.js"/>
 
-  <box class="box-header" title="&completionTitle.label;"/>
+  <hbox class="box-header" title="&completionTitle.label;"/>
 
   <separator/>
   
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
 
     <html>&completionText.label;</html>
 
@@ -83,10 +83,10 @@ Rights Reserved.
     <separator/>
     <html>&clickFinish.label;</html>
     <!--
-      <box>
+      <hbox>
         <button class="dialog push" label="&setupAnotherButton.label;" oncommand="setupAnother(event);"/>
-      </box>
+      </hbox>
     -->
-  </box>
+  </vbox>
   
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-identity.xul b/mailnews/base/prefs/resources/content/aw-identity.xul
index 1ecd45439807..0b5312d35670 100644
--- a/mailnews/base/prefs/resources/content/aw-identity.xul
+++ b/mailnews/base/prefs/resources/content/aw-identity.xul
@@ -32,21 +32,21 @@ Rights Reserved.
         onload="parent.wizardManager.onPageLoad('identity');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-identity.js"/> 
-  <script language="JavaScript" src="chrome://messenger/content/aw-wizardAdapter.js"/> 
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-identity.js"/> 
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-wizardAdapter.js"/> 
 
-  <box class="box-header" title="&identityTitle.label;"/>
+  <hbox class="box-header" title="&identityTitle.label;"/>
   
   <separator/>
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
     <html>&identityDesc.label;</html>
     <separator/>
     <html>&fullnameDesc.label; &fullnameExample.label;</html>
     <separator class="thin"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="awIdentityLabel" for="fullName" value="&fullnameLabel.label;"/>
       <textbox mailtype="identity" wsm_persist="true" name="fullName" id="fullName" flex="6"/>
-    </box>
+    </hbox>
     <separator/>  
     <grid>
       <columns>
@@ -58,14 +58,14 @@ Rights Reserved.
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never">
+          <hbox autostretch="never">
             <text class="awIdentityLabel" id="emailFieldLabel" value="&emailLabel.label;"/>
             <textbox wsm_persist="true" mailtype="identity" name="email" id="email" flex="6"/>
             <text id="postEmailText"/>
-          </box>
+          </hbox>
         </row>
       </rows>
     </grid>
-  </box>
+  </vbox>
   
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-login.xul b/mailnews/base/prefs/resources/content/aw-login.xul
index 8e3c70c43a1b..ce6e017c2332 100644
--- a/mailnews/base/prefs/resources/content/aw-login.xul
+++ b/mailnews/base/prefs/resources/content/aw-login.xul
@@ -32,38 +32,38 @@ Rights Reserved.
         onload="parent.wizardManager.onPageLoad('login');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-login.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-login.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
 
-  <box class="box-header" title="&loginTitle.label;"/>
+  <hbox class="box-header" title="&loginTitle.label;"/>
 
   <separator/>
   
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
     <html>&usernameDesc.label; &usernameExample.label;</html>
     <separator class="thin"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&usernameLabel.label;" for="username" style="width: 8em;"/>
       <textbox id="username" wsm_persist="true" flex="1"/>
-    </box>
+    </hbox>
 <!--
     <separator/>
     
-    <titledbox>
+    <groupbox>
       <label value="&passwordTitle.label;"/>
       <html>&savePasswordDesc.label;</html>
       <html>&savePasswordLabel.label;</html>
       <checkbox wsm_persist="true" oncommand="onSavePassword(event.target)"
                 id="rememberPassword"/>
-      <box orient="vertical" class="indent">
+      <vbox class="indent">
         <text class="label" value="&passwordDesc.label;"/>
-        <box autostretch="never">
+        <hbox autostretch="never">
           <text class="label" value="&passwordLabel.label;" for="password"/>
           <textbox type="password" id="password" wsm_persist="true"/>
-        </box>
-      </box>
-    </titledbox>
+        </hbox>
+      </vbox>
+    </groupbox>
 -->
-  </box>
+  </vbox>
   
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-newsserver.xul b/mailnews/base/prefs/resources/content/aw-newsserver.xul
index 611f5703236c..d8b546240f85 100644
--- a/mailnews/base/prefs/resources/content/aw-newsserver.xul
+++ b/mailnews/base/prefs/resources/content/aw-newsserver.xul
@@ -32,22 +32,22 @@ Rights Reserved.
         onload="parent.wizardManager.onPageLoad('newsserver');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-server.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-server.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
 
-  <box class="box-header" title="&serverTitle.label;"/>
+  <hbox class="box-header" title="&serverTitle.label;"/>
 
   <separator/>
  
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
 
     <html>&newsServerNameDesc.label;</html>
     <separator class="thin"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" for="hostname" value="&incomingServerLabel.label;" style="width: 8em;"/>
       <textbox id="hostname" wsm_persist="true" flex="1"/>
-    </box>
+    </hbox>
   
-  </box>
+  </vbox>
   
 </window>
diff --git a/mailnews/base/prefs/resources/content/aw-server.xul b/mailnews/base/prefs/resources/content/aw-server.xul
index 3ef5eda4736e..f80cff94f711 100644
--- a/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mailnews/base/prefs/resources/content/aw-server.xul
@@ -32,49 +32,49 @@ Rights Reserved.
         onload="parent.wizardManager.onPageLoad('server');">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-server.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-server.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/aw-wizardAdapter.js"/>
 
-  <box class="box-header" title="&serverTitle.label;"/>
+  <hbox class="box-header" title="&serverTitle.label;"/>
 
   <separator/>
   
-  <box class="box-wizardcontent" orient="vertical" flex="1">
+  <vbox class="box-wizardcontent" flex="1">
 
-    <titledbox orient="vertical">
+    <groupbox orient="vertical">
       <label value="&incomingServerTitle.label;"/>
       <html>&incomingServerTypeDesc.label;</html>
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <!-- The initial value for the servertype radiogroup is set in onInit() -->
         <radiogroup id="servertype" wsm_persist="true">
             <radio group="servertype" value="pop3" id="pop3" label="&popType.label;" wsm_persist="true"/>
             <radio group="servertype" value="imap" id="imap" label="&imapType.label;" wsm_persist="true"/>
         </radiogroup>
-      </box>
+      </hbox>
       <separator/>
       <html>&incomingServerNameDesc.label;</html>
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <text class="label" style="width: 8em;" value="&incomingServerLabel.label;" for="hostname"/>
         <textbox wsm_persist="true" id="hostname" flex="1"/>
-      </box>
-    </titledbox>
+      </hbox>
+    </groupbox>
 
-    <titledbox orient="vertical" id="noSmtp">
+    <groupbox orient="vertical" id="noSmtp">
       <label value="&smtpServerTitle.label;"/>
       <html>&smtpServerDesc.label;</html>
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <text class="label" value="&smtpServerLabel.label;" for="smtphostname" style="width: 8em;"/>
         <textbox id="smtphostname" wsm_persist="true" flex="1"/>
-      </box>
-    </titledbox>
+      </hbox>
+    </groupbox>
 
-    <titledbox id="haveSmtp" orient="vertical">
+    <groupbox id="haveSmtp" orient="vertical">
       <html id="smtpStaticText" style="width: 200px;">&haveSmtp1.label;</html>
-    </titledbox>
-  </box>
+    </groupbox>
+  </vbox>
   
 </window>
 
diff --git a/mailnews/base/prefs/resources/content/custreceipt.xul b/mailnews/base/prefs/resources/content/custreceipt.xul
index 2e2b15fdc278..a6fd1d128dc9 100644
--- a/mailnews/base/prefs/resources/content/custreceipt.xul
+++ b/mailnews/base/prefs/resources/content/custreceipt.xul
@@ -8,10 +8,10 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&window.title;"
     class="dialog"
-    align="vertical">
+    orient="vertical">
 
-  <box align="vertical" style="width:100%">
-  <box orient="horizontal" style="width:100%">
+  <vbox style="width:100%">
+  <hbox style="width:100%">
       <spring flex="1"/>
      <text class="label" value="&notInToCc.label;" accesskey="&notInToCc.accesskey;" for="NotInToCc"/>
       <menulist id="NotInToCc" pref="true" preftype="int" prefstring="mail.mdn.report.not_in_to_cc"
@@ -22,9 +22,9 @@
           <menuitem value="2" label="&askMe.label;"/>
         </menupopup>
       </menulist>
-  </box>
+  </hbox>
 
-  <box orient="horizontal" style="width:100%">
+  <hbox style="width:100%">
       <spring flex="1"/>
       <text class="label" value="&outside.label;" accesskey="&outside.accesskey;" for="OutsideDomain"/>
       <menulist id="OutsideDomain" pref="true" preftype="int" prefstring="mail.mdn.report.outside_domain"
@@ -35,9 +35,9 @@
           <menuitem value="2" label="&askMe.label;"/>
         </menupopup>
       </menulist>
-  </box>
+  </hbox>
 
-  <box orient="horizontal" style="width:100%">
+  <hbox style="width:100%">
       <spring flex="1"/>
      <text class="label" value="&other.label;" accesskey="&other.accesskey;" for="Other"/>
       <menulist id="Other" pref="true" preftype="int" prefstring="mail.mdn.report.other"
@@ -48,11 +48,11 @@
           <menuitem value="2" label="&askMe.label;"/>
         </menupopup>
       </menulist>
-  </box>
-  </box>
+  </hbox>
+  </vbox>
 
   <spring style="height:1em"/>
     
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
index a6b38c851a8d..4fceb3cfeee8 100644
--- a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
+++ b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
@@ -10,7 +10,7 @@
 <overlay id="mailPrefsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var panel;
     if (panel != undefined) {
@@ -28,20 +28,20 @@
   </script>         
 
   <!-- javascript toggle for mail/news -->
-  <titledbox id="advancedSettings">
+  <groupbox id="advancedSettings">
     <checkbox id="javascriptAllowMailNews" position="3"
               label="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
               pref="true" preftype="bool" prefstring="javascript.allow.mailnews"
               prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
 
   <!-- mail startup toggle -->
-  <titledbox id="generalStartupPreferences">           
+  <groupbox id="generalStartupPreferences">           
     <checkbox id="generalStartupMail" wsm_persist="true" position="3"
               label="&mesCheck.label;" accesskey="&mesCheck.accesskey;"
               pref="true" preftype="bool" prefstring="general.startup.mail"
               prefattribute="checked"/>         
-  </titledbox>
+  </groupbox>
 
   <!-- category tree entries for mail/news -->
   <treechildren id="panelChildren">
diff --git a/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul b/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
index c6ed6ff98e68..f369c2ddb113 100644
--- a/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
+++ b/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
@@ -3,7 +3,7 @@
 <overlay id="messengerPrefOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     // this appends this element to the wsm ID array
     if( _elementIDs )
@@ -22,4 +22,4 @@
   </vbox>
     
          
-</overlay> 
\ No newline at end of file
+</overlay> 
diff --git a/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul b/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
index af57616796cf..075195b40882 100644
--- a/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
+++ b/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
@@ -3,7 +3,7 @@
 <overlay id="messengerPrefAppearanceOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     // this appends this element to the wsm ID array
     if( _elementIDs )
@@ -14,11 +14,11 @@
   </script>
        
   <!-- startup entry in appearance prefs -->
-  <titledbox id="generalStartupPreferences">
+  <groupbox id="generalStartupPreferences">
     <checkbox id="generalStartupMail" wsm_persist="true" position="2"
               label="&mesCheck.label;" accesskey="&mesCheck.accesskey;"
               pref="true" preftype="bool" prefstring="general.startup.mail"
               prefattribute="checked"/>         
-  </titledbox>        
+  </groupbox>        
 
-</overlay> 
\ No newline at end of file
+</overlay> 
diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 481e693205c4..a21bc4b88ce5 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -43,12 +43,12 @@ Contributor(s):
   </script>
   <script type="application/x-javascript" src="chrome://messenger/content/pref-mailnews.js"/>
   
-  <box class="box-smallheader" title="&pane.title;"/>
+  <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&windowSettings.label;"/>
     
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&selectWindowLayout.label;"/>
       <spring flex="1"/>
       <radiogroup id="mailPaneConfig" pref="true" preftype="int" prefstring="mail.pane_config"
@@ -56,54 +56,54 @@ Contributor(s):
         <radio group="mailPaneConfig" class="iconic" value="0" id="classic"/>
         <radio group="mailPaneConfig" class="iconic" value="1" id="wide"/>
       </radiogroup>
-    </box>
+    </hbox>
     
     <html>&chooseExp.label;</html>
 
     <separator class="thin"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="mailnewsConfirmMoveFoldersToTrash" label="&confirmMove.label;"
                 pref="true" preftype="bool" prefstring="mailnews.confirm.moveFoldersToTrash"
                 prefattribute="checked"/>
-    </box>
+    </hbox>
 
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&messengerStartPage.label;"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox allowevents="true" id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
                   pref="true" preftype="bool" prefstring="mailnews.start_page.enabled"
                   prefattribute="checked"/>
-      </box>
+      </hbox>
 
       <separator class="thin"/>
 
-      <box autostretch="never">
+      <hbox autostretch="never">
         <text class="label" value="&location.label;" accesskey="&location.accesskey;" 
                    for="mailnews.start_page.url"/>
         <textbox id="mailnewsStartPageUrl" flex="1" pref="true" preftype="string"
                  prefstring="mailnews.start_page.url" prefattribute="value"/>
-      </box>
+      </hbox>
 
-    <box autostretch="never" halign="right">
+    <hbox autostretch="never" halign="right">
       <button class="dialog" label="&useDefault.label;" accesskey="&useDefault.accesskey;"
               id="resetHomePageButton"
               oncommand="setHomePageToDefaultPage('mailnewsStartPageUrl');">
         <observes element="mailnewsStartPageUrl" attribute="disabled"/>
       </button>
-     </box>
+     </hbox>
 
-  </titledbox>
+  </groupbox>
   
   <!-- Sound notification for new mail -->    
-        <titledbox orient="vertical">
+        <groupbox orient="vertical">
     <label value="&newMessage.label;"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
             <checkbox allowevents="true" id="newMailNotification" label="&playSound.label;"
                 pref="true" preftype="bool" prefstring="mail.biff.play_sound"
                 prefattribute="checked" accesskey="&playSound.accesskey;" />
-          </box>              
-        </titledbox>
+          </hbox>              
+        </groupbox>
   
 </window>
diff --git a/mailnews/base/prefs/resources/content/pref-receipts.xul b/mailnews/base/prefs/resources/content/pref-receipts.xul
index 3e20778b9f10..7a7a3ef25a34 100644
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -10,7 +10,7 @@
         onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
         orient="vertical">
 
-  <script language="javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     _elementIDs = [];
     
@@ -22,6 +22,6 @@
   </script>
 
 
-  <box class="box-smallheader" title="&pane.title;"/>
+  <hbox class="box-smallheader" title="&pane.title;"/>
 
 </window>
diff --git a/mailnews/base/prefs/resources/content/pref-tree_overlay.xul b/mailnews/base/prefs/resources/content/pref-tree_overlay.xul
index 6fa4d73634c7..f51d923fa7b6 100644
--- a/mailnews/base/prefs/resources/content/pref-tree_overlay.xul
+++ b/mailnews/base/prefs/resources/content/pref-tree_overlay.xul
@@ -34,4 +34,4 @@
     </treeitem>
   </treechildren>
          
-</overlay> 
\ No newline at end of file
+</overlay> 
diff --git a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index bab27302be14..50607b41faf6 100644
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -40,26 +40,26 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" title="&pane.title;"/>
+  <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <titledbox orient="vertical" class="small-margin">
+  <groupbox orient="vertical" class="small-margin">
     <label value="&displayWidth.label;"/>
 
       <html class="small-margin">&plainText.label;</html>
     
-    <box class="indent">
+    <hbox class="indent">
       <radiogroup id="mailFixedWidthMessages" 
                   pref="true" preftype="bool" prefstring="mail.fixed_width_messages"
                   prefattribute="value">
         <radio class="small-margin" group="mailFixedWidthMessages" value="true" label="&fixedWidth.label;"/>
         <radio class="small-margin"  group="mailFixedWidthMessages" value="false" label="&variableWidth.label;"/>                
       </radiogroup>
-    </box>
+    </hbox>
 
     <separator class="thin"/>
 
   <html class="small-margin">&displayText.label;</html>
-    <box class="indent" autostretch="never">
+    <hbox class="indent" autostretch="never">
       <text class="label small-margin" value="&style.label;" accesskey="&style.accesskey;" for="mailQuotedStyle"/>
       <menulist class="small-margin" id="mailQuotedStyle" pref="true" preftype="int" prefstring="mail.quoted_style"
                 prefattribute="value" flex="1" style="width: 0px;">
@@ -84,26 +84,26 @@
       <text class="label small-margin" value="&color.label;" accesskey="&color.accesskey;"/>
       <colorpicker class="small-margin"  type="button" id="citationmenu" palettename="standard" oncommand="setColorWell(this);"/>
       <broadcaster id="mailCitationColor" pref="true" preftype="color" prefstring="mail.citation_color" prefattribute="value" wsm_attributes="value"/>
-    </box>    
+    </hbox>    
 
   <html class="small-margin">&viewingPlainText.label;</html>
-    <box orient="vertical" autostretch="never" class="indent">
+    <vbox autostretch="never" class="indent">
       <checkbox class="small-margin"  id="wrapLongLines" label="&wrapInMsg.label;"
                 pref="true" preftype="bool" prefstring="mail.wrap_long_lines" 
                 prefattribute="checked"/>
       <checkbox class="iconic small-margin" id="displayGlyph" label="&convertEmoticons.label;"
                 pref="true" preftype="bool" prefstring="mail.display_glyph"
                 prefattribute="checked" tooltip="aTooltip" tooltiptext="&convertEmoticons.tooltip;"/>   
-      <box orient="horizontal" autostretch="never" class="indent">
+      <hbox autostretch="never" class="indent">
            <text value="&example1.label;" class="label"/>
            <image class="smileface"/>
            <text value="&example2.label;"/>
-      </box>
+      </hbox>
     
-    </box>
-  </titledbox>
+    </vbox>
+  </groupbox>
 
-  <titledbox orient="vertical" autostretch="never" class="small-margin">
+  <groupbox orient="vertical" autostretch="never" class="small-margin">
     <label value="&languagesTitle.label;"/>
     <html class="small-margin">&coding.label;</html>
     <hbox autostretch="never">
@@ -122,6 +122,6 @@
     <checkbox class="small-margin" id="forceCharsetOverride" label="&forceCharsetOverride.label;"
               pref="true" preftype="bool" prefstring="mailnews.force_charset_override" 
               prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
     
 </window>
diff --git a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
index db159bbc15b9..7efee5dce0b0 100644
--- a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@@ -31,36 +31,36 @@
 
   <script src="smtpEditOverlay.js"/>
 
-  <box id="smtpServerEditor" orient="vertical">
-    <box autostretch="never">
+  <vbox id="smtpServerEditor">
+    <hbox autostretch="never">
       <text class="label" value="&serverName.label;"/>
       <textbox wsm_persist="true" id="smtp.hostname" flex="1"
                pref="true" preftype="string" prefattribute="value"
                prefstring="mail.smtpserver.%serverkey%.hostname"/>
-    </box>
+    </hbox>
     <!-- use a grid here when it's implemented -->
-    <box orient="vertical">
+    <vbox>
       <!-- This hidden one will hold the integer version
            of smtp.useUsername -->
       <text hidden="true" id="smtp.authMethod" wsm_persist="true"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
       <checkbox id="smtp.useUsername" label="&alwaysUseUsername.label;" wsm_persist="true"
                 oncommand="onUseUsername(event.target,true);"
                 pref="true" preftype="bool" prefattribute="value"
                 prefstring="mail.smtpserver.%serverkey%.use_username"/>
-      </box>                
-      <box orient="vertical" style="margin-left: 2em">
-        <box autostretch="never">
+      </hbox>                
+      <vbox style="margin-left: 2em">
+        <hbox autostretch="never">
           <text id="smtpusernamelabel" class="label" value="&userName.label;"/>
           <textbox wsm_persist="true" id="smtp.username" flex="1"
                    pref="true" preftype="string" prefattribute="value"
                    prefstring="mail.smtpserver.%serverkey%.username"/>
-        </box>
-      </box>
-     </box>
-     <box autostretch="never">
+        </hbox>
+      </vbox>
+     </vbox>
+     <hbox autostretch="never">
   <text class="label" value="&isSecure.label;"/>
-     </box>
+     </hbox>
      <radiogroup id="smtp.trySSL" wsm_persist="true"
                  pref="true" preftype="int" prefattribute="value"
                  prefstring="mail.smtpserver.%serverkey%.try_ssl">
@@ -70,6 +70,6 @@
          <radio group="smtp.trySSL" value="2" label="&alwaysSecure.label;" id="smtp.alwaysSecure"/>
        </hbox>
      </radiogroup>
-  </box>
+  </vbox>
 
 </overlay>
diff --git a/mailnews/base/resources/content/downloadMsgs.xul b/mailnews/base/resources/content/downloadMsgs.xul
index f3c5d5982222..ef54afd34ebe 100644
--- a/mailnews/base/resources/content/downloadMsgs.xul
+++ b/mailnews/base/resources/content/downloadMsgs.xul
@@ -37,11 +37,11 @@ Rights Reserved.
 	<checkbox  id="offline.downloadMessages" wsm_persist="true" label="&alwaysAsk.check.label;" />
 
 	<spring flex="100%"/>
-	<box align="horizontal" autostretch="never">
+	<hbox autostretch="never">
 		 <spring flex="100%"/>
 		 <button id="buttonClicked:yes" class="dialog" label="&yesButton.label;"  onclick="doYesButton()" /> 
 		 <button id="buttonClicked:no" class="dialog" label="&noButton.label;" onclick="doNoButton()" />
 		 <button id="buttonClicked:cancel" class="dialog" label="&cancelButton.label;" onclick="doCancelButton()" /> 
 		 <spring flex="100%"/>
-	</box>
-</window>
\ No newline at end of file
+	</hbox>
+</window>
diff --git a/mailnews/base/resources/content/folderProps.xul b/mailnews/base/resources/content/folderProps.xul
index f7ea7c16c6ef..e6142db2045c 100644
--- a/mailnews/base/resources/content/folderProps.xul
+++ b/mailnews/base/resources/content/folderProps.xul
@@ -36,8 +36,8 @@
   onload="folderPropsOnLoad()" style="width: 36em;"
   class="dialog" orient="vertical">
  
-  <script language="Javascript" src="chrome://global/content/globalOverlay.js"></script>
-  <script language="JavaScript" src="chrome://messenger/content/folderProps.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
+  <script type="application/x-javascript" src="chrome://messenger/content/folderProps.js"></script>
 
 <keyset id="dialogKeys"/>  
 
@@ -87,5 +87,5 @@
   </tabpanels>
 </tabbox>
 
-<box align="right" id="okCancelButtonsRight"/>
+<hbox align="right" id="okCancelButtonsRight"/>
 </window>
diff --git a/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul b/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
index adb4e1bfc22e..66ff719ce3e2 100644
--- a/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
+++ b/mailnews/base/resources/content/mac/platformMailnewsOverlay.xul
@@ -8,4 +8,4 @@
 	<!-- Delete Key -->
 	<key id="cmd_shiftDelete" keycode="VK_BACK"  xulkey="false" modifiers="shift"/>
 
-</overlay>	
\ No newline at end of file
+</overlay>	
diff --git a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index ad71aa78a033..bd5432c3ee6a 100644
--- a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -128,8 +128,8 @@ Rights Reserved.
   </popup>
 
   <popup id="allHeadersPopup"  oncreate="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
-    <box id="allHeadersPopupContainer">
-    </box>
+    <hbox id="allHeadersPopupContainer">
+    </hbox>
   </popup>
 
   <popup id="messagePaneContext"/>
@@ -143,27 +143,27 @@ Rights Reserved.
   <!-- The main mail three pane frame -->
 
 
-  <box orient="horizontal" style="height:100px" flex="1">
-    <box id="sidebar-box" persist="collapsed width"/>
+  <hbox style="height:100px" flex="1">
+    <hbox id="sidebar-box" persist="collapsed width"/>
     <splitter id="sidebar-splitter" state="collapsed"/>
           
-    <box orient="vertical" flex="1">
-      <box id="mail3PaneVertLayoutBox" orient="horizontal" persist="collapsed height" flex="1">
-        <box orient="vertical" flex="1" autostrech="always" persist="width">
+    <vbox flex="1">
+      <hbox id="mail3PaneVertLayoutBox" persist="collapsed height" flex="1">
+        <vbox flex="1" autostrech="always" persist="width">
           <sidebarheader type="box" class="sidebarheader-main" label="&mail-sidebar-header.label;"/>
           <tree id="folderTree" flex="1" style="width:0px;" context="folderPaneContext" persist="collapsed width"/>
-        </box>
+        </vbox>
         <splitter id="gray_vertical_splitter" collapse="before"  persist="state"/>
 
-        <box id="mail3PaneVertLayoutBox" persist="collapsed width" flex="2">
-          <box id="threadpaneBox" flex="1" persist="width">
+        <hbox id="mail3PaneVertLayoutBox" persist="collapsed width" flex="2">
+          <hbox id="threadpaneBox" flex="1" persist="width">
             <outliner id="threadOutliner" flex="1" persist="width" style="width:0px" context="threadPaneContext" class="window-focusborder" focusring="false"/>
-          </box>
-          <box id="accountCentralBox" flex="1" persist="width"> 
+          </hbox>
+          <hbox id="accountCentralBox" flex="1" persist="width"> 
             <iframe name="accountCentralPane" style="width:0px;" flex="1" src="about:blank"/>
-          </box>
-        </box>
-      </box>
+          </hbox>
+        </hbox>
+      </hbox>
       <!-- if you change this id, please change GetThreadAndMessagePaneSplitter() and MsgToggleMessagePane() -->
       <splitter id="threadpane-splitter" collapse="after" persist="state"
 	 onmouseup="OnMouseUpThreadAndMessagePaneSplitter()"
@@ -171,16 +171,16 @@ Rights Reserved.
         <grippy onclick="OnClickThreadAndMessagePaneSplitterGrippy()"/>
       </splitter>
       <!-- msg header view -->
-      <box id="messagepanebox" orient="vertical" flex="4" persist="collapsed height" class="window-focusborder" focusring="false">
-        <box id="msgHeaderView"/>
+      <vbox id="messagepanebox" flex="4" persist="collapsed height" class="window-focusborder" focusring="false">
+        <hbox id="msgHeaderView"/>
 
         <!-- message view -->
         <browser id="messagepane" context="messagePaneContext" style="height: 0px" flex="1" name="messagepane" type="content-primary" src="about:blank" onclick="contentAreaClick(event);" ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"/>
-      </box>  
+      </vbox>  
 
-    </box>
+    </vbox>
 
-  </box>
+  </hbox>
 
 	<statusbar id="status-bar" class="mailwindow-statusbar">
 		<statusbarpanel id="unreadMessageCount" hidden="true" style="min-width: 5px"/>
diff --git a/mailnews/base/resources/content/mailNavigatorOverlay.xul b/mailnews/base/resources/content/mailNavigatorOverlay.xul
index ecb67c385465..bcab3dbe60b8 100644
--- a/mailnews/base/resources/content/mailNavigatorOverlay.xul
+++ b/mailnews/base/resources/content/mailNavigatorOverlay.xul
@@ -8,7 +8,7 @@
 <overlay id="mailNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function sendLink(pageUrl, pageTitle)
diff --git a/mailnews/base/resources/content/mailOverlay.xul b/mailnews/base/resources/content/mailOverlay.xul
index 815a6109c011..02a5b26de6ee 100644
--- a/mailnews/base/resources/content/mailOverlay.xul
+++ b/mailnews/base/resources/content/mailOverlay.xul
@@ -4,7 +4,7 @@
 <overlay id="mailOverlay.xul"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     function goNewCardDialog(selectedAB)
       {
diff --git a/mailnews/base/resources/content/mailTasksOverlay.xul b/mailnews/base/resources/content/mailTasksOverlay.xul
index cddcaec77c01..6672f6031f2a 100644
--- a/mailnews/base/resources/content/mailTasksOverlay.xul
+++ b/mailnews/base/resources/content/mailTasksOverlay.xul
@@ -10,7 +10,7 @@
 <overlay id="mailPrefsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     // uses "toOpenWindowByType" function provided by utilityOverlay.js
     // which is included by most clients. 
@@ -58,10 +58,10 @@
   </commandset>
   
 
-  <box id="component-bar" class="statusbar-panel" persist="collapsed">
+  <hbox id="component-bar" class="statusbar-panel" persist="collapsed">
     <button class="button-toolbar-4 taskbutton" id="mini-mail" oncommand="toMessengerWindow()" 
             position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
-  </box>
+  </hbox>
   
   <menupopup id="taskPopup">
     <menuitem position="2" accesskey="&messengerCmd.accesskey;" label="&messengerCmd.label;"  key="key_mail" command="Tasks:Mail"/>
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index e0fff749a2b1..eaa18b96697c 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -36,7 +36,7 @@ Rights Reserved.
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <!-- Context menu -->
-<script language="javascript">
+<script type="application/x-javascript">
   // Global variable that holds the nsContextMenu instance.
   var gMessagePaneContextMenu = null;
 </script>
@@ -1185,7 +1185,7 @@ Rights Reserved.
 
 <toolbox id="mailToolbarToolbox">
   <toolbar class="toolbar-primary chromeclass-toolbar" id="msgToolbar" persist="collapsed">
-    <box id="toolbar_button_box">
+    <hbox id="toolbar_button_box">
                         <menubutton class="menubutton-dual toolbar top" id="button-getmsg" 
                                     label="&getMsgButton.label;" crop="right" tooltip="aTooltip" 
                                     tooltiptext="&getMsgButton.tooltip;" 
@@ -1296,26 +1296,26 @@ Rights Reserved.
       </menubutton>
       <button class="button-toolbar-2 top" id="button-stop" label="&stopButton.label;"  tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
       <spring flex="1"/>
-            <box id="throbber-box" autostretch="never">
+            <hbox id="throbber-box" autostretch="never">
                 <button id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
-            </box>
-    </box>
+            </hbox>
+    </hbox>
   </toolbar>
 </toolbox>
 
 
 
 <statusbar id="status-bar"> 
-  <box insertbefore="unreadMessageCount" flex="1">
-    <box id="component-bar"/>
+  <hbox insertbefore="unreadMessageCount" flex="1">
+    <hbox id="component-bar"/>
     <statusbarpanel id="statusText" label="&statusText.label;" crop="right" flex="1"/> 
     <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0" oncommand="dumpProgress()"/> 
-  </box>
-  <box insertafter="totalMessageCount">
+  </hbox>
+  <hbox insertafter="totalMessageCount">
     <statusbarpanel checkfunc="MailCheckBeforeOfflineChange()" id="offline-status" class="statusbarpanel-icononly"/> 
     <statusbarpanel id="security-button" class="statusbarpanel-icononly"/>
 	  <resizer class="window-diagonal"/>
-  </box>
+  </hbox>
 </statusbar> 
 
 
diff --git a/mailnews/base/resources/content/messagePane.xul b/mailnews/base/resources/content/messagePane.xul
index 2b142052c61b..75d51138e3b6 100644
--- a/mailnews/base/resources/content/messagePane.xul
+++ b/mailnews/base/resources/content/messagePane.xul
@@ -15,9 +15,9 @@ window {
 } 
 
 </html:style>
-<box align="vertical" style="width: 100%; height: 100%">
-<box align="horizontal" flex="100%">
+<vbox style="width: 100%; height: 100%">
+<hbox flex="100%">
 <html:iframe name="browser.webwindow" width="100%" height="325px" flex="100%"> </html:iframe>
-</box>
-</box>
+</hbox>
+</vbox>
 </window>
diff --git a/mailnews/base/resources/content/messageWindow.xul b/mailnews/base/resources/content/messageWindow.xul
index a0a7cd350983..6d3df3e25ed5 100644
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -44,7 +44,7 @@ Rights Reserved.
         titlemenuseparator="&titleSeperator.label;"
         onload="OnLoadMessageWindow()"
         onunload="OnUnloadMessageWindow()"
-        align="vertical"
+        orient="vertical"
         width="750"
         height="500"
         persist="width height screenX screenY sizemode"
@@ -109,7 +109,7 @@ Rights Reserved.
     </popup>
 
     <popup id="allHeadersPopup"  oncreate="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
-      <box id="allHeadersPopupContainer"/>
+      <hbox id="allHeadersPopupContainer"/>
     </popup>
 
     <popup id="messagePaneContext"/>
@@ -124,12 +124,12 @@ Rights Reserved.
   </toolbox>
   
   <!-- msg header view -->
-  <box id="messagepanebox" align="vertical" flex="3" persist="collapsed">
-    <box id="msgHeaderView"/>
+  <vbox id="messagepanebox" flex="3" persist="collapsed">
+    <hbox id="msgHeaderView"/>
 
     <!-- message view -->
     <browser id="messagepane" context="messagePaneContext" style="height: 0px" flex="1" name="messagepane" type="content-primary" src="about:blank" onclick="contentAreaClick(event);" ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"/>
-  </box>  
+  </vbox>  
 
 
   <statusbar id="status-bar"/>
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index 335dba83343a..11cc6d0ab983 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -132,8 +132,8 @@ Rights Reserved.
   </popup>
 
   <popup id="allHeadersPopup"  oncreate="return fillAllHeadersPopup(document.popupNode);" popupanchor="bottomleft">
-    <box id="allHeadersPopupContainer">
-    </box>
+    <hbox id="allHeadersPopupContainer">
+    </hbox>
   </popup>
 
   <popup id="messagePaneContext"/>
@@ -145,21 +145,21 @@ Rights Reserved.
     <menubar id="mailMenubar"/>
   </toolbox>
 
-  <box style="height:100px" flex="1">
-    <box id="sidebar-box">
+  <hbox style="height:100px" flex="1">
+    <hbox id="sidebar-box">
       <sidebarheader type="box" class="sidebarheader-main" label="&mail-sidebar-header.label;"/>
       <tree id="folderTree" flex="1000" context="folderPaneContext"  />
-    </box>
+    </hbox>
           
     <splitter id="sidebar-splitter"/>
 
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
 
-      <box id="accountCentralBox" orient="vertical" flex="1">
+      <vbox id="accountCentralBox" flex="1">
                      <iframe name="accountCentralPane" flex="1" src="about:blank"/>
-                  </box>
+                  </vbox>
 
-      <box id="messagesBox" orient="vertical" flex="1">
+      <box orient="vertical" id="messagesBox" flex="1">
      
       <outliner id="threadOutliner" flex="2" persist="height" style="height:0px" context="threadPaneContext"/>
 
@@ -170,16 +170,16 @@ Rights Reserved.
         <grippy onclick="OnClickThreadAndMessagePaneSplitterGrippy()"/>
       </splitter>
       
-      <box id="messagepanebox" align="vertical" flex="3" persist="collapsed height" class="window-focusborder" focusring="false" onclick="contentAreaClick(event);" ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);">
-        <box id="msgHeaderView"/>
+      <vbox id="messagepanebox" flex="3" persist="collapsed height" class="window-focusborder" focusring="false" onclick="contentAreaClick(event);" ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);">
+        <hbox id="msgHeaderView"/>
     
         <browser id="messagepane" context="messagePaneContext" style="height: 0px" flex="1" name="messagepane" type="content-primary" src="about:blank"/>
-      </box>  
+      </vbox>  
       </box>
 
-   </box>             
+   </vbox>             
 
-  </box>
+  </hbox>
 
       <statusbar id="status-bar" class="mailwindow-statusbar">
         <statusbarpanel id="unreadMessageCount" style="min-width: 5px"/>
diff --git a/mailnews/base/resources/content/msgAccountCentral.xul b/mailnews/base/resources/content/msgAccountCentral.xul
index f636fca56da0..6384280307f5 100644
--- a/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mailnews/base/resources/content/msgAccountCentral.xul
@@ -62,34 +62,34 @@ Rights Reserved.
       <separator/>
 
       <row id="EmailHeader" class="acctCentralTitleRow">
-        <box class="acctCentralRowTitleBox">
+        <hbox class="acctCentralRowTitleBox">
           <html>&emailSectionHdr.label;</html> 
-        </box>
+        </hbox>
       </row>
       <separator id="EmailHeader.separator" class="thin"/>
       <row id="ReadMessages" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&readMsgsLink.label;" onclick="ReadMessages();"/> 
-        </box>
+        </hbox>
       </row>
       <separator id="ReadMessages.separator" class="thin"/>
       <row id="ComposeMessage" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&composeMsgLink.label;" onclick="ComposeAMessage();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="ComposeMessage.separator" class="thin"/>
 
       <row id="NewsHeader" class="acctCentralTitleRow">
-        <box class="acctCentralRowTitleBox">
+        <hbox class="acctCentralRowTitleBox">
           <html>&newsSectionHdr.label;</html> 
-        </box>
+        </hbox>
       </row>
       <separator id="NewsHeader.separator" class="thin"/>
       <row id="SubscribeNewsgroups" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&subscribeNewsLink.label;" onclick="SubscribeNewsgroups();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="SubscribeNewsgroups.separator" class="thin"/>
 
@@ -98,21 +98,21 @@ Rights Reserved.
       <separator id="MessagesSection.separator3"/>
 
       <row id="AccountsHeader" class="acctCentralTitleRow">
-        <box class="acctCentralRowTitleBox">
+        <hbox class="acctCentralRowTitleBox">
           <html>&accountsSectionHdr.label;</html> 
-        </box>
+        </hbox>
       </row>
       <separator id="AccountsHeader.separator" class="thin"/>
       <row id="AccountSettings" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&settingsLink.label;" onclick="ViewSettings();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="AccountSettings.separator" class="thin"/>
       <row id="CreateAccount" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&newAcctLink.label;" onclick="CreateNewAccount();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="CreateAccount.separator" class="thin"/>
 
@@ -121,27 +121,27 @@ Rights Reserved.
       <separator id="AccountsSection.separator3"/>
 
       <row id="AdvancedFeaturesHeader" class="acctCentralTitleRow">
-        <box class="acctCentralRowTitleBox">
+        <hbox class="acctCentralRowTitleBox">
           <html>&advFeaturesSectionHdr.label;</html> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="AdvancedFeaturesHeader.separator" class="thin"/>
       <row id="SearchMessages" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&searchMsgsLink.label;" onclick="SearchMessages();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="SearchMessages.separator" class="thin"/>
       <row id="CreateFilters" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&filtersLink.label;" onclick="CreateMsgFilters();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="CreateFilters.separator" class="thin"/>
       <row id="OfflineSettings" class="acctCentralRow">
-        <box> 
+        <hbox> 
           <text class="acctCentralText acctCentralLinkText" value="&offlineLink.label;" onclick="ViewSettings();"/> 
-        </box> 
+        </hbox> 
       </row>
       <separator id="OfflineSettings.separator" class="thin"/>
 
diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mailnews/base/resources/content/msgHdrViewOverlay.xul
index e0a40249066d..f50f2bd8d509 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -49,7 +49,7 @@ Rights Reserved.
     <text id="attachmentTreeTooltipText"/>
 </popup>
 
-<box id="msgHeaderView" persist="state">
+<hbox id="msgHeaderView" persist="state">
 <grid id="collapsedHeaderView" class="header-part1" flex="1" collapsed="true">
   <columns>
     <column class="collapsedToggleHdrBox" autostretch="never" >
@@ -187,5 +187,5 @@ Rights Reserved.
    </hbox>
 
   </hbox>
- </box>
+ </hbox>
 </overlay>
diff --git a/mailnews/base/resources/content/msgPrintEngine.xul b/mailnews/base/resources/content/msgPrintEngine.xul
index 6261e5f952f9..0048b3908e96 100644
--- a/mailnews/base/resources/content/msgPrintEngine.xul
+++ b/mailnews/base/resources/content/msgPrintEngine.xul
@@ -40,7 +40,7 @@ Rights Reserved.
         titlemenuseparator="&titleSeperator.label;"
 		    onload="OnLoadPrintEngine()"
 		    onunload="OnUnloadPrintEngine()"
-		    align="vertical"
+		    orient="vertical"
         width="150"
         height="250"
         screenX="10000"
diff --git a/mailnews/base/resources/content/msgSelectOffline.xul b/mailnews/base/resources/content/msgSelectOffline.xul
index 3272d2e403fe..9e71ba43edb8 100644
--- a/mailnews/base/resources/content/msgSelectOffline.xul
+++ b/mailnews/base/resources/content/msgSelectOffline.xul
@@ -40,14 +40,14 @@ Contributors:
         onload="selectOnLoad();">
 		
 <script src="chrome://global/content/strres.js"/>
-<script language="JavaScript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script language="JavaScript" src="chrome://messenger/content/commandglue.js"/>
-<script language="JavaScript" src="chrome://messenger/content/msgSynchronize.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
-<script language="JavaScript" src="chrome://messenger/content/mailCommands.js"/>
-<script language="JavaScript" src="chrome://messenger/content/mailWindow.js"/>
-<script language="JavaScript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 	
     <keyset id="keyset"/>
     <html class="desc">&MsgSelectDesc.label;</html>
@@ -103,5 +103,5 @@ Contributors:
     </grid>
 
     <separator/>
-    <box id="okCancelButtonsRight"/>
+    <hbox id="okCancelButtonsRight"/>
 </window>
diff --git a/mailnews/base/resources/content/msgSynchronize.xul b/mailnews/base/resources/content/msgSynchronize.xul
index 1e295254c26d..3a572e12be9e 100644
--- a/mailnews/base/resources/content/msgSynchronize.xul
+++ b/mailnews/base/resources/content/msgSynchronize.xul
@@ -38,9 +38,9 @@ Contributors:
         onload="OnLoad();">
 
 <script src="chrome://global/content/strres.js"/>
-<script language="JavaScript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script language="JavaScript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script language="JavaScript" src="chrome://messenger/content/msgSynchronize.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
 
     <keyset id="keyset"/>
     <text hidden="true" wsm_persist="true" id="server.type"/>
@@ -49,20 +49,20 @@ Contributors:
     <separator/>
     <html class="desc">&MsgSyncDirections.label;</html>
 
-    <box orient="vertical" class="indent">
+    <vbox class="indent">
         <checkbox id="syncMail" hidable="true" hidefor="pop3" label="&syncTypeMail.label;"/>
         <checkbox id="syncNews" label="&syncTypeNews.label;"/>
-    </box>
+    </vbox>
 
-    <box orient="vertical">
+    <vbox>
         <checkbox id="sendMessage" label="&sendMessage.label;"/>
         <checkbox id="workOffline" label="&workOffline.label;"/>
-    </box>
+    </vbox>
     <separator/>
-    <box orient="horizontal" align="right">
+    <hbox align="right">
         <button id="select" class="dialog" label="&selectButton.label;"  oncommand="OnSelect();"/>
-    </box>
+    </hbox>
 
     <separator/>
-    <box id="okCancelButtonsRight"/>
+    <hbox id="okCancelButtonsRight"/>
 </window>
diff --git a/mailnews/base/resources/content/newFolderDialog.xul b/mailnews/base/resources/content/newFolderDialog.xul
index 9e3d695bb945..9f038ff043bc 100644
--- a/mailnews/base/resources/content/newFolderDialog.xul
+++ b/mailnews/base/resources/content/newFolderDialog.xul
@@ -32,7 +32,7 @@
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newFolderDialog.title;"
-        align="vertical"
+        orient="vertical"
         class="dialog"
         onload="onLoad();">
 
@@ -42,7 +42,7 @@
 
   <keyset id="dialogKeys"/>
 
-  <box align="vertical">
+  <vbox>
 
     <spring flex="1"/>
 
@@ -53,12 +53,12 @@
 
     <text value="&description.label;" class="label" accesskey="&description.accesskey;" for="msgNewFolderPicker"/>
 
-    <box align="horizontal">
+    <hbox>
       <menu id="msgNewFolderPicker" oncommand="doEnabling();" crop="right" flex="1"/>
       <spring flex="1"/>
-    </box>
+    </hbox>
 
-    <box align="vertical" orient="vertical" hidden="true" id="newFolderTypeBox">
+    <vbox hidden="true" id="newFolderTypeBox">
 
       <separator class="thin"/>
 
@@ -73,14 +73,14 @@
         <spring flex="100%"/>
       </radiogroup>
 
-    </box>
+    </vbox>
 
     <spring flex="1"/>
 
     <separator/>
 
-    <box id="okCancelButtonsRight"/>
+    <hbox id="okCancelButtonsRight"/>
 
-  </box>
+  </vbox>
 
 </window>
diff --git a/mailnews/base/resources/content/openSaveAttachment.xul b/mailnews/base/resources/content/openSaveAttachment.xul
index 4eb9ace0bfa7..e8272094189e 100644
--- a/mailnews/base/resources/content/openSaveAttachment.xul
+++ b/mailnews/base/resources/content/openSaveAttachment.xul
@@ -7,21 +7,21 @@
 <window id="open-save-attachment"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   flex="100%" class="dialog" title="&openSaveAttachment.title;" 
-  align="vertical" onload="onLoad();" onclose="onCancel();" >
+  orient="vertical" onload="onLoad();" onclose="onCancel();" >
 
   <script src="chrome://messenger/content/openSaveAttachment.js"/>
 
-  <box width="360px">
-    <box orient="vertical">
+  <hbox width="360px">
+    <vbox>
       <image class="question-icon"/>
       <spring flex="1"/>
-    </box>
-    <box width="10px" />
-      <box orient="vertical" flex="1">
+    </vbox>
+    <hbox width="10px" />
+      <vbox flex="1">
       <separator class="thin"/>
-      <box id="documentNameBox">
+      <hbox id="documentNameBox">
         <text value="&openSaveAttachmentHeading.label;" />
-      </box>
+      </hbox>
       <separator class="thin"/>
       <html>&openSaveAttachmentWarning.label;</html>
       <separator class="thin"/>
@@ -32,8 +32,8 @@
         <radio group="openSaveGroup" id="saveIt" label="&openSaveAttachmentSave.label;" oncommand="onSave();" checked="true"/>
       </radiogroup>
       <separator class="thin"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
   <separator class="thin"/>
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/mailnews/base/resources/content/renameFolderDialog.xul b/mailnews/base/resources/content/renameFolderDialog.xul
index ba2da0b154d7..9e77ed40f6fc 100644
--- a/mailnews/base/resources/content/renameFolderDialog.xul
+++ b/mailnews/base/resources/content/renameFolderDialog.xul
@@ -32,7 +32,7 @@
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&renameFolderDialog.title;"
-        align="vertical"
+        orient="vertical"
         class="dialog"
         onload="onLoad();">
 
@@ -42,7 +42,7 @@
 
   <keyset id="dialogKeys"/>
 
-  <box align="vertical">
+  <vbox>
 
     <spring flex="100%"/>
 
@@ -51,8 +51,8 @@
 
     <spring flex="100%"/>
 
-    <box id="okCancelButtons"/>
+    <hbox id="okCancelButtons"/>
 
-  </box>
+  </vbox>
 
 </window>
diff --git a/mailnews/base/resources/content/sendMsgs.xul b/mailnews/base/resources/content/sendMsgs.xul
index 3448774a6617..0b4092216d0b 100644
--- a/mailnews/base/resources/content/sendMsgs.xul
+++ b/mailnews/base/resources/content/sendMsgs.xul
@@ -36,11 +36,11 @@ Rights Reserved.
 	<checkbox  wsm_persist="true" id="offline.sendUnsentMessages" label="&alwaysAsk.check.label;" />
 	<spring flex="100%"/>
 
-	<box align="horizontal" autostretch="never">
+	<hbox autostretch="never">
 		 <spring flex="100%"/>
 		 <button id="buttonClicked:yes" class="dialog" label="&yesButton.label;"  onclick="doYesButton()" /> 
 		 <button id="buttonClicked:no" class="dialog" label="&noButton.label;" onclick="doNoButton()" />
 		 <button id="buttonClicked:cancel" class="dialog" label="&cancelButton.label;" onclick="doCancelButton()" /> 
 		 <spring flex="100%"/>
-	</box>
-</window>
\ No newline at end of file
+	</hbox>
+</window>
diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index 2d6b4a3c23c5..600994fa18c3 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -43,9 +43,9 @@ Rights Reserved.
 <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
-<script language="JavaScript" src="chrome://messenger/content/mailCommands.js"/>
-<script language="JavaScript" src="chrome://messenger/content/mailWindow.js"/>
-<script language="JavaScript" src="chrome://messenger/content/subscribe.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
 
   <keyset id="dialogKeys"/>
 
@@ -94,7 +94,7 @@ Rights Reserved.
       </row>
       <row flex="1">
       <deck id="subscribedeck" index="0">
-      <box id="normalview">
+      <hbox id="normalview">
         <tree class="inset" flex="1"
               id="subscribetree"
               datasources="rdf:null"
@@ -129,8 +129,8 @@ Rights Reserved.
             </treerow>
           </treehead> 
         </tree>
-     </box>
-     <box id="searchview">
+     </hbox>
+     <hbox id="searchview">
        <outliner id="searchOutliner" flex="1" onclick="SearchOnClick(event);"> 
          <outlinercol id="nameCol" label="..." class="outlinercol-header outlinercol-inset-header" flex="5" width="0" persist="hidden width" />
          <splitter class="tree-splitter" />
@@ -139,15 +139,15 @@ Rights Reserved.
          <outlinercol id="messagesCol" label="&messagesHeader.label;" class="outlinercol-header outlinercol-inset-header" flex="1" width="0" persist="hidden width" />
          <outlinerbody id="searchOutlinerBody" flex="1" />
        </outliner>
-     </box>
+     </hbox>
      </deck>
-        <box orient="vertical">
+        <vbox>
           <button id="subscribe" class="dialog" label="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/>
           <button id="unsubscribe" class="dialog" label="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
           <button id="refresh" class="dialog" label="&refreshButton.label;" oncommand="Refresh()"/>
           <button id="stop" class="dialog" label="&stopButton.label;" oncommand="Stop()"/>
           <spring flex="1"/>
-        </box>
+        </vbox>
       </row>
       <row>
         <statusbar id="status-bar" class="chromeclass-status"/>
@@ -157,6 +157,6 @@ Rights Reserved.
   
   <separator/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/search/resources/content/FilterEditor.xul b/mailnews/base/search/resources/content/FilterEditor.xul
index c865f16308c8..2101b23245fe 100644
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@@ -62,7 +62,7 @@ Contributor(s):
 
   <vbox>
     <text class="label" value="&conditionDesc.label;"/>
-    <box id="searchTermListBox" flex="1"/>
+    <hbox id="searchTermListBox" flex="1"/>
   </vbox>
 
   <separator/>
@@ -101,6 +101,6 @@ Contributor(s):
 
   <separator/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/search/resources/content/FilterListDialog.xul b/mailnews/base/search/resources/content/FilterListDialog.xul
index 09efe8869eed..39c77208a3a7 100644
--- a/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -36,7 +36,7 @@ Contributor(s):  H
   persist="width height screenX screenY"
   title="&window.title;">
 
-  <script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/FilterListDialog.js"/>
   <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
 
   <keyset id="dialogKeys"/>
@@ -128,6 +128,6 @@ Contributor(s):  H
      
   <separator/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index 443b14fb2a45..e657399db192 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -45,7 +45,7 @@ Rights Reserved.
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script src="chrome://messenger/content/mailWindow.js"/>
   <script src="chrome://messenger/content/threadPane.js"/>
   <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
@@ -67,40 +67,40 @@ Rights Reserved.
   </commands>
 
   <dummy class="usesMailWidgets"/>
-  <box flex="1" orient="vertical">
+  <vbox flex="1">
     
-    <titledbox orient="vertical" flex="1">
+    <groupbox orient="vertical" flex="1">
       <label value="&conditions.label;"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <text class="label" value="&searchHeading.label;"/>
         <menulist id="searchableFolders" flex="2"/>
         <spring flex="1"/>
           <checkbox id="checkSearchSubFolders" label="&searchSubfolders.label;" checked="true"/>
-      </box>
+      </hbox>
       <separator/>
       <text class="label" value="&conditionDesc.label;"/>
 
-      <box flex="1">
-        <box id="searchTermListBox" flex="1"/>
-        <box orient="vertical">
+      <hbox flex="1">
+        <hbox id="searchTermListBox" flex="1"/>
+        <vbox>
            <spring flex="1"/>
            <button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);"/>
            <button label="&resetButton.label;" oncommand="onReset(event);"/>
            <spring flex="1"/>
-         </box>
-      </box>
-    </titledbox>
+         </vbox>
+      </hbox>
+    </groupbox>
     
     <splitter id="gray_horizontal_splitter" collapse="after" persist="state"/>
     
-    <titledbox orient="horizontal" flex="1">
+    <groupbox orient="horizontal" flex="1">
        <label value="&results.label;"/>
-       <box id="searchTermListBox" orient="vertical" flex="1">
+       <box orient="vertical" id="searchTermListBox" flex="1">
             <outliner id="threadOutliner" flex="1" context="threadPaneContext"/>
             <statusbar id="status-bar" class="chromeclass-status"/>
 
        </box>
-       <box orient="vertical">
+       <vbox>
             <spring flex="1" />
             <button label="&openButton.label;" id="openButton" command="cmd_open" />
             <menubutton id="fileMessageButton" label="&fileButton.label;"
@@ -169,9 +169,9 @@ Rights Reserved.
 
             <button label="&deleteButton.label;" id="deleteButton" command="button_delete"/>
             <spring flex="1" />
-       </box>      
-    </titledbox>
-  </box>
+       </vbox>      
+    </groupbox>
+  </vbox>
   <statusbar id="status-bar"/>
   
 </window>
diff --git a/mailnews/base/search/resources/content/SearchOptions.xul b/mailnews/base/search/resources/content/SearchOptions.xul
index 3ef8ad5ac920..6e8ab24fd1f1 100644
--- a/mailnews/base/search/resources/content/SearchOptions.xul
+++ b/mailnews/base/search/resources/content/SearchOptions.xul
@@ -27,13 +27,13 @@ Rights Reserved.
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&searchOptionsTitle.label;">
 
-<box align="vertical" style="width: 100%; height: 100%">
+<vbox style="width: 100%; height: 100%">
   <html:div>
     <html:input type="checkbox" name="searchSubfolders" id="searchSubfolders"/>
     &searchSubfoldersCheckbox.label;
   </html:div>
   <html:div>&localRemoteTitle.label;</html:div>
-  <box align="vertical" class="cleanborder">
+  <vbox class="cleanborder">
     <html:div>
       <html:input type="checkbox" name="localremote" id="local"/>
       &localSearchRadio.label;
@@ -42,5 +42,5 @@ Rights Reserved.
       <html:input type="checkbox" name="localremote" id="remote"/>
       &localSearchRadio.label;
     </html:div>
-  </box>
-</box>
+  </vbox>
+</vbox>
diff --git a/mailnews/base/search/resources/content/searchTermOverlay.xul b/mailnews/base/search/resources/content/searchTermOverlay.xul
index c2aa0edeef4d..011c73bd160e 100644
--- a/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mailnews/base/search/resources/content/searchTermOverlay.xul
@@ -28,7 +28,7 @@
 
   <script src="chrome://messenger/content/searchTermOverlay.js"/>
 
-  <box orient="vertical" id="searchTermListBox" class="indent">
+  <vbox id="searchTermListBox" class="indent">
 
     <radiogroup id="booleanAndGroup"
                 selectedItem="or" oncommand="booleanChanged(event);">
@@ -36,8 +36,8 @@
       <radio group="booleanAndGroup" checked="true" value="or" label="&matchAny.label;"/>
     </radiogroup>
     
-    <box flex="1">
-      <box id="searchterms"/>
+    <hbox flex="1">
+      <hbox id="searchterms"/>
       <tree class="inset" flex="1" id="searchTermTree" style="height: 100px; min-height: 50px;">
         <treecolgroup>
           <treecol flex="1"/>
@@ -80,11 +80,11 @@
         
         </treechildren>
       </tree>
-    </box>
-    <box>
+    </hbox>
+    <hbox>
       <button id="more" label="&more.label;" oncommand="onMore(event);"/>
       <button id="less" label="&less.label;" disabled="true" oncommand="onLess(event);"/>
-    </box>
-  </box>
+    </hbox>
+  </vbox>
 
 </overlay>
diff --git a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index 41e914344ac1..e32b4f6570c1 100644
--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -54,12 +54,12 @@
   ]]>
   </script>  
     
-  <box class="box-smallheader" title="&pane.title;"/>
+  <hbox class="box-smallheader" title="&pane.title;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&forwardReply.label;"/>
     
-    <box autostretch="never">
+    <hbox autostretch="never">
       <text class="label" value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
       <menulist id="forwardMessageMode" 
                 pref="true" preftype="int" prefstring="mail.forward_message_mode"
@@ -69,13 +69,13 @@
           <menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
         </menupopup>
       </menulist>
-    </box>
-    <box autostretch="never">
+    </hbox>
+    <hbox autostretch="never">
       <checkbox id="autoQuote" label="&autoQuote.label;" 
                 pref="true" preftype="bool" prefstring="mail.auto_quote"
                 prefattribute="checked" oncommand="doEnabling();"/>
-    </box>
-    <box class="indent" autostretch="never" id="thenBox">
+    </hbox>
+    <hbox class="indent" autostretch="never" id="thenBox">
       <text class="label" value="&then.label;" accesskey="&then.accesskey;" for="replyOnTop"/>
       <menulist id="replyOnTop" pref="true" preftype="int" prefstring="mailnews.reply_on_top"
                 prefattribute="value">
@@ -85,11 +85,11 @@
           <menuitem value="2" label="&selectAndQuote.label;" accesskey="&selectAndQuote.accesskey;"/>
         </menupopup>
       </menulist>        
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
   <!-- Composing Mail -->
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&sendingMessagesHeader.label;"/>
         
     <checkbox id="spellCheckBeforeSend" label="&spellCheck.label;"
@@ -100,14 +100,14 @@
                 pref="true" preftype="bool" prefstring="mail.strictly_mime"
                 prefattribute="checked"/>
     
-	<box autostretch="never">
+	<hbox autostretch="never">
 	<text class="label" value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" for="wrapLength"/>
     <textbox id="wrapLength" size="3" pref="true" preftype="int"
                prefstring="mailnews.wraplength" prefattribute="value"/>
     <text class="label" value="&char.label;"/>
-  </box>
+  </hbox>
 
-   <box autostretch="never">
+   <hbox autostretch="never">
     <text class="label" value="&sendDefaultCharset.label;" accesskey="&sendDefaultCharset.accesskey;" for="sendDefaultCharsetList"/>
     <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
               pref="true" preftype="string" prefstring="mailnews.send_default_charset"
@@ -118,14 +118,14 @@
         </menupopup>
       </template>
     </menulist>       
-    </box> 
-  </titledbox>
+    </hbox> 
+  </groupbox>
   
 <!--
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
   <label value="&languages.label;"/>
 
-   <box autostretch="never">
+   <hbox autostretch="never">
     <text class="label" value="&sendDefaultCharset.label;" for="sendDefaultCharsetList"/>
     <menulist id="sendDefaultCharsetList" ref="NC:MaileditCharsetMenuRoot" datasources="rdf:charset-menu"
               pref="true" preftype="string" prefstring="mailnews.send_default_charset"
@@ -136,8 +136,8 @@
         </menupopup>
       </template>
     </menulist>       
-    </box> 
-  </titledbox>
+    </hbox> 
+  </groupbox>
 -->
               
       
diff --git a/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mailnews/compose/prefs/resources/content/pref-formatting.xul
index d8f6c7f5d5f6..f318d263e891 100644
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -37,7 +37,7 @@
                 prefattribute="value"
                 wsm_attributes="value"/>
   
-  <box class="box-smallheader" title="&pane.title;"/>
+  <hbox class="box-smallheader" title="&pane.title;"/>
 
   <html>&sendMaildesc.label;</html>
 
@@ -52,7 +52,7 @@
     
   <html>&override.label;</html>
 
-  <titledbox orient="vertical" flex="1">
+  <groupbox orient="vertical" flex="1">
     <label value="&domain.title;"/>
 
     <html>&domaindesc.label;</html>
@@ -101,5 +101,5 @@
         </hbox>
       </vbox>
     </hbox>
-  </titledbox>
+  </groupbox>
 </window>
diff --git a/mailnews/compose/resources/content/MsgAttachPage.xul b/mailnews/compose/resources/content/MsgAttachPage.xul
index 6d3971c42f1e..338e3d92c143 100644
--- a/mailnews/compose/resources/content/MsgAttachPage.xul
+++ b/mailnews/compose/resources/content/MsgAttachPage.xul
@@ -9,22 +9,22 @@
 <window title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
-    align="vertical"
+    orient="vertical"
     class="dialog"> 
 
-<script language="JavaScript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/> 
+<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/> 
 
 	<keyset id="dialogKeys"/>
 
     <spring style="height:0.5em" />
-	<box align="horizontal">
+	<hbox>
         <spring style="width:10px" />
 		<text value="Web Page (URL):"/>
 		<textbox id="attachurl" align="bottom" style="min-width:200px; padding-bottom:0px" />
         <spring style="width:10px" />
-	</box>
+	</hbox>
 	
     <spring style="height:1em"/>
-	<box id="okCancelButtons"/> 
+	<hbox id="okCancelButtons"/> 
     <spring style="height:0.5em" />
 </window>
diff --git a/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index 21876b88b1dc..800b1d7465a8 100644
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -25,7 +25,7 @@ Rights Reserved.
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
 
   <!-- Addressing Widget -->
   <tree id="addressingWidgetTree"
diff --git a/mailnews/compose/resources/content/askSendFormat.xul b/mailnews/compose/resources/content/askSendFormat.xul
index a1cbcf1f84ca..0b3ca5ef9362 100644
--- a/mailnews/compose/resources/content/askSendFormat.xul
+++ b/mailnews/compose/resources/content/askSendFormat.xul
@@ -16,56 +16,56 @@
     style="-moz-user-input: ignore"
     >
 
-<script language="JavaScript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
 
 <keyset id="dialogKeys"/>
 
     <spring style="height:0.5em"/>
-    <box align="horizontal">
+    <hbox>
         <spring style="width:10px"/>
-        <box orient="vertical" id="askImageBox">
+        <vbox id="askImageBox">
             <image id="convertDefault" />
-        </box>
+        </vbox>
         <spring style="width:10px"/>
-        <box orient="vertical" flex="1">
+        <vbox flex="1">
             <html>&recipient.label;</html>
             <deck id="mailSendFormatExplanation">
-                <box orient="vertical"><html>&convertibleDefault.label;</html></box>  <!-- Hack: <box> is a workaround for bug 44513. -->
-                <box orient="vertical"><html>&convertibleYes.label;</html></box>
-                <box orient="vertical"><html>&convertibleAltering.label;</html></box>
-                <box orient="vertical"><html>&convertibleNo.label;</html></box>
+                <vbox><html>&convertibleDefault.label;</html></vbox>  <!-- Hack: <vbox> is a workaround for bug 44513. -->
+                <vbox><html>&convertibleYes.label;</html></vbox>
+                <vbox><html>&convertibleAltering.label;</html></vbox>
+                <vbox><html>&convertibleNo.label;</html></vbox>
             </deck>
             <html>&question.label;</html>
             <spring style="height:1em"/>
 
       <radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never">
-         <box orient="horizontal">
+         <hbox>
                 <radio group="mailDefaultHTMLAction" id="SendPlainTextAndHtml" value="0" label="&plainTextAndHtml.label;"/>
                 <html id="plainTextAndHtmlRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
                 <!-- Hack: box and html are workarounds for bug 49623 -->
-               </box>
-         <box orient="horizontal">
+               </hbox>
+         <hbox>
         <radio group="mailDefaultHTMLAction" id="SendPlainTextOnly" value="1" label="&plainTextOnly.label;"/>
                 <html id="plainTextOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
-               </box>
-         <box orient="horizontal">
+               </hbox>
+         <hbox>
         <radio group="mailDefaultHTMLAction" id="SendHtmlOnly" value="2" label="&htmlOnly.label;"/>
                 <html id="htmlOnlyRecommended" hidden="true" style="margin-top: 4px;">&recommended.label;</html>
-               </box>
+               </hbox>
       </radiogroup>
 
-        </box>
+        </vbox>
         <spring style="width:10px"/>
-    </box>
+    </vbox>
       
     <spring style="height:1em"/>
-  <box id="okCancelButtons"
+  <hbox id="okCancelButtons"
         button1Label="&send.label;"
         button2Label="&cancel.label;"
       button3Label="&recipients.label;"
       button4Label="&help.label;"
   />
-  <box id="hiddenLabels"
+  <hbox id="hiddenLabels"
         plainTextAndHtmlRecommendedLabel="&plainTextAndHtmlRecommended.label;"
         plainTextOnlyRecommendedLabel="&plainTextOnlyRecommended.label;"
         htmlOnlyRecommendedLabel="&htmlOnlyRecommended.label;"
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 0f1c93ce5235..dfe299faf5ee 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -410,7 +410,7 @@
     </menubar>
 
     <toolbar class="toolbar-primary chromeclass-toolbar" id="composeToolbar" persist="collapsed">
-      <box id="toolbar_button_box">
+      <hbox id="toolbar_button_box">
        <button class="button-toolbar-2 top" 
                id="button-send" label="&sendButton.label;"
                tooltip="aTooltip" tooltiptext="&sendButton.tooltip;" 
@@ -440,33 +440,33 @@
                tooltip="aTooltip" tooltiptext="&saveButton.tooltip;" 
                command="cmd_saveDefault"/>
        <spring flex="1"/>
-       <box id="throbber-box" autostretch="never">
+       <hbox id="throbber-box" autostretch="never">
          <button id="navigator-throbber" 
                oncommand="goClickThrobber('compose.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
            <observes element="broadcaster_throbber" attribute="busy"/>
          </button>
-       </box>
-       </box>
+       </hbox>
+       </hbox>
     </toolbar>
   
     <toolbar id="MsgHeadersToolbar" persist="collapsed" tborient="vertical" tbautostretch="always" flex="1">
-      <box id="msgheaderstoolbar-box" flex="1">
-        <box orient="vertical" flex="75">
-          <box autostretch="never">
+      <hbox id="msgheaderstoolbar-box" flex="1">
+        <vbox flex="75">
+          <hbox autostretch="never">
             <text class="label" value="&fromAddr.label;"/>
             <menulist id="msgIdentity" label="..." flex="1" oncommand="LoadIdentity(false);">
               <menupopup id="msgIdentityPopup"/>
             </menulist>
-          </box> 
+          </hbox> 
           <tree id="addressingWidgetTree" flex="1"/>
-          <box autostretch="never">
+          <hbox autostretch="never">
             <text class="label" value="&subject.label;" accesskey="&subject.accesskey;"/>
             <textbox id="msgSubject" flex="1" class="toolbar" onkeyup="SetComposeWindowTitle(event.which);"
                        onkeypress="subjectKeyPress(event);" onchange="contentChanged=true;"/>
-          </box>
-        </box>
+          </hbox>
+        </vbox>
         <splitter id="attachmentbucket-sizer" collapse="after"/>
-        <box orient="vertical" flex="25">
+        <vbox flex="25">
           <text class="label" id="attachmentBucketText" value="&attachments.label;" crop="right"
                 accesskey="&attachments.accesskey;"/>
           <tree id="attachmentBucket" class="inset toolbar" flex="1" style="height: 0px; width: 0px;"
@@ -483,8 +483,8 @@
             </treecolgroup>
             <treechildren id="bucketBody" flex="1"/>
           </tree>
-        </box>
-      </box>
+        </vbox>
+      </hbox>
     </toolbar>
   
     <!-- These toolbar items get filled out from the editorOverlay -->
@@ -514,13 +514,13 @@
   <splitter id="compose-toolbar-sizer" onmousedown="awSizerListen()" collapse="after"/>
 
   <!-- The mail message body frame -->
-  <box id="appcontent" orient="vertical" flex="1">
+  <vbox id="appcontent" flex="1">
     <editor type="content-primary" id="content-frame" src="about:blank" name="browser.message.body" flex="1"
             onkeypress="editorKeyPress(event);"/>
-  </box>
+  </vbox>
 
   <statusbar id="status-bar">
-    <box id="component-bar"/>
+    <hbox id="component-bar"/>
     <statusbarpanel id="statusText" flex="1" label="&defaultStatusText.label;"/>
 
     <progressmeter id="compose-progressmeter" class="progressmeter-statusbar" 
diff --git a/mailnews/compose/resources/content/sendProgress.xul b/mailnews/compose/resources/content/sendProgress.xul
index fd3e44cd7b8b..5769b9f6ed45 100644
--- a/mailnews/compose/resources/content/sendProgress.xul
+++ b/mailnews/compose/resources/content/sendProgress.xul
@@ -41,7 +41,7 @@ Contributor(s):
         onload="onLoad()"
         onunload="onUnload()">
 
-  <script type="text/javascript" src="chrome://messenger/content/messengercompose/sendProgress.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/sendProgress.js"/>
 
     <!-- This is non-visible content that simply adds translatable string
          into the document so that it is accessible to JS code.
@@ -65,29 +65,29 @@ Contributor(s):
       
       <rows>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&status;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.status"/>
         </row>
         <row class="thin-separator">             
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&progress;"/>
-          </box>
+          </hbox>
           <progressmeter id="dialog.progress" mode="normal" value="0"/>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" id="dialog.progressText"/>
-          </box>
+          </hbox>
         </row>
       </rows>
     </grid>
     
     <!-- remove the cancel button until we finish the backend code
-    <box id="CancelButton">
+    <hbox id="CancelButton">
       <spring flex="1"/>
       <button class="dialog" id="cancel" label="&dialogCancel.label;" oncommand="doCancelButton()"/>
       <spring flex="1"/>
-    </box>
+    </hbox>
     -->
 
 </window>
diff --git a/mailnews/import/resources/content/fieldMapExport.xul b/mailnews/import/resources/content/fieldMapExport.xul
index 7ca28df33b14..4caaf05ca463 100644
--- a/mailnews/import/resources/content/fieldMapExport.xul
+++ b/mailnews/import/resources/content/fieldMapExport.xul
@@ -34,24 +34,24 @@ Rights Reserved.
     class="dialog"
         style="padding:0px"
         onload="OnLoadFieldMapExport()"
-        align="vertical">
+        orient="vertical">
 
 <html:script src="chrome://messenger/content/fieldMapExport.js"/>
-<!--html:script language="JavaScript" src="resource:/res/samples/DumpDOM.js"/-->
+<!--html:script type="application/x-javascript" src="resource:/res/samples/DumpDOM.js"/-->
 
   <keyset id="dialogKeys"/>
 
-  <box align="horizontal">
+  <hbox>
   
     <spring style="width:3em"/>
     
     <!-- field list -->
-    <box align="vertical">
+    <vbox>
       <spring style="height:1em"/>
       <html:div id="fieldLabel">Ye old fields</html:div>
       <spring style="height:.5em"/>
         
-      <box align="vertical" style="border: 1px inset white">
+      <vbox style="border: 1px inset white">
         <html:div style="width:10em; height:200px" flex="1">
           <tree id="fieldList" style="width:100%; height:100%" onselect="FieldSelectionChanged()">
                                                 <treecolgroup>
@@ -60,30 +60,30 @@ Rights Reserved.
             <treechildren id="fieldBody" flex="1"/>
           </tree>
         </html:div>
-      </box>
+      </vbox>
             
       <spring style="height:1.5em"/>
       
-    </box>
+    </vbox>
     
     <spring style="width: 1em"/>
 
-    <box align="vertical" style="height:270px">
+    <vbox style="height:270px">
       <spring flex="50%"/>
       <button class="dialog push" onclick="OnAddExport()" label="&fieldMapExport.add;"/>
       <button class="dialog push" onclick="OnAddAllExport()" label="&fieldMapExport.addAll;"/>
       <spring flex="50%"/>
-    </box>
+    </vbox>
 
     <spring style="width:1em"/>
 
     <!-- export list -->
-    <box align="vertical">
+    <vbox>
       <spring style="height:1em"/>
       <html:div id="exportLabel">Export fields</html:div>
       <spring style="height:.5em"/>
         
-      <box align="vertical" style="border: 1px inset white">
+      <vbox style="border: 1px inset white">
         <html:div style="width:10em; height:200px" flex="1">
           <tree id="exportList" style="width:100%; height:100%" 
               onselect="ExportSelectionChanged()"
@@ -95,17 +95,17 @@ Rights Reserved.
             <treechildren id="exportBody"/>
           </tree>
         </html:div>
-      </box>
+      </vbox>
             
       <spring style="height:1.5em"/>
       
-    </box>
+    </vbox>
   
     <spring style="width:3em"/>
 
-  </box>
+  </hbox>
 
   <!-- OK & Cancel buttons -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/import/resources/content/fieldMapImport.xul b/mailnews/import/resources/content/fieldMapImport.xul
index 810d21f86361..b1d3d4fc2a73 100644
--- a/mailnews/import/resources/content/fieldMapImport.xul
+++ b/mailnews/import/resources/content/fieldMapImport.xul
@@ -32,14 +32,14 @@ Rights Reserved.
         title="&fieldMapImport.title;"
     class="dialog"
         onload="OnLoadFieldMapImport()"
-        align="vertical">
+        orient="vertical">
 
   <script type="application/x-javascript" src="chrome://messenger/content/fieldMapImport.js"/>
 
   <keyset id="dialogKeys"/>
 
   <!-- field list -->
-  <box id="fieldList-box" align="vertical">
+  <vbox id="fieldList-box">
     <tree id="fieldList" flex="1"
         ondragover="return DragOverTree(event);"
         ondraggesture="return BeginDrag( event);"
@@ -58,11 +58,11 @@ Rights Reserved.
 
       <treechildren id="fieldBody" flex="1"/>
     </tree>
-  </box>
+  </vbox>
   
   <spring style="height: .5em"/>
 
-  <box align="horizontal">
+  <hbox>
     <spring flex="50%"/>
     <button class="dialog" id="previous" oncommand="OnPreviousRecord()" label="&fieldMapImport.previous;"/>
     <spring style="width: 2em"/>
@@ -72,11 +72,11 @@ Rights Reserved.
     <spring style="width: 2em"/>
     <button class="dialog" id="next" oncommand="OnNextRecord()" label="&fieldMapImport.next;"/>
     <spring flex="50%"/>    
-  </box>
+  </hbox>
 
   <spring style="height: 2em"/>
 
   <!-- OK & Cancel buttons -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/mailnews/import/resources/content/importDialog.xul b/mailnews/import/resources/content/importDialog.xul
index d8ff42ca5840..7b1394ae04ef 100644
--- a/mailnews/import/resources/content/importDialog.xul
+++ b/mailnews/import/resources/content/importDialog.xul
@@ -41,12 +41,12 @@ Rights Reserved.
 
   <keyset id="dialogKeys"/>
   
-  <box class="box-header" id="header"
+  <hbox class="box-header" id="header"
        title="&importTitle.label;"
        description="&importDesc.label;"/>
 
   <deck id="stateDeck" index="0">
-    <box class="wizard-box" orient="vertical">
+    <vbox class="wizard-box">
       <html>&importDescription.label;</html>
       <html>&importDescription2.label;</html>
       <separator/>
@@ -57,8 +57,8 @@ Rights Reserved.
         <radio group="importFields" value="mail" id="mailRadio" label="&importDialog.mailTitle;"/>
         <radio group="importFields" value="settings" id="settingsRadio" label="&importDialog.settingsTitle;"/>
       </radiogroup>
-    </box>
-    <box class="wizard-box" orient="vertical">
+    </vbox>
+    <vbox class="wizard-box">
       <html>&selectDescription.label;</html>
       <tree class="inset" id="moduleList" flex="3" onselect="ImportSelectionChanged(); enableAdvance();" 
             style="height: 0px;">
@@ -68,30 +68,30 @@ Rights Reserved.
         <treechildren id="bucketBody" flex="1"/>
       </tree>
       <html id="description" class="box-padded" flex="1"/>
-    </box>
-    <box class="wizard-box" orient="vertical">
+    </vbox>
+    <vbox class="wizard-box">
       <spring flex="1"/>
-      <titledbox orient="vertical">
+      <groupbox orient="vertical">
         <label id="progressTitle" value="&title.label;"/>
         <text class="label indent" id="progressStatus" value="&processing.label;"/>
-        <box class="box-padded" orient="vertical">
+        <vbox class="box-padded">
           <progressmeter id="progressMeter" mode="normal" value="5"/>
-        </box>
-      </titledbox>
-    </box>
-    <box class="wizard-box" orient="vertical">
+        </vbox>
+      </groupbox>
+    </vbox>
+    <vbox class="wizard-box">
       <html id="status"/>
-      <box style="overflow: auto" class="inset color-window" flex="1">
+      <hbox style="overflow: auto" class="inset color-window" flex="1">
         <html id="results" flex="1"/>
-      </box>
-    </box>
+      </hbox>
+    </vbox>
   </deck>
 
   <separator/>
   
   <separator class="groove"/>
   
-  <box class="box-padded">
+  <hbox class="box-padded">
     <spring flex="1"/>
     <button id="back" label="&back.label;" disabled="true"
             oncommand="back();"/>
@@ -100,7 +100,7 @@ Rights Reserved.
     <separator orient="vertical"/>
     <button id="cancel" label="&cancel.label;"
             oncommand="close();"/>
-  </box>
+  </hbox>
   
 
 </window>
diff --git a/mailnews/news/resources/content/downloadheaders.xul b/mailnews/news/resources/content/downloadheaders.xul
index 95f7520be426..3c3dd76c89cb 100644
--- a/mailnews/news/resources/content/downloadheaders.xul
+++ b/mailnews/news/resources/content/downloadheaders.xul
@@ -42,21 +42,21 @@ Contributor(s):
   <html class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel"/> 
   <html style="width: 25em; max-width: 25em;" id="info"/>
   <separator class="thin"/>
-  <box class="indent" orient="vertical">
+  <vbox class="indent">
     <radiogroup orient="vertical" id="downloadGroup" autostretch="never">
       <radio group="downloadGroup" id="all" label="&all.label;" oncommand="setupDownloadUI(false);"/> 
       <separator class="thin"/>
-      <box autostretch="never" valign="middle">
+      <hbox autostretch="never" valign="middle">
         <radio group="downloadGroup" id="some" checked="true" label="&download.label;" oncommand="setupDownloadUI(true);"/>
         <textbox id="number" size="7"/>
         <text class="label" value="&headers.label;" />
-      </box>
+      </hbox>
     </radiogroup>
-    <box class="indent" autostretch="never">
+    <hbox class="indent" autostretch="never">
       <checkbox id="markread" label="&mark.label;"/>
-    </box>
-  </box>
+    </hbox>
+  </vbox>
   <separator/>
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
   
 </window>
diff --git a/profile/pref-migrator/resources/content/no_space.xul b/profile/pref-migrator/resources/content/no_space.xul
index f653b99c4b3f..fbb909ee4f93 100644
--- a/profile/pref-migrator/resources/content/no_space.xul
+++ b/profile/pref-migrator/resources/content/no_space.xul
@@ -37,28 +37,28 @@ Contributor(s):
   <script src="chrome://communicator/content/profile/no_space.js"></script>
   <keyset id="keyset"/>
 
-  <box flex="1">
-    <box orient="horizontal">
+  <hbox flex="1">
+    <hbox>
         <text id="outOfSpace" value="&errorText1.label;"/>
         <spring flex="100%"/>
         <image id="info.icon" class="message-icon"/>
-    </box>
+    </hbox>
     <separator orient="vertical" class="thin"/>
-  </box>
+  </hbox>
 
   <spring flex="50%"/>
 
-  <box orient="horizontal" id="errorTextBody">
+  <hbox id="errorTextBody">
       <text value="&errorText2.label;"/>
-  </box>
+  </hbox>
 
   <spring flex="50%"/>
 
   <separator class="thin"/>
-  <box class="selection" id="RetryNewCancelButtons">
+  <hbox class="selection" id="RetryNewCancelButtons">
       <button class="dialog push" id="retry" default="true" label="&buttonRetry.label;" oncommand="OnRetry();"/> 
       <button class="dialog push" id="createNew" label="&buttonCreateNew.label;"  oncommand="OnCreateNew();" />
       <button class="dialog push" id="cancel" label="&buttonCancel.label;"  oncommand="OnCancel();" />
-  </box>
+  </hbox>
 
 </window>
diff --git a/profile/pref-migrator/resources/content/profileMigrationProgress.xul b/profile/pref-migrator/resources/content/profileMigrationProgress.xul
index 20ef8a8adc3b..2e8cc2eb2853 100644
--- a/profile/pref-migrator/resources/content/profileMigrationProgress.xul
+++ b/profile/pref-migrator/resources/content/profileMigrationProgress.xul
@@ -5,7 +5,7 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/profile/profileMigrationProgress.dtd" >
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-	align="vertical"
+	orient="vertical"
 	onload="onLoad()"
 	title="&window.title;"
 	class="dialog"> 
@@ -14,18 +14,18 @@
 
   <keyset id="keyset"/>
 
-  <box align="horizontal">
-  	<box autostretch="never">
+  <hbox>
+  	<hbox autostretch="never">
       		<image class="message-icon"/>
-	</box>
-    	<box align="vertical" flex="100%">
+	</hbox>
+    	<vbox flex="100%">
 		<text id="info.header" value="&dialogTitle.label;" />
 		<text id="info1" flex="100%" value="&currentlyProcessing.text;" />
 		<text id="info2" flex="100%" value="&downloadBeforeUpdate.text;" />
-		<box id="pm-box" align="horizontal">
+		<hbox id="pm-box">
 			<progressmeter id="dialog.progress" mode="undetermined" flex="100%"/>
-		</box>
-   	</box>
-   </box>
+		</hbox>
+   	</vbox>
+   </hbox>
 
 </window>
diff --git a/profile/resources/content/confirmMigration.xul b/profile/resources/content/confirmMigration.xul
index 275ae7f814f6..ba0f2428285f 100644
--- a/profile/resources/content/confirmMigration.xul
+++ b/profile/resources/content/confirmMigration.xul
@@ -13,7 +13,7 @@
 
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-        align="vertical"
+        orient="vertical"
         title="&window.title;"
         onload="onLoad()"
         class="dialog"> 
@@ -25,17 +25,17 @@
     
   <keyset id="keyset"/>
   
-  <box>
-    <box orient="vertical">
+  <hbox>
+    <vbox>
       <image class="message-icon"/>
       <spring flex="1"/>
-    </box>
+    </vbox>
     <separator orient="vertical" class="thin"/>
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <html>&confirmMigrationPart1.label;</html>
       <html>&confirmMigrationPart2.label;</html>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
   <separator class="thin"/>
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/profile/resources/content/createProfileWizard.xul b/profile/resources/content/createProfileWizard.xul
index b05cb0b9ca62..012fd333fcdb 100644
--- a/profile/resources/content/createProfileWizard.xul
+++ b/profile/resources/content/createProfileWizard.xul
@@ -33,11 +33,11 @@
   <script type="application/x-javascript" src="chrome://global/content/wizardManager.js"/>
   <script type="application/x-javascript" src="chrome://global/content/widgetStateManager.js"/>
 
-  <box class="box-header" id="header" title="&window.title.label;" description="&profileWizard.title;"/>
-  <box class="wizard-box" flex="1">
+  <hbox class="box-header" id="header" title="&window.title.label;" description="&profileWizard.title;"/>
+  <hbox class="wizard-box" flex="1">
     <html:iframe src="about:blank" style="width: 40em; height: 23em; overflow: auto;" name="content" id="content" flex="1"/>
-  </box>
+  </hbox>
   <separator class="groove"/>
-  <box id="wizardButtons"/>
+  <hbox id="wizardButtons"/>
 
 </window>
diff --git a/profile/resources/content/deleteProfile.xul b/profile/resources/content/deleteProfile.xul
index 7306ff350efa..2b422debc449 100644
--- a/profile/resources/content/deleteProfile.xul
+++ b/profile/resources/content/deleteProfile.xul
@@ -15,7 +15,7 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   class="dialog"
-  align="vertical"
+  orient="vertical"
   style="width: 35em;"
   title="&title;"
   onload="Startup();">
@@ -27,11 +27,11 @@
 
   <keyset id="keyset"/>
   
-  <box orient="vertical" flex="1">
+  <vbox flex="1">
     <html>&intro;</html> 
     <html>&question;</html> 
     <separator/>
-    <box id="okCancelButtonsRight" class="Button1"/>
-  </box>
+    <hbox id="okCancelButtonsRight" class="Button1"/>
+  </vbox>
 
 </window>
diff --git a/profile/resources/content/newProfile1_2.xul b/profile/resources/content/newProfile1_2.xul
index 24145ccece3a..543a964f9cbb 100644
--- a/profile/resources/content/newProfile1_2.xul
+++ b/profile/resources/content/newProfile1_2.xul
@@ -48,20 +48,20 @@
   <html>&pnl2.pdir.label;</html> 
 
 
-  <box id="dirbox">
+  <hbox id="dirbox">
     <html class="indent" id="ProfileDir" flex="1" style="overflow: auto;"/>
-    <box orient="vertical" valign="top">
+    <vbox valign="top">
       <button label="&button.choosefolder.label;" oncommand="chooseProfileFolder();"/>
       <button id="useDefault" label="&button.usedefault.label;" oncommand="setDisplayToDefaultFolder();" disabled="true"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
 
   <separator/>
 
-  <box autostretch="never">
+  <hbox autostretch="never">
     <spring flex="1"/>
     <button label="&langSelection.label;" oncommand="showLangDialog();"/>
-  </box>
+  </hbox>
 
   <spring flex="1"/>
 
diff --git a/profile/resources/content/profileSelection.xul b/profile/resources/content/profileSelection.xul
index 3efb2e240963..4ff4478620a1 100644
--- a/profile/resources/content/profileSelection.xul
+++ b/profile/resources/content/profileSelection.xul
@@ -63,30 +63,30 @@
     <key id="fooKey" key="s"   event="keydown" oncommand="foo()" modifiers="accel, shift"/>
   </keyset>
 
-  <box class="box-header" id="header" title="&profilemanager.label;" description="&windowtitle.label;"/>
+  <hbox class="box-header" id="header" title="&profilemanager.label;" description="&windowtitle.label;"/>
   
-  <box class="wizard-box" flex="1">
+  <hbox class="wizard-box" flex="1">
 
     <!-- instructions -->
     <deck id="prattle">
       <html id="intro" style="width: 17em;border:1px solid transparent;" flex="1">&introgeneral.label;</html>
-      <box orient="vertical" id="manager">
+      <vbox id="manager">
         <html style="width: 17em;" class="label">&pmTextA.label;</html>
         <separator/>
-        <box>
-          <box orient="vertical" flex="1" id="managebuttons">
+        <hbox>
+          <vbox flex="1" id="managebuttons">
             <button id="newbutton" label="&newButton.label;" oncommand="CreateProfileWizard();"/>
             <button id="renbutton" label="&renameButton.label;" oncommand="RenameProfile();"/>
             <button id="delbutton" label="&deleteButton.label;" oncommand="ConfirmDelete();"/>
-          </box>
+          </vbox>
           <spring flex="2"/>
-        </box>
-      </box>
+        </hbox>
+      </vbox>
     </deck>  
       
     <separator class="thin" orient="vertical"/>
     
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <tree id="profiles" class="inset" flex="1" style="height: 0px;"
             onclick="HandleClickEvent( event );"
             onselect="DoEnabling();"
@@ -101,22 +101,22 @@
         </treehead>
         <treechildren id="profilekids" flex="1"/>
       </tree>    
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox id="offlineState" label="&offlineState.label;" accesskey="&offlineState.accesskey;"/> 
-      </box>
-    </box>
-  </box>
+      </hbox>
+    </vbox>
+  </hbox>
   
-  <box class="selection">
+  <hbox class="selection">
     <separator class="thin" orient="vertical"/>
     <button id="manage" label="&manage.label;" oncommand="SwitchProfileManagerMode();"/>
     <spring flex="1"/>
-    <box id="okCancelButtons"/>
+    <hbox id="okCancelButtons"/>
     <separator class="thin" orient="vertical"/>
-  </box>
+  </hbox>
   
   <separator class="thin" />
   
-  <box id="profileManager-status" class="box-status" value="&profilemanager.label;" progress=""/>
+  <hbox id="profileManager-status" class="box-status" value="&profilemanager.label;" progress=""/>
   
 </window>
diff --git a/profile/resources/content/selectLang.xul b/profile/resources/content/selectLang.xul
index 13a646cfe5d9..b6852aa3dbf9 100644
--- a/profile/resources/content/selectLang.xul
+++ b/profile/resources/content/selectLang.xul
@@ -65,6 +65,6 @@
     </menulist>       
 
   <separator/>  
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
         
 </window>        
diff --git a/rdf/resources/dom-test-1.xul b/rdf/resources/dom-test-1.xul
index 2f67900a9da2..9fbb0c064612 100644
--- a/rdf/resources/dom-test-1.xul
+++ b/rdf/resources/dom-test-1.xul
@@ -33,7 +33,7 @@
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical">
+  orient="vertical">
 
   <html:script>
   function RemovePersonalToolbar()
@@ -86,11 +86,11 @@
   }
   </html:script>
 
-  <box align="horizontal">  
+  <hbox>  
     <html:button onclick="RemovePersonalToolbar();">Remove Personal Toolbar</html:button>
     <html:button onclick="AddPersonalToolbar();">Add Personal Toolbar</html:button>
     <html:button onclick="MutateBody();">Swap Body (Bookmarks Root/Personal Toolbar Folder)</html:button>
-  </box>
+  </hbox>
 
   <tree id="tree" datasources="rdf:bookmarks" onclick="return OpenURL(event,event.target.parentNode);" ref="NC:BookmarksRoot">
     <template>
diff --git a/rdf/resources/dom-test-7.xul b/rdf/resources/dom-test-7.xul
index 87ecd3979a48..c679533b6797 100644
--- a/rdf/resources/dom-test-7.xul
+++ b/rdf/resources/dom-test-7.xul
@@ -39,9 +39,9 @@ The test exercises creation and removal of HTML elements.
   <html:button onclick="toggleOpenClose();" flex="100%">Add/Remove Red Element At 0</html:button>
   The order should stay 'blue, green, yellow'.
 
-  <box id="container" align="horizontal" style="height: 100%; width: 100%;" flex="100%">
-    <box align="vertical" style="width: 50px; height: 50px; background: blue;" />
-    <box align="vertical" style="width: 50px; height: 50px; background: green;" />
-    <box align="vertical" style="width: 50px; height: 50px; background: yellow;" />
-  </box>
+  <hbox id="container" style="height: 100%; width: 100%;" flex="100%">
+    <vbox style="width: 50px; height: 50px; background: blue;" />
+    <vbox style="width: 50px; height: 50px; background: green;" />
+    <vbox style="width: 50px; height: 50px; background: yellow;" />
+  </hbox>
 </window>
diff --git a/rdf/resources/dom-test-8.xul b/rdf/resources/dom-test-8.xul
index 1c571494c45b..bbd10904f13d 100644
--- a/rdf/resources/dom-test-8.xul
+++ b/rdf/resources/dom-test-8.xul
@@ -35,7 +35,7 @@
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical"
+  orient="vertical"
   onload="ToBeetle();">
 
   <html:script>
@@ -86,14 +86,14 @@
   }
   </html:script>
 
-  <box align="horizontal">
+  <hbox>
     <button onclick="ToBeetle();" label="To Beetle" />
     <button onclick="ToPrev();" label="To Previous Sibling" />
     <button onclick="ToNext();" label="To Next Sibling" />
     <button onclick="ToParent();" label="To Parent" />
     <button onclick="ToFirstChild();" label="To First Child" />
     <button onclick="ToLastChild();" label="To Last Child" />
-  </box>
+  </hbox>
 
 <!--  <tree id="tree" flex="100%" datasources="rdf:bookmarks rdf:mailnewsfolders rdf:msgaccountmanager" style="height:100%;"> -->
   <html:div style="width:100px;height:100px">
diff --git a/rdf/tests/domds/resources/DOMDataSourceViewer.xul b/rdf/tests/domds/resources/DOMDataSourceViewer.xul
index e3fd74bbda1c..462872a9a11a 100644
--- a/rdf/tests/domds/resources/DOMDataSourceViewer.xul
+++ b/rdf/tests/domds/resources/DOMDataSourceViewer.xul
@@ -9,23 +9,23 @@
   onload="onSrcLoaded();"
   title="DOM Viewer">
 
-<script language="JavaScript" src="DOMDataSourceViewer.js"/>
-<box align="vertical" flex="30%">
+<script type="application/x-javascript" src="DOMDataSourceViewer.js"/>
+<vbox flex="30%">
   <textbox value="chrome://communicator/content/domviewer/domviewer.html"
            type="text" name="url" id="url"
            onkeypress="if (event.keyCode == 13) loadUrl();"/>
-  <box>
+  <hbox>
     <text value="Show:"/>
     <checkbox oncommand="setMode('content', event.target.checked);" label="Content"/>
     <checkbox oncommand="setMode('dom', event.target.checked);" label="DOM"/>
     <checkbox oncommand="setMode('frame', event.target.checked);" label="Frames"/>
     <checkbox oncommand="setMode('leaf', event.target.checked);" label="OOB data"/>
     
-  </box>
-  <box align="horizontal">
+  </hbox>
+  <hbox>
     <button onclick="loadUrl();" label="Load"/>
     <button onclick="refreshTree();" label="Refresh"/>
-  </box>
+  </hbox>
 <tree
   datasources="rdf:domds"
   id="dataSourceTree">
@@ -57,7 +57,7 @@
   </treehead>
 </tree>
 
-</box>
+</vbox>
 <splitter collapse="before" persist="state hidden" chromeclass="extrachrome"/>
 <iframe onload="onSrcLoaded();" name="srcdoc" src="chrome://communicator/content/domviewer/domviewer.html" flex="73%"/>
 
diff --git a/themes/classic/global/mac/splitter.css b/themes/classic/global/mac/splitter.css
index 7144c9bcd6ae..9bea8f288ab8 100644
--- a/themes/classic/global/mac/splitter.css
+++ b/themes/classic/global/mac/splitter.css
@@ -50,7 +50,7 @@ splitter:hover:active
   }
 
 /* vertical splitters */
-  window > splitter, box > splitter 
+  window > splitter, box, hbox > splitter 
     {
     	width               : 6px;
     }
@@ -62,7 +62,8 @@ splitter:hover:active
   window[orient="vertical"] > splitter,
   box[orient="vertical"] > splitter,
   window[align="vertical"] > splitter,
-  box[align="vertical"] > splitter
+  box[align="vertical"] > splitter,
+  vbox > splitter
     {
       cursor              : n-resize;
       border-right		  : 0px;
@@ -75,6 +76,8 @@ splitter:hover:active
 
   window[orient="vertical"] > splitter > grippy,
   window[orient="vertical"] > splitter > grippy[collapse="before"],
+  vbox > splitter > grippy,
+  vbox > splitter > grippy[collapse="before"],
   box[orient="vertical"] > splitter > grippy,
   box[orient="vertical"] > splitter > grippy[collapse="before"]
     {
@@ -82,6 +85,7 @@ splitter:hover:active
     }
     
   window[orient="vertical"] > splitter[state="collapsed"] > grippy,
+  vbox > splitter[state="collapsed"] > grippy,
   box[orient="vertical"] > splitter[state="collapsed"] > grippy
     {
       list-style-image    : url("chrome://global/skin/grippy-vertical-before.gif");
diff --git a/themes/classic/global/win/global.css b/themes/classic/global/win/global.css
index 1da9ab9f890e..594469b22455 100644
--- a/themes/classic/global/win/global.css
+++ b/themes/classic/global/win/global.css
@@ -248,4 +248,4 @@
     margin                : 0px;
   }
   
-  
\ No newline at end of file
+  
diff --git a/webshell/tests/viewer/samples/checkboxTest.xul b/webshell/tests/viewer/samples/checkboxTest.xul
index a32b2537f9c9..bb2dc31011cc 100644
--- a/webshell/tests/viewer/samples/checkboxTest.xul
+++ b/webshell/tests/viewer/samples/checkboxTest.xul
@@ -5,7 +5,7 @@
 <!DOCTYPE window> 
 
 <window style="overflow: auto" xmlns:html="http://www.w3.org/1999/xhtml"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" align="vertical" 
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" orient="vertical" 
         onload=""> 
 
 <html:h1>TriStateCheckbox Test 1</html:h1>
diff --git a/webshell/tests/viewer/samples/scrollbarTest1.xul b/webshell/tests/viewer/samples/scrollbarTest1.xul
index ffa7e421f579..f8e712c38936 100644
--- a/webshell/tests/viewer/samples/scrollbarTest1.xul
+++ b/webshell/tests/viewer/samples/scrollbarTest1.xul
@@ -7,7 +7,7 @@
 xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
-<box style="background-color: white; height: 100%; width: 100%">
+<hbox style="background-color: white; height: 100%; width: 100%">
     <!-- scroll bar -->
 	<scrollbar align="vertical"/>
 
@@ -60,7 +60,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
 		</slider>
 		<scrollbarbutton class="increment"/>
 	</scrollbar>
-</box>
+</hbox>
 
 </window>
 
diff --git a/webshell/tests/viewer/samples/scrollbarTest2.xul b/webshell/tests/viewer/samples/scrollbarTest2.xul
index e38868ab03b6..4f491009219f 100644
--- a/webshell/tests/viewer/samples/scrollbarTest2.xul
+++ b/webshell/tests/viewer/samples/scrollbarTest2.xul
@@ -6,15 +6,15 @@
 <window style="height: 100%; width: 100%;" 
 xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-<box style="width: 100%; height: 100%">
+<hbox style="width: 100%; height: 100%">
    <scrollbar align="vertical"/>
-   <box align="vertical" flex="100%">
+   <vbox flex="100%">
 	   <scrollbar align="horizontal"/>
 	   <spring flex="100%" style="background-color: white"/>
 	   <scrollbar align="horizontal"/>      
-   </box>
+   </vbox>
    <scrollbar align="vertical"/>
-</box>
+</hbox>
 
 </window>
 
diff --git a/webshell/tests/viewer/samples/sliderTest1.xul b/webshell/tests/viewer/samples/sliderTest1.xul
index acdd9c75b66d..bb23e8eeedfe 100644
--- a/webshell/tests/viewer/samples/sliderTest1.xul
+++ b/webshell/tests/viewer/samples/sliderTest1.xul
@@ -7,7 +7,7 @@
 xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
-<slider align="verticals" curpos="50">
+<slider align="vertical" curpos="50">
    <thumb flex="100%"/>
 </slider>
 
diff --git a/webshell/tests/viewer/samples/toolbarTest1.xul b/webshell/tests/viewer/samples/toolbarTest1.xul
index 0ab4d86b37d1..e10fa8c09267 100644
--- a/webshell/tests/viewer/samples/toolbarTest1.xul
+++ b/webshell/tests/viewer/samples/toolbarTest1.xul
@@ -3,7 +3,7 @@
 
 <!DOCTYPE window> 
 
-<window align="vertical" xmlns:html="http://www.w3.org/1999/xhtml"
+<window orient="vertical" xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onConstruction="Startup()"> 
 
@@ -28,11 +28,11 @@
 	  <button id="home-button"    align="top" value="Home"/>
 	  <button id="print-button"   align="top" value="Print"/> 
 
-          <box align="vertical" flex="100%">
+          <vbox flex="100%">
             <spring flex="100%"/>
             <html:input id="urlbar" type="text"/>   
 	    <spring flex="100%"/>
-          </box>
+          </vbox>
 
           <button src="resource:/res/throbber/anims00.gif" align="right"/>
     
diff --git a/xpfe/browser/resources/content/metadata.xul b/xpfe/browser/resources/content/metadata.xul
index 7082aa526e96..ab866301ac30 100644
--- a/xpfe/browser/resources/content/metadata.xul
+++ b/xpfe/browser/resources/content/metadata.xul
@@ -49,11 +49,11 @@
         title="&caption.label;"
         onload="onLoad()"
         class="dialog"
-        align="vertical"
+        orient="vertical"
         persist="screenX screenY"
         screenX="24" screenY="24">
 
-  <script language="javascript" src="chrome://navigator/content/metadata.js"/>
+  <script type="application/x-javascript" src="chrome://navigator/content/metadata.js"/>
 
   <stringbundle src="chrome://navigator/locale/metadata.properties" id="bundle_metadata"/>
   <stringbundle src="chrome://global/locale/languageNames.properties" id="bundle_languages"/>
@@ -61,7 +61,7 @@
 
   <text id="no-properties" value="&no-properties.label;"/>
   
-  <titledbox id="link-sec">
+  <groupbox id="link-sec">
     <label><text value="&link-sec.label;"/></label>
     <grid>
       <columns>
@@ -95,8 +95,8 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
-  <titledbox id="image-sec">
+  </groupbox>
+  <groupbox id="image-sec">
     <label><text value="&image-sec.label;"/></label>
     <grid>
       <columns>
@@ -114,8 +114,8 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
-  <titledbox id="insdel-sec">
+  </groupbox>
+  <groupbox id="insdel-sec">
     <label><text value="&insdel-sec.label;"/></label>
     <grid>
       <columns>
@@ -133,8 +133,8 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
-  <titledbox id="quote-sec">
+  </groupbox>
+  <groupbox id="quote-sec">
     <label><text value="&quote-sec.label;"/></label>
     <grid>
       <columns>
@@ -148,8 +148,8 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
-  <titledbox id="misc-sec">
+  </groupbox>
+  <groupbox id="misc-sec">
     <label><text value="&misc-sec.label;"/></label>
     <grid>
       <columns>
@@ -163,9 +163,9 @@
         </row>
         <row id="misc-title">
           <text value="&misc-title.label; "/>
-          <box>
+          <hbox>
           <html id="misc-title-text" width="100%" style="margin: 0px;"/>
-          </box>
+          </hbox>
         </row>
         <row id="misc-tblsummary">
           <text value="&misc-tblsummary.label; "/>
@@ -173,7 +173,7 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
   <spring flex="1"/>
 
diff --git a/xpfe/browser/resources/content/navigator-toolbars.xul b/xpfe/browser/resources/content/navigator-toolbars.xul
index 532bd5ce6f90..b6f5c193a912 100644
--- a/xpfe/browser/resources/content/navigator-toolbars.xul
+++ b/xpfe/browser/resources/content/navigator-toolbars.xul
@@ -70,12 +70,12 @@
 
     <!--    
     <rule NC:Element="box">
-      <box uri="..."
-           class="http://home.netscape.com/NC-rdf#Class"
-           value="http://home.netscape.com/NC-rdf#Name"
-           content="http://home.netscape.com/NC-rdf#URL"
-           src="http://home.netscape.com/NC-rdf#Icon"
-           type="http://home.netscape.com/NC-rdf#Type"/>
+      <hbox uri="..."
+            class="http://home.netscape.com/NC-rdf#Class"
+            value="http://home.netscape.com/NC-rdf#Name"
+            content="http://home.netscape.com/NC-rdf#URL"
+            src="http://home.netscape.com/NC-rdf#Icon"
+            type="http://home.netscape.com/NC-rdf#Type"/>
     </rule>
     -->
 
@@ -108,8 +108,8 @@
                  object="?item-URL"/>
       </bindings>
       <action>
-        <box uri="?item" class="?item-class" value="?item-name" 
-             src="?item-icon" content="?item-URL" type="?item-type"/>
+        <hbox uri="?item" class="?item-class" value="?item-name" 
+              src="?item-icon" content="?item-URL" type="?item-type"/>
       </action>
     </rule>   
 
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index fa7445b78e38..191fd4a6e39a 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -111,7 +111,7 @@ Contributor(s): ______________________________________. -->
   
   <popupset id="aHTMLTooltipSet">
     <popup id="aHTMLTooltip" class="tooltip" oncreate="return FillInHTMLTooltip(document.tooltipNode);" > 
-      <box id="HTML_TOOLTIP_tooltipBox" orient="vertical"/>
+      <vbox id="HTML_TOOLTIP_tooltipBox"/>
     </popup>
     <popup id="backMenu" oncreate="BrowserBackMenu(event);" oncommand="gotoHistoryIndex(event);"/>
     <popup id="forwardMenu" oncreate="BrowserForwardMenu(event);" oncommand="gotoHistoryIndex(event);"/>
@@ -315,7 +315,7 @@ Contributor(s): ______________________________________. -->
   </toolbox>
     
   <hbox flex="1" >
-    <box id="sidebar-box" class="chromeclass-extrachrome"/>
+    <hbox id="sidebar-box" class="chromeclass-extrachrome"/>
     <splitter id="sidebar-splitter" class="chromeclass-extrachrome" />
   
     <vbox id="appcontent" flex="1"
@@ -336,7 +336,7 @@ Contributor(s): ______________________________________. -->
   <statusbar id="status-bar" class="chromeclass-status"
              ondragover="nsDragAndDrop.dragOver(event, contentAreaDNDObserver);"
              ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
-        <box id="component-bar"/>
+        <hbox id="component-bar"/>
         <statusbarpanel id="statusbar-display" label="&statusText.label;" crop="right" flex="1"/>
         <progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
         <statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
diff --git a/xpfe/browser/resources/content/pageInfo.xul b/xpfe/browser/resources/content/pageInfo.xul
index 50163590adcf..9ab18b68c480 100644
--- a/xpfe/browser/resources/content/pageInfo.xul
+++ b/xpfe/browser/resources/content/pageInfo.xul
@@ -42,7 +42,7 @@
   titlemenuseparator ="&mainWindow.titlemodifierseperator;"  
   windowtype="Browser:page-info"
   onload="onLoadPageInfo()"
-  align="vertical" class="dialog"
+  orient="vertical" class="dialog"
   width="400" height="450"
   screenX="10" screenY="10"
   persist="screenX screenY width height sizemode">
@@ -52,7 +52,7 @@
   <!-- keys are appended from the overlay -->
   <keyset id="dialogKeys"/>
 
-  <box id="cont" orient="vertical" flex="1">  
+  <vbox id="cont" flex="1">  
    <text class="header label" value="&pageInfo.description;"/>
    <tabbox id="tabbox" flex="1">
     <tabs id="tabs">
@@ -64,9 +64,9 @@
     <tabpanels id="tabpanels" flex="1">
 
     <!-- General page information -->
-    <box orient="vertical">
+    <vbox>
       <text class="header label" value="&pageInfo.description;"/>
-      <box class="inset" orient="vertical" id="documentinfo">
+      <vbox class="inset" id="documentinfo">
         <grid>
           <columns> 
             <column/>
@@ -87,11 +87,11 @@
             </row>
           </rows>  
         </grid>
-      </box>
-    </box>
+      </vbox>
+    </vbox>
 
     <!-- Form information -->
-    <box id="formTreeContainer" flex="1" orient="vertical" collapsed="true">
+    <vbox id="formTreeContainer" flex="1" collapsed="true">
       <text class="header label" value="&pageInfo.formHeader;"/>
       <tree id="formTree" class="inset" flex="1">
         <treecolgroup>
@@ -110,10 +110,10 @@
         </treehead>
         <treechildren id="formChildren" flex="1"/>
       </tree>
-    </box>
+    </vbox>
 
     <!-- Image information -->
-    <box id="imageTreeContainer" flex="1" orient="vertical" collapsed="true">
+    <vbox id="imageTreeContainer" flex="1" collapsed="true">
       <text class="header label" value="&pageInfo.imageHeader;"/>
       <tree id="imageTree" class="inset" onselect="onImageSelect()" flex="1">
         <treecolgroup>
@@ -138,13 +138,13 @@
  
       <splitter collapse="after" id="imageSplitter"/>
       
-      <box id="imagePreviewContainer" flex="1">
+      <hbox id="imagePreviewContainer" flex="1">
         <iframe id="imageFrame" class="inset" src="about:blank" flex="1"/>
-      </box>
-    </box>
+      </hbox>
+    </vbox>
 
     <!-- Others added by overlay -->
     </tabpanels>
    </tabbox>
-  </box>
+  </vbox>
 </window>
diff --git a/xpfe/browser/resources/content/toolbarTest.xul b/xpfe/browser/resources/content/toolbarTest.xul
index 16c4b6a1311a..940e8c0f8856 100644
--- a/xpfe/browser/resources/content/toolbarTest.xul
+++ b/xpfe/browser/resources/content/toolbarTest.xul
@@ -80,30 +80,30 @@
   <popupset>
     <popup type="floater" id="panelpopup" oncreate="initPopup();" 
            menugenerated="true" popupanchor="bottomleft" popupalign="topleft">
-      <box orient="vertical" flex="1">
+      <vbox flex="1">
         <menuitem label="Add Current Page" class="menuitem-floater"/>
         <menuitem label="Manage Bookmarks..." class="menuitem-floater"/>             
         <iframe flex="1" id="panelsrc" style="min-width: 1px; min-height: 1px;"/>
-      </box>
+      </vbox>
     </popup>
     <!--             
     <popup id="panelpopup" oncreate="initPopup();" orient="vertical"
            class="popup-resizable"
            style="min-width: 100px; max-width: 300px;">
-      <box class="floater-box" orient="vertical">
-        <box class="floater-box-top">
+      <vbox class="floater-box">
+        <hbox class="floater-box-top">
           <titlebar flex="1"/>
-        </box>
-        <box class="floater-box-center" flex="1">
-          <box class="floater-children" flex="1">
+        </hbox>
+        <hbox class="floater-box-center" flex="1">
+          <hbox class="floater-children" flex="1">
             <iframe flex="1" id="panelsrc" style="width: 170px; height: 200px;"/>
-          </box>
-        </box>
-        <box class="floater-box-bottom">
+          </hbox>
+        </hbox>
+        <hbox class="floater-box-bottom">
           <resizer direction="bottom" flex="1"/>
           <resizer direction="bottomright"/>
-        </box>
-      </box>
+        </hbox>
+      </vbox>
     </popup>
     -->
   </popupset>
@@ -289,11 +289,11 @@
   </tree>
 -->
 
-  <box flex="1">
-    <box id="sidebar-box" class="chromeclass-extrachrome"/>
+  <hbox flex="1">
+    <hbox id="sidebar-box" class="chromeclass-extrachrome"/>
     <splitter id="sidebar-splitter" class="chromeclass-extrachrome" />
-    <box flex="1"/>
-  </box>
+    <hbox flex="1"/>
+  </hbox>
 
 </window>        
 
diff --git a/xpfe/browser/resources/content/viewSource.xul b/xpfe/browser/resources/content/viewSource.xul
index b5b2a10956af..ff1488b52ee0 100644
--- a/xpfe/browser/resources/content/viewSource.xul
+++ b/xpfe/browser/resources/content/viewSource.xul
@@ -45,7 +45,7 @@
 	titlepreface="&mainWindow.preface;"
 	titlemenuseparator ="&mainWindow.titlemodifierseperator;"  
 	windowtype="navigator:view-source"
-	align="vertical" width="640" height="480"
+	orient="vertical" width="640" height="480"
 	screenX="10" screenY="10"
 	persist="screenX screenY width height sizemode">
  
@@ -151,13 +151,13 @@
   </menubar>  
   </toolbox>
 
-  <box id="appcontent" align="vertical" flex="1"
+  <vbox id="appcontent" flex="1"
        ondragover="nsDragAndDrop.dragOver(event, contentAreaDNDObserver);"
        ondraggesture="nsDragAndDrop.startDrag(event, contentAreaDNDObserver);"
        ondragdrop="nsDragAndDrop.drop(event, contentAreaDNDObserver);">
 
     <browser id="content" type="content-primary" name="content" src="about:blank" flex="1"/>
 
-  </box>
+  </vbox>
 
 </window>
diff --git a/xpfe/browser/samples/collapsing.xul b/xpfe/browser/samples/collapsing.xul
index 195e887b1903..6f3cf15d972a 100644
--- a/xpfe/browser/samples/collapsing.xul
+++ b/xpfe/browser/samples/collapsing.xul
@@ -4,7 +4,7 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	align="horizontal"
+	orient="horizontal"
 	onload="onWindowLoad()"> 
 
 	<script>
@@ -35,13 +35,13 @@
 	<broadcaster id="ShowSite" sitemode="hideSiteTwo" />
 	<observes element="ShowSite" attribute="sitemode" />
 	
-	<box align="vertical" id="SiteOneBox" flex="1">
+	<vbox id="SiteOneBox" flex="1">
 		<html:iframe flex="1" name="SiteOne" src="http://www.mozilla.org/xpfe/xptoolkit"/>
 		<html:input type="BUTTON" value="Show Boxes Documentation" onclick="cmdHideSiteOne()"/>
-	</box>
-	<box align="vertical" id="SiteTwoBox" flex="1">
+	</vbox>
+	<vbox id="SiteTwoBox" flex="1">
 		<html:iframe flex="1" name="SiteTwo" src="http://www.mozilla.org/xpfe/xptoolkit/boxes.html"/>
 		<html:input type="BUTTON" value="Show XPFE Documentation" onclick="cmdHideSiteTwo()"/>
-	</box>
+	</vbox>
 	
 </window>
diff --git a/xpfe/browser/samples/colorpicker.xul b/xpfe/browser/samples/colorpicker.xul
index 509ecf460964..509a7878ca93 100644
--- a/xpfe/browser/samples/colorpicker.xul
+++ b/xpfe/browser/samples/colorpicker.xul
@@ -29,7 +29,7 @@
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  align="vertical"
+  orient="vertical"
   style="width:200px"
   >
 
@@ -92,7 +92,7 @@
 </script>
 
 <!-- ColorPicker #1 -->
-<box id="box1">
+<hbox id="box1">
 <menu id="menu1">
   <button id="button1" label="text1" class="popup" align="right"/>
   <html:div id="colorWell1" style="width:30px; background-color:white"/>
@@ -100,11 +100,11 @@
     <colorpicker id="cp1" palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
   </menupopup>
 </menu>
-</box>
+</hbox>
 
 <!-- ColorPicker #2 -->
 <html:hr/>
-<box id="box2">
+<hbox id="box2">
 <menu id="menu2">
   <button id="button2" label="text2" class="popup" align="right"/>
   <html:div id="colorWell2" style="width:30px; background-color:white"/>
@@ -112,11 +112,11 @@
     <colorpicker id="cp2" palettename="gray" onclick="setColorWell(this.parentNode.parentNode);"/>
   </menupopup>
 </menu>
-</box>
+</hbox>
 
 <!-- ColorPicker #3 -->
 <html:hr/>
-<box id="box3">
+<hbox id="box3">
 <menu id="menu3">
   <button id="button3" label="text3" class="popup" align="right"/>
   <html:div id="colorWell3" style="width:30px; background-color:white"/>
@@ -124,7 +124,7 @@
     <colorpicker id="cp3" palettename="web" onclick="setColorWell(this.parentNode.parentNode);"/>
   </menupopup>
 </menu>
-</box>
+</hbox>
 
 
 </window>
diff --git a/xpfe/browser/samples/dexopenchrome.xul b/xpfe/browser/samples/dexopenchrome.xul
index d879cc711da7..9ffe949d1a37 100644
--- a/xpfe/browser/samples/dexopenchrome.xul
+++ b/xpfe/browser/samples/dexopenchrome.xul
@@ -59,7 +59,7 @@
 ]]>
 </script>
 
-<box orient="vertical">
+<vbox>
   <grid>
     <columns><column/><column/></columns>
     <rows>
@@ -129,14 +129,14 @@
       </row>
     </rows>
   </grid>
-</box>
+</vbox>
 <spring style="width: 8px"/>
-<box orient="vertical">
-  <box orient="horizontal">
+<vbox>
+  <hbox>
     <spring flex="1"/>
     <text value="Open"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
   <grid>
     <columns><column/><column/></columns>
     <rows>
@@ -150,5 +150,5 @@
       </row>
     </rows>
   </grid>
-</box>
+</vbox>
 </window>
diff --git a/xpfe/browser/samples/hidetoolicon.xul b/xpfe/browser/samples/hidetoolicon.xul
index 15edf97f9986..70b44e140818 100644
--- a/xpfe/browser/samples/hidetoolicon.xul
+++ b/xpfe/browser/samples/hidetoolicon.xul
@@ -4,7 +4,7 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-	align="vertical"> 
+	orient="vertical"> 
 
 	<script>
 	function cmdHideButtonOne(){
@@ -34,10 +34,10 @@
 		</toolbar>
 	</toolbox>
 
-	<box flex="1">
+	<hbox flex="1">
 		<html:input flex="1" type="BUTTON" value="Hide Only Button 1" onclick="cmdHideButtonOne()"/>
 		<html:input flex="1" type="BUTTON" value="Hide Only Button 2" onclick="cmdHideButtonTwo()"/>
 		<html:input flex="1" type="BUTTON" value="Hide Both" onclick="cmdHideAll()"/>
 		<html:input flex="1" type="BUTTON" value="Show Both" onclick="cmdShowAll()"/>
-	</box>
+	</hbox>
 </window>
diff --git a/xpfe/browser/samples/tab.xul b/xpfe/browser/samples/tab.xul
index ac00ab3f3350..b4253d503854 100644
--- a/xpfe/browser/samples/tab.xul
+++ b/xpfe/browser/samples/tab.xul
@@ -6,7 +6,7 @@
 xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
-<box align="vertical" flex="1">
+<vbox flex="1">
   <tabbox orient="vertical" flex="100%" >
      <tabs orient="horizontal">
       <tab selected="true" label="centered"/>
@@ -22,24 +22,24 @@ xmlns:html="http://www.w3.org/1999/xhtml"
     <tabpanels flex="100%" style="border: 2px outset gray">
 
        <!-- tab 1 -->
-       <box align="horizontal">
+       <hbox>
          <spring flex="100%"/> 
-         <box align="vertical"> 
+         <vbox> 
           <spring flex="100%"/> 
                 <button class="push" label="centered"/>
           <!--html:button>This is a test</html:button-->
           <spring flex="100%"/> 
-         </box> 
+         </vbox> 
          <spring flex="100%"/> 
-      </box> 
+      </hbox> 
 
       <!-- tab2 -->
-      <box align="horizontal">
+      <hbox>
           <button class="push" label="10%" flex="10%"/>
             <button class="push" label="20%" flex="20%"/>
           <button class="push" label="30%" flex="30%"/>
           <button class="push" label="40%" flex="40%"/>
-      </box> 
+      </hbox> 
 
             <!-- tab3 -->
       <html:div>
@@ -70,82 +70,82 @@ xmlns:html="http://www.w3.org/1999/xhtml"
       </toolbox>
 
           <!-- tab 5 -->
-          <box align="vertical">
+          <vbox>
               <html:input type="text" value="text" flex="100%"/>
-          </box>
+          </vbox>
 
           <html:iframe src="http://www.yahoo.com" />
 
       <!-- tab 6 -->
-      <box align="vertical">
+      <vbox>
       <html:div>
         Category:
       </html:div>
-      <box align="horizontal" flex="100%">
+      <hbox flex="100%">
            <html:div style="width: 100px; background-color: rgb(255,255,255)">
             table
            </html:div>
 
-        <box align="vertical" flex="100%">
-          <box align="horizontal" style="margin: 10px; margin-top: 0; margin-bottom: 0; background-color: #8080c0; color: white">
+        <vbox flex="100%">
+          <hbox style="margin: 10px; margin-top: 0; margin-bottom: 0; background-color: #8080c0; color: white">
              <html:div><html:B>Navigator</html:B></html:div>
                <spring flex="100%"/>
              <html:div>Specify you preferences for browsing the web</html:div>
-          </box>
+          </hbox>
 
-          <box align="vertical" style="margin: 10px; padding: 10px; border: 2px groove white">
+          <vbox style="margin: 10px; padding: 10px; border: 2px groove white">
              <html:div><html:input type="radio"/>Blank Page  </html:div>
              <html:div><html:input type="radio"/>Home Page   </html:div>
              <html:div><html:input type="radio"/>Last Visited</html:div>
-          </box>
+          </vbox>
 
-          <box align="vertical" style="margin: 10px; padding: 10px; border: 2px groove white">
+          <vbox style="margin: 10px; padding: 10px; border: 2px groove white">
              <html:div>Clicking the home button will take you to this page.</html:div>
-             <box align="horizontal">
+             <hbox>
               <html:div>Location: </html:div> 
               <html:input type="text" flex="100%"/>
-             </box>
-               <box align="horizontal">
+             </hbox>
+               <hbox>
               <spring flex="100%"/>
               <html:input disabled="true" type="button" value="Use current page"/>
               <spring style="width:10px"/>
               <html:input type="button" value="Browse"/>
-             </box>
-          </box>
+             </hbox>
+          </vbox>
 
-          <box align="vertical" style="margin: 10px; padding: 10px; border: 2px groove white">
+          <vbox style="margin: 10px; padding: 10px; border: 2px groove white">
              <html:div>History is a list a pages you have previously visited.</html:div>
-               <box align="horizontal">
+               <hbox>
                <html:div>Pages in history expire in: <html:input type="text" value="9"/> days. </html:div>
                <spring flex="100%"/>
                <html:input type="button" value="Clear History"/>
-             </box>
-            <box align="horizontal">
+             </hbox>
+            <hbox>
                <html:div>Clear the list of sites on the location bar.</html:div>
                <spring flex="100%"/>
                <html:input type="button" value="Clear Location Bar"/>
-             </box>
-          </box>
+             </hbox>
+          </vbox>
 
           <spring flex="100%"/>
 
-        </box>
+        </vbox>
         
-      </box>
-        <box align="horizontal" style="margin: 5px;">
+      </hbox>
+        <hbox style="margin: 5px;">
            <spring flex="100%"/>
            <html:input type="button" value="Ok"/>
            <spring style="width:10px"/>
            <html:input type="button" value="Cancel"/>
            <spring style="width:10px"/>
            <html:input type="button" value="Help"/>
-         </box>
-    </box>
+         </hbox>
+    </vbox>
 
 
      </tabpanels> 
   </tabbox>
-</box>
+</vbox>
 
 </window>
 
diff --git a/xpfe/browser/samples/widgets.xul b/xpfe/browser/samples/widgets.xul
index 098453a76389..36df8fbf79b6 100644
--- a/xpfe/browser/samples/widgets.xul
+++ b/xpfe/browser/samples/widgets.xul
@@ -31,7 +31,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
         style="width: 250px;"
-        align="vertical"> 
+        orient="vertical"> 
               
   <script>
   <![CDATA[
@@ -51,27 +51,27 @@
   ]]>
   </script>              
               
-  <box autostretch="never" valign="center">
+  <hbox autostretch="never" valign="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');"/>
-  </box>
-  <box autostretch="never" valign="center">
+  </hbox>
+  <hbox autostretch="never" valign="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');"/>
-  </box>
-  <box autostretch="never" valign="center">
+  </hbox>
+  <hbox autostretch="never" valign="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');"/>
-  </box>
-  <box autostretch="never" valign="center">
+  </hbox>
+  <hbox autostretch="never" valign="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');"/>
-  </box>
-  <box autostretch="never" valign="center">
+  </hbox>
+  <hbox autostretch="never" valign="center">
     <text class="label" value="Foo Label 5:" for="nerp4"/>
     <menubutton label="regular menubutton">
       <menupopup>
@@ -87,9 +87,9 @@
         <menuitem label="foo 3"/>
       </menupopup>
     </menubutton>    
-  </box>
+  </hbox>
   
-  <box autostretch="never" valign="center">
+  <hbox autostretch="never" valign="center">
     <text class="label" value="Foo Label 5:" for="nerp4"/>
     <menulist label="regular menulist">
       <menupopup>
@@ -105,64 +105,64 @@
         <menuitem label="foo 3"/>
       </menupopup>
     </menulist>    
-  </box>  
+  </hbox>  
   
-  <box>
+  <hbox>
     <text class="label" value="Foo Label 4:"/>
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <textbox flex="1"/>
-      <box orient="vertical" autostretch="never">
-        <box flex="1">
+      <vbox autostretch="never">
+        <hbox flex="1">
           <checkbox label="Checkbox 1" id="checkbox1"/>
           <spring flex="1"/>
           <button label="Test Property APIs" oncommand="testProperty('checkbox1');"/>
-        </box>
+        </hbox>
         <checkbox label="Checkbox 2" disabled="true" checked="true"/>
         <checkbox label="Checkbox 3"/>
-      </box>
+      </vbox>
       <separator class="groove"/>
       <radiogroup id="group" orient="vertical">
-        <box>
+        <hbox>
           <radio group="group" label="Radio 1" id="radio1"/>
           <spring flex="1"/>
           <button label="Test Property APIs" oncommand="testProperty('radio1');"/>
-        </box>
+        </hbox>
         <radio group="group" label="Radio 2"/>
         <radio group="group" label="Radio 3" disabled="true" checked="true"/>
       </radiogroup>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
 
   <separator/>
   
-  <box autostretch="never" valign="center">
+  <hbox autostretch="never" valign="center">
     <text class="label" value="Foo Label 7:"/>
     <button label="Standard XUL Button"/>
     <button class="dialog" label="Dialog XUL Button"/>
     <button class="dialog" disabled="true" default="true" label="Disabled Button"/>
-  </box>
+  </hbox>
         
   <separator/>
   
-  <box>
-    <box orient="vertical">
+  <hbox>
+    <vbox>
       <text class="label" value="Foo Label 6:"/>
       <spring flex="1"/>
-    </box>
+    </vbox>
     <textbox id="textarea" rows="3" multiline="true" value="Regular multiline textbox"/>
-    <box orient="vertical">
+    <vbox>
       <button label="Test Property APIs" oncommand="testProperty('textarea');"/>
       <spring flex="1"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
   
-  <box>
-    <box orient="vertical">
+  <hbox>
+    <vbox>
       <text class="label" value="Foo Label 6:"/>
       <spring flex="1"/>
-    </box>
+    </vbox>
     <textbox rows="3" multiline="true" disabled="true" value="Disabled multiline textbox"/>
-  </box>
+  </hbox>
   
   <separator/>
 
@@ -188,10 +188,10 @@
   </script>
   
   
-  <box autostretch="never" valign="center">
+  <hbox autostretch="never" valign="center">
     <progressmeter id="normal" mode="normal" flex="1"/>
     <button label="Advance Progress" oncommand="advanceProgress();"/>
-  </box>
+  </hbox>
   
   <separator/>
   
diff --git a/xpfe/browser/samples/xpmenu.xul b/xpfe/browser/samples/xpmenu.xul
index 8707c53d2bf6..b1f1d35185ed 100644
--- a/xpfe/browser/samples/xpmenu.xul
+++ b/xpfe/browser/samples/xpmenu.xul
@@ -25,7 +25,7 @@ Contributor(s): ______________________________________. -->
 <window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    align="vertical"> 
+    orient="vertical"> 
  <toolbox>
    <menubar chromeclass="menubar">
     <menu label="File" accesskey="f">
diff --git a/xpfe/browser/src/navigator-test1.xul b/xpfe/browser/src/navigator-test1.xul
index 43c9d13cf036..d45469d70a46 100644
--- a/xpfe/browser/src/navigator-test1.xul
+++ b/xpfe/browser/src/navigator-test1.xul
@@ -540,23 +540,23 @@
 
   </menubar>
   
-  <box id="outer-box" align="vertical">
-  <box align="horizontal" style="margin: 5px;">
-  <box align="vertical" flex="100%">
+  <vbox id="outer-box">
+  <hbox style="margin: 5px;">
+  <vbox flex="100%">
   <spring flex="100%"/>
   <html:input id="urlbar" type="text" style="min-width: 100px; min-height: 25px"
     onkeyup="if (event.keyCode == 13) { BrowserLoadURL(); }"/>   
   <spring flex="100%"/>
-  </box>
+  </vbox>
   <button id="Throbber" onclick="window.frames[0].home()">
      <observes element="Browser:Throbber" attribute="busy"/>
   </button>
-   </box>
+   </hbox>
 
-   <box align="horizontal" flex="100%">
+   <hbox flex="100%">
 
-   <toolbox align="horizontal">
-    <toolbar class="main-bar" align="vertical">
+   <toolbox orient="horizontal">
+    <toolbar class="main-bar" orient="vertical">
       <button id="back-button" align="bottom" label="Back" onclick="BrowserBack()"> 
           <observes element="canGoBack" attribute="disabled"/>      
         </button>
@@ -583,7 +583,7 @@
 
   </toolbar>
 
-    <toolbar class="main-bar" align="vertical">
+    <toolbar class="main-bar" orient="vertical">
       <button id="home-button" align="bottom" label="Home" 
       onclick="BrowserHome()"/>
     <button id="netscape-button" align="bottom" label="Netscape" 
@@ -596,7 +596,7 @@
   
   <html:iframe id="content-frame" html:name="content" html:src="BrowserInitPage.html" flex="100%" />
 
-  </box>
+  </hbox>
  
   <script>
         var bindCount = 0;
@@ -713,7 +713,7 @@
         }
     </script>
 
-  <box align="horizontal" id="status-bar">
+  <hbox id="status-bar">
  
     <broadcaster id="Browser:LoadingProgress"/>
     <broadcaster id="Browser:Status"/>
@@ -724,15 +724,15 @@
     
     <button label="[Notification Component]" onclick="doTests()"/>
 
-  <box id="security-box" class="insecure" align="horizontal" flex="100%">
-    <box align="vertical" style="width:100px">
+  <hbox id="security-box" class="insecure" flex="100%">
+    <vbox style="width:100px">
       <spring flex="100%"/>
       <progressmeter id="statusbar-icon" mode="normal" value="0" onclick="dumpProgress()">
         <observes element="Browser:LoadingProgress" attribute="mode"/>
         <observes element="Browser:Throbber" attribute="busy" onbroadcast="onProgress()"/>
       </progressmeter>
       <spring flex="100%"/>
-    </box>
+    </vbox>
 
     <button id="statusText" align="right" flex="1%" label="Document: Done" style="font-family:sans-serif;font-size:2.5mm">
              <observes element="Browser:Status" attribute="label" onbroadcast="onStatus()"/>      
@@ -744,31 +744,31 @@
     </button>
 
     <button id="security-button" class="insecure" label="Secure Conn" align="right" onclick="securityOff();"/>
-     </box>
-  </box>
+     </hbox>
+  </hbox>
 
   <toolbox>
     <toolbar id="taskbar">
-        <box align="horizontal">
+        <hbox>
            <button align="left" class="popup"  label="Web" />
            <button align="left" class="popup"  label="Mail" />
            <button align="left" class="popup"  label="Chat" />
-      </box>
+      </hbox>
       <spring flex="100%"/>
-      <box align="horizontal">
+      <hbox>
         <button align="left"  class="popup"  label="DayPlanner" />
         <button align="left"  class="popup"  label="Shopping" />
         <button align="left"  class="popup"  label="My Desk" />
-          </box>
+          </hbox>
       <spring flex="100%"/>
-        <box align="horizontal">
+        <hbox>
         <button align="left" class="popup" label="Open Windows" />
         <button align="left" id="mini-nav" label="" />
         <button align="left" id="mini-mail" label="" onclick="OpenMessenger()"/>
         <button align="left" id="mini-addr" label="" />
         <button align="left" id="mini-comp" label="" />
-        </box>
+        </hbox>
     </toolbar>
   </toolbox>
-  </box>
+  </vbox>
 </window>
diff --git a/xpfe/communicator/resources/content/askViewZoom.xul b/xpfe/communicator/resources/content/askViewZoom.xul
index 4f47728cc44e..4ac62c973731 100644
--- a/xpfe/communicator/resources/content/askViewZoom.xul
+++ b/xpfe/communicator/resources/content/askViewZoom.xul
@@ -46,19 +46,19 @@
   title="&askViewZoom.title;"
   onload="onLoad();"
   class="dialog"
-  align="vertical">
+  orient="vertical">
 
   <script type="application/x-javascript" src="chrome://communicator/content/askViewZoom.js"/>
 
-  <box orient="horizontal">
+  <hbox>
     <text class="label" value="&selectZoom.label;"/>
-  </box>
+  </hbox>
 
-  <box orient="horizontal">
+  <hbox>
     <textbox id="zoomValue" oninput="doEnabling();"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
   <keyset id="dialogKeys"/>
 
 </window>
diff --git a/xpfe/communicator/resources/content/openLocation.xul b/xpfe/communicator/resources/content/openLocation.xul
index 2d79ddceb490..9f067376d064 100644
--- a/xpfe/communicator/resources/content/openLocation.xul
+++ b/xpfe/communicator/resources/content/openLocation.xul
@@ -42,7 +42,7 @@
         onload="onLoad()"
         style="width: 40em;"
         class="dialog"
-        align="vertical"
+        orient="vertical"
         persist="screenX screenY"
         screenX="24" screenY="24">
               
@@ -54,17 +54,17 @@
   <stringbundle id="openLocationBundle" src="chrome://communicator/locale/openLocation.properties"/>
   <keyset id="dialogKeys"/>
 
-  <box>
-    <box orient="vertical">
+  <hbox>
+    <vbox>
       <image class="question-icon"/>
       <spring flex="1"/>
-    </box>
+    </vbox>
     <separator orient="vertical" class="thin"/>
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <html>&enter.label;</html>
       <separator class="thin"/>
 
-      <box autostretch="never">
+      <hbox autostretch="never">
         <textbox id="dialog.input" flex="1" type="autocomplete"
                     searchSessions="history" timeout="50" maxrows="6"
                     oninput="doEnabling();">
@@ -74,8 +74,8 @@
                      oncommand="useUBHistoryItem(event.target)"/>
         </textbox>
         <button label="&chooseFile.label;" oncommand="onChooseFile();"/>
-      </box>
-      <box autostretch="never" valign="center">
+      </hbox>
+      <hbox autostretch="never" valign="center">
         <text class="label" value="&openWhere.label;"/>
         <menulist id="openAppList">
           <menupopup>
@@ -86,12 +86,12 @@
           </menupopup>
         </menulist>
         <spring flex="1"/>
-      </box>
-    </box>
-  </box> 
+      </hbox>
+    </vbox>
+  </hbox> 
 
   <separator/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
            
  </window>
diff --git a/xpfe/communicator/resources/content/taskbarOverlay.xul b/xpfe/communicator/resources/content/taskbarOverlay.xul
index 1fcf61f58dcd..5dfbebf58815 100644
--- a/xpfe/communicator/resources/content/taskbarOverlay.xul
+++ b/xpfe/communicator/resources/content/taskbarOverlay.xul
@@ -11,9 +11,9 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:nc="http://home.netscape.com/NC-rdf#">
 
-  <box id="taskbarMenuBox" datasources="chrome://communicator-region/locale/taskbar.rdf"
-       ref="chrome://communicator-region/locale/taskbar.rdf#root" 
-       containment="http://home.netscape.com/NC-rdf#entry http://home.netscape.com/NC-rdf#child">
+  <hbox id="taskbarMenuBox" datasources="chrome://communicator-region/locale/taskbar.rdf"
+        ref="chrome://communicator-region/locale/taskbar.rdf#root" 
+        containment="http://home.netscape.com/NC-rdf#entry http://home.netscape.com/NC-rdf#child">
        
    <spring flex="1"/>
    
@@ -69,9 +69,9 @@
 
     </template>
     <spring class="taskbarspacer" flex="9"/>
-  </box>
+  </hbox>
     
-  <box id="taskbarGotoMenuBox" align="right" flex="1">
+  <hbox id="taskbarGotoMenuBox" align="right" flex="1">
     <!-- The "Open Windows" menu uses the window mediator
          to display all of the open windows -->
     <menubutton oncommand="ShowWindowFromResource(event.target)"
@@ -88,6 +88,6 @@
   
     <!-- spacer to accommodate mac resize box -->
     <spring id="resizer" style="width: 20px;"/>
-  </box>
+  </hbox>
 
 </overlay>
diff --git a/xpfe/communicator/resources/content/tasksOverlay.xul b/xpfe/communicator/resources/content/tasksOverlay.xul
index fc7203086e23..cb87e8904e22 100644
--- a/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/xpfe/communicator/resources/content/tasksOverlay.xul
@@ -71,24 +71,24 @@
         </menupopup>
       </menu>
  <!--   
-  <box id="taskbar" class="toolbar-standard chromeclass-status" persist="collapsed" style="min-width: 1px;" 
-       grippytooltip="aTooltip" grippytooltiptext="&taskBar.tooltip;">
-    <box id="taskButtons">
+  <hbox id="taskbar" class="toolbar-standard chromeclass-status" persist="collapsed" style="min-width: 1px;" 
+        grippytooltip="aTooltip" grippytooltiptext="&taskBar.tooltip;">
+    <hbox id="taskButtons">
       <button class="button-toolbar-4 taskbutton" id="mini-nav" oncommand="toNavigator();" 
               tooltip="aTooltip" tooltiptext="&taskNavigator.tooltip;"/>
       <button class="button-toolbar-4 taskbutton" id="mini-comp" oncommand="toEditor();" 
               tooltip="aTooltip" tooltiptext="&taskComposer.tooltip;"/>
       <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
               tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
-    </box>
+    </hbox>
    
     <spring id="taskbar-middle-spacer" flex="10"/>
     
-    <box id="taskbarMenuBox"/>
+    <hbox id="taskbarMenuBox"/>
     
    
    
-    <box id="taskbarGotoMenuBox" align="right"/>
+    <hbox id="taskbarGotoMenuBox" align="right"/>
     
     
   
@@ -97,10 +97,10 @@
     <spring id="taskbar-right-spacer" flex="7"/>
     
   
-  </box>
+  </hbox>
   -->
   
-  <box id="component-bar" class="statusbar-panel" persist="collapsed">
+  <hbox id="component-bar" class="statusbar-panel" persist="collapsed">
 
        <button class="button-toolbar-4 taskbutton" id="mini-nav" oncommand="toNavigator();" 
               tooltip="aTooltip" tooltiptext="&taskNavigator.tooltip;"/>
@@ -109,5 +109,5 @@
       <button class="button-toolbar-4 taskbutton" id="mini-addr" oncommand="toAddressBook();"
               tooltip="aTooltip" tooltiptext="&taskAddressBook.tooltip;"/>
                
-   </box> 
+   </hbox> 
 </overlay>
diff --git a/xpfe/communicator/resources/content/utilityOverlay.xul b/xpfe/communicator/resources/content/utilityOverlay.xul
index 2dd33da6cfcd..cccc6164e610 100644
--- a/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -253,33 +253,32 @@
         
   <!-- XXX needs xbl-ification! gray horizontal splitter -->
   <splitter id="gray_horizontal_splitter" class="gray-horizontal-splitter">
-    <box id="begincap" align="horizontal">
+    <hbox id="begincap">
       <spring flex="100%"/>
-    </box>
+    </hbox>
     <spring flex="100%"/>
     <grippy/>
     <spring flex="100%"/>
-    <box id="endcap" align="horizontal">
+    <hbox id="endcap">
       <spring flex="100%"/>
-    </box>
+    </hbox>
  </splitter>
 
   <!-- XXX needs xbl-ification! gray vertical splitter -->
   <splitter id="gray_vertical_splitter" class="gray-vertical-splitter">
-    <box id="begincap" align="vertical">
+    <vbox id="begincap">
       <spring flex="100%"/>
-    </box>
+    </vbox>
     <spring flex="100%"/>
     <grippy/>
     <spring flex="100%"/>
-    <box id="endcap" align="vertical">
+    <vbox id="endcap">
       <spring flex="100%"/>
-    </box>
+    </vbox>
  </splitter>
 
  <!-- Toolbar boxes -->
- <box id="toolbar_button_box"
-      align="horizontal"
-      flex="100%"/>
+ <hbox id="toolbar_button_box"
+       flex="100%"/>
 
 </overlay>
diff --git a/xpfe/components/autocomplete/test/autocomplete_test.xul b/xpfe/components/autocomplete/test/autocomplete_test.xul
index fca9be51ad00..e8042ce391cd 100644
--- a/xpfe/components/autocomplete/test/autocomplete_test.xul
+++ b/xpfe/components/autocomplete/test/autocomplete_test.xul
@@ -8,7 +8,7 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
-    		align="vertical"
+    		orient="vertical"
         width="750"
         height="500"
         onload="Initialize();"
diff --git a/xpfe/components/bookmarks/resources/addBookmark.xul b/xpfe/components/bookmarks/resources/addBookmark.xul
index c130cee8a8e2..d29190548ba2 100644
--- a/xpfe/components/bookmarks/resources/addBookmark.xul
+++ b/xpfe/components/bookmarks/resources/addBookmark.xul
@@ -129,6 +129,6 @@
   </vbox>
 
   <!-- XXX - need to use an "Add Bookmark" string here -->
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>        
diff --git a/xpfe/components/bookmarks/resources/bm-panel.xul b/xpfe/components/bookmarks/resources/bm-panel.xul
index 6d23c51193aa..2324feab0074 100644
--- a/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -75,7 +75,7 @@
     <commandset id="bookmarksItems"/>
   </commands>
   
-  <box id="panel-bar" class="toolbar">
+  <hbox id="panel-bar" class="toolbar">
     <button class="button-toolbar" label="&command.addBookmark.label;"
             oncommand="gBookmarksShell.addBookmark();"/>
     <button class="button-toolbar" label="&command.manageBookmarks.label;"
@@ -84,7 +84,7 @@
     <toolbarseparator/>
     <button class="button-toolbar" label="&command.findBookmarks.label;"
             oncommand="gBookmarksShell.findInBookmarks();"/>
-  </box>
+  </hbox>
   
   <tree id="bookmarksTree" context="bmContext" ref="NC:BookmarksRoot" class="sidebarTree"
         datasources="rdf:bookmarks rdf:files rdf:httpindex rdf:localsearch rdf:internetsearch"
diff --git a/xpfe/components/bookmarks/resources/bm-props.xul b/xpfe/components/bookmarks/resources/bm-props.xul
index 482f20f1e3a2..d83ede36b14f 100644
--- a/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/xpfe/components/bookmarks/resources/bm-props.xul
@@ -104,7 +104,7 @@
         <separator class="thin"/>
         <hbox class="box-padded">
           <spring flex="1"/>
-          <titledbox orient="vertical">
+          <groupbox orient="vertical">
             <label class="label" value="&checkforupdates.legend.label;"/>
             <grid flex="1">
               <columns>
@@ -208,7 +208,7 @@
               </rows>
             </grid>
             <separator class="thin"/>
-          </titledbox>
+          </groupbox>
           <spring flex="1"/>
         </hbox>
       </vbox>
@@ -223,13 +223,13 @@
         <separator class="thin"/>
         <hbox class="box-padded">
           <spring flex="1"/>
-          <titledbox orient="vertical" autostretch="never">
+          <groupbox orient="vertical" autostretch="never">
             <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;" />
-          </titledbox>
+          </groupbox>
           <spring flex="1"/>
         </hbox>
       </vbox>
@@ -238,6 +238,6 @@
   
   <separator/>
     
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/xpfe/components/bookmarks/resources/bookmarksPanel.xul b/xpfe/components/bookmarks/resources/bookmarksPanel.xul
index df1382ac53d9..4649ddff9c35 100644
--- a/xpfe/components/bookmarks/resources/bookmarksPanel.xul
+++ b/xpfe/components/bookmarks/resources/bookmarksPanel.xul
@@ -67,14 +67,14 @@
   <!-- bookmarks & edit commands -->
   <commandset id="bookmarksItems"/>
   
-  <box id="panel-bar" class="toolbar">
+  <hbox id="panel-bar" class="toolbar">
     <button class="button-toolbar" label="&command.addBookmark.label;"
             oncommand="gBookmarksShell.addBookmark();"/>
     <button class="button-toolbar" label="&command.manageBookmarks.label;"
             oncommand="gBookmarksShell.manageBookmarks();"/>
     <button class="button-toolbar" label="&command.findBookmarks.label;"
             oncommand="gBookmarksShell.findInBookmarks();"/>
-  </box>
+  </hbox>
   
   <tree id="bookmarksTree" context="bmContext" ref="NC:BookmarksRoot" class="sidebarTree"
         datasources="rdf:bookmarks rdf:files rdf:httpindex rdf:localsearch rdf:internetsearch"
diff --git a/xpfe/components/bookmarks/resources/findBookmark.xul b/xpfe/components/bookmarks/resources/findBookmark.xul
index bc38225adc80..73d16768c5fb 100644
--- a/xpfe/components/bookmarks/resources/findBookmark.xul
+++ b/xpfe/components/bookmarks/resources/findBookmark.xul
@@ -72,7 +72,7 @@
 
   <separator/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
 
diff --git a/xpfe/components/bookmarks/resources/pref-bookmarks.xul b/xpfe/components/bookmarks/resources/pref-bookmarks.xul
index b8da305c9464..c7ed46d2ce18 100644
--- a/xpfe/components/bookmarks/resources/pref-bookmarks.xul
+++ b/xpfe/components/bookmarks/resources/pref-bookmarks.xul
@@ -84,35 +84,35 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&filingBookmarks.label;"/>
     <html flex="1">&autoFile.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox id="enableAutoFile" label="&enableAutoFile.label;"
                 pref="true" preftype="bool" prefstring="browser.bookmarks.add_without_dialog"
                 prefattribute="checked" valign="top"/>
-    </box>
+    </hbox>
     <separator/>
     <html flex="1">&defaultFolder.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <textbox readonly="true" id="defaultFolder" crop="right" flex="1"/>
       <button label="&chooseDefaultFolder.label;" accesskey="&chooseDefaultFolder.accesskey;"
               oncommand="chooseDefaultFolder();"
               id="browser.bookmarks.choosefolder" pref="true" preftype="bool"
               prefstring="pref.browser.homepage.disable_button.choose_folder" prefattribute="disabled"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <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"/>
-  </titledbox>              
+  </groupbox>              
 
 
 </window>
diff --git a/xpfe/components/console/resources/content/console.xul b/xpfe/components/console/resources/content/console.xul
index 44775ca0159b..0a62cdca8e2b 100644
--- a/xpfe/components/console/resources/content/console.xul
+++ b/xpfe/components/console/resources/content/console.xul
@@ -39,7 +39,7 @@ Contributor(s): Joe Hewitt <hewitt@netscape.com>
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&console.title;"
         windowtype="global:console"
-        align="vertical"
+        orient="vertical"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height"> 
@@ -148,7 +148,7 @@ Contributor(s): Joe Hewitt <hewitt@netscape.com>
   </toolbar>
 </toolbox>
   
-<box id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext"/>
+<hbox id="ConsoleBox" class="console-box" flex="1" context="ConsoleContext"/>
 
 <iframe id="Evaluator" style="height: 0px" />
 
diff --git a/xpfe/components/directory/directory.xul b/xpfe/components/directory/directory.xul
index 18be15d42b70..53e6b0880295 100644
--- a/xpfe/components/directory/directory.xul
+++ b/xpfe/components/directory/directory.xul
@@ -93,9 +93,9 @@
     <grippy/>
   </splitter>
 
-  <box id="logbox" flex="1" orient="vertical" collapsed="true" persist="height collapsed" hidden="true">
+  <vbox id="logbox" flex="1" collapsed="true" persist="height collapsed" hidden="true">
      <iframe id="output-iframe" type="content" flex="1" src="chrome://communicator/content/directory/directory.html"/>
-  </box>
+  </vbox>
 </window>
 
 
diff --git a/xpfe/components/filepicker/res/content/filepicker.xul b/xpfe/components/filepicker/res/content/filepicker.xul
index fd8588b2e48e..0d1372eb0a2a 100644
--- a/xpfe/components/filepicker/res/content/filepicker.xul
+++ b/xpfe/components/filepicker/res/content/filepicker.xul
@@ -46,15 +46,15 @@
 <script type="application/x-javascript" src="chrome://global/content/filepicker.js"/>
 <keyset id="dialogKeys"/>
 
-<box autostretch="never">
+<hbox autostretch="never">
   <text value="&lookInMenuList.label;"/>
   <menulist id="lookInMenuList" flex="1" oncommand="onDirectoryChanged(event.target);" crop="left">
     <menupopup id="lookInMenu"/>
   </menulist>
   <button label=".." oncommand="goUp();"/>
-</box>
+</hbox>
 
-<box flex="1">
+<hbox flex="1">
   <outliner id="directoryOutliner" flex="1" onclick="onClick(event);"
             ondblclick="onDblClick(event);">
     <outlinercol id="FilenameColumn" label="&name.label;" flex="1"
@@ -68,7 +68,7 @@
 
     <outlinerbody flex="1" onselect="this.parentNode.outlinerBoxObject.view.selectionChanged()"/>
    </outliner>
-</box>
+</hbox>
 
 <grid style="margin-top: 5px">
   <columns>
@@ -88,6 +88,6 @@
   </rows>
 </grid>
 
-<box id="okCancelButtons"/>
+<hbox id="okCancelButtons"/>
 
 </window>
diff --git a/xpfe/components/find/resources/finddialog.xul b/xpfe/components/find/resources/finddialog.xul
index de63ef04a53e..3cfe2d104f38 100644
--- a/xpfe/components/find/resources/finddialog.xul
+++ b/xpfe/components/find/resources/finddialog.xul
@@ -42,7 +42,7 @@ Contributor(s):
   style="width: 30em;"
   title="&findDialog.title;"
   class="dialog"
-  align="vertical"
+  orient="vertical"
   persist="screenX screenY">
 
   <script type="application/x-javascript" src="chrome://global/content/finddialog.js"/>
@@ -79,7 +79,7 @@ Contributor(s):
   <separator/>
 
   <!-- Places to overlay common dialog buttons and keyset -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
   <keyset id="dialogKeys"/>
 
 </window>
diff --git a/xpfe/components/find/resources/replacedialog.xul b/xpfe/components/find/resources/replacedialog.xul
index 4fcdee26b645..5c44f1a23b25 100644
--- a/xpfe/components/find/resources/replacedialog.xul
+++ b/xpfe/components/find/resources/replacedialog.xul
@@ -33,14 +33,14 @@ Contributor(s): Kin Blas <kin@netscape.com>
   onunload="onUnload();"
   title="&replaceDialog.title;"
   class="dialog"
-  align="vertical"
+  orient="vertical"
   persist="screenX screenY"
   screenX="24" screenY="24">
 
   <script type="application/x-javascript" src="chrome://global/content/replacedialog.js"/>
   <stringbundle id="replaceBundle" src="chrome://global/locale/finddialog.properties"/>
    
-  <box>
+  <hbox>
   
     <!-- hack. we seem to need this separator to get it to render -->
     <separator orient="vertical" class="thin"/>
@@ -66,7 +66,7 @@ Contributor(s): Kin Blas <kin@netscape.com>
       <button class="dialog" id="replaceAll" label="&replaceAllButton.label;" oncommand="onReplaceAll();"/>
       <button class="dialog" id="close" label="&closeButton.label;" oncommand="close();"/>
     </vbox>
-  </box>
+  </hbox>
 
   <separator/>
 
diff --git a/xpfe/components/history/resources/findHistory.xul b/xpfe/components/history/resources/findHistory.xul
index 7a2a25dc8c7b..9aeda7f70dc9 100644
--- a/xpfe/components/history/resources/findHistory.xul
+++ b/xpfe/components/history/resources/findHistory.xul
@@ -67,7 +67,7 @@
 
   <separator/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
 
diff --git a/xpfe/components/history/resources/history-test.xul b/xpfe/components/history/resources/history-test.xul
index 0f09d498e5a3..163af3c83a77 100644
--- a/xpfe/components/history/resources/history-test.xul
+++ b/xpfe/components/history/resources/history-test.xul
@@ -12,9 +12,9 @@
 <html:b>history test</html:b>
 <html:hr/>
 
-<box align="horizontal" flex="100%">
+<hbox flex="100%">
 <html:input id="result" type="text" style="min-width: 400px; min-height: 27px" flex="100%"/>
-</box>
+</hbox>
 <html:hr/>
 <html:button onclick="ShowLastPageVisited();">Show Last Page Visited</html:button>  
 </window>
diff --git a/xpfe/components/permissions/content/cookieViewer.xul b/xpfe/components/permissions/content/cookieViewer.xul
index ecc6b6b2182f..205b08fc605b 100644
--- a/xpfe/components/permissions/content/cookieViewer.xul
+++ b/xpfe/components/permissions/content/cookieViewer.xul
@@ -1 +1 @@
-Dummy placeholder until these directories are hooked up correctly.
\ No newline at end of file
+Dummy placeholder until these directories are hooked up correctly.
diff --git a/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul b/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
index fa5d4d6dfb22..203857a13829 100644
--- a/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
+++ b/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
@@ -29,7 +29,7 @@ Contributor(s): ______________________________________. -->
          >
 
   <window id="fontPanel">
-    <titledbox orient="vertical">
+    <groupbox orient="vertical">
       <label value="&fontScaling;"/>
       <html:div>&fontScalingIntro;</html:div>
       <spring style="height: 10px;"/>
@@ -39,6 +39,6 @@ Contributor(s): ______________________________________. -->
                     prefstring="browser.display.screen_resolution" value="&defaultScaling;" size="3"/>
         <html:label>&fontScalingExample;</html:label>
       </html:div>
-    </titledbox>
+    </groupbox>
   </window>
 </overlay>
diff --git a/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 7893ba3bb075..13530b3c9cfd 100644
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -64,7 +64,7 @@
 	 * to call the backend to determine if turbo mode is enabled (since we are 
 	 * required to check for it in a non-trivial way) and then explicitly set the
 	 * checkbox here based on what we find. Finally, we have to hide the checkbox
-	 * (and the titled box that frames it) if we are not executing on a Win32 
+	 * (and the group box that frames it) if we are not executing on a Win32 
 	 * platform.
 	 *
 	 * Return Value: void
@@ -151,9 +151,9 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical" id="advancedSettings">
+  <groupbox orient="vertical" id="advancedSettings">
     <label value="&advancedTitle.label;"/>
     <vbox autostretch="never" id="contentEnablingBox">
       <checkbox id="advancedJavaAllow" label="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
@@ -180,13 +180,13 @@
       <spring flex="1"/>
     </hbox>
     <separator/>
-  </titledbox>
-  <titledbox orient="vertical" id="perfSettings">
+  </groupbox>
+  <groupbox orient="vertical" id="perfSettings">
    <label id="perfLabel" value="&perfTitle.label;"/>
     <vbox id="perfBox" autostretch="never">
       <checkbox id="enableTurbo" label="&enableTurbo.label;" accesskey="&enableTurboCheck.accesskey;"/>
-	</vbox>
-   </titledbox>
+    </vbox>
+  </groupbox>
   
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index bde021e505ee..8ce8989f59cc 100644
--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -79,9 +79,9 @@
   ]]>
   </script>
           
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox id="generalStartupPreferences" orient="vertical" autostretch="never">
+  <groupbox id="generalStartupPreferences" orient="vertical" autostretch="never">
     <label value="&onStartLegend.label;"/>
     
     <!-- XXX remove when navigator overlays.rdf works -->
@@ -91,10 +91,10 @@
               prefattribute="checked"/>
     <!-- XXX -->
     
-  </titledbox>
+  </groupbox>
   
   <!-- displaying none for beta -->
-  <titledbox id="toolbarStyleBox" orient="vertical" style="display: none;">
+  <groupbox id="toolbarStyleBox" orient="vertical" style="display: none;">
     <label value="&showToolsLegend.label;"/>
     <radiogroup id="toolbarStyle" orient="vertical" autostretch="never"
                 pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"
@@ -103,7 +103,7 @@
       <radio group="toolbarStyle" value="0" label="&picsOnlyRadio.label;" accesskey="&picsOnlyRadio.accesskey;"/>
       <radio group="toolbarStyle" value="1" label="&textonlyRadio.label;" accesskey="&textonlyRadio.accesskey;"/>
     </radiogroup>
-  </titledbox>
+  </groupbox>
 
   <vbox class="box-padded" autostretch="never">
     <separator class="thin" />
diff --git a/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul b/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
index 74c06dfd064b..2bd894052878 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
@@ -273,10 +273,10 @@
   
   <keyset id="dialogKeys"/>
   
-  <box autostretch="never">
+  <hbox autostretch="never">
     <image id="largeIcon" class="file-icon-large" style="width: 32px; height: 32px;"/>
     <text class="label" id="contentType" crop="right"/>
-  </box>
+  </hbox>
   
   <separator class="thin"/>
 
@@ -303,41 +303,41 @@
     </rows>
   </grid>
   
-  <box autostretch="never">
+  <hbox autostretch="never">
     <checkbox id="outgoingDefault" label="&outgoingDefault.label;" accesskey="&outgoingDefault.accesskey;" disabled="true"/>
-  </box>
+  </hbox>
   
   <separator class="thin"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&handledby.label;"/>
     
     <radiogroup id="handler" orient="vertical">
-      <box orient="vertical" autostretch="never">
+      <vbox autostretch="never">
 <!-- 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();"/>
-      </box>
-      <box autostretch="never">
+      </vbox>
+      <hbox autostretch="never">
         <radio value="2" group="handler" label="&application.label;" accesskey="&application.accesskey;" oncommand="doEnabling();"/>
         <textbox id="appPath" flex="1" onchange="selectAppRadio();"/>
-      </box>
-      <box autostretch="never" halign="right">
+      </hbox>
+      <hbox autostretch="never" halign="right">
         <button label="&browse.label;" accesskey="&browse.accesskey;"
                 oncommand="chooseApp();"/>
-      </box>
+      </hbox>
     </radiogroup>
     
-  </titledbox>              
+  </groupbox>              
 
-  <box autostretch="never">
+  <hbox autostretch="never">
     <checkbox id="askBeforeOpen" label="&askBeforeOpen.label;" accesskey="&askBeforeOpen.accesskey;"/>         
-  </box>
+  </hbox>
   
   <separator/>
   
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
   
 </window>
         
diff --git a/xpfe/components/prefwindow/resources/content/pref-applications-new.xul b/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
index 091af249b559..ce3dc813d040 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
@@ -71,11 +71,11 @@
       </row>
       <row>
         <spring/>
-        <box>
+        <hbox>
           <spring flex="1"/>
           <button label="&browse.label;" accesskey="&browse.accesskey;" 
                   oncommand="chooseApp();"/>
-        </box>
+        </hbox>
       </row>
     </rows>
   </grid>
@@ -88,7 +88,7 @@
   
   <separator/>
   
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
   
 </window>
         
diff --git a/xpfe/components/prefwindow/resources/content/pref-applications.xul b/xpfe/components/prefwindow/resources/content/pref-applications.xul
index d48e32d47fc3..e6e1ac79e584 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -39,12 +39,12 @@
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-applications.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox flex="1">
+  <groupbox flex="1">
     <label value="&descript;"/>
     
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <text class="label" value="&fileTypes.label;"/>
       <tree id="appTree" class="inset" flex="1" style="width: 0px; height: 0px;"
             datasources="rdf:null" ref="urn:mimetypes"
@@ -79,9 +79,9 @@
           </rule>        
         </template>
       </tree>
-    </box>
+    </vbox>
     
-    <box orient="vertical">
+    <vbox>
       <button id="newTypeButton" 
               label="&newTypeButton.label;" accesskey="&newTypeButton.accesskey;" 
               oncommand="newType();"
@@ -97,10 +97,10 @@
               oncommand="removeType();"
               pref="true" preftype="bool"
               prefstring="pref.application.disable_button.remove" prefattribute="disabled"/>
-    </box>
-  </titledbox>
+    </vbox>
+  </groupbox>
     
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&file;"/>
     <grid flex="1">
       <columns>
@@ -122,6 +122,6 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
   
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-cache.xul b/xpfe/components/prefwindow/resources/content/pref-cache.xul
index bb010605799f..4294316c0cc5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -40,9 +40,9 @@
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-cache.js"/>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&cacheTitle.label;"/>
     
     <html>&cachePara;</html>
@@ -59,11 +59,11 @@
       <rows>
         <row autostretch="never" valign="middle">
           <text class="label" value="&memCache.label;" accesskey="&memCache.accesskey;" for="browserCacheMemoryCache"/>
-          <box autostretch="never" valign="middle">
+          <hbox autostretch="never" valign="middle">
             <textbox id="browserCacheMemoryCache" size="8" pref="true" preftype="int"
                        prefstring="browser.cache.memory.capacity" prefattribute="value"/>
             <text class="label" value="&kbyes;"/>
-          </box>
+          </hbox>
           <button class="dialog" label="&clearMemCache.label;" accesskey="&clearMemCache.accesskey;"
                   oncommand="prefClearMemCache();"
                   id="clearMemCache" pref="true" preftype="bool"
@@ -71,11 +71,11 @@
         </row>
         <row autostretch="never" valign="middle">
           <text class="label" value="&diskCache.label;" accesskey="&diskCache.accesskey;" for="browserCacheDiskCache"/>
-          <box autostretch="never" valign="middle">
+          <hbox autostretch="never" valign="middle">
             <textbox id="browserCacheDiskCache" size="8" pref="true" preftype="int"
                        prefstring="browser.cache.disk.capacity" prefattribute="value"/>
             <text class="label" value="&kbyes;"/>
-          </box>
+          </hbox>
           <button class="dialog" label="&clearDiskCache.label;" accesskey="&clearDiskCache.accesskey;"
                   oncommand="prefClearDiskCache();"
                   id="clearDiskCache" pref="true" preftype="bool"
@@ -87,7 +87,7 @@
     <separator class="thin"/>
     
     <html>&docCache;</html>
-    <box orient="vertical" autostretch="never" class="indent">
+    <vbox autostretch="never" class="indent">
       <radiogroup id="browserCacheCheckDocFrequency" orient="vertical" autostretch="never"
                   pref="true" preftype="int" prefstring="browser.cache.check_doc_frequency"
                   prefattribute="value">
@@ -96,9 +96,9 @@
         <radio group="browserCacheCheckDocFrequency" value="0" label="&oncePsessionRadio.label;" accesskey="&oncePsessionRadio.accesskey;"/>
         <radio group="browserCacheCheckDocFrequency" value="2" label="&neverRadio.label;" accesskey="&neverRadio.accesskey;"/>
       </radiogroup>
-    </box>
+    </vbox>
 
-  </titledbox>
+  </groupbox>
 
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul b/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul
index e0f048bcbfa0..a16b092ec179 100644
--- a/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-calibrate-screen.xul
@@ -38,16 +38,16 @@
   <script type="application/x-javascript" 
           src="chrome://communicator/content/pref/pref-fonts.js"/>
 
-  <box orient="vertical" align="center">
+  <vbox align="center">
 
-    <box id="horizRuler" orient="vertical" width="300" height="30" style="margin: 10px; margin-bottom: 0px">
-      <box height="10px" style="border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
-      <box height="10px" style="border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
-    </box>
+    <vbox id="horizRuler" width="300" height="30" style="margin: 10px; margin-bottom: 0px">
+      <hbox height="10px" style="border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
+      <hbox height="10px" style="border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
+    </vbox>
 
-    <box align="center">
+    <hbox align="center">
       <text value="&calibrate.instructions;"/>
-    </box>
+    </hbox>
       
     <separator class="thin"/>
       
@@ -65,8 +65,8 @@
     <separator/>
 
     <keyset id="dialogKeys"/>
-    <box id="okCancelButtonsRight"/>
+    <hbox id="okCancelButtonsRight"/>
 
-  </box>
+  </vbox>
   
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-charset.xul b/xpfe/components/prefwindow/resources/content/pref-charset.xul
index 78a27aa619aa..922850bd3248 100644
--- a/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-charset.xul
@@ -39,12 +39,12 @@
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-charset.js"/>
   
 <!-- 
-  <box class="box-smallheader" title="&charset.customize.left.header;" id="confirm_text" value="&charset.customize.save.popup;"/>
+  <hbox class="box-smallheader" title="&charset.customize.left.header;" id="confirm_text" value="&charset.customize.save.popup;"/>
 -->
 
   <!-- The two-pane -->
-  <box flex="1">
-    <box orient="vertical" flex="1">
+  <hbox flex="1">
+    <vbox flex="1">
       <text class="label" value="&charset.customize.additional.label;" crop="right"/>
       <!-- Available Charsets Tree -->
       <tree class="inset" id="available_charsets" flex="1"
@@ -57,13 +57,13 @@
         <treechildren id="available_charsets_root" flex="1"/>
       </tree> 
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <button id="add_button" oncommand="AddAvailableCharset();" class="dialog"
                 label="&charset.customize.add.label;" disabled="true"/>
-      </box>
-    </box> 
+      </hbox>
+    </vbox> 
     <separator orient="vertical"/>
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <text class="label" value="&charset.customize.current.label;" crop="right"/>
       <tree class="inset" id="active_charsets" flex="1" 
             onselect="SelectActiveCharset();"
@@ -76,25 +76,25 @@
         <treechildren id="active_charsets_root" flex="1"/>
       </tree>
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <button id="remove_button" oncommand="RemoveActiveCharset();"
                 class="dialog" disabled="true"
                 label="&charset.customize.remove.label;"/>
-      </box>
-    </box> 
-    <box orient="vertical">
+      </hbox>
+    </vbox> 
+    <vbox>
       <spring flex="1"/>
       <button id="up_button" class="up small" disabled="true"
               oncommand="MoveUp();"/>
       <button id="down_button" class="down small" disabled="true"
               oncommand="MoveDown();"/>
       <spring flex="1"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
 
   <separator class="groove"/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
   
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index 1988c670cddc..2c60b781d1f7 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -42,53 +42,53 @@
   
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-colors.js"/>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <box>
-    <titledbox orient="vertical" flex="1" id="pageColours">
+  <hbox>
+    <groupbox orient="vertical" flex="1" id="pageColours">
       <label value="&color;"/>
-      <box>
+      <hbox>
         <text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/>
         <spring flex="1"/>
         <colorpicker type="button" id="foregroundtextmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="foregroundText" pref="true" preftype="color" prefstring="browser.display.foreground_color" prefattribute="value" wsm_attributes="value"/>
-      </box>
-      <box style="margin-top: 5px">
+      </hbox>
+      <hbox style="margin-top: 5px">
         <text class="label" value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" for="backgroundmenu"/>
         <spring flex="1"/>
         <colorpicker type="button" id="backgroundmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="background" pref="true" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
-      </box>
+      </hbox>
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
                 pref="true" preftype="bool" prefstring="browser.display.use_system_colors" prefattribute="checked"/>
-      </box>
-    </titledbox>
+      </hbox>
+    </groupbox>
       
-    <titledbox orient="vertical" flex="1">
+    <groupbox orient="vertical" flex="1">
       <label value="&links;"/>
-      <box>
+      <hbox>
         <text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/>
         <spring flex="1"/>
         <colorpicker type="button" id="unvisitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="unvisitedLinks" pref="true" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
-      </box>
-      <box style="margin-top: 5px">
+      </hbox>
+      <hbox style="margin-top: 5px">
         <text class="label" value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" for="visitedlinkmenu"/>
         <spring flex="1"/>
         <colorpicker type="button" id="visitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="visitedLinks" pref="true" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
-      </box>
+      </hbox>
       <separator class="thin"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
                   pref="true" preftype="bool" prefstring="browser.underline_anchors" prefattribute="checked"/>
-      </box>
-    </titledbox>
-  </box>
+      </hbox>
+    </groupbox>
+  </hbox>
   
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <html>&someProvColors;</html>
   
     <radiogroup id="browserUseDocumentColors" orient="vertical" autostretch="never" 
@@ -98,14 +98,14 @@
       <radio group="browserUseDocumentColors" value="false" label="&useMyColors.label;" accesskey="&useMyColors.accesskey;"/>        
     </radiogroup>
     
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
       <label value="&viewsource;"/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox id="syntaxHighlight" label="&syntaxHighlight.label;" accesskey="&syntaxHighlight.accesskey;"
                   pref="true" preftype="bool" prefstring="view_source.syntax_highlight" prefattribute="checked"/>
-      </box>
-  </titledbox>
+      </hbox>
+  </groupbox>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-debug.xul b/xpfe/components/prefwindow/resources/content/pref-debug.xul
index 3e8081568b2e..b096665779f2 100644
--- a/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -40,9 +40,9 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&widgetRendering.label;"/>
     <checkbox id="nglayoutDebugWindow" label="&debugWindow.label;"
               pref="true" preftype="bool" prefstring="nglayout.widget.debugWindow"
@@ -50,11 +50,11 @@
     <checkbox id="debugXULBoxes" label="&debugXULBox.label;"
               pref="true" preftype="bool" prefstring="xul.debug.box"
               prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
 
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&debugMiscellaneous.label;"/>
     <checkbox id="nglayoutDebugUseXBLForms" label="Use XBL-based form controls (takes effect after restart). Don't file bugs on these controls; they are still under construction."
               pref="true" preftype="bool" prefstring="nglayout.debug.enable_xbl_forms"
@@ -68,10 +68,10 @@
     <checkbox id="showAboutAsStupidModalWindow" label="&debugShowAboutAsStupidModalWindow.label;"
               pref="true" preftype="bool" prefstring="browser.show_about_as_stupid_modal_window"
               prefattribute="checked"/>
-  </titledbox>              
+  </groupbox>              
 
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&accelerators.label;"/>
     <label value="&acceleratorsBlurb.label;"/>
 
@@ -95,7 +95,7 @@
         </rows>
       </grid>
 
-  </titledbox>
+  </groupbox>
 
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-debug1.xul b/xpfe/components/prefwindow/resources/content/pref-debug1.xul
index 51ea8edb4554..1b52d3716a94 100644
--- a/xpfe/components/prefwindow/resources/content/pref-debug1.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug1.xul
@@ -41,13 +41,13 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
 
   <!-- Event Debugging -->  
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugEventDebugging.label;"/>
     <vbox autostretch="never">
       <checkbox id="nglayoutDebugPaintFlashing" label="&debugPaintFlashing.label;"
@@ -69,10 +69,10 @@
                 pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
                 prefattribute="checked"/>
     </vbox>
-  </titledbox>
+  </groupbox>
 
   <!-- Reflow events -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugReflowEvents.label;"/>
     <vbox autostretch="never">
       <checkbox id="layoutReflowShowFrameCounts" label="&debugReflowShowFrameCounts.label;"
@@ -85,7 +85,7 @@
                 pref="true" preftype="bool" prefstring="layout.reflow.dumpframebyframecounts"
                 prefattribute="checked"/>
     </vbox>
-  </titledbox>
+  </groupbox>
 
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-debug2.xul b/xpfe/components/prefwindow/resources/content/pref-debug2.xul
index ac9df10ade6d..eb70d5e40154 100644
--- a/xpfe/components/prefwindow/resources/content/pref-debug2.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug2.xul
@@ -39,12 +39,12 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugNetworking.label;"/>
     <vbox autostretch="never">
       <checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;"
@@ -65,9 +65,9 @@
     <textbox id="acceptEncodingString" flex="1" wsm_persist="true"
               pref="true" preftype="string" prefstring="network.http.accept-encoding"
               prefattribute="value"/> 
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugCache.label;"/>
     <vbox autostretch="never">
     <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
@@ -81,7 +81,7 @@
               prefattribute="checked"/>
 
     </vbox>
-  </titledbox>
+  </groupbox>
 
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-download.xul b/xpfe/components/prefwindow/resources/content/pref-download.xul
index 7dae4a5d2c9a..7c6aec3f0b60 100644
--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -67,7 +67,7 @@
   }
   </script>
   
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
   
   <html:fieldset>
     <html:legend align="left">&newmes;</html:legend>
@@ -131,12 +131,12 @@
 
   <html:fieldset>
     <html:legend align="left">&Allmsg;</html:legend>
-    <box align="vertical" flex="100%" style="width: 100%; height: 100%">
+    <vbox flex="100%" style="width: 100%; height: 100%">
       <html:div class="hspace-both">&offlineMsgs;</html:div>
       <html:div class="hspace-both vspace">
         <button class="dialog push" label="&select;" align="left"/>
       </html:div>
-    </box>
+    </vbox>
     <spring style="height: 30px;"/>
   </html:fieldset>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index fb11e39a65cd..7a882ae714d5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -36,9 +36,9 @@
   <script type="application/x-javascript" 
           src="chrome://communicator/content/pref/pref-fonts.js"/>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label>
       <text class="label small-margin" 
             value="&language.label;" 
@@ -74,12 +74,12 @@
       
       <rows>
         <row autostretch="never" valign="middle">
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label small-margin" 
                   value="&proportional.label;" 
                   accesskey="&proportional.accesskey;" 
                   for="proportionalFont"/>
-          </box>
+          </hbox>
           <menulist id="proportionalFont" class="small-margin"  flex="1" style="width: 0px;" 
                     preftype="string" prefstring="font.default">
             <menupopup>
@@ -119,60 +119,60 @@
           <separator class="thin"/>
         </row>
         <row autostretch="never" valign="middle">
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label small-margin" 
                   value="&serif.label;" 
                   accesskey="&serif.accesskey;" 
                   for="serif"/>
-          </box>
+          </hbox>
           <menulist id="serif" class="small-margin" flex="1" style="width: 0px;">
             <menupopup/>
           </menulist>
           <spring/>
         </row>
         <row autostretch="never" valign="middle">
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label small-margin" 
                   value="&sans-serif.label;" 
                   accesskey="&sans-serif.accesskey;" 
                   for="sans-serif"/>
-          </box>
+          </hbox>
           <menulist id="sans-serif" class="small-margin" flex="1" style="width: 0px;">
             <menupopup/>
           </menulist>
           <spring/>
         </row>
         <row autostretch="never" valign="middle">
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label small-margin" 
                   value="&cursive.label;" 
                   accesskey="&cursive.accesskey;" 
                   for="cursive"/>
-          </box>
+          </hbox>
           <menulist id="cursive" class="small-margin">
             <menupopup/>
           </menulist>
           <spring/>
         </row>
         <row autostretch="never" valign="middle">
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label small-margin" 
                   value="&fantasy.label;" 
                   accesskey="&fantasy.accesskey;" 
                   for="fantasy"/>
-          </box>
+          </hbox>
           <menulist id="fantasy" class="small-margin">
             <menupopup/>
           </menulist>
           <spring/>
         </row>
         <row autostretch="never" valign="middle">
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label small-margin" 
                   value="&monospace.label;" 
                   accesskey="&monospace.accesskey;" 
                   for="monospace"/>
-          </box>
+          </hbox>
           <menulist id="monospace" class="small-margin"
                     flex="1" style="width: 0px;" crop="right">
             <menupopup/>
@@ -205,21 +205,21 @@
         </row>
       </rows>
     </grid>
-  </titledbox>
+  </groupbox>
 
   <separator class="thin"/>
   
-  <box autostretch="never">
+  <hbox autostretch="never">
     <!-- Unchecking this removes the ability to select dynamic fonts -->
     <checkbox id="browserUseDocumentFonts" 
               clas="small-margin"
               label="&useDocumentFonts.label;" 
               accesskey="&useDocumentFonts.accesskey;"/>
-  </box>
+  </hbox>
 
   <separator class="thin"/>
   
-  <box autostretch="never" valign="middle">
+  <hbox autostretch="never" valign="middle">
     <text class="label small-margin" 
           value="&resolution.label;" 
           accesskey="&resolution.accesskey;" 
@@ -244,6 +244,6 @@
       </menupopup>
     </menulist>
 
-  </box>
+  </hbox>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-history.xul b/xpfe/components/prefwindow/resources/content/pref-history.xul
index f70e673034d4..fe054c82f14d 100644
--- a/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-history.xul
@@ -101,13 +101,13 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
   <!-- history -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&header3.label;"/>
     <html>&historyPages.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <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"
@@ -118,36 +118,36 @@
         oncommand="prefClearGlobalHistory();"
         id="browserClearHistory" pref="true" preftype="bool"
         prefstring="pref.browser.history.disable_button.clear_hist" prefattribute="disabled"/>
-    </box>
-  </titledbox>  
+    </hbox>
+  </groupbox>  
   
   <!-- no honey, I haven't been viewing porn, honest! -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&locationBarHistory.label;"/>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <html flex="1">&clearLocationBar.label;</html>
-      <box autostretch="never" halign="right">
+      <hbox autostretch="never" halign="right">
         <button class="dialog" id="ClearUrlBarHistoryButton" label="&clearLocationBarButton.label;" accesskey="&clearLocationBarButton.accesskey;"
          oncommand="prefClearUrlbarHistory();"
          pref="true" preftype="bool"
          prefstring="pref.browser.history.disable_button.clear_urlbar" prefattribute="disabled"/>
-      </box>
-    </box>
-  </titledbox>  
+      </hbox>
+    </hbox>
+  </groupbox>  
 
 
   <!-- Session History -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&shistory.label;"/>
     <html>&shistoryDescription1.label;</html>
-    <box autostretch="never">
+    <hbox autostretch="never">
       <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"
                   prefattribute="value"/>      
       <spring flex="1"/>
-    </box>
-  </titledbox>  
+    </hbox>
+  </groupbox>  
 
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-languages-add.xul b/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
index e26c4fc16a65..f893872b0334 100644
--- a/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
@@ -53,15 +53,15 @@
     <treechildren id="available_languages_root" flex="1"/>
   </tree>
 
-  <box autostretch="never">
+  <hbox autostretch="never">
     <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"/>
-  </box>
+  </hbox>
 
   <separator class="groove"/>
 
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-languages.xul b/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 50cef08d4912..934abe7edb03 100644
--- a/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -44,18 +44,18 @@
                 prefstring="intl.accept_languages"/>
 
                 
-    <box class="box-smallheader" title="&languages.customize.lHeader;"/>
+    <hbox class="box-smallheader" title="&languages.customize.lHeader;"/>
     <!--
       description="&languages.customize.rHeader;    
     -->
 
-  <titledbox orient="vertical" flex="1">
+  <groupbox orient="vertical" flex="1">
     <label value="&langtitle.label;"/>
 
     <html>&languages.customize.prefLangDescript;</html>
 
     <html>&languages.customize.active.label;</html>
-    <box flex="1">
+    <hbox flex="1">
       <tree class="inset" id="active_languages" flex="1" style="width: 0px; height: 0px;"
             pref="true" preftype="string" prefstring="intl.accept_languages" prefvalue="" prefattribute="prefvalue" wsm_attributes="prefvalue"
             datasources="rdf:null" multiple="true" onselect="SelectLanguage();">
@@ -64,7 +64,7 @@
         </treecolgroup>
         <treechildren id="active_languages_root" flex="1"/>
       </tree>
-      <box orient="vertical">
+      <vbox>
         <button oncommand="MoveUp();" id="up" class="up" disabled="true"
                 label="&languages.customize.moveUp.label;"
                 accesskey="&languages.customize.moveUp.accesskey;"
@@ -86,10 +86,10 @@
                 oncommand="RemoveActiveLanguage();"
                 pref="true" preftype="bool"
                 prefstring="pref.browser.language.disable_button.remove" prefattribute="disabled"/>
-      </box>
-    </box>
-  </titledbox>
-  <titledbox orient="vertical" autostretch="never">
+      </vbox>
+    </hbox>
+  </groupbox>
+  <groupbox orient="vertical" autostretch="never">
     <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"
@@ -101,5 +101,5 @@
           </menupopup>
         </template>
     </menulist>       
-  </titledbox>
+  </groupbox>
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index f25ec0f3d936..daf4ba435283 100644
--- a/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -85,22 +85,22 @@
   ]]>
   </script>
 
-  <box class="box-smallheader" title="&title.label;"/>
+  <hbox class="box-smallheader" title="&title.label;"/>
 
-    <box orient="vertical">
-      <box valign="bottom" autostretch="never">
-        <box orient="vertical">
+    <vbox>
+      <hbox valign="bottom" autostretch="never">
+        <vbox>
           <text class="label" value="&mouseWheelPanel.label;" accesskey="&mouseWheelPanel.accesskey;" 
                 for="mouseWheelMode"/>
-        </box>
-      </box>
-    </box>
+        </vbox>
+      </hbox>
+    </vbox>
 
     <separator class="thin"/>
   
-    <titledbox orient="vertical">
+    <groupbox orient="vertical">
       <label>
-        <box> 
+        <hbox> 
           <menulist id="mouseWheelMode" oncommand="switchPage(this);"
             pref="true" preftype="bool" prefstring="pref.mousewheel.disable_button.modifier" prefattribute="disabled">
             <menupopup>
@@ -110,7 +110,7 @@
               <menuitem value="3" label="&usingWheelAndShft.label;"/>
             </menupopup>
           </menulist>
-        </box>
+        </hbox>
       </label>
 
 
@@ -120,9 +120,9 @@
       <radiogroup id="mousewheelWithNoKeyAction" orient="vertical" autostretch="never"
                   pref="true" preftype="int" prefstring="mousewheel.withnokey.action" 
                   prefattribute="value">
-        <box autostretch="never" valign="top">
+        <hbox autostretch="never" valign="top">
           <radio group="mousewheelWithNoKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <box orient="vertical" autostretch="never">
+          <vbox autostretch="never">
             <hbox autostretch="never">
               <textbox id="mousewheelWithNoKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withnokey.numlines"
@@ -132,8 +132,8 @@
             <checkbox id="mousewheelWithNoKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       pref="true" preftype="bool" prefstring="mousewheel.withnokey.sysnumlines"
                       prefattribute="checked" oncommand="enableField(this, 'mousewheelWithNoKeyNumlines');"/>
-          </box>
-        </box>
+          </vbox>
+        </hbox>
         <radio group="mousewheelWithNoKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
         <radio group="mousewheelWithNoKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio group="mousewheelWithNoKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
@@ -143,9 +143,9 @@
       <radiogroup id="mousewheelWithAltKeyAction" orient="vertical" autostretch="never" 
                   pref="true" preftype="int" prefstring="mousewheel.withaltkey.action" 
                   prefattribute="value">
-        <box autostretch="never" valign="top">
+        <hbox autostretch="never" valign="top">
           <radio group="mousewheelWithAltKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <box orient="vertical" autostretch="never">
+          <vbox autostretch="never">
             <hbox autostretch="never">
               <textbox id="mousewheelWithAltKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withaltkey.numlines"
@@ -155,8 +155,8 @@
             <checkbox id="mousewheelWithAltKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       pref="true" preftype="bool" prefstring="mousewheel.withaltkey.sysnumlines"
                       prefattribute="checked" oncommand="enableField(this, 'mousewheelWithAltKeyNumlines');"/>
-          </box>
-        </box>
+          </vbox>
+        </hbox>
         <radio group="mousewheelWithAltKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
         <radio group="mousewheelWithAltKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio group="mousewheelWithAltKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
@@ -166,9 +166,9 @@
       <radiogroup id="mousewheelWithCtrlKeyAction" orient="vertical" autostretch="never"
                   pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.action" 
                   prefattribute="value">
-        <box autostretch="never" valign="top">
+        <hbox autostretch="never" valign="top">
           <radio group="mousewheelWithCtrlKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <box orient="vertical" autostretch="never">
+          <vbox autostretch="never">
             <hbox autostretch="never">
               <textbox id="mousewheelWithCtrlKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withcontrolkey.numlines"
@@ -178,8 +178,8 @@
             <checkbox id="mousewheelWithCtrlKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       pref="true" preftype="bool" prefstring="mousewheel.withcontrolkey.sysnumlines"
                       prefattribute="checked" oncommand="enableField(this, 'mousewheelWithCtrlKeyNumlines');"/>
-          </box>
-        </box>
+          </vbox>
+        </hbox>
         <radio group="mousewheelWithCtrlKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
         <radio group="mousewheelWithCtrlKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio group="mousewheelWithCtrlKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
@@ -189,9 +189,9 @@
       <radiogroup id="mousewheelWithShiftKeyAction" orient="vertical" autostretch="never"
                   pref="true" preftype="int" prefstring="mousewheel.withshiftkey.action" 
                   prefattribute="value">
-        <box autostretch="never" valign="top">
+        <hbox autostretch="never" valign="top">
           <radio group="mousewheelWithShiftKeyAction" value="0" label="&scroll.label;" accesskey="&scroll.accesskey;"/>
-          <box orient="vertical" autostretch="never">
+          <vbox autostretch="never">
             <hbox autostretch="never">
               <textbox id="mousewheelWithShiftKeyNumlines" size="3" 
                          pref="true" preftype="int" prefstring="mousewheel.withshiftkey.numlines"
@@ -201,14 +201,14 @@
             <checkbox id="mousewheelWithShiftKeySysNumlines" label="&useSystemDefault.label;" accesskey="&useSystemDefault.accesskey;"
                       pref="true" preftype="bool" prefstring="mousewheel.withshiftkey.sysnumlines"
                       prefattribute="checked" oncommand="enableField(this, 'mousewheelWithShiftKeyNumlines');"/>
-          </box>
-        </box>
+          </vbox>
+        </hbox>
         <radio group="mousewheelWithShiftKeyAction" value="1" label="&scrollPgUpPgDn.label;" accesskey="&scrollPgUpPgDn.accesskey;"/>
         <radio group="mousewheelWithShiftKeyAction" value="2" label="&history.label;" accesskey="&history.accesskey;"/>
         <radio group="mousewheelWithShiftKeyAction" value="3" label="&textsize.label;" accesskey="&textsize.accesskey;"/>
       </radiogroup>
     </deck>     
-  </titledbox>
+  </groupbox>
   
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index bbbdb784d83c..283149acc9c8 100644
--- a/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -45,10 +45,10 @@
   ]]>
   </script>
   
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
   <!-- navigator starts with -->  
-  <titledbox>
+  <groupbox>
     <label value="&navRadio;"/>
     
     <radiogroup id="startupPage" autostretch="never" orient="vertical"
@@ -59,21 +59,21 @@
       <radio group="startupPage" value="2" label="&lastPageRadio.label;" accesskey="&lastPageRadio.accesskey;"/>
     </radiogroup>
 
-  </titledbox>
+  </groupbox>
 
   <!-- homepage specification -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&header2.label;"/>
     <html>&homePageIntro.label;</html>
-    <box autostretch="never">
+    <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 -->
-    </box>
-    <box autostretch="never" halign="right">
+    </hbox>
+    <hbox autostretch="never" halign="right">
       <button class="dialog" label="&useCurrent.label;" accesskey="&useCurrent.accesskey;"
               oncommand="setHomePageToCurrentPage();"
               id="browserUseCurrent" pref="true" preftype="bool"
@@ -82,13 +82,13 @@
               oncommand="selectFile();"
               id="browserChooseFile" pref="true" preftype="bool"
               prefstring="pref.browser.homepage.disable_button.select_file" prefattribute="disabled"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
   
   <!-- toolbar buttons customization -->
-  <titledbox flex="1" orient="horizontal" id="prefShowButtons">
+  <groupbox flex="1" orient="horizontal" id="prefShowButtons">
     <label value="&toolbarIntro.label;"/>
-    <box orient="vertical">
+    <vbox>
 
               <checkbox allowevents="true"
                         id="bookmarksButton"
@@ -111,8 +111,8 @@
                         preftype="bool"
                         prefstring="browser.toolbars.showbutton.home"
                         prefattribute = "checked"/>
-     </box>
-     <box orient="vertical" id="prefShowButtonsbox">
+     </vbox>
+     <vbox id="prefShowButtonsbox">
 
               <checkbox allowevents="true"
                         id="searchButton"
@@ -128,10 +128,10 @@
                         preftype="bool"
                         prefstring="browser.toolbars.showbutton.print"
                         prefattribute = "checked"/>
-      </box>
-      <box orient="vertical" id="prefShowButtonBox">
+      </vbox>
+      <vbox id="prefShowButtonBox">
 
-	  </box>
-   </titledbox>
+      </vbox>
+   </groupbox>
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-offline.xul b/xpfe/components/prefwindow/resources/content/pref-offline.xul
index 5de434f5a6e7..2a91e50f8c4e 100644
--- a/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -35,7 +35,7 @@
 <window debug="false" xmlns:html="http://www.w3.org/1999/xhtml" id="offlineWindow"
 		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
-        align="vertical" title="&window.title;"
+        orient="vertical" title="&window.title;"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-offline.xul');">
 
   <script type="application/x-javascript">
@@ -44,9 +44,9 @@
   ]]>
   </script>
 
-<box class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/>
+<hbox class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/>
 
-<titledbox orient="vertical" class="small-margin">
+<groupbox orient="vertical" class="small-margin">
     <label value="&rHeader;"/>
 
   <text value="&textStart;"/>
@@ -77,17 +77,17 @@
     <radio class="small-margin" group="whengoingOfflinestate" value="2" label="&radioNotDownload;"/>
     </radiogroup>
 
-</titledbox>
+</groupbox>
 
-<titledbox orient="vertical">
+<groupbox orient="vertical">
     <label value="&Diskspace;"/>	    
-    <box orient="horizontal" autostretch="never">
+    <hbox autostretch="never">
         <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" 
             pref="true" preftype="int" prefstring="mail.purge_threshhold" prefattribute="value"/>
         <text class="label" value="&kb.label;"/>
-    </box>
-</titledbox>
+    </hbox>
+</groupbox>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-policies.xul b/xpfe/components/prefwindow/resources/content/pref-policies.xul
index 46a60f99c611..ac2a7c61e934 100644
--- a/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-policies.xul
@@ -23,14 +23,14 @@
   </script>
 
 
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
   
     <html>&zoneIntro.label;</html>
   
     <text class="label" value="&policies.label;"/>
-    <box>
+    <hbox>
       <tree id="zones" class="inset" flex="1">
         <treecolgroup>
           <treecol flex="1"/>
@@ -68,24 +68,24 @@
         </treechildren>
       </tree>
   
-      <box orient="vertical">
+      <vbox>
         <button class="dialog" label="&addSite.label;" accesskey="&addSite.accesskey;"
                 oncommand="addSite();"/>
         <spring flex="1"/>              
-      </box>    
-    </box>
+      </vbox>    
+    </hbox>
     
     <text class="label header" value="&description.label;"/>
     
-    <box class="indent">
+    <hbox class="indent">
       <html id="description"></html>
-    </box>
+    </hbox>
   
-    <box autostretch="never">
+    <hbox autostretch="never">
       <button class="dialog" label="&settings.label;" accesskey="&settings.accesskey;"
               oncommand="settings();"/>
-    </box>
+    </hbox>
 
-  </titledbox>
+  </groupbox>
   
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index a3bdbbda1f34..67783addf137 100644
--- a/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -49,9 +49,9 @@
                 src="chrome://pref/locale/prefutilities.properties"/>
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
   
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&proxyTitle.label;"/>
     <html>&networkHeader.label;</html>
 
@@ -71,54 +71,54 @@
         <rows>
           <row autostretch="never">
               <text class="label" value="&ftp.label;" accesskey="&ftp.accesskey;" for="networkProxyFTP"/>
-            <box autostretch="never">
+            <hbox autostretch="never">
               <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"/>
               <textbox id="networkProxyFTP_Port" pref="true" preftype="int" prefstring="network.proxy.ftp_port"
                          prefattribute="value" size="5"/>
-            </box>
+            </hbox>
           </row>
           <row autostretch="never">
             <text class="label" value="&gopher.label;" accesskey="&gopher.accesskey;" for="networkProxyGopher"/>
-            <box autostretch="never">
+            <hbox autostretch="never">
               <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 -->
               <text class="label" value="&port.label;" accesskey="&gopherPort.accesskey;" for="networkProxyGopher_Port"/>
               <textbox id="networkProxyGopher_Port" pref="true" preftype="int" prefstring="network.proxy.gopher_port"
                          prefattribute="value" size="5"/>
-            </box>
+            </hbox>
           </row>
           <row autostretch="never">
             <text class="label" value="&http.label;" accesskey="&http.accesskey;" for="networkProxyHTTP"/>
-            <box autostretch="never">
+            <hbox autostretch="never">
               <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"/>
               <textbox id="networkProxyHTTP_Port" pref="true" preftype="int" prefstring="network.proxy.http_port"
                          prefattribute="value" size="5"/>
-            </box>
+            </hbox>
           </row>
           <row autostretch="never">
             <text class="label" value="&ssl.label;" accesskey="&ssl.accesskey;" for="networkProxySSL"/>
-            <box autostretch="never">
+            <hbox autostretch="never">
               <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"/>
               <textbox id="networkProxySSL_Port" pref="true" preftype="int" prefstring="network.proxy.ssl_port"
                          prefattribute="value" size="5"/>
-            </box>
+            </hbox>
           </row>
           <row autostretch="never">
             <text class="label" value="&socks.label;" accesskey="&socks.accesskey;" for="networkProxySOCKS"/>
-            <box autostretch="never">
+            <hbox autostretch="never">
               <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"/>
               <textbox id="networkProxySOCKS_Port" pref="true" preftype="int" prefstring="network.proxy.socks_port"
                        prefattribute="value" size="5"/>
-            </box>
+            </hbox>
           </row>
           <row autostretch="never"> 
             <text class="label" value="&noproxy.label;" accesskey="&noproxy.accesskey;" for="networkProxyNone"/>
@@ -131,20 +131,20 @@
           </row>
         </rows>
       </grid>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <radio group="networkProxyType" value="2" label="&autoTypeRadio.label;" accesskey="&autoTypeRadio.accesskey;"                        oncommand="DoEnabling();"/>
-      </box>
-      <box class="indent" flex="1">
+      </hbox>
+      <hbox class="indent" flex="1">
         <textbox id="networkProxyAutoconfigURL" flex="1" 
                    pref="true" preftype="string" prefstring="network.proxy.autoconfig_url"
                    prefattribute="value"/>
         <button id="autoReload" class="dialog" label="&reload.label;" accesskey="&reload.accesskey;"
                 pref="true" preftype="bool"
                 prefstring="pref.advanced.proxies.disable_button.reload" prefattribute="disabled"/>
-      </box>
+      </hbox>
     </radiogroup>
 
-  </titledbox>
+  </groupbox>
 
 </window>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul b/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
index 28b655150c3d..111b49b12fb5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
@@ -34,19 +34,19 @@
 <window xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     		title="&window.title;"
-		    class="dialog" align="vertical"
+		    class="dialog" orient="vertical"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-proxy-manual' ); else parent.queuedTag = 'pref-proxy-manual';">
 
 <keyset id="dialogKeys"/>
 
 <html:div flex="100%">
-<box align="vertical">
-	<box align="horizontal">
+<vbox>
+	<hbox>
 		<html:div>
 		&intro.label;
 		</html:div>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&ftp.label;
 		</html:div>
@@ -58,8 +58,8 @@
 		</html:div>
 		<html:input name="ftpproxyport" type="text" id="networkProxyHTTPPort"
                 pref="true" preftype="string" prefstring="network.proxy.http_port" size="5"/>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&gopher.label;
 		</html:div>
@@ -71,8 +71,8 @@
 		</html:div>
 		<html:input name="gopherproxyport" type="text" id="networkProxyGopherPort"
                 pref="true" preftype="string" prefstring="network.proxy.gopher_port" size="5"/>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&http.label;
 		</html:div>
@@ -84,8 +84,8 @@
 		</html:div>
 		<html:input name="httpproxyport" type="text" id="networkProxyHTTPPort"
                 pref="true" preftype="string" prefstring="network.proxy.http_port" size="5"/>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&wais.label;
 		</html:div>
@@ -97,20 +97,20 @@
 		</html:div>
 		<html:input name="waisproxyport" type="text" id="networkProxyWAISPort"
                 pref="true" preftype="string" prefstring="network.proxy.wais_port" size="5"/>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&direct.label;
 		</html:div>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&noproxy.label;
 		</html:div>
 		<html:input name="noproxy" type="text" id="networProxyNone"
                 pref="true" preftype="string" prefstring="network.proxy.none" size="60"/>
-	</box>
-	<box align="horizontal">
+	</hbox>
+	<hbox>
 		<html:div>
 		&sockhost.label;
 		</html:div>
@@ -122,9 +122,9 @@
 		</html:div>
 		<html:input name="socksport" type="text" id="networkSocksPort"
                 pref="true" preftype="string" prefstring="network.socks.port" size="5"/>
-	</box>
-	<box id="okCancelButtons"/>
-</box>
+	</hbox>
+	<hbox id="okCancelButtons"/>
+</vbox>
 </html:div>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-search.xul b/xpfe/components/prefwindow/resources/content/pref-search.xul
index 932ca2187cac..80bd9931cd8f 100755
--- a/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-search.xul
@@ -37,12 +37,12 @@
   </script> 
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-search.js"/>      
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox>
+  <groupbox>
     <label value="&legendHeader;"/>
 
-    <box autostretch="never" valign="middle">
+    <hbox autostretch="never" valign="middle">
       <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"
@@ -55,10 +55,10 @@
           </menupopup>
         </template>
       </menulist>
-    </box>                      
-  </titledbox>
+    </hbox>                      
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&searchResults.label;"/>
     <!-- XXX - unfortunately we can't have an autostretch never box here
                because it causes the text not to wrap and the panel content
@@ -67,9 +67,9 @@
     <checkbox id="openSidebarPanel" label="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;"
               pref="true" preftype="bool" prefstring="browser.search.opensidebarsearchpanel"
               prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&sidebarSearchTabPref.label;"/>
     <radiogroup orient="vertical" autostretch="never"
         id="sidebarSearchMode"
@@ -81,6 +81,6 @@
       <radio group="sidebarSearchMode" value="0" label="&searchModeBasic.label;" accesskey="&searchModeBasic.accesskey;"/>
       <radio group="sidebarSearchMode" value="1" label="&searchModeAdvanced.label;" accesskey="&searchModeAdvanced.accesskey;"/>
     </radiogroup>
-  </titledbox>
+  </groupbox>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-security.xul b/xpfe/components/prefwindow/resources/content/pref-security.xul
index ccd156f9369f..3113874217c5 100644
--- a/xpfe/components/prefwindow/resources/content/pref-security.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-security.xul
@@ -37,7 +37,7 @@
   ]]>
   </script>
   
-  <box class="box-smallheader" title="&lHeader;" />
+  <hbox class="box-smallheader" title="&lHeader;" />
   <html> &rContent1;</html>
   <html> &rContent2;</html>
   <!-- Overlays add UI here -->
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index a39bc3068ed5..7d8a369857c3 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -182,9 +182,9 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical" flex="1">
+  <groupbox orient="vertical" flex="1">
     <label value="&whatsRelated.label;"/>
 
     <html class="small-margin" id="doNotAcceptText">&doNotDecp.label;</html>
@@ -209,11 +209,11 @@
           </vbox>
         </row>
         <row>
-          <box autostretch="never">
+          <hbox autostretch="never">
             <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"/>
-          </box>
+          </hbox>
           <button disabled="true" class="dialog" id="addDomainButton" label="&addDomain.label;" accesskey="&addDomain.accesskey;"
                   oncommand="addDomain();" pref="true" preftype="bool"
                   prefstring="pref.browser.smartbrowsing.disable_button.add" prefattribute="disabled"/>
@@ -224,14 +224,14 @@
     <data id="browserRelatedDisabledForDomains" pref="true" preftype="string" 
                  prefstring="browser.related.disabledForDomains" prefattribute="value" wsm_attributes="value"/>
 
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&internetKeywordsHeader.label;"/>
 
     <html class="small-margin">&internetKeywordsDescription.label;</html>
     
-    <box autostretch="never">
+    <hbox autostretch="never">
       <checkbox class="small-margin" id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
                 pref="true" preftype="bool" prefstring="keyword.enabled"
                 prefattribute="checked"/>
@@ -239,18 +239,18 @@
       <button class="small-margin" label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"
         id="moreInformationButton" pref="true" preftype="bool"
         prefstring="pref.browser.smartbrowsing.disable_button.more_info" prefattribute="disabled"/>
-    </box>
+    </hbox>
     
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&autoCompleteHeader.label;"/>
       <html class="small-margin">&autoCompleteDescription.label;</html>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
                   pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
                   prefattribute="checked"/>
       <spring flex="1"/>
-    </box>
-  </titledbox>
+    </hbox>
+  </groupbox>
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index fe1e56cc3674..49abf597cbdd 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -17,17 +17,17 @@
   </script>
         
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
     
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&smartTitle.label;"/>
     <checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;"
               pref="true" preftype="bool" prefstring="xpinstall.enabled"
               prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
 
 <!--
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="Installed Packages"/>
   
     <script>
@@ -44,13 +44,13 @@
     ]]>
     </script>
     <button label="Install Package" oncommand="InstallPackage();"/>
-  </titledbox>
+  </groupbox>
 -->
 
 <!--
   <html:fieldset style="width: 100%; height: 100%">
     <html:div class="hspace-both">&selectUninstall.label;</html:div>
-    <box class="hspace-both vspace" align="horizontal" flex="100%" style="width: 93%; height: 100%">
+    <hbox class="hspace-both vspace" flex="100%" style="width: 93%; height: 100%">
       <tree id="smartUpdatePackages" class="inset" flex="100%" style="height: 40%;">
         <treecolgroup>
           <treecol flex="1"/>
@@ -64,11 +64,11 @@
         </treechildren>
       </tree>
       <spring flex="5%"/>
-      <box align="vertical">
+      <vbox>
         <button class="dialog push" id="pref:0:bool:smartupdate" label="&uninstallButton.label;" accesskey="&uninstallButton.accesskey;"/>
         <spring flex="100%"/>
-      </box>
-    </box>
+      </vbox>
+    </hbox>
     <spring style="height: 28px;"/>
   </html:fieldset>
 -->
diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.xul b/xpfe/components/prefwindow/resources/content/pref-themes.xul
index 3db85a040b29..e628aab3b19a 100644
--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -43,7 +43,7 @@
 
   <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-themes.js"/>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
 
   <html>&skinIntro.label;</html>
   
@@ -77,25 +77,25 @@
 
   <separator class="thin"/>
   
-  <box id="previewImageContainer" class="inset" align="center" >
+  <hbox id="previewImageContainer" class="inset" align="center" >
     <image id="previewImage"/>
-  </box>
+  </hbox>
 
   <separator class="thin"/>
 
-  <box flex="1">
-    <box orient="vertical" flex="1">
+  <hbox flex="1">
+    <vbox flex="1">
       <text class="label header" id="displayName" value=""/>
-      <box autostretch="never">
+      <hbox autostretch="never">
         <text class="label" value="&author.label;"/>
         <text class="label" id="author"/>
-      </box>
+      </hbox>
       <html id="description" flex="1"/>
-    </box>
-    <box orient="vertical" align="top">
+    </vbox>
+    <vbox align="top">
       <button id="applySkin" label="&selectSkin.label;" accesskey="&selectSkin.accesskey;" oncommand="applySkin();"/>
     <button id="uninstallSkin" label="&uninstallSkin.label;" oncommand="uninstallSkin();"/>
-    </box>
-  </box>
+    </vbox>
+  </hbox>
   
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
index 108b17b9b3ec..c88fcc30963d 100644
--- a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@@ -42,7 +42,7 @@
 
     <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-winhooks.js"/>
     
-    <box class="box-smallheader" title="&title.label;"/>
+    <hbox class="box-smallheader" title="&title.label;"/>
 
     <!-- File types -->
     <text class="label" value="&files.text;"/>
@@ -140,9 +140,9 @@
     <separator/>
 
     <!-- Misc -->
-    <box autostretch="never">
+    <hbox autostretch="never">
         <checkbox id="showDialog" label="&showDialog.label;" accesskey="&showDialog.accesskey;"/>     
-    </box>
+    </hbox>
     <spring flex="1"/>
     
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref.xul b/xpfe/components/prefwindow/resources/content/pref.xul
index 6075be546f9e..73578aed2d01 100644
--- a/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/xpfe/components/prefwindow/resources/content/pref.xul
@@ -78,6 +78,6 @@
 
   <separator/>
 
-  <box id="okCancelHelpButtonsRight" />
+  <hbox id="okCancelHelpButtonsRight" />
 
 </window>
diff --git a/xpfe/components/regviewer/regviewer.xul b/xpfe/components/regviewer/regviewer.xul
index 5cc417f33431..f634844dbba2 100644
--- a/xpfe/components/regviewer/regviewer.xul
+++ b/xpfe/components/regviewer/regviewer.xul
@@ -29,11 +29,11 @@
 <window title="&regviewerWindowTitle.label;"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="horizontal"
+        orient="horizontal"
         onload="OnLoad();">
 
   <script type="application/x-javascript" src="regviewer.js" />
-  <box flex="1*">
+  <hbox flex="1*">
     <html:div style="width:100px;height:100px;" flex="1*">
       <tree id="tree" style="width:100%;height:100%" datasources="rdf:null"
             containment="urn:mozilla-registry:subkeys"
@@ -59,10 +59,10 @@
         </treehead>
       </tree>
     </html:div>
-  </box>
+  </hbox>
   <splitter collapse="before"/>
-  <box flex="1*">
+  <hbox flex="1*">
     <html:div id="properties" style="width:100%;height:100%" flex="1*" />
-  </box>
+  </hbox>
 </window>
 
diff --git a/xpfe/components/search/resources/find.xul b/xpfe/components/search/resources/find.xul
index e51601211ae6..f83a9871862a 100644
--- a/xpfe/components/search/resources/find.xul
+++ b/xpfe/components/search/resources/find.xul
@@ -11,7 +11,7 @@
 
   <script type="application/x-javascript" src="chrome://communicator/content/search/find.js"/>
 
-  <box autostretch="never" halign="left">
+  <hbox autostretch="never" halign="left">
     <text class="label" value="&search1.label;"/>
     <menulist id="datasource">
       <menupopup>
@@ -20,9 +20,9 @@
       </menupopup>
     </menulist>
     <text class="label" value="&search2.label;"/>
-  </box>
+  </hbox>
   
-  <box autostretch="never" halign="left">
+  <hbox autostretch="never" halign="left">
     <menulist id="match">
       <menupopup>
         <menuitem label="&name.label;" value="http://home.netscape.com/NC-rdf#Name"/>
@@ -43,10 +43,10 @@
     </menulist>
     <textbox id="findtext" type="text" width="20" onkeypress="if (event.keyCode == 13) { doFind(); }" />
     <button label="&search.button.label;" oncommand="doFind();"/>
-  </box>          
+  </hbox>          
           
-  <box autostretch="never" halign="left">
+  <hbox autostretch="never" halign="left">
     <button id="SaveSearch" disabled="true" label="&save.button.label;" oncommand="saveSearch();"/>
-  </box>
+  </hbox>
 
 </window>
diff --git a/xpfe/components/search/resources/findresults.xul b/xpfe/components/search/resources/findresults.xul
index fda3f057ee5a..c4efd862b19c 100644
--- a/xpfe/components/search/resources/findresults.xul
+++ b/xpfe/components/search/resources/findresults.xul
@@ -4,7 +4,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/search/findresults.dtd">
 
-<window class="dialog" title="&window.title.label;" style="width:100%; height:100%; background-color:white" align="vertical"
+<window class="dialog" title="&window.title.label;" style="width:100%; height:100%; background-color:white" orient="vertical"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -68,7 +68,7 @@
 
     <treechildren open="true" flex="1"/>
   </tree>
-  <spring flex="100%" align="horizontal" />
+  <spring flex="100%" orient="horizontal" />
 
 <!--
 This extra "status" bar is necessary because the bottom right corner of the window on MacOS is
@@ -78,7 +78,7 @@ combat this, we can just stick in a 15px high bar to bump up the bottom of the t
 the scrollbar is visible. Yes, I know this is not necessary for win32 or gtk, but we can
 use this area for information (maybe full URL of selected item or the like) in the future.
 -->
-  <box id="status-bar" style="min-height:15px; max-height:15px;">
+  <hbox id="status-bar" style="min-height:15px; max-height:15px;">
     <button class="status-bar" align="left" label=""/>
-  </box>
+  </hbox>
 </window>
diff --git a/xpfe/components/search/resources/internet.xul b/xpfe/components/search/resources/internet.xul
index cf0875f73298..4c169e35e02f 100644
--- a/xpfe/components/search/resources/internet.xul
+++ b/xpfe/components/search/resources/internet.xul
@@ -12,7 +12,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/search/internet.js" />
   <script type="application/x-javascript" src="chrome://communicator/content/search/shared.js" />
 
-  <box>
+  <hbox>
     <spring flex="100%" />
 
     <html>&search.label;</html>
@@ -41,9 +41,9 @@
     <button id="searchbutton" oncommand="return doSearch();" label="&search.button.label;"/>
     <button id="stopbutton" oncommand="return doStop();" style="display: none;" label="&stop.button.label;"/>
     <spring flex="100%"/>
-  </box>
+  </hbox>
 
-  <box style="height: 85%; width: 100%;" flex="1" >
+  <hbox style="height: 85%; width: 100%;" flex="1" >
     <spring flex="50%" />
     <tree orient="horizontal" id="searchengines" border="1" flex="1" datasources="rdf:internetsearch" ref="NC:SearchEngineRoot">
       <treecolgroup>
@@ -79,13 +79,13 @@
       </treehead>
     </tree>
     <spring flex="50%" />
-  </box>
+  </hbox>
 
-  <box style="width: 100%;" >
+  <hbox style="width: 100%;" >
     <spring flex="100%" />
     <button oncommand="doCheckAll(true);" label="&checkall.button.label;"/>
     <button oncommand="doCheckAll(false);" label="&uncheckall.button.label;"/> 
     <button id="SaveSearch" disabled="true" oncommand="saveSearch();" label="&savesearch.button.label;"/>
     <spring flex="100%"/>
-  </box>
+  </hbox>
 </window>
diff --git a/xpfe/components/search/resources/internetresults.xul b/xpfe/components/search/resources/internetresults.xul
index 853ad4e8a862..9b1c2c689668 100644
--- a/xpfe/components/search/resources/internetresults.xul
+++ b/xpfe/components/search/resources/internetresults.xul
@@ -22,13 +22,13 @@
   <script type="application/x-javascript" src="chrome://communicator/content/search/internetresults.js"/>
   <script type="application/x-javascript" src="chrome://communicator/content/search/shared.js"/>
 
-  <box id="multi-results-header"> 
+  <hbox id="multi-results-header"> 
     <text value="&results.header.label;"/>
-  </box>
+  </hbox>
 
-  <box id="engineTabs" autostretch="never"
-       ref="NC:SearchResultsSitesRoot" datasources="rdf:internetsearch" 
-       style="overflow: none; min-width: 1px;">
+  <hbox id="engineTabs" autostretch="never"
+        ref="NC:SearchResultsSitesRoot" datasources="rdf:internetsearch" 
+        style="overflow: none; min-width: 1px;">
     <template>
       <button class="engineTabs button-toolbar-3 button-slimline" uri="..." 
               oncommand="doEngineClick(event, this);" crop="right" 
@@ -42,7 +42,7 @@
     <separator orient="vertical"/>
     <text value="&viewbyprovider.label;"/>
     <separator orient="vertical" class="thin"/>
-  </box>
+  </hbox>
 
   <popupset>
     <popup id="contextual" oncreate="return fillContextMenu('contextual', 'internetresultstree');" >
@@ -102,7 +102,7 @@
                         label="rdf:http://home.netscape.com/NC-rdf#Name" />
               <treecell crop="right" label="rdf:http://home.netscape.com/NC-rdf#PageRank" />
               <treecell>
-                <progressmeter align="horizontal" value="rdf:http://home.netscape.com/NC-rdf#Relevance" mode="normal" />
+                <progressmeter orient="horizontal" value="rdf:http://home.netscape.com/NC-rdf#Relevance" mode="normal" />
                 <text crop="right" value="rdf:http://home.netscape.com/NC-rdf#Relevance"/>
               </treecell>
               <treecell crop="right" label="rdf:http://home.netscape.com/NC-rdf#Price" />
@@ -159,8 +159,8 @@
   <splitter id="results-splitter" persist="state" collapse="after" orient="vertical" autostretch="never">
     <grippy/>
   </splitter>
-  <box class="double-box-top" flex="1">
+  <hbox class="double-box-top" flex="1">
     <iframe id="content" flex="1" src="chrome://communicator/locale/search/default.htm"/>
-  </box>
+  </hbox>
   
 </window>
diff --git a/xpfe/components/search/resources/search-editor.xul b/xpfe/components/search/resources/search-editor.xul
index c0ffc0de7419..472728da6893 100644
--- a/xpfe/components/search/resources/search-editor.xul
+++ b/xpfe/components/search/resources/search-editor.xul
@@ -47,9 +47,9 @@
 
   <keyset id="dialogKeys"/>
   
-  <box flex="1">
+  <hbox flex="1">
   
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <tree multiple="true" flex="1" class="inset" id="allengines" ref="NC:SearchEngineRoot" datasources="rdf:internetsearch">
         <template>
           <treechildren>
@@ -78,15 +78,15 @@
 
         <treechildren flex="1"/>
       </tree>
-      <box>
+      <hbox>
         <button class="dialog" id="add-button" oncommand="return AddEngine()" label="&add.label;" />
-      </box>
-    </box>
+      </hbox>
+    </vbox>
     
     <separator class="groove" orient="vertical" style="width: 0px;"/>
         
-    <box orient="vertical" flex="1">
-      <box autostretch="never">
+    <vbox flex="1">
+      <hbox autostretch="never">
         <text class="label" value="&category.label;"/>
         <menulist id="categoryList" ref="NC:SearchCategoryRoot" datasources="rdf:null" flex="1">
           <template>
@@ -98,17 +98,17 @@
           </template>
           <menupopup id="categoryPopup"/>
         </menulist>
-      </box>
+      </hbox>
       
-      <box>
+      <hbox>
         <button class="dialog" id="new-category-button" oncommand="NewCategory()" label="&new.category.label;" flex="1"/>
         <button class="dialog" id="rename-category-button" oncommand="RenameCategory()" label="&rename.category.label;" flex="1"/>
         <button class="dialog" id="remove-category.buttom" oncommand="RemoveCategory()" label="&remove.category.label;" flex="1"/>
-      </box>
+      </hbox>
       
       <separator class="thin"/>
 
-      <box flex="1">
+      <hbox flex="1">
         <tree class="inset" multiple="true" flex="1" id="engineList" style="height: 0px;"
               datasources="rdf:internetsearch" onselect="doMoveDirectionEnabling()">
           <template>
@@ -135,22 +135,22 @@
           <treechildren flex="1"/>
           
         </tree>
-        <box orient="vertical">
+        <vbox>
           <spring flex="1"/>
           <button class="up" oncommand="MoveUp();" id="up" disabled="true"/>
           <button class="down" oncommand="MoveDown();" id="down" disabled="true"/>
           <spring flex="1"/>
-        </box>
-      </box>          
-      <box>
+        </vbox>
+      </hbox>          
+      <hbox>
         <button class="dialog" id="remove-button" oncommand="return RemoveEngine()" label="&remove.label;" />
-      </box>    
+      </hbox>    
       
-    </box>
+    </vbox>
   
-  </box>
+  </hbox>
 
   <separator/>
-  <box id="okCancelButtonsRight"/>
+  <hbox id="okCancelButtonsRight"/>
 
 </window>
diff --git a/xpfe/components/search/resources/search-panel.xul b/xpfe/components/search/resources/search-panel.xul
index 8c55c0047b5d..9b1f28b173dc 100644
--- a/xpfe/components/search/resources/search-panel.xul
+++ b/xpfe/components/search/resources/search-panel.xul
@@ -165,12 +165,12 @@
 
         </tree>
       
-        <box>
+        <hbox>
           <spring flex="1" />
           <button class="button-slimline" id="saveQueryButton"
                   label="&savesearch.button.label;" oncommand="return saveSearch();"/>
           <spring flex="1" />
-        </box>
+        </hbox>
       </vbox>
     
       <vbox class="searchpanel-outerbox" flex="1">
diff --git a/xpfe/components/search/resources/search.xul b/xpfe/components/search/resources/search.xul
index 34ecaf275486..087f422ee00d 100644
--- a/xpfe/components/search/resources/search.xul
+++ b/xpfe/components/search/resources/search.xul
@@ -5,7 +5,7 @@
 
 <window id="search-window" title="&window.title.label;"
     class="dialog" windowtype="search:window"
-  width="500" height="400" x="20" y="20" persist="width height x y" align="vertical"
+  width="500" height="400" x="20" y="20" persist="width height x y" orient="vertical"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/xpfe/components/sidebar/resources/customize.xul b/xpfe/components/sidebar/resources/customize.xul
index 1a9f1c19a20e..3490813ebb94 100644
--- a/xpfe/components/sidebar/resources/customize.xul
+++ b/xpfe/components/sidebar/resources/customize.xul
@@ -42,8 +42,8 @@
 
   <keyset id="dialogKeys"/>
 
-  <box flex="1">
-    <box orient="vertical" flex="1">
+  <hbox flex="1">
+    <vbox flex="1">
       <text class="label" value="&sidebar.customize.additional.label;"
         crop="right"/>
       <tree id="other-panels" flex="1"
@@ -95,7 +95,7 @@
       </tree>
 
       <!-- xxxslamm Need to add descriptive panel text here -->
-      <box class="button-group">
+      <hbox class="button-group">
         <button class="dialog" id="add_button" oncommand="AddPanel()"
           label="&sidebar.customize.add.label;"
           disabled="true"/>
@@ -103,13 +103,13 @@
         <button class="dialog" id="preview_button" oncommand="PreviewPanel()"
           label="&sidebar.customize.preview.label;"
           disabled="true"/>
-      </box>
-    </box> 
+      </hbox>
+    </vbox> 
     
     <separator orient="vertical"/>    
 
     <!-- The panels that the user currently has chosen -->
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <text class="label" value="&sidebar.customize.current.label;"
         crop="right"/>
       <tree id="current-panels" onclick="SelectChangeForCurrentPanels();"
@@ -150,36 +150,36 @@
               to it from the script -->
         <treechildren id="current-panels-root"/> 
       </tree>
-      <box class="button-group">
+      <hbox class="button-group">
         <button class="dialog" id="customize-button"
           oncommand="CustomizePanel();" 
           label="&sidebar.customize.customize.label;" />
         <button class="dialog" id="remove-button" onclick="RemovePanel()"
           label="&sidebar.customize.remove.label;" />
-      </box>      
-    </box>
+      </hbox>      
+    </vbox>
 
     <separator orient="vertical" class="thin"/>
 
     <!-- The 'reorder' buttons -->
-    <box id="reorder" align="vertical" autostretch="never">
+    <vbox id="reorder" autostretch="never">
       <spring flex="1"/>
       <button oncommand="MoveUp();" id="up" class="dialog" 
         label="&sidebar.customize.up.label;"/>
       <button oncommand="MoveDown();" id="down" class="dialog"
         label="&sidebar.customize.down.label;"/>
       <spring flex="1"/>
-    </box> 
+    </vbox> 
 
-  </box>
+  </hbox>
 
   <separator/>
   
-  <box>
+  <hbox>
     <button id="more-panels-link" label="&sidebar.more.label;" oncommand="BrowseMorePanels()"/>
     <spring flex="1"/>
-    <box id="okCancelButtonsRight" />
-  </box>
+    <hbox id="okCancelButtonsRight" />
+  </hbox>
 
 </window>
 
diff --git a/xpfe/components/sidebar/resources/preview.xul b/xpfe/components/sidebar/resources/preview.xul
index ca14e6df6a6c..0411f5bb26fd 100644
--- a/xpfe/components/sidebar/resources/preview.xul
+++ b/xpfe/components/sidebar/resources/preview.xul
@@ -37,12 +37,12 @@
 
   <script type="application/x-javascript" src="chrome://communicator/content/sidebar/preview.js" />
 
-  <box id="panel-container" orient="vertical">
+  <vbox id="panel-container">
 
-    <box id="paneltitle" class="box-texttab texttab-sidebar" selected="true"/>
+    <hbox id="paneltitle" class="box-texttab texttab-sidebar" selected="true"/>
     <!--  <iframe id="previewframe" type="content" src="about:blank" flex="1"/>-->
     <iframe class="box-panel" id="previewframe" type="content" src="about:blank" flex="1"/>
 
-  </box>  
+  </vbox>  
 
 </window>
diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.xul b/xpfe/components/sidebar/resources/sidebarOverlay.xul
index 535850099119..613636664ad6 100644
--- a/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -44,7 +44,7 @@
   </popup>
 
   <!-- Overlay the sidebar panels -->
-  <box id="sidebar-box" orient="vertical" persist="hidden width collapsed">
+  <vbox id="sidebar-box" persist="hidden width collapsed">
     <splitter id="sidebar-panels-splitter" collapse="after" persist="state"
       onmouseup="PersistHeight();" hidden="true">
       <spring flex="1"/>
@@ -52,7 +52,7 @@
       <spring flex="1"/>
     </splitter>
 
-    <box id="sidebar-panels-splitter-box" align="vertical" flex="1" 
+    <vbox id="sidebar-panels-splitter-box" flex="1" 
       persist="hidden">
 
       <sidebarheader id="sidebar-title-box" class="sidebarheader-main"
@@ -97,7 +97,7 @@
         </menubutton>
       </sidebarheader>
   
-      <box id="sidebar-panels" align="vertical"
+      <vbox id="sidebar-panels"
         datasources="rdf:null"
         ref="urn:sidebar:current-panel-list" 
         persist='last-selected-panel height collapsed' flex="1*"
@@ -120,39 +120,39 @@
                 predicate="http://home.netscape.com/NC-rdf#exclude" />
             </bindings>
             <action>
-              <box uri="?panel" class="box-texttab texttab-sidebar"
+              <hbox uri="?panel" class="box-texttab texttab-sidebar"
                 oncommand="SidebarSelectPanel(this,false,false)" align="left"
                 hidden="true" label="?title" exclude="?exclude" context="sidebarPopup" />
-              <box uri="?panel" flex='1*' hidden="true" orient="vertical"
+              <vbox uri="?panel" flex='1*' hidden="true"
                 loadstate="never loaded">
-                <box flex='1' orient="vertical" class="iframe-panel loadarea">
-                  <box orient="horizontal" flex="1" autostretch="never">
+                <vbox flex='1' class="iframe-panel loadarea">
+                  <hbox flex="1" autostretch="never">
                     <image class="image-panel-loading"/>
                     <text class="text-panel-loading"
                       value="&sidebar.loading.label;"/>
                     <button label="&sidebar.loading.stop.label;" hidden="true"
                       onclick="SidebarStopPanelLoad(this.parentNode.parentNode.parentNode.previousSibling);"/>
-                  </box>
+                  </hbox>
                   <spring flex="100%"/>
-                </box>
+                </vbox>
                 <iframe class="iframe-panel" flex='1*' src="about:blank"
                   hidden="true" collapsed="true" content="?content"/>
                 <iframe class="iframe-panel" flex='1*' src="about:blank"
                   hidden="true" collapsed="true" content="?content" type="content" context="contentAreaContextMenu"/>
-              </box>
+              </vbox>
             </action>
           </rule>
         </template>
-        <box id="sidebar-iframe-no-panels" class="iframe-panel" orient="vertical" flex="1"
+        <vbox id="sidebar-iframe-no-panels" class="iframe-panel" flex="1"
           hidden="true">
           <html>&sidebar.no-panels.state;</html>
           <html>&sidebar.no-panels.add;</html>
           <html>&sidebar.no-panels.hide;</html>
-        </box>
-      </box>
-    </box>
+        </vbox>
+      </vbox>
+    </vbox>
     <popupset id="contentAreaContextSet"/>
-  </box>
+  </vbox>
 
   <!-- Splitter on the right of sidebar -->
   <splitter id="sidebar-splitter" collapse="before" persist="state hidden"
diff --git a/xpfe/components/timebomb/resources/content/expireText.xul b/xpfe/components/timebomb/resources/content/expireText.xul
index 739f8b429317..a947e51c6d11 100644
--- a/xpfe/components/timebomb/resources/content/expireText.xul
+++ b/xpfe/components/timebomb/resources/content/expireText.xul
@@ -35,13 +35,13 @@ Contributor(s):
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
     
-    <box align="vertical">
+    <vbox>
         <html:td align="center">
 		    <html:label>&expireText.label;</html:label>
         </html:td>
         <html:td align="center">
 		    <html:button onclick="return window.close();">&okButton.label;</html:button>
         </html:td>
-    </box>
+    </vbox>
 
 </window>
diff --git a/xpfe/components/timebomb/resources/content/warn.xul b/xpfe/components/timebomb/resources/content/warn.xul
index 623b87758a72..fa15df1184c9 100644
--- a/xpfe/components/timebomb/resources/content/warn.xul
+++ b/xpfe/components/timebomb/resources/content/warn.xul
@@ -35,13 +35,13 @@ Contributor(s):
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
     
-    <box align="vertical">
+    <vbox>
         <html:td align="center">
 		    <html:label>&warnText.label;</html:label>
         </html:td>
         <html:td align="center">
 		    <html:button onclick="return window.close();">&okButton.label;</html:button>
         </html:td>
-    </box>
+    </vbox>
 
 </window>
diff --git a/xpfe/components/ucth/resources/helperAppDldProgress.xul b/xpfe/components/ucth/resources/helperAppDldProgress.xul
index 64e65241251d..097c7150c0d0 100644
--- a/xpfe/components/ucth/resources/helperAppDldProgress.xul
+++ b/xpfe/components/ucth/resources/helperAppDldProgress.xul
@@ -68,48 +68,48 @@ Contributor(s):
       
       <rows>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&location;"/>
-          </box>
+          </hbox>
           <textbox id="dialog.location" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&saving;"/>
-          </box>
+          </hbox>
           <textbox id="dialog.fileName" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&status;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.status" value="&#160;" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&timeLeft;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.timeLeft" value="&#160;"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&timeElapsed;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.timeElapsed" value="&#160;"/>
         </row>
         <separator class="thin"/>
         <row>             
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&progress;"/>
-          </box>
+          </hbox>
           <progressmeter id="dialog.progress" mode="normal" value="0"/>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" id="dialog.progressText" value="&#160;"/>
-          </box>
+          </hbox>
         </row>
         <separator/>
       </rows>
@@ -121,12 +121,12 @@ Contributor(s):
     
     <separator/>
     
-    <box id="CancelButton">
+    <hbox id="CancelButton">
       <button class="dialog" id="cancel" label="&dialogCancel.label;" oncommand="doCancelButton()"/>
       <button class="dialog" id="pause"  hidden="true" oncommand="doPauseButton()"/>
       <spring flex="1"/>
       <button class="dialog" id="open" label="&open.label;" disabled="true" oncommand="doOpen()"/>
       <button class="dialog" id="openFolder" label="&openFolder.label;" disabled="true" oncommand="doOpenFolder()"/>      
-    </box>
+    </hbox>
 
 </window>
diff --git a/xpfe/components/ucth/resources/helperAppLauncher.xul b/xpfe/components/ucth/resources/helperAppLauncher.xul
index 673e2cf74efd..b65c164c428e 100644
--- a/xpfe/components/ucth/resources/helperAppLauncher.xul
+++ b/xpfe/components/ucth/resources/helperAppLauncher.xul
@@ -41,7 +41,7 @@
         onload="window.dialog = new nsHelperAppLauncherDialog()"
         style="width: 40em;"
         class="dialog"
-        align="vertical"
+        orient="vertical"
         persist="screenX screenY"
         screenX="24" screenY="24">
               
@@ -52,50 +52,50 @@
                    
     <keyset id="dialogKeys"/>
            
-    <box>
-        <box orient="vertical">
+    <hbox>
+        <vbox>
             <image class="question-icon"/>
             <spring flex="1"/>
-        </box>
+        </vbox>
         <separator orient="vertical" class="thin"/>
-        <box orient="vertical" flex="1">
+        <vbox flex="1">
             <html id="intro">&intro.label;</html>
             <separator orient="horizontal" class="thin"/>
             <radiogroup id="mode" orient="vertical" oncommand="window.dialog.toggleChoice()">
-                <box orient="vertical">
-                    <box autostretch="never">
+                <vbox>
+                    <hbox autostretch="never">
                         <radio id="runApp"
                                group="mode"
                                label="&runApp.label;"
                                accesskey="&runApp.accesskey;"/>
-                    </box>
-                    <box class="indent">
+                    </hbox>
+                    <hbox class="indent">
                         <textbox id="appName" readonly="true" flex="1"/>
                         <button id="chooseApp"
                                 class="dialog"
                                 label="&chooseApp.label;"
                                 accesskey="&chooseApp.accesskey;"
                                 oncommand="dialog.chooseApp()"/>
-                    </box>
-                </box>
-                <box orient="vertical">
-                    <box autostretch="never">
+                    </hbox>
+                </vbox>
+                <vbox>
+                    <hbox autostretch="never">
                         <radio id="saveToDisk"
                                group="mode"
                                label="&saveToDisk.label;"
                                accesskey="&saveToDisk.accesskey;"/>
-                    </box>
-                 </box>
+                    </hbox>
+                 </vbox>
             </radiogroup>
             <separator orient="horizontal" class="thin"/>
-            <box autostretch="never">
+            <hbox autostretch="never">
                 <checkbox id="alwaysAskMe" label="&alwaysAskMe.label;" accesskey="&alwaysAskMe.accesskey;"/>
-            </box>
-        </box>
-    </box>
+            </hbox>
+        </vbox>
+    </hbox>
 
     <separator class="groove"/>
 
-    <box id="okCancelButtonsRight"/>
+    <hbox id="okCancelButtonsRight"/>
            
 </window>
diff --git a/xpfe/components/ucth/resources/unknownContent.xul b/xpfe/components/ucth/resources/unknownContent.xul
index 45f07c301266..ab0d266922d3 100644
--- a/xpfe/components/ucth/resources/unknownContent.xul
+++ b/xpfe/components/ucth/resources/unknownContent.xul
@@ -21,26 +21,26 @@
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <script type="application/x-javascript" src="chrome://global/content/unknownContent.js"/>
 
-  <box>
+  <hbox>
     <separator orient="vertical" class="thin"/>
-    <box orient="vertical" autostretch="never" valign="top">
+    <vbox autostretch="never" valign="top">
       <image class="message-icon" id="fileIcon"/>
-    </box>
+    </vbox>
     <separator orient="vertical" class="thin"/>
-    <box orient="vertical">
+    <vbox>
       <html id="dialog.contentType">&startDownload;</html>
       <html>&helpText;</html>
-    </box>
+    </vbox>
     <separator orient="vertical" class="thin"/>
-  </box>
+  </hbox>
     
   <separator class="groove"/>
     
-  <box autostretch="never">
+  <hbox autostretch="never">
     <button class="dialog" id="dialog.more" label="&dialogMore.label;" oncommand="more()"/>
     <spring flex="1"/>
-    <box id="okCancelButtons"/>
-  </box>
+    <hbox id="okCancelButtons"/>
+  </hbox>
 
   <keyset id="dialogKeys"/>
 
diff --git a/xpfe/components/xfer/resources/downloadProgress.xul b/xpfe/components/xfer/resources/downloadProgress.xul
index 7f84f72874e7..05ad688896f2 100644
--- a/xpfe/components/xfer/resources/downloadProgress.xul
+++ b/xpfe/components/xfer/resources/downloadProgress.xul
@@ -68,37 +68,37 @@ Contributor(s):
       
       <rows>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&location;"/>
-          </box>
+          </hbox>
           <textbox id="dialog.location" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&saving;"/>
-          </box>
+          </hbox>
           <textbox id="dialog.fileName" class="scrollfield" readonly="" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&status;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.status" value="&#160;" flex="1"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&timeLeft;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.timeLeft" value="&#160;"/>
         </row>
         <separator class="thin"/>
         <row>
-          <box autostretch="never" halign="right">
+          <hbox autostretch="never" halign="right">
             <text class="label" value="&timeElapsed;"/>
-          </box>
+          </hbox>
           <text class="label" id="dialog.timeElapsed" value="&#160;"/>
         </row>
         <separator class="thin"/>
@@ -111,10 +111,10 @@ Contributor(s):
     
     <separator/>
     
-    <box id="CancelButton">
+    <hbox id="CancelButton">
       <spring flex="1"/>
       <button class="dialog" id="cancel" label="&dialogCancel.label;" onclick="doCancelButton()"/>
       <spring flex="1"/>
-    </box>
+    </hbox>
 
 </window>
diff --git a/xpfe/global/resources/content/about.xul b/xpfe/global/resources/content/about.xul
index 916adee50e5f..3877159ffcbe 100644
--- a/xpfe/global/resources/content/about.xul
+++ b/xpfe/global/resources/content/about.xul
@@ -32,13 +32,13 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
 
 <window
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        align="vertical"
+        orient="vertical"
         class="dialog"
         title="&title.label;">
 
 <keyset id="dialogKeys"/>
 
-<box align="vertical" flex="100%" style="margin: 0.5em;">
+<vbox flex="100%" style="margin: 0.5em;">
 
 <tabbox orient="vertical" flex="100%">
   <tabs>
@@ -52,10 +52,10 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
   </tabpanels>
 </tabbox>
 
-<box align="horizontal" style="margin-top: 1em;">
+<hbox style="margin-top: 1em;">
   <spring flex="100%"/>
   <button id="ok" label="&okButton.label;" default="true" align="right" onclick="doOKButton()"/>
-</box>
+</hbox>
 
-</box>
+</vbox>
 </window>
diff --git a/xpfe/global/resources/content/commonDialog.xul b/xpfe/global/resources/content/commonDialog.xul
index 9f8249fabf41..f01c2a78a666 100644
--- a/xpfe/global/resources/content/commonDialog.xul
+++ b/xpfe/global/resources/content/commonDialog.xul
@@ -15,43 +15,43 @@
     
   <keyset id="dialogKeys"/>
 
-  <box flex="1">
-    <box autostretch="never" valign="top">
+  <hbox flex="1">
+    <hbox autostretch="never" valign="top">
       <image id="info.icon" class="spaced"/>
-    </box>
+    </hbox>
     <separator orient="vertical" class="thin"/>
-    <box orient="vertical" flex="1">
+    <vbox flex="1">
       <!-- text -->
       <html id="info.header" class="header" flex="1"/>
-      <box id="info.box" flex="1" orient="vertical" style="max-width: 45em;"/>
+      <vbox id="info.box" flex="1" style="max-width: 45em;"/>
 
       <!-- edit fields -->
-      <box orient="vertical" id="loginEditField" collapsed="true">
+      <vbox id="loginEditField" collapsed="true">
         <text class="label" id="login.text" value="&editfield0.label;" for="dialog.loginname"/>
         <textbox tabindex="0" id="dialog.loginname" flex="1"/>
         <separator class="thin"/>
-      </box>
-      <box orient="vertical" id ="password1EditField" collapsed="true">
+      </vbox>
+      <vbox id ="password1EditField" collapsed="true">
         <text class="label" id="password1.text" value="&editfield1.label;" for="dialog.password1"/>
         <textbox tabindex="1" type="password" id="dialog.password1" flex="1"/>
         <separator class="thin"/>
-      </box>
-      <box orient="vertical" id="password2EditField" collapsed="true">
+      </vbox>
+      <vbox id="password2EditField" collapsed="true">
         <text class="label" id="password2.text" value="&editfield2.label;" for="dialog.password2"/>
         <textbox tabindex="1" type="password" id="dialog.password2" flex="1"/>
         <separator class="thin"/>
-      </box>
+      </vbox>
   
       <spring flex="1"/>
       
       <!-- checkbox -->
-      <box id="checkboxContainer" collapsed="true" autostretch="never">
+      <hbox id="checkboxContainer" collapsed="true" autostretch="never">
         <checkbox id="checkbox" oncommand="onCheckboxClick(this);" style="max-width: 40em;"/>
-      </box>
-    </box>
-  </box>
+      </hbox>
+    </vbox>
+  </hbox>
 
   <separator class="thin"/>
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
 
 </window>
diff --git a/xpfe/global/resources/content/mac/platformDialogOverlay.xul b/xpfe/global/resources/content/mac/platformDialogOverlay.xul
index 1f2a91c39107..ae94c3706c60 100644
--- a/xpfe/global/resources/content/mac/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/mac/platformDialogOverlay.xul
@@ -27,40 +27,39 @@
              xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <box id="okCancelButtons" align="horizontal">
+  <hbox id="okCancelButtons">
     <spring flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
-  </box>
+  </hbox>
 
-
-  <box id="okCancelHelpButtons" align="horizontal">
+  <hbox id="okCancelHelpButtons">
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelButtonsRight" align="horizontal">
+  <hbox id="okCancelButtonsRight">
     <spring flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelHelpButtonsRight" align="horizontal">
+  <hbox id="okCancelHelpButtonsRight">
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="right exit-dialog" id="ok" default="true" label="&okButton.label;" oncommand="doOKButton();"/>
-  </box>
+  </hbox>
 
   <keyset id="dialogKeys">
     <key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
diff --git a/xpfe/global/resources/content/os2/platformDialogOverlay.xul b/xpfe/global/resources/content/os2/platformDialogOverlay.xul
index 23cb06ccc547..ccc8f5ac47ed 100644
--- a/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -27,16 +27,16 @@
              xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <box id="okCancelButtons">
+  <hbox id="okCancelButtons">
     <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();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelHelpButtons" align="horizontal">
+  <hbox id="okCancelHelpButtons">
     <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();"/>
@@ -44,17 +44,17 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelButtonsRight" halign="right">
+  <hbox id="okCancelButtonsRight" halign="right">
     <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();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3()"/>  
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
-  </box>
+  </hbox>
   
-  <box id="okCancelHelpButtonsRight" align="horizontal">
+  <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();"/>
@@ -62,7 +62,7 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
   <keyset id="dialogKeys">
     <key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
diff --git a/xpfe/global/resources/content/selectDialog.xul b/xpfe/global/resources/content/selectDialog.xul
index c34ceafb20f2..ee1f70b930d5 100644
--- a/xpfe/global/resources/content/selectDialog.xul
+++ b/xpfe/global/resources/content/selectDialog.xul
@@ -27,22 +27,22 @@ Contributor(s): ______________________________________. -->
 <window
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
-  align="vertical"
+  orient="vertical"
   onload="selectDialogOnLoad()"
   class="dialog">
 
   <script type="application/x-javascript" src="chrome://global/content/selectDialog.js" />
   <keyset id="dialogKeys"/>
-  <box align="vertical" style="width: 24em;margin: 5px;">
+  <vbox style="width: 24em;margin: 5px;">
     <text id="info.txt" class="label"/>
-    <box orient="vertical">
+    <vbox>
       <tree rows="4" class="list" id="list" flex="1">
         <treecolgroup>
           <treecol flex="1"/>
         </treecolgroup>
         <treechildren flex="1" id="child"/>
       </tree>
-    </box>
-  </box>
-  <box id="okCancelButtons"/>
+    </vbox>
+  </vbox>
+  <hbox id="okCancelButtons"/>
 </window>
diff --git a/xpfe/global/resources/content/unix/platformDialogOverlay.xul b/xpfe/global/resources/content/unix/platformDialogOverlay.xul
index 9e9c5a1a5986..1e630040ae93 100644
--- a/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@@ -27,16 +27,16 @@
              xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <box id="okCancelButtons" align="horizontal">
+  <hbox id="okCancelButtons">
     <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();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelHelpButtons" align="horizontal">
+  <hbox id="okCancelHelpButtons">
     <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();"/>
@@ -44,18 +44,18 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelButtonsRight" align="horizontal">
+  <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();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
-  <box id="okCancelHelpButtonsRight" align="horizontal">
+  <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();"/>
@@ -63,7 +63,7 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
   
   <keyset id="dialogKeys">
     <key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
diff --git a/xpfe/global/resources/content/unix/printdialog.xul b/xpfe/global/resources/content/unix/printdialog.xul
index 9e46d7386366..4426905bc8b7 100644
--- a/xpfe/global/resources/content/unix/printdialog.xul
+++ b/xpfe/global/resources/content/unix/printdialog.xul
@@ -35,7 +35,7 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
   title="&printDialog.title;"
   debug="false"
   class="dialog"
-  align="vertical"
+  orient="vertical"
   persist="screenX screenY"
   screenX="24" screenY="24">
 
@@ -59,10 +59,10 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
       </row>
       <row valign="baseline">
         <text id="fileLabel" class="label" value="&fileInput.label;"/>
-        <box>
+        <hbox>
           <textbox id="fileInput" flex ="1" onblur="stripTrailingWhitespace(this)"/>
           <button id="chooseFile" label = "&chooseButton.label;" oncommand = "onChooseFile()"/>
-        </box>
+        </hbox>
       </row>
       <row>
         <text class="label" value="&reverseGroup.label;" flex ="1"/>
@@ -91,13 +91,13 @@ 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);"/>
-          <box orient="horizontal" autostretch="never">
+          <hbox autostretch="never">
             <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)"/>
             <text class = "label" id = "topageLabel" for = "topageInput" value = "&topageInput.label;" />
             <textbox id = "topageInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
-          </box>
+          </hbox>
           <radio group = "printrangeGroup" id = "selectionRadio" label = "&selectionRadio.label;" onclick = "doPrintRange(2);"/>
         </radiogroup>
       </row>
@@ -111,24 +111,24 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
       </row>
       <row>
         <text class="label" value="&marginInput.label;" flex ="1"/>
-        <box orient="horizontal">
-          <box orient="horizontal" autostretch="never">
+        <hbox>
+          <hbox autostretch="never">
             <text class = "label" id = "topLabel" for = "topInput" value = "&topInput.label;" />
             <textbox id = "topInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
-          </box>
-          <box orient="horizontal" autostretch="never">
+          </hbox>
+          <hbox autostretch="never">
             <text class = "label" id = "bottomLabel" for = "bottomInput" value = "&bottomInput.label;" />
             <textbox id = "bottomInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
-          </box>
-          <box orient="horizontal" autostretch="never">
+          </hbox>
+          <hbox autostretch="never">
             <text class = "label" id = "leftLabel" for = "leftInput" value = "&leftInput.label;" />
             <textbox id = "leftInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
-          </box>
-          <box orient="horizontal" autostretch="never">
+          </hbox>
+          <hbox autostretch="never">
             <text class = "label" id = "rightLabel" for = "rightInput" value = "&rightInput.label;" />
             <textbox id = "rightInput" style = "width:5em;" onkeyup="checkValid(this.id)"/>
-          </box>
-        </box>
+          </hbox>
+        </hbox>
       </row>
     </rows>
   </grid>
@@ -142,7 +142,7 @@ Contributor(s): Masaki Katakai <katakai@japan.sun.com>
   <separator/>
 
   <!-- Places to overlay common dialog buttons and keyset -->
-  <box id="okCancelButtons"/>
+  <hbox id="okCancelButtons"/>
   <keyset id="keyset"/>
 
 </window>
diff --git a/xpfe/global/resources/content/win/platformDialogOverlay.xul b/xpfe/global/resources/content/win/platformDialogOverlay.xul
index 55bb99e4866f..4fac66b4e2cd 100644
--- a/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -28,16 +28,16 @@
              xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <box id="okCancelButtons">
+  <hbox id="okCancelButtons">
     <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();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
- <box id="okCancelHelpButtons">
+  <hbox id="okCancelHelpButtons">
     <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();"/>
@@ -45,25 +45,25 @@
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
     <spring flex="1"/>
-  </box>
+  </hbox>
 
 
-  <box id="okCancelButtonsRight" halign="right">
+  <hbox id="okCancelButtonsRight" halign="right">
     <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();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
-  </box>
+  </hbox>
   
-  <box id="okCancelHelpButtonsRight" halign="right">
+  <hbox id="okCancelHelpButtonsRight" halign="right">
     <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();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
-  </box>
+  </hbox>
 
   <keyset id="dialogKeys">
     <key keycode="VK_ENTER" oncommand="if (!document.getElementById('ok').disabled) doOKButton();"/>
diff --git a/xpfe/global/resources/content/wizardOverlay.xul b/xpfe/global/resources/content/wizardOverlay.xul
index 00808bf776c9..fbf3aa85d870 100644
--- a/xpfe/global/resources/content/wizardOverlay.xul
+++ b/xpfe/global/resources/content/wizardOverlay.xul
@@ -8,7 +8,7 @@
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Wizard Buttons -->
-   <box id="wizardButtons" align="horizontal">
+   <hbox id="wizardButtons">
     <spring flex="100%"/>
     <button class="dialog" id="wiz-cancel-button" label="&cancelButton.label;" oncommand="wizardManager.onCancel();" />
     <spring flex="20%"/>
@@ -17,6 +17,6 @@
     <spring flex="5%"/>
     <button class="dialog" id="wiz-finish-button" label="&finishButton.label;" oncommand="wizardManager.onFinish();" />
     <spring flex="5%"/>
-  </box>
+  </hbox>
   
 </overlay>    
diff --git a/xpinstall/res/content/institems.xul b/xpinstall/res/content/institems.xul
index 57d719a61bdd..090d8506600b 100644
--- a/xpinstall/res/content/institems.xul
+++ b/xpinstall/res/content/institems.xul
@@ -39,12 +39,12 @@ Contributor(s):
     <script src="chrome://communicator/content/xpinstall/institems.js"/>
     <keyset id="keyset"/>
     
-    <box orient="vertical" id="mainBox">
-        <box id="interiorTitleBox" orient="horizontal" autostretch="never">
+    <vbox id="mainBox">
+        <hbox id="interiorTitleBox" autostretch="never">
             <text class="headline" id="interiorTitle" value="&items.label;"/>
             <spring flex="100%"/>
             <image src="chrome://global/skin/animthrob_single.gif" />
-        </box>      
+        </hbox>      
 
         <spring class="vertical-small-spacer"/>
         <separator class="groove" flex="100%"/>            
@@ -56,7 +56,7 @@ Contributor(s):
         <text class="label" id="componentList" value="&componentList.label;"/>
         <spring class="vertical-small-spacer"/>
         <spring class="vertical-small-spacer"/>            
-        <box orient="vertical" id="treebox">
+        <vbox id="treebox">
                 <tree id="modulesTree" class="inset">
                     <treecolgroup>
                       <treecol flex="1"/>
@@ -74,11 +74,11 @@ Contributor(s):
                     <treechildren id="theTreeBody" flex="1">
                     </treechildren>
                 </tree>
-        </box>
+        </vbox>
 
         <separator class="groove" flex="100%"/>
-        <box class="selection" id="okCancelButtonsRight"/>
-    </box>
+        <hbox class="selection" id="okCancelButtonsRight"/>
+    </vbox>
 
 
 </window>
diff --git a/xpinstall/res/content/xpistatus.xul b/xpinstall/res/content/xpistatus.xul
index 097471d1cbe7..14b238d676be 100644
--- a/xpinstall/res/content/xpistatus.xul
+++ b/xpinstall/res/content/xpistatus.xul
@@ -41,12 +41,12 @@
     <script src="chrome://communicator/content/xpinstall/xpistatus.js"/>
     <keyset id="keyset"/>
 
-    <box orient="vertical" id="mainBox">
-        <box id="interiorTitleBox" orient="horizontal" autostretch="never">
+    <vbox id="mainBox">
+        <hbox id="interiorTitleBox" autostretch="never">
             <text class="headline" id="interiorTitle" value="&progress.label;"/>
             <spring flex="100%"/>
             <image src="chrome://global/skin/animthrob_single.gif" />
-        </box>
+        </hbox>
 
         <spring class="vertical-small-spacer"/>
         <separator class="groove" flex="100%"/>            
@@ -56,7 +56,7 @@
         <spring class="vertical-small-spacer"/>
         <spring class="vertical-small-spacer"/>            
 
-        <box orient="vertical" id="treebox">  
+        <vbox id="treebox">  
                 <tree id="modulesTree" class="inset">
                     <treecolgroup>
                       <treecol flex="1"/>
@@ -73,20 +73,20 @@
                     <treechildren id="theTreeBody" flex="1">
                     </treechildren>
                 </tree>
-        </box>
+        </vbox>
     
         <spring class="vertical-small-spacer"/>
 
-        <box id="statusMessages" orient="vertical">
+        <vbox id="statusMessages">
             <textbox id="dialog.uiPackageName" readonly="" />
             <textbox id="dialog.currentAction" readonly="" />
-        </box>
+        </vbox>
 
-        <box id="progressBox" orient="horizontal" autostretch="never">
+        <hbox id="progressBox" autostretch="never">
             <progressmeter id="dialog.progress" mode="normal" value="0"/>
             <button class="dialog push" id="cancel" onclick="cancel()" label="&dialogCancel.label;"/>
-        </box>
+        </hbox>
 
-    </box>
+    </vbox>
 
 </window>