diff --git a/themes/modern/communicator/pt-grippy-bg-active.gif b/themes/modern/communicator/pt-grippy-bg-active.gif
new file mode 100644
index 00000000000..425f1c14d02
Binary files /dev/null and b/themes/modern/communicator/pt-grippy-bg-active.gif differ
diff --git a/themes/modern/communicator/pt-grippy-bg.gif b/themes/modern/communicator/pt-grippy-bg.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/communicator/pt-grippy-btm-active.gif b/themes/modern/communicator/pt-grippy-btm-active.gif
new file mode 100644
index 00000000000..1b5fbec7ffb
Binary files /dev/null and b/themes/modern/communicator/pt-grippy-btm-active.gif differ
diff --git a/themes/modern/communicator/pt-grippy-btm.gif b/themes/modern/communicator/pt-grippy-btm.gif
new file mode 100644
index 00000000000..1e6b419ea73
Binary files /dev/null and b/themes/modern/communicator/pt-grippy-btm.gif differ
diff --git a/themes/modern/communicator/pt-grippy-top-active.gif b/themes/modern/communicator/pt-grippy-top-active.gif
new file mode 100644
index 00000000000..0884457f429
Binary files /dev/null and b/themes/modern/communicator/pt-grippy-top-active.gif differ
diff --git a/themes/modern/communicator/pt-grippy-top.gif b/themes/modern/communicator/pt-grippy-top.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/communicator/ptc-grippy-bg-active.gif b/themes/modern/communicator/ptc-grippy-bg-active.gif
new file mode 100644
index 00000000000..0547cfef8f1
Binary files /dev/null and b/themes/modern/communicator/ptc-grippy-bg-active.gif differ
diff --git a/themes/modern/communicator/ptc-grippy-bg.gif b/themes/modern/communicator/ptc-grippy-bg.gif
new file mode 100644
index 00000000000..4730bd021f0
Binary files /dev/null and b/themes/modern/communicator/ptc-grippy-bg.gif differ
diff --git a/themes/modern/communicator/sidebar/sidebar.css b/themes/modern/communicator/sidebar/sidebar.css
index 8a29af045ed..84c9c394f98 100644
--- a/themes/modern/communicator/sidebar/sidebar.css
+++ b/themes/modern/communicator/sidebar/sidebar.css
@@ -17,39 +17,26 @@
  * Rights Reserved.
  * 
  * Contributor(s): Stephen Lamm <slamm@netscape.com>
+ *                 Joe Hewitt <hewitt@netscape.com>                   
  */ 
 
 
 #sidebar-splitter {
-    -moz-binding: url("chrome://communicator/skin/sidebar/sidebarSplitterBindings.xml#sidebar-splitter");
-    border: none;
-    padding: 0px;
-    width: 10px;
-    background-image: url("chrome://communicator/skin/sidebar/sbsplitter-bg.gif");
-}
-
-.sidebar-splitter-grippy {
-    background-image: url("chrome://communicator/skin/sidebar/sbgrippy-left.gif") !important; 
-}
-
-.sidebar-splitter-grippy:hover,
-.sidebar-splitter-grippy:active {
-    background-image: url("chrome://communicator/skin/sidebar/sbgrippy-left-hover.gif") !important; 
-}
-
-#sidebar-splitter[state="collapsed"] > .sidebar-splitter-grippy {
-    background-image: url("chrome://communicator/skin/sidebar/sbgrippy-right.gif") !important;
-}
-
-#sidebar-splitter[state="collapsed"] > .sidebar-splitter-grippy:hover,
-#sidebar-splitter[state="collapsed"] > .sidebar-splitter-grippy:active {
-    background-image: url("chrome://communicator/skin/sidebar/sbgrippy-right-hover.gif") !important; 
+  border-left             : none;
 }
 
+/**
+ *    other sidebar stuff
+ **/
 
 #sidebar-box {
