diff --git a/mozilla/editor/ui/composer/content/EditorCommands.js b/mozilla/editor/ui/composer/content/EditorCommands.js
index d09159b1b36..7ae2911cbd0 100644
--- a/mozilla/editor/ui/composer/content/EditorCommands.js
+++ b/mozilla/editor/ui/composer/content/EditorCommands.js
@@ -971,6 +971,12 @@ function EditorInsertOrEditHLine()
   contentWindow.focus();
 }
 
+function EditorInsertChars()
+{
+  window.openDialog("chrome://editor/content/EdInsertChars.xul", "_blank", "chrome,close,titlebar", "");
+  contentWindow.focus();
+}
+
 function EditorInsertOrEditNamedAnchor()
 {
   window.openDialog("chrome://editor/content/EdNamedAnchorProps.xul", "_blank", "chrome,close,titlebar,modal", "");
diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index 7b10230c562..7ef4bb11847 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -42,7 +42,7 @@
         titlemodifier="&editorWindow.titlemodifier;"
         titlemenuseparator="&editorWindow.titlemodifiermenuseparator;"
         windowtype="composer:html"
-        align="vertical"
+        orient="vertical"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height"
@@ -147,7 +147,7 @@
     <button id="namedAnchorButton"/>
     <spring flex="100%"/>
 
-		<box id="toolbar_throbber_box" align="vertical">
+		<box id="toolbar_throbber_box" orient="vertical">
 			<titledbutton id="Throbber" oncommand='goClickThrobber("editor.throbber.url")'>
 				<observes element="Editor:Throbber" attribute="busy"/>
 			</titledbutton>
@@ -188,12 +188,12 @@
   <box id="sidebar-box" chromeclass="extrachrome"/>
   <splitter id="sidebar-splitter" chromeclass="extrachrome"/>
   
-  <box id="appcontent" align="vertical" flex="100%">
+  <box id="appcontent" orient="vertical" flex="100%">
     <editor type="content-primary" id="content-frame" src="about:blank" flex="100%"/>
 
     <box align="horizontal" id="EditModeToolbar">
       <spring class="spacer5"/>
-      <box align="vertical">
+      <box orient="vertical">
         <spring style="height: 1px;"/>
         <html:div>&displayMode.label;</html:div>
       </box>
diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index 584f8e997d0..d4204d4496e 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -139,6 +139,7 @@
 
     <broadcaster id="Editor:InsertLink"   value="&insertLinkCmd.label;"    oncommand="EditorInsertOrEditLink()"/>
     <broadcaster id="Editor:InsertAnchor" value="&insertAnchorCmd.label;"  oncommand="EditorInsertOrEditNamedAnchor()"/>
+    <broadcaster id="Editor:InsertChars"  value="&insertCharsCmd.label;"   oncommand="EditorInsertChars()"/>
     <broadcaster id="Editor:InsertImage"  value="&insertImageCmd.label;"   oncommand="EditorInsertOrEditImage()"/>
     <broadcaster id="Editor:InsertHLine"  value="&insertHLineCmd.label;"   oncommand="EditorInsertOrEditHLine()"/>
     <broadcaster id="Editor:InsertTable"  value="&insertTableCmd.label;"   oncommand="EditorInsertTable()"/>
@@ -317,6 +318,7 @@
       <menuitem accesskey="&inserthline.accesskey;"                              observes="Editor:InsertHLine"/>
       <menuitem accesskey="&inserttable.accesskey;"                              observes="Editor:InsertTable"/>
       <menuitem accesskey="&insertsource.accesskey;" key="inserthtmlkb"          observes="Editor:InsertHTML"/>
+      <menuitem accesskey="&insertchars.accesskey;"                              observes="Editor:InsertChars"/>
       <menuseparator />
       <menuitem accesskey="&insertlinebreak.accesskey;"  disabled="true"         observes="Editor:InsertBreak"/>
       <menuitem accesskey="&insertbreak.accesskey;"      disabled="true"         observes="Editor:InsertBreakAll"/>
@@ -508,43 +510,17 @@
     </menu>
     <menuseparator position="13"/>
 
-    <!-- Stylesheet submenu -->
-<!-- 
-function EditorApplyStyleSheet(styleSheetURL)
-{
-  // Second param is true for "override" type of sheet
-  // We don't let users use that option
-  editorShell.ApplyStyleSheet(styleSheetURL);
-  contentWindow.focus();
-}
-
-    <menu id="stylesheetMenu" value="&stylesheetMenu.label;"
-          accesskey="&formatstylesheetmenu.accesskey;"
-          position="14">
-    <menupopup>
-      <menuitem value="&stylesheetOldstyleCmd.label;"      accesskey="&ssoldstyle.accesskey;"    oncommand="EditorApplyStyleSheet('http://www.w3.org/StyleSheets/Core/Oldstyle')"/>
-      <menuitem value="&stylesheetModernistCmd.label;"     accesskey="&ssmodernist.accesskey;"   oncommand="EditorApplyStyleSheet('http://www.w3.org/StyleSheets/Core/Modernist')"/>
-      <menuitem value="&stylesheetMidnightCmd.label;"      accesskey="&ssmidnight.accesskey;"    oncommand="EditorApplyStyleSheet('http://www.w3.org/StyleSheets/Core/Midnight')"/>
-      <menuitem value="&stylesheetUltramarineCmd.label;"   accesskey="&ssultramarine.accesskey;" oncommand="EditorApplyStyleSheet('http://www.w3.org/StyleSheets/Core/Ultramarine')"/>
-      <menuitem value="&stylesheetChocolateCmd.label;"     accesskey="&sschocolate.accesskey;"   oncommand="EditorApplyStyleSheet('http://www.w3.org/StyleSheets/Core/Chocolate')"/>
-      <menuitem value="&stylesheetSteelyCmd.label;"        accesskey="&sssteely.accesskey;"      oncommand="EditorApplyStyleSheet('http://www.w3.org/StyleSheets/Core/Steely')"/>
-    </menupopup>
-    </menu>
-
-    <menuseparator position="15"/>
--->
-
     <menuitem id="increaseIndent" value="&increaseIndent.label;"
               accesskey="&increaseindent.accesskey;" 
               key="increaseindentkb"
               oncommand="EditorIndent('indent')"
-              position="16"/>
+              position="14"/>
     <menuitem id="decreaseIndent" value="&decreaseIndent.label;"
               accesskey="&decreaseindent.accesskey;"
               key="decreaseindentkb"
               oncommand="EditorIndent('outdent')"
-              position="17"/>
-    <menuseparator position="18"/>
+              position="15"/>
+    <menuseparator position="16"/>
     <!-- Merge Table Menu and separator in Messenger Composer here -->
     <!-- Merge property items here -->
   </menupopup>
@@ -811,7 +787,7 @@ function EditorApplyStyleSheet(styleSheetURL)
   <!-- Window bottom -->
   <box id="status-bar" chromeclass="status">
     <box id="state-box" align="horizontal" flex="100%" style="min-width: 1px">
-      <box align="vertical" style="width:100px">
+      <box orient="vertical" style="width:100px">
         <spring flex="100%"/>
         <progressmeter id="statusbar-icon" mode="normal" align="horizontal" value="0">
             <observes element="Editor:Throbber" attribute="busy"/>
diff --git a/mozilla/editor/ui/composer/content/sidebar-editor.xul b/mozilla/editor/ui/composer/content/sidebar-editor.xul
index 76b3f93fdc7..effd3a67dc8 100644
--- a/mozilla/editor/ui/composer/content/sidebar-editor.xul
+++ b/mozilla/editor/ui/composer/content/sidebar-editor.xul
@@ -33,10 +33,10 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="Init('chrome://editor/content/sidebar-editor.rdf',
-               'NC:EditorSidebarRoot');" align="vertical">
+               'NC:EditorSidebarRoot');" orient="vertical">
 
 <script src="chrome://communicator/content/sidebar/sidebar.js" />
-<box id="sidebox" align="vertical" flex="100%">
+<box id="sidebox" orient="vertical" flex="100%">
  <box class="sidebartitle">
   <spring flex="100%"/>
   <titledbutton class="dialog borderless paneltitle" 
diff --git a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
index efdf4010886..667ea915d92 100644
--- a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
+++ b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd
@@ -232,6 +232,8 @@
 <!ENTITY insertlink.accesskey "l">
 <!ENTITY insertAnchorCmd.label "Named Anchor...">
 <!ENTITY insertanchor.accesskey "a">
+<!ENTITY insertCharsCmd.label "Characters...">
+<!ENTITY insertchars.accesskey "c">
 <!ENTITY insertImageCmd.label "Image...">
 <!ENTITY insertimage.accesskey "i">
 <!ENTITY insertImageMapCmd.label "Image Map...">
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
index 578a50bbb2d..38330100c11 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -39,7 +39,7 @@
     xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -67,7 +67,7 @@
     <html:div flex="100%" id="tagLabel"/>
   </box>
   <spring class="spacer"/>
-  <tabcontrol align="vertical" flex="100%">
+  <tabcontrol orient="vertical" flex="100%">
     <tabbox>
       <tab selected="true" value="&tabHTML.label;"/>
       <tab value="&tabCSS.label;"/>
@@ -78,7 +78,7 @@
       <!-- ============================================================== -->
       <!--                        HTML Attributes                         -->
       <!-- ============================================================== -->
-        <box class="tabpanel" flex="100%" align="vertical">
+        <box class="tabpanel" flex="100%" orient="vertical">
           <tree id="HTMLATree" 
             class="AttributesTree inset" 
             flex="100%" 
@@ -93,7 +93,7 @@
             </treehead>
             <treechildren id="HTMLAList"/>
           </tree>
-          <box align="vertical">
+          <box orient="vertical">
             <spring class="spacer"/>
             <titledbox orient="vertical">
               <title><text value="&AddHTMLAttributeLabel.label;"/></title>
@@ -111,7 +111,7 @@
       <!-- ============================================================== -->
       <!--                         CSS Attributes                         -->
       <!-- ============================================================== -->
-        <box class="tabpanel" flex="100%" align="vertical">
+        <box class="tabpanel" flex="100%" orient="vertical">
           <tree id="CSSATree" class="AttributesTree inset" flex="100%" context="attlistPopup">
             <treecol width="35%"/>
             <treecol width="65%" style="min-width: 30%"/>
@@ -123,7 +123,7 @@
             </treehead>
             <treechildren id="CSSAList"/>
           </tree>
-          <box align="vertical">
+          <box orient="vertical">
             <spring class="spacer"/>
             <titledbox orient="vertical">
               <title><text value="&AddCSSAttributeLabel.label;"/></title>
@@ -141,7 +141,7 @@
       <!-- ============================================================== -->
       <!--                    JavaScript Event Handlers                   -->
       <!-- ============================================================== -->
-        <box class="tabpanel" flex="100%" align="vertical">
+        <box class="tabpanel" flex="100%" orient="vertical">
           <tree id="JSEATree" class="AttributesTree inset" flex="100%" context="attlistPopup">
             <treecol width="35%"/>
             <treecol width="65%" style="min-width: 30%"/>
