diff --git a/mozilla/themes/classic/global/Makefile.in b/mozilla/themes/classic/global/Makefile.in
index 0d29cc5d2ae..52cc9327e63 100644
--- a/mozilla/themes/classic/global/Makefile.in
+++ b/mozilla/themes/classic/global/Makefile.in
@@ -28,6 +28,113 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk
 
-DIRS = win
+DIRS = win unix
+
+# split EXPORT_RESOURCE_SAMPLES in two otherwise the generated commands
+# can be too long for some systems.
+EXPORT_RESOURCE_SAMPLES_1 = \
+	animthrob.gif \
+	animthrob_single.gif \
+	blank.gif \
+	check-check-disabled.gif \
+	check-check.gif \
+	check-radio-disabled.gif \
+	check-radio.gif \
+	columnselect.gif \
+	dir-closed.gif \
+	dir-open.gif \
+	gray-bottomleft.gif \
+	gray-bottomright.gif \
+	gray-topright.gif \
+	grippy-horizontal-after.gif \
+	grippy-horizontal-before.gif \
+	grippy-vertical-after.gif \
+	grippy-vertical-before.gif \
+	lessCOls_dis.gif \
+	lessCols.gif \
+	lessCols_mo.gif \
+	menu-arrow-disabled.gif \
+	menu-arrow-hover.gif \
+	menu-arrow.gif \
+	menu-check-disabled.gif \
+	menu-check-hover.gif \
+	menu-check.gif \
+	menu-radio-disabled.gif \
+	menu-radio-hover.gif \
+	menu-radio.gif \
+	moreCols.gif \
+	moreCols_dis.gif \
+	moreCols_mo.gif \
+	print-disabled.gif \
+	print-hover-active.gif \
+	print-hover.gif \
+	print.gif \
+	progressmeter-busy.gif \
+	return-disabled.gif \
+	return.gif \
+	arrow-up.gif \
+	arrow-down.gif \
+	arrow-left.gif \
+	arrow-right.gif \
+	scroll-down-disabled.gif \
+	scroll-down-hover.gif \
+	scroll-down.gif \
+	scroll-left-disabled.gif \
+	scroll-left-hover.gif \
+	scroll-left.gif \
+	scroll-right-disabled.gif \
+	scroll-right-hover.gif \
+	scroll-right.gif \
+	scroll-up-disabled.gif \
+	scroll-up-hover.gif \
+	scroll-up.gif \
+	search.gif \
+	seltab-leftedge.gif \
+	seltab-rightedge.gif \
+	sortAscending.gif \
+	sortDescending.gif \
+	stop-disabled.gif \
+	stop-hover-active.gif \
+	stop-hover.gif \
+	stop.gif \
+	$(NULL)
+
+EXPORT_RESOURCE_SAMPLES_2 = \
+	tab-leftedge.gif \
+	tab-rightedge.gif \
+	taskbar-addressbook.gif \
+	taskbar-addressbook-hover.gif \
+	taskbar-composer.gif \
+	taskbar-composer-hover.gif \
+	taskbar-mail.gif \
+	taskbar-mail-hover.gif \
+	taskbar-gotmail.gif \
+	taskbar-gotmail-hover.gif \
+	taskbar-navigator.gif \
+	taskbar-navigator-hover.gif \
+	taskbar-popup-arrow.gif \
+	taskbar-tab-hover.gif \
+	taskbar-tab-minimized.gif \
+	taskbar-tab-trans.gif \
+	taskbar-tab.gif \
+	toolbargrippy-twisty.gif \
+	toolbargrippy-texture.gif \
+	tbg-twisty-collapsed.gif \
+	tbg-texture-collapsed.gif \
+	loading.gif \
+	splitter-drag-bg.gif \
+	dropmarker-down-on-active.gif \
+	dropmarker-down-on-hover.gif \
+	dropmarker-down-disabled.gif \
+	dropmarker-down-on.gif \
+	dropmarker-up-on.gif \
+	menubuttonBindings.xml \
+	twisty-closed-active.gif \
+	twisty-closed.gif \
+	twisty-closed-selected.gif \
+	twisty-open-active.gif \
+	twisty-open.gif \
+	twisty-open-selected.gif \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/themes/classic/global/unix/Makefile.in b/mozilla/themes/classic/global/unix/Makefile.in
index 652a758dd68..6252480a21c 100644
--- a/mozilla/themes/classic/global/unix/Makefile.in
+++ b/mozilla/themes/classic/global/unix/Makefile.in
@@ -27,4 +27,5 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(THEME_ROOT_DEPTH)/theme.mk
+
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/themes/classic/global/unix/checkbox.css b/mozilla/themes/classic/global/unix/checkbox.css
index 609f9211e36..dd229f3ae57 100644
--- a/mozilla/themes/classic/global/unix/checkbox.css
+++ b/mozilla/themes/classic/global/unix/checkbox.css
@@ -14,10 +14,11 @@
       border-left         : 1px solid threedshadow;
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
-      background-color    : #FFFFFF;
+      background-color    : window;
       margin              : 2px 2px 0px 0px;
       width               : 13px;
       height              : 13px;