-    margin-top: 0px;
-    border-top: 1px solid #8C9AB2;
+  margin-top: 0px;
+  border-top: 1px solid #92ABC9;
+  border-right: 1px solid #000000;
+}
+
+#sidebar-title-box {
+  border-bottom: none;
 }
 
 .text-panel-loading {
@@ -120,82 +107,26 @@ box[loadstate="stopped"] > box > box >  .image-panel-loading {
     display: none;
 }
 
+.iframe-panel
+{
+  border-bottom          : 1px solid #C1C8D5;
+}
+
 /**
  * texttab folder lookalike e.g. for sidebar panel headers
  */
   .box-texttab
     {
       -moz-binding        : url("chrome://communicator/content/sidebar/sidebarBindings.xml#texttab");
-      background-color    : #5C7794;
-      padding-top         : 2px;
       border-bottom       : 3px solid #5C7794;
-    }
-
-  .box-texttab[selected="true"] 
-    {
-      border-bottom       : 3px solid #C1C8D5;
-    }    
-    
-  .box-texttab[top-panel="true"]
-    {
       background-color    : #5C7794;
     }
-  
-  .box-texttab[first-panel-after-selected="true"] 
-    {
-      background-color    : #C1C8D5;
-    }
-
-  .box-texttab[first-panel-after-selected="true"]  > .box-texttab-left
-    {
-      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkonlight-left.gif");
-    }
-
-  .box-texttab[first-panel-after-selected="true"]  > .box-texttab-right
-    {
-      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkonlight-right.gif");
-    }
-    
-  .box-texttab-right-space 
-    {
-      width               : 0px;
-    }
-
-  .box-texttab[last-panel="true"] > .box-texttab-right-space 
-    {
-      border-bottom       : none;
-    }
-
-  .box-texttab[last-panel="true"]
-    {
-      border-bottom       : 7px solid #5C7794;
-    } 
-
-  .box-texttab[last-panel="true"][selected="true"] 
-    {
-      border-bottom       : 3px solid #C1C8D5;
-    } 
-
+   
   .box-texttab-left
     {
       list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkondark-left.gif");
     }
 
-  .box-texttab-right
-    {
-      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkondark-right.gif");
-    }
-
-  .box-texttab[selected="true"] > .box-texttab-left
-    {
-      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-lightondark-left.gif");
-    }
-
-  .box-texttab[selected="true"] > .box-texttab-right
-    {
-      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-lightondark-right.gif");
-    }
-
   .box-texttab-text-container
     {
       background-color    : #5C7794;
@@ -204,10 +135,72 @@ box[loadstate="stopped"] > box > box >  .image-panel-loading {
       padding-top         : 2px;
     }
 
+  .box-texttab-right
+    {
+      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkondark-right.gif");
+    }
+
+  .box-texttab-right-space 
+    {
+      width               : 0px;
+    }
+
+  .box-texttab[top-panel="true"]
+    {
+      background-color    : #5C7794;
+    }
+  
+  .box-texttab[last-panel="true"]
+    {
+      border-bottom       : 7px solid #5C7794;
+    } 
+
+  .box-texttab[last-panel="true"][selected="true"] 
+    {
+      border-bottom       : 3px solid #C1C8D5;
+    } 
+
+  .box-texttab[selected="true"]
+    {
+      height              : 24px;
+    }
+    
+  .box-texttab[selected="true"] > .box-texttab-left
+    {
+      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-lightondark-left.gif");
+    }
+
   .box-texttab[selected="true"] > .box-texttab-text-container
     {
       background: url("chrome://communicator/skin/sidebar/sbtab-light.gif") repeat-x;
       background-color    : #C1C8D5;
       color               : #000000;
     }
+
+  .box-texttab[selected="true"] > .box-texttab-right
+    {
+      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-lightondark-right.gif");
+    }
+
+  .box-texttab[first-panel-after-selected="true"] 
+    {
+      background-color    : #C1C8D5;
+      border-top          : 1px solid #E7EBF7;
+    }
+
+  .box-texttab[first-panel-after-selected="true"]  > .box-texttab-left
+    {
+      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkonlight-left.gif");
+      border-top          : 3px solid #C1C8D5;
+    }
+
+  .box-texttab[first-panel-after-selected="true"]  > .box-texttab-text-container
+    {
+      border-top          : 3px solid #C1C8D5;
+    }
     
+  .box-texttab[first-panel-after-selected="true"]  > .box-texttab-right
+    {
+      list-style-image    : url("chrome://communicator/skin/sidebar/sbtab-darkonlight-right.gif");
+      border-top          : 3px solid #C1C8D5;
+    }
diff --git a/themes/modern/communicator/toolbar.css b/themes/modern/communicator/toolbar.css
index 939e7da48b2..57b313be5a4 100644
--- a/themes/modern/communicator/toolbar.css
+++ b/themes/modern/communicator/toolbar.css
@@ -1,78 +1,77 @@
  
-/******* ToolBox & ToolBar *******/
+/**
+ * toolbar-primary ::: main shaded toolbar used in all apps
+ **/
 
-toolbar
+.toolbar-primary 
   {
-    background-color      : #394B6E;
-    // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
-    // Talk to evaughan@netscape.com for details.
-    min-width			        : 1px;      
+    -moz-binding		      : url("chrome://global/skin/globalBindings.xml#toolbar-primary");
+    padding               : 0px;
+    background-color	    : transparent;
+    background-image	    : none;
   }
-  
+
+.toolbar-primary > .toolbar-holder
+  {
+    border                : none;
+    border-top            : 1px solid #DCEEFF;
+  }
+
 .toolbar-primary-image-middle,
 .toolbar-primary-image-left,
 .toolbar-primary-image-right 
   {
-    border-top: 1px solid #DCEEFF;
+    height				        : 46px;
+    border-top            : 1px solid #DCEEFF;
+  }
+    
+.toolbar-primary-image-left
+  {
+    background            : url("chrome://global/skin/navbar-bg-leftcap.gif") no-repeat;
+    width				          : 10px;
+  }
+
+.toolbar-primary-image-middle
+  {
+    background            : url("chrome://global/skin/navbar-bg.gif") repeat-x;
+  }
+
+.toolbar-primary-image-right
+  {
+    background            : url("chrome://global/skin/navbar-bg-rightcap.gif") no-repeat;
+  	width				          : 21px;
   }
   
-toolbargrippy 
+/** 
+ * the grippy inside of the .toolbar-primary
+ **/
+ 
+.toolbar-primary-grippy
   { 
-    -moz-binding         : url("chrome://global/skin/globalBindings.xml#toolbargrippy");
-    background-image     : url("chrome://global/skin/tb-grippy-up-bg.gif");
-    width                : 11px;
-    margin				       : 0px 0px 0px 0px;
-    border-top           : 1px solid #E7EFEF;
-    border-right         : 1px solid #313439;
-    border-bottom        : 1px solid #212429;
+    background-image     : url("chrome://communicator/skin/ptc-grippy-bg.gif");
   } 
 
-.toolbargrippy-twisty 
+.toolbar-primary-grippy > .toolbargrippy-top
   {
-    background           : url("chrome://global/skin/tb-grippy-up.gif") no-repeat bottom;
-    width                : 11px;
+    height               : 0px;
+    background           : none;
+  }
+
+.toolbar-primary-grippy > .toolbargrippy-btm
+  {
+    height               : 0px;
+    background           : none;
   }
   
-toolbargrippy:hover:active
+.toolbar-primary-grippy:hover:active
   {
-    background-image     : url("chrome://global/skin/tb-grippy-up-clicked-bg.gif");
+    background-image     : url("chrome://communicator/skin/ptc-grippy-bg-active.gif");
   }
 
-toolbargrippy:hover:active > .toolbargrippy-twisty
-  {
-  	background           : url("chrome://global/skin/tb-grippy-up-clicked.gif") no-repeat bottom;
-    width                : 11px;
-  }
+/**
+ * toolbar-standard ::: used on the taskbar
+ **/
 
-.collapsed-tray-holder
-  {
-  	background-color	  : #394B6E;
-  	border-bottom		    : 1px solid #11151F;
-    border-top			      : 1px solid #B6CADF;
-  }
-
-toolbargrippy[tbgrippy-collapsed="true"]
-  {
-    -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbargrippy");
-  	margin				  : 1px 0px 1px 2px;
-  }
-
-toolbargrippy[tbgrippy-collapsed="true"]:hover:active
-  {
-  }
-
-.toolbargrippy-twisty-collapsed 
-  {
-    background: url("chrome://global/skin/tb-grippy-down-clicked.gif") no-repeat bottom;
-    width: 11px;
-    max-height: 14px;
-  }
-
-toolbar[collapsed="true"] > toolbargrippy 
-  {
-    width                 : 20px;
-  }
-  
 .toolbar-standard > toolbargrippy
   {
   	background-color      : #003366; 
@@ -92,44 +91,8 @@ toolbar[collapsed="true"] > toolbargrippy
 .toolbarseparator-standard
   { 
     width                 : 1px;
-    border-left           : 1px solid #9D9D9D;
-    border-right          : 1px solid #FFFFFF;
+    border-left           : 1px solid #425973;
+    border-right          : 1px solid #92ABC9;
     margin                : 2px 0.2em 2px 0.2em;
   } 
 
-.toolbar-primary 
-  {
-    -moz-binding		      : url("chrome://global/skin/globalBindings.xml#toolbar-primary");
-    padding               : 0px;
-    background-color	    : transparent;
-    background-image	    : none;
-  }
-  
-.toolbar-primary-image-left
-  {
-    background            : url("chrome://global/skin/navbar-bg-leftcap.gif") no-repeat;
-    width				          : 10px;
-    height				        : 46px;
-    border-bottom         : 1px solid #6583A2;
-  }
-
-.toolbar-primary-image-middle
-  {
-    background            : url("chrome://global/skin/navbar-bg.gif") repeat-x;
-    height			  	      : 46px;
-    border-bottom         : 1px solid #6583A2;
-  }
-
-.toolbar-primary-image-right
-  {
-    background            : url("chrome://global/skin/navbar-bg-rightcap.gif") no-repeat;
-  	width				          : 21px;
-  	height				        : 46px;
-    border-bottom         : 1px solid #6583A2;
-  }
-
-.toolbary-primary-grippy
-  {
-  	background-image	  : none;
-  	background-color	  : transparent;
-  }
diff --git a/themes/modern/global/global.css b/themes/modern/global/global.css
index 1db6fbe7c78..58be6d42b4d 100644
--- a/themes/modern/global/global.css
+++ b/themes/modern/global/global.css
@@ -24,6 +24,7 @@
 @import url(chrome://global/skin/formatting.css);
 @import url(chrome://global/skin/textfield.css);
 @import url(chrome://global/skin/tabcontrol.css);
+@import url(chrome://global/skin/toolbar.css);
 @import url(chrome://global/skin/colorpicker.css);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
@@ -38,7 +39,7 @@
  **/
   window 
     { 
-      background-color    : #FFFFFF;
+      background-color    : #B4C3D4;
       padding             : 0px;
       font-family         : Verdana, Geneva, Tahoma, Helvetica, Arial, sans-serif;
       color               : #000000;
@@ -51,7 +52,6 @@
   
   window.dialog 
     { 
-      background-color    : #B4C3D4;
       padding             : 7px 5px 5px 5px;
     }
 
@@ -114,7 +114,7 @@
  */
   #status-bar 
     {
-      border-top          : 1px solid #11151F;
+      border-top          : 1px solid #000000;
       background-color    : #6E89AB;
       -moz-user-focus     : ignore;
       overflow            : hidden;
diff --git a/themes/modern/global/globalBindings.xml b/themes/modern/global/globalBindings.xml
index ad816f077f6..c3f1a4dd3fe 100644
--- a/themes/modern/global/globalBindings.xml
+++ b/themes/modern/global/globalBindings.xml
@@ -34,13 +34,16 @@
 	  
   <binding id="toolbargrippy" extends="chrome://global/content/toolbarBindings.xml#toolbargrippy">
     <content orient="vertical">
-      <xul:box class="toolbargrippy-twisty" flex="1"/>
+      <xul:box class="toolbargrippy-top"/>
+      <xul:spring class="toolbargrippy-mid" flex="1"/>
+      <xul:box class="toolbargrippy-btm"/>
     </content>
   </binding>
 
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/toolbarBindings.xml#toolbargrippy">
     <content>
-      <xul:box class="toolbargrippy-twisty-collapsed" flex="1"/>
+      <xul:box class="toolbargrippy-collapsed-left"/>
+      <xul:box class="toolbargrippy-collapsed-context" flex="1"/>
     </content>
   </binding>
 
@@ -96,9 +99,9 @@
 
   <binding id="throbber" extends="chrome://global/content/xulBindings.xml#basetext">
   	<content>
-  	  <xul:spring class="throbber-groove-left"/>
-  	  <xul:box flex="1" class="throbber-middle" orient="vertical" autostretch="never">
-  	  	<xul:spring class="throbber-groove-top"/>
+     	<xul:spring class="throbber-groove-left"/>
+  	  <xul:box flex="1" class="throbber-middle" orient="vertical">
+    	  <xul:spring class="throbber-groove-top"/>
   	  	<xul:image flex="1" class="throbber-icon" inherits="src" autostretch="never"/>
   	  	<xul:spring class="throbber-groove-bottom"/>
   	  </xul:box>
@@ -109,44 +112,57 @@
 
 <!-- WIDGETS -->
 
-  <binding id="three-slice-button" extends="chrome://global/content/xulBindings.xml#basetext">
-    <content>
-        <xul:spring class="button-image-left" inherits="default,disabled"/>
-    	<xul:box flex="1" class="button-image-middle" inherits="default,disabled" orient="vertical" align="center">
-    	  <xul:spring flex="1" class="button-top-spring"/>
-    	  <xul:box flex="1" autostretch="never">
+  <binding id="nine-slice-button" extends="chrome://global/content/xulBindings.xml#basetext">
+    <content includes="menupopup">
+      <xul:box class="button-box-left" inherits="default,disabled" orient="vertical">
+        <xul:spring class="button-left-top" inherits="default,disabled"/>
+        <xul:spring class="button-left-mid" inherits="default,disabled" flex="1"/>
+        <xul:spring class="button-left-btm" inherits="default,disabled"/>
+      </xul:box>
+      
+    	<xul:box class="button-box-mid" inherits="default,disabled" orient="vertical" flex="1">
+    	  <xul:spring class="button-mid-top" inherits="default,disabled"/>
+    	  <xul:box class="button-mid-mid" inherits="default,disabled" flex="1" autostretch="never">
     	  	<xul:image class="button-icon" inherits="src"/>
-    	    <xul:box class="button-text-box" flex="1" inherits="default">
-		      <xul:text inherits="disabled,value,crop,accesskey"/>
-    	    </xul:box>
+		      <xul:text class="button-text-mid" inherits="default,disabled,value,crop,accesskey"/>
     	  </xul:box>
-    	  <xul:spring flex="1" class="button-bottom-spring"/>
+    	  <xul:spring class="button-mid-btm" inherits="default,disabled"/>
     	</xul:box>
-    	<xul:spring class="button-image-right" inherits="default,disabled"/>
+      
+      <xul:box class="button-box-right" inherits="default,disabled" orient="vertical">
+        <xul:spring class="button-right-top" inherits="default,disabled"/>
+        <xul:spring class="button-right-mid" inherits="default,disabled" flex="1"/>
+        <xul:spring class="button-right-btm" inherits="default,disabled"/>
+      </xul:box>
     </content>
   </binding>
 
-<!-- The handlers and implementation are not being properly inherited from global/content/menulistBindings.xml,
-     so I've added them manually here.  This is bad. -->
+  <binding id="nine-slice-menulist" extends="chrome://global/content/menulistBindings.xml#menulist">
+  	<content includes="menupopup">
+      <xul:box class="menulist-box-left" inherits="disabled" orient="vertical">
+        <xul:spring class="menulist-left-top" inherits="disabled"/>
+        <xul:spring class="menulist-left-mid" inherits="disabled" flex="1"/>
+        <xul:spring class="menulist-left-btm" inherits="disabled"/>
+      </xul:box>
 
-  <binding id="menulist" extends="chrome://global/content/menulistBindings.xml#menulist">
-  	<content inherits="false" includes="menupopup">
-    	<xul:spring class="menulist-spring-left" inherits="disabled"/>
-    	<xul:box class="menulist-box-middle" flex="1" inherits="disabled">
-    		<xul:image class="menulist-icon" inherits="src"/>
-    		<xul:box class="menulist-text-box" flex="1">
-		      	<xul:text flex="1" inherits="disabled,value,crop,accesskey"/>
-    	    </xul:box>
+    	<xul:box class="menulist-box-mid" inherits="disabled" flex="1" orient="vertical">
+    	  <xul:spring class="menulist-mid-top" inherits="disabled"/>
+    		<xul:box class="menulist-mid-mid" inherits="disabled" flex="1" autostretch="never">
+        		<xul:image class="menulist-icon" inherits="src"/>
+		      	<xul:text class="menulist-text-mid" flex="1" inherits="disabled,value,crop,accesskey"/>
+        </xul:box>
+    	  <xul:spring class="menulist-mid-btm" inherits="disabled"/>
     	</xul:box>
-    	<xul:spring class="menulist-dropmarker-right" inherits="disabled"/>
+
+      <xul:box class="menulist-box-right" inherits="disabled" orient="vertical">
+    		<xul:box class="menulist-right-mid" inherits="disabled" flex="1">
+      		<xul:box class="menulist-right-mid2" inherits="disabled" flex="1" autostretch="never">
+        		<xul:image class="menulist-dropmarker" inherits="disabled"/>
+          </xul:box>
+        </xul:box>
+        <xul:spring class="menulist-right-btm" inherits="disabled"/>
+      </xul:box>
     </content>
-    <handlers>
-      <handler event="command" phase="capturing" action="if (event.target.localName == 'menuitem') { this.selectedItem = event.target; this.data = this.selectedItem.data; }"/>
-	</handlers>
-    <implementation>
-      <property name="data" onset="this.setAttribute('data',val); return val;"
-                            onget="return this.getAttribute('data');"/>
-    </implementation>  
   </binding>
 
   <binding id="scrollbar">
@@ -212,4 +228,29 @@
 	</content>
   </binding>
 
+ <binding id="largeheader" extends="xul:box">
+    <content>
+      <xul:box class="largeheader-box" flex="1">
+        <xul:box class="largeheader-text-container" orient="vertical">
+          <xul:spring flex="1"/>
+          <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
+          <xul:html class="largeheader-desc-text" inherits="value=description"/>
+          <xul:spring flex="1"/>
+        </xul:box>
+        <xul:spring flex="1"/>
+        <xul:box class="largeheader-icon-container" autostretch="never">
+          <xul:image class="largeheader-icon" inherits="src"/>
+        </xul:box>
+      </xul:box>
+    </content>
+  </binding>
+  
+  <binding id="splitter" extends="xul:splitter">
+    <content autostretch="always">
+      <xul:box class="splitter-internal-box" flex="1" autostretch="never">
+        <children/>
+      </xul:box>
+  	</content>
+  </binding>
+
 </bindings>
diff --git a/themes/modern/global/grippy-horizontal-active.gif b/themes/modern/global/grippy-horizontal-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/grippy-horizontal-after.gif b/themes/modern/global/grippy-horizontal-after.gif
index eab08611074..e69de29bb2d 100644
Binary files a/themes/modern/global/grippy-horizontal-after.gif and b/themes/modern/global/grippy-horizontal-after.gif differ
diff --git a/themes/modern/global/grippy-horizontal-before.gif b/themes/modern/global/grippy-horizontal-before.gif
index 44bec740d62..e69de29bb2d 100644
Binary files a/themes/modern/global/grippy-horizontal-before.gif and b/themes/modern/global/grippy-horizontal-before.gif differ
diff --git a/themes/modern/global/grippy-vertical-active.gif b/themes/modern/global/grippy-vertical-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/grippy-vertical-after.gif b/themes/modern/global/grippy-vertical-after.gif
index 29a5ebba666..e69de29bb2d 100644
Binary files a/themes/modern/global/grippy-vertical-after.gif and b/themes/modern/global/grippy-vertical-after.gif differ
diff --git a/themes/modern/global/grippy-vertical-before.gif b/themes/modern/global/grippy-vertical-before.gif
index 77d2476f399..e69de29bb2d 100644
Binary files a/themes/modern/global/grippy-vertical-before.gif and b/themes/modern/global/grippy-vertical-before.gif differ
diff --git a/themes/modern/global/mb-grippy-bg-active.gif b/themes/modern/global/mb-grippy-bg-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/mb-grippy-bg.gif b/themes/modern/global/mb-grippy-bg.gif
new file mode 100644
index 00000000000..2110debc063
Binary files /dev/null and b/themes/modern/global/mb-grippy-bg.gif differ
diff --git a/themes/modern/global/mb-grippy-btm-active.gif b/themes/modern/global/mb-grippy-btm-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/mb-grippy-btm.gif b/themes/modern/global/mb-grippy-btm.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/mb-grippy-top-active.gif b/themes/modern/global/mb-grippy-top-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/mb-grippy-top.gif b/themes/modern/global/mb-grippy-top.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/menu.css b/themes/modern/global/menu.css
index f8037d1b394..c783a24986c 100644
--- a/themes/modern/global/menu.css
+++ b/themes/modern/global/menu.css
@@ -1,13 +1,15 @@
  
 menubar 
   {
-  background-color      : #B4C3D4;
-	border-top            : 1px solid #7693B3;
+    background-color      : #B4C3D4;
+    border-top            : 1px solid #82929C;
+    border-bottom         : 1px solid #000000;
   }
 
-menubar > .toolbar-holder {
-	border-bottom         : 1px solid #597899;
-}
+menubar > .toolbar-holder 
+  {
+    border-left           : 1px solid #D6E7FF;
+  }
   
 menu, menuitem  
   {
@@ -213,15 +215,44 @@ menuitem[checked="true"][type="radio"][menuactive="true"]
 autorepeatbutton {
   text-align: center;
   vertical-align: middle;
+  padding: 1px;
 }
 
 autorepeatbutton:hover {
-  background-color: #336699;
+  background-color: #486380;
 }
 
+/*
+ * Menubar grippy 
+ */
 
+menubar > toolbargrippy
+  { 
+    background-image     : url("chrome://global/skin/mb-grippy-bg.gif");
+  } 
 
+menubar > toolbargrippy > .toolbargrippy-top
+  {
+    background-image     : url("chrome://global/skin/mb-grippy-top.gif");
+  }
+
+menubar > toolbargrippy > .toolbargrippy-btm
+  {
+    background-image     : url("chrome://global/skin/mb-grippy-btm.gif");
+  }
   
-  
-  
-  
+menubar > toolbargrippy:hover:active
+  {
+    background-image     : url("chrome://global/skin/mb-grippy-bg-active.gif");
+  }
+
+menubar > toolbargrippy:hover:active > .toolbargrippy-top
+  {
+  	background-image     : url("chrome://global/skin/mb-grippy-top-active.gif");
+  }
+
+menubar > toolbargrippy:hover:active > .toolbargrippy-btm
+  {
+  	background-image     : url("chrome://global/skin/mb-grippy-btm-active.gif");
+  }
+
diff --git a/themes/modern/global/splitter.css b/themes/modern/global/splitter.css
index 1a6bf532265..d4a62345bfa 100644
--- a/themes/modern/global/splitter.css
+++ b/themes/modern/global/splitter.css
@@ -1,23 +1,44 @@
 /******* Splitters *******/
 
 /* vertical splitters */
-  window > splitter, box > splitter, splitter
+  splitter
     {
-      min-width             : 10px;
-      border: none;
-      background-image      : url("chrome://global/skin/splitter-horizontal-bg.gif");
+      -moz-binding          : url("chrome://global/skin/globalBindings.xml#splitter");
+      border-left           : 1px solid #000000;
+      border-right          : 1px solid #000000;
+      background-color      : #7B969C;
       text-align            : center;
+      vertical-align        : middle;
       cursor                : e-resize;
     }
   
+  splitter > .splitter-internal-box
+    {
+      min-width             : 5px;
+      border-left           : 1px solid #C6D3D6;
+      border-top            : 1px solid #C6D3D6;
+      border-right          : 1px solid #63717B;
+      border-bottom         : 1px solid #63717B;
+    }
+
 /* horizontal splitters */  
   rows > splitter,
   window[orient="vertical"] > splitter,
   box[orient="vertical"] > splitter
     {
+      border-left           : none;
+      border-top            : 1px solid #000000;
+      border-right          : none;
+      border-bottom         : 1px solid #000000;
       cursor                : n-resize;
-      background-image      : url("chrome://global/skin/splitter-vertical-bg.gif");
-      min-height            : 10px;
+      text-align            : center;
+    }
+
+  rows > splitter > .splitter-internal-box,
+  window[orient="vertical"] > splitter > .splitter-internal-box,
+  box[orient="vertical"] > splitter > .splitter-internal-box
+    {
+      min-height            : 5px;
     }
 
 /******* Grippies *******/
@@ -26,19 +47,19 @@
     {
   	  margin                : 0px;
   	  padding               : 0px;
-  	  cursor                : pointer;
-      width             : 10px;
-      height            : 110px;
+      width                 : 5px;
+      height                : 63px;
       background-color      : transparent;
       background-repeat     : no-repeat;
       background-position   : 50% 50%;
+  	  cursor                : pointer;
     }
 
   window[orient="vertical"] > splitter > grippy,
   box[orient="vertical"] > splitter > grippy
     {
-      width             : 110px;
-      height            : 10px;
+      width             : 63px;
+      height            : 5px;
     }
     
   /* ................. Normal state ................ */
@@ -46,99 +67,76 @@
   /* vertical grippies */
   splitter[collapse="before"] > grippy
     {
-      background-image      : url("chrome://global/skin/grippy-horizontal-before.gif");
+      background-image      : url("chrome://global/skin/grippy-vertical-before.gif");
     }
 
   splitter[collapse="after"] > grippy
     {
-      background-image      : url("chrome://global/skin/grippy-horizontal-after.gif");
+      background-image      : url("chrome://global/skin/grippy-vertical-after.gif");
     }
 
   /* horizontal grippies */
   window[orient="vertical"] > splitter[collapse="before"] > grippy,
   box[orient="vertical"] > splitter[collapse="before"] > grippy
     {
-      background-image    : url("chrome://global/skin/grippy-vertical-before.gif");
+      background-image    : url("chrome://global/skin/grippy-horizontal-before.gif");
     }  
 
   window[orient="vertical"] > splitter[collapse="after"] > grippy,
   box[orient="vertical"] > splitter[collapse="after"] > grippy
     {
-      background-image    : url("chrome://global/skin/grippy-vertical-after.gif");
+      background-image    : url("chrome://global/skin/grippy-horizontal-after.gif");
     }  
     
-  /* ................. Hover state ................ */
+  /* ................. Active state ................ */
 
-  splitter[collapse="before"] > grippy:hover
+  /* vertical grippies */
+  splitter[collapse="before"] > grippy:hover:active
     {
-      background-image      : url("chrome://global/skin/grippy-horizontal-before-h.gif");
+      background-image      : url("chrome://global/skin/grippy-vertical-active.gif");
     }
 
-  splitter[collapse="after"] > grippy:hover
+  splitter[collapse="after"] > grippy:hover:active
     {
-      background-image      : url("chrome://global/skin/grippy-horizontal-after-h.gif");
+      background-image      : url("chrome://global/skin/grippy-vertical-active.gif");
     }
 
-  window[orient="vertical"] > splitter[collapse="before"] > grippy:hover,
-  box[orient="vertical"] > splitter[collapse="before"] > grippy:hover
+  /* horizontal grippies */
+  window[orient="vertical"] > splitter[collapse="before"] > grippy:hover:active,
+  box[orient="vertical"] > splitter[collapse="before"] > grippy:hover:active
     {
-      background-image    : url("chrome://global/skin/grippy-vertical-before-h.gif");
+      background-image    : url("chrome://global/skin/grippy-horizontal-active.gif");
     }  
 
-  window[orient="vertical"] > splitter[collapse="after"] > grippy:hover,
-  box[orient="vertical"] > splitter[collapse="after"] > grippy:hover
+  window[orient="vertical"] > splitter[collapse="after"] > grippy:hover:active,
+  box[orient="vertical"] > splitter[collapse="after"] > grippy:hover:active
     {
-      background-image    : url("chrome://global/skin/grippy-vertical-after-h.gif");
+      background-image    : url("chrome://global/skin/grippy-horizontal-active.gif");
     }  
 
   /* ................. Collapsed state ................ */
 
-
+  /* vertical grippies */
   splitter[collapse="before"][state="collapsed"] > grippy
     {
-      background-image      : url("chrome://global/skin/grippy-horizontal-after.gif");
+      background-image      : url("chrome://global/skin/grippy-vertical-after.gif");
     }
 
   splitter[collapse="after"][state="collapsed"] > grippy
     {
-      background-image      : url("chrome://global/skin/grippy-horizontal-before.gif");
+      background-image      : url("chrome://global/skin/grippy-vertical-before.gif");
     }
 
+  /* horizontal grippies */
   window[orient="vertical"] > splitter[collapse="before"][state="collapsed"] > grippy,
   box[orient="vertical"] > splitter[collapse="before"][state="collapsed"] > grippy
     {
-      background-image    : url("chrome://global/skin/grippy-vertical-after.gif");
+      background-image    : url("chrome://global/skin/grippy-horizontal-after.gif");
     }  
 
   window[orient="vertical"] > splitter[collapse="after"][state="collapsed"] > grippy,
   box[orient="vertical"] > splitter[collapse="after"][state="collapsed"] > grippy
     {
-      background-image    : url("chrome://global/skin/grippy-vertical-before.gif");
+      background-image    : url("chrome://global/skin/grippy-horizontal-before.gif");
     }  
 
-   /* ................. Collapsed Hover state ................ */
-
-
-  splitter[collapse="before"][state="collapsed"] > grippy:hover
-    {
-      background-image      : url("chrome://global/skin/grippy-horizontal-after-h.gif");
-    }
-
-  splitter[collapse="after"][state="collapsed"] > grippy:hover
-    {
-      background-image      : url("chrome://global/skin/grippy-horizontal-before-h.gif");
-    }
-
-  window[orient="vertical"] > splitter[collapse="before"][state="collapsed"] > grippy:hover,
-  box[orient="vertical"] > splitter[collapse="before"][state="collapsed"] > grippy:hover
-    {
-      background-image    : url("chrome://global/skin/grippy-vertical-after-h.gif");
-    }  
-
-  window[orient="vertical"] > splitter[collapse="after"][state="collapsed"] > grippy:hover,
-  box[orient="vertical"] > splitter[collapse="after"][state="collapsed"] > grippy:hover
-    {
-      background-image    : url("chrome://global/skin/grippy-vertical-before-h.gif");
-    }  
-    
-    
diff --git a/themes/modern/global/tb-grippy-bg-active.gif b/themes/modern/global/tb-grippy-bg-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/tb-grippy-bg.gif b/themes/modern/global/tb-grippy-bg.gif
new file mode 100644
index 00000000000..c3bdadbe45a
Binary files /dev/null and b/themes/modern/global/tb-grippy-bg.gif differ
diff --git a/themes/modern/global/tb-grippy-btm-active.gif b/themes/modern/global/tb-grippy-btm-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/tb-grippy-btm.gif b/themes/modern/global/tb-grippy-btm.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/tb-grippy-collapsed-active.gif b/themes/modern/global/tb-grippy-collapsed-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/tb-grippy-collapsed.gif b/themes/modern/global/tb-grippy-collapsed.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/tb-grippy-top-active.gif b/themes/modern/global/tb-grippy-top-active.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/tb-grippy-top.gif b/themes/modern/global/tb-grippy-top.gif
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/themes/modern/global/toolbar.css b/themes/modern/global/toolbar.css
index 582d94f5b8c..5f565c0e6d6 100644
--- a/themes/modern/global/toolbar.css
+++ b/themes/modern/global/toolbar.css
@@ -1,29 +1,99 @@
-/* this file is not used */
-
-toolbox
-  {
-    background-color      : #999999;
-  }
-  
+/**
+ * toolbar
+ **/ 
+ 
 toolbar
   {
-    background-color      : #CCCCCC;
-    border                : 1px outset #CCCCCC;
+    border-bottom         : 1px solid #000000;
+  	background-color	    : #5B7693;
+    // DON'T DELETE.  Removes disappearance of scrollbars in content pane when window is made smaller.
+    // Talk to evaughan@netscape.com for details.
+    min-width			        : 1px;      
   }
 
-toolbargrippy
+toolbar > .toolbar-holder 
   {
-    background-color      : #CCCCCC;
-    border                : 1px solid #CCCCCC;
+    border-left          : 1px solid #92ABC9;
+    border-top           : 1px solid #92ABC9;
   }
   
-toolbar[collapsed="true"] > toolbargrippy
-  {
-    width                 : 30px;
-  }
-  
-toolbarseparator 
+/**
+ * toolbargrippy 
+ **/
+ 
+toolbargrippy 
   { 
-    width                 : 2em;
+    -moz-binding         : url("chrome://global/skin/globalBindings.xml#toolbargrippy");
+    background-image     : url("chrome://global/skin/tb-grippy-bg.gif");
+    width                : 12px;
+    margin				       : 0px;
+  } 
+
+.toolbargrippy-top 
+  {
+    background-image     : url("chrome://global/skin/tb-grippy-top.gif");
+    height                : 3px;
   }
 
+.toolbargrippy-btm 
+  {
+    background-image     : url("chrome://global/skin/tb-grippy-btm.gif");
+    height                : 8px;
+  }
+  
+toolbargrippy:hover:active
+  {
+    background-image     : url("chrome://global/skin/tb-grippy-bg-active.gif");
+  }
+
+toolbargrippy:hover:active > .toolbargrippy-top
+  {
+  	background-image     : url("chrome://global/skin/tb-grippy-top-active.gif");
+  }
+
+toolbargrippy:hover:active > .toolbargrippy-btm
+  {
+  	background-image     : url("chrome://global/skin/tb-grippy-btm-active.gif");
+  }
+
+/**
+ * collapsed tray and grippies
+ **/
+  
+.collapsed-tray-holder
+  {
+    background-color    : #5B7693;
+    height              : 11px;
+  	border-bottom		    : 1px solid #000000;
+  }
+
+toolbargrippy[tbgrippy-collapsed="true"]
+  {
+    -moz-binding          : url("chrome://global/skin/globalBindings.xml#toolbargrippy-collapsed");
+    background-image      : none;
+    width                 : 200px;
+  }
+
+toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-collapsed-left
+  {
+    background-image      : url("chrome://global/skin/tb-grippy-collapsed.gif");
+    width                 : 12px;
+  }
+
+toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-collapsed-context
+  {
+  	background-color	    : #5B7693;
+    border                : 1px outset #5B7693;
+  }
+
+toolbargrippy[tbgrippy-collapsed="true"]:hover:active > .toolbargrippy-collapsed-left
+  {
+    background-image      : url("chrome://global/skin/tb-grippy-collapsed-active.gif");
+  }
+
+toolbargrippy[tbgrippy-collapsed="true"]:hover:active > .toolbargrippy-collapsed-context
+  {
+    border-style          :inset;
+  }
+
+
diff --git a/themes/modern/messenger/addressbook/addressbook.css b/themes/modern/messenger/addressbook/addressbook.css
index 1e70c458e47..0fa84b15305 100644
--- a/themes/modern/messenger/addressbook/addressbook.css
+++ b/themes/modern/messenger/addressbook/addressbook.css
@@ -25,9 +25,14 @@ Rights Reserved.
  
 /* CardView styles - used in the Card View Pane*/
 
+#CardViewOuterBox {
+  border-left: 1px solid #63717B;
+}
+
 #CardViewBox {
 	overflow: auto;
 	background-color: #EFEFEF;
+  border-left: 1px solid #000000;
 	min-width: 150px;
 	-moz-user-focus: ignore;
 }
@@ -119,10 +124,6 @@ tree[class="abResults"] treeitem > treerow > treecell.cardicon {
 
 /* Address Book specific style */
 
-#results_box {
-	border-left: 8px solid #CCCCCC;
-}
- 
 [hide] {
   visibility: collapse;
 }
@@ -278,16 +279,32 @@ tree[class="abResults"] treeitem > treerow > treecell.cardicon {
 treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty {
   list-style-image: none !important;
   padding-left: 12px;                                         
-}    
+}
+
+#sidebar-splitter {
+  border: none;
+}
+
+#sidebar-splitter > .splitter-internal-box {
+  border-right: none;
+}
+
+#results-splitter {
+  border-top: 1px solid #7B969C;
+}
+
+#results-splitter > box {
+  border-left: none;
+}
+
+/* prevents double border when touching status-bar */
+#results-splitter[state="collapsed"]
+{
+  border-bottom: none;
+}
 
 /*** Styles for abSelectAddressesDialog.xul ***/
 
-box[orient="horizontal"] > splitter {
-}
-
-box[orient="vertical"] > splitter {
-}
-
 #3PaneBox {
 	border-top		: 1px solid #000000; 
 	border-bottom	: 1px solid #000000;
@@ -298,7 +315,6 @@ box[orient="vertical"] > splitter {
 	width			: 180px;
 	height			: 100%; 
 	background-color: #FFFFFF;
-	border-right	: 1px solid #000000;
 }
 
 #dirTree { // Tree that lists different Address Books
@@ -306,6 +322,11 @@ box[orient="vertical"] > splitter {
 	min-width		: 10px;
 }
 
+#vertical-splitter,
+#vertical-splitter > box {
+  border-right : none;
+}
+
 #results-bucket-tree-box {
 	border-right	: 1px solid #000000;
 }
@@ -318,23 +339,38 @@ box[orient="vertical"] > splitter {
 #resultsTree {
 	height			: 100px; 
 	min-width		: 10px;
+	border-left: 1px solid #63717B;
+	border-top: 1px solid #63717B;
 }
 
-#addToBucketButtonBox { // Row of "To" "CC" and "Bcc" buttons
+#resultsTree > treerows {
+	border-left: 1px solid #000000;
+}
+
+#bucket-splitter > box {
+  border-left: none;
+}
+
+#addToBucketButtonBox {
+  border-left : 1px solid #000000;
 	padding			: 0.3em; 
 	min-width		: 10px;
 }
 
 #bucketBox {
 	height			: 170px;
