diff --git a/mozilla/themes/modern/global/alert-icon.gif b/mozilla/themes/modern/global/alert-icon.gif
new file mode 100644
index 00000000000..453d1b2bdbc
Binary files /dev/null and b/mozilla/themes/modern/global/alert-icon.gif differ
diff --git a/mozilla/themes/modern/global/animthrob.gif b/mozilla/themes/modern/global/animthrob.gif
new file mode 100644
index 00000000000..cd19451828d
Binary files /dev/null and b/mozilla/themes/modern/global/animthrob.gif differ
diff --git a/mozilla/themes/modern/global/animthrob_single.gif b/mozilla/themes/modern/global/animthrob_single.gif
new file mode 100644
index 00000000000..7d60bae2d16
Binary files /dev/null and b/mozilla/themes/modern/global/animthrob_single.gif differ
diff --git a/mozilla/themes/modern/global/blank.gif b/mozilla/themes/modern/global/blank.gif
new file mode 100644
index 00000000000..03f6e9fd3f6
Binary files /dev/null and b/mozilla/themes/modern/global/blank.gif differ
diff --git a/mozilla/themes/modern/global/box.css b/mozilla/themes/modern/global/box.css
new file mode 100644
index 00000000000..7dabc0b0934
--- /dev/null
+++ b/mozilla/themes/modern/global/box.css
@@ -0,0 +1,59 @@
+
+titledbox
+  {
+    border                : 2px groove #CCCCCC;
+    padding               : 7px;
+    margin                : 5px;
+  }
+
+title
+  {
+    margin-left           : 6px;
+    padding-right         : 40px;
+  }
+
+/* This just SUCKS, but seems to be necessitated by titledbox design... */
+title > *
+  {
+    margin-left           : 5px;
+    margin-right          : 5px;
+  }
+
+:titledbox-content 
+  {
+    display               : block;
+    padding               : inherit;
+  }
+
+    
+/** box formatting **/
+  box[autostretch="never"]
+    {
+      vertical-align      : middle;
+    }
+    
+  box[autostretch="never"][valign="top"]
+    {
+      vertical-align      : top;
+    }
+    
+  box[autostretch="never"][valign="bottom"]
+    {
+      vertical-align      : bottom;
+    }
+    
+  box[autostretch="never"][halign="center"] 
+    {
+      text-align          : center;
+    }
+    
+  box[autostretch="never"][halign="right"]
+    {
+      text-align          : right;
+    }
+
+  row
+    {
+      vertical-align      : middle;
+    }
+  
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/button.css b/mozilla/themes/modern/global/button.css
new file mode 100644
index 00000000000..45591d1b9d5
--- /dev/null
+++ b/mozilla/themes/modern/global/button.css
@@ -0,0 +1,152 @@
+/* NEW WIDGET ANDING: <button> */
+
+/** Default Button Styles (apply to usage of <button> without 
+ *  any applied class).
+ **/
+
+/* outer frame */
+  button 
+    {
+      border              : 1px solid #000000;
+      -moz-border-radius  : 3px 2px 2px 3px;
+      margin              : 1px 5px 2px 5px;
+      background-color    : #CCCCCC;
+    }
+  
+  button[disabled="true"],
+  button[disabled="true"]:hover,
+  button[disabled="true"]:hover:active 
+    {
+      border              : 1px solid #999999;
+      color               : #999999;
+    }
+        
+/* internal frame */
+  button > .button-internal-box 
+    {
+      vertical-align      : middle;
+      text-align          : center;
+      border              : 1px outset #CCCCCC;
+      padding             : 2px;
+    }
+    
+  button:hover:active > .button-internal-box 
+    {
+      border              : 1px inset #CCCCCC;
+      padding             : 3px 1px 1px 3px;  
+    }
+  
+  button[disabled="true"] > .button-internal-box,
+  button[disabled="true"]:hover > .button-internal-box,
+  button[disabled="true"]:hover:active > .button-internal-box 
+    {
+      border              : 1px outset #CCCCCC;
+      -moz-border-radius  : 0px;
+      padding             : 2px;
+    }
+
+/* text wrapping frame (hack because <text> does not support alignment) */
+  .button-text-container
+    {
+      text-align          : center;
+      vertical-align      : middle;
+    }
+
+/* text frame */
+  .button-text 
+    {
+      padding             : 0px 2px 0px 2px;
+    }
+  
+  button[orient="vertical"] > .button-internal-box > .button-text-container > .button-text
+    {
+      padding             : 2px 2px 0px 2px;
+    }
+  
+/** Styles for "DEFAULT" buttons (usually 'OK' or equivalent in dialogs. 
+ *  To activate, set 'default' attribute on button.
+ **/
+ 
+/* outer frame */  
+  button[default] 
+    {
+      /* XXX this is a HACK until 'orient' is supported in CSS! XXX */
+      /* strictly speaking not necessary because default for buttonright is 
+       * to lay image out horizontally, but leaving here as a reminder to
+       * implement this feature */
+      behavior            : url(resource:/chrome/xulBindings.xml#buttonright);
+      font-weight         : bold;
+	    list-style-image    : url("chrome://global/skin/return.gif");
+    }
+  
+  button[default][disabled="true"]
+    {
+      list-style-image    : url("chrome://global/skin/return-disabled.gif");
+    }
+    
+/** Styles for 'dialog' buttons (usually any command button in a dialog)
+ *  This class gives buttons 10px of padding on each side to increase the
+ *  strike area and make buttons with small amounts of text (e.g. 'OK') 
+ *  look less silly.
+ **/
+
+/* internal frame */
+  .button-dialog > .button-internal-box,
+  .button-dialog:hover > .button-internal-box
+    {
+      padding             : 2px 10px 2px 10px;
+    }
+  
+  .button-dialog:hover:hover:active > .button-internal-box 
+    {
+      padding             : 3px 9px 1px 11px;
+    }
+
+/** Styles for grey toolbar buttons. These buttons are used in places like
+ *  editor's formatting toolbar or toolbars wanting a button similar to a command
+ *  button but without an initial outset frame.
+ **/ 
+  .button-borderless 
+    {
+      border              : 1px solid #CCCCCC;
+    }
+  
+  .button-borderless:hover
+    {
+      border              : 1px solid #000000;
+    }
+    
+  .button-borderless > .button-internal-box 
+    {
+      border              : 1px solid #CCCCCC;
+    }
+  
+  .button-borderless:hover > .button-internal-box 
+    {
+      border              : 1px outset #CCCCCC;
+    }
+  
+  .button-borderless:hover:active > .button-internal-box 
+    {
+      border              : 1px inset #CCCCCC;
+    }
+
+/** plain (raw) buttons, class="plain" **/
+  button.plain, button.plain:hover, button.plain:hover:active,
+  button.plain > .button-internal-box, 
+  button.plain > .button-internal-box:hover:active,
+  button.plain > .button-internal-box > .button-text-container, 
+  button.plain > .button-internal-box > .button-text-container:hover:active,
+  button.plain > .button-internal-box > .button-text-container > .button-text, 
+  button.plain > .button-internal-box > .button-text-container > .button.text:hover:active,
+  button-plain > .button-internal-box > .button-icon, 
+  button.plain > .button-internal-box > .button.icon:hover:active
+    {
+      border              : 0px ! important;
+      margin              : 0px;
+      padding             : 0px;
+    }
+    
+    
+    
+    
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/button28-bg-active.gif b/mozilla/themes/modern/global/button28-bg-active.gif
new file mode 100644
index 00000000000..a3e28c21742
Binary files /dev/null and b/mozilla/themes/modern/global/button28-bg-active.gif differ
diff --git a/mozilla/themes/modern/global/button28-bg-disabled.gif b/mozilla/themes/modern/global/button28-bg-disabled.gif
new file mode 100644
index 00000000000..bfbbf5d2ea1
Binary files /dev/null and b/mozilla/themes/modern/global/button28-bg-disabled.gif differ
diff --git a/mozilla/themes/modern/global/button28-bg-hover.gif b/mozilla/themes/modern/global/button28-bg-hover.gif
new file mode 100644
index 00000000000..2dd281ae6dc
Binary files /dev/null and b/mozilla/themes/modern/global/button28-bg-hover.gif differ
diff --git a/mozilla/themes/modern/global/button28-bg.gif b/mozilla/themes/modern/global/button28-bg.gif
new file mode 100644
index 00000000000..3ce607c31c7
Binary files /dev/null and b/mozilla/themes/modern/global/button28-bg.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg-active.gif b/mozilla/themes/modern/global/button32-bg-active.gif
new file mode 100644
index 00000000000..b214d961dca
Binary files /dev/null and b/mozilla/themes/modern/global/button32-bg-active.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg-disabled.gif b/mozilla/themes/modern/global/button32-bg-disabled.gif
new file mode 100644
index 00000000000..6dfa1c7f511
Binary files /dev/null and b/mozilla/themes/modern/global/button32-bg-disabled.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg-hover.gif b/mozilla/themes/modern/global/button32-bg-hover.gif
new file mode 100644
index 00000000000..a8a6b782dc0
Binary files /dev/null and b/mozilla/themes/modern/global/button32-bg-hover.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg.gif b/mozilla/themes/modern/global/button32-bg.gif
new file mode 100644
index 00000000000..0b9936475b1
Binary files /dev/null and b/mozilla/themes/modern/global/button32-bg.gif differ
diff --git a/mozilla/themes/modern/global/check-check-disabled.gif b/mozilla/themes/modern/global/check-check-disabled.gif
new file mode 100644
index 00000000000..d8041bd4fc1
Binary files /dev/null and b/mozilla/themes/modern/global/check-check-disabled.gif differ
diff --git a/mozilla/themes/modern/global/check-check.gif b/mozilla/themes/modern/global/check-check.gif
new file mode 100644
index 00000000000..36899391951
Binary files /dev/null and b/mozilla/themes/modern/global/check-check.gif differ
diff --git a/mozilla/themes/modern/global/check-radio-disabled.gif b/mozilla/themes/modern/global/check-radio-disabled.gif
new file mode 100644
index 00000000000..a25e174ad73
Binary files /dev/null and b/mozilla/themes/modern/global/check-radio-disabled.gif differ
diff --git a/mozilla/themes/modern/global/check-radio.gif b/mozilla/themes/modern/global/check-radio.gif
new file mode 100644
index 00000000000..04053197fb3
Binary files /dev/null and b/mozilla/themes/modern/global/check-radio.gif differ
diff --git a/mozilla/themes/modern/global/checkbox.css b/mozilla/themes/modern/global/checkbox.css
new file mode 100644
index 00000000000..e2374d68215
--- /dev/null
+++ b/mozilla/themes/modern/global/checkbox.css
@@ -0,0 +1,78 @@
+/* stylesheet for XUL <checkbox> element */
+
+/* default checkbox for dialogs */
+
+/* outer checkbox frame */
+  checkbox 
+    {
+      margin: 3px 5px 3px 5px;
+    }
+
+/* checkmark outer frame */
+  checkbox > .internal-box > .checkmark-box 
+    {
+      border: 1px solid #000000;
+      -moz-border-radius: 3px 2px 2px 3px;
+      background-color: #CCCCCC;
+      margin-top: 2px;
+    }
+
+  checkbox[disabled="true"] > .internal-box > .checkmark-box,
+  checkbox[disabled="true"]:hover > .internal-box > .checkmark-box 
+    {
+      border: 1px solid #999999;
+    }
+    
+/* checkmark inner frame */
+  checkbox > .internal-box > .checkmark-box > image 
+    {
+      border: 1px outset #CCCCCC;
+      width: 8px;
+      height: 8px;
+    }
+  
+  checkbox[checked="true"] > .internal-box > .checkmark-box > image 
+    {
+      list-style-image: url(chrome://global/skin/check-check.gif);
+    }
+    
+  checkbox[checked="true"][disabled="true"] > .internal-box > .checkmark-box > image
+    {
+      list-style-image: url(chrome://global/skin/check-check-disabled.gif);
+    }  
+
+  checkbox:hover:active > .internal-box > .checkmark-box > image 
+    {
+      border: 1px inset #CCCCCC;
+    }
+  
+  checkbox[disabled="true"] > .internal-box > .checkmark-box > image,
+  checkbox[disabled="true"]:active > .internal-box > .checkmark-box > image 
+    {
+      border: 1px outset #CCCCCC;
+      -moz-border-radius: 0px;
+    }
+
+/* checkmark label/icon frame */
+  checkbox[value] > .internal-box > html,
+  checkbox.iconic > .internal-box > .icon 
+    {
+      margin: 0px 0px 0px 4px;
+      padding: 1px;
+    }
+
+  checkbox.iconic > .internal-box > html 
+    {
+      margin-left: 4px;
+    }
+
+  checkbox[disabled="true"][value] > .internal-box > html 
+    {
+      color: #999999;
+    }
+    
+  checkbox:focus > .internal-box > html 
+    {
+      border              : 1px dotted black;
+      padding             : 0px;
+    }
diff --git a/mozilla/themes/modern/global/closedtwisty-selected.gif b/mozilla/themes/modern/global/closedtwisty-selected.gif
new file mode 100644
index 00000000000..9d5b0533088
Binary files /dev/null and b/mozilla/themes/modern/global/closedtwisty-selected.gif differ
diff --git a/mozilla/themes/modern/global/closedtwisty.gif b/mozilla/themes/modern/global/closedtwisty.gif
new file mode 100644
index 00000000000..d1b3a1f8133
Binary files /dev/null and b/mozilla/themes/modern/global/closedtwisty.gif differ
diff --git a/mozilla/themes/modern/global/commonDialog.css b/mozilla/themes/modern/global/commonDialog.css
new file mode 100644
index 00000000000..c57962e7662
--- /dev/null
+++ b/mozilla/themes/modern/global/commonDialog.css
@@ -0,0 +1,21 @@
+box.icon {
+  margin: 1em 15px 0px 10px;
+}
+
+box#content {
+  margin-top: 1em;
+  margin-right: 1em;
+}
+
+box#okCancelButtons {
+  margin-bottom: 0.5em;
+}
+
+table#editFields {
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+div[id="info.header"] {
+  font-weight: bold;
+}
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/console.css b/mozilla/themes/modern/global/console.css
new file mode 100644
index 00000000000..5ef2d6161ea
--- /dev/null
+++ b/mozilla/themes/modern/global/console.css
@@ -0,0 +1,26 @@
+/* 
+ * 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.org code.
+ * 
+ * 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): 
+ */
+
+@import url(chrome://global/skin/global.css);
+
+window {
+    font-size: 12px;
+}
diff --git a/mozilla/themes/modern/global/dialogOverlay.css b/mozilla/themes/modern/global/dialogOverlay.css
new file mode 100644
index 00000000000..241ddc2c74a
--- /dev/null
+++ b/mozilla/themes/modern/global/dialogOverlay.css
@@ -0,0 +1,121 @@
+/**  
+ * Small Dialog Header (without icon)
+ **/
+.box-smallheader 
+  {
+    behavior              : url(chrome://global/content/dialogBindings.xml#smallheader);
+    border                : 1px inset #CCCCCC;
+    margin                : 0px 5px 6px 5px;
+  }
+
+.toolbar-primary
+  {
+    padding               : 0px 0px 3px 0px;
+    min-height            : 0px;
+  }
+
+.box-smallheader-left 
+  {
+    font-size             : larger;
+    font-weight           : bold;
+    color                 : #FFFFFF;
+    padding-left          : 6px;
+  }
+
+.box-smallheader-right 
+  {
+    color                 : #FFFFFF;
+    padding-right         : 6px;
+  }
+
+.box-smallheader > .toolbar-primary 
+  {
+    border                : 1px solid #000000;
+    vertical-align        : middle;
+    padding-top           : 3px;
+  }
+
+/** 
+ * Large Dialog Header (with icon) 
+ **/
+.box-header 
+  {
+    behavior              : url(chrome://global/content/dialogBindings.xml#largeheader);
+  }
+
+.box-header-header 
+  {
+    padding               : 0px 0px 4px 5px;
+    min-height            : 34px;
+  }
+
+.box-header-text-box 
+  {
+    vertical-align        : middle;
+  }
+
+.box-header-text 
+  {
+    color                 : white;
+    font-size             : large;
+    font-weight           : bold;
+    text-decoration       : underline;
+  }
+
+.box-header-icon-box  
+  {
+    vertical-align        : middle;
+  }
+  
+.box-header-circle 
+  {
+	  background-image      : url("chrome://global/skin/button28-bg.gif");
+  	background-repeat     : no-repeat;
+	  background-position   : 50% 4px;
+  	background-color      : transparent;
+	  min-width             : 28px;
+  	margin                : 1px 7px 1px 1px;
+    height                : 28px;
+    width                 : 28px;
+  }  
+
+/**
+ * Dialog status line (blue) including progress area
+ **/
+.box-status 
+  {
+    behavior              : url(chrome://global/content/dialogBindings.xml#status);
+  }
+
+.box-status-bg 
+  {
+    padding               : 1px 5px 1px 5px;
+    min-height            : 0px ! important;
+  }
+
+.box-status-text, .box-status-progress
+  {
+    color                 : #99cccc ! important;
+  }
+
+  
+/** 
+ * Utility classes for use when combined headers/footers are used
+ **/
+/* display area framed container */
+#contentarea 
+  {
+    border-top            : 2px groove #CCCCCC;
+    border-bottom         : 2px groove #CCCCCC;
+    padding               : 7px;
+  }
+
+/* top border on status area */
+#wizardButtons 
+  {
+    border-bottom         : 1px outset #CCCCCC;
+    padding-top           : 1px;
+    padding-bottom        : 1px;
+  }
+
+
diff --git a/mozilla/themes/modern/global/dir-closed.gif b/mozilla/themes/modern/global/dir-closed.gif
new file mode 100644
index 00000000000..2fbe4379571
Binary files /dev/null and b/mozilla/themes/modern/global/dir-closed.gif differ
diff --git a/mozilla/themes/modern/global/dir-open.gif b/mozilla/themes/modern/global/dir-open.gif
new file mode 100644
index 00000000000..4b1d8908319
Binary files /dev/null and b/mozilla/themes/modern/global/dir-open.gif differ
diff --git a/mozilla/themes/modern/global/error-icon.gif b/mozilla/themes/modern/global/error-icon.gif
new file mode 100644
index 00000000000..70a42e3447b
Binary files /dev/null and b/mozilla/themes/modern/global/error-icon.gif differ
diff --git a/mozilla/themes/modern/global/filepicker.css b/mozilla/themes/modern/global/filepicker.css
new file mode 100644
index 00000000000..f113bc1b0be
--- /dev/null
+++ b/mozilla/themes/modern/global/filepicker.css
@@ -0,0 +1,19 @@
+@import url(chrome://global/skin/global.css);
+
+treecell.directory {
+  list-style-image: url("chrome://global/skin/dir-closed.gif");
+}
+
+treecell.file {
+  list-style-image: url("chrome://global/skin/blank.gif");
+}
+
+/*
+treeitem.hidden > treerow > treecell > .tree-button {
+  color: #CCCCCC;
+}
+
+treeitem.hidden > treerow > treecell > .tree-icon {
+  list-style-image: url("chrome://global/skin/blank.gif");
+}
+*/
diff --git a/mozilla/themes/modern/global/formatting.css b/mozilla/themes/modern/global/formatting.css
new file mode 100644
index 00000000000..91270904c34
--- /dev/null
+++ b/mozilla/themes/modern/global/formatting.css
@@ -0,0 +1,126 @@
+/* colors */
+
+.color-dialog
+  {
+    background-color      : #CCCCCC;
+    color                 : #000000;
+  }
+  
+.color-window
+  {
+    background-color      : #FFFFFF;
+    color                 : #000000;
+  }
+
+/* inset areas */
+.inset
+  {
+    border                : 1px inset #CCCCCC;
+    margin                : 0px 5px 5px 5px;
+  }
+  
+/* formatting */
+.groove-top
+  {
+    border-top            : 2px groove #CCCCCC;  
+  }
+  
+.groove-right
+  {
+    border-right          : 2px groove #CCCCCC;
+  }
+  
+.groove-left
+  {
+    border-left           : 2px groove #CCCCCC;
+  }
+  
+.groove-bottom
+  {
+    border-bottom         : 2px groove #CCCCCC;
+  }
+  
+.outset
+  {
+    border                : 1px outset #CCCCCC;
+  }  
+  
+/** separator rules **/
+/* standard separators */
+  separator, separator[orient="horizontal"] 
+    {
+      height: 1.5em;
+    }
+  
+  separator[orient="vertical"] 
+    {
+      width: 1.5em;
+    }
+
+/* thinner separators (50% size) */
+  separator.thin, separator.thin[orient="horizontal"] 
+    {
+      height: 0.5em;
+    }
+  
+  separator.thin[orient="vertical"] 
+    {
+      width: 0.5em;
+    }
+
+/* groove separators (50% size) */
+  separator.groove,
+  separator.groove[orient="horizontal"] 
+    {
+      border-top: 2px groove #CCCCCC;
+      height: 0px;
+      margin-top: 0.4em;
+      margin-bottom: 0.4em;
+    }
+  
+  separator.groove[orient="vertical"] 
+    {
+      border-left: 2px groove #CCCCCC;
+      margin-left: 0.4em;
+      margin-right: 0.4em;
+    }
+  
+/* groove separators (0 padding, for dividing effects) */  
+  separator.groove-thin 
+    {
+      border-top: 2px groove #CCCCCC;
+      height: 0px;
+    }
+  
+  separator[orient="vertical"].groove-thin 
+    {
+      border-left: 2px groove #CCCCCC;
+    }
+
+/** text formatting rules **/
+/* label (with margins) */
+  text.label 
+    {
+      margin              : 1px 5px 2px 5px;
+    }
+    
+  text[disabled="true"] 
+    {
+      color                 : #999999;
+    }    
+    
+  html
+    {
+      margin              : 1px 5px 4px 5px;
+      cursor              : default;
+    }
+
+  .header 
+    {
+      font-weight         : bold;
+    }
+   
+  .indent
+    {
+      margin-left         : 20px;
+    }
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/global.css b/mozilla/themes/modern/global/global.css
new file mode 100644
index 00000000000..94f620e4f38
--- /dev/null
+++ b/mozilla/themes/modern/global/global.css
@@ -0,0 +1,291 @@
+/** this should only contain XUL dialog and document window widget defaults. Defaults for widgets of
+    a particular application should be in that application's style sheet.
+	For example style definitions for navigator can be found in navigator.css
+
+   THIS FILE IS LOCKED DOWN.  YOU ARE NOT ALLOWED TO MODIFY IT WITHOUT FIRST HAVING YOUR
+   CHANGES REVIEWED BY hyatt@netscape.com.
+**/
+
+/* import the widget style sheets */
+
+@import url(chrome://global/skin/box.css);
+@import url(chrome://global/skin/button.css);
+@import url(chrome://global/skin/checkbox.css);
+@import url(chrome://global/skin/radio.css);
+@import url(chrome://global/skin/tree.css);
+@import url(chrome://global/skin/menu.css);
+@import url(chrome://global/skin/menubutton.css);
+@import url(chrome://global/skin/menulist.css);
+@import url(chrome://global/skin/formatting.css);
+@import url(chrome://global/skin/textfield.css);
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
+@namespace html url("http://www.w3.org/TR/REC-html40"); 
+
+html|* {
+  border: 1px solid green !important;
+}
+
+html|form {
+  border: none !important;
+}
+
+titledbutton {
+  border: 1px solid purple !important;
+}
+
+/**********************************
+ * Window
+ **********************************/
+
+/**
+ * The is the outer most tag in a xul document all xul
+ * content will be inside it.
+ */
+window { 
+  background-color: white;
+  font: 3mm tahoma,arial,helvetica,sans-serif;
+  padding: 0px;
+}
+
+window[wait-cursor] { cursor: wait !important; }
+
+/**
+ * This is a special class of window used for dialogs
+ */
+window.dialog 
+  { 
+    background-color      : #CCCCCC;
+    padding               : 5px;
+  }
+
+/**********************************
+ * XUL widgets
+ **********************************/
+
+/******** Box *********/
+
+:-moz-horizontal-box-debug {
+  border: 2px solid blue;
+  border-top-width: 10px;
+  padding: 2px;
+  margin: 2px;
+  color: white;
+}
+
+:-moz-vertical-box-debug {
+  border: 2px solid red;
+  border-left-width: 10px;
+  padding: 2px;
+  margin: 2px;
+  color: white;
+}
+
+/**
+ * Throbber
+ */
+/* FIX ME - move these gifs to global */
+titledbutton#Throbber {
+	border: none;
+	margin-top: 8px;
+	margin-left: 9px;
+	list-style-image: url("chrome://global/skin/animthrob_single.gif");
+	background-image: none;
+}
+
+titledbutton#Throbber:hover:active {
+	margin-top: 9px;
+	margin-left: 10px;
+}
+
+titledbutton#Throbber[busy="true"] {
+	list-style-image:url("chrome://global/skin/animthrob.gif");
+}
+
+/* icons titledbuttons */
+.message-icon {
+  list-style-image: url("chrome://global/skin/message-icon.gif");
+}
+.alert-icon {
+  list-style-image: url("chrome://global/skin/alert-icon.gif");
+}
+.error-icon {
+  list-style-image: url("chrome://global/skin/error-icon.gif");
+}
+.question-icon {
+  list-style-image: url("chrome://global/skin/question-icon.gif");
+}
+
+/**
+ * status-bar
+ */
+#status-bar 
+  {
+	  background-color      : #CCCCCC;
+	  user-focus            : ignore;
+    overflow              : hidden
+  }
+
+/******** Titled buttons **********/
+titledbutton.toolbar-flat {
+   color: #99CCCC;
+   font: inherit;
+   border: none;
+   padding: 1px;
+   margin: 0px;
+}
+
+titledbutton.toolbar-flat:hover {
+  text-decoration: none;
+  background-color: #336699;
+  color: #CCFFFF;
+}
+
+titledbutton.toolbar-flat:hover:active {
+  text-decoration: none;
+  color: #CCFFFF;
+  padding: 2px 0px 0px 2px;
+}
+
+titledbutton.push[toggled="1"] {
+  border-top: 1px solid #666666;
+  border-bottom: 1px solid white;
+  border-left: 1px solid #666666;
+  border-right: 1px solid white;
+  padding: 3px 1px 1px 3px;
+  margin: 2px;
+}
+
+titledbutton.push[toggled="2"] {
+   background-color: lightgray;
+   border: 1px solid #999999;
+	margin: 2px;
+}
+
+titledbutton.popup {
+	list-style-image:url(chrome://global/skin/taskbar-popup-arrow.gif);
+}
+
+/**********************************
+ * custom XBL widgets
+ **********************************/
+
+/**
+ * texttab folder lookalike e.g. for sidebar panel headers
+ */
+
+box.texttab{
+  behavior: url("chrome://global/content/globalBindings.xml#texttab");
+  padding-top: 2px;
+  min-height: 10px;
+  min-width: 10px;
+}
+
+
+box.texttab[selected="true"] {
+  border-bottom: 1px solid white;
+}
+
+box.texttab > .remain-space{
+  border-bottom:1px solid black;
+}
+
+box.texttab > .tab-leftedge {
+  list-style-image: url("chrome://global/skin/tab-leftedge.gif");
+}
+
+box.texttab > .tab-rightedge {
+  list-style-image: url("chrome://global/skin/tab-rightedge.gif");
+}
+
+box.texttab[selected="true"] > .tab-leftedge {
+  list-style-image: url("chrome://global/skin/seltab-leftedge.gif");
+}
+
+box.texttab[selected="true"]  > .tab-rightedge {
+  list-style-image: url("chrome://global/skin/seltab-rightedge.gif");
+}
+
+box.texttab > .textholder {
+  border-top: 1px solid black;
+  background-color: #CCCCCC;
+}
+
+box.texttab[selected="true"] > .textholder {
+  background-color: white;
+  font-weight: bold;
+}
+
+/**********************************
+ * HTML components in the window tag
+ **********************************/
+html|iframe {
+ min-width: 10px;
+ min-height: 10px;
+ width: 100px;
+ height: 100px;
+ border: none;
+}
+
+
+/** XUL <progressmeter> **/
+
+  progressmeter[mode="undetermined"] > .progressmeter-internal-box
+    {
+      background-image    : url(chrome://global/skin/progressmeter-busy.gif);
+    }
+  
+  progressmeter[mode="undetermined"] > .progressmeter-internal-box > .progressmeter-stack > .progressmeter-progressbar
+    {
+      display             : none;
+    }
+
+  progressmeter 
+    {
+      margin              : 0px 4px 0px 4px;
+      border              : 1px inset #CCCCCC;
+      max-height          : 1.5em;
+    }
+
+  progressmeter > .progressmeter-internal-box 
+    {
+      border              : 1px solid #000000;
+    }
+
+/* progress indicators */
+  .progress-bar 
+    {
+	    background-color    : #6699cc;
+      border-right        : 1px outset #6699cc;
+    }
+  
+  .progress-remainder 
+    {
+	    background-color    : #999999;
+    }
+
+/** XUL <scrollbar> element **/
+  scrollbar 
+    { 
+      user-focus          : ignore; 
+    } 
+
+
+/* XUL <colorpicker> pieces */
+.colorpickertile 
+  {
+    width                 : 20px;
+    height                : 20px;
+    margin                : 1px;
+    border                : 1px inset #CCCCCC;
+  }
+
+.colorpickertile:hover 
+  {
+    border                : 1px solid #FFFFFF;
+  }
+
+.colorpickertile[selected="true"] 
+  {
+    border                : 1px solid #000000;
+  }
diff --git a/mozilla/themes/modern/global/gray-bottomleft.gif b/mozilla/themes/modern/global/gray-bottomleft.gif
new file mode 100644
index 00000000000..94e979cf55e
Binary files /dev/null and b/mozilla/themes/modern/global/gray-bottomleft.gif differ
diff --git a/mozilla/themes/modern/global/gray-bottomright.gif b/mozilla/themes/modern/global/gray-bottomright.gif
new file mode 100644
index 00000000000..5887c3eb5af
Binary files /dev/null and b/mozilla/themes/modern/global/gray-bottomright.gif differ
diff --git a/mozilla/themes/modern/global/gray-topright.gif b/mozilla/themes/modern/global/gray-topright.gif
new file mode 100644
index 00000000000..5cae57f457f
Binary files /dev/null and b/mozilla/themes/modern/global/gray-topright.gif differ
diff --git a/mozilla/themes/modern/global/grippy-horizontal-after.gif b/mozilla/themes/modern/global/grippy-horizontal-after.gif
new file mode 100644
index 00000000000..71be69083ef
Binary files /dev/null and b/mozilla/themes/modern/global/grippy-horizontal-after.gif differ
diff --git a/mozilla/themes/modern/global/grippy-horizontal-before.gif b/mozilla/themes/modern/global/grippy-horizontal-before.gif
new file mode 100644
index 00000000000..6be9bc4f400
Binary files /dev/null and b/mozilla/themes/modern/global/grippy-horizontal-before.gif differ
diff --git a/mozilla/themes/modern/global/grippy-vertical-after.gif b/mozilla/themes/modern/global/grippy-vertical-after.gif
new file mode 100644
index 00000000000..af6290fe9de
Binary files /dev/null and b/mozilla/themes/modern/global/grippy-vertical-after.gif differ
diff --git a/mozilla/themes/modern/global/grippy-vertical-before.gif b/mozilla/themes/modern/global/grippy-vertical-before.gif
new file mode 100644
index 00000000000..3cba0059461
Binary files /dev/null and b/mozilla/themes/modern/global/grippy-vertical-before.gif differ
diff --git a/mozilla/themes/modern/global/lessCOls_dis.gif b/mozilla/themes/modern/global/lessCOls_dis.gif
new file mode 100644
index 00000000000..2452e7f311a
Binary files /dev/null and b/mozilla/themes/modern/global/lessCOls_dis.gif differ
diff --git a/mozilla/themes/modern/global/lessCols.gif b/mozilla/themes/modern/global/lessCols.gif
new file mode 100644
index 00000000000..65f985b6067
Binary files /dev/null and b/mozilla/themes/modern/global/lessCols.gif differ
diff --git a/mozilla/themes/modern/global/lessCols_mo.gif b/mozilla/themes/modern/global/lessCols_mo.gif
new file mode 100644
index 00000000000..2cb5b752f7b
Binary files /dev/null and b/mozilla/themes/modern/global/lessCols_mo.gif differ
diff --git a/mozilla/themes/modern/global/menu-arrow-disabled.gif b/mozilla/themes/modern/global/menu-arrow-disabled.gif
new file mode 100644
index 00000000000..99860477e4f
Binary files /dev/null and b/mozilla/themes/modern/global/menu-arrow-disabled.gif differ
diff --git a/mozilla/themes/modern/global/menu-arrow-hover.gif b/mozilla/themes/modern/global/menu-arrow-hover.gif
new file mode 100644
index 00000000000..c0785e3612f
Binary files /dev/null and b/mozilla/themes/modern/global/menu-arrow-hover.gif differ
diff --git a/mozilla/themes/modern/global/menu-arrow.gif b/mozilla/themes/modern/global/menu-arrow.gif
new file mode 100644
index 00000000000..55ab67a38c5
Binary files /dev/null and b/mozilla/themes/modern/global/menu-arrow.gif differ
diff --git a/mozilla/themes/modern/global/menu-check-disabled.gif b/mozilla/themes/modern/global/menu-check-disabled.gif
new file mode 100644
index 00000000000..8fd65d00b4d
Binary files /dev/null and b/mozilla/themes/modern/global/menu-check-disabled.gif differ
diff --git a/mozilla/themes/modern/global/menu-check-hover.gif b/mozilla/themes/modern/global/menu-check-hover.gif
new file mode 100644
index 00000000000..9d444728923
Binary files /dev/null and b/mozilla/themes/modern/global/menu-check-hover.gif differ
diff --git a/mozilla/themes/modern/global/menu-check.gif b/mozilla/themes/modern/global/menu-check.gif
new file mode 100644
index 00000000000..8fd65d00b4d
Binary files /dev/null and b/mozilla/themes/modern/global/menu-check.gif differ
diff --git a/mozilla/themes/modern/global/menu.css b/mozilla/themes/modern/global/menu.css
new file mode 100644
index 00000000000..198ea3d1ed3
--- /dev/null
+++ b/mozilla/themes/modern/global/menu.css
@@ -0,0 +1,84 @@
+
+/** 
+ * Atomic sub-parts of standard menus
+ **/
+.menu-right 
+  {
+    margin                : 0px 0px 0px 6px;
+    width                 : 8px;
+    text-align            : center;
+    list-style-image      : url("chrome://global/skin/menu-arrow.gif");
+  }
+
+.menu-iconic-left 
+  {
+    color                 : inherit;
+    margin                : 0px 2px 0px 0px;
+    width                 : 13px;
+    text-align            : center;
+    list-style-image      : inherit;
+  }
+
+.menubar-left 
+  {
+    color                 : inherit;
+    margin                : 0px 2px 0px 0px;
+  }
+
+.menu-iconic-text, .menu-iconic-accel, .menu-text, .menu-accel 
+  {
+    color                 : inherit;
+    margin                : 0px 2px 0px 0px;
+  }
+
+.menu-text 
+  {
+    padding-left          : 15px;
+  }
+
+.menu-accel 
+  {
+    margin-left           : 4px;
+    padding-right         : 14px;
+  }
+
+.menu-iconic-accel 
+  {
+    margin-left           : 4px;
+  }
+
+.menubar-text 
+  {
+    color                 : inherit;
+    margin-right          : 2px;
+  }
+
+menuitem[checked="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-check.gif");
+  }
+
+menuitem[checked="true"][disabled="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-check-disabled.gif");
+  }
+
+menuitem[checked="true"][menuactive="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-check-hover.gif");
+  }
+
+.menu-right[disabled="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-arrow-disabled.gif");
+  }
+
+.menu-right[menuactive="true"][disabled="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-arrow-disabled.gif");
+  }
+
+.menu-right[menuactive="true"] 
+  {
+    list-style-image      : url("chrome://global/skin/menu-arrow-hover.gif");
+  }
diff --git a/mozilla/themes/modern/global/menubutton.css b/mozilla/themes/modern/global/menubutton.css
new file mode 100644
index 00000000000..b5fab9ee00a
--- /dev/null
+++ b/mozilla/themes/modern/global/menubutton.css
@@ -0,0 +1,118 @@
+
+/* outermost frame */
+  menubutton
+    {
+      border              : 1px solid #000000;
+      margin              : 3px 5px 3px 5px;
+      -moz-border-radius  : 3px 2px 2px 3px;
+    }
+    
+  menubutton[disabled="true"] 
+    {
+      border              : 1px solid #999999;
+      color               : #999999;
+    }
+  
+  menubutton > .menubutton-internal-box
+    {
+      border              : 1px outset #CCCCCC;
+      padding             : 1px 2px 1px 2px;
+      vertical-align      : middle;
+    }
+    
+  menubutton:active > .menubutton-internal-box,
+  menubutton[open="true"] > .menubutton-internal-box
+    {
+      /*border              : 1px inset #CCCCCC;*/
+      padding             : 2px 1px 0px 3px;
+    }
+
+  .menubutton-single-icon
+    {
+      margin-right        : 3px;
+    }
+    
+/** "Dual Functionality" menubutton
+ *  Has a popup spawning button and a command invoking button, e.g. back/forward
+ *  class="menubutton-dual"
+ **/    
+  
+/* inner button */
+  menubutton.menubutton-dual > .menubutton-dual-button,
+  menubutton.menubutton-dual:hover > .menubutton-dual-button,
+  menubutton.menubutton-dual:active > .menubutton-dual-button
+    {
+      border              : none;
+      margin              : 0px;
+      -moz-border-radius  : 0px;
+    }
+
+  menubutton.menubutton-dual[open="true"] > .menubutton-dual-button > .button-internal-box
+    {
+      border              : 1px inset #CCCCCC;
+      padding             : 3px 1px 1px 3px;  
+    }
+    
+/* inner dropmarker */
+  menubutton.menubutton-dual > .menubutton-dropmarker
+    {
+      border              : 1px outset #CCCCCC;
+      list-style-image    : url("chrome://global/skin/scroll-down.gif");
+      padding             : 0px 2px 0px 2px;
+    }
+    
+  menubutton.menubutton-dual[disabled="true"] > .menubutton-dropmarker
+    {
+      list-style-image    : url("chrome://global/skin/scroll-down-disabled.gif");
+    }
+
+  menubutton.menubutton-dual[open="true"] > .menubutton-dropmarker
+    {
+      border              : 1px inset #CCCCCC;
+      padding             : 1px 1px -1px 3px;
+    }
+
+  menubutton.menubutton-dual > menupopup
+    {
+      min-width           : 0px;
+      border-top          : 0px;
+      border-right        : 1px solid #000000;
+      border-left         : 1px solid #000000;
+      border-bottom       : 1px solid #000000;
+    }
+    
+  menubutton > menupopup > .menupopup-internal-box
+    {
+      border-top          : 0px;
+      border-right        : 1px inset #CCCCCC;
+      border-left         : 1px inset #CCCCCC;
+      border-bottom       : 1px inset #CCCCCC;
+    }
+    
+  menubutton > menupopup > menuitem
+    {
+      padding             : 0px 0px 0px 3px;
+    }
+
+/** Icon only menubutton.menubutton-duals
+ *  class="menubutton.menubutton-dual-icon"
+ **/
+  .menubutton.menubutton-dual-icon 
+    {
+      border              : 1px solid #000000;
+      background-color    : #CCCCCC;
+    } 
+    
+  .menubutton.menubutton-dual-icon > .menubutton.menubutton-dual-icon-internal-box
+    {
+      border              : 1px outset #CCCCCC;
+      padding             : 1px;
+    }
+    
+  .menubutton.menubutton-dual-icon:hover:active > .menubutton.menubutton-dual-icon-internal-box,
+  .menubutton.menubutton-dual-icon[open="true"] > .menubutton.menubutton-dual-icon-internal-box
+    {
+      border              : 1px inset #CCCCCC;
+      padding             : 2px 0px 0px 2px;
+    }    
+    
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/menulist.css b/mozilla/themes/modern/global/menulist.css
new file mode 100644
index 00000000000..1c92ed38dd2
--- /dev/null
+++ b/mozilla/themes/modern/global/menulist.css
@@ -0,0 +1,176 @@
+
+/* NEW WIDGET LANDING: <menulist> popup */
+
+/* outer frame */
+  menulist 
+    {
+      padding             : 0px;
+      border              : 1px solid #000000;
+      background-color    : #CCCCCC;
+      -moz-border-radius  : 3px 2px 2px 3px;
+      margin              : 1px 5px 2px 5px;
+    }
+
+  menulist[menuactive="true"],
+  menulist:hover 
+    {
+      border              : 1px solid #000000;
+    }
+
+  menulist[open="true"] 
+    {
+      border              : 1px solid #000000;
+    }
+  
+  menulist[disabled="true"]
+    {
+      border              : 1px solid #999999;
+      color               : #999999;
+    }
+    
+/* icon display frame */
+  menulist > .menu-icon 
+    {
+      border-left         : 1px outset #CCCCCC;
+      border-top          : 1px outset #CCCCCC;
+      border-bottom       : 1px outset #CCCCCC;
+      padding             : 2px 0px 2px 0px;
+    }  
+
+  menulist[open="true"] > .menu-icon 
+    {
+      border-left         : 1px inset #CCCCCC;
+      border-top          : 1px inset #CCCCCC;
+      border-bottom       : 1px solid #CCCCCC;
+      padding             : 3px 0px 1px 0px;
+    }
+  
+/* text display frame */
+  menulist > .menu-text 
+    {
+      padding             : 2px 4px 2px 4px;
+      border-top          : 1px outset #CCCCCC;
+      border-bottom       : 1px outset #CCCCCC;
+      margin-right        : 0px;
+    }
+    
+  menulist[open="true"] > .menu-text 
+    {
+      border-top          : 1px inset #CCCCCC;
+      border-bottom       : 1px solid #CCCCCC;
+      padding             : 3px 4px 1px 4px;
+    }
+
+/* drop marker display frame */
+  menulist > .menu-dropmarker 
+    {
+      border-top          : 1px outset #CCCCCC;
+      border-right        : 1px outset #CCCCCC;
+      border-bottom       : 1px outset #CCCCCC;
+      border-left         : none;
+      list-style-image    : url("chrome://global/skin/scroll-down.gif");
+      padding             : 2px;
+    }
+  
+  menulist[disabled="true"] > .menu-dropmarker
+    {
+      list-style-image    : url("chrome://global/skin/scroll-down-disabled.gif");
+    }
+
+  menulist[open="true"] > .menu-dropmarker 
+    {
+      border-top          : 1px inset #CCCCCC;
+      border-right        : 1px inset #CCCCCC;
+      border-bottom       : 1px solid #CCCCCC;
+      border-left         : 1px solid #CCCCCC;
+      padding             : 3px 2px 1px 2px;
+    }
+
+/** rules for EDITABLE menulists (aka 'comboboxes'). 
+ **/
+
+/* outer frame */
+  menulist[editable="true"] 
+    {
+      padding             : 0px;
+    }
+
+/* icon display frame */
+  menulist[editable="true"] > .menu-icon 
+    {
+      list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
+      background-color    : white;
+      padding             : 1px;
+      border-left         : 1px inset #CCCCCC;
+      border-top          : 1px inset #CCCCCC;
+      border-right        : none;
+      border-bottom       : 1px inset #CCCCCC;
+    }
+
+/* text display frame */    
+  menulist[editable="true"] > .menu-text 
+    {
+      border-left         : none;
+      border-top          : 1px inset #CCCCCC;
+      border-right        : 1px inset #CCCCCC;
+      border-bottom       : 1px inset #CCCCCC;
+      margin              : 0px 2px 0px 0px;
+    }
+
+/* drop marker display frame */
+  menulist[editable="true"] > .menu-dropmarker 
+    {
+      border              : 1px outset #CCCCCC;
+    }
+
+  menulist[editable="true"][open="true"] > .menu-dropmarker 
+    {
+      border              : 1px inset #CCCCCC;
+    }
+
+/* rules for popups and separators associated with menulists */
+  menulist > menupopup 
+    {
+      border-left         : 1px solid #000000;
+      border-right        : 1px solid #000000;
+      border-bottom       : 1px solid #000000;
+      border-top          : 0px;
+      min-width           : 0px;
+      padding             : 0px;
+    }
+    
+  menulist > menupopup > .internal-box
+    {
+      border-left         : 1px inset #CCCCCC;
+      border-right        : 1px inset #CCCCCC;
+      border-bottom       : 1px inset #CCCCCC;
+      border-top          : 0px;
+    }
+    
+  menulist > menupopup > menuseparator 
+    {
+      border-bottom       : 2px groove #CCCCCC;
+    }
+
+
+  menulist > menupopup > menuitem 
+    {
+      padding             : 0px;
+      min-width: 0px;
+      max-width: auto;
+    }
+
+  menulist > menupopup > menuitem > .menu-left 
+    {
+      width               : 13px;
+    }
+
+  menulist > menupopup > menuitem[selected="true"] > .menu-left
+    {
+      list-style-image    : url(chrome://global/skin/menu-check.gif);
+    }
+  
+  menulist > menupopup > menuitem[menuactive="true"][selected="true"] > .menu-left
+    {
+      list-style-image    : url(chrome://global/skin/menu-check-hover.gif);
+    }
diff --git a/mozilla/themes/modern/global/message-icon.gif b/mozilla/themes/modern/global/message-icon.gif
new file mode 100644
index 00000000000..e46c67a09c6
Binary files /dev/null and b/mozilla/themes/modern/global/message-icon.gif differ
diff --git a/mozilla/themes/modern/global/moreCols.gif b/mozilla/themes/modern/global/moreCols.gif
new file mode 100644
index 00000000000..5e73045546a
Binary files /dev/null and b/mozilla/themes/modern/global/moreCols.gif differ
diff --git a/mozilla/themes/modern/global/moreCols_dis.gif b/mozilla/themes/modern/global/moreCols_dis.gif
new file mode 100644
index 00000000000..507626c0ef6
Binary files /dev/null and b/mozilla/themes/modern/global/moreCols_dis.gif differ
diff --git a/mozilla/themes/modern/global/moreCols_mo.gif b/mozilla/themes/modern/global/moreCols_mo.gif
new file mode 100644
index 00000000000..787484391e6
Binary files /dev/null and b/mozilla/themes/modern/global/moreCols_mo.gif differ
diff --git a/mozilla/themes/modern/global/n-box-navbar.gif b/mozilla/themes/modern/global/n-box-navbar.gif
new file mode 100644
index 00000000000..a92756c1ea2
Binary files /dev/null and b/mozilla/themes/modern/global/n-box-navbar.gif differ
diff --git a/mozilla/themes/modern/global/n-box.gif b/mozilla/themes/modern/global/n-box.gif
new file mode 100644
index 00000000000..280030b7de1
Binary files /dev/null and b/mozilla/themes/modern/global/n-box.gif differ
diff --git a/mozilla/themes/modern/global/navbar-bg-begincap.gif b/mozilla/themes/modern/global/navbar-bg-begincap.gif
new file mode 100644
index 00000000000..450cb0ca5fd
Binary files /dev/null and b/mozilla/themes/modern/global/navbar-bg-begincap.gif differ
diff --git a/mozilla/themes/modern/global/navbar-bg.gif b/mozilla/themes/modern/global/navbar-bg.gif
new file mode 100644
index 00000000000..211e836f471
Binary files /dev/null and b/mozilla/themes/modern/global/navbar-bg.gif differ
diff --git a/mozilla/themes/modern/global/navbar-endcap.gif b/mozilla/themes/modern/global/navbar-endcap.gif
new file mode 100644
index 00000000000..39fb6ca8a5f
Binary files /dev/null and b/mozilla/themes/modern/global/navbar-endcap.gif differ
diff --git a/mozilla/themes/modern/global/opentwisty-selected.gif b/mozilla/themes/modern/global/opentwisty-selected.gif
new file mode 100644
index 00000000000..9a7cc5631b5
Binary files /dev/null and b/mozilla/themes/modern/global/opentwisty-selected.gif differ
diff --git a/mozilla/themes/modern/global/opentwisty.gif b/mozilla/themes/modern/global/opentwisty.gif
new file mode 100644
index 00000000000..0620c6b601d
Binary files /dev/null and b/mozilla/themes/modern/global/opentwisty.gif differ
diff --git a/mozilla/themes/modern/global/otherbutton28-bg-active.gif b/mozilla/themes/modern/global/otherbutton28-bg-active.gif
new file mode 100644
index 00000000000..0cd8881b81a
Binary files /dev/null and b/mozilla/themes/modern/global/otherbutton28-bg-active.gif differ
diff --git a/mozilla/themes/modern/global/otherbutton28-bg-hover.gif b/mozilla/themes/modern/global/otherbutton28-bg-hover.gif
new file mode 100644
index 00000000000..9bbe9b7a3a7
Binary files /dev/null and b/mozilla/themes/modern/global/otherbutton28-bg-hover.gif differ
diff --git a/mozilla/themes/modern/global/print.gif b/mozilla/themes/modern/global/print.gif
new file mode 100644
index 00000000000..47541c13537
Binary files /dev/null and b/mozilla/themes/modern/global/print.gif differ
diff --git a/mozilla/themes/modern/global/progressmeter-busy.gif b/mozilla/themes/modern/global/progressmeter-busy.gif
new file mode 100644
index 00000000000..0645d72a7dc
Binary files /dev/null and b/mozilla/themes/modern/global/progressmeter-busy.gif differ
diff --git a/mozilla/themes/modern/global/question-icon.gif b/mozilla/themes/modern/global/question-icon.gif
new file mode 100644
index 00000000000..15c2a6eeb37
Binary files /dev/null and b/mozilla/themes/modern/global/question-icon.gif differ
diff --git a/mozilla/themes/modern/global/radio.css b/mozilla/themes/modern/global/radio.css
new file mode 100644
index 00000000000..782922998a0
--- /dev/null
+++ b/mozilla/themes/modern/global/radio.css
@@ -0,0 +1,79 @@
+/* stylesheet for XUL <radio> element */
+
+/* default radio for dialogs */
+/* outer frame */
+  radio 
+    {
+      margin: 3px 5px 3px 5px;
+    }
+
+
+/* checkmark outer frame */
+  radio > .internal-box > .checkmark-box 
+    {
+      border: 1px solid #000000;
+      -moz-border-radius: 50%;
+      margin-top: 2px;
+    }
+
+  radio[disabled="true"] > .internal-box > .checkmark-box,
+  radio[disabled="true"]:hover > .internal-box > .checkmark-box 
+    {
+      border: 1px solid #999999;
+    }
+    
+/* checkmark inner frame */
+  radio > .internal-box > .checkmark-box > image 
+    {
+      border: 1px outset #CCCCCC;
+      width: 8px;
+      height: 8px;
+      -moz-border-radius: 50%;
+    }
+
+  radio[checked="true"] > .internal-box > .checkmark-box > image 
+    {
+      list-style-image: url(chrome://global/skin/check-radio.gif);
+    }
+  
+  radio[checked="true"][disabled="true"] > .internal-box > .checkmark-box > image
+    {
+      list-style-image: url(chrome://global/skin/check-radio-disabled.gif);
+    }
+
+  radio:hover:active > .internal-box > .checkmark-box > image 
+    {
+      border: 1px inset #CCCCCC;
+    }
+
+  radio[disabled="true"] > .internal-box > .checkmark-box > image,
+  radio[disabled="true"]:active > .internal-box > .checkmark-box > image 
+    {
+      border: 1px outset #CCCCCC;
+    }
+
+/* text/icon frames */
+  radio[value] > .internal-box > html,
+  radio.iconic > .internal-box > .icon 
+    {
+      margin: 0px 0px 0px 4px;
+      padding: 1px;
+    }
+
+  radio.iconic > .internal-box > html 
+    {
+      margin-left: 4px;
+    }
+    
+  radio[disabled="true"][value] > .internal-box > html 
+    {
+      color: #999999;
+    }
+  
+  radio:focus > .internal-box > html
+    { 
+      border              : 1px dotted black;
+      padding             : 0px;
+    }
+    
+    
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/return-disabled.gif b/mozilla/themes/modern/global/return-disabled.gif
new file mode 100644
index 00000000000..01f2a6a43ca
Binary files /dev/null and b/mozilla/themes/modern/global/return-disabled.gif differ
diff --git a/mozilla/themes/modern/global/return.gif b/mozilla/themes/modern/global/return.gif
new file mode 100644
index 00000000000..9075c98aa4f
Binary files /dev/null and b/mozilla/themes/modern/global/return.gif differ
diff --git a/mozilla/themes/modern/global/scroll-down-disabled.gif b/mozilla/themes/modern/global/scroll-down-disabled.gif
new file mode 100644
index 00000000000..3d62e400631
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-down-disabled.gif differ
diff --git a/mozilla/themes/modern/global/scroll-down-hover.gif b/mozilla/themes/modern/global/scroll-down-hover.gif
new file mode 100644
index 00000000000..f0e550b135c
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-down-hover.gif differ
diff --git a/mozilla/themes/modern/global/scroll-down.gif b/mozilla/themes/modern/global/scroll-down.gif
new file mode 100644
index 00000000000..62edbfd4fe3
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-down.gif differ
diff --git a/mozilla/themes/modern/global/scroll-left-disabled.gif b/mozilla/themes/modern/global/scroll-left-disabled.gif
new file mode 100644
index 00000000000..33243517b1b
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-left-disabled.gif differ
diff --git a/mozilla/themes/modern/global/scroll-left-hover.gif b/mozilla/themes/modern/global/scroll-left-hover.gif
new file mode 100644
index 00000000000..3367bde3123
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-left-hover.gif differ
diff --git a/mozilla/themes/modern/global/scroll-left.gif b/mozilla/themes/modern/global/scroll-left.gif
new file mode 100644
index 00000000000..c5c362d89b1
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-left.gif differ
diff --git a/mozilla/themes/modern/global/scroll-right-disabled.gif b/mozilla/themes/modern/global/scroll-right-disabled.gif
new file mode 100644
index 00000000000..cda95fe215c
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-right-disabled.gif differ
diff --git a/mozilla/themes/modern/global/scroll-right-hover.gif b/mozilla/themes/modern/global/scroll-right-hover.gif
new file mode 100644
index 00000000000..5010921adc6
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-right-hover.gif differ
diff --git a/mozilla/themes/modern/global/scroll-right.gif b/mozilla/themes/modern/global/scroll-right.gif
new file mode 100644
index 00000000000..dce39aecc18
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-right.gif differ
diff --git a/mozilla/themes/modern/global/scroll-thumb-horiz-disabled.gif b/mozilla/themes/modern/global/scroll-thumb-horiz-disabled.gif
new file mode 100644
index 00000000000..2e2249ddb08
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-thumb-horiz-disabled.gif differ
diff --git a/mozilla/themes/modern/global/scroll-thumb-horiz-hover.gif b/mozilla/themes/modern/global/scroll-thumb-horiz-hover.gif
new file mode 100644
index 00000000000..690c3765474
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-thumb-horiz-hover.gif differ
diff --git a/mozilla/themes/modern/global/scroll-thumb-horiz.gif b/mozilla/themes/modern/global/scroll-thumb-horiz.gif
new file mode 100644
index 00000000000..c1ab09c0d1f
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-thumb-horiz.gif differ
diff --git a/mozilla/themes/modern/global/scroll-thumb-vert-disabled.gif b/mozilla/themes/modern/global/scroll-thumb-vert-disabled.gif
new file mode 100644
index 00000000000..e653deff02b
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-thumb-vert-disabled.gif differ
diff --git a/mozilla/themes/modern/global/scroll-thumb-vert-hover.gif b/mozilla/themes/modern/global/scroll-thumb-vert-hover.gif
new file mode 100644
index 00000000000..cef7a5421fc
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-thumb-vert-hover.gif differ
diff --git a/mozilla/themes/modern/global/scroll-thumb-vert.gif b/mozilla/themes/modern/global/scroll-thumb-vert.gif
new file mode 100644
index 00000000000..687e838bca3
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-thumb-vert.gif differ
diff --git a/mozilla/themes/modern/global/scroll-up-disabled.gif b/mozilla/themes/modern/global/scroll-up-disabled.gif
new file mode 100644
index 00000000000..381dee3e5d8
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-up-disabled.gif differ
diff --git a/mozilla/themes/modern/global/scroll-up-hover.gif b/mozilla/themes/modern/global/scroll-up-hover.gif
new file mode 100644
index 00000000000..771605182a5
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-up-hover.gif differ
diff --git a/mozilla/themes/modern/global/scroll-up.gif b/mozilla/themes/modern/global/scroll-up.gif
new file mode 100644
index 00000000000..b8e09b21b87
Binary files /dev/null and b/mozilla/themes/modern/global/scroll-up.gif differ
diff --git a/mozilla/themes/modern/global/scrollbars.css b/mozilla/themes/modern/global/scrollbars.css
new file mode 100644
index 00000000000..5fa9aaad73f
--- /dev/null
+++ b/mozilla/themes/modern/global/scrollbars.css
@@ -0,0 +1,131 @@
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); /* set default namespace to XUL */
+
+/********* XP Scrollbar *********/
+
+scrollbar {
+   behavior: url("resource:/chrome/xulBindings.xml#scrollbar");
+}
+
+slider {
+   user-focus: ignore;
+   user-select: none;
+}
+
+scrollbarbutton {
+  display: inline;
+  user-focus: ignore;
+  user-select: none;
+}
+
+scrollbar[value="hidden"] {
+   visibility: hidden;
+   user-focus: ignore;
+   user-select: none;
+}
+
+/********* XP Scrollbar *********/
+
+thumb {
+  behavior: url(resource:/chrome/xulBindings.xml#thumb);
+  user-focus: ignore;
+  user-select: none;
+  background-color: #CCCCCC;
+  border: 1px outset #CCCCCC;
+  list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif")
+}
+
+thumb[disabled="true"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif");
+}
+
+thumb[align="vertical"] {
+   list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif")
+}
+
+scrollbarbutton {
+  user-focus: ignore;
+  user-select: none;
+  vertical-align: bottom;
+  cursor: default;
+
+  border: 1px outset white;
+  background-color: #CCCCCC;
+  color:black; 
+
+  padding: 1px;
+}
+
+scrollbarbutton:active {
+  user-focus: ignore;
+  user-select: none;
+  border-style: inset;
+
+  padding-left: 2px;
+  padding-right: 0px;
+  padding-top: 2px;
+  padding-bottom: 0px;
+}
+
+scrollbarbutton[type="decrement"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-left.gif")
+}
+
+scrollbarbutton[type="decrement"][disabled="true"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-left-disabled.gif") 
+}
+
+scrollbarbutton[type="increment"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-right.gif")
+}
+
+
+scrollbarbutton[type="increment"][disabled="true"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-right-disabled.gif") 
+}
+
+
+scrollbar[align="vertical"] scrollbarbutton[type="decrement"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-up.gif")
+}
+
+scrollbar[align="vertical"] scrollbarbutton[type="decrement"][disabled="true"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-up-disabled.gif") 
+}
+
+scrollbar[align="vertical"] scrollbarbutton[type="increment"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-down.gif")
+}
+
+scrollbar[align="vertical"] scrollbarbutton[type="increment"][disabled="true"] {
+   user-focus: ignore;
+   user-select: none;
+   list-style-image: url("chrome://global/skin/scroll-down-disabled.gif") 
+}
+
+slider[align="vertical"] thumb:active {
+   user-focus: ignore;
+   user-select: none;
+   background-color: #CCCCCC;
+}
+
+slider {
+   user-focus: ignore;
+   user-select: none;
+   background-color: #999999;
+}
diff --git a/mozilla/themes/modern/global/search.gif b/mozilla/themes/modern/global/search.gif
new file mode 100644
index 00000000000..bde656afe24
Binary files /dev/null and b/mozilla/themes/modern/global/search.gif differ
diff --git a/mozilla/themes/modern/global/seltab-leftedge.gif b/mozilla/themes/modern/global/seltab-leftedge.gif
new file mode 100644
index 00000000000..b3553c25fa0
Binary files /dev/null and b/mozilla/themes/modern/global/seltab-leftedge.gif differ
diff --git a/mozilla/themes/modern/global/seltab-rightedge.gif b/mozilla/themes/modern/global/seltab-rightedge.gif
new file mode 100644
index 00000000000..3cd16218bf8
Binary files /dev/null and b/mozilla/themes/modern/global/seltab-rightedge.gif differ
diff --git a/mozilla/themes/modern/global/sortAscending.gif b/mozilla/themes/modern/global/sortAscending.gif
new file mode 100644
index 00000000000..5e13c7398f1
Binary files /dev/null and b/mozilla/themes/modern/global/sortAscending.gif differ
diff --git a/mozilla/themes/modern/global/sortDescending.gif b/mozilla/themes/modern/global/sortDescending.gif
new file mode 100644
index 00000000000..fa957ac1e75
Binary files /dev/null and b/mozilla/themes/modern/global/sortDescending.gif differ
diff --git a/mozilla/themes/modern/global/stop.gif b/mozilla/themes/modern/global/stop.gif
new file mode 100644
index 00000000000..edfc6119783
Binary files /dev/null and b/mozilla/themes/modern/global/stop.gif differ
diff --git a/mozilla/themes/modern/global/tab-leftedge.gif b/mozilla/themes/modern/global/tab-leftedge.gif
new file mode 100644
index 00000000000..c1653783188
Binary files /dev/null and b/mozilla/themes/modern/global/tab-leftedge.gif differ
diff --git a/mozilla/themes/modern/global/tab-rightedge.gif b/mozilla/themes/modern/global/tab-rightedge.gif
new file mode 100644
index 00000000000..db883b8bcef
Binary files /dev/null and b/mozilla/themes/modern/global/tab-rightedge.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-addressbook.gif b/mozilla/themes/modern/global/taskbar-addressbook.gif
new file mode 100644
index 00000000000..6e1a5e426bf
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-addressbook.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-composer.gif b/mozilla/themes/modern/global/taskbar-composer.gif
new file mode 100644
index 00000000000..dcd90658722
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-composer.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-mail.gif b/mozilla/themes/modern/global/taskbar-mail.gif
new file mode 100644
index 00000000000..11865098fea
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-mail.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-navigator.gif b/mozilla/themes/modern/global/taskbar-navigator.gif
new file mode 100644
index 00000000000..40c582b1593
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-navigator.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-popup-arrow.gif b/mozilla/themes/modern/global/taskbar-popup-arrow.gif
new file mode 100644
index 00000000000..33779709b89
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-popup-arrow.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-tab-hover.gif b/mozilla/themes/modern/global/taskbar-tab-hover.gif
new file mode 100644
index 00000000000..e3fb8d8a470
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-tab-hover.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-tab-minimized.gif b/mozilla/themes/modern/global/taskbar-tab-minimized.gif
new file mode 100644
index 00000000000..6b6f438a2c0
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-tab-minimized.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-tab-trans.gif b/mozilla/themes/modern/global/taskbar-tab-trans.gif
new file mode 100644
index 00000000000..3bd1269d9dd
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-tab-trans.gif differ
diff --git a/mozilla/themes/modern/global/taskbar-tab.gif b/mozilla/themes/modern/global/taskbar-tab.gif
new file mode 100644
index 00000000000..7b4fa87a3e1
Binary files /dev/null and b/mozilla/themes/modern/global/taskbar-tab.gif differ
diff --git a/mozilla/themes/modern/global/tasksOverlay.css b/mozilla/themes/modern/global/tasksOverlay.css
new file mode 100644
index 00000000000..b2e4dc324fa
--- /dev/null
+++ b/mozilla/themes/modern/global/tasksOverlay.css
@@ -0,0 +1,45 @@
+titledbutton#mini-nav {
+	list-style-image:url("chrome://global/skin/taskbar-navigator.gif");
+}
+
+titledbutton#mini-mail {
+	list-style-image:url("chrome://global/skin/taskbar-mail.gif");
+}
+
+titledbutton#mini-addr {
+	list-style-image:url("chrome://global/skin/taskbar-addressbook.gif");
+}
+
+titledbutton#mini-comp {
+	list-style-image:url("chrome://global/skin/taskbar-composer.gif");
+}
+
+
+toolbar#taskbar {
+	color: white;
+	background-color: #003366;
+	padding: 0px;
+	border: none;
+	margin: 0px;
+	margin-top: 2px;
+	min-height: 1em;
+	user-focus: ignore;
+}
+
+titledbutton.taskbutton {
+	margin-right: 1em !important;
+	padding-left: 3px !important;
+}
+
+titledbutton.taskbutton:hover {
+	padding-left: 3px !important;
+}
+
+titledbutton.taskbutton:active {
+  padding: 2px 0px 0px 4px !important;
+}
+
+spring.taskbarspacer {
+   min-width: 0.3em;
+   width: 1em;
+}
diff --git a/mozilla/themes/modern/global/textfield.css b/mozilla/themes/modern/global/textfield.css
new file mode 100644
index 00000000000..7289c287baa
--- /dev/null
+++ b/mozilla/themes/modern/global/textfield.css
@@ -0,0 +1,81 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
+@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */
+
+/** generic text fields (in dialogs)
+ **/
+ 
+/* outer frame */
+  textfield
+    {
+      border              : 1px inset #CCCCCC;
+      font                : inherit;
+      color               : #000000;
+      padding             : 0px;
+      margin              : 1px 3px 2px 4px;
+      background-color    : #FFFFFF;
+      -moz-border-radius  : 3px 2px 2px 3px;
+      cursor              : text;
+    }
+    
+  textfield[readonly="true"]
+    {
+      background-color    : #CCCCCC;
+    }
+  
+  textfield[focused="true"]
+    {
+      border              : 2px solid #6699cc;
+      margin              : 0px 2px 1px 3px;
+    }
+    
+  textfield[focused="true"][readonly="true"]
+    {
+      border              : 1px inset #CCCCCC;
+      margin              : 1px 3px 2px 4px;
+    }
+
+/* internal frame */
+  .textfield-internal-box 
+    {
+      margin              : 0px;
+      padding             : 1px 2px 1px 2px;
+      cursor              : text;
+      border              : 1px solid #000000;
+      background-color    : inherit;
+      color               : inherit;
+    }
+  
+  textfield[disabled="true"] > .textfield-internal-box
+    {
+      border              : 1px solid #999999;
+    }
+  
+  .textarea-internal-box
+    {
+      padding             : 0px 0px 0px 2px;
+    }
+  
+/* internal text widget */
+  .textfield-input, .textfield-textarea
+    {
+      border              : none !important;
+      margin              : 0px;
+      font                : inherit;
+      background-color    : inherit;
+    }
+
+  .textfield-input, .textfield-textarea
+    {
+      color               : #999999;
+      cursor              : default ! important;
+    } 
+    
+/** plain atomic textfields, class="plain" **/
+  textfield.plain, 
+  textfield.plain > .textfield-internal-box, 
+  textfield.plain > .textarea-internal-box
+    {
+      padding             : 0px !important;
+      margin              : 0px !important;
+      border              : none !important;
+    }
diff --git a/mozilla/themes/modern/global/toolbar-begincap.gif b/mozilla/themes/modern/global/toolbar-begincap.gif
new file mode 100644
index 00000000000..74c003ac0ca
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-begincap.gif differ
diff --git a/mozilla/themes/modern/global/toolbar-dropdown-hover.gif b/mozilla/themes/modern/global/toolbar-dropdown-hover.gif
new file mode 100644
index 00000000000..1facab1a47d
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-dropdown-hover.gif differ
diff --git a/mozilla/themes/modern/global/toolbar-dropdown.gif b/mozilla/themes/modern/global/toolbar-dropdown.gif
new file mode 100644
index 00000000000..b1fbed19b74
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-dropdown.gif differ
diff --git a/mozilla/themes/modern/global/toolbar-endcap.gif b/mozilla/themes/modern/global/toolbar-endcap.gif
new file mode 100644
index 00000000000..b13e7b4106b
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-endcap.gif differ
diff --git a/mozilla/themes/modern/global/toolbar-menu-arrow-disabled.gif b/mozilla/themes/modern/global/toolbar-menu-arrow-disabled.gif
new file mode 100644
index 00000000000..9ae75bf9484
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-menu-arrow-disabled.gif differ
diff --git a/mozilla/themes/modern/global/toolbar-menu-arrow-hover.gif b/mozilla/themes/modern/global/toolbar-menu-arrow-hover.gif
new file mode 100644
index 00000000000..24f028f284e
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-menu-arrow-hover.gif differ
diff --git a/mozilla/themes/modern/global/toolbar-menu-arrow.gif b/mozilla/themes/modern/global/toolbar-menu-arrow.gif
new file mode 100644
index 00000000000..45cfaf8d303
Binary files /dev/null and b/mozilla/themes/modern/global/toolbar-menu-arrow.gif differ
diff --git a/mozilla/themes/modern/global/toolbar.css b/mozilla/themes/modern/global/toolbar.css
new file mode 100644
index 00000000000..85e5e022529
--- /dev/null
+++ b/mozilla/themes/modern/global/toolbar.css
@@ -0,0 +1,28 @@
+
+toolbox
+  {
+    background-color      : #999999;
+  }
+  
+toolbar
+  {
+    background-color      : #CCCCCC;
+    border                : 1px outset #CCCCCC;
+  }
+
+toolbargrippy
+  {
+    background-color      : #CCCCCC;
+    border                : 1px solid #CCCCCC;
+  }
+  
+toolbar[collapsed="true"] > toolbargrippy
+  {
+    width                 : 30px;
+  }
+  
+toolbarseparator 
+  { 
+    width                 : 2em; 
+  }
+  
\ No newline at end of file
diff --git a/mozilla/themes/modern/global/tree.css b/mozilla/themes/modern/global/tree.css
new file mode 100644
index 00000000000..b0a4533ba2a
--- /dev/null
+++ b/mozilla/themes/modern/global/tree.css
@@ -0,0 +1,122 @@
+
+/******** Tree widget **********/
+
+/** basic tree ****************************************************
+ *  basic tree widget for use in main windows where no decoration
+ *  is required.
+ **/
+tree {
+  background-color: white;
+  border: none;
+  border-spacing: 0px;
+}
+
+/** class="inset" *************************************************
+ *  this is the tree class used by dialogs to create treeviews with 
+ *  inset borders, and default dialog spacing.
+ **/
+tree.inset {
+  border-top: 1px solid #666666;
+  border-bottom: 1px solid white;
+  border-left: 1px solid #666666;
+  border-right: 1px solid white;
+  margin: 1px 5px 2px 5px;
+}
+
+treeitem[selected="true"] > treerow { 
+	color: white;
+	background-color: #336699;
+}
+
+treecell { 
+  white-space: nowrap;
+  vertical-align: middle;
+  padding: 1px 0px 1px 2px;
+} 
+
+.treecell-header { 
+  background-color: #CCCCCC; 
+  color: black;
+  border-right: 1px solid white;
+  vertical-align: middle;
+  padding: 0px 0px 0px 5px;
+} 
+
+.treecell-inset-header {
+  border-top: 1px solid white;
+  border-bottom: 1px solid #666666;
+  border-left: 1px solid white;
+  border-right: 1px solid #666666;
+}
+
+tree.inset > treehead > treerow > treecell.sortable:active {
+  border-top: 1px solid #666666;
+  border-bottom: 1px solid white;
+  border-left: 1px solid #666666;
+  border-right: 1px solid white;
+}
+
+/** class="propertylist" ******************************************
+ *  class for cells in grid-formatted property lists.
+ **/
+treecell.propertylist {
+  padding-left: 5px;
+  border-right: 1px solid #CCCCCC;
+  border-bottom: 1px solid #CCCCCC;
+}
+
+.tree-cell-primary-icon {
+  list-style-image: inherit;
+  padding-right: 2px;
+}
+
+.tree-cell-icon {
+  list-style-image: inherit;
+  padding-right: 2px;
+}
+
+.tree-cell-twisty {
+ list-style-image: url("chrome://global/skin/closedtwisty.gif");
+ user-focus:ignore;
+ padding-right: 2px;
+}
+
+treeitem[selected="true"] > treerow > treecell > .tree-cell-twisty {
+  list-style-image: url("chrome://global/skin/closedtwisty-selected.gif");
+}
+
+.tree-cell-twisty:hover {
+ text-decoration: none;
+}
+
+.tree-cell-twisty:active {
+ text-decoration: none;
+}
+
+treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty {
+ list-style-image: none !important;
+}
+
+.tree-cell-twisty[disabled="true"] {
+ list-style-image: none;
+}
+
+treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty {
+ list-style-image: url("chrome://global/skin/opentwisty.gif");
+}
+
+treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-cell-twisty {
+  list-style-image: url("chrome://global/skin/opentwisty-selected.gif");
+}
+
+
+/* tree header with sort direction indicators */
+treecell.sortDirectionIndicator[sortDirection="ascending"]  > .tree-header-sortdirection {
+  list-style-image: url("chrome://global/skin/sortAscending.gif");
+  margin-right: 3px;
+}
+
+treecell.sortDirectionIndicator[sortDirection="descending"] > .tree-header-sortdirection {
+  list-style-image: url("chrome://global/skin/sortDescending.gif");
+  margin-right: 3px;
+}
diff --git a/mozilla/themes/modern/global/wizardOverlay.css b/mozilla/themes/modern/global/wizardOverlay.css
new file mode 100644
index 00000000000..a56c66c3ec9
--- /dev/null
+++ b/mozilla/themes/modern/global/wizardOverlay.css
@@ -0,0 +1,17 @@
+#wiz-back-button {
+  list-style-image            : url("chrome://global/skin/scroll-left.gif");
+}
+#wiz-back-button[disabled] {
+  list-style-image            : url("chrome://global/skin/scroll-left-disabled.gif");
+}
+#wiz-next-button {
+  list-style-image            : url("chrome://global/skin/scroll-right.gif");
+}
+#wiz-next-button[disabled] {
+  list-style-image            : url("chrome://global/skin/scroll-right-disabled.gif");
+}
+
+box#wizardButtons {
+  margin-top                  : 3px;
+}
+