diff --git a/themes/classic/communicator/xpinstall/xpinstall.css b/themes/classic/communicator/xpinstall/xpinstall.css
index c7db02791a3..71cb1ea099e 100644
--- a/themes/classic/communicator/xpinstall/xpinstall.css
+++ b/themes/classic/communicator/xpinstall/xpinstall.css
@@ -18,6 +18,7 @@
  * 
  * Contributor(s): 
  *   Don Bragg (dbragg@netscape.com) 12/08/1999
+ *   Blake Ross (BlakeR1234@aol.com)  6/12/2000
  */
 
 @import url(chrome://global/skin);
@@ -36,7 +37,7 @@ box#mainBox{
 }
 
 box#okcancelBox{
-  margin-left               : 19em;
+  margin-left               : 22em;
   margin-top                : 3px;
   margin-bottom             : 3px;
 }
@@ -44,20 +45,16 @@ box#okcancelBox{
 
 box#treeBox{
   height                    : 18ex;
+  margin                    : 0em;
 }
 
 box#statusMessages{
   width                     : 36em;
 }
 
-div#interiorTitle {
-  font-size                 : 24px;
-  font-weight               : bold;
-}
-
 
 /*
-#table-housing {
+div#table-housing {
   height                    : 100%;
 }
 */
@@ -89,10 +86,6 @@ tree#modulesTree > treehead > treerow > treecell {
   color                     : windowtext;
 }
 
-titledbutton.graphic{
-  list-style-image: url("chrome://global/skin/animthrob_single.gif");
-}
-
 spring#verticalSmallSpacer {
   height                    : 1ex;
 }
@@ -113,3 +106,8 @@ spring#horizontalLargeSpacer {
   width                     : 10em;
 }
 
+.headline {
+  font-size                 : 2em;
+  margin                    : 4px;
+  font-weight               : bold;
+}
\ No newline at end of file
diff --git a/themes/modern/communicator/xpinstall/xpinstall.css b/themes/modern/communicator/xpinstall/xpinstall.css
index c7db02791a3..71cb1ea099e 100644
--- a/themes/modern/communicator/xpinstall/xpinstall.css
+++ b/themes/modern/communicator/xpinstall/xpinstall.css
@@ -18,6 +18,7 @@
  * 
  * Contributor(s): 
  *   Don Bragg (dbragg@netscape.com) 12/08/1999
+ *   Blake Ross (BlakeR1234@aol.com)  6/12/2000
  */
 
 @import url(chrome://global/skin);
@@ -36,7 +37,7 @@ box#mainBox{
 }
 
 box#okcancelBox{
-  margin-left               : 19em;
+  margin-left               : 22em;
   margin-top                : 3px;
   margin-bottom             : 3px;
 }
@@ -44,20 +45,16 @@ box#okcancelBox{
 
 box#treeBox{
   height                    : 18ex;
+  margin                    : 0em;
 }
 
 box#statusMessages{
   width                     : 36em;
 }
 
-div#interiorTitle {
-  font-size                 : 24px;
-  font-weight               : bold;
-}
-
 
 /*
-#table-housing {
+div#table-housing {
   height                    : 100%;
 }
 */
@@ -89,10 +86,6 @@ tree#modulesTree > treehead > treerow > treecell {
   color                     : windowtext;
 }
 
-titledbutton.graphic{
-  list-style-image: url("chrome://global/skin/animthrob_single.gif");
-}
-
 spring#verticalSmallSpacer {
   height                    : 1ex;
 }
@@ -113,3 +106,8 @@ spring#horizontalLargeSpacer {
   width                     : 10em;
 }
 
+.headline {
+  font-size                 : 2em;
+  margin                    : 4px;
+  font-weight               : bold;
+}
\ No newline at end of file
diff --git a/xpinstall/res/content/institems.xul b/xpinstall/res/content/institems.xul
index ce069880686..0a41759c58e 100644
--- a/xpinstall/res/content/institems.xul
+++ b/xpinstall/res/content/institems.xul
@@ -20,11 +20,12 @@ Rights Reserved.
 Contributor(s): 
    Don Bragg (dbragg@netscape.com)
    Dan Veditz <dveditz@netscape.com>
+   Blake Ross <BlakeR1234@aol.com>
 -->
 
+<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/xpinstall/xpinstall.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/xpinstall/xpinstall.css" type="text/css"?>
-
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/xpinstall/institems.dtd">
 
 
@@ -36,25 +37,25 @@ Contributor(s):
         align = "vertical"
 > 
 
-    <html:script language="javascript" src="chrome://communicator/content/xpinstall/institems.js"/>
+    <script src="chrome://communicator/content/xpinstall/institems.js"></script>
+    <keyset id="keyset"/>
     
     <box align="vertical" id="mainBox">
         <box align="horizontal" id="interiorTitleBox">
-            <html:div id="interiorTitle"> &items.label; </html:div>
+            <text class="headline" id="interiorTitle" value="&items.label;"/>
             <spring flex="100%"/>
-            <titledbutton class="graphic" />
-        </box>
-        
-        <html:div >
-            <html:hr/>
-        </html:div>
+            <image src="chrome://global/skin/animthrob_single.gif" />
+        </box>      
 
-        <html:div>&componentList.label;</html:div>
-            
+        <spring id ="verticalSmallSpacer"/>
+        <separator align="center" class="groove" flex="100%"/>            
         <spring id="verticalSmallSpacer"/>