-	border-top		: 1px solid #000000;
 }
 
 #addressBucket {
+  border-left : 1px solid #63717B;
 	height			: 100px; 
 	min-width		: 10px;
 }
 
+#addressBucket > treerows {
+  border-left : 1px solid #000000;
+}
+
 #rightColumnButtonBox { // Column with "New", "Edit" and "Remove" buttons
 	padding			: .5em; 
 	padding-right	: 0px;
@@ -347,3 +383,4 @@ box[orient="vertical"] > splitter {
 .middle-button-spring {  // Springs between To, CC, and BCC buttons
 	width			: 10px;
 }
+
diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css
index c236baada35..efac6c6fde7 100644
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@@ -28,6 +28,11 @@
  display: none;
 } 
 
+.sidebarheader-main 
+{
+  border-bottom: 1px solid #000000;
+}
+
 dummy.usesMailWidgets {
  -moz-binding: url(chrome://messenger/content/mailWidgets.xml#dummy);
 }
@@ -186,13 +191,13 @@ iframe {
 }
 
 #button-file[disabled="true"],
-#button-file[disabled="true"]:hover,
-#button-file[disabled="true"]:hover:active
+menu:hover > #button-file[disabled="true"],
+menu:hover:active > #button-file[disabled="true"]
   {
     list-style-image      : url("chrome://messenger/skin/file-disabled.gif");
   } 
 
-#button-file:hover
+menu:hover > #button-file
   {
     list-style-image      : url("chrome://messenger/skin/file-hover.gif");
   } 
@@ -481,31 +486,132 @@ searchterm {
  behavior: url(chrome://messenger/content/mailWidgets.xml#searchterm);
 }
 
+#status-bar
+{
+  border-left: 1px solid #63717B;
+  border-top: none;
+}
+
+#status-bar > :first-child
+{
+  border-left         : 1px solid #000000;
+}
+
+/******
+ * Adjusting the borders on splitters so they seem to join where vertical meets horizontal
+ ******/
+
+#sidebar-splitter {
+  border: none;
+}
+
+#sidebar-splitter > .splitter-internal-box {
+  border-right: none;
+}
+
+#threadpane-splitter,
+#threadpane-splitter > box
+{
+  border-top: none;
+  border-left: none;
+  border-right: none;
+  border-bottom: none;
+}
+
+#threadpane-splitter[state="collapsed"]
+{
+  border-bottom: 1px solid #000000;
+}
+
+#threadpane-splitter[state="collapsed"] > box
+{
+  border-bottom: 1px solid #63717B;
+}
+
+.gray-vertical-splitter,
+.gray-vertical-splitter > box
+{
+  border-right: none;
+}
+
+.gray-vertical-splitter > box
+{
+  border-bottom: none;
+}
+
+#sidebar-panels-splitter,
+#sidebar-panels-splitter > box
+{
+  border-top: none;
+}
+
 /** 
- *Focus rings on 3 pane view
- */
+ * Focus rings on 3 pane view
+ **/
+ 
+#folderTree
+{
+  border-left: 1px solid #63717B;
+  border-bottom: 1px solid #C6D3D6;
+}
+
+#folderTree > .tree-container-treerows
+{
+  border-left: 1px solid #000000;
+  border-bottom: 1px solid #7B969C;
+}
+
+#threadTree
+{
+  border-left: 1px solid #63717B;
+  border-right: none;
+  border-bottom: 1px solid #C6D3D6;
+}
+
+#threadTree > .tree-container-treerows
+{
+  border-left: 1px solid #000000;
+  border-bottom: 1px solid #7B969C;
+}
 
 #folderTree > treehead,
 #threadTree[focusring="false"] > treehead
 {
   border-left: 1px solid #EFEFEF;
-  border-top: 1px solid #EFEFEF;
+  border-top: 1px solid transparent;
+}
+
+#folderTree > treehead
+{
   border-right: 1px solid transparent;
 }
 