@@ -153,7 +153,7 @@
             </treehead>
             <treechildren id="JSEAList"/>
           </tree>
-          <box align="vertical">
+          <box orient="vertical">
             <spring class="spacer"/>
             <titledbox orient="vertical">
               <title><text value="&AddJSEAttributeLabel.label;"/></title>
diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.xul b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
index 97233679aa0..cdaf8b3df27 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
@@ -34,7 +34,7 @@
     xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
-    align="vertical">
+    orient="vertical">
 
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script language="JavaScript" src="chrome://editor/content/EdColorProps.js"/>
@@ -42,9 +42,9 @@
 
   <broadcaster id="args" value=""/>
 
-  <text class="dialog bold" value="&pageColors.label;"/>
+  <text class="label bold" value="&pageColors.label;"/>
   <box orient="vertical">
-    <radiogroup orient="vertical">
+    <radiogroup orient="vertical" autostretch="never">
       <radio id="DefaultColorsRadio" value="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"/>
       <radio id="CustomColorsRadio" value="&customColorsRadio.label;" oncommand="UseCustomColors()"/>
     </radiogroup>
@@ -55,7 +55,7 @@
       <columns><column/><column/></columns>
       <rows>
         <row>
-          <text class="dialog" value="&normalText.label;"/>
+          <text class="label" value="&normalText.label;"/>
           <menu class="colorpicker">
     	      <box>
               <spring id="textCW" class="color-well"/>
@@ -67,7 +67,7 @@
           </menu>
         </row>
         <row>
-        <text class="dialog" value="&linkText.label;"/>
+        <text class="label" value="&linkText.label;"/>
           <menu class="colorpicker">
     	      <box>
               <spring id="linkCW" class="color-well"/>
@@ -79,7 +79,7 @@
           </menu>
         </row>
         <row>
-          <text class="dialog" value="&activeLinkText.label;"/>
+          <text class="label" value="&activeLinkText.label;"/>
           <menu class="colorpicker">
     	      <box>
               <spring id="activeCW" class="color-well"/>
@@ -91,7 +91,7 @@
           </menu>
         </row>
         <row>
-          <text class="dialog" value ="&visitedLinkText.label;"/>
+          <text class="label" value ="&visitedLinkText.label;"/>
           <menu class="colorpicker">
     	      <box>
               <spring id="visitedCW" class="color-well"/>
@@ -103,7 +103,7 @@
           </menu>
         </row>
         <row>
-          <text class="dialog" value="&background.label;"/>
+          <text class="label" value="&background.label;"/>
           <menu class="colorpicker">
     	      <box>
               <spring id="backgroundCW" class="color-well"/>
@@ -117,10 +117,10 @@
       </rows>
     </grid>
     <box orient="vertical" id="ColorPreview">
-      <text class="dialog" id="NormalText" value="&normalText.label;"/>
-      <text class="dialog" id="LinkText" value="&linkText.label;"/>
-      <text class="dialog" id="ActiveLinkText" value="&activeLinkText.label;"/>
-      <text class="dialog" id="VisitedLinkText" value="&visitedLinkText.label;"/>
+      <text class="label" id="NormalText" value="&normalText.label;"/>
+      <text class="label" id="LinkText" value="&linkText.label;"/>
+      <text class="label" id="ActiveLinkText" value="&activeLinkText.label;"/>
+      <text class="label" id="VisitedLinkText" value="&visitedLinkText.label;"/>
     </box>
   </box>
   <separator class="groove"/>
@@ -134,7 +134,7 @@
     <html id="SaveImageMsg" value="&saveImageMsg.label;"/>
     <spring class="bigspacer"/>
     <spring flex="1"/>
-    <box align="vertical">
+    <box orient="vertical">
       <spring class="bigspacer"/>
       <button class="dialog" id="AdvancedEditButton2"/>
     </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
index 5c5222dd327..6f50bf3e7b5 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
+++ b/mozilla/editor/ui/dialogs/content/EdDialogCommon.js
@@ -72,7 +72,7 @@ function ClearList(list)
       list.remove(i);
   }
 }
-
+//TODO: WE NEED EQUIVALENT OF THIS FOR "TREELIST"
 function ReplaceStringInList(list, index, string)
 {
   if (index < list.options.length)
@@ -328,7 +328,7 @@ function AppendStringToMenulist(menulist, string)
         menulist.appendChild(menupopup);
       else
       {
-dump("Failed to create menupoup\n");
+        dump("Failed to create menupoup\n");
         return null;
       }
     }
@@ -337,7 +337,6 @@ dump("Failed to create menupoup\n");
     {
       menuItem.setAttribute("value", string);
       menupopup.appendChild(menuItem);
-dump("AppendStringToMenulist, menuItem="+menuItem+", value="+string+"\n");
       return menuItem;
     }
   }
@@ -350,7 +349,6 @@ function ClearMenulist(menulist)
   //  but look for > 1 children anyway.
   // Note -- this doesn't remove menuitems from the menupopop -- SHOULD WE?
   if (menulist) {
-dump(menulist+"=menulist in ClearMenulist\n");
     menulist.selectedItem = null;
     while (menulist.firstChild)
       menulist.removeChild(menulist.firstChild);
@@ -383,7 +381,7 @@ function AppendStringToTreelist(tree, string)
         tree.appendChild(treechildren);
       else
       {
-dump("Failed to create <treechildren>\n");
+        dump("Failed to create <treechildren>\n");
         return null;
       }
     }