-            
-        <box align="vertical" id="treeBox">
-            <html:div id="table-housing">
+
+        <text class="label" id="componentList" value="&componentList.label;"/>
+        <spring id="verticalSmallSpacer"/>
+        <spring id="verticalSmallSpacer"/>            
+        <box align="vertical" id="treebox">
+            <html>
                 <tree id="modulesTree">
                     <treecol />
                     <treecol />
@@ -69,17 +70,14 @@ Contributor(s):
                     <treechildren id="theTreeBody">
                     </treechildren>
                 </tree>
-            </html:div>
+           </html>
         </box>
-        
-        <spring id="verticalLargeSpacer"/>
 
-        <box class="selection" align="horizontal" id="okcancelBox">
-            <titledbutton class="dialog push" id="start" value="&dialogOk.label;" onclick="onOk();" />
-       		<!--spring style="width:4px"/-->
-            <titledbutton class="dialog push" id="cancel" value="&dialogCancel.label;"  onclick="cancel();" />
+        <separator align="center" class="groove" flex="100%"/>
+        <box class="selection" id="okcancelBox">
+            <button class="dialog push" id="start" default="true" value="&dialogOk.label;" onclick="onOk();"/> 
+            <button class="dialog push" id="cancel" value="&dialogCancel.label;"  onclick="cancel();" />
         </box>
-        <spring id="verticalMediumSpacer"/>
     </box>
 
 
diff --git a/xpinstall/res/content/xpistatus.xul b/xpinstall/res/content/xpistatus.xul
index cd20ba08e88..e06309b7cad 100644
--- a/xpinstall/res/content/xpistatus.xul
+++ b/xpinstall/res/content/xpistatus.xul
@@ -23,7 +23,7 @@
  -->
 
 <?xml-stylesheet href="chrome://communicator/skin/xpinstall/xpinstall.css" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/xpinstall/xpinstall.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/xpinstall/xpistatus.dtd" >
 
@@ -35,25 +35,28 @@
         title="&progress.label;"
         align = "vertical"
         class = "dialog"
-        > 
+> 
 
-    <html:script language="javascript" src="chrome://communicator/content/xpinstall/xpistatus.js"/>
+    <script src="chrome://communicator/content/xpinstall/xpistatus.js"></script>
+    <keyset id="keyset"/>
 
     <box align="vertical" id="mainBox">
         <box align="horizontal" id="interiorTitleBox">
-            <html:div id="interiorTitle"> &progress.label; </html:div>
+            <text class="headline" id="interiorTitle" value="&progress.label;"/>
             <spring flex="100%"/>
-            <titledbutton class="graphic" />
+            <image src="chrome://global/skin/animthrob_single.gif" />
         </box>
 
-        <html:div>
-            <html:hr/>
-        </html:div>
+        <spring id ="verticalSmallSpacer"/>
+        <separator align="center" class="groove" flex="100%"/>            
+        <spring id="verticalSmallSpacer"/>
 
-        <spring id="verticalSmallSpacer"/>  
+        <text class="label" id="componentList" value="&downloadBeforeUpdate.text;"/>
+        <spring id="verticalSmallSpacer"/>
+        <spring id="verticalSmallSpacer"/>            
 
-        <box align="vertical" id="treeBox">  
-            <html:div id="table-housing">
+        <box align="vertical" id="treebox">  
+            <html>
                 <tree id="modulesTree">
                     <treecol />
                     <treecol />
@@ -68,30 +71,26 @@
                     <treechildren id="theTreeBody">
                     </treechildren>
                 </tree>
-            </html:div>
+            </html>
         </box>
-
+    
         <spring id="verticalLargeSpacer"/>
 
         <box align="vertical" id="statusMessages">
-        <html:input id="dialog.uiPackageName" readonly="" />
-        <html:input id="dialog.currentAction" readonly="" />
+            <html:input id="dialog.uiPackageName" readonly="" />
+            <html:input id="dialog.currentAction" readonly="" />
         </box>
 
-        <spring style="height:1ex"/>
-
         <box align="horizontal">
-
             <box align="vertical">
                 <spring style="height:6px"/>
                 <progressmeter id="dialog.progress" mode="normal" value="0" style="width:200px;height:10px">
                 </progressmeter>
             </box>
 
-            <spring flex="80%"/>
-
-            <titledbutton class="dialog push" id="dialog.cancel" disabled="false" onclick="cancel()" value="&dialogCancel.label;"/>
+            <button class="dialog push" id="cancel" onclick="cancel()" value="&dialogCancel.label;"/>
         </box>
+
     </box>
 
 </window>
diff --git a/xpinstall/res/locale/en-US/institems.dtd b/xpinstall/res/locale/en-US/institems.dtd
index 4772eb4cc73..077fca501bf 100644
--- a/xpinstall/res/locale/en-US/institems.dtd
+++ b/xpinstall/res/locale/en-US/institems.dtd
@@ -1,8 +1,8 @@
 <!-- extracted from institems.xul -->
 
 <!ENTITY dialogCancel.label "Cancel">
-<!ENTITY dialogOk.label "Ok">
-<!ENTITY items.label "Items to install">
+<!ENTITY dialogOk.label "Install">
+<!ENTITY items.label "Items to Install">
 <!ENTITY dialog.title "Software Installation">
 <!ENTITY componentList.label "The following packages will be installed:">
 <!ENTITY moduleName.label "Module name">