+#threadTree[focusring="false"] > treehead
+{
+  border-top: 1px solid #63717B;
+}
+
 #folderTree > treechildren,
 #threadTree[focusring="false"] > treechildren
 {
   border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
   border-bottom: 1px solid transparent;
 }
 
+#folderTree > treechildren
+{
+  border-right: 1px solid transparent;
+}
+
 #folderTree:focus > treehead,
 #threadTree[focusring="true"]  > treehead
 {
   border-left: 1px solid black;
   border-top: 1px solid black;
+}
+
+#folderTree:focus > treehead
+{
   border-right: 1px solid black;
 }
 
@@ -513,55 +619,43 @@ searchterm {
 #threadTree[focusring="true"]  > treechildren
 {
   border-left: 1px solid black;
-  border-right: 1px solid black;
   border-bottom: 1px solid black;
 }
 
-#folderTree > treehead > treerow > .treecell-header:first-child,
+#folderTree:focus > treechildren
+{
+  border-right: 1px solid black;
+}
+
 #threadTree > treehead > treerow > .treecell-header:first-child
 {
   border-left: none;
 }
 
-#folderTree > treehead > treerow > .treecell-header,
-#threadTree > treehead > treerow > .treecell-header
+#messagepanebox
 {
-  border-top: none !important;
-}
-
-#folderTree > treehead > treerow > .treecell-header > .treecell-header-box,
-#threadTree > treehead > treerow > .treecell-header > .treecell-header-box 
-{
-  border-top: none  !important;
+  border-left: 1px solid #63717B;
+  border-top: 1px solid #63717B;
+  border-bottom: 1px solid #000000;
 }
 
 #msgHeaderView {
-  border-left: 1px solid #8C9EA5;
-  border-top: 1px solid #EFEFEF;
-  border-right: 1px solid #EFEFEF;
+  border-left: 1px solid #000000;
+  border-top: 1px solid #000000;
+  border-right: 1px solid #7B969C;
 }
 