@@ -409,6 +407,7 @@ function ClearTreelist(tree)
 {
   if (tree)
   {
+    tree.clearItemSelection();
     while (tree.firstChild)
       tree.removeChild(tree.firstChild);
     
@@ -419,16 +418,12 @@ function ClearTreelist(tree)
 
 function GetSelectedTreelistValue(tree)
 {
-  var treeCell = tree.selectedCell;
-  if (treeCell)
-    return treeCell.getAttribute("value");
-  
-  return ""; 
+  if (tree)
+    return tree.selectedCells[0].getAttribute("value");
+
+  return "";
 }
 
-function SetSelectedTreelistItem()
-{
-}
 
 // USE onkeyup!
 // forceInteger by petejc (pete@postpagan.com)
@@ -506,30 +501,25 @@ function getContainer ()
   selImage = editorShell.GetSelectedElement(tagName);
   if (selImage)  // existing image
   {
-    dump("Is an image element\n");
+    //dump("Is an image element\n");
     oneup = selImage.parentNode;
-    dump("Parent = " + oneup.nodeName + "\n");
+    //dump("Parent = " + oneup.nodeName + "\n");
     //twoup = oneup.parentNode;
     //dump("Grand Parent is " + twoup.nodeName + "\n");
     return oneup;
   }
   else if (!selImage)  // new image insertion
   {
-    dump("Not an image element\n");
-    dump("Trying for caret selection\n");
+    dump("Not an image element -- Trying for caret selection\n");
     var selection = window.editorShell.editorSelection;
     if (selection)
     {
-        dump("Got selection\n");
-        //dump("Selection is " + selection.nodeName + "\n");
         var focusN = selection.focusNode;
-        dump("FOCUS is now on " + focusN.nodeName + "\n");
         if (focusN.nodeName == "TD")
           return focusN
                 else
         {
           oneup = focusN.parentNode;
-          dump("PARENT is " + oneup.nodeName + "\n");
           return oneup;
          }  
     }
@@ -628,7 +618,6 @@ function InitMoreFewer()
   //   attribute on the dialog.MoreFewerButton button
   //   onMoreFewer will toggle it and redraw the dialog
   SeeMore = (dialog.MoreFewerButton.getAttribute("more") != "1");
-dump(SeeMore+"=SeeMore - InitMoreFewer\n");
   onMoreFewer();
 }
 
@@ -637,8 +626,7 @@ function onMoreFewer()
   if (SeeMore)
   {
     dialog.MoreSection.setAttribute("style","display: none");
-    //TODO: Bugs in box layout prevent us from using this:
-    //dialog.MoreSection.setAttribute("style","visibility: collapse");
+    //dialog.MoreSection.setAttribute("collapsed","true");
     window.sizeToContent();
     dialog.MoreFewerButton.setAttribute("more","0");
     dialog.MoreFewerButton.setAttribute("value",GetString("MoreProperties"));
@@ -647,7 +635,7 @@ function onMoreFewer()
   else
   {
     dialog.MoreSection.setAttribute("style","display: inherit");
-    //dialog.MoreSection.setAttribute("style","visibility: inherit");
+    //dialog.MoreSection.removeAttribute("collapsed");
     window.sizeToContent();
     dialog.MoreFewerButton.setAttribute("more","1");
     dialog.MoreFewerButton.setAttribute("value",GetString("FewerProperties"));
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
index 164e50fdf0f..ab806ad8ae3 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -34,7 +34,7 @@
     xmlns:xul ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js">
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
index 837c54658ed..2ef90021843 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
@@ -28,7 +28,7 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -36,7 +36,7 @@
 
   <broadcaster id="args" value=""/>
 
-<box align="vertical">
+<box orient="vertical">
   <html:label for="WordInput">&wordEditField.label;</html:label>
   <box align="horizontal">
     <html:input type="text" class="SpellCheckWord" id="WordInput"/>
@@ -49,7 +49,7 @@
   <box align="horizontal">
     <html:select class="SpellCheckList" id="DictionaryList" size="10"/>
     <spring class="bigspacer"/>
-    <box align="vertical">
+    <box orient="vertical">
       <button class="dialog"  id="ReplaceWord" oncommand="ReplaceWord()" value="&ReplaceButton.label;"/>
       <spring class="spacer"/>
       <button class="dialog"  id="RemoveWord" oncommand="RemoveWord()" value="&RemoveButton.label;"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.js b/mozilla/editor/ui/dialogs/content/EdHLineProps.js
index b78125b81f1..e943de141c4 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.js
@@ -66,7 +66,7 @@ dump("3 Init called...\n");
 dump("1\n");
 
   // SET FOCUS TO FIRST CONTROL
-  dialog.heightInput.focus();
+  dialog.widthInput.focus();
 
   // Resize window
   window.sizeToContent();
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index 9892bdc58b7..696aebddeb4 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -34,7 +34,7 @@
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	 xmlns:html="http://www.w3.org/TR/REC-html40"
    onload = "Startup()"
-   align="vertical">
+   orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -48,15 +48,15 @@
       <columns><column/><column/><column /></columns>
       <rows>
         <row vertical-align="baseline" autostretch="never">
-          <text class="dialog" value="&widthEditField.label;"/>
+          <text class="label" value="&widthEditField.label;"/>
           <textfield class="narrow" id="width" flex="1" onkeyup="forceInteger('width')"/>
           <menulist id="pixelOrPercentMenulist"/>
           <!-- menupopup and menuitems added by JS -->
         </row>
         <row vertical-align="baseline" autostretch="never">
-          <text class="dialog" value="&heightEditField.label;"/>
+          <text class="label" value="&heightEditField.label;"/>
           <textfield class="narrow" id="height" onkeyup="forceInteger('height')"/>
-          <text class="dialog" value="&pixelsPopup.value;"/>
+          <text class="label" value="&pixelsPopup.value;"/>
         </row>
       </rows>
     </grid>        
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMap.xul b/mozilla/editor/ui/dialogs/content/EdImageMap.xul
index df6398a635c..da4e545660c 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMap.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMap.xul
@@ -53,7 +53,7 @@
     xmlns:html="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
     onunload="//finishMap();"
-    align="vertical"
+    orient="vertical"
    >
 <!--
     width="640" height="480"
@@ -152,7 +152,7 @@
 </menubar>
 
 
-<toolbar id="toolbar" class="standard" persist="collapsed" align="vertical">
+<toolbar id="toolbar" class="standard" persist="collapsed" orient="vertical">
   <titledbutton id="cutButton" class="button28" observes="Map:Cut"/>
   <titledbutton id="copyButton" class="button28" observes="Map:Copy"/>
   <titledbutton id="pasteButton" class="button28" observes="Map:Paste"/>
@@ -166,7 +166,7 @@
 <box align="horizontal" flex="100">
 
   <toolbar id="toolbox">
-  <box align="vertical" flex="100">
+  <box orient="vertical" flex="100">
     <titledbutton id="pointerButton" class="tool" toggled="1" oncommand="changeTool(event, 'pointer')"/>
     <titledbutton id="rectButton" class="tool" oncommand="changeTool(event, 'rect')"/>
     <titledbutton id="cirButton" class="tool" oncommand="changeTool(event, 'cir')"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 7b5d6262265..2da0acffbde 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -35,7 +35,7 @@
     xmlns:xul ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.js b/mozilla/editor/ui/dialogs/content/EdImageProps.js
index f421681bd33..d13adcbf5f1 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.js
@@ -267,11 +267,10 @@ function onMoreFewerImage()
     dialog.doConstrain = dialog.constrainCheckbox.checked;
     SetGlobalElementToCurrentDialogSettings();
     
-    dialog.MoreSection.setAttribute("style","display: none");
-    //TODO: Bugs in box layout prevent us from using this:
-    //dialog.MoreSection.setAttribute("style","visibility: collapse");
+    //dialog.MoreSection.setAttribute("style","display: none");
+    dialog.MoreSection.setAttribute("collapsed","true");
     // Show the "Advanced Edit" button on same line as "More Properties"
-    dialog.AdvancedEditButton2.setAttribute("style","display: inherit");
+    //dialog.AdvancedEditButton2.setAttribute("style","display: inherit");
     window.sizeToContent();
     dialog.MoreFewerButton.setAttribute("more","0");
     dialog.MoreFewerButton.setAttribute("value",GetString("MoreProperties"));
@@ -279,8 +278,8 @@ function onMoreFewerImage()
   }
   else
   {
-    dialog.MoreSection.setAttribute("style","display: inherit");
-    //dialog.MoreSection.setAttribute("style","visibility: inherit");
+    //dialog.MoreSection.setAttribute("style","display: inherit");
+    dialog.MoreSection.removeAttribute("collapsed");
     // Hide the "Advanced Edit" next to "More..." Use button at bottom right of dialog
     dialog.AdvancedEditButton2.setAttribute("style","display: none");
     window.sizeToContent();
@@ -291,6 +290,7 @@ function onMoreFewerImage()
     
     InitDialog();
     
+    //TODO: We won't need to do this when we convert to using "collapsed"
     if (dialog.isCustomSize)
     {
       dialog.customsizeRadio.checked = true;
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 56f0079c46e..2dc2ac6abff 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -56,7 +56,7 @@
       <columns><column/><column/><column/></columns>
       <rows>
         <row>
-          <text class = "dialog" 
+          <text class = "label" 
             for   = "srcInput"
             value = "&locationEditField.label;"
             align = "right" />
@@ -70,7 +70,7 @@
           <button id="ChooseFile"/>
         </row>
         <row>
-          <text class = "dialog"
+          <text class = "label"
             id    = "altTextLabel" 
             for   = "altTextInput"
             value = "&altTextEditField.label;" />
@@ -118,7 +118,7 @@
             <rows>
               <!--//////  IMAGE WIDTH  //////-->
               <row vertical-align="baseline" autostretch="never">
-                <text class = "dialog" 
+                <text class = "label" 
                   id    = "widthLabel"
                   for   = "widthInput"
                   value = "&widthEditField.label;" />
@@ -133,7 +133,7 @@
               </row>
               <!--////// IMAGE HEIGHT //////-->
               <row vertical-align="baseline" autostretch="never">
-                <text class = "dialog" 
+                <text class = "label" 
                   id    = "heightLabel"
                   for   = "heightInput"
                   value = "&heightEditField.label;" />
@@ -173,14 +173,14 @@
       <box orient="vertical" flex="1">
         <!--//////// Alignment ////////-->
         <titledbox flex="1" orient="vertical">
-          <title><text class="dialog" id="alignLabel" value="&alignment.label;"/></title>
+          <title><text class="label" id="alignLabel" value="&alignment.label;"/></title>
           <menulist id = "alignTypeSelect" onchange ="doOverallEnabling()">
             <menupopup vertical-align="middle">
-              <menuitem class="middle"><image id="img-align-top"/>   <text class="dialog" value = "&topPopup.value;"/></menuitem>
-              <menuitem class="middle"><image id="img-align-middle"/><text class="dialog" value = "&centerPopup.value;"/></menuitem>
-              <menuitem class="middle"><image id="img-align-bottom"/><text class="dialog" value = "&bottomPopup.value;"/></menuitem>
-              <menuitem class="middle"><image id="img-align-left"/>  <text class="dialog" value = "&wrapLeftPopup.value;"/></menuitem>
-              <menuitem class="middle"><image id="img-align-right"/> <text class="dialog" value = "&wrapRightPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-top"/>   <text class="label" value = "&topPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-middle"/><text class="label" value = "&centerPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-bottom"/><text class="label" value = "&bottomPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-left"/>  <text class="label" value = "&wrapLeftPopup.value;"/></menuitem>
+              <menuitem class="middle"><image id="img-align-right"/> <text class="label" value = "&wrapRightPopup.value;"/></menuitem>
             </menupopup>
           </menulist>
         </titledbox>
@@ -193,7 +193,7 @@
             <rows>
               <row vertical-align="baseline" autostretch="never">
                 <text 
-                  class = "dialog align-right" 
+                  class = "label align-right" 
                   id    = "leftrightLabel"
                   value = "&leftRightEditField.label;"/>
                 <textfield 
@@ -202,13 +202,13 @@
                   onkeyup   = "forceInteger(this.id)" 
                   onchange  = "doOverallEnabling()"/>
                 <text 
-                  class = "dialog" 
+                  class = "label" 
                   id    = "leftrighttypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
               <row vertical-align="baseline" autostretch="never">
                 <text 
-                  class = "dialog align-right" 
+                  class = "label align-right" 
                   id    = "topbottomLabel"
                   value = "&topBottomEditField.label;"/>
                 <textfield 
@@ -217,12 +217,12 @@
                   onkeyup   = "forceInteger(this.id)"
                   onchange  = "doOverallEnabling()"/>
                 <text
-                  class = "dialog" 
+                  class = "label" 
                   id    = "topbottomtypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
               <row vertical-align="baseline" autostretch="never">
-                <text class = "dialog align-right" 
+                <text class = "label align-right" 
                   id    = "borderLabel"
                   value = "&borderEditField.label;"/>
                 <textfield
@@ -231,7 +231,7 @@
                   onkeyup   = "forceInteger(this.id)"
                   onchange  = "doOverallEnabling()" />
                 <text 
-                  class = "dialog" 
+                  class = "label" 
                   id    = "bordertypeLabel"
                   value = "&pixelsPopup.value;" />
               </row>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
index 676d6e02ab6..54dde741022 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
@@ -34,7 +34,7 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
-    align="vertical" flex="100%">
+    orient="vertical" flex="100%">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -44,7 +44,7 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
 
-  <text class="dialog" id="srcMessage" value="&sourceEditField.label;"/>
+  <text class="label" id="srcMessage" value="&sourceEditField.label;"/>
   <textfield id="srcInput" multiline="true" rows="6" flex="1"/>
   <!-- Will this accept the embedded HTML tags? -->
   <box>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.js b/mozilla/editor/ui/dialogs/content/EdInsertChars.js
new file mode 100644
index 00000000000..664d2c67f2a
--- /dev/null
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.js
@@ -0,0 +1,485 @@
+/* 
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *  
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *  
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ */
+
+//------------------------------------------------------------------
+// From Unicode 3.0 Page 54. 3.11 Conjoining Jamo Behavior
+var SBase = 0xac00;
+var LBase = 0x1100;
+var VBase = 0x1161;
+var TBase = 0x11A7;
+var LCount = 19;
+var VCount = 21;
+var TCount = 28;
+var NCount = VCount * TCount;
+// End of Unicode 3.0
+
+var HangulL;
+var HangulV;
+var HangulT;
+var AddHangul;
+var HangulChar= String.fromCharCode(SBase);
+
+function StartupHangul()
+{
+
+  HangulL = document.getElementById("HangulL");
+  HangulV = document.getElementById("HangulV");
+  HangulT = document.getElementById("HangulT");
+  AddHangul = document.getElementById("AddHangul");
+
+  for(var i =0 ; i < LCount; i++)
+       AppendStringToMenulist(HangulL , String.fromCharCode(i+LBase));
+
+  for(var i =0 ; i < VCount; i++)
+       AppendStringToMenulist(HangulV , String.fromCharCode(i+VBase) );
+
+  AppendStringToMenulist(HangulT , " " );
+  for(var i =1 ; i < TCount; i++)
+       AppendStringToMenulist(HangulT , String.fromCharCode(i+TBase) );
+
+  HangulL.focus();
+}
+
+function SelectHangul()
+{
+  
+  HangulChar =  String.fromCharCode(
+       (HangulL.selectedIndex * VCount + 
+        HangulV.selectedIndex) * TCount + 
+        HangulT.selectedIndex + 
+        SBase ); 
+  AddHangul.value =  HangulChar;
+}
+function InsertHangul()
+{
+  editorShell.InsertSource(HangulChar);
+}
+//------------------------------------------------------------------
+var LatinC;
+var LatinL;
+var LatinM;
+var AddLatin;
+var LatinChar;
+var oldC=0;
+var oldL=0;
+var oldM=0;
+var LItems=0;
+function StartupLatin()
+{
+  LatinC = document.getElementById("LatinC");
+  LatinL = document.getElementById("LatinL");
+  LatinM = document.getElementById("LatinM");
+  AddLatin = document.getElementById("AddLatin");
+  UpdateLatinL();
+  UpdateLatinM();
+  UpdateLatinI();
+}
+function SelectLatinCategory()
+{
+  if(LatinC.selectedIndex != oldC ) {
+    UpdateLatinL();
+    UpdateLatinM();
+    UpdateLatinI();
+    oldC = LatinC.selectedIndex;
+  }
+}
+function SelectLatinLetter()
+{
+  if(LatinL.selectedIndex != oldL ) {
+    UpdateLatinM();
+    UpdateLatinI();
+    oldL = LatinL.selectedIndex;
+  }
+}
+function SelectLatinModifier()
+{
+  if(LatinM.selectedIndex != oldM ) {
+    UpdateLatinI();
+    oldM = LatinM.selectedIndex;
+  }
+}
+
+var upper=[ 
+[ // A 
+  0x00c0, 0x00c1, 0x00c2, 0x00c3, 0x00c4, 0x00c5, 
+  0x0100, 0x0102, 0x0104, 0x01cd, 0x01de, 0x01de, 0x01e0, 0x01fa, 
+  0x0200, 0x0202, 0x0226, 
+  0x1e00, 0x1ea0, 0x1ea2, 0x1ea4, 0x1ea6, 0x1ea8, 0x1eaa, 0x1eac, 
+  0x1eae, 0x1eb0, 0x1eb2, 0x1eb4, 0x1eb6
+], [ // B
+  0x0181, 0x0182, 0x0184,
+  0x1e02, 0x1e04, 0x1e06
+], [ // C
+  0x00c7, 0x0106, 0x0108, 0x010a, 0x010c, 
+  0x0187, 
+  0x1e08
+], [ // D
+  0x010e, 0x0110,
+  0x0189,
+  0x018a,
+  0x1e0a, 0x1e0c, 0x1e0e, 0x1e10, 0x1e12
+], [ // E
+  0x00C8, 0x00C9, 0x00CA, 0x00CB, 
+  0x0112, 0x0114, 0x0116, 0x0118, 0x011A,
+  0x0204, 0x0206, 0x0228,
+  0x1e14, 0x1e16, 0x1e18, 0x1e1a, 0x1e1c,
+  0x1eb8, 0x1eba, 0x1ebc, 0x1ebe, 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec6
+], [ // F
+  0x1e1e
+], [ // G
+  0x011c, 0x011E, 0x0120, 0x0122,
+  0x01e4, 0x01e6, 0x01f4,
+  0x1e20
+], [ // H
+  0x0124, 0x0126,
+  0x021e,
+  0x1e22, 0x1e24, 0x1e26, 0x1e28, 0x1e2a
+], [ // I
+  0x00CC, 0x00CD, 0x00CE, 0x00CF,
+  0x0128, 0x012a, 0x012C, 0x012e, 0x0130,
+  0x0208, 0x020a, 
+  0x1e2c, 0x1e2e,
+  0x1ec8, 0x1eca
+], [ // J
+  0x0134,
+  0x01f0
+], [ // K
+  0x0136,
+  0x0198, 0x01e8,
+  0x1e30, 0x1e32, 0x1e34
+], [ // L
+  0x0139, 0x013B, 0x013D, 0x013F, 0x0141,
+  0x1e36, 0x1e38, 0x1e3a, 0x1e3c
+], [ // M
+  0x1e3e, 0x1e40, 0x1e42
+], [ // N
+  0x00D1,
+  0x0143, 0x0145, 0x0147, 0x014A,
+  0x01F8,
+  0x1e44, 0x1e46, 0x1e48, 0x1e4a
+], [ // O
+  0x00D2, 0x00D3, 0x00D4, 0x00D5, 0x00D6,
+  0x014C, 0x014E, 0x0150,
+  0x01ea, 0x01ec, 
+  0x020c, 0x020e, 0x022A, 0x022C, 0x022E, 0x0230,
+  0x1e4c, 0x1e4e, 0x1e50, 0x1e52, 
+  0x1ecc, 0x1ece, 0x1ed0, 0x1ed2, 0x1ed4, 0x1ed6, 0x1ed8, 0x1eda, 0x1edc, 0x1ede,
+  0x1ee0, 0x1ee2
+], [ // P
+  0x1e54, 0x1e56
+], [ // Q
+  0x0051
+], [ // R
+  0x0154, 0x0156, 0x0158,
+  0x0210, 0x0212,
+  0x1e58, 0x1e5a, 0x1e5c, 0x1e5e
+], [ // S
+  0x015A, 0x015C, 0x015E, 0x0160,
+  0x0218,
+  0x1e60, 0x1e62, 0x1e64, 0x1e66, 0x1e68
+], [ // T
+  0x0162, 0x0164, 0x0166,
+  0x021A,
+  0x1e6a, 0x1e6c, 0x1e6e, 0x1e70
+], [ // U
+  0x00D9, 0x00DA, 0x00DB, 0x00DC,
+  0x0168, 0x016A, 0x016C, 0x016E, 0x0170, 0x0172,
+  0x0214, 0x0216, 
+  0x1e72, 0x1e74, 0x1e76, 0x1e78, 0x1e7a,
+  0x1ee4, 0x1ee6, 0x1ee8, 0x1eea, 0x1eec, 0x1eee, 0x1ef0
+], [ // V
+  0x1e7c, 0x1e7e
+], [ // W
+  0x0174,
+  0x1e80, 0x1e82, 0x1e84, 0x1e86, 0x1e88
+], [ // X
+  0x1e8a, 0x1e8c
+], [ // Y
+  0x00DD,
+  0x0176, 0x0178,
+  0x0232,
+  0x1e8e, 
+  0x1ef2, 0x1ef4, 0x1ef6, 0x1ef8
+], [ // Z
+  0x0179, 0x017B, 0x017D,
+  0x0224,
+  0x1e90, 0x1e92, 0x1e94
+] ];
+var lower=[ 
+[ // a 
+  0x00e0, 0x00e1, 0x00e2, 0x00e3, 0x00e4, 0x00e5,
+  0x0101, 0x0103, 0x0105,
+  0x01ce, 0x01df, 0x01e1, 0x01fb,
+  0x0201, 0x0203, 0x0227,
+  0x1e01, 0x1e9a, 
+  0x1ea1, 0x1ea3, 0x1ea5, 0x1ea7, 0x1ea9, 0x1eab, 0x1ead, 0x1eaf, 
+  0x1eb1, 0x1eb3, 0x1eb5, 0x1eb7
+], [ // b
+  0x0180, 0x0183, 0x0185,
+  0x1e03, 0x1e05, 0x1e07
+], [ // c
+  0x00e7, 
+  0x0107, 0x0109, 0x010b, 0x010d,
+  0x0188,
+  0x1e09
+], [ // d
+  0x010f, 0x0111,
+  0x1e0b, 0x1e0d, 0x1e0f, 0x1e11, 0x1e13
+], [ // e
+  0x00e8, 0x00e9, 0x00ea, 0x00eb,
+  0x0113, 0x0115, 0x0117, 0x0119, 0x011b, 
+  0x0205, 0x0207, 0x0229,
+  0x1e15, 0x1e17, 0x1e19, 0x1e1b, 0x1e1d,
+  0x1eb9, 0x1ebb, 0x1ebd, 0x1ebf, 
+  0x1ec1, 0x1ec3, 0x1ec5, 0x1ec7
+], [ // f
+  0x1e1f
+], [ // g
+  0x011d, 0x011f, 0x0121, 0x0123,
+  0x01e5, 0x01e7, 0x01f5,
+  0x1e21
+], [ // h
+  0x0125, 0x0127,
+  0x021f,
+  0x1e23, 0x1e25, 0x1e27, 0x1e29, 0x1e2b, 0x1e96
+], [ // i
+  0x00ec, 0x00ed, 0x00ee, 0x00ef,
+  0x0129, 0x012b, 0x012d, 0x012f, 0x0131,
+  0x01d0,
+  0x0209, 0x020b,
+  0x1e2d, 0x1e2f,
+  0x1ec9, 0x1ecb
+], [ // j
+  0x0135,
+], [ // k
+  0x0137, 0x0138, 
+  0x01e9,
+  0x1e31, 0x1e33, 0x1e35
+], [ // l
+  0x013a, 0x013c, 0x013e, 0x0140, 0x0142,
+  0x1e37, 0x1e39, 0x1e3b, 0x1e3d
+], [ // m
+  0x1e3f, 0x1e41, 0x1e43
+], [ // n
+  0x00f1,
+  0x0144, 0x0146, 0x0148, 0x0149, 0x014b,
+  0x01f9,
+  0x1e45, 0x1e47, 0x1e49, 0x1e4b
+], [ // o
+  0x00f2, 0x00f3, 0x00f4, 0x00f5, 0x00f6,
+  0x014d, 0x014f, 0x0151,
+  0x01d2, 0x01eb, 0x01ed,
+  0x020d, 0x020e, 0x022b, 0x22d, 0x022f, 0x0231,
+  0x1e4d, 0x1e4f, 0x1e51, 0x1e53,
+  0x1ecd, 0x1ecf, 
+  0x1ed1, 0x1ed3, 0x1ed5, 0x1ed7, 0x1ed9, 0x1edb, 0x1edd, 0x1edf, 
+  0x1ee1, 0x1ee3
+], [ // p
+  0x1e55, 0x1e57
+], [ // q
+  0x0071
+], [ // r
+  0x0155, 0x0157, 0x0159,
+  0x0211, 0x0213, 
+  0x1e59, 0x1e5b, 0x1e5d, 0x1e5f
+], [ // s
+  0x015b, 0x015d, 0x015f, 0x0161, 
+  0x0219,
+  0x1e61, 0x1e63, 0x1e65, 0x1e67, 0x1e69
+], [ // t
+  0x0162, 0x0163, 0x0165, 0x0167,
+  0x021b,
+  0x1e6b, 0x1e6d, 0x1e6f, 0x1e71, 
+  0x1e97
+], [ // u
+  0x00f9, 0x00fa, 0x00fb, 0x00fc, 
+  0x0169, 0x016b, 0x016d, 0x016f, 0x0171, 0x0173,
+  0x01d4, 0x01d6, 0x01d8, 0x01da, 0x01dc,
+  0x0215, 0x0217,
+  0x1e73, 0x1e75, 0x1e77, 0x1e79, 0x1e7b,
+  0x1ee5, 0x1ee7, 0x1ee9, 0x1eeb, 0x1eed, 0x1eef, 
+  0x1ef1
+], [ // v
+  0x1e7d, 0x1e7f
+], [ // w
+  0x0175,
+  0x1e81, 0x1e83, 0x1e85, 0x1e87, 0x1e89, 0x1e98,
+], [ // x
+  0x1e8b, 0x1e8d
+], [ // y
+  0x00fd, 0x00ff,
+  0x0177,
+  0x0233,
+  0x1e8f, 0x1e99, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef9
+], [ // z
+  0x017a, 0x017c, 0x017e,
+  0x0225,
+  0x1e91, 0x1e93, 0x1e95
+] ];
+
+
+symbol = [ 
+        0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6, 0x00a7, 
+0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac,         0x00ae, 0x00af,
+0x00b0, 0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 
+0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf,
+0x00d7, 0x00f7
+];
+
+otherupper = [
+0x00c6, 0x00d0, 0x00d8, 0x00de,
+0x0132,
+0x0152,
+0x0186,
+0x01c4, 0x01c5,
+0x01c7, 0x01c8,
+0x01ca, 0x01cb,
+0x01F1, 0x01f2
+];
+otherlower = [
+0x00e6, 0x00f0, 0x00f8, 0x00fe, 0x00df,
+0x0133,
+0x0153,
+0x01c6,
+0x01c9,
+0x01cc,
+0x01f3
+];
+function UpdateLatinL()
+{
+  ClearMenulist(LatinL);
+  switch(LatinC.selectedIndex) {
+    case 0: // Uppercase Diacritical
+     for(var basic=0; basic < 26; basic++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(0x41 + basic));
+     if(oldL < 26)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = upper.length;
+     break;
+    case 1: // Lowercase Diacritical
+     for(var basic=0; basic < 26; basic++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(0x61 + basic));
+     if(oldL < 26)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = lower.length;
+     break;
+    case 2: // Uppercase w/o Diacritical
+     for(var i=0; i < otherupper.length; i++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(otherupper[i]));
+     if(oldL < otherupper.length)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = otherupper.length;
+     break;
+    case 3: // Lowercase w/o Diacritical
+     for(var i=0; i < otherlower.length; i++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(otherlower[i]));
+     if(oldL < otherlower.length)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = otherlower.length;
+     break;
+    case 4: // Symbol
+     for(var i=0; i < symbol.length; i++)
+       AppendStringToMenulist(LatinL , String.fromCharCode(symbol[i]));
+     if(oldL < symbol.length)
+        LatinL.selectedIndex = oldL; 
+     else 
+        LatinL.selectedIndex = symbol.length;
+     break;
+    default :
+
+     break;
+  }
+}
+function UpdateLatinM()
+{
+  ClearMenulist(LatinM);
+  switch(LatinC.selectedIndex) {
+    case 0: // Uppercase Diacritical
+     LatinM.disabled=false;
+     for(var basic=0; basic < upper[LatinL.selectedIndex].length; basic++)
+       AppendStringToMenulist(LatinM , 
+             String.fromCharCode(upper[LatinL.selectedIndex][basic]));
+     if(oldM < upper[LatinL.selectedIndex].length)
+        LatinM.selectedIndex = oldM; 
+     else 
+        LatinM.selectedIndex = upper[LatinL.selectedIndex].length;
+     break;
+    case 1: // Lowercase Diacritical
+     LatinM.disabled=false;
+     for(var basic=0; basic < lower[LatinL.selectedIndex].length; basic++)
+       AppendStringToMenulist(LatinM , 
+             String.fromCharCode(lower[LatinL.selectedIndex][basic]));
+     if(oldM < lower[LatinL.selectedIndex].length)
+        LatinM.selectedIndex = oldM; 
+     else 
+        LatinM.selectedIndex = lower[LatinL.selectedIndex].length;
+     break;
+    default:
+     LatinM.disabled=true;
+     break;
+  }
+}
+function UpdateLatinI()
+{
+  switch(LatinC.selectedIndex) {
+    case 0: // Uppercase Diacritical
+       LatinChar = String.fromCharCode(upper[LatinL.selectedIndex][LatinM.selectedIndex]);
+     break;
+    case 1: // Lowercase Diacritical
+       LatinChar = String.fromCharCode(lower[LatinL.selectedIndex][LatinM.selectedIndex]);
+     break;
+    case 2: 
+       LatinChar = String.fromCharCode(otherupper[LatinL.selectedIndex]);
+     break;
+    case 3: 
+       LatinChar = String.fromCharCode(otherlower[LatinL.selectedIndex]);
+     break;
+    case 4: 
+       LatinChar = String.fromCharCode(symbol[LatinL.selectedIndex]);
+     break;
+    default:
+     break;
+  }
+  AddLatin.value = LatinChar;
+}
+function InsertLatin()
+{
+  editorShell.InsertSource(LatinChar);
+}
+//------------------------------------------------------------------
+// dialog initialization code
+function Startup()
+{
+  if (!InitEditorShell())
+    return;
+  StartupHangul();
+  StartupLatin();
+  doSetOKCancel(onOK, null);
+}
+function onOK()
+{
+  return true;
+}
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
new file mode 100644
index 00000000000..1e09c2541b0
--- /dev/null
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
+<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
+
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
+<?xul-overlay href="chrome://editor/content/EdDialogOverlay.xul"?> 
+
+<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorInsertChars.dtd">
+<window class="dialog" title="&windowTitle.label;"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns:html="http://www.w3.org/TR/REC-html40"
+    onload = "Startup()"
+    orient="vertical">
+
+  <!-- Methods common to all editor dialogs -->
+  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script language="JavaScript" src="chrome://editor/content/EdInsertChars.js"/>
+  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+
+  <keyset id="keyset"/>
+  <broadcaster id="args" value=""/>
+  <box orient="vertical" style="min-width: 20em">
+    <titledbox orient="vertical">
+      <title>
+        <text class="label" id="insertLatinCaption" align="left" value="&insertLatin.label;"/>
+      </title>
+      <menulist flex="1" id="LatinC" oncommand="SelectLatinCategory()">
+        <menupopup>
+          <menuitem value="&accentUpper.label;"/>
+          <menuitem value="&accentLower.label;"/>
+          <menuitem value="&otherUpper.label;"/>
+          <menuitem value="&otherLower.label;"/>
+          <menuitem value="&commonSymbols.label;"/>
+        </menupopup>
+      </menulist>
+      <menulist flex="1" id="LatinL" oncommand="SelectLatinLetter()"/>
+      <menulist flex="1" id="LatinM" oncommand="SelectLatinModifier()"/>
+      <text class="label" align="center" value="&insert.label;"/>
+      <button id="AddLatin" value="&#xac00;" oncommand="InsertLatin()"/>
+    </titledbox>
+
+    <titledbox orient="vertical">
+      <title>
+       <text class="label" id="insertHangulCaption" align="left" value="&insertHangul.label;"/>
+      </title>
+      <menulist flex="1" id="HangulL" oncommand="SelectHangul()"/>
+      <menulist flex="1" id="HangulV" oncommand="SelectHangul()"/>
+      <menulist flex="1" id="HangulT" oncommand="SelectHangul()"/>
+      <text class="label" align="center" value="&insert.label; "/>
+      <button id="AddHangul" value="&#xac00;" oncommand="InsertHangul()"/>
+    </titledbox>
+  </box>
+  <!-- This needs to wrap, so use html instead of text 0-->
+  <html>&nonModalMsg.label;</html>
+  <separator class="groove"/>
+  <!-- from global dialogOverlay -->
+	<box id="okCancelButtons"/> 
+
+</window>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.js b/mozilla/editor/ui/dialogs/content/EdInsertTable.js
index 58239d9244b..7dab90d8273 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.js
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.js
@@ -46,19 +46,14 @@ function Startup()
     dump("Failed to create a new table!\n");
     window.close();
   }
-  dump("Rows editbox:"+document.getElementById("rows")+"\n");
-  dump("Columns editbox:"+document.getElementById("columns")+"\n");
-  dump("width editbox:"+document.getElementById("width")+"\n");
-  dump("pixelOrPercentMenulist:"+document.getElementById("pixelOrPercentMenulist")+"\n");
-  dump("borderInput editbox:"+document.getElementById("borderInput")+"\n");
-
   // Create dialog object to store controls for easy access
   dialog = new Object;
-  dialog.rowsInput = document.getElementById("rows");
-  dialog.columnsInput = document.getElementById("columns");
-  dialog.widthInput = document.getElementById("width");
+  dialog.rowsInput = document.getElementById("rowsInput");
+  dialog.columnsInput = document.getElementById("columnsInput");
+  dialog.widthInput = document.getElementById("widthInput");
   dialog.borderInput = document.getElementById("borderInput");
-  dialog.pixelOrPercentMenulist = document.getElementById("pixelOrPercentMenulist");
+  dialog.widthPixelOrPercentMenulist = document.getElementById("widthPixelOrPercentMenulist");
+  dialog.heightPixelOrPercentMenulist = document.getElementById("heightPixelOrPercentMenulist");
 
   // Make a copy to use for AdvancedEdit
   globalElement = tableElement.cloneNode(false);
@@ -88,7 +83,8 @@ function InitDialog()
   // Get default attributes set on the created table:
   // Get the width attribute of the element, stripping out "%"
   // This sets contents of select combobox list
-  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "width","pixelOrPercentMenulist");
+  dialog.widthInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "widthInput","widthPixelOrPercentMenulist");
+  dialog.heightInput.value = InitPixelOrPercentMenulist(globalElement, tableElement, "heightInput","heightPixelOrPercentMenulist");
   dialog.borderInput.value = globalElement.getAttribute("border");
 }
 
@@ -118,10 +114,10 @@ function ValidateData()
       globalElement.setAttribute("border", borderText);
   }
 