+      -moz-user-focus     : ignore;
     }
 
   .checkbox-checkmark-box-1[disabled="true"]
@@ -80,4 +81,7 @@
       padding             : 0px;
     }
     
-    
+  .checkbox-internal-box
+    {
+      -moz-user-focus     : none;
+    }
diff --git a/mozilla/themes/classic/global/unix/jar.mn b/mozilla/themes/classic/global/unix/jar.mn
index f9097d06e0b..69f664f81eb 100644
--- a/mozilla/themes/classic/global/unix/jar.mn
+++ b/mozilla/themes/classic/global/unix/jar.mn
@@ -1,30 +1,23 @@
 classic.jar:
-    skin/classic/global/box.css
-    skin/classic/global/button.css
-    skin/classic/global/checkbox.css
-    skin/classic/global/commonDialog.css
-    skin/classic/global/console.css
-    skin/classic/global/filepicker.css
-    skin/classic/global/formatting.css
-    skin/classic/global/global.css
-    skin/classic/global/menu.css
-    skin/classic/global/menubutton.css
-    skin/classic/global/menulist.css
-    skin/classic/global/radio.css
-    skin/classic/global/scrollbars.css
-    skin/classic/global/splitter.css
-    skin/classic/global/tabcontrol.css
-    skin/classic/global/textfield.css
-    skin/classic/global/toolbar.css
-    skin/classic/global/tree.css
-    skin/classic/global/wizardOverlay.css
-    skin/classic/global/buttonBindings.xml
-    skin/classic/global/classicBindings.xml
-    skin/classic/global/menulistBindings.xml
-    skin/classic/global/treeBindings.xml
-    skin/classic/global/scrollbar-slider-bg.gif
-    skin/classic/global/error-icon.gif
-    skin/classic/global/message-icon.gif
-    skin/classic/global/question-icon.gif
-    skin/classic/global/alert-icon.gif
-    skin/classic/global/dialogOverlay.css
++   skin/classic/global/menulist.css
++   skin/classic/global/textfield.css
++   skin/classic/global/tree.css
++   skin/classic/global/radio.css
++   skin/classic/global/checkbox.css
+
+
+# Note: Unix uses the Windows classic skin, however there are a few
+# cases in which the classic skin must differ to accomodate it. 
+# This is one of those cases. We are forcing the background colour
+# of windows, trees and similar widgets to be white, rather than
+# 'window', as on linux this is grey, which is ugly and not the
+# intent. This file exists to specify the CSS files in which
+# the unix classic skin differs, and these files clobber the
+# css files jarred by the windows directory.
+#
+# This is not ideal, but ideally in the future unix will have its
+# own version of the Classic skin
+#
+# - Ben Goodger (09/21/2000) <ben@netscape.com>
+
+
diff --git a/mozilla/themes/classic/global/unix/menulist.css b/mozilla/themes/classic/global/unix/menulist.css
index f232c9fb11d..f430361b90a 100644
--- a/mozilla/themes/classic/global/unix/menulist.css
+++ b/mozilla/themes/classic/global/unix/menulist.css
@@ -1,4 +1,3 @@
-
 /* NEW WIDGET LANDING: <menulist> popup */
 
 /* outer frame */