-#messagepane {
-  border-left: 1px solid transparent;
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-}
-
-#messagepanebox[focusring="true"] > #msgHeaderView
+#messagepane
 {
   border-left: 1px solid #000000;
   border-top: 1px solid #000000;
-  border-right: 1px solid #000000;
+  border-bottom: none;
 }
 
-#messagepanebox[focusring="true"] > #messagepane
+#messagepanebox[focusring="true"]
 {
-  border-left: 1px solid black;
-  border-right: 1px solid black;
-  border-bottom: 1px solid black;
+  border-left: 1px solid #000000;
+  border-top: 1px solid #000000;
+  border-bottom: 1px solid #000000;
 }
 
-sidebarheader 
-{
-  border: 1px solid #5C7794;
-}
diff --git a/themes/modern/messenger/messengercompose/messengercompose.css b/themes/modern/messenger/messengercompose/messengercompose.css
index a077f5cf785..b4ff4c3b262 100644
--- a/themes/modern/messenger/messengercompose/messengercompose.css
+++ b/themes/modern/messenger/messengercompose/messengercompose.css
@@ -19,7 +19,6 @@
  */
 
 @import url(chrome://communicator/skin/);
-@import url(chrome://communicator/skin/sidebar/sidebar.css);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
@@ -43,23 +42,6 @@ box.padded {
 
 /* Header toolbar */
 
-#MsgHeadersToolbar {
-	background-color	: #394B6E;
-	border-top			: 2px solid #4C6484;
-	border-bottom		: 0px;
-	border-left			: 1px solid #48607E;
-	border-right		: 2px solid #4D6685;
-}
-
-#MsgHeadersToolbar > toolbargrippy {
-	border-top			: 1px solid #B6CADF;
-	margin-left			: 0px;
-}
-
-#msgheaderstoolbar-box {
-	border-top			: 1px solid #B6CADF;
-}
-
 /* Text labels only for this window */
 
 .label {
@@ -333,3 +315,7 @@ tree#attachmentBucket {
 #convertDefault {
 	list-style-image:url("chrome://global/skin/question-icon.gif");
 } /* Workaround for bug 50217. Please remove this rule, when this bug is fixed. */