-  var isPercent = (dialog.pixelOrPercentMenulist.selectedIndex == 1);
+  var maxLimit;
+  var isPercent = (dialog.widthPixelOrPercentMenulist.selectedIndex == 1);
   widthText = TrimString(dialog.widthInput.value);
-  if (widthText) {
-    var maxLimit;
+  if (widthText.length > 0) {
     if (isPercent) {
       maxLimit = 100;
     } else {
@@ -130,11 +126,30 @@ function ValidateData()
     }
 
     widthText = ValidateNumberString(dialog.widthInput.value, 1, maxLimit);
-    if (widthText) {
-      if (isPercent)
-        widthText += "%";
-      globalElement.setAttribute("width", widthText);
+    if (widthText.length == 0) return false;
+
+    if (isPercent)
+      widthText += "%";
+    globalElement.setAttribute("width", widthText);
+  }
+
+  isPercent = (dialog.heightPixelOrPercentMenulist.selectedIndex == 1);
+  heightText = TrimString(dialog.widthInput.value);
+  if (heightText.length > 0) {
+    if (isPercent) {
+      maxLimit = 100;
+    } else {
+      // Upper limit when using pixels
+      maxLimit = maxPixels;
     }
+
+    heightText = ValidateNumberString(dialog.heightInput.value, 1, maxLimit);
+    if (heightText.length == 0) return false;
+
+    if (isPercent)
+      heightText += "%";
+
+    globalElement.setAttribute("height", heightText);
   }
   return true;
 }
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index 17e5734e521..0a9a8c9fe9c 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -47,35 +47,32 @@
   <grid>
     <columns><column/><column/><column/></columns>
     <rows>
-      <row vertical-align="baseline"  autostretch="never">
-        <text class="dialog align-right" value="&numRowsEditField.label;"/>
-        <textfield class="narrow" id="rows" onkeyup="forceInteger(this.id)" />
+      <row vertical-align="baseline" text-align="right" autostretch="never">
+        <text class="label align-right" text-align="right" value="&numRowsEditField.label;"/>
+        <textfield class="narrow" id="rowsInput" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
-      <spring class="spacer"/>
-      <row vertical-align="baseline"  autostretch="never">
-        <text class="dialog align-right" value="&numColumnsEditField.label;"/>
-        <textfield class="narrow" id="columns" onkeyup="forceInteger(this.id)" />
+      <row vertical-align="baseline" text-align="right" autostretch="never">
+        <text class="label align-right" value="&numColumnsEditField.label;"/>
+        <textfield class="narrow" id="columnsInput" onkeyup="forceInteger(this.id)" />
         <spring/>
       </row>
-      <spring class="spacer"/>
-      <row vertical-align="baseline"  autostretch="never">
-        <text class="dialog align-right" value="&widthEditField.label;"/>
-        <textfield class="narrow" id="width" onkeyup="forceInteger(this.id)" />
-        <spring/>
-      </row>
-      <spring class="spacer"/>
-      <row vertical-align="baseline"  autostretch="never">
-        <text class="dialog align-right" value="&widthEditField.label;"/>
-        <textfield class="narrow" id="width" onkeyup="forceInteger(this.id)" />
-        <menulist id="pixelOrPercentMenulist"><menupopup/></menulist>
+      <row vertical-align="baseline" text-align="right" autostretch="never">
+        <text class="label align-right" value="&widthEditField.label;"/>
+        <textfield class="narrow" id="widthInput" onkeyup="forceInteger(this.id)" />
+        <menulist id="widthPixelOrPercentMenulist"><menupopup/></menulist>
+          <!-- child elements are appended by JS -->
+      </row>
+      <row vertical-align="baseline" text-align="right" autostretch="never">
+        <text class="label align-right" value="&heightEditField.label;"/>
+        <textfield class="narrow" id="heightInput" onkeyup="forceInteger(this.id)" />
+        <menulist id="heightPixelOrPercentMenulist"><menupopup/></menulist>
           <!-- child elements are appended by JS -->
       </row>
-      <spring class="spacer"/>
       <row vertical-align="baseline" autostretch="never">
-        <text class="dialog align-right" value="&borderEditField.label;"/>
+        <text class="label align-right" text-align="right" value="&borderEditField.label;"/>
         <textfield class="narrow" id="borderInput" onkeyup="forceInteger(this.id)" />
-        <text value="&pixelsPopup.value;"/>  
+        <text value="&pixels.label;"/>  
       </row>
     </rows>
   </grid>
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.js b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
index 50b9ca2f136..a90742aba41 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.js
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.js
@@ -245,12 +245,12 @@ function FillListboxes()
   if (NamedAnchorCount > 0)
   {
     for (var i = 0; i < NamedAnchorCount; i++)
-    {
-      var item = AppendStringToTreelist(dialog.NamedAnchorList, NamedAnchorNodeList.item(i).name);
+      AppendStringToTreelist(dialog.NamedAnchorList, NamedAnchorNodeList.item(i).name);
 
-    }
     haveNamedAnchors = true;
-  } else {
+  } 
+  else 
+  {
     // Message to tell user there are none
     var item = AppendStringToTreelistById(dialog.NamedAnchorList, "NoNamedAnchors");
     if (item) item.setAttribute("disabled", "true");
@@ -318,15 +318,16 @@ function GetExistingHeadingIndex(text)
 
 function SelectNamedAnchor()
 {
-dump("SelectNamedAnchor\n");
+dump("SelectNamedAnchor. haveNamedAnchors="+haveNamedAnchors+"|\n");
   if (haveNamedAnchors)
-    dialog.hrefInput.value = "#"+dialog.NamedAnchorList.value;
+    dialog.hrefInput.value = "#"+GetSelectedTreelistValue(dialog.NamedAnchorList);
 }
 
 function SelectHeading()
 {
+dump("SelectHeading. haveHeadings="+haveHeadings+"|\n");
   if (haveHeadings)
-    dialog.hrefInput.value = "#"+dialog.HeadingsList.value;
+    dialog.hrefInput.value = "#"+GetSelectedTreelistValue(dialog.HeadingsList);
 }
 
 // Get and validate data from widgets.
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index cc1a4907541..07711ca97a3 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -35,7 +35,7 @@
 	 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	 xmlns:html="http://www.w3.org/TR/REC-html40"
    onload = "Startup()"
-   align="vertical" >
+   orient="vertical" >
 
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
   <script language="JavaScript" src="chrome://editor/content/EdLinkProps.js"/>
@@ -44,14 +44,14 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
 
-  <box align="vertical" style="min-width: 20em">
+  <box orient="vertical" style="min-width: 20em">
     <titledbox orient="vertical"><title><text id="linkTextCaption" align="left" value="&LinkTitle.label;"/></title>
-      <text class="dialog" id="linkTextMessage"/> 
+      <text class="label" id="linkTextMessage"/> 
 	    <textfield id="linkTextInput" flex="1"/>
     </titledbox>
 
-    <titledbox orient="vertical"><title><text class="dialog" value="&LinkURLBox.label;"/></title>
-      <text class="dialog" value="&LinkURLEditField.label;"/>
+    <titledbox orient="vertical"><title><text class="label" value="&LinkURLBox.label;"/></title>
+      <text class="label" value="&LinkURLEditField.label;"/>
       <box autostretch="never"  valign="middle">
         <textfield id="hrefInput" flex="1"/>
         <spring class="spacer"/>
@@ -65,14 +65,14 @@
         <spring flex="1"/>
         <button class="dialog" id="RemoveLink" oncommand="RemoveLink()" value="&RemoveLinkButton.label;" style="width: 7em"/>
       </box>
-      <box id="MoreSection" align="vertical">
+      <box id="MoreSection" orient="vertical">
         <spring class="bigspacer"/>
-        <text class="dialog" align="left" value="&NamedAnchorMsg.label;"/>
-        <tree class="list" id="NamedAnchorList" oncommand="SelectNamedAnchor()"/>
+        <text class="label" align="left" value="&NamedAnchorMsg.label;"/>
+        <tree rows="4" class="list" id="NamedAnchorList" onselect="SelectNamedAnchor()" onclick="SelectNamedAnchor()"/>
         <spring class="spacer"/>
-        <text class="dialog" align="left" value="&HeadingMsg.label;"/>
-        <tree class="list" id="HeadingsList" oncommand="SelectHeading()"/>
-        <text class="dialog" flex="1" value="&HeadingMsg2.label;"/>
+        <text class="label" align="left" value="&HeadingMsg.label;"/>
+        <tree rows="4" class="list" id="HeadingsList" onselect="SelectHeading()" onclick="SelectHeading()"/>
+        <text class="label" flex="1" value="&HeadingMsg2.label;"/>
       </box>
     </titledbox>
   </box>
diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.xul b/mozilla/editor/ui/dialogs/content/EdListProps.xul
index b0def183667..e91fde23c79 100644
--- a/mozilla/editor/ui/dialogs/content/EdListProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdListProps.xul
@@ -42,7 +42,7 @@
   <keyset id="keyset"/>
   <broadcaster id="args" value=""/>
 
-  <text class="dialog" value="&ListType.label;"/>
+  <text class="label" value="&ListType.label;"/>
   <menulist flex="1" id="ListType" oncommand="SelectListType()">
     <menupopup>
       <menuitem value="&none.value;"/>
@@ -56,11 +56,11 @@
   <!-- message text and list items are set in JS 
        text value should be identical to string with id=BulletStyle in editor.properties 
   -->
-  <text class="dialog" id="BulletStyleLabel" value="&bulletStyle.label;"/>
+  <text class="label" id="BulletStyleLabel" value="&bulletStyle.label;"/>
   <menulist flex="1" class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()"/>
   <spring class="spacer"/>
   <box>
-    <text class="dialog" id="StartingNumberLabel" value="&startingNumber.label;"/>
+    <text class="label" id="StartingNumberLabel" value="&startingNumber.label;"/>
     <spring class="spacer"/>
     <textfield class="narrow" id="StartingNumber" onkeyup="forceInteger('StartingNumber')"/>
     <spring/>
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 824b6871305..27687d1a19d 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -34,7 +34,7 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/TR/REC-html40"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -43,9 +43,9 @@
 
   <keyset id="keyset"/>
 
-  <text class="dialog" align="left" for="nameInput" value="&anchorNameEditField.label;"/>
+  <text class="label" align="left" for="nameInput" value="&anchorNameEditField.label;"/>
   <textfield class="MinWidth20em" id="nameInput"/>
-  <text class="dialog" align="left" value="&noSpacesMsg.label;"/>
+  <text class="label" align="left" value="&noSpacesMsg.label;"/>
   <spring class="spacer"/>
   <!-- from EdDialogOverlay -->
   <box id="AdvancedEdit"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.xul b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
index fa5147101ab..82c44c5d7f4 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
@@ -34,7 +34,7 @@
     xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -44,35 +44,35 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
   <box>
-    <text value="&location.label;" flex ="1" align="left"/>
+    <text class="label" value="&location.label;" flex ="1" align="left"/>
     <spring class="spacer"/>
     <spring flex="1"/>
-    <text class="MinWidth20em" value="&locationNewPage.label;" id="PageLocation" align="left"/>
+    <text class="label" value="&locationNewPage.label;" id="PageLocation" align="left"/>
   </box>  
   <spring class="spacer"/>
   <box>
-    <text value="&lastModified.label;" flex ="1" align="left"/>
+    <text class="label" value="&lastModified.label;" flex ="1" align="left"/>
     <spring class="spacer"/>
     <spring flex="1"/>
-    <text class="MinWidth20em" value="[fill this in!]" id="PageModDate" align="left"/>
+    <text class="label" value="[fill this in!]" id="PageModDate" align="left"/>
   </box>  
   <spring class="spacer"/>
   <box>
-    <text value="&titleInput.label;" flex ="1" align="left"/>
+    <text class="label" value="&titleInput.label;" flex ="1" align="left"/>
     <spring class="spacer"/>
     <spring flex="1"/>
-    <html:input class="MinWidth20em" type="text" id="TitleInput"/>
+    <textfield id="TitleInput"/>
   </box>  
   <spring class="spacer"/>
   <box>
-    <text value="&authorInput.label;" flex ="1" align="left"/>
+    <text class="label" value="&authorInput.label;" flex ="1" align="left"/>
     <spring class="spacer"/>
     <spring flex="1"/>
-    <html:input class="MinWidth20em" type="text" id="AuthorInput"/>
+    <textfield id="AuthorInput"/>
   </box>  
   <spring class="spacer"/>
   <box>
-    <text value="&descriptionInput.label;" flex ="1" align="left"/>
+    <text class="label" value="&descriptionInput.label;" flex ="1" align="left"/>
     <spring flex="1"/>
     <html:input class="MinWidth20em" type="text" id="DescriptionInput"/>
   </box>  
@@ -86,7 +86,7 @@
       persist = "more"/>
     <spring flex="1"/>
   </box>
-  <box id="MoreSection" align="vertical" flex="1">
+  <box id="MoreSection" orient="vertical" flex="1">
     <spring class="bigspacer"/>
     <html:div> [Meta Tags editing widgets will go here] </html:div>
     <spring class="bigspacer"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
index ced2b12a9ae..14d6eb1530b 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
@@ -163,26 +163,27 @@ function CheckWord()
 
 function SelectSuggestedWord()
 {
-  dump("SpellCheck: SelectSuggestedWord\n");
   if (allowSelectWord)
-    dialog.ReplaceWordInput.value = dialog.SuggestedList.options[dialog.SuggestedList.selectedIndex].value;
+  {
+    var selValue = GetSelectedTreelistValue(dialog.SuggestedList);
+dump(selValue+"=Selected word in suggested list\n");
+    dialog.ReplaceWordInput.value = selValue;
+  }
 }
 
 function ChangeReplaceWord()
 {
   // Unselect the word in the suggested list when user edits the replacement word
-  dialog.SuggestedList.selectedIndex = -1;
+  dialog.SuggestedList.clearItemSelection();
 }
 
 function Ignore()
 {
-  dump("SpellCheck: Ignore\n");
   NextWord();
 }
 
 function IgnoreAll()
 {
-  dump("SpellCheck: IgnoreAll\n");
   if (MisspelledWord != "") {
     spellChecker.IgnoreWordAllOccurrences(MisspelledWord);
   }
@@ -191,7 +192,6 @@ function IgnoreAll()
 
 function Replace()
 {
-  dump("SpellCheck: Replace\n");
   newWord = dialog.ReplaceWordInput.value;
   //dump("New = "+newWord+" Misspelled = "+MisspelledWord+"\n");
   if (MisspelledWord != "" && MisspelledWord != newWord) {
@@ -251,19 +251,24 @@ function FillSuggestedList()
   // Clear the current contents of the list
   ClearTreelist(list);
 
-dump(MisspelledWord+"=misspelledword\n");
   if (MisspelledWord.length > 0)
   {
     // Get suggested words until an empty string is returned
+    var count = 0;
     do {
       word = spellChecker.GetSuggestedWord();
       dump("Suggested Word="+word+"|\n");
       if (word.length > 0) {
         AppendStringToTreelist(list, word);
+        count++;
       }
     } while (word.length > 0);
+    
+    var len = list.getAttribute("length");
 
-    if (list.getAttribute("length") == 0) {
+dump(len+"=number of words in list\n");
+
+    if (count == 0) {
       // No suggestions - show a message but don't let user select it
       var item = AppendStringToTreelistById(list, "NoSuggestedWords");
       if (item) item.setAttribute("disabled", "true");
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index 8121ac73858..9a494e8239b 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -31,33 +31,33 @@
     xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
-    align="vertical">
+    orient="vertical">
 
   <html:script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
   <html:script language="JavaScript" src="chrome://editor/content/EdSpellCheck.js"/>
   <!-- The argument to ShowWindowWithArgs (the editor appCore name) is placed here -->
   <broadcaster id="args" value=""/>
 
-<box align="vertical">
+<box orient="vertical">
   <box align="horizontal">
     <!-- value is set in JS -->
-    <text class="dialog" id="MisspelledWordLabel"/>
+    <text class="label" id="MisspelledWordLabel"/>
     <spring class="bigspacer"/>
-    <text class="dialog bold" id="MisspelledWord"/>
+    <text class="label bold" id="MisspelledWord"/>
   </box>
-  <text class="dialog" id="ReplaceWordLabel" value="&wordEditField.label;"/>
+  <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
   <box align="horizontal">
     <textfield class="MinWidth20em" id="ReplaceWord" onkeyup="ChangeReplaceWord()"/>
     <spring class="spacer"/>
     <box flex="1">
-      <button class="dialog MinWidth10em" flex="1" id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
+      <button class="label MinWidth5em" flex="1" id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
       <spring class="MinWidth20em" flex="1"/>
     </box>
   </box>
   <spring class="spacer"/>
-  <text class="dialog" id="SuggestedListLabel" value="&suggestions.label;"/>
+  <text class="label" id="SuggestedListLabel" value="&suggestions.label;"/>
   <box align="horizontal">
-    <tree class="list MinWidth20em" id="SuggestedList" oncommand="SelectSuggestedWord()"/>
+    <tree rows="8" class="list MinWidth20em" id="SuggestedList" onselect="SelectSuggestedWord()" onclick="SelectSuggestedWord()"/>
     <spring class="spacer"/>
     <grid flex="1">
       <columns><column flex="1"/><column flex="1"/></columns>
@@ -71,7 +71,7 @@
           <button class="dialog" flex="1" id="ReplaceAll" oncommand="ReplaceAll()" value="&changeAllButton.label;"/>
         </row>
         <row>
-          <text class="dialog" flex="1" value="&userDictionary.label;"/>
+          <text class="label" flex="1" value="&userDictionary.label;"/>
           <spring/>
         </row>
         <row>
@@ -81,7 +81,7 @@
       </rows> 
     </grid>
   </box>
-  <text class="dialog" value ="&languagePopup.label;"/>
+  <text class="label" value ="&languagePopup.label;"/>
   <box>
     <menulist class="MinWidth20em" id="LanguageMenulist" oncommand="SelectLanguage()">
       <menupopup>
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index 2dffc675d8b..18f85bf16e6 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -35,7 +35,7 @@
     xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="Startup()"
-    align="vertical">
+    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
   <html:script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
@@ -45,7 +45,7 @@
   <broadcaster id="args" value=""/>
   <keyset id="keyset"/>
 
-  <tabcontrol align="vertical">
+  <tabcontrol orient="vertical">
 	  <tabbox align="horizontal" flex="100%">
 		  <tab id="TableTab" selected="true" oncommand="SelectTableTab()" value="&tableTab.label;"/>
 		  <tab id="CellTab" oncommand="SelectCellTab()" value="&cellTab.label;"/>
@@ -84,7 +84,7 @@
           <spring flex="1"/>
         </titledbox>
         <box>
-          <titledbox align="vertical"><title><text align="left" value="&tableBorderSpacing.label;"/></title>
+          <titledbox orient="vertical"><title><text align="left" value="&tableBorderSpacing.label;"/></title>
             <box valign="middle" autostretch="never">
               <text align="left" for="BorderWidthInput" value="&tableBorderWidth.label;"/>
               <spring class="spacer"/>
@@ -130,7 +130,7 @@
           </box>
           <spring class="bigspacer"/>
         </box>
-        <titledbox align="vertical"><title><text align="left" value="&background.label;"/></title>
+        <titledbox orient="vertical"><title><text align="left" value="&background.label;"/></title>
           <box valign="middle" autostretch="never">
             <text class="MinWidth50" align="left" value="&color.label;"/>
             <menu class="colorpicker">
diff --git a/mozilla/editor/ui/dialogs/content/MANIFEST b/mozilla/editor/ui/dialogs/content/MANIFEST
index 4ee211052fe..65b103a64ce 100644
--- a/mozilla/editor/ui/dialogs/content/MANIFEST
+++ b/mozilla/editor/ui/dialogs/content/MANIFEST
@@ -22,6 +22,8 @@
 
 #dialogs:content directory
 
+EdInsertChars.js
+EdInsertChars.xul
 EdDialogCommon.js
 EdHLineProps.xul
 EdHLineProps.js
diff --git a/mozilla/editor/ui/dialogs/content/Makefile.in b/mozilla/editor/ui/dialogs/content/Makefile.in
index f87d79381bf..ab4dfbbf138 100644
--- a/mozilla/editor/ui/dialogs/content/Makefile.in
+++ b/mozilla/editor/ui/dialogs/content/Makefile.in
@@ -40,6 +40,8 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/EdImageProps.js \
 		$(srcdir)/EdInsSrc.xul \
 		$(srcdir)/EdInsSrc.js \
+    $(srcdir)/EdInsertChars.xul \
+    $(srcdir)/EdInsertChars.js \
 		$(srcdir)/EdHLineProps.xul \
 		$(srcdir)/EdHLineProps.js \
 		$(srcdir)/EdSpellCheck.xul \
diff --git a/mozilla/editor/ui/dialogs/content/makefile.win b/mozilla/editor/ui/dialogs/content/makefile.win
index 95fabbd6238..ce6da576933 100644
--- a/mozilla/editor/ui/dialogs/content/makefile.win
+++ b/mozilla/editor/ui/dialogs/content/makefile.win
@@ -43,6 +43,8 @@ install::
 	$(MAKE_INSTALL) EdTableProps.js        $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EdInsSrc.xul           $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EdInsSrc.js            $(DIST)\bin\chrome\editor\content
+  $(MAKE_INSTALL) EdInsertChars.xul      $(DIST)\bin\chrome\editor\content
+  $(MAKE_INSTALL) EdInsertChars.js       $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EdDialogOverlay.xul    $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EdAdvancedEdit.xul     $(DIST)\bin\chrome\editor\content
 	$(MAKE_INSTALL) EdAdvancedEdit.js      $(DIST)\bin\chrome\editor\content
@@ -83,6 +85,8 @@ clobber::
   rm -f $(DIST)\bin\chrome\editor\content\EdInsertTable.js
   rm -f $(DIST)\bin\chrome\editor\content\EdInsSrc.xul
   rm -f $(DIST)\bin\chrome\editor\content\EdInsSrc.js
+  rm -f $(DIST)\bin\chrome\editor\content\default\EdInsertChars.xul
+  rm -f $(DIST)\bin\chrome\editor\content\default\EdInsertChars.js
   rm -f $(DIST)\bin\chrome\editor\content\EdDialogOverlay.xul
   rm -f $(DIST)\bin\chrome\editor\content\EdAdvancedEdit.xul
   rm -f $(DIST)\bin\chrome\editor\content\EdAdvancedEdit.js
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertChars.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertChars.dtd
new file mode 100644
index 00000000000..02a42508110
--- /dev/null
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertChars.dtd
@@ -0,0 +1,34 @@
+<!--
+   - The contents of this file are subject to the Netscape Public
+   - License Version 1.1 (the "License"); you may not use this file
+   - except in compliance with the License. You may obtain a copy of
+   - the License at http://www.mozilla.org/NPL/
+   -  
+   - Software distributed under the License is distributed on an "AS
+   - IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+   - implied. See the License for the specific language governing
+   - rights and limitations under the License.
+   -  
+   - The Original Code is Mozilla Communicator client code, released
+   - March 31, 1998.
+   - 
+   - The Initial Developer of the Original Code is Netscape
+   - Communications Corporation. Portions created by Netscape are
+   - Copyright (C) 1998-1999 Netscape Communications Corporation. All
+   - Rights Reserved.
+   - 
+   - Contributor(s): 
+  -->
+
+
+<!-- Window title -->
+<!ENTITY windowTitle.label "Insert Characters">
+<!ENTITY insertHangul.label "Korean Hangul">
+<!ENTITY insertLatin.label "Latin">
+<!ENTITY insert.label "Insert">
+<!ENTITY accentUpper.label "Accent Uppercase">
+<!ENTITY accentLower.label "Accent Lowercase">
+<!ENTITY otherUpper.label "Other Uppercase">
+<!ENTITY otherLower.label "Other Lowercase">
+<!ENTITY commonSymbols.label "Common Symbols">
+<!ENTITY nonModalMsg.label "You may leave this dialog open and return to editing the page.">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
index ff8c37881f7..b5724365201 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
+++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorInsertTable.dtd
@@ -26,12 +26,10 @@
 <!ENTITY numRowsEditField.label "Number of rows:">
 <!ENTITY numColumnsEditField.label "Number of columns:">
 <!ENTITY widthEditField.label "Table width:">
+<!ENTITY heightEditField.label "Table height:">
 <!ENTITY borderEditField.label "Border:">
-
+<!ENTITY pixels.label "pixels">
 <!ENTITY alignmentBox.label "Alignment:">
 <!ENTITY leftPopup.value "Left">
 <!ENTITY centerPopup.value "Center">
 <!ENTITY rightPopup.value "Right">
-
-<!ENTITY pixelsPopup.value "pixels">
-<!ENTITY percentPopup.value "percent">
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/MANIFEST b/mozilla/editor/ui/dialogs/locale/en-US/MANIFEST
index 3d8a766f239..bbd32e7bc40 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/MANIFEST
+++ b/mozilla/editor/ui/dialogs/locale/en-US/MANIFEST
@@ -25,6 +25,7 @@
 EditorHLineProperties.dtd
 EditorImageProperties.dtd
 EditorInsertSource.dtd
+EditorInsertChars.dtd
 EditorInsertTable.dtd
 EditorLinkProperties.dtd
 EditorListProperties.dtd
@@ -38,3 +39,4 @@ EdDialogOverlay.dtd
 EdAdvancedEdit.dtd
 EditorImageMap.dtd
 EditorImageMapHotSpot.dtd
+EditorInsertChars.dtd
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in b/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in
index 7bd5aa3e54d..f0ebd1dfe7f 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in
+++ b/mozilla/editor/ui/dialogs/locale/en-US/Makefile.in
@@ -30,6 +30,7 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/EditorHLineProperties.dtd \
 		$(srcdir)/EditorImageProperties.dtd \
 		$(srcdir)/EditorInsertSource.dtd \
+		$(srcdir)/EditorInsertChars.dtd \
 		$(srcdir)/EditorInsertTable.dtd \
 		$(srcdir)/EditorLinkProperties.dtd \
 		$(srcdir)/EditorListProperties.dtd \
diff --git a/mozilla/editor/ui/dialogs/locale/en-US/makefile.win b/mozilla/editor/ui/dialogs/locale/en-US/makefile.win
index d25b02b5f88..9f1babf016d 100644
--- a/mozilla/editor/ui/dialogs/locale/en-US/makefile.win
+++ b/mozilla/editor/ui/dialogs/locale/en-US/makefile.win
@@ -27,6 +27,7 @@ install::
 	$(MAKE_INSTALL) EditorHLineProperties.dtd        $(DIST)\bin\chrome\editor\locale
 	$(MAKE_INSTALL) EditorImageProperties.dtd        $(DIST)\bin\chrome\editor\locale
 	$(MAKE_INSTALL) EditorInsertSource.dtd           $(DIST)\bin\chrome\editor\locale
+  $(MAKE_INSTALL) EditorInsertChars.dtd            $(DIST)\bin\chrome\editor\locale
 	$(MAKE_INSTALL) EditorInsertTable.dtd            $(DIST)\bin\chrome\editor\locale
 	$(MAKE_INSTALL) EditorLinkProperties.dtd         $(DIST)\bin\chrome\editor\locale
 	$(MAKE_INSTALL) EditorListProperties.dtd         $(DIST)\bin\chrome\editor\locale
@@ -44,6 +45,7 @@ install::
 clobber::
   rm -f $(DIST)\bin\chrome\editor\locale\EditorHLineProperties.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\EditorImageProperties.dtd
+  rm -f $(DIST)\bin\chrome\editor\locale\EditorInsertChars.dtd
   rm -f $(DIST)\bin\chrome\editor\locale\EditorInsertSource.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\EditorInsertTable.dtd 
   rm -f $(DIST)\bin\chrome\editor\locale\EditorLinkProperties.dtd 
diff --git a/mozilla/editor/ui/dialogs/skin/EditorDialog.css b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
index e3998628d10..f50c0679efc 100644
--- a/mozilla/editor/ui/dialogs/skin/EditorDialog.css
+++ b/mozilla/editor/ui/dialogs/skin/EditorDialog.css
@@ -25,101 +25,77 @@
    THIS FILE IS LOCKED DOWN.  YOU ARE NOT ALLOWED TO MODIFY IT WITHOUT FIRST HAVING YOUR
    CHANGES REVIEWED BY cmanske@netscape.com.
 */
-
-
-table { 
-  border-collapse: separate; 
-  border-spacing:  0px; 
-  margin: 0px; 
-  border: 0px;
-}
-
-td { border: 0px;}
-
-/* Use to center vertically in a table cell */
-tr { 
-  vertical-align: middle;
-}
-
-.margin-left-right {
-  margin-left:  10px;
-  margin-right:  5px;
-}
-
-*.color-well {
-  width:20px;
-  height: 1em; 
-  border: 1px inset #CCCCCC;
-  /* Background color is set at runtime */
-}
-
-*.color-well[default="true"] {
-  border: 1px solid transparent;
-  background-color: inherit;
-}
-
-image.popup-trigger {
-  list-style-image: url(chrome://global/skin/scroll-down.gif);
-}
-
 /* Most should be moved to global files */
 
 titledbox {
   padding-bottom: 4px;
 }
 
-*.MinWidth10em {
+.MinWidth5em {
+  min-width: 5em;
+}
+
+.MinWidth10em {
   min-width: 10em;
 }
 
-*.MinWidth20em {
+.MinWidth20em {
   min-width: 20em;
 }
 
-*.big-left-margin {
+.big-left-margin {
   margin-left:    10px;
 }
 
-*.middle {
+.middle {
   vertical-align: middle:
 }
 
-text.dialog {
-  margin: 1px 2px 1px 4px;
-}
-
-text.bold {
+.bold {
   font-weight: bold;
 }
 
-text.italic {
+.italic {
   font-style: italic;
 }
 
+
+.narrow {
+  width: 3em;
+}
+
+.align-right {
+  text-align: right;
+}
+
+/* end of "should be in global.css" */
+
+.color-well {
+  width:20px;
+  height: 1em; 
+  border: 1px inset #CCCCCC;
+  /* Background color is set at runtime */
+}
+
+.color-well[default="true"] {
+  border: 1px solid transparent;
+  background-color: inherit;
+}
+
+.popup-trigger {
+  list-style-image: url(chrome://global/skin/scroll-down.gif);
+}
+
+/* temporary -- we need a simple box-based list defined in XBL */
 tree.list {
   border: 1px inset #CCCCCC;
   margin: 1px 4px 2px 4px;
   width: 10em;
   height: 3em;
+  /* use rows="#" in XUL to define height */
 }
 
-textfield.narrow {
-  width: 3em;
-}
-
-*.align-right {
-  text-align: right;
-}
-
-text {
-  text-align: left;
-}
-
-text[hidden="true"], input[hidden="true"] {
-  display: none;
-}
-
-box#ColorPreview {
+#ColorPreview {
   border: 1px inset #CCCCCC;
   margin-left:    10px;
   padding-left:    5px;
@@ -128,95 +104,82 @@ box#ColorPreview {
   min-height:     50px;
 }
 
-select#alignTypeSelect,label#alignLabel {
+#alignTypeSelect,label#alignLabel {
   margin-left: 5px;
 }
 
-button#MoreFewerButton[more="0"] {
+#MoreFewerButton[more="0"] {
   list-style-image: url(chrome://global/skin/scroll-down.gif);
   /* bug 9459 - changing button text doesn't resize width.
      This covers that problem, but we want this size anyway */
   min-width: 10em;
 }
 
-button#MoreFewerButton[more="1"] {
+#MoreFewerButton[more="1"] {
   list-style-image: url(chrome://global/skin/scroll-up.gif);
   min-width: 10em;
 }
 
 /* We use a borderless button to show misspelled word in dialog */
-text#MisspelledWord {
+#MisspelledWord {
   font-weight: bold;
 }
 
 /* For a column of right-aligned text before 
    a column of input fields, e.g., InsertTable dialog
 */
-text.right {
+.right {
   /* doesn't work yet! must use align="right" in <text> */
   text-align:   right;
-  margin-right: 5px;
-  /* Kludge: this needs to be wide enoungh for longest string */
-  min-width:    10em;
 }
 
 /* use outset shape for a button look */
-menu.colorpicker {
+.colorpicker {
   border: 1px outset #CCCCCC;
   /* For a little extra space between buttons */
   margin-bottom: 2px;
 }
 
 
-menu.colorpicker:active {
+.colorpicker:active {
   border: 1px inset #CCCCCC;
 }
 
 /* THIS SHOULD BE IN GLOBAL.CSS */
-label.dialog[disabled],legend.dialog[disabled] {
-    color: gray;
-}
-
-spring.smallspacer {
+.smallspacer {
   width:  3px;
   height: 3px;
   min-width:  3px;
   min-height: 3px;
 }
 
-spring.spacer {
+.spacer {
   width:  5px;
   height: 5px;
   min-width:  5px;
   min-height: 5px;
 }
 
-spring.bigspacer {
+.bigspacer {
   width:  10px;
   height: 10px;
   min-width:  10px;
   min-height: 10px;
 }
 
-img.AlignIcon {
-  margin-right: 5px;
-  /* To make all align the same */
-  /*vertical-align: middle;*/
-}
-
-image#img-align-top {
+#img-align-top {
 	list-style-image:url("chrome://editor/skin/images/img-align-top.gif");
 }
-image#img-align-middle {
+#img-align-middle {
 	list-style-image:url("chrome://editor/skin/images/img-align-middle.gif");
 }
-image#img-align-bottom {
+#img-align-bottom {
 	list-style-image:url("chrome://editor/skin/images/img-align-bottom.gif");
 }
-image#img-align-right {
+#img-align-right {
 	list-style-image:url("chrome://editor/skin/images/img-align-right.gif");
 }
-image#img-align-left {
+#img-align-left {
 	list-style-image:url("chrome://editor/skin/images/img-align-left.gif");
 }
 
@@ -228,19 +191,10 @@ image#img-align-left {
    viewers. */
 
 
-div.tagname {
-    font-weight: bold;
-}
-
-div#tagLabel {
+#tagLabel {
   font-weight: bold;
 }
 
-/* In Color Properties dialog */
-div#SaveImageMsg {
-  max-width: 150px;
-}
-
 /* styles for an attribute tree-table */
 tree.AttributesTree {
   min-width : 200px;