@@ -9,8 +8,8 @@
       border-top          : 1px solid threedshadow;
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
-      background-color    : window;
-      color               : menutext;
+      background-color    : #FFFFFF;
+      color               : #000000;
       font                : pull-down-menu;
       margin              : 1px 5px 2px 5px;
     }
@@ -27,15 +26,16 @@
       border-top          : 1px solid threeddarkshadow;
       border-right        : 1px solid threedface;
       border-bottom       : 1px solid threedface;
+      -moz-user-focus     : ignore;
     }  
 
   .menulist-display-box,
   menulist[open="true"]:focus > .menulist-internal-box > .menulist-display-box
     {
-      border              : 1px solid window;
+      border              : 1px solid #FFFFFF;
       margin              : 1px;
-      background-color    : window;
-      color               : menutext;
+      background-color    : #FFFFFF;
+      color               : #000000;
     }     
     
   menulist:focus > .menulist-internal-box > .menulist-display-box
@@ -49,7 +49,7 @@
   .menulist-text 
     {
       padding             : 0px 2px 0px 2px;
-      margin:             : 0px;
+      margin              : 0px;
     }
     
 /* drop marker display frame */
@@ -97,17 +97,17 @@
   menulist > menupopup 
     {
       -moz-binding        : url("chrome://global/skin/menulistBindings.xml#menulistpopup");
-      background-color    : window;
+      background-color    : #FFFFFF;
       border              : 1px solid #000000;
       min-width           : 0px;
     }
 
   menulist > menupopup > menuitem 
     {
-      padding             : 0px 1px !important;
+      padding             : 0px 7px !important;
       min-width           : 0px;  /* should be in content*/
       max-width           : none; /* should be in content*/
-      border              : 1px solid window;
+      border              : 1px solid #FFFFFF;
     }
 
   menulist > menupopup > menuitem[menuactive="true"],
@@ -123,3 +123,36 @@
       width               : 0px;
       border              : none;
     }
+
+/**
+ * <menulist>s for things like mailnews addressing widget
+ **/    
+  .menulist-compact
+    {
+      -moz-binding        : url("chrome://global/skin/menulistBindings.xml#menulist-compact");
+      -moz-user-focus     : ignore;  /* we don't take focus */
+      border-left         : 1px solid threedhighlight;
+      border-top          : 1px solid threedhighlight;
+      border-right        : 1px solid threeddarkshadow;
+      border-bottom       : 1px solid threeddarkshadow;
+    }    
+    
+  .menulist-compact-text
+    {
+      margin-right        : 3px;
+    }  
+    
+  .menulist-compact-internal-box
+    {
+      border-right        : 1px solid threedshadow;
+      border-bottom       : 1px solid threedshadow;
+      background-color    : threedface;
+    }
+    
+  .menulist-compact-dropmarker
+    {
+      list-style-image    : url("chrome://global/skin/scroll-down.gif");
+      margin-left         : 2px;
+    }
+    
+    
diff --git a/mozilla/themes/classic/global/unix/radio.css b/mozilla/themes/classic/global/unix/radio.css
index d4ccfc28fa5..849f063912c 100644
--- a/mozilla/themes/classic/global/unix/radio.css
+++ b/mozilla/themes/classic/global/unix/radio.css
@@ -14,7 +14,7 @@
       border-left         : 1px solid threedshadow;
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
-      background-color    : #FFFFFF;
+      background-color    : window;
       -moz-border-radius  : 50%;
       margin              : 2px 2px 0px 0px;
       width               : 12px;