+
+#compose-toolbar-sizer {
+  border-top: none;
+}
\ No newline at end of file
diff --git a/themes/modern/messenger/msgHdrViewOverlay.css b/themes/modern/messenger/msgHdrViewOverlay.css
index 0a710e6b93d..92866286500 100644
--- a/themes/modern/messenger/msgHdrViewOverlay.css
+++ b/themes/modern/messenger/msgHdrViewOverlay.css
@@ -44,6 +44,10 @@ mail-emailaddress {
 .header-part2           { background-color: #CCCCCC; border: none; }
 .header-part3           { background-color: #CCCCCC; border: none; }
 
+#msgHeaderView > toolbar > .toolbar-holder {
+  border: none;
+}
+
 .headerValueBox { width: 7.7em; text-align: right;}
 
 #addToAddressBookButton {
diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css
index 8a0c9ed04da..567ada4c804 100644
--- a/themes/modern/navigator/navigator.css
+++ b/themes/modern/navigator/navigator.css
@@ -179,16 +179,18 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 /*all the urlbar stuff*/
 
-#nav-bar > .toolbar-primary-image-left, #nav-bar > .toolbar-primary-image-middle, #nav-bar > .toolbar-primary-image-right
+#nav-bar > .toolbar-primary-image-left, 
+#nav-bar > .toolbar-primary-image-middle, 
+#nav-bar > .toolbar-primary-image-right
 {
 	max-height	: 43px;
 }
 
 #nav-bar-inner
   {
-  	-moz-binding		  : url("chrome://global/skin/globalBindings.xml#nav-bar-inner");
-	margin				  : 6px 0px 9px 6px;
-    min-width			  : 0px;
+    -moz-binding		  : url("chrome://global/skin/globalBindings.xml#nav-bar-inner");
+    margin				    : 6px 0px 9px 6px;
+    min-width			    : 0px;
   }
 
 .navbar-inner-groove-image-left                                                 
@@ -256,7 +258,10 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 	height                            : 18px;                               
   }
 
-
+#urlbar
+  {
+    -moz-binding		  : url(chrome://global/content/xulBindings.xml#textfield);
+  }
 
 #page-proxy-button 
   {
@@ -359,8 +364,38 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
     -moz-user-focus       : ignore !important;
   }
 
-#PersonalToolbar
+/**********
+ * The grippy in the navigator primary-toolbar
+ ********/
+
+#navbar > .toolbar-primary-grippy
+  { 
+    background-image     : url("chrome://communicator/skin/pt-grippy-bg.gif");
+  } 
+
+#navbar > .toolbar-primary-grippy > .toolbargrippy-top
   {
-  	background-color	  : #394B6E;
-    border-bottom       : 1px solid #000000;
+    background-image     : url("chrome://communicator/skin/pt-grippy-top.gif");
+    height               : 5px;
+  }
+
+#navbar > .toolbar-primary-grippy > .toolbargrippy-btm
+  {
+    background-image     : url("chrome://communicator/skin/pt-grippy-btm.gif");
+    height               : 38px;
+  }
+  
+#navbar > .toolbar-primary-grippy:hover:active
+  {
+    background-image     : url("chrome://communicator/skin/pt-grippy-bg-active.gif");
+  }
+
+#navbar > .toolbar-primary-grippy:hover:active > .toolbargrippy-top
+  {
+  	background-image     : url("chrome://communicator/skin/pt-grippy-top-active.gif");
+  }
+
+#navbar > .toolbar-primary-grippy:hover:active > .toolbargrippy-btm
+  {
+  	background-image     : url("chrome://communicator/skin/pt-grippy-btm-active.gif");
   }