@@ -76,10 +76,13 @@
       color               : graytext;
     }
   
-  radio:focus > .radio-internal-box > .radio-text
+  radio[focused="true"] > .radio-internal-box > .radio-text
     { 
       border              : 1px dotted threeddarkshadow;
       padding             : 0px;
     }
     
-    
+  .radio-internal-box
+    {
+      -moz-user-focus     : ignore;
+    }    
diff --git a/mozilla/themes/classic/global/unix/textfield.css b/mozilla/themes/classic/global/unix/textfield.css
index 1efa28e0743..b843745cdf6 100644
--- a/mozilla/themes/classic/global/unix/textfield.css
+++ b/mozilla/themes/classic/global/unix/textfield.css
@@ -11,11 +11,11 @@
       border-top          : 1px solid threedshadow;
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
-      font                : field;
-      color               : windowtext;
+      font                : dialog;
+      color               : #000000;
       padding             : 0px;
-      margin              : 1px 3px 2px 4px;
-      background-color    : white;
+      margin              : 1px 5px 2px 5px;
+      background-color    : #FFFFFF;
       cursor              : text;
     }
     
@@ -40,6 +40,10 @@
   
   .textarea-internal-box
     {
+      border-left         : 1px solid threeddarkshadow;
+      border-top          : 1px solid threeddarkshadow;
+      border-right        : 1px solid threedface;
+      border-bottom       : 1px solid threedface;
       padding             : 0px 0px 0px 2px;
     }
   
@@ -50,12 +54,14 @@
       margin              : 0px;
       font                : inherit;
       background-color    : inherit;
+      color               : inherit;
     }
 
   textfield[disabled="true"] 
     {
       cursor              : default ! important;
       background-color    : threedface;
+      color               : graytext;
     } 
     
 /** plain atomic textfields, class="plain" **/
@@ -67,3 +73,30 @@
       margin              : 0px !important;
       border              : none !important;
     }
+
+  .autocomplete-icon
+    {
+      border              : none;
+      margin              : 0px;
+    }
+
+  .autocomplete-icon > .autocomplete-icon-internal-box
+    {
+      border              : none;
+      padding             : 0px;
+      margin              : 0px;
+    }  
+    
+  .autocomplete-icon-icon
+    {
+      margin              : 2px 3px 2px 3px;
+      list-style-image    : inherit;
+      cursor              : default !important;
+    }
+    
+  .autocomplete-icon-input
+    {
+      border              : none !important;
+    }    
+
+
diff --git a/mozilla/themes/classic/global/unix/tree.css b/mozilla/themes/classic/global/unix/tree.css
index 211539cb03d..b9ef774a5ff 100644
--- a/mozilla/themes/classic/global/unix/tree.css
+++ b/mozilla/themes/classic/global/unix/tree.css
@@ -7,24 +7,63 @@
  **/
 tree 
   {
-    background-color      : window;
+    background-color      : #FFFFFF;
     border-spacing        : 0px;
-    font                  : list;
     border-left           : 1px solid threedshadow;
     border-top            : 1px solid threedshadow;
     border-right          : 1px solid threedhighlight;
     border-bottom         : 1px solid threedhighlight;
   }
+
+.tree-container-treerows[dragover="true"][dragdroptree="true"]
+  {
+    border                : 2px solid highlight;
+    padding               : 0px;
+  }  
+  
+.tree-container-treerows
+  {
+    border-left           : 1px solid threeddarkshadow;
+    border-top            : 1px solid threeddarkshadow;
+    border-right          : 1px solid threedface;
+    border-bottom         : 1px solid threedface;
+  }  
+
+.tree-container-treerows[dragdroptree="true"]
+  {
+    padding               : 1px;
+  }  
   
 tree.inset
   {
     margin                : 1px 5px 2px 5px;
   }
 
-treeitem[selected="true"] > treerow { 
-	color: highlighttext;
-	background-color: highlight;
+tree > treechildren treeitem[selected="true"] > treerow
+  {
+	  color: buttontext;
+  	background-color: threedface;
+  }
+
+tree:focus > treechildren treeitem[selected="true"] > treerow
+  {
+	  color: highlighttext;
+  	background-color: highlight;
+  }
+
+treerow {
+  border: 1px solid transparent;
 }
+
+treehead > treerow {
+  border: none;
+}
+  
+tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow
+  {
+    border: 1px dotted CaptionText;
+  }
+
 treeitem[dd-dropon="true"] > treerow { 
 	color: highlighttext;
 	background-color: highlight;
@@ -34,36 +73,70 @@ treecell
   { 
     white-space           : nowrap;
     vertical-align        : middle;
-    padding               : 1px 0px 1px 2px;
+    padding               : 0px 0px 1px 2px;
   } 
 
 .treecell-header,
 .treecell-inset-header 
   { 
     -moz-binding          : url("chrome://global/skin/treeBindings.xml#treecell-header");
-    border-left           : 1px solid threedface !important;
-    border-top            : 1px solid threedface !important;
+    border-left           : 1px solid threedhighlight !important;
+    border-top            : 1px solid threedhighlight !important;
     border-right          : 1px solid threeddarkshadow !important;
     border-bottom         : 1px solid threeddarkshadow !important;
     background-color      : threedface;
     padding               : 0px;
   }
 
-.treecell-header-image {
-  padding: 0px;
-}
+/* slimline sidebar treeheaders */  
+.treecell-header.treecell-header-sidebarpanel,
+.treecell-inset-header.treecell-header-sidebarpanel
+  {
+    border-left           : none !important;
+    border-top            : 1px solid threedhighlight !important;
+    border-bottom         : 1px solid threedshadow !important;
+    border-right          : none !important;
+    padding               : 0px 0px 0px 3px;
+  }
 
-.treecell-image {
-  padding: 0px;
-}
+.treecell-header-sidebarpanel > .treecell-header-box
+  {
+    border                : none !important;
+    border-right          : 1px solid threedface !important;
+  }
+ 
+.treecell-header-image 
+  {
+    -moz-binding          : url("chrome://global/skin/treeBindings.xml#treecell-header-image");
+    padding               : 0px;
+  }
+  
+.tree-header-image
+  {
+    list-style-image      : inherit;
+  }  
+
+.treecell-image 
+  {
+    padding               : 0px;
+  }
 
 .treecell-header-box
   {
-    border-left           : 1px solid threedhighlight;
-    border-top            : 1px solid threedhighlight;
+    border-left           : 1px solid threedface;
+    border-top            : 1px solid threedface;
     border-right          : 1px solid threedshadow;
     border-bottom         : 1px solid threedshadow;
-    padding               : 2px 5px 2px 4px;
+    padding               : 0px 5px 0px 4px;
+  }  
+  
+.treecell-header-image-box
+  {
+    border-left           : 1px solid threedface;
+    border-top            : 1px solid threedface;
+    border-right          : 1px solid threedshadow;
+    border-bottom         : 1px solid threedshadow;
+    padding               : 0px 0px 0px 0px;
   }  
   
 .sortable.treecell-header:hover:active,
@@ -76,7 +149,7 @@ treecell
 .sortable.treecell-inset-header:hover:active > .treecell-header-box
   {
     border                : 1px solid threedface;
-    padding               : 3px 4px 1px 5px;
+    padding               : 2px 4px 0px 5px;
   }
   
   
@@ -101,7 +174,7 @@ treecell.propertylist
 }
 
 .tree-cell-twisty {
- list-style-image: url("chrome://global/skin/closedtwisty.gif");
+ list-style-image: url("chrome://global/skin/twisty-closed.gif");
  -moz-user-focus:ignore;
  padding-right: 2px;
 }
@@ -115,7 +188,7 @@ treeitem[container="true"] > treerow > .treecell-indent > .tree-cell-primary-ico
 }
 
 treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty {
-  list-style-image: url("chrome://global/skin/closedtwisty-selected.gif");
+  list-style-image: url("chrome://global/skin/twisty-closed-selected.gif");
 }
 
 .tree-cell-twisty:hover {
@@ -131,25 +204,26 @@ treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty {
 }
 
 treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty {
- list-style-image: url("chrome://global/skin/opentwisty.gif");
+ list-style-image: url("chrome://global/skin/twisty-open.gif");
 }
 
 treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-cell-twisty {
-  list-style-image: url("chrome://global/skin/opentwisty-selected.gif");
+  list-style-image: url("chrome://global/skin/twisty-open-selected.gif");
 }
 
 
 /* tree header with sort direction indicators */
-.sortDirectionIndicator[sortDirection="ascending"]  > treecell-header-box > .tree-header-sortdirection {
+.sortDirectionIndicator[sortDirection="ascending"]  > .treecell-header-box > .tree-header-sortdirection {
   list-style-image: url("chrome://global/skin/sortAscending.gif");
   margin-right: 3px;
 }
 
-.sortDirectionIndicator[sortDirection="descending"] > treecell-header-box > .tree-header-sortdirection {
+.sortDirectionIndicator[sortDirection="descending"] > .treecell-header-box > .tree-header-sortdirection {
   list-style-image: url("chrome://global/skin/sortDescending.gif");
   margin-right: 3px;
 }
 
+
 .treecell-popup-icon
   {
     list-style-image       : url("chrome://global/skin/columnselect.gif");
diff --git a/mozilla/themes/classic/global/win/checkbox.css b/mozilla/themes/classic/global/win/checkbox.css
index c86a43a53df..dd229f3ae57 100644
--- a/mozilla/themes/classic/global/win/checkbox.css
+++ b/mozilla/themes/classic/global/win/checkbox.css
@@ -14,7 +14,7 @@
       border-left         : 1px solid threedshadow;
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
-      background-color    : #FFFFFF;
+      background-color    : window;
       margin              : 2px 2px 0px 0px;
       width               : 13px;
       height              : 13px;
diff --git a/mozilla/themes/classic/global/win/global.css b/mozilla/themes/classic/global/win/global.css
index f6c52062b89..aac69c929de 100644
--- a/mozilla/themes/classic/global/win/global.css
+++ b/mozilla/themes/classic/global/win/global.css
@@ -58,6 +58,9 @@
       padding             : 0px;
       font-family         : sans-serif;
       font                : dialog;
+      user-focus          : ignore;
+      font-family         : sans-serif;
+      font                : dialog;
       -moz-user-focus     : ignore;
     }
   
diff --git a/mozilla/themes/classic/global/win/radio.css b/mozilla/themes/classic/global/win/radio.css
index b22e354bb44..849f063912c 100644
--- a/mozilla/themes/classic/global/win/radio.css
+++ b/mozilla/themes/classic/global/win/radio.css
@@ -14,7 +14,7 @@
       border-left         : 1px solid threedshadow;
       border-right        : 1px solid threedhighlight;
       border-bottom       : 1px solid threedhighlight;
-      background-color    : #FFFFFF;
+      background-color    : window;
       -moz-border-radius  : 50%;
       margin              : 2px 2px 0px 0px;
       width               : 12px;
diff --git a/mozilla/themes/classic/global/win/textfield.css b/mozilla/themes/classic/global/win/textfield.css
index 6a6d893a9eb..197413a19c0 100644
--- a/mozilla/themes/classic/global/win/textfield.css
+++ b/mozilla/themes/classic/global/win/textfield.css
@@ -15,7 +15,7 @@
       color               : windowtext;
       padding             : 0px;
       margin              : 1px 5px 2px 5px;
-      background-color    : #FFFFFF;
+      background-color    : window;
       cursor              : text;
     }