From 74d14f90a7085ce7d63f78d6124b57e9a8422d3f Mon Sep 17 00:00:00 2001
From: robert <robert>
Date: Thu, 24 Jan 2002 20:17:38 +0000
Subject: [PATCH] updating EarlyBlue skin; should almost be 0.8 now ;-)

---
 .../bookmarks/bookmark-item16.gif             | Bin 102 -> 0 bytes
 .../communicator/bookmarks/bookmarks.css      |  30 +-
 .../bookmarks/bookmarksToolbar.css            |  85 +--
 .../bookmarks/bookmarksWindow.css             |   5 +-
 .../bookmarks}/location-hover.gif             | Bin
 .../bookmarks}/location.gif                   | Bin
 .../bookmarks/platformBookmarks.css           |  69 ---
 EarlyBlue/communicator/brand.css              |  61 +-
 .../brand/throbber-anim.gif}                  | Bin
 .../brand/throbber-single.gif}                | Bin
 EarlyBlue/communicator/button.css             |  90 +--
 EarlyBlue/communicator/communicator.css       |  21 +-
 .../dialogs.css}                              |  23 +-
 .../communicator/directory/directory.css      |  23 +-
 .../{file-icon-sel.gif => file-sel.gif}       | Bin
 .../directory/{file-icon.gif => file.gif}     | Bin
 ...r-closed-sel.gif => folder-closed-sel.gif} | Bin
 ...le-folder-closed.gif => folder-closed.gif} | Bin
 ...older-open-sel.gif => folder-open-sel.gif} | Bin
 .../{file-folder-open.gif => folder-open.gif} | Bin
 .../{ => icons}/content-large.gif             | Bin
 .../{ => icons}/content-small.gif             | Bin
 .../{broken.gif => icons/lock-broken.gif}     | Bin
 .../{unlock.gif => icons/lock-insecure.gif}   | Bin
 .../{lock.gif => icons/lock-secure.gif}       | Bin
 .../communicator/{ => icons}/offline.gif      | Bin
 EarlyBlue/communicator/{ => icons}/online.gif | Bin
 .../{global => communicator/icons}/search.gif | Bin
 EarlyBlue/communicator/prefpanels.css         |  61 +-
 EarlyBlue/communicator/profile/mac-users.gif  | Bin 285 -> 0 bytes
 EarlyBlue/communicator/profile/profile.css    |   3 +-
 EarlyBlue/communicator/related/related.css    |   2 +-
 EarlyBlue/communicator/search/findresults.css | 102 ----
 EarlyBlue/communicator/search/internet.css    |  50 --
 .../communicator/search/internetresults.css   |   2 +-
 .../communicator/search/search-editor.css     |  23 -
 EarlyBlue/communicator/securityOverlay.css    |  35 +-
 EarlyBlue/communicator/sidebar/customize.css  |  27 -
 .../sidebar/sidebar-close-hover.gif           | Bin 90 -> 0 bytes
 .../communicator/sidebar/sidebar-close.gif    | Bin 90 -> 0 bytes
 .../communicator/sidebar/sidebar-icon.gif     | Bin 82 -> 0 bytes
 .../sidebar/sidebar-open-hover.gif            | Bin 90 -> 0 bytes
 .../communicator/sidebar/sidebar-open.gif     | Bin 90 -> 0 bytes
 EarlyBlue/communicator/sidebar/sidebar.css    | 238 ++++----
 .../communicator/sidebar/sidebarBindings.xml  |  20 +-
 .../sidebar/sidebarSplitterBindings.xml       |  32 -
 .../communicator/taskbar/addressbook.gif      | Bin 0 -> 126 bytes
 EarlyBlue/communicator/taskbar/composer.gif   | Bin 0 -> 104 bytes
 EarlyBlue/communicator/taskbar/mail.gif       | Bin 0 -> 121 bytes
 EarlyBlue/communicator/taskbar/mailnew.gif    | Bin 0 -> 142 bytes
 EarlyBlue/communicator/taskbar/navigator.gif  | Bin 0 -> 112 bytes
 EarlyBlue/communicator/tasksOverlay.css       |  70 +--
 EarlyBlue/communicator/toolbar.css            |  47 --
 .../communicator/xpinstall/xpinstall.css      |   2 +-
 EarlyBlue/contents.rdf                        |  37 +-
 EarlyBlue/editor/EdImageMap.css               |  34 +-
 EarlyBlue/editor/EditModeTabs.css             |  82 ---
 EarlyBlue/editor/EditorDialog.css             | 106 ++--
 EarlyBlue/editor/editor.css                   |  25 +-
 EarlyBlue/editor/editorFormatToolbar.css      | 453 +++++++-------
 EarlyBlue/editor/editorModeToolbar.css        |  51 +-
 EarlyBlue/editor/editorPrimaryToolbar.css     | 281 ++++-----
 EarlyBlue/editor/resources.xml                |  13 -
 EarlyBlue/editor/textEditor.css               |   2 +-
 .../{communicator/box.css => forms/forms.css} |  17 +-
 EarlyBlue/global/arrow-down.gif               | Bin 61 -> 0 bytes
 EarlyBlue/global/arrow-left.gif               | Bin 61 -> 0 bytes
 EarlyBlue/global/arrow-right.gif              | Bin 61 -> 0 bytes
 EarlyBlue/global/arrow-up.gif                 | Bin 59 -> 0 bytes
 .../global/arrow/arrow-down-disabled.gif      | Bin 0 -> 61 bytes
 EarlyBlue/global/arrow/arrow-down.gif         | Bin 0 -> 59 bytes
 .../global/arrow/arrow-left-disabled.gif      | Bin 0 -> 62 bytes
 EarlyBlue/global/arrow/arrow-left.gif         | Bin 0 -> 62 bytes
 .../global/arrow/arrow-right-disabled.gif     | Bin 0 -> 62 bytes
 EarlyBlue/global/arrow/arrow-right.gif        | Bin 0 -> 62 bytes
 EarlyBlue/global/arrow/arrow-up-disabled.gif  | Bin 0 -> 62 bytes
 EarlyBlue/global/arrow/arrow-up.gif           | Bin 0 -> 60 bytes
 EarlyBlue/global/article.gif                  | Bin 164 -> 0 bytes
 EarlyBlue/global/autocomplete.css             | 130 ++--
 EarlyBlue/global/browser.css                  |  40 +-
 EarlyBlue/global/button.css                   | 228 +++----
 EarlyBlue/global/buttonBindings.xml           |  35 --
 EarlyBlue/global/checkbox.css                 | 142 ++---
 .../cbox-check-disabled.gif}                  | Bin
 .../cbox-check.gif}                           | Bin
 EarlyBlue/global/classicBindings.xml          | 181 ------
 EarlyBlue/global/colorpicker.css              |  52 +-
 EarlyBlue/global/console.css                  | 137 ++---
 .../{ => console}/console-error-caret.gif     | Bin
 .../{ => console}/console-error-dash.gif      | Bin
 EarlyBlue/global/dialog.css                   |  41 +-
 EarlyBlue/global/document.gif                 | Bin 113 -> 0 bytes
 EarlyBlue/global/dropmarker-down-disabled.gif | Bin 46 -> 0 bytes
 .../global/dropmarker-down-on-active.gif      | Bin 46 -> 0 bytes
 EarlyBlue/global/dropmarker-down-on-hover.gif | Bin 67 -> 0 bytes
 EarlyBlue/global/dropmarker-up-on.gif         | Bin 46 -> 0 bytes
 EarlyBlue/global/filepicker.css               |  13 +-
 EarlyBlue/global/formatting.css               |  59 +-
 EarlyBlue/global/global.css                   | 286 +++------
 EarlyBlue/global/globalBindings.xml           |  22 +
 EarlyBlue/global/gray-bottomleft.gif          | Bin 820 -> 0 bytes
 EarlyBlue/global/gray-bottomright.gif         | Bin 820 -> 0 bytes
 EarlyBlue/global/gray-topright.gif            | Bin 821 -> 0 bytes
 EarlyBlue/global/groupbox.css                 |  30 +-
 .../{error-icon.gif => icons/alert-error.gif} | Bin
 .../alert-exclam.gif}                         | Bin
 .../alert-message.gif}                        | Bin
 .../alert-question.gif}                       | Bin
 .../{closebox.gif => icons/close-button.gif}  | Bin
 EarlyBlue/global/{ => icons}/loading.gif      | Bin
 .../global/{ => icons}/print-disabled.gif     | Bin
 EarlyBlue/global/{ => icons}/print.gif        | Bin
 .../global/{ => icons}/return-disabled.gif    | Bin
 EarlyBlue/global/{ => icons}/return.gif       | Bin
 .../icons}/stop-disabled.gif                  | Bin
 .../{navigator => global/icons}/stop.gif      | Bin
 .../icons}/trash-disabled.gif                 | Bin
 .../{messenger => global/icons}/trash.gif     | Bin
 EarlyBlue/global/lessCOls_dis.gif             | Bin 59 -> 0 bytes
 EarlyBlue/global/lessCols.gif                 | Bin 51 -> 0 bytes
 EarlyBlue/global/lessCols_mo.gif              | Bin 51 -> 0 bytes
 EarlyBlue/global/listbox.css                  | 106 ++++
 EarlyBlue/global/menu.css                     | 412 ++++++-------
 .../global/{ => menu}/menu-arrow-disabled.gif | Bin
 .../global/{ => menu}/menu-arrow-hover.gif    | Bin
 EarlyBlue/global/{ => menu}/menu-arrow.gif    | Bin
 .../global/{ => menu}/menu-check-disabled.gif | Bin
 .../global/{ => menu}/menu-check-hover.gif    | Bin
 EarlyBlue/global/{ => menu}/menu-check.gif    | Bin
 .../global/{ => menu}/menu-radio-disabled.gif | Bin
 .../global/{ => menu}/menu-radio-hover.gif    | Bin
 EarlyBlue/global/{ => menu}/menu-radio.gif    | Bin
 EarlyBlue/global/menulist.css                 | 260 ++++----
 EarlyBlue/global/menulistBindings.xml         |  64 --
 EarlyBlue/global/outliner.css                 | 200 ++++---
 EarlyBlue/global/popup.css                    |  80 ++-
 EarlyBlue/global/progressmeter.css            |  86 +--
 .../progressmeter-busy.gif                    | Bin
 EarlyBlue/global/radio.css                    | 164 +++--
 .../radio-check-disabled.gif}                 | Bin
 .../radio-check.gif}                          | Bin
 EarlyBlue/global/scroll-down.gif              | Bin 56 -> 0 bytes
 .../button-down-disabled.gif}                 | Bin
 .../button-down.gif}                          | Bin
 .../button-left-disabled.gif}                 | Bin
 .../button-left.gif}                          | Bin
 .../button-right-disabled.gif}                | Bin
 .../button-right.gif}                         | Bin
 .../button-up-disabled.gif}                   | Bin
 .../button-up.gif}                            | Bin
 .../thumb-horiz-grip-disabled.gif}            | Bin
 .../thumb-horiz-grip.gif}                     | Bin
 .../thumb-vert-grip-disabled.gif}             | Bin
 .../thumb-vert-grip.gif}                      | Bin
 EarlyBlue/global/scrollbarBindings.xml        |  43 --
 EarlyBlue/global/scrollbars.css               | 194 +++---
 EarlyBlue/global/scrollbox.css                |  48 +-
 EarlyBlue/global/seltab-leftedge.gif          | Bin 99 -> 0 bytes
 EarlyBlue/global/seltab-rightedge.gif         | Bin 103 -> 0 bytes
 .../{ => spinbutton}/spinbtn-dn-act.gif       | Bin
 .../global/{ => spinbutton}/spinbtn-dn.gif    | Bin
 .../{ => spinbutton}/spinbtn-up-act.gif       | Bin
 .../global/{ => spinbutton}/spinbtn-up.gif    | Bin
 EarlyBlue/global/spinbuttons.css              |   8 +-
 EarlyBlue/global/splitter.css                 | 230 +++----
 .../grip-horiz-after.gif}                     | Bin
 .../grip-horiz-before.gif}                    | Bin
 .../grip-vert-after.gif}                      | Bin
 .../grip-vert-before.gif}                     | Bin
 EarlyBlue/global/stop-disabled.gif            | Bin 155 -> 0 bytes
 EarlyBlue/global/stop.gif                     | Bin 154 -> 0 bytes
 EarlyBlue/global/tab-leftedge.gif             | Bin 105 -> 0 bytes
 EarlyBlue/global/tab-rightedge.gif            | Bin 100 -> 0 bytes
 EarlyBlue/global/tabBindings.xml              |  27 -
 EarlyBlue/global/tabbox.css                   | 161 ++---
 EarlyBlue/global/taskbar-addressbook.gif      | Bin 143 -> 0 bytes
 EarlyBlue/global/taskbar-composer.gif         | Bin 180 -> 0 bytes
 EarlyBlue/global/taskbar-gotmail.gif          | Bin 188 -> 0 bytes
 EarlyBlue/global/taskbar-mail.gif             | Bin 180 -> 0 bytes
 EarlyBlue/global/taskbar-navigator.gif        | Bin 192 -> 0 bytes
 EarlyBlue/global/textbox.css                  | 137 ++---
 EarlyBlue/global/toolbar.css                  | 145 ++---
 .../tbgrip-arrow-collapsed.gif}               | Bin
 .../tbgrip-arrow.gif}                         | Bin
 EarlyBlue/global/toolbarbutton.css            | 163 +++--
 EarlyBlue/global/tree.css                     |  10 +-
 .../columnpicker.gif}                         | Bin
 .../{sortAscending.gif => tree/sort-asc.gif}  | Bin
 .../sort-desc.gif}                            | Bin
 EarlyBlue/global/{ => tree}/twisty-closed.gif | Bin
 EarlyBlue/global/{ => tree}/twisty-open.gif   | Bin
 EarlyBlue/global/wizardOverlay.css            |   9 +-
 EarlyBlue/messenger/abcard.gif                | Bin 131 -> 0 bytes
 EarlyBlue/messenger/accountCentral.css        |  24 +-
 EarlyBlue/messenger/accountManage.css         |   2 -
 EarlyBlue/messenger/accountWizard.css         |   2 -
 .../addressbook/abResultsPane.css}            |  21 +-
 .../messenger/addressbook/addressPanes.css    |  16 +-
 .../messenger/addressbook/addressbook.css     | 128 ++--
 .../messenger/addressbook/cardDialog.css      |  11 +-
 EarlyBlue/messenger/addressbook/edit.gif      | Bin 87 -> 0 bytes
 .../messenger/addressbook/icons/abcard.gif    | Bin 0 -> 90 bytes
 .../messenger/addressbook/icons/ablist.gif    | Bin 0 -> 91 bytes
 .../{myaddrbk.gif => icons/addrbook.gif}      | Bin
 .../{ => icons}/newcard-disabled.gif          | Bin
 .../addressbook/{ => icons}/newcard.gif       | Bin
 .../{ => icons}/newlist-disabled.gif          | Bin
 .../addressbook/{ => icons}/newlist.gif       | Bin
 .../{ => icons}/newmsg-disabled.gif           | Bin
 .../addressbook/{ => icons}/newmsg.gif        | Bin
 .../{ => icons}/person-disabled.gif           | Bin
 .../addressbook/{ => icons}/person.gif        | Bin
 .../remote-addrbook-error.gif}                | Bin
 .../remote-addrbook.gif}                      | Bin
 EarlyBlue/messenger/addressbook/list.gif      | Bin 77 -> 0 bytes
 EarlyBlue/messenger/addressbook/resources.xml |  10 -
 .../addressbook/selectAddressesDialog.css     |  23 +-
 .../messenger/addressbook/trash-disabled.gif  | Bin 128 -> 0 bytes
 EarlyBlue/messenger/addressbook/trash.gif     | Bin 128 -> 0 bytes
 EarlyBlue/messenger/addtoab.gif               | Bin 145 -> 0 bytes
 EarlyBlue/messenger/dialogs.css               |  33 +-
 EarlyBlue/messenger/filterDialog.css          |   4 +-
 EarlyBlue/messenger/flagcol.gif               | Bin 1260 -> 0 bytes
 EarlyBlue/messenger/folderMenus.css           | 174 +++---
 EarlyBlue/messenger/folderPane.css            | 120 ++--
 EarlyBlue/messenger/{ => icons}/attach.gif    | Bin
 EarlyBlue/messenger/{ => icons}/check.gif     | Bin
 EarlyBlue/messenger/{ => icons}/dot.gif       | Bin
 EarlyBlue/messenger/icons/flagcol.gif         | Bin 0 -> 94 bytes
 .../messenger/{ => icons}/flaggedmail.gif     | Bin
 .../messenger/{ => icons}/folder-closed.gif   | Bin
 .../messenger/{ => icons}/folder-draft.gif    | Bin
 .../{ => icons}/folder-inbox-new.gif          | Bin
 .../messenger/{ => icons}/folder-inbox.gif    | Bin
 .../{ => icons}/folder-new-closed.gif         | Bin
 .../{ => icons}/folder-newsgroup.gif          | Bin
 .../messenger/{ => icons}/folder-open.gif     | Bin
 .../messenger/{ => icons}/folder-outbox.gif   | Bin
 .../messenger/{ => icons}/folder-sent.gif     | Bin
 .../messenger/{ => icons}/folder-template.gif | Bin
 .../messenger/{ => icons}/folder-trash.gif    | Bin
 .../icons/message-mail-attach-offline.gif     | Bin 0 -> 114 bytes
 .../{ => icons}/message-mail-attach.gif       | Bin
 .../icons/message-mail-imapdelete-offline.gif | Bin 0 -> 86 bytes
 .../{ => icons}/message-mail-imapdelete.gif   | Bin
 .../icons/message-mail-new-offline.gif        | Bin 0 -> 111 bytes
 .../{ => icons}/message-mail-new.gif          | Bin
 .../messenger/icons/message-mail-offline.gif  | Bin 0 -> 87 bytes
 .../messenger/{ => icons}/message-mail.gif    | Bin
 .../{ => icons}/message-news-attach.gif       | Bin
 .../{ => icons}/message-news-new.gif          | Bin
 .../messenger/{ => icons}/message-news.gif    | Bin
 EarlyBlue/messenger/icons/readcol.gif         | Bin 0 -> 76 bytes
 EarlyBlue/messenger/{ => icons}/readmail.gif  | Bin
 .../messenger/{ => icons}/server-local.gif    | Bin
 .../messenger/{ => icons}/server-mail-new.gif | Bin
 .../messenger/{ => icons}/server-mail.gif     | Bin
 .../{ => icons}/server-news-lock.gif          | Bin
 .../messenger/{ => icons}/server-news.gif     | Bin
 .../{ => icons}/server-remote-lock.gif        | Bin
 .../messenger/{ => icons}/server-remote.gif   | Bin
 .../messenger/{ => icons}/thread-closed.gif   | Bin
 .../{ => icons}/thread-new-closed.gif         | Bin
 .../messenger/{ => icons}/thread-new-open.gif | Bin
 .../messenger/{ => icons}/thread-open.gif     | Bin
 EarlyBlue/messenger/icons/threadcol.gif       | Bin 0 -> 64 bytes
 .../messenger/{ => icons}/unreadmail.gif      | Bin
 EarlyBlue/messenger/icons/unthreadcol.gif     | Bin 0 -> 65 bytes
 .../messenger/{ => icons}/winclassic.gif      | Bin
 EarlyBlue/messenger/{ => icons}/winwide.gif   | Bin
 EarlyBlue/messenger/inbox.gif                 | Bin 879 -> 0 bytes
 EarlyBlue/messenger/mailWindow1.css           |  27 +-
 EarlyBlue/messenger/mailfolder.gif            | Bin 869 -> 0 bytes
 EarlyBlue/messenger/messageBody.css           |  88 ++-
 EarlyBlue/messenger/messageHeader.css         | 229 +++----
 EarlyBlue/messenger/messageWindow.css         |   7 +-
 EarlyBlue/messenger/messenger.css             |  11 -
 .../messengercompose/messengercompose.css     | 360 ++++-------
 EarlyBlue/messenger/newshost.gif              | Bin 887 -> 0 bytes
 EarlyBlue/messenger/prefPanels.css            |  17 +-
 EarlyBlue/messenger/primaryToolbar.css        | 212 +++----
 EarlyBlue/messenger/readcol.gif               | Bin 861 -> 0 bytes
 EarlyBlue/messenger/resources.xml             |  43 --
 EarlyBlue/messenger/searchDialog.css          |   2 -
 EarlyBlue/messenger/subscribe.css             |  25 +-
 EarlyBlue/messenger/threadPane.css            | 123 ++--
 EarlyBlue/messenger/threadPaneLabels.css      | 562 ++++++++++++++++++
 EarlyBlue/messenger/threadcol.gif             | Bin 1248 -> 0 bytes
 .../messenger/{ => toolbar}/file-disabled.gif | Bin
 EarlyBlue/messenger/{ => toolbar}/file.gif    | Bin
 .../{ => toolbar}/forward-disabled.gif        | Bin
 EarlyBlue/messenger/{ => toolbar}/forward.gif | Bin
 .../{ => toolbar}/getmsg-disabled.gif         | Bin
 EarlyBlue/messenger/{ => toolbar}/getmsg.gif  | Bin
 .../messenger/{ => toolbar}/mark-disabled.gif | Bin
 EarlyBlue/messenger/{ => toolbar}/mark.gif    | Bin
 .../{ => toolbar}/newmsg-disabled.gif         | Bin
 EarlyBlue/messenger/{ => toolbar}/newmsg.gif  | Bin
 .../messenger/{ => toolbar}/next-disabled.gif | Bin
 EarlyBlue/messenger/{ => toolbar}/next.gif    | Bin
 .../{ => toolbar}/reply-disabled.gif          | Bin
 EarlyBlue/messenger/{ => toolbar}/reply.gif   | Bin
 .../{ => toolbar}/replyall-disabled.gif       | Bin
 .../messenger/{ => toolbar}/replyall.gif      | Bin
 EarlyBlue/messenger/unthreadcol.gif           | Bin 1251 -> 0 bytes
 .../navigator/{ => icons}/back-disabled.gif   | Bin
 EarlyBlue/navigator/{ => icons}/back.gif      | Bin
 .../{ => icons}/forward-disabled.gif          | Bin
 EarlyBlue/navigator/{ => icons}/forward.gif   | Bin
 .../navigator/{ => icons}/reload-disabled.gif | Bin
 EarlyBlue/navigator/{ => icons}/reload.gif    | Bin
 .../{ => linkButtons}/first-disabled.gif      | Bin
 .../navigator/{ => linkButtons}/first.gif     | Bin
 .../{ => linkButtons}/last-disabled.gif       | Bin
 .../navigator/{ => linkButtons}/last.gif      | Bin
 .../{ => linkButtons}/next-disabled.gif       | Bin
 .../navigator/{ => linkButtons}/next.gif      | Bin
 .../{ => linkButtons}/previous-disabled.gif   | Bin
 .../navigator/{ => linkButtons}/previous.gif  | Bin
 .../{ => linkButtons}/top-disabled.gif        | Bin
 EarlyBlue/navigator/{ => linkButtons}/top.gif | Bin
 .../{ => linkButtons}/up-disabled.gif         | Bin
 EarlyBlue/navigator/{ => linkButtons}/up.gif  | Bin
 EarlyBlue/navigator/linkToolbar.css           |  69 +--
 EarlyBlue/navigator/navigator.css             | 381 ++++++------
 EarlyBlue/navigator/resources.xml             |  17 -
 EarlyBlue/navigator/turbo-systray.gif         | Bin 1124 -> 0 bytes
 EarlyBlue/navigator/turbo.css                 |  43 --
 EarlyBlue/preview.png                         | Bin 3376 -> 0 bytes
 329 files changed, 3923 insertions(+), 5026 deletions(-)
 delete mode 100644 EarlyBlue/communicator/bookmarks/bookmark-item16.gif
 rename EarlyBlue/{navigator => communicator/bookmarks}/location-hover.gif (100%)
 rename EarlyBlue/{navigator => communicator/bookmarks}/location.gif (100%)
 delete mode 100644 EarlyBlue/communicator/bookmarks/platformBookmarks.css
 rename EarlyBlue/{global/animthrob.gif => communicator/brand/throbber-anim.gif} (100%)
 rename EarlyBlue/{global/animthrob_single.gif => communicator/brand/throbber-single.gif} (100%)
 rename EarlyBlue/{navigator/personalToolbar.css => communicator/dialogs.css} (77%)
 rename EarlyBlue/communicator/directory/{file-icon-sel.gif => file-sel.gif} (100%)
 rename EarlyBlue/communicator/directory/{file-icon.gif => file.gif} (100%)
 rename EarlyBlue/communicator/directory/{file-folder-closed-sel.gif => folder-closed-sel.gif} (100%)
 rename EarlyBlue/communicator/directory/{file-folder-closed.gif => folder-closed.gif} (100%)
 rename EarlyBlue/communicator/directory/{file-folder-open-sel.gif => folder-open-sel.gif} (100%)
 rename EarlyBlue/communicator/directory/{file-folder-open.gif => folder-open.gif} (100%)
 rename EarlyBlue/communicator/{ => icons}/content-large.gif (100%)
 rename EarlyBlue/communicator/{ => icons}/content-small.gif (100%)
 rename EarlyBlue/communicator/{broken.gif => icons/lock-broken.gif} (100%)
 rename EarlyBlue/communicator/{unlock.gif => icons/lock-insecure.gif} (100%)
 rename EarlyBlue/communicator/{lock.gif => icons/lock-secure.gif} (100%)
 rename EarlyBlue/communicator/{ => icons}/offline.gif (100%)
 rename EarlyBlue/communicator/{ => icons}/online.gif (100%)
 rename EarlyBlue/{global => communicator/icons}/search.gif (100%)
 delete mode 100644 EarlyBlue/communicator/profile/mac-users.gif
 delete mode 100644 EarlyBlue/communicator/search/findresults.css
 delete mode 100644 EarlyBlue/communicator/search/internet.css
 delete mode 100644 EarlyBlue/communicator/sidebar/sidebar-close-hover.gif
 delete mode 100644 EarlyBlue/communicator/sidebar/sidebar-close.gif
 delete mode 100755 EarlyBlue/communicator/sidebar/sidebar-icon.gif
 delete mode 100644 EarlyBlue/communicator/sidebar/sidebar-open-hover.gif
 delete mode 100644 EarlyBlue/communicator/sidebar/sidebar-open.gif
 delete mode 100644 EarlyBlue/communicator/sidebar/sidebarSplitterBindings.xml
 create mode 100755 EarlyBlue/communicator/taskbar/addressbook.gif
 create mode 100755 EarlyBlue/communicator/taskbar/composer.gif
 create mode 100755 EarlyBlue/communicator/taskbar/mail.gif
 create mode 100755 EarlyBlue/communicator/taskbar/mailnew.gif
 create mode 100755 EarlyBlue/communicator/taskbar/navigator.gif
 delete mode 100644 EarlyBlue/communicator/toolbar.css
 delete mode 100644 EarlyBlue/editor/EditModeTabs.css
 delete mode 100644 EarlyBlue/editor/resources.xml
 rename EarlyBlue/{communicator/box.css => forms/forms.css} (80%)
 delete mode 100644 EarlyBlue/global/arrow-down.gif
 delete mode 100644 EarlyBlue/global/arrow-left.gif
 delete mode 100644 EarlyBlue/global/arrow-right.gif
 delete mode 100644 EarlyBlue/global/arrow-up.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-down-disabled.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-down.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-left-disabled.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-left.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-right-disabled.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-right.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-up-disabled.gif
 create mode 100755 EarlyBlue/global/arrow/arrow-up.gif
 delete mode 100755 EarlyBlue/global/article.gif
 delete mode 100644 EarlyBlue/global/buttonBindings.xml
 rename EarlyBlue/global/{check-check-disabled.gif => checkbox/cbox-check-disabled.gif} (100%)
 rename EarlyBlue/global/{check-check.gif => checkbox/cbox-check.gif} (100%)
 delete mode 100644 EarlyBlue/global/classicBindings.xml
 rename EarlyBlue/global/{ => console}/console-error-caret.gif (100%)
 rename EarlyBlue/global/{ => console}/console-error-dash.gif (100%)
 delete mode 100755 EarlyBlue/global/document.gif
 delete mode 100644 EarlyBlue/global/dropmarker-down-disabled.gif
 delete mode 100644 EarlyBlue/global/dropmarker-down-on-active.gif
 delete mode 100644 EarlyBlue/global/dropmarker-down-on-hover.gif
 delete mode 100644 EarlyBlue/global/dropmarker-up-on.gif
 create mode 100644 EarlyBlue/global/globalBindings.xml
 delete mode 100644 EarlyBlue/global/gray-bottomleft.gif
 delete mode 100644 EarlyBlue/global/gray-bottomright.gif
 delete mode 100644 EarlyBlue/global/gray-topright.gif
 rename EarlyBlue/global/{error-icon.gif => icons/alert-error.gif} (100%)
 rename EarlyBlue/global/{alert-icon.gif => icons/alert-exclam.gif} (100%)
 rename EarlyBlue/global/{message-icon.gif => icons/alert-message.gif} (100%)
 rename EarlyBlue/global/{question-icon.gif => icons/alert-question.gif} (100%)
 rename EarlyBlue/global/{closebox.gif => icons/close-button.gif} (100%)
 rename EarlyBlue/global/{ => icons}/loading.gif (100%)
 rename EarlyBlue/global/{ => icons}/print-disabled.gif (100%)
 rename EarlyBlue/global/{ => icons}/print.gif (100%)
 rename EarlyBlue/global/{ => icons}/return-disabled.gif (100%)
 rename EarlyBlue/global/{ => icons}/return.gif (100%)
 rename EarlyBlue/{navigator => global/icons}/stop-disabled.gif (100%)
 rename EarlyBlue/{navigator => global/icons}/stop.gif (100%)
 rename EarlyBlue/{messenger => global/icons}/trash-disabled.gif (100%)
 rename EarlyBlue/{messenger => global/icons}/trash.gif (100%)
 delete mode 100644 EarlyBlue/global/lessCOls_dis.gif
 delete mode 100644 EarlyBlue/global/lessCols.gif
 delete mode 100644 EarlyBlue/global/lessCols_mo.gif
 create mode 100644 EarlyBlue/global/listbox.css
 rename EarlyBlue/global/{ => menu}/menu-arrow-disabled.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-arrow-hover.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-arrow.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-check-disabled.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-check-hover.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-check.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-radio-disabled.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-radio-hover.gif (100%)
 rename EarlyBlue/global/{ => menu}/menu-radio.gif (100%)
 delete mode 100644 EarlyBlue/global/menulistBindings.xml
 rename EarlyBlue/global/{ => progressmeter}/progressmeter-busy.gif (100%)
 rename EarlyBlue/global/{check-radio-disabled.gif => radio/radio-check-disabled.gif} (100%)
 rename EarlyBlue/global/{check-radio.gif => radio/radio-check.gif} (100%)
 delete mode 100755 EarlyBlue/global/scroll-down.gif
 rename EarlyBlue/global/{scroll-down-disabled.gif => scrollbar/button-down-disabled.gif} (100%)
 rename EarlyBlue/global/{dropmarker-down-on.gif => scrollbar/button-down.gif} (100%)
 rename EarlyBlue/global/{scroll-left-disabled.gif => scrollbar/button-left-disabled.gif} (100%)
 rename EarlyBlue/global/{scroll-left.gif => scrollbar/button-left.gif} (100%)
 rename EarlyBlue/global/{scroll-right-disabled.gif => scrollbar/button-right-disabled.gif} (100%)
 rename EarlyBlue/global/{scroll-right.gif => scrollbar/button-right.gif} (100%)
 rename EarlyBlue/global/{scroll-up-disabled.gif => scrollbar/button-up-disabled.gif} (100%)
 rename EarlyBlue/global/{scroll-up.gif => scrollbar/button-up.gif} (100%)
 rename EarlyBlue/global/{scroll-thumb-horiz-disabled.gif => scrollbar/thumb-horiz-grip-disabled.gif} (100%)
 rename EarlyBlue/global/{scroll-thumb-horiz.gif => scrollbar/thumb-horiz-grip.gif} (100%)
 rename EarlyBlue/global/{scroll-thumb-vert-disabled.gif => scrollbar/thumb-vert-grip-disabled.gif} (100%)
 rename EarlyBlue/global/{scroll-thumb-vert.gif => scrollbar/thumb-vert-grip.gif} (100%)
 delete mode 100644 EarlyBlue/global/scrollbarBindings.xml
 delete mode 100644 EarlyBlue/global/seltab-leftedge.gif
 delete mode 100644 EarlyBlue/global/seltab-rightedge.gif
 rename EarlyBlue/global/{ => spinbutton}/spinbtn-dn-act.gif (100%)
 rename EarlyBlue/global/{ => spinbutton}/spinbtn-dn.gif (100%)
 rename EarlyBlue/global/{ => spinbutton}/spinbtn-up-act.gif (100%)
 rename EarlyBlue/global/{ => spinbutton}/spinbtn-up.gif (100%)
 rename EarlyBlue/global/{grippy-horizontal-after.gif => splitter/grip-horiz-after.gif} (100%)
 rename EarlyBlue/global/{grippy-horizontal-before.gif => splitter/grip-horiz-before.gif} (100%)
 rename EarlyBlue/global/{grippy-vertical-after.gif => splitter/grip-vert-after.gif} (100%)
 rename EarlyBlue/global/{grippy-vertical-before.gif => splitter/grip-vert-before.gif} (100%)
 delete mode 100755 EarlyBlue/global/stop-disabled.gif
 delete mode 100755 EarlyBlue/global/stop.gif
 delete mode 100644 EarlyBlue/global/tab-leftedge.gif
 delete mode 100644 EarlyBlue/global/tab-rightedge.gif
 delete mode 100644 EarlyBlue/global/tabBindings.xml
 delete mode 100755 EarlyBlue/global/taskbar-addressbook.gif
 delete mode 100755 EarlyBlue/global/taskbar-composer.gif
 delete mode 100755 EarlyBlue/global/taskbar-gotmail.gif
 delete mode 100755 EarlyBlue/global/taskbar-mail.gif
 delete mode 100755 EarlyBlue/global/taskbar-navigator.gif
 rename EarlyBlue/global/{tbg-twisty-collapsed.gif => toolbar/tbgrip-arrow-collapsed.gif} (100%)
 rename EarlyBlue/global/{toolbargrippy-twisty.gif => toolbar/tbgrip-arrow.gif} (100%)
 rename EarlyBlue/global/{columnselect.gif => tree/columnpicker.gif} (100%)
 rename EarlyBlue/global/{sortAscending.gif => tree/sort-asc.gif} (100%)
 rename EarlyBlue/global/{sortDescending.gif => tree/sort-desc.gif} (100%)
 rename EarlyBlue/global/{ => tree}/twisty-closed.gif (100%)
 rename EarlyBlue/global/{ => tree}/twisty-open.gif (100%)
 delete mode 100755 EarlyBlue/messenger/abcard.gif
 rename EarlyBlue/{communicator/search/icons.css => messenger/addressbook/abResultsPane.css} (74%)
 delete mode 100644 EarlyBlue/messenger/addressbook/edit.gif
 create mode 100755 EarlyBlue/messenger/addressbook/icons/abcard.gif
 create mode 100644 EarlyBlue/messenger/addressbook/icons/ablist.gif
 rename EarlyBlue/messenger/addressbook/{myaddrbk.gif => icons/addrbook.gif} (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/newcard-disabled.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/newcard.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/newlist-disabled.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/newlist.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/newmsg-disabled.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/newmsg.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/person-disabled.gif (100%)
 rename EarlyBlue/messenger/addressbook/{ => icons}/person.gif (100%)
 rename EarlyBlue/messenger/addressbook/{remote-abook-down.gif => icons/remote-addrbook-error.gif} (100%)
 rename EarlyBlue/messenger/addressbook/{remote-abook.gif => icons/remote-addrbook.gif} (100%)
 delete mode 100644 EarlyBlue/messenger/addressbook/list.gif
 delete mode 100644 EarlyBlue/messenger/addressbook/resources.xml
 delete mode 100755 EarlyBlue/messenger/addressbook/trash-disabled.gif
 delete mode 100755 EarlyBlue/messenger/addressbook/trash.gif
 delete mode 100755 EarlyBlue/messenger/addtoab.gif
 delete mode 100755 EarlyBlue/messenger/flagcol.gif
 rename EarlyBlue/messenger/{ => icons}/attach.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/check.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/dot.gif (100%)
 create mode 100755 EarlyBlue/messenger/icons/flagcol.gif
 rename EarlyBlue/messenger/{ => icons}/flaggedmail.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-closed.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-draft.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-inbox-new.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-inbox.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-new-closed.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-newsgroup.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-open.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-outbox.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-sent.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-template.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/folder-trash.gif (100%)
 create mode 100644 EarlyBlue/messenger/icons/message-mail-attach-offline.gif
 rename EarlyBlue/messenger/{ => icons}/message-mail-attach.gif (100%)
 create mode 100644 EarlyBlue/messenger/icons/message-mail-imapdelete-offline.gif
 rename EarlyBlue/messenger/{ => icons}/message-mail-imapdelete.gif (100%)
 create mode 100644 EarlyBlue/messenger/icons/message-mail-new-offline.gif
 rename EarlyBlue/messenger/{ => icons}/message-mail-new.gif (100%)
 create mode 100644 EarlyBlue/messenger/icons/message-mail-offline.gif
 rename EarlyBlue/messenger/{ => icons}/message-mail.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/message-news-attach.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/message-news-new.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/message-news.gif (100%)
 create mode 100755 EarlyBlue/messenger/icons/readcol.gif
 rename EarlyBlue/messenger/{ => icons}/readmail.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-local.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-mail-new.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-mail.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-news-lock.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-news.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-remote-lock.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/server-remote.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/thread-closed.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/thread-new-closed.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/thread-new-open.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/thread-open.gif (100%)
 create mode 100755 EarlyBlue/messenger/icons/threadcol.gif
 rename EarlyBlue/messenger/{ => icons}/unreadmail.gif (100%)
 create mode 100755 EarlyBlue/messenger/icons/unthreadcol.gif
 rename EarlyBlue/messenger/{ => icons}/winclassic.gif (100%)
 rename EarlyBlue/messenger/{ => icons}/winwide.gif (100%)
 delete mode 100644 EarlyBlue/messenger/inbox.gif
 delete mode 100644 EarlyBlue/messenger/mailfolder.gif
 delete mode 100644 EarlyBlue/messenger/newshost.gif
 delete mode 100755 EarlyBlue/messenger/readcol.gif
 delete mode 100644 EarlyBlue/messenger/resources.xml
 create mode 100644 EarlyBlue/messenger/threadPaneLabels.css
 delete mode 100755 EarlyBlue/messenger/threadcol.gif
 rename EarlyBlue/messenger/{ => toolbar}/file-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/file.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/forward-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/forward.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/getmsg-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/getmsg.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/mark-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/mark.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/newmsg-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/newmsg.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/next-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/next.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/reply-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/reply.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/replyall-disabled.gif (100%)
 rename EarlyBlue/messenger/{ => toolbar}/replyall.gif (100%)
 delete mode 100755 EarlyBlue/messenger/unthreadcol.gif
 rename EarlyBlue/navigator/{ => icons}/back-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => icons}/back.gif (100%)
 rename EarlyBlue/navigator/{ => icons}/forward-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => icons}/forward.gif (100%)
 rename EarlyBlue/navigator/{ => icons}/reload-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => icons}/reload.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/first-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/first.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/last-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/last.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/next-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/next.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/previous-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/previous.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/top-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/top.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/up-disabled.gif (100%)
 rename EarlyBlue/navigator/{ => linkButtons}/up.gif (100%)
 delete mode 100644 EarlyBlue/navigator/resources.xml
 delete mode 100644 EarlyBlue/navigator/turbo-systray.gif
 delete mode 100644 EarlyBlue/navigator/turbo.css
 delete mode 100755 EarlyBlue/preview.png

diff --git a/EarlyBlue/communicator/bookmarks/bookmark-item16.gif b/EarlyBlue/communicator/bookmarks/bookmark-item16.gif
deleted file mode 100644
index 7e311b5910b2c1af86fffaffbbf1339fe6700fe4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmZ?wbhEHb6krfwIK;qk;J|^jw3%sXXa1uC#h)yU3_zg6z`z7l$-}_Ftj!^H>z{&w
tqvn)~7m4!IW*>;1AI6y?<`kIew8+}-(Smb+d)I#1w|L9sfQbwY)&LcgELQ*k

diff --git a/EarlyBlue/communicator/bookmarks/bookmarks.css b/EarlyBlue/communicator/bookmarks/bookmarks.css
index 04f29cbd..8a65166f 100644
--- a/EarlyBlue/communicator/bookmarks/bookmarks.css
+++ b/EarlyBlue/communicator/bookmarks/bookmarks.css
@@ -43,26 +43,46 @@
  * Style rules for generic bookmarks items. 
  */    
  
-outlinerbody:-moz-outliner-image(Name) {
+outlinerchildren:-moz-outliner-image(Name) {
     padding-right: 2px;
 }
  
-.bookmark-item, outlinerbody:-moz-outliner-image(Name) {
+.bookmark-item, outlinerchildren:-moz-outliner-image(Name) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
 }
 
-.bookmark-item[container="true"], outlinerbody:-moz-outliner-image(Name, container) {
+.bookmark-item[container="true"], outlinerchildren:-moz-outliner-image(Name, container) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
 }
 
-.bookmark-item[container="true"][open="true"], outlinerbody:-moz-outliner-image(Name, open) {
+.bookmark-item[container="true"][open="true"], outlinerchildren:-moz-outliner-image(Name, open) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
 
 .bookmark-item[container="true"][open="true"][loading="true"] {
-  list-style-image: url("chrome://global/skin/loading.gif") !important;
+  list-style-image: url("chrome://global/skin/icons/loading.gif") !important;
 }
 
 .bookmark-item[status="new"] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-updated.gif") !important;
 }
+
+.bookmark-item > .menu-iconic-left {
+  height: 16px;
+}
+
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  max-width: 16px;
+  max-height: 16px;
+}
+
+toolbarbutton.bookmark-item > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+.tree-cell-icon, .tree-cell-primary-icon {
+  list-style-image: inherit;
+  height: 16px;
+  max-width: 16px;
+  max-height: 16px;
+}
diff --git a/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css b/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css
index 9e3ef58c..ff277561 100644
--- a/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css
+++ b/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css
@@ -35,89 +35,98 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/* ===== bookmarksToolbar.css ===========================================
+  == Styles specific to bookmark items in a toolbar.
+  ======================================================================= */
+
 @import url(chrome://communicator/skin/bookmarks/bookmarks.css);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: bookmark toolbarbuttons ::::: */
+/* ::::: bookmark toolbar buttons ::::: */
     
 toolbarbutton.bookmark-item {
-  cursor	            : pointer;
-  min-width           : 0px;
-  max-width           : 13em;
+  cursor: pointer;
+  min-width: 0px;
+  max-width: 13em;
+  min-height: 20px;
 }
 
 toolbarbutton.bookmark-item[container="true"] {
-  cursor              : default;
+  cursor: default;
 }
 
-toolbarbutton.bookmark-item > .toolbarbutton-box > .toolbarbutton-dropmarker {
-  display             : none;
+toolbarbutton.bookmark-item > .toolbarbutton-menu-dropmarker {
+  display: none;
 }
 
 toolbarbutton.bookmark-item[disabled="true"],
 toolbarbutton.bookmark-item[disabled="true"]:hover,
 toolbarbutton.bookmark-item[disabled="true"]:hover:active
 {
-  color               : #999999;
-  text-decoration     : none;
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
-  cursor              : default;
+  color: #999999;
+  text-decoration: none;
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
+  cursor: default;
 }
 
 toolbarbutton.bookmark-item[disabled="true"][container="true"],
 toolbarbutton.bookmark-item[disabled="true"][container="true"]:hover,
 toolbarbutton.bookmark-item[disabled="true"][container="true"]:hover:active
 {
-/*  border              : 1px solid transparent !important; */
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
 }
 
 .menuitem-iconic.bookmark-item[disabled="true"]
 {
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
 }
 
 .menu-iconic.bookmark-item[disabled="true"][container="true"]
 {
-  list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
 }
 
-/* ::::: toolbarbutton drag and drop feedback ::::: */
-
-toolbarbutton.bookmark-item[dragover-right="true"] {
-  border-right        : 2px solid #336699;
-}
+/* ::::: drag and drop styles ::::: */
 
 toolbarbutton.bookmark-item[dragover-left="true"] {
-  border-left         : 2px solid #336699;
+  border-left-color: #336699;
 }
-    
-.toolbarbutton-text[dragover-top="true"] {
-  background-color    : #336699;
-  color               : #CCD0DD;
+
+toolbarbutton.bookmark-item[dragover-right="true"] {
+  border-right-color: #336699;
 }
 
-/* ::::: menu drag and drop feedback ::::: */
+/* ::::: bookmark menus ::::: */
 
-menuitem[dragover-top="true"].bookmark-item {
-  border-top          : 1px solid #336699 !important;
+menu.bookmark-item,
+menuitem.bookmark-item {
+  border-top: 1px solid transparent !important;
+  border-bottom: 1px solid transparent !important;
+  padding: 1px 2px;
 }
 
-menu[dragover-top="true"].bookmark-item {
-  border-top          : 1px solid #336699 !important;
-} 
+.menuitem-iconic.bookmark-item[disabled="true"] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-disabled.gif");
+}
 
-menu[dragover="true"].bookmark-item {
-  background-color      : #336699 !important;
-  color                 : #FFFFFF !important;
+.menu-iconic.bookmark-item[disabled="true"][container="true"] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-disabled.gif");
 }
 
-menuitem[dragover-bottom="true"].bookmark-item {
-  border-bottom       : 1px solid #336699 !important;
+/* ..... drag and drop styles ..... */
+
+menu.bookmark-item[dragover-top="true"],
+menuitem.bookmark-item[dragover-top="true"] {
+  border-top: 1px solid #336699 !important;
 }
 
-menu[dragover-bottom="true"].bookmark-item {
-  border-bottom       : 1px solid #336699 !important;
+menu.bookmark-item[dragover-bottom="true"],
+menuitem.bookmark-item[dragover-bottom="true"] {
+  border-bottom: 1px solid #336699 !important;
 }
 
+menu.bookmark-item[dragover="true"] {
+  background-color: #336699 !important;
+  color: #FFFFFF !important;
+}
diff --git a/EarlyBlue/communicator/bookmarks/bookmarksWindow.css b/EarlyBlue/communicator/bookmarks/bookmarksWindow.css
index 9bf76ac7..6336f3b5 100644
--- a/EarlyBlue/communicator/bookmarks/bookmarksWindow.css
+++ b/EarlyBlue/communicator/bookmarks/bookmarksWindow.css
@@ -37,8 +37,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url(chrome://communicator/skin/bookmarks/bookmarks.css);
-@import url(chrome://communicator/skin/bookmarks/platformBookmarks.css);
+@import url("chrome://communicator/skin/bookmarks/bookmarks.css");
+@import url("chrome://communicator/skin/bookmarks/platformBookmarks.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -64,4 +64,3 @@
     {
       list-style-image    : url("chrome://communicator/skin/bookmarks/schedule.gif");
     }
-
diff --git a/EarlyBlue/navigator/location-hover.gif b/EarlyBlue/communicator/bookmarks/location-hover.gif
similarity index 100%
rename from EarlyBlue/navigator/location-hover.gif
rename to EarlyBlue/communicator/bookmarks/location-hover.gif
diff --git a/EarlyBlue/navigator/location.gif b/EarlyBlue/communicator/bookmarks/location.gif
similarity index 100%
rename from EarlyBlue/navigator/location.gif
rename to EarlyBlue/communicator/bookmarks/location.gif
diff --git a/EarlyBlue/communicator/bookmarks/platformBookmarks.css b/EarlyBlue/communicator/bookmarks/platformBookmarks.css
deleted file mode 100644
index 9c29e126..00000000
--- a/EarlyBlue/communicator/bookmarks/platformBookmarks.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/**
- * Bookmarks tree 
- **/ 
-
-/*   
-  .bookmarks-window-tree
-    {
-      border-top          : none !important;
-      border-bottom       : none;
-      border-left         : 1px solid ThreeDShadow;
-      border-right        : 1px solid ThreeDHighlight;
-    }
-*/
-
-  .bookmarks-window-tree > .tree-container-treerows
-    {
-      border-left         : 1px solid #666699;
-      border-right        : 1px solid #666699;
-    }  
-    
-  .bookmarks-panel-tree, .bookmarks-panel-tree > .tree-container-treerows
-    {
-      border              : none;
-    }
-    
-  #panel-bar
-    {
-      border-top          : 1px solid #666699;
-      border-bottom       : 1px solid #666699;
-    }
diff --git a/EarlyBlue/communicator/brand.css b/EarlyBlue/communicator/brand.css
index c41eb78e..6072a4fe 100644
--- a/EarlyBlue/communicator/brand.css
+++ b/EarlyBlue/communicator/brand.css
@@ -37,45 +37,26 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#navigator-throbber
-  {
-    -moz-binding          : url("chrome://global/content/bindings/button.xml#button");
-    border                : none;
-    list-style-image      : url("chrome://global/skin/animthrob_single.gif");
-    margin                : 2px 2px 2px 1px;
-    min-width             : 0px;
-    cursor                : pointer;
-    -moz-user-focus       : ignore;
-  }  
-  
-#navigator-throbber > .button-box
-  {
-/*
-    border                : 1px solid transparent;
-*/
-    padding               : 0px;
-  }
-  
-#navigator-throbber > .button-box > .button-text
-  {
-    display               : none;
-  }  
+#navigator-throbber {
+  -moz-binding: url("chrome://global/content/bindings/button.xml#button-image");
+  -moz-user-focus: ignore;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 1px 3px 1px 1px;
+  border: 1px solid transparent;
+  padding: 0px;
+  min-width: 0;
+  list-style-image: url("chrome://communicator/skin/brand/throbber-single.gif");
+}
 
-/*
-#navigator-throbber:hover > .button-box
-  {
-    border                : 1px outset #CCD0DD;
-    padding               : 1px !important;
-  }  
+#navigator-throbber[busy="true"] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
+}
 
-#navigator-throbber:hover:active > .button-box
-  {
-    border                : 1px inset #CCD0DD !important;
-    padding               : 2px 0px 0px 2px !important;
-  }  
-*/
-  
-#navigator-throbber[busy="true"]
-  {
-    list-style-image      : url("chrome://global/skin/animthrob.gif");
-  }
+#navigator-throbber:hover {
+  border: 1px outset #CCD0DD;
+}
+
+#navigator-throbber:hover:active {
+  border: 1px inset #CCD0DD;
+}
diff --git a/EarlyBlue/global/animthrob.gif b/EarlyBlue/communicator/brand/throbber-anim.gif
similarity index 100%
rename from EarlyBlue/global/animthrob.gif
rename to EarlyBlue/communicator/brand/throbber-anim.gif
diff --git a/EarlyBlue/global/animthrob_single.gif b/EarlyBlue/communicator/brand/throbber-single.gif
similarity index 100%
rename from EarlyBlue/global/animthrob_single.gif
rename to EarlyBlue/communicator/brand/throbber-single.gif
diff --git a/EarlyBlue/communicator/button.css b/EarlyBlue/communicator/button.css
index 308e30e7..5c2cd15f 100644
--- a/EarlyBlue/communicator/button.css
+++ b/EarlyBlue/communicator/button.css
@@ -44,11 +44,10 @@
 /* ::::: large toolbar buttons ::::: */
 
 .toolbarbutton-1,
-.toolbarbutton-1 > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button
+.toolbarbutton-1 > .toolbarbutton-menubutton-button
 {
   min-width           : 36px;
   min-height          : 36px;
-/*  font-size           : smaller; */
   -moz-box-orient     : vertical;
 }
 
@@ -56,99 +55,30 @@
   -moz-box-orient     : horizontal;
 }
 
-.toolbarbutton-1 > .toolbarbutton-box,
-.toolbarbutton-1 > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box,
-.toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box,
-.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-box,
-.toolbarbutton-1[disabled="true"][buttondown="true"] > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1[disabled="true"]:hover:active,
+.toolbarbutton-1[disabled="true"][buttondown="true"]
 {
   padding             : 1px;
 }
 
-.toolbarbutton-1:hover:active > .toolbarbutton-box,
-.toolbarbutton-1[open="true"] > .toolbarbutton-box,
-.toolbarbutton-1[buttondown="true"] > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box
+.toolbarbutton-1:hover:active,
+.toolbarbutton-1[open="true"],
+.toolbarbutton-1[buttondown="true"] > .toolbarbutton-menubutton-button
 {
   padding             : 2px 0px 0px 2px;
 }
 
-.toolbarbutton-1[type="menu"] > .toolbarbutton-box > .toolbarbutton-dropmarker {
+.toolbarbutton-1[type="menu"] > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-/* ::::: normal buttons on toolbars ::::: */
+/* ::::: standard toolbar buttons ::::: */
 
 .button-toolbar {
   -moz-user-focus     : ignore;
   min-width           : 0px;
   max-width             : 10em;
   background-color    : transparent;
-}  
-
-/*  
-.button-toolbar > .button-box,
-.button-toolbar[disabled="true"] > .button-box,
-.button-toolbar[disabled="true"]:hover > .button-box,
-.button-toolbar[disabled="true"]:hover:active > .button-box {
-  border-left         : 1px solid ThreeDHighlight !important;
-  border-top          : 1px solid ThreeDHighlight !important;
-  border-right        : 1px solid ThreeDShadow !important;
-  border-bottom       : 1px solid ThreeDShadow !important;
-}
-  
-.button-toolbar:hover:active > .button-box {
-  border-left         : 1px solid ThreeDShadow !important;
-  border-top          : 1px solid ThreeDShadow !important;
-  border-bottom       : 1px solid ThreeDHighlight !important;
-  border-right        : 1px solid ThreeDHighlight !important;
-} 
-
-.button-toolbar[checked="true"] > .button-box {
-  border-left         : 1px solid ThreeDShadow;
-  border-top          : 1px solid ThreeDShadow;
-  border-right        : 1px solid ThreeDHighlight;
-  border-bottom       : 1px solid ThreeDHighlight;
-  background-color	  : ThreeDHighlight;
-}
-    
-.button-toolbar[checked="true"]:hover > .button-box {
-  border-left         : 1px solid ThreeDShadow;
-  border-top          : 1px solid ThreeDShadow;
-  border-right        : 1px solid ThreeDHighlight;
-  border-bottom       : 1px solid ThreeDHighlight;
-  background-color	  : -moz-Dialog;
-  background-image    : none;
-}
-
-.button-toolbar > .button-box > .button-box-2,
-.button-toolbar > .button-box > .button-box-2 > .button-box-text {
-  margin: none;
-  border: none !important;
-  padding: 0px 2px;
-}
-*/
-
-.button-toolbar > .button-box > .button-icon {
-  margin-right: 3px;
 }
-
-.button-toolbar > .button-box > .button-text {
-  margin-right: 1px;
-}  
-
-/* ::::: reorder buttons ::::: */
-
-.reorder-up {
-  min-width           : 0px;
-}    
-
-.reorder-down {
-  min-width           : 0px;
-}    
-
-.reorder-up > .button-internal-box > .button-icon,
-.reorder-down > .button-internal-box > .button-icon {
-  margin              : 0;
-  padding             : 0;
-}
-
diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index cf30a93d..a2e652c6 100644
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -35,27 +35,29 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url(chrome://global/skin/);
+/* ==== communicator.css ====================================================
+   == Styles shared everywhere throughout the Communicator suite.
+   ========================================================================== */
 
-@import url(chrome://communicator/skin/box.css);
-@import url(chrome://communicator/skin/button.css);
+@import url(chrome://global/skin/);
 @import url(chrome://communicator/skin/brand.css);
+@import url(chrome://communicator/skin/button.css);
 @import url(chrome://communicator/skin/formatting.css);
-@import url(chrome://communicator/skin/toolbar.css);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml");
 
 #offline-status[offline="true"]
   {
-    list-style-image      : url("chrome://communicator/skin/offline.gif");
+    list-style-image      : url("chrome://communicator/skin/icons/offline.gif");
   }
 
 #offline-status
   {
-    list-style-image      : url("chrome://communicator/skin/online.gif");
+    list-style-image      : url("chrome://communicator/skin/icons/online.gif");
   }
   
+/* ::::: directional button icons ::::: */
+
 .up {
   list-style-image:url("chrome://global/skin/scroll-up.gif");
   min-width: 0px;
@@ -73,3 +75,8 @@
 .down[disabled="true"] {
   list-style-image:url("chrome://global/skin/scroll-down-disabled.gif");
 }
+
+.sidebarTree {
+  border: none;
+  margin: 0px !important;
+}
diff --git a/EarlyBlue/navigator/personalToolbar.css b/EarlyBlue/communicator/dialogs.css
similarity index 77%
rename from EarlyBlue/navigator/personalToolbar.css
rename to EarlyBlue/communicator/dialogs.css
index 93a03f9a..d65505b9 100644
--- a/EarlyBlue/navigator/personalToolbar.css
+++ b/EarlyBlue/communicator/dialogs.css
@@ -19,9 +19,8 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Ben Goodger <ben@netscape.com>
- *   Josh Soref  <timeless@mac.com>
- *   Robert Kaiser <KaiRo@KaiRo.at>
+ *  Joe Hewitt <hewitt@netscape.com>
+ *  Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or 
@@ -37,16 +36,18 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url("chrome://communicator/skin/bookmarks/bookmarks.css");
+/* ==== dialogs.css ==================================================
+   == Styles used by certain dialogs in the Communicator suite.
+   ====================================================================== */
+
+@import url("chrome://communicator/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/**
- * Personal toolbar items
- **/
+/* ::::: turbo confirmation dialog ::::: */
 
-  #home-button
-    {
-      list-style-image    : url("chrome://communicator/skin/bookmarks/home.gif");
-    }
+#turboTrayImage {
+  list-style-image: url("chrome://communicator/skin/icons/turbo-systray.gif");
+  border: 2px inset ThreeDFace !important;
+}
 
diff --git a/EarlyBlue/communicator/directory/directory.css b/EarlyBlue/communicator/directory/directory.css
index 8434d2a2..16f4fff4 100644
--- a/EarlyBlue/communicator/directory/directory.css
+++ b/EarlyBlue/communicator/directory/directory.css
@@ -35,16 +35,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@import url("chrome://communicator/skin/");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /*
-
   Style rules specific to the directory listing window.
-
 */
 
-@import url(chrome://communicator/skin/);
-
 /* Hide twisty for files */
 .treecell-indent[type="FILE"] > .tree-cell-twisty 
   {
@@ -53,38 +51,37 @@
 
 .treecell-filename
   {
-    list-style-image      : url("chrome://communicator/skin/directory/file-icon.gif");
+    list-style-image      : url("chrome://communicator/skin/directory/file.gif");
   }  
   
 treeitem[selected="true"] > treerow > .treecell-filename
   {
-    list-style-image      : url("chrome://communicator/skin/directory/file-icon-sel.gif");
+    list-style-image      : url("chrome://communicator/skin/directory/file-sel.gif");
   }
   
 treeitem[container="true"] > treerow > .treecell-filename
   {
-    list-style-image      : url("chrome://communicator/skin/directory/file-folder-closed.gif");
+    list-style-image      : url("chrome://communicator/skin/directory/folder-closed.gif");
   }
 treeitem[container="true"][selected="true"] > treerow > .treecell-filename
   {
-    list-style-image      : url("chrome://communicator/skin/directory/file-folder-closed-sel.gif");
+    list-style-image      : url("chrome://communicator/skin/directory/folder-closed-sel.gif");
   }
 
 treeitem[container="true"][open="true"] > treerow > .treecell-filename
   {
-    list-style-image      : url("chrome://communicator/skin/directory/file-folder-open.gif");
+    list-style-image      : url("chrome://communicator/skin/directory/folder-open.gif");
   }
 treeitem[container="true"][open="true"][selected="true"] > treerow > .treecell-filename
   {
-    list-style-image      : url("chrome://communicator/skin/directory/file-folder-open-sel.gif");
+    list-style-image      : url("chrome://communicator/skin/directory/folder-open-sel.gif");
   }
-  
-  
+
 /* Show an animated icon when a directory/symlink is loading */
 treeitem[type="SYMBOLIC-LINK"][loading="true"] > treerow > .treecell-filename > .tree-cell-twisty,
 treeitem[type="DIRECTORY"][loading="true"] > treerow > treecell > .tree-cell-twisty
   {
-    list-style-image      : url("chrome://global/skin/loading.gif");
+    list-style-image      : url("chrome://global/skin/icons/loading.gif");
   }
 
 /* Italicize a symbolic link and make it look like a link (it can be a dir or link) */
diff --git a/EarlyBlue/communicator/directory/file-icon-sel.gif b/EarlyBlue/communicator/directory/file-sel.gif
similarity index 100%
rename from EarlyBlue/communicator/directory/file-icon-sel.gif
rename to EarlyBlue/communicator/directory/file-sel.gif
diff --git a/EarlyBlue/communicator/directory/file-icon.gif b/EarlyBlue/communicator/directory/file.gif
similarity index 100%
rename from EarlyBlue/communicator/directory/file-icon.gif
rename to EarlyBlue/communicator/directory/file.gif
diff --git a/EarlyBlue/communicator/directory/file-folder-closed-sel.gif b/EarlyBlue/communicator/directory/folder-closed-sel.gif
similarity index 100%
rename from EarlyBlue/communicator/directory/file-folder-closed-sel.gif
rename to EarlyBlue/communicator/directory/folder-closed-sel.gif
diff --git a/EarlyBlue/communicator/directory/file-folder-closed.gif b/EarlyBlue/communicator/directory/folder-closed.gif
similarity index 100%
rename from EarlyBlue/communicator/directory/file-folder-closed.gif
rename to EarlyBlue/communicator/directory/folder-closed.gif
diff --git a/EarlyBlue/communicator/directory/file-folder-open-sel.gif b/EarlyBlue/communicator/directory/folder-open-sel.gif
similarity index 100%
rename from EarlyBlue/communicator/directory/file-folder-open-sel.gif
rename to EarlyBlue/communicator/directory/folder-open-sel.gif
diff --git a/EarlyBlue/communicator/directory/file-folder-open.gif b/EarlyBlue/communicator/directory/folder-open.gif
similarity index 100%
rename from EarlyBlue/communicator/directory/file-folder-open.gif
rename to EarlyBlue/communicator/directory/folder-open.gif
diff --git a/EarlyBlue/communicator/content-large.gif b/EarlyBlue/communicator/icons/content-large.gif
similarity index 100%
rename from EarlyBlue/communicator/content-large.gif
rename to EarlyBlue/communicator/icons/content-large.gif
diff --git a/EarlyBlue/communicator/content-small.gif b/EarlyBlue/communicator/icons/content-small.gif
similarity index 100%
rename from EarlyBlue/communicator/content-small.gif
rename to EarlyBlue/communicator/icons/content-small.gif
diff --git a/EarlyBlue/communicator/broken.gif b/EarlyBlue/communicator/icons/lock-broken.gif
similarity index 100%
rename from EarlyBlue/communicator/broken.gif
rename to EarlyBlue/communicator/icons/lock-broken.gif
diff --git a/EarlyBlue/communicator/unlock.gif b/EarlyBlue/communicator/icons/lock-insecure.gif
similarity index 100%
rename from EarlyBlue/communicator/unlock.gif
rename to EarlyBlue/communicator/icons/lock-insecure.gif
diff --git a/EarlyBlue/communicator/lock.gif b/EarlyBlue/communicator/icons/lock-secure.gif
similarity index 100%
rename from EarlyBlue/communicator/lock.gif
rename to EarlyBlue/communicator/icons/lock-secure.gif
diff --git a/EarlyBlue/communicator/offline.gif b/EarlyBlue/communicator/icons/offline.gif
similarity index 100%
rename from EarlyBlue/communicator/offline.gif
rename to EarlyBlue/communicator/icons/offline.gif
diff --git a/EarlyBlue/communicator/online.gif b/EarlyBlue/communicator/icons/online.gif
similarity index 100%
rename from EarlyBlue/communicator/online.gif
rename to EarlyBlue/communicator/icons/online.gif
diff --git a/EarlyBlue/global/search.gif b/EarlyBlue/communicator/icons/search.gif
similarity index 100%
rename from EarlyBlue/global/search.gif
rename to EarlyBlue/communicator/icons/search.gif
diff --git a/EarlyBlue/communicator/prefpanels.css b/EarlyBlue/communicator/prefpanels.css
index 21ee7e9d..aa538611 100644
--- a/EarlyBlue/communicator/prefpanels.css
+++ b/EarlyBlue/communicator/prefpanels.css
@@ -35,34 +35,59 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/* ==== prefpanels.css ==================================================
+   == Styles used by all preference panels in the Communicator suite.
+   ====================================================================== */
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/******* SmartBrowsing **********/
+/* ::::: Themes ::::: */
+#skinsTree {
+  height: 80px;
+}  
 
-#disabledDomains {
-	max-height: 15em;
+#themesLink {
+  margin-left: 5px;
+  text-decoration: underline;
+  color: blue;
+  cursor: pointer;
 }
 
-/******* Themes ****************/
-#skinsTree {
-  height                  : 80px;
-}  
+#themesLink:active {
+  color: red;
+}
 
 #previewImageContainer {
-  overflow: hidden; 
+  padding: 1px;
   height: 92px; 
-  background-color: #000000; 
-  padding: 2px;
+/*  background-color: #000000; */
 }
 
 #previewImage {
-  max-width: 387px; 
+  max-width: 355px; 
+  min-width: 355px;
+  max-height: 85px;
+  min-height: 85px;
 }
 
-/**
- * File icon (32x32)
- **/
-.file-icon-large
-  {
-    list-style-image      : url("chrome://communicator/skin/content-large.gif");
-  }
+/* ::::: Fonts ::::: */
+
+#sizeVar,
+#sizeMono {
+  width: 4em;
+}
+
+#mouseWheelMode {
+  width: 9em;
+}
+
+/* ::::: Smart Browsing ::::: */
+
+#disabledDomains {
+  max-height: 13em;
+}
+
+/* ::::: File icon (32x32) ::::: */
+.file-icon-large {
+  list-style-image: url("chrome://communicator/skin/icons/content-large.gif");
+}
diff --git a/EarlyBlue/communicator/profile/mac-users.gif b/EarlyBlue/communicator/profile/mac-users.gif
deleted file mode 100644
index decf39aa759c3be91ce7bbd8dc42b7f4746f9d9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmV+&0pk8gNk%w1VH5xo0HXf@00030|IEypX8+8Yz`($&s;U4000000A^8LW000C4
zEC2ui02BZc06+s?NV*FCunj?L1!Cw|2>eCIEWl)0*fs%0d16AUt>X91bKIIJC2Km@
zDdxzySRUTX78;QP&}ei3NaAp@*>N|7{b<5rER$n}yJQ+y4BI$5XI~MEgt0^T<|5B`
zE)oDcykSk>)M@jJ4zIG#XP27eus?WOE;L(obw*HmHb6f@e`-iO29uPPmY0~5DFK|F
zo}Zwh0cns)kEM>JNQJD0sdg)^tZ;l_h=GEHwSKBif>CdawpfaKa$9|e#Ce4?bIHng
jzcRswO1-!-vN$KIAF{~MN2jR6<>TJxycq256%hbCCl7v*

diff --git a/EarlyBlue/communicator/profile/profile.css b/EarlyBlue/communicator/profile/profile.css
index da4ab1a8..122de53b 100644
--- a/EarlyBlue/communicator/profile/profile.css
+++ b/EarlyBlue/communicator/profile/profile.css
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url(chrome://global/skin/global.css);
+@import url("chrome://global/skin/global.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -82,4 +82,3 @@ box#wizardButtons {
 box.selection {
   margin-top: 4px;
 }
-
diff --git a/EarlyBlue/communicator/related/related.css b/EarlyBlue/communicator/related/related.css
index 3566729b..8f193e21 100644
--- a/EarlyBlue/communicator/related/related.css
+++ b/EarlyBlue/communicator/related/related.css
@@ -67,7 +67,7 @@ treeitem > treerow.relatedresult > treecell > titledbutton:active
 
 treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-indent
 {
-  list-style-image: url("chrome://global/skin/loading.gif") ! important ;
+  list-style-image: url("chrome://global/skin/icons/loading.gif") ! important ;
 }
 
 treeitem[container="true"][open="true"] > treerow > .treecell-indent 
diff --git a/EarlyBlue/communicator/search/findresults.css b/EarlyBlue/communicator/search/findresults.css
deleted file mode 100644
index 9ae42c94..00000000
--- a/EarlyBlue/communicator/search/findresults.css
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-treecol[sortActive="true"] {
- background-color: lightgray;
-}
-
-treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://global/skin/loading.gif") ! important ;
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/ieFavorite.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/directory/file-folder-open.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/directory/file-folder-closed.gif");
-}
-
-treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://global/skin/article.gif");
-}
-
-treeitem[container="true"][open="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/directory/file-folder-open.gif");
-}
-
-treeitem[container="true"] > treerow > treecell > titledbutton {
- list-style-image: url("chrome://communicator/skin/directory/file-folder-closed.gif");
-}
-
-treeitem > treerow > treecell > titledbutton {
- list-style-image: url("chrome://global/skin/document.gif");
-}
-
-titledbutton#bookmarks {
-	list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
-}
diff --git a/EarlyBlue/communicator/search/internet.css b/EarlyBlue/communicator/search/internet.css
deleted file mode 100644
index 27e170f9..00000000
--- a/EarlyBlue/communicator/search/internet.css
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-tree[id="searchengines"] {
- width: 300px;
-}
-
-tree[id="searchengines"] > treecol[id="CheckboxColumn"] {
- width: 40px;
-}
-
-treecol[sortActive="true"] {
- background-color: lightgray;
-}
diff --git a/EarlyBlue/communicator/search/internetresults.css b/EarlyBlue/communicator/search/internetresults.css
index 3b72dec0..25f9691c 100644
--- a/EarlyBlue/communicator/search/internetresults.css
+++ b/EarlyBlue/communicator/search/internetresults.css
@@ -48,8 +48,8 @@
 
 #engineTabs 
   {
-    background-color      : #666666;
     padding               : 2px 0px 2px 0px;
+    background-color      : #666666;
   }
 
 #internetresultstree
diff --git a/EarlyBlue/communicator/search/search-editor.css b/EarlyBlue/communicator/search/search-editor.css
index 51089e77..5d7fa5bd 100644
--- a/EarlyBlue/communicator/search/search-editor.css
+++ b/EarlyBlue/communicator/search/search-editor.css
@@ -37,28 +37,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.up
-{
-	list-style-image:url("chrome://global/skin/scroll-up.gif");
-	min-width: 0px;
-}
-
-.up[disabled="true"]
-{
-	list-style-image:url("chrome://global/skin/scroll-up-disabled.gif");
-}
-
-.down
-{
-	min-width: 0px;
-	list-style-image:url("chrome://global/skin/scroll-down.gif");
-}
-
-.down[disabled="true"]
-{
-	list-style-image:url("chrome://global/skin/scroll-down-disabled.gif");
-}
-
 #add-button
   {
     list-style-image      : url("chrome://global/skin/scroll-right.gif");
@@ -68,4 +46,3 @@
   {
     list-style-image      : url("chrome://global/skin/scroll-left.gif");
   }
-
diff --git a/EarlyBlue/communicator/securityOverlay.css b/EarlyBlue/communicator/securityOverlay.css
index 72d4dbe4..6cfa3304 100644
--- a/EarlyBlue/communicator/securityOverlay.css
+++ b/EarlyBlue/communicator/securityOverlay.css
@@ -35,25 +35,26 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/* ==== securityOverlay.css =============================================
+   == Styles used by the the overlay which contains security related
+   == content that is used throughout the Communicator suite.
+   ====================================================================== */
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#security-button
-  {
-    list-style-image:url("chrome://communicator/skin/unlock.gif");
-    margin-left: 2px;
-  }
+#security-button {
+  list-style-image:url("chrome://communicator/skin/icons/lock-insecure.gif");
+  margin-left: 2px;
+}
 
-#security-button[level="high"] 
-  {
-    list-style-image:url("chrome://communicator/skin/lock.gif");        
-  }
+#security-button[level="high"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
+}
 
-#security-button[level="low"] 
-  {
-    list-style-image:url("chrome://communicator/skin/lock.gif");        
-  }
+#security-button[level="low"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
+}
 
-#security-button[level="broken"] 
-  {
-    list-style-image:url("chrome://communicator/skin/broken.gif");        
-  }
+#security-button[level="broken"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-broken.gif");
+}
diff --git a/EarlyBlue/communicator/sidebar/customize.css b/EarlyBlue/communicator/sidebar/customize.css
index 0f42c33b..8eadb76e 100644
--- a/EarlyBlue/communicator/sidebar/customize.css
+++ b/EarlyBlue/communicator/sidebar/customize.css
@@ -38,30 +38,9 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /*
-
    Style rules specific to the Customize dialog.
-
 */
 
-/* These rules apply appropriate images to the 'reorder' buttons */
-.up {
-  list-style-image:url("chrome://global/skin/scroll-up.gif");
-  min-width: 0px;
-}
-
-.up[disabled="true"] {
-  list-style-image:url("chrome://global/skin/scroll-up-disabled.gif");
-}
-
-.down {
-  min-width: 0px;
-  list-style-image:url("chrome://global/skin/scroll-down.gif");
-}
-
-.down[disabled="true"] {
-  list-style-image:url("chrome://global/skin/scroll-down-disabled.gif");
-}
-
 .treecell-panel
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
@@ -91,12 +70,6 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-p
   list-style-image: url("chrome://communicator/skin/sidebar/sidebar-icon.gif");
 }
 
-/*
-.tree-cell-twisty {
- display: none !important;
-}
-*/
-
 box#reorder {
   -moz-box-pack: center;
 }
diff --git a/EarlyBlue/communicator/sidebar/sidebar-close-hover.gif b/EarlyBlue/communicator/sidebar/sidebar-close-hover.gif
deleted file mode 100644
index be478ac8de10825da7d5edefb7791ac21e23b0de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmZ?wbhEHb6lUOMn8?I%=Kp^N28RD&Qt>AXBLf2ygAP!H0VL1Bq}|fLlIaf9Vv{xd
qDjsf}d5$e?R(s%s#WNnxn)hbMjIf!O`I?r+XHTd2Wpi>fSOWm^u^+hr

diff --git a/EarlyBlue/communicator/sidebar/sidebar-close.gif b/EarlyBlue/communicator/sidebar/sidebar-close.gif
deleted file mode 100644
index f0835fc5ba4022154c2d4e87fe675d3e801c4bf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmZ?wbhEHb6lUOMn8?I1^UN6r28RFt{{u<IpDc_F3``6<KsEzNo`FfbrGF*U9j3)5
sYxY$<+&J?bTiC4jzz2(GJe)P}&5jviGcEHqEsM{dPVvj;<Yur20L4WgAOHXW

diff --git a/EarlyBlue/communicator/sidebar/sidebar-icon.gif b/EarlyBlue/communicator/sidebar/sidebar-icon.gif
deleted file mode 100755
index a872bc91f59dfc32affdc2e5a9403be1a8b3a71b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82
zcmZ?wbhEHb6krfwX!y_Y|Ns932M#FyWMO1rU}Vr?00NMV1CvHie`dp)chk5w_;PHz
k7d0;<FtMpn%_4TWX6mEMRVk+z#Oby#_`58ak-^#;0E&PfKmY&$

diff --git a/EarlyBlue/communicator/sidebar/sidebar-open-hover.gif b/EarlyBlue/communicator/sidebar/sidebar-open-hover.gif
deleted file mode 100644
index 808c2da99b80f2389625a788f28c8666e38808b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmZ?wbhEHb6lUOMn8?I%=Kp^N28RD&Qt>AXBLf2ygAP!H0VL1Bq}|fLlIaf9Vv{xd
qDjsgUd6q5g{?^84k6NDxEj#7Ba+340d+nz$-w87Q&!xo0U=08o)FKQ3

diff --git a/EarlyBlue/communicator/sidebar/sidebar-open.gif b/EarlyBlue/communicator/sidebar/sidebar-open.gif
deleted file mode 100644
index a152b5a5a7d84efb49176947f75342444360a050..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmZ?wbhEHb6lUOMn8?I1^UN6r28RFt{{u<IpDc_F3``6<KsEzNo`FfbrGF*U9j3)5
sYxY$<+<5aWTiE@rjn5vnJ`Y-U%6a7^=VSNUPhY+hWc;5?iHpG+0PR^Ja{vGU

diff --git a/EarlyBlue/communicator/sidebar/sidebar.css b/EarlyBlue/communicator/sidebar/sidebar.css
index 0ae2df55..36c1ca43 100644
--- a/EarlyBlue/communicator/sidebar/sidebar.css
+++ b/EarlyBlue/communicator/sidebar/sidebar.css
@@ -37,14 +37,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/*
-#sidebar-splitter 
-  {
-    border-top            : 1px solid ThreeDHighlight;
-    border-bottom         : 1px solid ThreeDShadow;
-  }
-*/
-
 #sidebar-box 
   {
     margin-top            : 0px;
@@ -52,23 +44,14 @@
     background-color      : #CCD0DD;
   }
 
-.text-panel-loading 
-  {
-    margin                : 5px 0px;
-  }
-
-.image-panel-loading 
-  {
-    margin                : 5px;
-    list-style-image      : url("chrome://global/skin/loading.gif"); 
-  }
+/* ::::: sidebar header ::::: */
 
 .sidebarheader-main 
   {
-    border                : none;
-    color                 : #CCD0DD;
-    background-color      : #666699;
-    padding-left          : 4px;
+    border: none;
+    color: #CCD0DD;
+    background-color: #666699;
+    padding-left: 4px;
   }
 
 #sidebar-panel-picker {
@@ -76,134 +59,113 @@
   color: inherit;
 }
   
-#sidebar-panel-picker > .toolbarbutton-box > .toolbarbutton-dropmarker
+#sidebar-panel-picker > .toolbarbutton-dropmarker
   {
-    padding-left            : 4px;
-    list-style-image        : url("chrome://global/skin/menu-arrow-hover.gif");
+    padding-left: 4px;
+    list-style-image: url("chrome://global/skin/menu-arrow-hover.gif");
   }
 
 .sidebar-header-text  
   {
-    font-weight           : bold;
+    font-weight: bold;
   }
 
-/*
-.sidebar-header-grippy
-  { 
-    list-style-image	    : url("chrome://global/skin/grippy-short-vert-after.gif");
-  	background-color	    : -moz-Dialog;
-  	max-width			        : 32px;
-  	height				        : 4px;
-  }
+/* ..... close button ..... */
 
-#sidebar-title-box[state="collapsed"] > .sidebar-header-grippy 
-  {
-    list-style-image	    : url("chrome://global/skin/grippy-short-vert-before.gif"); 
-  }
-*/
-  
-/**
- * texttab folder lookalike e.g. for sidebar panel headers
- */
-  .box-texttab
-    {
-      -moz-binding        : url("chrome://communicator/skin/sidebar/sidebarBindings.xml#panelheader");
-      padding             : 2px 0px 2px 0px;
-      background-color    : #CCD0DD;
-      color               : #000000;
-      cursor              : pointer;
-      border-top          : 1px outset #CCD0DD;
-      border-bottom       : 1px outset #CCD0DD;
-    }
-
-  .box-texttab[selected="true"],
-  .box-texttab[selected="true"]:hover,
-  .box-texttab[selected="true"]:hover:active
-    {
-      background-color    : #336699;
-      border-top          : 1px solid #336699;
-    }
-    
-  .panelheader-box-1,
-  .box-texttab[selected="true"]:hover > .panelheader-box-1
-    {
-      padding             : 1px 1px 1px 0px;
-    }
+#sidebar-close-button {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image");
+  padding: 1px 3px 1px 4px;
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+}
+
+/* ::::: sidebar panel ::::: */
+
+.sidebar-iframe-no-panels,
+.loadarea {
+  background-color: #FFFFFF;
+  color: #666699;
+}
+
+.iframe-panel {
+}  
+
+/* ::::: loading info ::::: */
+
+.text-panel-loading {
+  margin: 5px 0px;
+}
+
+.image-panel-loading {
+  margin: 5px;
+  list-style-image: url("chrome://global/skin/icons/loading.gif");
+}
+
+/* ::::: sidebar tabs ::::: */
+
+.box-texttab {
+  -moz-binding: url("chrome://communicator/skin/sidebar/sidebarBindings.xml#sbtab");
+  padding: 2px 0px 2px 0px;
+  background-color: #CCD0DD;
+  color: #000000;
+  cursor: pointer;
+  border-top: 1px outset #CCD0DD;
+  border-bottom: 1px outset #CCD0DD;
+}
+
+.box-texttab[selected="true"],
+.box-texttab[selected="true"]:hover,
+.box-texttab[selected="true"]:hover:active {
+  background-color: #336699;
+  border-top: 1px solid #336699;
+  padding: 1px 1px 1px 0px;
+}
     
-  .box-texttab[last-panel="true"], 
-  .box-texttab[last-panel="true"]:hover,
-  .box-texttab[last-panel="true"]:hover:active,
-  .box-texttab[last-panel="true"][selected="true"],
-  .box-texttab[last-panel="true"][selected="true"]:hover,
-  .box-texttab[last-panel="true"][selected="true"]:hover:active
-    {
-      border-bottom       : none;
-    }
-
-  .panelheader-grippy-icon
-    {
-      margin              : 2px 3px 0px 3px;
-      list-style-image    : url("chrome://global/skin/twisty-closed.gif");
-    }
+.box-texttab[last-panel="true"], 
+.box-texttab[last-panel="true"]:hover,
+.box-texttab[last-panel="true"]:hover:active,
+.box-texttab[last-panel="true"][selected="true"],
+.box-texttab[last-panel="true"][selected="true"]:hover,
+.box-texttab[last-panel="true"][selected="true"]:hover:active {
+  border-bottom: none;
+}
+
+.sbtab-label {
+  margin: 0px 0px 0px 0px !important;
+}
+
+.sbtab-twisty {
+  margin: 2px 3px 0px 3px;
+  list-style-image: url("chrome://global/skin/twisty-closed.gif");
+}
 
 /*
-  .panelheader-texture
-    {
-      margin              : 1px 0px 1px 0px;
-      background-image    : url("chrome://global/skin/toolbargrippy-texture.gif");
-      background-position : 50% 0%;
-      background-repeat   : repeat-y; 
-      width               : 12px;
-    }
+.sbtab-texture {
+  margin: 2px 0px;
+  background: url("chrome://global/skin/toolbar/tbgrip-texture.gif") repeat-y;
+  width: 12px;
+  height: 12px;
+}
 */
 
-  .box-texttab:hover
-    {
-      background-color      : #DDDDDD;
-    }
-    
-  .box-texttab:hover > .panelheader-box-1
-    {
-    }
-
-  .box-texttab:hover:active
-    {
-      background-color      : #6699FF;
-    }
+.box-texttab:hover {
+  background-color      : #DDDDDD;
+}
     
-  .box-texttab:hover:active > .panelheader-box-1
-    {
-    }
-
-  .box-texttab[selected="true"],
-  .box-texttab[selected="true"]:hover
-    {
-      font-weight           : bold;
-      cursor                : default;
-    }
-
-  .box-texttab[last-panel="true"], 
-  .box-texttab[selected="true"]
-    {
-      margin-bottom       : 0px;
-    }
-
-  .panelheader-grippy-icon[selected="true"]
-    {
-      margin              : 2px 3px 0px 3px;
-      list-style-image    : url("chrome://global/skin/twisty-open.gif");
-    }
-
-  .sidebar-iframe-no-panels, .loadarea
-    {
-      background-color      : #FFFFFF;
-    }
+.box-texttab:hover:active {
+  background-color      : #6699FF;
+}
     
-  .iframe-panel
-    {
-    } 
-
-  .panelheader-text
-    {
-      margin              : 0px;
-    }
+.box-texttab[selected="true"],
+.box-texttab[selected="true"]:hover {
+  font-weight           : bold;
+  cursor                : default;
+}
+
+.box-texttab[last-panel="true"], 
+.box-texttab[selected="true"] {
+  margin-bottom       : 0px;
+}
+
+.sbtab-twisty[selected="true"] {
+  list-style-image: url("chrome://global/skin/twisty-open.gif");
+}
diff --git a/EarlyBlue/communicator/sidebar/sidebarBindings.xml b/EarlyBlue/communicator/sidebar/sidebarBindings.xml
index dccc1188..b0029552 100644
--- a/EarlyBlue/communicator/sidebar/sidebarBindings.xml
+++ b/EarlyBlue/communicator/sidebar/sidebarBindings.xml
@@ -3,20 +3,14 @@
 <bindings id="sidebarBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  
-  <binding id="panelheader" extends="xul:button">
+
+  <binding id="sbtab" extends="xul:button">
     <content>
-      <xul:hbox class="panelheader-box-1" inherits="selected" flex="1">
-        <xul:hbox class="panelheader-box-2" align="center" flex="1">
-          <xul:image class="panelheader-grippy-icon" inherits="selected"/>
-          <xul:image class="panelheader-image" inherits="src"/>
-          <xul:vbox flex="1">
-            <xul:label class="panelheader-icon" inherits="value=label" crop="right"/>
-          </xul:vbox>
-          <xul:spacer flex="1"/>
-        </xul:hbox>
-        <xul:hbox class="panelheader-texture"/>
-      </xul:hbox>
+      <xul:image class="sbtab-twisty" inherits="selected"/>
+      <xul:label class="sbtab-label" inherits="value=label" crop="right"/>
+      <xul:spacer flex="1"/>
+      <xul:image class="sbtab-texture"/>
     </content>
   </binding>
+
 </bindings>
diff --git a/EarlyBlue/communicator/sidebar/sidebarSplitterBindings.xml b/EarlyBlue/communicator/sidebar/sidebarSplitterBindings.xml
deleted file mode 100644
index 6e5a611e..00000000
--- a/EarlyBlue/communicator/sidebar/sidebarSplitterBindings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="sidebarSplitterBindings.xml"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="sidebar-splitter" extends="xul:splitter">
-    <content>
-      <xul:vbox class="sidebar-splitter-topright-cap">
-        <xul:spacer flex="1"/>
-      </xul:vbox>
-      <xul:spacer flex="1"/>
-      <xul:hbox>
-        <children/>
-      </xul:hbox>
-      <xul:spacer flex="1"/>
-      <xul:vbox class="sidebar-splitter-bottomright-cap">
-        <xul:spacer flex="100%"/>
-      </xul:vbox>
-    </content>
-  </binding>
-  
-  <binding id="panelheader" extends="xul:button">
-    <content>
-      <xul:hbox class="panelheader-box-1" flex="1">
-        <xul:image class="panelheader-image" inherits="src"/>
-        <xul:label class="panelheader-icon" inherits="value=label,crop"/>
-      </xul:hbox>
-    </content>
-  </binding>
-          
-</bindings>
diff --git a/EarlyBlue/communicator/taskbar/addressbook.gif b/EarlyBlue/communicator/taskbar/addressbook.gif
new file mode 100755
index 0000000000000000000000000000000000000000..089da6e2d7036afd4f506847e7c56a23fedd681d
GIT binary patch
literal 126
zcmZ?wbhEHb6ldULSjfQe|NsA)GtZ=@%>*(Of3h$#FfcRdFaQBao`K1Kj{Tz3J^BrE
zLb}?MZtQ8!HaVrPb+Fv!>MzzqoN5m4`ER@1KATM1!0mljN^Fk$vWIiqygdV+M+Fq@
dowH`Mg;|U5xhI{06DuA`9NFk$VZh2@4FCp&Gj#v}

literal 0
HcmV?d00001

diff --git a/EarlyBlue/communicator/taskbar/composer.gif b/EarlyBlue/communicator/taskbar/composer.gif
new file mode 100755
index 0000000000000000000000000000000000000000..541ef795424ad6bff51739b9c38a16ba13b309a9
GIT binary patch
literal 104
zcmZ?wbhEHb6ldULSjfPTmNxVM|Nk>*o&l1IKUo+V7?>G!7=QpI&%k6kr=RWg%biU;
zulI5^ojBmMj*;o9Y=lML(}KLr(6k__vg{|<v}Zq^UF-a^Y=*dj#m~1s#!rI|HcaJW
Gum%9>P$_f(

literal 0
HcmV?d00001

diff --git a/EarlyBlue/communicator/taskbar/mail.gif b/EarlyBlue/communicator/taskbar/mail.gif
new file mode 100755
index 0000000000000000000000000000000000000000..959d4034391327881188d60363b07fcb6be1ad77
GIT binary patch
literal 121
zcmZ?wbhEHb6ldULSjfPTmNxVM|Nk>*o&l1IKUo+V7?>G!7=QpI&%oq0r*Y-%X9A1n
zm^8FE-Plw9J7kecL;JI(v(xw{9Me#(p1b+Losy3G9r0RMV+>B{D6z0aA5*)qNk*#M
XGR&nbq*kZnf`^ICkz=v$j11NQJftvj

literal 0
HcmV?d00001

diff --git a/EarlyBlue/communicator/taskbar/mailnew.gif b/EarlyBlue/communicator/taskbar/mailnew.gif
new file mode 100755
index 0000000000000000000000000000000000000000..4aa2873075bf9be5361bb11379a08403632881bd
GIT binary patch
literal 142
zcmZ?wbhEHb6ldULIK;q^mNxVM|NqASjc3k017yH~;!hSv1_l-e9R?r(sbyde_V7CJ
z!Qj}^gdG;ox6P|?*62$-VCnQL<5ohDoJU_{HPbUK$GpE`rgsvq7vHqnr}V<e<e!9N
l;xV>@drgi@&vu!-o3>Ydotbj1g2%L9K7}>+)t#6atN{akKfM3|

literal 0
HcmV?d00001

diff --git a/EarlyBlue/communicator/taskbar/navigator.gif b/EarlyBlue/communicator/taskbar/navigator.gif
new file mode 100755
index 0000000000000000000000000000000000000000..9514b508de4d9a3e1089c0e02d8bd35a19cad930
GIT binary patch
literal 112
zcmZ?wbhEHb6ldULSjfPTmNxT03@H9&VPs%nV$fj#0+2idljD^B1t-o5G|biyT9q&_
zvP-7r;kQy{jb(zToStiGrO%v|_U7dB?$4*qxmGD1y7PKzbEMY_g?v}59m{sDTzok(
JiJz6h8UWMuFG&CZ

literal 0
HcmV?d00001

diff --git a/EarlyBlue/communicator/tasksOverlay.css b/EarlyBlue/communicator/tasksOverlay.css
index f378d3b3..9afcf1e2 100644
--- a/EarlyBlue/communicator/tasksOverlay.css
+++ b/EarlyBlue/communicator/tasksOverlay.css
@@ -35,50 +35,52 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+/* ==== tasksOverlay.css ================================================
+   == Styles used by the the overlay which contains tasks related
+   == content, such as the taskbar and product launcher icons.
+   ====================================================================== */
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#mini-nav 
-  {
-	  list-style-image      : url("chrome://global/skin/taskbar-navigator.gif");
-  }
+/* ::::: communicator product icons ::::: */
+
+.taskbutton,
+.taskbutton:hover:active {
+  padding: 1px 3px;
+  border: none;
+}
+
+.taskbutton:hover {
+  background-color: #9999CC;
+}
 
-#mini-mail 
-  {
-	  list-style-image      : url("chrome://global/skin/taskbar-mail.gif");
-  }
+.taskbutton:hover:active {
+  background-color: #CCCCFF;
+}
 
-#mini-mail[BiffState="NewMail"]
-  {
-    list-style-image      : url("chrome://global/skin/taskbar-gotmail.gif");
-  }
+#mini-nav {
+  list-style-image: url("chrome://communicator/skin/taskbar/navigator.gif");
+}
 
-#mini-addr 
-  {
-	  list-style-image      : url("chrome://global/skin/taskbar-addressbook.gif");
-  }
+#mini-mail {
+  list-style-image: url("chrome://communicator/skin/taskbar/mail.gif");
+}
 
-#mini-comp 
-  {
-	  list-style-image      : url("chrome://global/skin/taskbar-composer.gif");
-  }
+#mini-mail[BiffState="NewMail"] {
+  list-style-image: url("chrome://communicator/skin/taskbar/mailnew.gif");
+}
 
-.taskbutton > .toolbarbutton-box,
-.taskbutton > .toolbarbutton-box:hover:active {
-  padding: 1px;
-  border: none;
+#mini-addr {
+  list-style-image: url("chrome://communicator/skin/taskbar/addressbook.gif");
 }
 
-.taskbutton > .toolbarbutton-box:hover,
-.taskbutton:hover > .toolbarbutton-box {
-  background-color      : #9999CC;
+#mini-comp {
+  list-style-image: url("chrome://communicator/skin/taskbar/composer.gif");
 }
 
-.taskbutton > .toolbarbutton-box:hover:active,
-.taskbutton:hover:active > .toolbarbutton-box {
-  background-color      : #CCCCFF;
+/* ::::: component bar ::::: */
+
+#component-bar {
+  -moz-box-align: stretch;
 }
 
-.taskbutton > .toolbarbutton-box > .toolbarbutton-text
-  {
-    display               : none;
-  } 
diff --git a/EarlyBlue/communicator/toolbar.css b/EarlyBlue/communicator/toolbar.css
deleted file mode 100644
index b6ce3c26..00000000
--- a/EarlyBlue/communicator/toolbar.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
- 
-/******* ToolBox & ToolBar *******/
-
-/*
-.toolbar-primary, menubar
-  {
-    background-image      : url("chrome://communicator/skin/toolbar-bg.png");
-  }
-*/
diff --git a/EarlyBlue/communicator/xpinstall/xpinstall.css b/EarlyBlue/communicator/xpinstall/xpinstall.css
index c47f1b95..95bf8579 100644
--- a/EarlyBlue/communicator/xpinstall/xpinstall.css
+++ b/EarlyBlue/communicator/xpinstall/xpinstall.css
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url(chrome://global/skin);
+@import url("chrome://global/skin");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
diff --git a/EarlyBlue/contents.rdf b/EarlyBlue/contents.rdf
index 6496f4db..84a9d39c 100644
--- a/EarlyBlue/contents.rdf
+++ b/EarlyBlue/contents.rdf
@@ -5,37 +5,34 @@
 
   <!-- List all the skins being supplied by this theme -->
   <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.7" />
+    <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8" />
   </RDF:Seq>
 
   <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.7"
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8"
         chrome:displayName="EarlyBlue"
         chrome:accessKey="E"
         chrome:author="Robert Kaiser - KaiRo.at"
         chrome:description="This theme re-introduces a UI design idea based on early Mozilla milestones. Get more info at http://www.kairo.at/download/"
-        chrome:name="EarlyBlue/0.7"
-        chrome:image="jar:resource:///chrome/EarlyBlue.jar!/skin/EarlyBlue/global/preview.png">
+        chrome:name="EarlyBlue/0.8"
+        chrome:image="jar:resource:///chrome/EarlyBlue.jar!/global/preview.png">
     <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:EarlyBlue/0.7:packages">
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.7:global"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.7:communicator"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.7:navigator"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.7:messenger"/>
-        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.7:editor"/>
+      <RDF:Seq about="urn:mozilla:skin:EarlyBlue/0.8:packages">
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8:global"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8:communicator"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8:navigator"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8:messenger"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8:editor"/>
+        <RDF:li resource="urn:mozilla:skin:EarlyBlue/0.8:forms"/>
       </RDF:Seq>
     </chrome:packages>
   </RDF:Description>
 
   <!-- Version Information.  State that we work only with a certain version of this package. -->
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.7:global"
-    chrome:skinVersion="0.9.4"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.7:communicator"
-    chrome:skinVersion="0.9.4"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.7:navigator"
-    chrome:skinVersion="0.9.4"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.7:messenger"
-    chrome:skinVersion="0.9.4"/>
-  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.7:editor"
-    chrome:skinVersion="0.9.4"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8:global" chrome:skinVersion="0.9.4"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8:communicator" chrome:skinVersion="0.9.4"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8:navigator" chrome:skinVersion="0.9.4"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8:messenger" chrome:skinVersion="0.9.4"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8:editor" chrome:skinVersion="0.9.4"/>
+  <RDF:Description about="urn:mozilla:skin:EarlyBlue/0.8:forms" chrome:skinVersion="0.9.4"/>
 </RDF:RDF>
diff --git a/EarlyBlue/editor/EdImageMap.css b/EarlyBlue/editor/EdImageMap.css
index 9703ff83..7ff1f16f 100644
--- a/EarlyBlue/editor/EdImageMap.css
+++ b/EarlyBlue/editor/EdImageMap.css
@@ -40,12 +40,12 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 toolbar#toolbox {
-  margin :0px;
-  padding: 4px; 0px; 0px; 0px;
+  margin: 0px;
+  padding: 4px 0px 0px 0px;
 }
 
 toolbar#toolbox button.tool:active {
-	margin: 2px 0px 0px 2px;
+  margin: 2px 0px 0px 2px;
 }
 
 toolbar#toolbox button.tool[toggled="1"] {
@@ -56,51 +56,51 @@ toolbar#toolbox button.tool[toggled="1"] {
 toolbar#toolbox button.tool {
   border: 1px solid transparent;
   margin: 1px 1px 1px 1px;
-	padding: 2px;
-	text-decoration: none;
-	color: inherit;
+  padding: 2px;
+  text-decoration: none;
+  color: inherit;
 }
 
 toolbar.toolbox > toolbargrippy {
-	visibility: collapse;
+  visibility: collapse;
 }
 
 #pointerButton {
-	list-style-image:url("chrome://editor/skin/images/Map_pointerTool.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_pointerTool.gif");
 }
 
 #rectButton {
-	list-style-image:url("chrome://editor/skin/images/Map_rectangleTool.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_rectangleTool.gif");
 }
 
 #cirButton {
-	list-style-image:url("chrome://editor/skin/images/Map_circleTool.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_circleTool.gif");
 }
 
 #polyButton {
-	list-style-image:url("chrome://editor/skin/images/Map_polygonTool.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_polygonTool.gif");
 }
 
 #cutButton {
-	list-style-image:url("chrome://editor/skin/images/Map_Cut.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_Cut.gif");
 }
 
 #copyButton {
-	list-style-image:url("chrome://editor/skin/images/Map_Copy.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_Copy.gif");
 }
 
 #pasteButton {
-	list-style-image:url("chrome://editor/skin/images/Map_Paste.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_Paste.gif");
 }
 
 #zoomInButton {
-	list-style-image:url("chrome://editor/skin/images/Map_zoomIn.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_zoomIn.gif");
 }
 
 #zoomOutButton {
-	list-style-image:url("chrome://editor/skin/images/Map_zoomOut.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_zoomOut.gif");
 }
 
 #contrastButton {
-	list-style-image:url("chrome://editor/skin/images/Map_contrast.gif");
+  list-style-image: url("chrome://editor/skin/icons/Map_contrast.gif");
 }
diff --git a/EarlyBlue/editor/EditModeTabs.css b/EarlyBlue/editor/EditModeTabs.css
deleted file mode 100644
index e3a0405d..00000000
--- a/EarlyBlue/editor/EditModeTabs.css
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ............. edit mode tabs ............... */  
-
-.tabs-bottom {
-  border-top: none;
-}
-
-.tabs-bottom > .tabs-spacer {
-  border-top: 1px solid #9999CC !important;
-  border-bottom: none;
-}
-
-
-/* ............. edit mode tabs ............... */  
-
-
-.tabs-bottom > tab { 
-  margin-top: 0px;
-  margin-bottom: 2px;
-  border: none;
-/*  border-right: 1px solid ThreeDDarkShadow;
-  -moz-border-radius: 0px 0px 5px 5px; */
-  -moz-user-focus: ignore;
-}
-
-.tabs-bottom > tab > .tab-box { 
-  border: 1px outset #CCD0DD !important;
-  border-top: none !important;
-/*  -moz-border-radius: 0px 0px 4px 4px; */
-}
-
-/* ............. selected state ............... */
-
-/*  
-.tabs-bottom > tab[selected="true"] {
-  margin-bottom: 0px;
-}
-*/
-
-.tabs-bottom > tab[selected="true"] > .tab-box {
-  background-color: #6699FF;
-/*  border-bottom: 1px solid ThreeDShadow !important;
-  border-top: 1px solid #ffffff !important; */
-}
diff --git a/EarlyBlue/editor/EditorDialog.css b/EarlyBlue/editor/EditorDialog.css
index 31fa7fe1..e4c2bab1 100644
--- a/EarlyBlue/editor/EditorDialog.css
+++ b/EarlyBlue/editor/EditorDialog.css
@@ -40,8 +40,8 @@
 
 /* The defaults are WAY to big! */
 groupbox {
-  margin:         2px 5px /* 4px 5px */;
-  padding-top:    2px;
+  margin: 2px 5px /* 4px 5px */;
+  padding-top: 2px;
   padding-bottom: 4px;
 }
 
@@ -53,12 +53,16 @@ groupbox {
   min-width: 10em;
 }
 
+.MinWidth15em {
+  min-width: 15em;
+}
+
 .MinWidth20em {
   min-width: 20em;
 }
 
 .big-left-margin {
-  margin-left:    10px;
+  margin-left: 10px;
 }
 
 .bold {
@@ -73,7 +77,6 @@ groupbox {
   font-size: 120%;
 }
 
-
 .narrow {
   width: 3em;
 }
@@ -83,15 +86,15 @@ groupbox {
 }
 
 .menuitem-highlight-1 {
-  font-weight : bold;
+  font-weight: bold;
 }
 
 /* Use this with groove-thin in dialogs 
    to add margins to top and bottom
 */
 .tb-margin {
-  margin-top    : 6px;
-  margin-bottom : 6px;
+  margin-top: 6px;
+  margin-bottom: 6px;
 }
 
 .color-well {
@@ -120,14 +123,14 @@ groupbox {
 }
 
 #ColorPickerSwatch {
-  border : 2px outset #CCD0DD;
+  border: 2px outset #CCD0DD;
   width: 25px;
   height: 20px;
   margin: 0px 3px 0px 0px;
 }
 
 #ColorPickerSwatch[default="true"] {
-  border : 2px solid transparent;
+  border: 2px solid transparent;
   background-color: inherit;
 }
 
@@ -138,61 +141,54 @@ groupbox {
   margin: 1px 2px 2px 4px;
 }
 
-.popup-trigger {
-  list-style-image: url(chrome://global/skin/scroll-down.gif);
-}
-
 /* temporary -- we need a simple box-based list defined in XBL */
 tree.list {
   border: 1px inset #CCD0DD;
   /* same as in menulist.css */
   margin: 1px 5px 2px 5px;
-  width: 10em;
-  height: 3em;
   /* use rows="#" in XUL to define height */
 }
 
 #ColorPreview {
   border: 1px inset #CCD0DD;
-  margin-left:    10px;
-  padding-left:    5px;
-  padding-right:   5px;
-  min-width:     100px;
-  min-height:     50px;
+  margin-left: 10px;
+  padding-left: 5px;
+  padding-right: 5px;
+  min-width: 100px;
+  min-height: 50px;
 }
 
-#alignTypeSelect,label#alignLabel {
+#alignTypeSelect,
+label#alignLabel {
   margin-left: 5px;
 }
 
+/* ::::: table properties dialog ::::: */
+
 #MoreFewerButton[more="0"] {
-  list-style-image: url(chrome://global/skin/scroll-down.gif);
-  /* bug 9459 - changing button text doesn't resize width.
-     This covers that problem, but we want this size anyway */
+  list-style-image: url(chrome://global/skin/arrow/arrow-down.gif);
   min-width: 12em;
 }
 
-/* ::::: table properties dialog ::::: */
-
 #MoreFewerButton[more="1"] {
-  list-style-image: url(chrome://global/skin/scroll-up.gif);
+  list-style-image: url(chrome://global/skin/arrow/arrow-up.gif);
   min-width: 12em;
 }
 
 #PreviousButton {
-  list-style-image: url(chrome://global/skin/arrow-left.gif);
+  list-style-image: url(chrome://global/skin/arrow/arrow-left.gif);
 }
 
 #NextButton {
-  list-style-image: url(chrome://global/skin/arrow-right.gif);
+  list-style-image: url(chrome://global/skin/arrow/arrow-right.gif);
 }
 
 #PreviousButton[type="row"] {
-  list-style-image: url(chrome://global/skin/arrow-up.gif);
+  list-style-image: url(chrome://global/skin/arrow/arrow-up.gif);
 }
 
 #NextButton[type="row"] {
-  list-style-image: url(chrome://global/skin/arrow-down.gif);
+  list-style-image: url(chrome://global/skin/arrow/arrow-down.gif);
 }
 
 /* ::::: spelling dialog ::::: */
@@ -227,44 +223,48 @@ tree.list {
 }
 
 .smallspacer {
-  width:  3px;
+  width: 3px;
   height: 3px;
-  min-width:  3px;
+  min-width: 3px;
   min-height: 3px;
 }
 
 .spacer {
-  width:  5px;
+  width: 5px;
   height: 5px;
-  min-width:  5px;
+  min-width: 5px;
   min-height: 5px;
 }
 
 .bigspacer {
-  width:  10px;
+  width: 10px;
   height: 10px;
-  min-width:  10px;
+  min-width: 10px;
   min-height: 10px;
 }
 
+#alignTypeSelect {
+  height: 34px;
+}
+
 .align-menu[value="top"] {
-	list-style-image:url("chrome://editor/skin/images/img-align-top.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-top.gif");
 }
 
 .align-menu[value="center"] {
-	list-style-image:url("chrome://editor/skin/images/img-align-middle.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-middle.gif");
 }
 
 .align-menu[value="bottom"] {
-	list-style-image:url("chrome://editor/skin/images/img-align-bottom.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-bottom.gif");
 }
 
 .align-menu[value="right"] {
-	list-style-image:url("chrome://editor/skin/images/img-align-right.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-right.gif");
 }
 
 .align-menu[value="left"] {
-	list-style-image:url("chrome://editor/skin/images/img-align-left.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-left.gif");
 }
 
 /* Don't change width/height of these without changing values in 
@@ -272,19 +272,19 @@ tree.list {
 */    
 #preview-image-box {
   border: 1px inset #CCD0DD;
-  width      : 82px;
-  max-width  : 82px;
-  min-width  : 82px;
-  height     : 52px;
-  max-height : 52px;
-  min-height : 52px;
-  margin     : 6px 5px 6px 5px;
-  overflow   : hidden;
+  width: 82px;
+  max-width: 82px;
+  min-width: 82px;
+  height: 52px;
+  max-height: 52px;
+  min-height: 52px;
+  margin: 6px 5px 6px 5px;
+  overflow: hidden;
 }
 
 #preview-image-holder {
-  padding : 0px;
-  margin  : 0px;
+  padding: 0px;
+  margin: 0px;
 }
 
 /* Rest are from Ben Goodger for Advanced Edit dialog 
@@ -301,6 +301,6 @@ tree.list {
 
 /* styles for an attribute tree-table */
 tree.AttributesTree {
-  min-width : 200px;
+  min-width: 200px;
   min-height: 200px;
 }
diff --git a/EarlyBlue/editor/editor.css b/EarlyBlue/editor/editor.css
index b8c64fc3..ebd3d794 100644
--- a/EarlyBlue/editor/editor.css
+++ b/EarlyBlue/editor/editor.css
@@ -40,22 +40,14 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* Note: most of our styles are in EditorToolbars.css 
-   in order to share with all users of editor
-*/
-
-/********* image pre-cacheing ********/
-#resource_bundle_editor{
-  -moz-binding            : url('chrome://editor/skin/resources.xml#resource_bundle_editor') 
-}
-
 #content-frame { 
   min-width: 10px; 
   min-height: 10px;
   height: 400px;
 } 
 
-.source-editor, .source-editor:focus {
+.source-editor,
+.source-editor:focus {
   margin: 0px 5px 5px 0px;
   border: 0px;
   /* Scroll bars are in content, 
@@ -64,8 +56,13 @@
 }
 
 /* Multiline textarea for HTML source editing */
-#content-source, #doctype-text
-  {
-    font-family   : -moz-fixed;
-  }
+#content-source,
+#doctype-text {
+  font-family: -moz-fixed;
+}
 
+#appcontent {
+}
+
+#ContentWindowDeck {
+}
diff --git a/EarlyBlue/editor/editorFormatToolbar.css b/EarlyBlue/editor/editorFormatToolbar.css
index 2307cb95..83ea31cb 100644
--- a/EarlyBlue/editor/editorFormatToolbar.css
+++ b/EarlyBlue/editor/editorFormatToolbar.css
@@ -37,278 +37,249 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* ::::: formatting buttons ::::: */
+
 #FormatToolbar > toolbarbutton {
   min-width: 18px;
 }
  
-#FormatToolbar > toolbarbutton > .toolbarbutton-box > .toolbarbutton-text {
+#FormatToolbar > toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
-#boldButton 
-  {
-    list-style-image      : url(chrome://editor/skin/images/bold.gif); 
-  }
+#DecreaseFontSizeButton {
+  list-style-image: url("chrome://editor/skin/icons/dec-font-size.gif");
+} 
+
+#DecreaseFontSizeButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/dec-font-size-disabled.gif") !important;
+} 
+
+#IncreaseFontSizeButton {
+  list-style-image: url("chrome://editor/skin/icons/inc-font-size.gif");
+} 
+
+#IncreaseFontSizeButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/inc-font-size-disabled.gif") !important;
+} 
+
+#boldButton {
+  list-style-image: url(chrome://editor/skin/icons/bold.gif); 
+}
+
+#boldButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/bold-disabled.gif") !important;
+} 
+
+#italicButton {
+  list-style-image: url("chrome://editor/skin/icons/italic.gif");
+} 
+
+#italicButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/italic-disabled.gif") !important;
+} 
+
+#underlineButton {
+  list-style-image: url("chrome://editor/skin/icons/underline.gif");
+} 
+
+#underlineButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/underline-disabled.gif") !important;
+} 
+
+#ulButton {
+  list-style-image:url("chrome://editor/skin/icons/bullets.gif");
+}
+
+#ulButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/bullets-disabled.gif") !important;
+} 
+
+#olButton {
+  list-style-image: url("chrome://editor/skin/icons/numbers.gif");
+}
+
+#olButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/numbers-disabled.gif") !important;
+} 
+
+#outdentButton {
+  list-style-image: url("chrome://editor/skin/icons/outdent.gif");
+} 
+
+#outdentButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/outdent-disabled.gif") !important;
+} 
+
+#indentButton {
+  list-style-image: url("chrome://editor/skin/icons/indent.gif");
+} 
+
+#indentButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/indent-disabled.gif") !important;
+} 
+
+#align-left-button {
+  list-style-image: url("chrome://editor/skin/icons/left.gif");
+} 
+
+#align-left-button[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/left-disabled.gif") !important;
+} 
+
+#align-center-button {
+  list-style-image: url("chrome://editor/skin/icons/center.gif");
+} 
+
+#align-center-button[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/center-disabled.gif") !important;
+} 
+
+#align-right-button {
+  list-style-image: url("chrome://editor/skin/icons/right.gif");
+} 
+
+#align-right-button[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/right-disabled.gif") !important;
+} 
+
+#align-justify-button {
+  list-style-image: url("chrome://editor/skin/icons/justify.gif");
+}
+
+#align-justify-button[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/justify-disabled.gif") !important;
+} 
+
+#AlignPopupButton {
+  list-style-image: url("chrome://editor/skin/icons/align.gif");
+}
+
+#AlignPopupButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/align-disabled.gif") !important;
+}
+
+#InsertPopupButton {
+  list-style-image: url("chrome://editor/skin/icons/insert.gif");
+}
 
-#boldButton[disabled="true"],
-#boldButton[disabled="true"]:hover,
-#boldButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/bold-disabled.gif");
-  } 
+#InsertPopupButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/insert-disabled.gif") !important;
+}
 
 #smileButtonMenu {
-  list-style-image:url("chrome://editor/skin/images/smile.gif"); 
+  list-style-image: url("chrome://editor/skin/icons/smile.gif"); 
+}
+
+#smileButtonMenu[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/smile-disabled.gif") !important;
+}
+
+/* ::::: menuitem icons ::::: */
+
+/* ..... align menu ..... */
+
+#AlignLeftItem {
+  list-style-image: url("chrome://editor/skin/icons/left.gif");
+} 
+
+#AlignCenterItem {
+  list-style-image: url("chrome://editor/skin/icons/center.gif");
+} 
+
+#AlignRightItem {
+  list-style-image: url("chrome://editor/skin/icons/right.gif");
+} 
+
+#AlignJustifyItem {
+  list-style-image: url("chrome://editor/skin/icons/justify.gif");
+}
+
+/* ..... insert menu ..... */
+
+#InsertLinkItem {
+  list-style-image: url("chrome://editor/skin/icons/link.gif");
+}
+
+#InsertAnchorItem {
+  list-style-image: url("chrome://editor/skin/icons/anchor.gif");
+}
+
+#InsertImageItem {
+  list-style-image: url("chrome://editor/skin/icons/image.gif");
+}
+
+#InsertHRuleItem {
+  list-style-image: url("chrome://editor/skin/icons/hline.gif");
 }
 
-#smileButtonMenu[disabled="true"],
-#smileButtonMenu[disabled="true"]:hover,
-#smileButtonMenu[disabled="true"]:hover:active  {
-	list-style-image:url("chrome://editor/skin/images/smile-disabled.gif");
+#InsertTableItem {
+  list-style-image: url("chrome://editor/skin/icons/table.gif");
 }
 
+/* ..... smiley menu ..... */
+
 .insert-smile > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/smile_n.gif); 
+  list-style-image: url("chrome://editor/content/images/smile_n.gif");
 }
 
 .insert-tongue > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/tongue_n.gif); 
+  list-style-image: url("chrome://editor/content/images/tongue_n.gif");
 }
 
 .insert-frown > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/frown_n.gif); 
- }
+  list-style-image: url("chrome://editor/content/images/frown_n.gif"); 
+}
 
 .insert-wink > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/wink_n.gif); 
- }
+  list-style-image: url("chrome://editor/content/images/wink_n.gif");
+}
 
 .insert-laughing > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/laughing_n.gif); 
- }
+  list-style-image: url("chrome://editor/content/images/laughing_n.gif"); 
+}
 
 .insert-embarrassed > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/embarrassed_n.gif); 
- }
-
+  list-style-image: url("chrome://editor/content/images/embarrassed_n.gif");
+}
 
 .insert-undecided > .menu-iconic-left {
-  list-style-image:url(chrome://global/skin/smiley/undecided_n.gif); 
-}
-
-.smiley > .menu-iconic-left {
-
-    margin-right: 15px;
-}
-
-
-
-#italicButton
-  {
-    list-style-image      : url("chrome://editor/skin/images/italic.gif");
-  } 
-
-#italicButton[disabled="true"],
-#italicButton[disabled="true"]:hover,
-#italicButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/italic-disabled.gif");
-  } 
-
-#underlineButton
-  {
-	  list-style-image      : url("chrome://editor/skin/images/underline.gif");
-  } 
-
-#underlineButton[disabled="true"],
-#underlineButton[disabled="true"]:hover,
-#underlineButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/underline-disabled.gif");
-  } 
-
-#DecreaseFontSizeButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/dec-font-size.gif");
-  } 
-
-#DecreaseFontSizeButton[disabled="true"],
-#DecreaseFontSizeButton[disabled="true"]:hover,
-#DecreaseFontSizeButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/dec-font-size-disabled.gif");
-  } 
-
-#IncreaseFontSizeButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/inc-font-size.gif");
-  } 
-
-#IncreaseFontSizeButton[disabled="true"],
-#IncreaseFontSizeButton[disabled="true"]:hover,
-#IncreaseFontSizeButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/inc-font-size-disabled.gif");
-  } 
-
-#ulButton 
-  {
-	  list-style-image      :url("chrome://editor/skin/images/bullets.gif");
-  }
-
-#ulButton[disabled="true"],
-#ulButton[disabled="true"]:hover,
-#ulButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/bullets-disabled.gif");
-  } 
-
-#olButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/numbers.gif");
-  }
-
-#olButton[disabled="true"],
-#olButton[disabled="true"]:hover,
-#olButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/numbers-disabled.gif");
-  } 
-
-#outdentButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/outdent.gif");
-  } 
-
-#outdentButton[disabled="true"],
-#outdentButton[disabled="true"]:hover,
-#outdentButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/outdent-disabled.gif");
-  } 
-
-#indentButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/indent.gif");
-  } 
-
-#indentButton[disabled="true"],
-#indentButton[disabled="true"]:hover,
-#indentButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/indent-disabled.gif");
-  } 
+  list-style-image: url("chrome://editor/content/images/undecided_n.gif"); 
+}
 
-#AlignPopupButton {
-	list-style-image        : url("chrome://editor/skin/images/align.gif");
+/* ::::: fg/bg color picker ::::: */
+
+.ColorPickerLabel {
+  border: 1px inset #CCD0DD;
+  margin: 0px;
+  padding: 2px;
 }
 
-#AlignPopupButton[disabled="true"],
-#AlignPopupButton[disabled="true"]:hover,
-#AlignPopupButton[disabled="true"]:hover:active {
-	list-style-image        : url("chrome://editor/skin/images/align-disabled.gif");
+.color-button {
+  border: 1px inset #CCD0DD;
+  padding: 0px;
+  width: 14px;
+  height: 12px;
+  margin: 2px;
 }
 
-#InsertPopupButton {
-	list-style-image        : url("chrome://editor/skin/images/insert.gif");
-}
-
-#InsertPopupButton[disabled="true"],
-#InsertPopupButton[disabled="true"]:hover,
-#InsertPopupButton[disabled="true"]:hover:active {
-	list-style-image        : url("chrome://editor/skin/images/insert-disabled.gif");
-}
-
-#text-align-left,
-#align-left-button
-  {
-	  list-style-image      : url("chrome://editor/skin/images/left.gif");
-  } 
-
-#text-align-left[disabled="true"],
-#text-align-left[disabled="true"]:hover,
-#text-align-left[disabled="true"]:hover:active,
-#align-left-button[disabled="true"],
-#align-left-button[disabled="true"]:hover,
-#align-left-button[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/left-disabled.gif");
-  } 
-
-#text-align-center,
-#align-center-button
-  {
-	  list-style-image      : url("chrome://editor/skin/images/center.gif");
-  } 
-
-#text-align-center[disabled="true"],
-#text-align-center[disabled="true"]:hover,
-#text-align-center[disabled="true"]:hover:active,
-#align-center-button[disabled="true"],
-#align-center-button[disabled="true"]:hover,
-#align-center-button[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/center-disabled.gif");
-  } 
-
-#text-align-right,
-#align-right-button
-  {
-	  list-style-image      : url("chrome://editor/skin/images/right.gif");
-  } 
-
-#text-align-right[disabled="true"],
-#text-align-right[disabled="true"]:hover,
-#text-align-right[disabled="true"]:hover:active
-#align-right-button[disabled="true"],
-#align-right-button[disabled="true"]:hover,
-#align-right-button[disabled="true"]:hover:active 
- {
-    list-style-image      : url("chrome://editor/skin/images/right-disabled.gif");
-  } 
-
-#text-align-justify, #align-justify-button
-  {
-	  list-style-image      : url("chrome://editor/skin/images/justify.gif");
-  }
-
-#text-align-justify[disabled="true"],
-#text-align-justify[disabled="true"]:hover,
-#text-align-justify[disabled="true"]:hover:active
-#align-justify-button[disabled="true"],
-#align-justify-button[disabled="true"]:hover,
-#align-justify-button[disabled="true"]:hover:active 
- {
-    list-style-image      : url("chrome://editor/skin/images/justify-disabled.gif");
-  } 
-
-.ColorPickerLabel 
-  {
-    border                : 1px inset white;
-    margin                : 0px;
-    padding               : 2px;
-  }
-
-.color-button
-  {
-    border                : 1px inset #CCD0DD;
-    padding               : 0px;
-    width                 : 14px;
-    height                : 12px;
-    margin                : 2px;
-  }
-
-.color-button:hover 
-  {
-    border                : 1px solid #666699;
-  }
-
-#TextColorButton 
-  {
-    margin                : 2px 9px 9px 2px;
-  }
-
-#BackgroundColorButton 
-  {
-    margin                : 9px 2px 2px 9px;
-  }
+.color-button:hover {
+  border: 1px solid #666699;
+}
+
+#TextColorButton {
+  margin: 2px 9px 9px 2px;
+}
+
+#BackgroundColorButton {
+  margin: 9px 2px 2px 9px;
+}
+
+#HighlightColorButton {
+  list-style-image: url("chrome://editor/skin/icons/highlight.gif");
+  background-color: transparent;
+}
+
+#HighlightColorButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/highlight-disabled.gif") !important;
+}
diff --git a/EarlyBlue/editor/editorModeToolbar.css b/EarlyBlue/editor/editorModeToolbar.css
index c5985744..d5876878 100644
--- a/EarlyBlue/editor/editorModeToolbar.css
+++ b/EarlyBlue/editor/editorModeToolbar.css
@@ -35,37 +35,32 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url("chrome://editor/skin/EditModeTabs.css");
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#EditModeToolbar 
-  {
-    padding               : 0px;
-    -moz-box-align        : start;
-/*    border-bottom         : 1px solid ThreeDShadow; */
-    margin-bottom         : 0px;
-    min-width             : 1px;
-/*    color                 : white;
-    background-color      : ThreeDFace; */
-  }
+#EditModeToolbar {
+  -moz-box-align: start;
+  padding: 0px;
+  margin-bottom: 0px;
+  min-width: 1px;
+}
+
+.tab-bottom[selected="true"] {
+/*  background-color: -moz-Field;
+  color: -moz-FieldText; */
+}
 
-#NormalModeButton 
-  {
-    list-style-image      : url(chrome://editor/skin/images/editmode-normal.gif); 
-  }
+#NormalModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-normal.gif"); 
+}
 
-#TagModeButton 
-  {
-    list-style-image      : url(chrome://editor/skin/images/editmode-tags.gif); 
-  }
+#TagModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-tags.gif"); 
+}
 
-#SourceModeButton 
-  {
-    list-style-image      : url(chrome://editor/skin/images/editmode-html.gif); 
-  }
+#SourceModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-html.gif"); 
+}
 
-#PreviewModeButton 
-  {
-    list-style-image      : url(chrome://editor/skin/images/editmode-preview.gif); 
-  }
+#PreviewModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-preview.gif"); 
+}
diff --git a/EarlyBlue/editor/editorPrimaryToolbar.css b/EarlyBlue/editor/editorPrimaryToolbar.css
index 6d236ba7..c7917be5 100644
--- a/EarlyBlue/editor/editorPrimaryToolbar.css
+++ b/EarlyBlue/editor/editorPrimaryToolbar.css
@@ -37,169 +37,118 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#newButton
-  {
-    list-style-image      : url("chrome://editor/skin/images/newfile.gif");
-  }
-
-#newButton[disabled="true"],
-#newButton[disabled="true"]:hover,
-#newButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/newfile-disabled.gif");
-  } 
-
-#openButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/openfile.gif");
-  } 
-
-#openButton[disabled="true"],
-#openButton[disabled="true"]:hover,
-#openButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/openfile-disabled.gif");
-  } 
-
-#saveButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/savefile.gif");
-  } 
-
-#saveButton[disabled="true"],
-#saveButton[disabled="true"]:hover,
-#saveButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/savefile-disabled.gif");
-  } 
-
-#saveButton[dirty="true"] 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/savefile-dirty.gif");
-  } 
-
-#saveButton[dirty="true"][disabled="true"],
-#saveButton[dirty="true"][disabled="true"]:hover,
-#saveButton[dirty="true"][disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/savefile-disabled.gif");
-  } 
-
-#publishButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/publish.gif");
-  } 
-
-#publishButton[disabled="true"],
-#publishButton[disabled="true"]:hover,
-#publishButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/publish-disabled.gif");
-  } 
-
-#previewButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/preview.gif");
-  } 
-
-#previewButton[disabled="true"],
-#previewButton[disabled="true"]:hover,
-#previewButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/preview-disabled.gif");
-  } 
-
-#printButton 
-  {
-	  list-style-image      : url("chrome://global/skin/print.gif");
-  } 
-
-#printButton[disabled="true"]
-  {
-    list-style-image      : url("chrome://global/skin/print-disabled.gif");
-  } 
-
-#findButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/find.gif");
-  } 
-
-#findButton[disabled="true"],
-#findButton[disabled="true"]:hover,
-#findButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/find-disabled.gif");
-  } 
-
-#linkButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/link.gif");
-  } 
-
-#linkButton[disabled="true"],
-#linkButton[disabled="true"]:hover,
-#linkButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/link-disabled.gif");
-  } 
-
-#imageButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/image.gif");
-  } 
-
-#imageButton[disabled="true"],
-#imageButton[disabled="true"]:hover,
-#imageButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/image-disabled.gif");
-  } 
-
-#namedAnchorButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/anchor.gif");
-  } 
-
-#namedAnchorButton[disabled="true"],
-#namedAnchorButton[disabled="true"]:hover,
-#namedAnchorButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/anchor-disabled.gif");
-  } 
-
-#hlineButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/hline.gif");
-  } 
-
-#hlineButton[disabled="true"],
-#hlineButton[disabled="true"]:hover,
-#hlineButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/hline-disabled.gif");
-  } 
-
-#tableButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/table.gif");
-  } 
-
-#tableButton[disabled="true"],
-#tableButton[disabled="true"]:hover,
-#tableButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/table-disabled.gif");
-  } 
-
-#spellingButton 
-  {
-	  list-style-image      : url("chrome://editor/skin/images/spell.gif");
-  } 
-
-#spellingButton[disabled="true"],
-#spellingButton[disabled="true"]:hover,
-#spellingButton[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://editor/skin/images/spell-disabled.gif");
-  } 
-
+#newButton {
+  list-style-image: url("chrome://editor/skin/icons/newfile.gif");
+}
+
+#newButton[disabled="true"]  {
+  list-style-image: url("chrome://editor/skin/icons/newfile-disabled.gif") !important;
+} 
+
+#openButton {
+  list-style-image: url("chrome://editor/skin/icons/openfile.gif");
+} 
+
+#openButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/openfile-disabled.gif") !important;
+} 
+
+#saveButton {
+  list-style-image: url("chrome://editor/skin/icons/savefile.gif");
+} 
+
+#saveButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/savefile-disabled.gif") !important;
+} 
+
+#saveButton[dirty="true"] {
+  list-style-image: url("chrome://editor/skin/icons/savefile-dirty.gif");
+} 
+
+#saveButton[dirty="true"][disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/savefile-disabled.gif") !important;
+} 
+
+/*
+#publishButton {
+  list-style-image: url("chrome://editor/skin/icons/publish.gif");
+} 
+
+#publishButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/publish-disabled.gif") !important;
+}
+*/
+
+#previewButton {
+  list-style-image: url("chrome://editor/skin/icons/preview.gif");
+} 
+
+#previewButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/preview-disabled.gif") !important;
+} 
+
+#printButton {
+  list-style-image: url("chrome://global/skin/icons/print.gif");
+} 
+
+#printButton[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/print-disabled.gif") !important;
+} 
+
+/*
+#findButton {
+  list-style-image: url("chrome://editor/skin/icons/find.gif");
+} 
+
+#findButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/find-disabled.gif") !important;
+}
+*/
+
+#linkButton {
+  list-style-image: url("chrome://editor/skin/icons/link.gif");
+} 
+
+#linkButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/link-disabled.gif") !important;
+} 
+
+#imageButton {
+  list-style-image: url("chrome://editor/skin/icons/image.gif");
+} 
+
+#imageButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/image-disabled.gif") !important;
+} 
+
+#namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/anchor.gif");
+} 
+
+#namedAnchorButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/anchor-disabled.gif") !important;
+} 
+
+#hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/hline.gif");
+} 
+
+#hlineButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/hline-disabled.gif") !important;
+} 
+
+#tableButton {
+  list-style-image: url("chrome://editor/skin/icons/table.gif");
+} 
+
+#tableButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/table-disabled.gif") !important;
+} 
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/spell.gif");
+} 
+
+#spellingButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif") !important;
+}
diff --git a/EarlyBlue/editor/resources.xml b/EarlyBlue/editor/resources.xml
deleted file mode 100644
index 82e49429..00000000
--- a/EarlyBlue/editor/resources.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<bindings id="EditorResourcesBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-          
-         
- <binding id="resource_bundle_editor" extends="" >
-   <resources>
-   </resources>	
-  </binding>
-          
-</bindings>  
diff --git a/EarlyBlue/editor/textEditor.css b/EarlyBlue/editor/textEditor.css
index f756ac0d..fa50b276 100644
--- a/EarlyBlue/editor/textEditor.css
+++ b/EarlyBlue/editor/textEditor.css
@@ -37,6 +37,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.separator_small {
+.separator-small {
   width: 1em;
 }
diff --git a/EarlyBlue/communicator/box.css b/EarlyBlue/forms/forms.css
similarity index 80%
rename from EarlyBlue/communicator/box.css
rename to EarlyBlue/forms/forms.css
index d4a035bd..b97c1c14 100644
--- a/EarlyBlue/communicator/box.css
+++ b/EarlyBlue/forms/forms.css
@@ -11,15 +11,15 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is "Classic" theme of mozilla.org code.
+ * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
+ *  Brian Ryner <bryner@netscape.com>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -35,9 +35,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+/* This file contains skin-specific rules for HTML form controls */
+
+/* xbl-forms.css contains the XBL bindings common to all skins */
+@import url("chrome://forms/content/xbl-forms.css");
 
-.box-toolbar-group
-  {
-    margin                : 0px;
-  }
diff --git a/EarlyBlue/global/arrow-down.gif b/EarlyBlue/global/arrow-down.gif
deleted file mode 100644
index c2c2c64f10c4363da290ec54e8034fe52add3c1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61
zcmZ?wbhEHb<YwSzXkcJCaNqy~1B2pE7Dgb&paUX6G7L;2E&Y<Sw_iNdov^5V=9v$V
LG8#of85pbquNDyL

diff --git a/EarlyBlue/global/arrow-left.gif b/EarlyBlue/global/arrow-left.gif
deleted file mode 100644
index 543751ce78b66d2bd108952f5224ab0a49e4a270..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61
zcmZ?wbhEHb<YwSzXkcJCaNqy~1B2pE7Dgb&paUX6G7L;2E&ZGe#qY@ZY;ua0o%h=G
Lac%bv5e91jjp+|e

diff --git a/EarlyBlue/global/arrow-right.gif b/EarlyBlue/global/arrow-right.gif
deleted file mode 100644
index 7da2d79aa6303ea3525d2b8be427a7e7b910db4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61
zcmZ?wbhEHb<YwSzXkcJCaNqy~1B2pE7Dgb&paUX6G7L;2E&ZGeCGK1+UhkJ|e9rvp
L4b6ZhA`I35nb;4Z

diff --git a/EarlyBlue/global/arrow-up.gif b/EarlyBlue/global/arrow-up.gif
deleted file mode 100644
index fb0ba9889685568260908b73012b8fdcd8fa0fb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59
zcmZ?wbhEHb<YwSzXkcJCaNqy~1B2pE7Dgb&paUX6G7L;YE&ZGe#qZDa*|aO`V$THQ
J`z@>t)&P8U4=Mlv

diff --git a/EarlyBlue/global/arrow/arrow-down-disabled.gif b/EarlyBlue/global/arrow/arrow-down-disabled.gif
new file mode 100755
index 0000000000000000000000000000000000000000..56e395ee085ae9775a084a93040de95f1cdb574f
GIT binary patch
literal 61
zcmZ?wbhEHb<YeGvSjfOIbLPzdFrfI8g^_`Qi9v?}2te`-Ong)NS8~5CkmERU(PVlU
HD}yxvwqz9H

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-down.gif b/EarlyBlue/global/arrow/arrow-down.gif
new file mode 100755
index 0000000000000000000000000000000000000000..ac1611368efb1d5724f5f50325a5ba0a13140c7f
GIT binary patch
literal 59
zcmZ?wbhEHb<YeGvSjfO|;J^U}28RD&p!k!85y)ZC0TCd11}2`C{*}^i3*}t;*6!wF
Gum%7l0uj>y

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-left-disabled.gif b/EarlyBlue/global/arrow/arrow-left-disabled.gif
new file mode 100755
index 0000000000000000000000000000000000000000..e39e03f4d68eb7a91928ce6d4acd59e05dbec625
GIT binary patch
literal 62
zcmZ?wbhEHb<YeGvSjfOIbLPzdFrfI8g^_`Qi9v?}2te`-O#D;&IWie0-U$}EBw4uS
Ij2MG80K}mcApigX

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-left.gif b/EarlyBlue/global/arrow/arrow-left.gif
new file mode 100755
index 0000000000000000000000000000000000000000..2684510f5b8107ac408386ebb5c39477c214e419
GIT binary patch
literal 62
zcmZ?wbhEHb<YeGvSjfO|;J^U}28RD&p!k!85y)ZC0TCd11}6TNeu>PDFYk30S+VJ@
JlMrFB1^`^15{>`>

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-right-disabled.gif b/EarlyBlue/global/arrow/arrow-right-disabled.gif
new file mode 100755
index 0000000000000000000000000000000000000000..8025fcf24aa70718ea7500704e5d66abb5ab68c9
GIT binary patch
literal 62
zcmZ?wbhEHb<YeGvSjfOIbLPzdFrfI8g^_`Qi9v?}2te`-O#D;&*(x`@k?RWDIYIA8
Ik0^sR0M7>%-2eap

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-right.gif b/EarlyBlue/global/arrow/arrow-right.gif
new file mode 100755
index 0000000000000000000000000000000000000000..50472872b09a827143d5d13e06f184f7caf24f88
GIT binary patch
literal 62
zcmZ?wbhEHb<YeGvSjfO|;J^U}28RD&p!k!85y)ZC0TCd11}6TNezD4pZ{)gyEF+|E
JFJNG>1^`&M5}yD7

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-up-disabled.gif b/EarlyBlue/global/arrow/arrow-up-disabled.gif
new file mode 100755
index 0000000000000000000000000000000000000000..91a48d2a0cbbf08e78c29a63c8e2df1219fb7b73
GIT binary patch
literal 62
zcmZ?wbhEHb<YeGvSjfOIbLPzdFrfI8g^_`Qi9v?}2te`-O#D;&S2A(WpJ%gaUPE!j
I9}xy?0L$PN#sB~S

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/arrow/arrow-up.gif b/EarlyBlue/global/arrow/arrow-up.gif
new file mode 100755
index 0000000000000000000000000000000000000000..a4ba1556846eed2b299e0911e2a46454e89a73e3
GIT binary patch
literal 60
zcmZ?wbhEHb<YeGvSjfO|;J^U}28RD&p!k!85y)ZC0TCd11}5H?{*?mK^XJ)YTGt)O
H$Y2csGF=hc

literal 0
HcmV?d00001

diff --git a/EarlyBlue/global/article.gif b/EarlyBlue/global/article.gif
deleted file mode 100755
index cd52b50856348cd46acc5e0a9062a47fa66a3ac7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 164
zcmZ?wbhEHb6krfw*vtR|`@wiWnA#8I?caakz=4K_hW|kE{|x`Z6p#k8fI#sl3nK#q
zFM|$9C&&y2mcR)oJUw?$-*a~7(Ox#06Bc&D%cimiFunNH8oO4|<J$!OrVlKUePN#$
yv}wEaFX4Gqa`Y_k&fs5l8`TZ1&W30?O-TEwFuVVeek#YVUF#R@kP&8Num%8(WkEUs

diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css
index c46612f0..68b18766 100644
--- a/EarlyBlue/global/autocomplete.css
+++ b/EarlyBlue/global/autocomplete.css
@@ -36,100 +36,78 @@
  * ***** END LICENSE BLOCK ***** */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
-/* ::::: autocomplete ::::: */
+/* ===== autocomplete.css =================================================
+  == Styles used by the autocomplete widget.
+  ======================================================================= */
 
-textbox[type="autocomplete"]
-  {
-    cursor              : default !important;
-  }
-
-.autocomplete-internal-box 
-  {
-    padding             : 0px !important;
-  }
+/* ::::: autocomplete ::::: */
 
-.autocomplete-textbox-container
+textbox
   {
-    padding             : 1px 2px 1px 2px;
+    cursor: default;
+    padding: 0px;
   }
 
-.autocomplete-textbox 
-  {
-    cursor              : text;
-  }
+.textbox-input-box {
+  margin: 0 3px;
+  -moz-box-align: center;
+}
 
 /* ::::: history button ::::: */
 
-.autocomplete-history-button
-  {
-    -moz-binding        : url("chrome://global/skin/classicBindings.xml#autocomplete-history-button");
-    width               : 15px; 
-    min-height          : 19px; 
-    border              : none;
-    background-color    : #9999CC;
-    list-style-image    : url("chrome://global/skin/scroll-down.gif");
-    padding             : 0px;
-    margin              : 0px;
-  }
-
-.autocomplete-history-button > .autocomplete-history-button-internal-box 
-  {
-    border              : 1px outset #CCD0DD;
-    padding             : 1px;
-  }
-
-.autocomplete-history-button[open="true"]
-  {
-    border              : none;
-  }
-
-.autocomplete-history-button[open="true"] > .autocomplete-history-button-internal-box
-  {
-    border              : 1px inset #CCD0DD;
-    padding             : 2px 0px 0px 2px;
-  }
+.autocomplete-history-dropmarker {
+  -moz-appearance: menulist-button;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  min-width: 15px;
+  min-height: 19px; 
+  border: 1px outset #CCD0DD;
+  background-color: #9999CC;
+  padding: 1px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
+.autocomplete-history-dropmarker[open="true"] {
+  border: 1px inset #CCD0DD;
+  padding: 2px 0px 0px 2px;
+}
 
 /* ::::: autocomplete popups ::::: */
 
 .autocomplete-result-popup,
-.autocomplete-history-popup
-  {
-    border                 : 1px solid #9999CC !important;
-    background-color       : white !important;
-  }
+.autocomplete-history-popup {
+  border: 1px solid #9999CC;
+  background-color: white !important;
+  padding: 0;
+}
 
-.autocomplete-history-popup
-  {
-    max-height             : 180px;
-  }
+.autocomplete-history-popup {
+  max-height: 180px;
+}
 
 /* ::::: outliner ::::: */
 
-.autocomplete-outliner 
-  {
-    border                 : none;
-    background-color       : transparent !important;
-  }
+.autocomplete-outliner {
+  border: none;
+  background-color: transparent !important;
+}
 
-.autocomplete-outlinercol 
-  {
-    margin                 : 0px !important;
-    border                 : none !important;
-    padding                : 0px !important;
-  }
+.autocomplete-outlinercol {
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+}
 
-.autocomplete-outlinerbody:-moz-outliner-cell-text 
-  {
-    padding-left: 8px;
-  }
+.autocomplete-outlinerbody:-moz-outliner-cell-text {
+  padding-left: 8px;
+}
 
-.autocomplete-outlinerbody:-moz-outliner-row(menuactive) 
-  {
-    background-color       : #336699;
-  }
+.autocomplete-outlinerbody:-moz-outliner-row(menuactive) {
+  background-color: #336699;
+}
 
-.autocomplete-outlinerbody:-moz-outliner-cell-text(menuactive) 
-  {
-    color                  : white !important;
-  }
+.autocomplete-outlinerbody:-moz-outliner-cell-text(menuactive) {
+  color: white !important;
+}
diff --git a/EarlyBlue/global/browser.css b/EarlyBlue/global/browser.css
index ec1e5d71..9e78dacf 100644
--- a/EarlyBlue/global/browser.css
+++ b/EarlyBlue/global/browser.css
@@ -37,7 +37,25 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.tab-image {
+.tabbrowser-strip {
+  padding-bottom: 1px;
+  border-bottom: 1px solid #666699;
+}
+
+tabpanels {
+  -moz-appearance: none;
+}
+
+.tabbrowser-tabs {
+  padding-top: 1px;
+}
+
+.tabs-left,
+.tabs-right {
+  width: 0px;
+}
+
+.tab-icon {
   margin-top: 1px;
   margin-right: 3px;
   width: 16px;
@@ -45,12 +63,24 @@
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item16.gif"); 
 }
 
-tab[busy] > .tab-box > .tab-image {
-  list-style-image: url("chrome://global/skin/loading.gif");
+tab[busy] > .tab-icon {
+  list-style-image: url("chrome://global/skin/icons/loading.gif");
+}
+
+tabbrowser > tabbox > tabpanels {
+  border: none;
+  padding: 0px;
+  margin: 0px;
 }
 
-.tabbrowser-closebox {
-  list-style-image: url("chrome://global/skin/closebox.gif");
+/* ::::: close button ::::: */
+
+.tabs-closebutton {
   margin-bottom: 3px;
   margin-right: 2px;
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+}
+
+.tabs-closebutton > .toolbarbutton-icon {
+  margin: 0;
 }
diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 309d9843..3544a804 100644
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -37,152 +37,108 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/** Default Button Styles (apply to usage of <button> without 
- *  any applied class).
- **/
+/* ===== button.css =====================================================
+  == Styles used by the XUL button element.
+  ======================================================================= */
+
+/* :::::::::: button :::::::::: */
 
 /* outer frame */
-  button
-    {
-      border              : none;
-      margin              : 1px 5px 2px 5px;
-      min-width           : 6.3em;
-      background-color    : #CCD0DD;
-      color               : #000000;
-      -moz-user-focus     : normal;
-    }
-  
-  .button-text {
-    margin: 0px !important;
-    text-align: center;
-  }
-
-  button, 
-  button[disabled="true"][default],
-  button[disabled="true"]:hover:active
-    {
-      border              : none;
-    }
-
-  .button-box,
-  button[disabled="true"][default] > .button-box,
-  button[disabled="true"]:hover:active > .button-box
-    {
-      border              : 1px outset #CCD0DD;
-      -moz-user-focus     : none;
-    }
-
-  .button-box-2,
-  button[disabled="true"][default] > .button-box > .button-box-2,
-  button[disabled="true"]:hover:active > .button-box > .button-box-2
-    {
-			border              : none;	
-    }
-  
-  button:hover:active,
-  button[open="true"],
-  button[checked="true"]
-    {
-      border              : none;
-    }
-
-  button:hover:active > .button-box,
-  button[checked="true"] > .button-box,
-  button[checked="true"]:focus > .button-box,
-  button[open="true"] > .button-box,
-  button[open="true"]:focus > .button-box
-    {
-      border              : 1px inset #CCD0DD;
-    }
-
-  button:hover:active > .button-box > .button-box-2,
-  button[checked="true"] > .button-box > .button-box-2,
-  button[checked="true"]:focus> .button-box > .button-box-2,
-  button[open="true"] > .button-box > .button-box-2,
-  button[open="true"]:focus > .button-box > .button-box-2
-    {
-      border              : none;
-    }
-
-  button:hover:active > .button-box > .button-box-2 > .button-box-text,
-  button[open="true"] > .button-box > .button-box-2 > .button-box-text
-    {
-      padding             : 1px 2px 0px 3px; 
-    }
+
+button {
+  margin: 1px 5px 2px 5px;
+  min-width: 6.3em;
+  border: 1px outset #CCD0DD;
+  background-color: #CCD0DD;
+  color: #000000;
+}
+
+.button-box {
+  border: 1px solid transparent;
+  padding: 0px 3px 1px 2px;
+}
   
-  button[disabled="true"],
-  button[disabled="true"]:hover:active 
-    {
-      color               : #999999;
-    }
-        
-  button[disabled="true"] > .button-box > .button-box-2 > .button-box-text,
-  button[disabled="true"]:hover:active > .button-box > .button-box-2 > .button-box-text
-    {
-      padding             : 0px 3px 1px 2px;
-    }
-
-/* text wrapping frame (hack because <text> does not support alignment) */
-  .button-box-text,
-  button[disabled]:focus > .button-box > .button-box-2 > .button-box-text
-    {
-      padding             : 0px 3px 1px 2px;
-      border              : 1px solid transparent;
-      margin              : 1px;
-    }
-
-  button:focus > .button-box > .button-box-2 > .button-box-text
-    {
-      border              : 1px dotted #9999CC;
-    }    
-    
-/** Styles for "DEFAULT" buttons (usually 'OK' or equivalent in dialogs. 
- *  To activate, set 'default' attribute on button.
- **/
- 
-/* outer frame */  
-  button[default], button:focus
-    {
-      border              : none;
-    }
-
-  button[default] > .button-box > .button-box-2 > .button-box-text
-    {
-      font-weight         : bold;
-      list-style-image    : url("chrome://global/skin/return.gif");
-      -moz-box-direction  : reverse;
-    }
-
-  button[default][disabled="true"] > .button-box > .button-box-2 > .button-box-text
-    {
-      font-weight         : bold;
-      list-style-image    : url("chrome://global/skin/return-disabled.gif");
-    }
-
-/* ::::: menu-button buttons ::::: */
+.button-text {
+  margin: 0px !important;
+  text-align: center;
+}
+
+/* .......... focused state .......... */
+
+button:focus {
+}
+
+button:focus > .button-box {
+  border: 1px dotted #9999CC;
+}
+
+/* .......... default state .......... */
+
+button[default="true"] {
+  font-weight: bold;
+  list-style-image: url("chrome://global/skin/icons/return.gif");
+  -moz-box-direction: reverse;
+}
+
+button[default="true"][disabled="true"] {
+  font-weight: bold;
+  list-style-image: url("chrome://global/skin/icons/return-disabled.gif");
+}
+
+/* .......... active/open/checked state .......... */
+
+button:hover:active,
+button[open="true"],
+button[checked="true"] {
+  border: 1px inset #CCD0DD;
+}
+
+button:hover:active > .button-box,
+button[open="true"] > .button-box,
+button[checked="true"] > .button-box {
+  padding: 1px 2px 0px 3px; 
+}
+
+/* .......... disabled state .......... */
+
+button[disabled="true"] {
+  border: 1px outset #CCD0DD;
+  color: #999999;
+}
+
+button[disabled="true"] > .button-box {
+  padding: 0px 3px 1px 2px !important;
+}
+
+/* ::::: menu/menu-button buttons ::::: */
 
 button[type="menu-button"] {
-  margin: 0px !important;
-  border: none !important;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0px;
+  border: none;
 }
 
-.menu-button-dropmarker {
-  list-style-image: url("chrome://global/skin/scroll-down.gif");
+.button-menu-dropmarker,
+.button-menubutton-dropmarker {
+  margin: 1px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
-  
-.menu-button-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/scroll-down-disabled.gif");
+
+.button-menu-dropmarker[disabled="true"],
+.button-menubutton-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }
 
+.button-menubutton-dropmarker[open="true"] {
+  margin: 2px 0px 0px 2px;
+}
+
+
 /* ::::: plain buttons ::::: */
 
-button.plain, 
-button.plain:hover,
-button.plain:hover:active,
-button.plain > .button-box, 
-button.plain:hover > .button-box, 
-button.plain:hover:active > .button-box {
-  border: 0px ! important;
-  margin: 0px;
-  padding: 0px;
+button.plain {
+  border: 0px !important;
+  margin: 0px !important;
+  padding: 0px !important;
 }
diff --git a/EarlyBlue/global/buttonBindings.xml b/EarlyBlue/global/buttonBindings.xml
deleted file mode 100644
index e22109ea..00000000
--- a/EarlyBlue/global/buttonBindings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="buttonBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="button" extends="chrome://global/content/bindings/button.xml#button">
-    <content>
-      <children includes="observes|template|menupopup|tooltip"/>
-      <xul:box class="box-inherit button-box" orient="horizontal" flex="1">
-        <xul:hbox class="box-inherit button-box-2" flex="1">
-          <xul:hbox class="box-inherit button-box-text" inherits="orient,dir,align,pack"
-                    flex="1" align="center" pack="center">
-            <children>
-              <xul:image class="button-icon" inherits="src=image"/>
-              <xul:label class="button-text" flex="1" inherits="disabled,value=label,accesskey,crop"/>
-            </children>
-          </xul:hbox>
-        </xul:hbox>
-      </xul:box>
-    </content>
-  </binding>
-
-  <binding id="button-menu" display="xul:menu" extends="chrome://global/skin/buttonBindings.xml#button"/>
-
-  <binding id="simplebutton" extends="chrome://global/content/bindings/button.xml#button-base">
-    <content>
-      <xul:vbox flex="1" align="center">
-        <xul:image class="simplebutton-icon" inherits="src,disabled"/>
-        <xul:label class="simplebutton-text" inherits="value=label,accesskey,crop,disabled"/>
-      </xul:vbox>
-    </content>
-  </binding>
-  
-</bindings>
diff --git a/EarlyBlue/global/checkbox.css b/EarlyBlue/global/checkbox.css
index 1c4ed408..4183c42c 100644
--- a/EarlyBlue/global/checkbox.css
+++ b/EarlyBlue/global/checkbox.css
@@ -41,90 +41,62 @@
 
 /* default checkbox for dialogs */
 /* outer frame */
-  checkbox 
-    {
-      margin              : 3px 5px 3px 5px;
-    }
-
-  .checkbox-checkmark-box-1
-    {
-      border              : 1px inset #CCD0DD;
-      background-color    : transparent;
-      margin              : 0px 0px 0px 0px;
-      width               : 10px;
-      height              : 10px;
-      -moz-user-focus     : ignore;
-    }
-
-  .checkbox-checkmark-box-1[disabled="true"]
-    {
-      background-color    : transparent;
-    }
-
-  .checkbox-checkmark-box-2
-    {
-      border              : none;
-      padding             : 1px;
-      width               : 9px;
-      height              : 9px;
-    }  
-
-  /* ensure that no list-style-image is inherited in from the Outside */
-  .checkbox-check
-    {
-      list-style-image    : none;
-      min-width           : 8px;
-      min-height          : 8px;
-      width               : 8px;
-      height              : 8px;
-    }
-
-  .checkbox-check[checked="true"]
-    {
-      list-style-image    : url(chrome://global/skin/check-check.gif);
-    }
-  
-  .checkbox-check[checked="true"][disabled="true"]
-    {
-      list-style-image    : url(chrome://global/skin/check-check-disabled.gif);
-    }
-
-  checkbox:hover:active > .checkbox-internal-box > .checkbox-checkmark-box-1
-    {
-      background-color    : transparent;
-    }
-
-/* text/icon frames */
-  .checkbox-text
-    {
-      margin              : 0px 0px 0px 2px;
-      padding             : 1px;
-    }
-
-  .checkbox-icon 
-    {
-      list-style-image    : inherit;
-    }    
-
-  .checkbox-text
-    {
-      margin              : 0px !important;
-    }
-    
-  .checkbox-text[disabled="true"]
-    {
-      color               : #999999;
-    }
+checkbox {
+  -moz-box-align: center;
+  margin: 2px 4px;
+  padding: 1px;
+}
+
+.checkbox-label-box {
+  margin-left: 2px;
+  border: 1px solid transparent;
+  padding: 0px 1px;
+}
+
+.checkbox-icon {
+  margin-right: 2px;
+}
+
+.checkbox-label {
+  margin: 0 !important;
+}
+
+/* ..... focused state ..... */
+
+checkbox:focus > .checkbox-label-box {
+  border: 1px dotted #9999CC;
+}
+
+/* ..... disabled state ..... */
+
+checkbox[disabled="true"] > .checkbox-check {
+  background-color: -moz-Dialog;
+}
+
+checkbox[disabled="true"] {
+  color: #999999 !important;
+}
+
+/* ::::: checkmark image ::::: */
+
+.checkbox-check {
+  -moz-box-align: center;
+  border: 1px inset #CCD0DD;
+  width: 12px;
+  height: 12px;
+  background: transparent 50% 50% no-repeat;
+}
   
-  checkbox:focus > .checkbox-internal-box > .checkbox-text
-    { 
-      border              : 1px dotted #9999CC;
-      padding             : 0px;
-    }
-    
-  .checkbox-internal-box
-    {
-      -moz-user-focus     : none;
-      padding             : 0px;
-    }
+checkbox:hover:active > .checkbox-check {
+  background-color: transparent;
+}
+
+/* ..... checked state ..... */
+
+checkbox[checked="true"] > .checkbox-check {
+  background-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
 
+checkbox[checked="true"][disabled="true"] > .checkbox-check {
+  background-image: url("chrome://global/skin/checkbox/cbox-check-disabled.gif") !important
+}
diff --git a/EarlyBlue/global/check-check-disabled.gif b/EarlyBlue/global/checkbox/cbox-check-disabled.gif
similarity index 100%
rename from EarlyBlue/global/check-check-disabled.gif
rename to EarlyBlue/global/checkbox/cbox-check-disabled.gif
diff --git a/EarlyBlue/global/check-check.gif b/EarlyBlue/global/checkbox/cbox-check.gif
similarity index 100%
rename from EarlyBlue/global/check-check.gif
rename to EarlyBlue/global/checkbox/cbox-check.gif
diff --git a/EarlyBlue/global/classicBindings.xml b/EarlyBlue/global/classicBindings.xml
deleted file mode 100644
index 3c391b6a..00000000
--- a/EarlyBlue/global/classicBindings.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="classicBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="textdisabled" extends="xul:text">
-    <content>
-      <xul:stack>
-        <xul:label class="text-bottom" inherits="value,accesskey,crop"/>
-        <xul:label class="text-top" inherits="value,accesskey,crop"/>
-      </xul:stack>
-    </content>
-  </binding>
-
-  <binding id="toolbargrippy"
-           extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
-    <content>
-      <xul:hbox align="center" pack="center">
-        <xul:image class="toolbargrippy-twisty"/>
-      </xul:hbox>
-      <xul:spacer class="toolbargrippy-texture" flex="1"/>
-    </content>
-  </binding>
-
-  <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
-    <content>
-      <xul:hbox align="center">
-        <xul:image class="toolbargrippy-twisty-collapsed"/>
-      </xul:hbox>
-      <xul:spacer class="toolbargrippy-texture-collapsed" flex="1"/>
-    </content>
-  </binding>
-
-  
-  <binding id="radio" extends="chrome://global/content/bindings/radio.xml#radio">
-    <content>
-      <xul:hbox flex="1" class="radio-internal-box" align="center">
-        <xul:hbox class="radio-checkmark-box-1" align="center" inherits="disabled">
-          <xul:hbox class="radio-checkmark-box-2" align="center" flex="1">
-            <xul:image class="radio-check" inherits="selected,disabled"/>
-          </xul:hbox>
-        </xul:hbox>
-        <xul:hbox class="radio-text-container" flex="1" align="center">
-          <xul:image class="radio-icon" inherits="src,disabled"/>
-          <xul:label class="radio-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
-        </xul:hbox>          
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="checkbox" extends="chrome://global/content/bindings/checkbox.xml#checkbox">
-    <content>
-      <xul:hbox flex="1" class="checkbox-internal-box" align="center">
-        <xul:hbox class="checkbox-checkmark-box-1" align="center" inherits="disabled">
-          <xul:hbox class="checkbox-checkmark-box-2" align="center" flex="1">
-            <xul:image class="checkbox-check" inherits="checked,disabled"/>
-          </xul:hbox>
-        </xul:hbox>
-        <xul:image class="checkbox-icon" inherits="src,disabled"/>
-        <xul:label class="checkbox-text" inherits="value=label,accesskey,crop,disabled" flex="1"/>
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="thumb" extends="chrome://global/content/bindings/scrollbar.xml#thumb">
-    <content>
-      <xul:vbox class="thumb-box" align="center" flex="1">
-        <xul:spacer class="thumb-spacer" flex="1"/>
-      </xul:vbox>
-    </content>
-  </binding>
-
-  <binding id="scrollbar" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">
-    <content>
-      <xul:scrollbarbutton type="decrement" inherits="sborient=orient"/>
-      <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
-        <xul:thumb inherits="src" flex="1"/>
-      </xul:slider>
-      <xul:scrollbarbutton type="increment" inherits="sborient=orient"/>
-    </content>
-  </binding>
-  
-  <binding id="scrollbarbutton" extends="chrome://global/content/bindings/scrollbar.xml#scrollbarbutton">
-  </binding>
-
-  <binding id="slider" extends="chrome://global/content/bindings/scrollbar.xml#slider">
-    <content>
-      <xul:button class="slider-button"/>
-    </content>
-  </binding>
-  
-  <binding id="grippy" extends="chrome://global/content/bindings/splitter.xml#grippy">
-    <content>
-      <xul:hbox class="grippy-box" flex="1">
-        <xul:image class="grippy-image" inherits="src" />
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="double-box">
-    <content>
-      <xul:hbox class="db-internal-box" flex="1">
-        <children/>
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="menuitem-iconic" extends="chrome://global/content/bindings/menu.xml#menuitem-iconic">
-    <content>
-      <xul:vbox class="menu-iconic-left" align="center" inherits="selected,menuactive,disabled,checked">
-        <xul:image/>
-      </xul:vbox>
-      <xul:spacer class="menuitem-iconic-spacer"/>
-      <xul:label class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
-      <xul:label class="menu-iconic-accel" inherits="value=acceltext"/>
-    </content>
-  </binding>
-
-  <binding id="largeheader">
-    <content>
-      <xul:hbox class="largeheader-box" flex="1">
-        <xul:vbox class="largeheader-text-container">
-          <xul:spacer flex="1"/>
-          <xul:label class="largeheader-header-text" inherits="value=title" crop="right"/>
-          <xul:label class="largeheader-desc-text" inherits="value=description"/>
-          <xul:spacer flex="1"/>
-        </xul:vbox>
-        <xul:spacer flex="1"/>
-        <xul:hbox class="largeheader-icon-container" align="center">
-          <xul:image class="largeheader-icon" inherits="src"/>
-        </xul:hbox>
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="toolbarbutton-left" extends="chrome://global/content/bindings/button.xml#buttonleft">
-    <content>
-      <xul:hbox flex="1" align="center">
-        <xul:image class="toolbarbutton-left-icon" inherits="src,disabled"/>
-        <xul:label class="toolbarbutton-left-text" inherits="value=label,crop"/>
-      </xul:hbox>
-    </content>
-  </binding>  
-
-  <binding id="toolbarbutton-top" extends="chrome://global/content/bindings/button.xml#buttontop">
-    <content>
-      <xul:vbox flex="1" align="center">
-        <xul:image class="toolbarbutton-top-icon" inherits="src,disabled"/>
-        <xul:label class="toolbarbutton-top-text" inherits="value=label,crop"/>
-      </xul:vbox>
-    </content>
-  </binding>  
-  
-  <binding id="splitter"
-           extends="chrome://global/content/bindings/splitter.xml#splitter">
-    <content>
-      <xul:hbox class="splitter-internal-box" flex="1" pack="center" align="center">
-        <children/>
-      </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="disabled-text" extends="xul:stack">
-    <content>
-      <xul:stack class="disabled-text-stack">
-        <xul:label class="disabled-text-bottom"/>
-        <xul:label class="disabled-text-top"/>
-      </xul:stack>        
-    </content>  
-  </binding>
-
-  <binding id="autocomplete-history-button">
-    <content>
-      <xul:hbox class="autocomplete-history-button-internal-box" align="center">
-        <children/>
-      </xul:hbox>
-    </content>
-  </binding>
-
-</bindings>
diff --git a/EarlyBlue/global/colorpicker.css b/EarlyBlue/global/colorpicker.css
index 3aaa1602..e089a9e6 100644
--- a/EarlyBlue/global/colorpicker.css
+++ b/EarlyBlue/global/colorpicker.css
@@ -37,36 +37,19 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* colorpicker tiles */
+/* ===== colorpicker.css ================================================
+  == Styles used by the XUL colorpicker element.
+  ======================================================================= */
 
-.colorpickertile {
-  width                 : 20px;
-  height                : 20px;
-  margin                : 1px;
-  border                : 1px inset #CCD0DD;
-}
-
-.colorpickertile[selected="true"] {
-  border                : 1px solid #000000;
-}
-
-.colorpickertile[hover="true"] {
-  border                : 1px solid #FFFFFF;
-}
-
-.cp-light[hover="true"] {
-  border                : 2px dotted #9999CC;
-}
+/* ::::: colorpicker button ::::: */
 
 /* colorpicker button */
 
 colorpicker[type="button"] {
-  width: 35px;
+  width: 34px;
   height: 20px;
   border: 1px outset #CCD0DD;
-}
-
-.colorpicker-button-internal-box {
+  background-color: #CCD0DD;
   padding: 3px;
 }
 
@@ -75,14 +58,29 @@ colorpicker[type="button"] {
 }
 
 colorpicker[type="button"]:focus {
+}
+ 
+colorpicker[type="button"][open="true"] {
+  border: 1px inset #CCD0DD;
+}
 
+/* ::::: colorpicker tiles ::::: */
 
-colorpicker[type="button"]:focus > .colorpicker-button-internal-box {
+.colorpickertile {
+  width                 : 20px;
+  height                : 20px;
+  margin                : 1px;
+  border                : 1px inset #CCD0DD;
 }
 
-colorpicker[type="button"][open="true"] {
-  border: 1px inset #CCD0DD;
+.colorpickertile[selected="true"] {
+  border                : 1px solid #000000;
 }
 
-colorpicker[type="button"][open="true"] > .colorpicker-button-internal-box {
+.colorpickertile[hover="true"] {
+  border                : 1px solid #FFFFFF;
+}
+
+.cp-light[hover="true"] {
+  border                : 2px dotted #9999CC;
 }
diff --git a/EarlyBlue/global/console.css b/EarlyBlue/global/console.css
index 0fcf1208..0d322524 100644
--- a/EarlyBlue/global/console.css
+++ b/EarlyBlue/global/console.css
@@ -35,113 +35,102 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@import url(chrome://global/skin);
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.console-box 
-  {
-    background-color    : #CCD0DD;
-    color               : #000000;
-  }
+/* ===== console.css ====================================================
+  == Styles used by the JavaScript Console window.
+  ======================================================================= */
+
+.console-box {
+  background-color: #CCD0DD;
+  color: #000000;
+}
  
-/* :::::::::: console rows :::::::::: */
+/* ::::: console rows ::::: */
 
-.console-row 
-  {
-    padding             : 0px;
-    border-bottom       : 2px solid #000000;
-  }
+.console-row {
+  padding: 0px;
+  border-bottom: 2px solid #000000;
+}
 
-.console-row-icon 
-  {
-    border-right        : 1px outset #999999;
-    padding             : 5px;
-    background-color    : #CCCCCC;
-    -moz-box-align      : start;
-  }
+.console-row-icon {
+  border-right: 1px outset #999999;
+  padding: 5px;
+  background-color: #CCCCCC;
+  -moz-box-align: start;
+}
 
-.console-icon 
-  {
-    list-style-image    : inherit !important;
-  }
+.console-icon {
+  list-style-image    : inherit !important;
+}
 
-/* error rows */
+/* ..... error rows ..... */
 
-.console-row-code 
-  {
-    padding             : 3px 0px 3px 3px;
-    font-size           : larger;
-    color               : #0000BB;
-  }
+.console-row-code {
+  padding: 3px 0px 3px 3px;
+  font-size: larger;
+  color: #0000BB;
+}
 
-.console-dots, .console-caret 
-  {
-    height              : 9px;
-  }
+.console-dots,
+.console-caret {
+  height: 9px;
+}
 
-.console-dots 
-  {
-    background          : url("chrome://global/skin/console-error-dash.gif") repeat-x top;
-  }
+.console-dots {
+  background: url("chrome://global/skin/console/console-error-dash.gif") repeat-x top;
+}
 
-.console-caret 
-  {
-    width               : 7px;
-    background          : url("chrome://global/skin/console-error-caret.gif") no-repeat top;
-  }
+.console-caret {
+  width: 7px;
+  background: url("chrome://global/skin/console/console-error-caret.gif") no-repeat top;
+}
 
-/* message rows */
+/* ..... message rows ..... */
 
-.console-row[type="message"] 
-  {
-    font-family         : monospace;
-  } 
+.console-row[type="message"] {
+  font-family: monospace;
+} 
 
-/* selected state */
+/* ..... selected state ..... */
 
-.console-row[selected="true"] 
-  {
-    background-color    : #336699;
-    color               : #000000;
-  }
+.console-row[selected="true"] {
+  background-color: #336699;
+  color: #000000;
+}
 
 .console-row-code[selected="true"],
-.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link 
-  {
-    color               : inherit !important;  
-  }
+.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link {
+  color: inherit !important;  
+}
 
 /* ::::: icons ::::: */
 
 .console-row[type="error"],
 .console-row[type="exception"] 
   {
-    list-style-image    : url("chrome://global/skin/error-icon.gif");
+    list-style-image    : url("chrome://global/skin/icons/alert-error.gif");
   }
 
 .console-row[type="warning"] 
   {
-    list-style-image    : url("chrome://global/skin/alert-icon.gif");
+    list-style-image    : url("chrome://global/skin/icons/alert-exclam.gif");
   }
 
 .console-row[type="message"] {
-  list-style-image      : url("chrome://global/skin/message-icon.gif");
+  list-style-image      : url("chrome://global/skin/icons/alert-message.gif");
 }
 
 /* ::::: toolbars ::::: */
 
-#TextboxEval
-  {
-    margin            : 1px 2px 1px 2px ;
-  }
+#TextboxEval {
+  margin: 1px 2px 1px 2px ;
+}
 
-#ButtonEval 
-  {
-    margin            : 1px 2px 1px 0px;
-  }
+#ButtonEval {
+  margin: 1px 2px 1px 0px;
+}
 
-toolbarseparator 
-  {
-    min-height        : 1em;
-  }
+toolbarseparator {
+  min-height: 1em;
+}
diff --git a/EarlyBlue/global/console-error-caret.gif b/EarlyBlue/global/console/console-error-caret.gif
similarity index 100%
rename from EarlyBlue/global/console-error-caret.gif
rename to EarlyBlue/global/console/console-error-caret.gif
diff --git a/EarlyBlue/global/console-error-dash.gif b/EarlyBlue/global/console/console-error-dash.gif
similarity index 100%
rename from EarlyBlue/global/console-error-dash.gif
rename to EarlyBlue/global/console/console-error-dash.gif
diff --git a/EarlyBlue/global/dialog.css b/EarlyBlue/global/dialog.css
index fb9ec01d..c6db6ccb 100644
--- a/EarlyBlue/global/dialog.css
+++ b/EarlyBlue/global/dialog.css
@@ -51,10 +51,43 @@ dialog {
 
 /* ::::: dialog buttons ::::: */
 
-.dialog-button-box {
-  padding-top: 1.5em;
-}
-
 .dialog-button {
 /*  font: menu; */
 }
+
+/* ::::: dialog header ::::: */
+
+dialogheader {
+  margin: 0px 5px 5px 5px;
+  border: 1px inset #666699;
+  padding: 3px 4px;
+  background-color: #666699;
+  color: #CCD0DD;
+}
+
+.dialogheader-title {
+  margin: 0px !important;
+  font-size: larger;
+  font-weight: bold;
+}
+
+/* ::::: large dialog header ::::: */
+
+.header-large {
+  -moz-box-orient: vertical;
+  margin: 0;
+  border: none;
+  border-bottom: 1px solid #000000;
+  padding: 12px 5px 12px 25px;
+  background-color: #CCD0DD;
+  color: #000000;
+}
+
+.header-large > .dialogheader-title {
+  font: inherit;
+  font-weight: bold;
+}
+
+.header-large > .dialogheader-description {
+  margin-left: 12px !important;
+}
diff --git a/EarlyBlue/global/document.gif b/EarlyBlue/global/document.gif
deleted file mode 100755
index cce7ebb38684b743517eace27726faa8704d7458..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 113
zcmZ?wbhEHb6krfwSoELa|NsBz&h0;Q=8U?!3Ih^Q{K>)y;_841kXi?3Gmg!7J`}WE
zSh1w=m96`;Ip1R*C<sir6scoYcFCz!ensah+Xb4EMy9j1)n$H_I6hgOkz>)=z`|e+
E04zW!1^@s6

diff --git a/EarlyBlue/global/dropmarker-down-disabled.gif b/EarlyBlue/global/dropmarker-down-disabled.gif
deleted file mode 100644
index 71a86cd6f398dd55a30efb298b4018266ad75b19..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ycmZ?wbhEHbWMyDxXkcWRIdk*>|Nj+#vM@3*Ff!;c00Bsbfr+(6R-8MU!5RP-CJD#@

diff --git a/EarlyBlue/global/dropmarker-down-on-active.gif b/EarlyBlue/global/dropmarker-down-on-active.gif
deleted file mode 100644
index 2c596338a008836f79528084d74e9a0d45925353..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ycmZ?wbhEHbWMyDxXkcXE;W7UI|G(l-7DfgJMg|=QAOOiQFtN7CigQOZSOWm!$_Oq1

diff --git a/EarlyBlue/global/dropmarker-down-on-hover.gif b/EarlyBlue/global/dropmarker-down-on-hover.gif
deleted file mode 100644
index b29bfe6dd55d5f0e8f38d1a3b49268f375d54afa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67
zcmZ?wbhEHbWMyDxSj57hq@-m0f2Of<T3Xtf|Ns9pz<}aU7DfgJ76u)V07xwZGl#}z
M2cg~xGZ+}G0UnzUXaE2J

diff --git a/EarlyBlue/global/dropmarker-up-on.gif b/EarlyBlue/global/dropmarker-up-on.gif
deleted file mode 100644
index 283e6fa1aea214ab9c71428647f66929c3adc316..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46
ycmZ?wbhEHbWMyDxXkcV8HctEh|G(l-7DfgJMg|=QAOOiQFtPe1u<wXvum%A2QVCfA

diff --git a/EarlyBlue/global/filepicker.css b/EarlyBlue/global/filepicker.css
index 408cd498..ed1f5de0 100644
--- a/EarlyBlue/global/filepicker.css
+++ b/EarlyBlue/global/filepicker.css
@@ -55,11 +55,20 @@
 
 /* ::::: file/directory items ::::: */
 
-outlinerbody:-moz-outliner-image(FilenameColumn, directory) {
+outlinerchildren:-moz-outliner-image(FilenameColumn, directory) {
   list-style-image: url("chrome://global/skin/filepicker/dir-closed.gif");
 }
 
-outlinerbody:-moz-outliner-image(FilenameColumn, file) {
+outlinerchildren:-moz-outliner-image(FilenameColumn, file) {
   list-style-image: url("chrome://global/skin/filepicker/blank.gif");
 }
 
+/* ::::: focus rules ::::: */
+
+#directoryOutliner > outlinerrows > .outliner-bodybox {
+  border: 1px solid transparent;
+} 
+
+#directoryOutliner:focus > outlinerrows > .outliner-bodybox {
+  border-color: #000000;
+}
diff --git a/EarlyBlue/global/formatting.css b/EarlyBlue/global/formatting.css
index a61350fc..38c70e13 100644
--- a/EarlyBlue/global/formatting.css
+++ b/EarlyBlue/global/formatting.css
@@ -70,14 +70,6 @@
     border                : 1px outset #CCD0DD;
   }  
 
-/*  
-.outset-top-bottom
-  {
-    border-top            : 1px solid ThreeDHighlight;
-    border-bottom         : 1px solid ThreeDShadow;
-  }    
-*/
-
 /** separator rules **/
 /* standard separators */
   separator, separator[orient="horizontal"] 
@@ -139,9 +131,14 @@
     
   label[disabled="true"] 
     {
-      color                 : #9999CC;
+      color               : #9999CC;
     }    
-    
+
+  description, label
+    {
+      cursor              : default;
+    }
+   
   description
     {
 /*      margin              : 1px 5px 4px 5px; */
@@ -177,11 +174,6 @@
       margin-left         : 23px;
     }
 
-  .icon-dropmarker
-    {
-      list-style-image    : url("chrome://global/skin/dropmarker-down-on.gif");
-    }
-    
   .box-padded
     {
       padding             : 5px;
@@ -197,43 +189,8 @@
       padding             : 20px 44px 10px 44px;
     }    
 
-/* Double Border Boxes */
-
-  /* top only */
-/*
-  .double-box-top
-    {
-      -moz-binding        : url("chrome://global/skin/classicBindings.xml#double-box");
-      border-top          : 1px solid ThreeDShadow;
-      background-color    : #FFFFFF;
-      margin              : 0px;
-    }
-  
-  .double-box-top > .db-internal-box
-    {
-      border-top          : 1px solid ThreeDDarkShadow;
-    }          
-*/    
-  /* all round */    
-/*
-  .double-box
-    {
-      -moz-binding          : url("chrome://global/skin/classicBindings.xml#double-box");
-      border-left           : 1px solid ThreeDShadow;
-      border-top            : 1px solid ThreeDShadow;
-      border-bottom         : 1px solid ThreeDHighlight;
-      border-right          : 1px solid ThreeDHighlight;
-      background-color      : #FFFFFF;
-      margin                : 0px;
-    }
-  
-  .double-box > .db-internal-box
-    {
-      border                : 1px solid ThreeDDarkShadow;
-    }   
-*/
-
   .caption-text
     {
       margin: 0px 2px 0px 1px !important;
     }
+
diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css
index 6bb98a2f..3ba6299a 100644
--- a/EarlyBlue/global/global.css
+++ b/EarlyBlue/global/global.css
@@ -46,204 +46,104 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: bindings ::::: */
+/* ::::: XBL bindings ::::: */
 
-button {
-  -moz-binding: url("chrome://global/skin/buttonBindings.xml#button");
+radio {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#radio");
 }
-  
-button[type="menu"] {
-  -moz-binding: url("chrome://global/skin/buttonBindings.xml#button-menu");
+
+menulist > menupopup,
+.menulist-menupopup {
+  -moz-binding: url("chrome://global/content/bindings/popup.xml#popup-scrollbars");
 }
 
-button[type="menu-button"] {
-  -moz-binding: url("chrome://global/content/bindings/button.xml#menu-button");
+.menulist-compact {
+  -moz-binding: url("chrome://global/content/bindings/menulist.xml#menulist-compact");
 }
 
-  checkbox 
-    {
-      -moz-binding        : url("chrome://global/skin/classicBindings.xml#checkbox");
-    }
-  
-  menulist 
-    {
-      -moz-binding        : url("chrome://global/skin/menulistBindings.xml#menulist");
-    }
-        
-  menulist[editable="true"] 
-    {
-      -moz-binding          : url("chrome://global/skin/menulistBindings.xml#menulist-editable") !important;
-    }
-  
-  menulist > menupopup,
-  .menulist-menupopup
-    {
-      -moz-binding        : url("chrome://global/skin/menulistBindings.xml#menulistpopup");
-    }
-  
-  .menulist-compact
-    {
-      -moz-binding        : url("chrome://global/skin/menulistBindings.xml#menulist-compact");
-    }
-    
-  radio 
-    {
-      -moz-binding        : url("chrome://global/skin/classicBindings.xml#radio");
-    }
-  
-  grippy, grippy[collapse="before"]
-    {
-      -moz-binding          : url("chrome://global/skin/classicBindings.xml#grippy");
-    }
-    
-  splitter
-    {
-      -moz-binding        : url("chrome://global/skin/classicBindings.xml#splitter");
-    }
-  
-  tabs 
-    {
-      -moz-binding: url("chrome://global/skin/tabBindings.xml#tabs");
-    }
-  
-  toolbargrippy
-    {
-      -moz-binding          : url("chrome://global/skin/classicBindings.xml#toolbargrippy");
-    }
-  
-  toolbargrippy[tbgrippy-collapsed="true"] 
-    {
-      -moz-binding          : url("chrome://global/skin/classicBindings.xml#toolbargrippy-collapsed");
-    }
-  
-  .treecell-popupcell-menu 
-    {
-      -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic") !important;
-    }
-
-/**  
- * XUL <window> element
- **/
-  window,
-  page,
-  dialog,
-  wizard
-    { 
-      background-color    : #CCD0DD;
-      color               : black;
-      font                : 3mm helvetica,arial,tahoma,sans-serif;
-    }
-  
-  [wait-cursor] 
-    { 
-      cursor              : wait !important; 
-    }
-  
-  /* deprecated */
-  window.dialog 
-    { 
-      background-color    : #CCD0DD;
-      padding             : 8px 10px 10px 8px;
-    }
-
-/**
- * XUL <box> debugging
- **/
-  :-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;
-    }
-
-/**
- * Utility icons (used for alert dialogs, etc)
- **/
-  .message-icon 
-    {
-      list-style-image    : url("chrome://global/skin/message-icon.gif");
-      width:32px;height:32px;
-    }
-
-  .alert-icon 
-    {
-      list-style-image    : url("chrome://global/skin/alert-icon.gif");
-      width:32px;height:32px;
-    }
-  
-  .error-icon 
-    {
-      list-style-image    : url("chrome://global/skin/error-icon.gif");
-      width:32px;height:32px;
-    }
-  
-  .question-icon 
-    {
-      list-style-image    : url("chrome://global/skin/question-icon.gif");
-      width:32px;height:32px;
-    }
-
-/**
- * status-bar
- */
-  statusbar
-    {
-      background-color    : #666699;
-      color               : #CCD0DD;
-      overflow            : hidden;
-      border-top          : 1px solid #9999CC;
-/*      min-height          : 1.9em !important; */
-      /* DON'T DELETE.  Removes disappearance of scrollbars
-       * in content pane when window is made smaller.
-       * Talk to evaughan@netscape.com for details.
-       */
-      min-width           : 1px;
-    }
+/* ::::: root elements ::::: */
+
+window,
+page,
+dialog,
+wizard { 
+  background-color: #CCD0DD;
+  color: #000000;
+  font: 3mm helvetica,arial,tahoma,sans-serif;
+}
   
-  statusbarpanel, .statusbar-panel
-    {
-      padding             : 0px 1px 0px 1px;
-    }
-
-  .statusbarpanel-icononly
-    {
-      padding             : 0px;
-    }    
-    
-/**
- * iframe default sizing 
- **/
-  iframe 
-    {
-      min-width           : 10px;
-      min-height          : 10px;
-      width               : 100px;
-      height              : 100px;
-      border              : none;
-    }
-
-/* has to be in here since scoped stylesheets can't apply
-   to explicit children yet */
-caption
-  {
-    margin                : 0px 6px 2px 6px;
-    padding               : 0px 3px 0px 3px;
-    background-color      : #CCD0DD;
-  }
-
-.tooltip-label
-  {
-    margin                : 0px;
-  }
+/* deprecated */
+window.dialog { 
+  padding: 8px 10px 10px 8px;
+}
+
+[wait-cursor] { 
+  cursor: wait !important; 
+}
+
+/* ::::: alert icons :::::*/
+
+.message-icon,
+.alert-icon,
+.error-icon,
+.question-icon {
+  width: 32px;
+  height: 32px;
+}
 
+.message-icon {
+  list-style-image: url("chrome://global/skin/icons/alert-message.gif");
+}
+
+.alert-icon {
+  list-style-image: url("chrome://global/skin/icons/alert-exclam.gif");
+}
+
+.error-icon {
+  list-style-image: url("chrome://global/skin/icons/alert-error.gif");
+}
+
+.question-icon {
+  list-style-image: url("chrome://global/skin/icons/alert-question.gif");
+}
+
+/* ::::: iframe ::::: */
+
+iframe {
+  border: none;
+  width: 100px;
+  height: 100px;
+  min-width: 10px;
+  min-height: 10px;
+}
+
+/* ::::: statusbar ::::: */
+
+statusbar {
+  border-top: 1px solid #9999CC;
+  background-color: #666699;
+  color: #CCD0DD;
+}
+
+statusbarpanel {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  padding: 0px 1px 0px 1px;
+}
+
+
+.statusbar-resizerpanel {
+  -moz-box-align: end;
+  -moz-box-pack: end;
+  padding: 0px;
+}
+
+.statusbarpanel-iconic {
+  padding: 0px;
+}    
+
+/* ::::: miscellaneous ::::: */
+
+.toolbar-focustarget {
+  -moz-user-focus: ignore !important;
+}
diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml
new file mode 100644
index 00000000..98cae530
--- /dev/null
+++ b/EarlyBlue/global/globalBindings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<bindings id="globalBindings"
+   xmlns="http://www.mozilla.org/xbl"
+   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <binding id="radio"
+           extends="chrome://global/content/bindings/radio.xml#radio">
+    <content>
+      <xul:hbox class="radio-check-box1" inherits="selected,checked,disabled">
+        <xul:hbox class="radio-check-box2" flex="1">
+          <xul:image class="radio-check" inherits="selected,checked,disabled"/>
+        </xul:hbox>
+      </xul:hbox>
+      <xul:hbox class="radio-label-box" flex="1">
+        <xul:image class="radio-icon" inherits="src"/>
+        <xul:label class="radio-label" inherits="xbl:text=label,accesskey,crop" flex="1"/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/EarlyBlue/global/gray-bottomleft.gif b/EarlyBlue/global/gray-bottomleft.gif
deleted file mode 100644
index 94e979cf55e2e39b1582621f854fa7ec625da5a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmc(eD~^_74291mh+m<HWW=u!1VM5TGr@C_sL`0S4o0wuI+nl|@Lk00Vq|&xZi3e}
zZO^UW_vPE?`-dMFUGyT&zMiR>%y>pybx+rHrai4~R!`MbraYycO;2i)i6`1s_qfIx
zdn}MfJ*rVg9#Mb|G*~P%t>xKQ-RX9>mX@ljD_!o=s-T(bq~nfO6tk{&+HMPtthTC^
zmRqo*8Zbno5?S;h1{-LwSk@ZanwKh9Y5hS<l~i2O+C>FTr|hzDk0@qKDY=9_@<1lr
z#DRZA;1Jb-AsUs8q61>Efd)&P+_tHCPP9Sd4_Yca7P(><6*MD9<Vey4fG)-f8n;AA
z9>`>yIM9S)9HJU9M6-!3bU+L?(ApF2G;M00xEMj=4_Yc~KaS1y+<Tkngd6j@%Fdpk
zH}#X<uAVsd2*=?f9npJ}qho;&G@k=kB0M}n^}pWxCEkBQmp6L6+<pD?`|s1c*Ka@G
RK3{+SdUd1g_YYTn`Um&$Ox*wg

diff --git a/EarlyBlue/global/gray-bottomright.gif b/EarlyBlue/global/gray-bottomright.gif
deleted file mode 100644
index 5887c3eb5afa8a7604431e97b80504bea156541c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 820
zcmc(eD{fv<41`B2`BffJDIg07h%_WsQAykIM!_MYE+bNRP-d1TWDDWmPoewyY@&x*
zw&&%0zdwAt|NMN>MSrE)*E2Pf8P8~|?&+G&w5PSr>ZzK_l&7?_=}Ap8@kG1o9@jWy
zj|I}GM>WdGBMPvA28(5;wLJT(JKgTq(o$7*rORDf6*N<wbllO3V%F78+ijtd)mF9A
zatl^e1BPf+B8wixU;_;n%UVNQ^HSw1tv_g~l8P%@yQrY)lwB6?5yfmNC6};A9>`>y
zIPi}M9HJU9M5B^XbU+L?&|qnk+cq`Ni8e_5K}%)FB3JC9f@b8197&o0(8V}G<CZAN
z1DR|S2bwU9LsSEXXf~0B4v4`9T6?0MrcKQg7b8ggK}%)r$FaGddvEicaAQ7K+1V5H
zrhc;9)f2}a;W%8RBYJOgbS&_J=5ydmgoh`n{@1%*;{6wN`J|`I^^dpL_un5LuYdl!
Pd--~$kAI|_8-4i)^|wrX

diff --git a/EarlyBlue/global/gray-topright.gif b/EarlyBlue/global/gray-topright.gif
deleted file mode 100644
index 5cae57f457fc9dd1cf4fc8ee5c9fcbb4b95ecebc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 821
zcmc(eEs|DI3`Dz7PoWSLg+Nb@YXgiK#gCsUEFgLv%rYX`0eiq^Kj6a2-2~U=%e|e`
zo%enG{Ne4pZ<j9p8O@%ashP}p_=T!_x~4PjX>GH5s-`mKDec|#q$ZhoqJ8Qf*EnO3
zwc6@YjWY6x0&S$x;xV_ibM{nsy4|fEOI6jCE_Z1uXr?;pxTA&QuB)B4+k%m&t!ky^
z7E_@{3}`69qQ_vgkw%NhT0>iNQspYGKgLoe6<4%&p`huMT^8<v;%+G=m#{}3VDg$c
z@DBtIp+*d7D7gv;gV9DBEp2k!rsg=&28ln$QrWS{6}wQ-j2w|8NfQ8ETqkJU5+!+n
z$!p?(3Bx#q8Zn@G2^Jg-MjL7EiuN{bYL3_#LE?|GRF-yuXZ=fYHoE&fOIoOt`>yvy
zxr`^B-S#oO$j8Gj|6r|yGYM%v2ew3bcw*H5I=4G`{|oomD}A|Me0ruIPuJs{*Dt^R
R{QY$E{Qbk<U*GR__YYurPZt0H

diff --git a/EarlyBlue/global/groupbox.css b/EarlyBlue/global/groupbox.css
index eb7de482..6e82b2dd 100644
--- a/EarlyBlue/global/groupbox.css
+++ b/EarlyBlue/global/groupbox.css
@@ -37,14 +37,24 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-groupbox
-  {
-    border                : 2px groove #CCD0DD;
-    padding               : 7px !important;
-    margin                : 5px;
-  }
+/* ===== groupbox.css ==================================================
+  == Styles used by the XUL groupbox and related elements.
+  ======================================================================= */
 
-.groupbox-body
-  {
-    padding               : inherit;
-  }
+/* ::::: groupbox ::::: */
+
+groupbox {
+  margin: 5px;
+  border: 2px groove #CCD0DD;
+  padding: 5px;
+}
+
+.groupbox-body {
+  padding: inherit;
+}
+
+caption {
+  margin: 0px 6px 2px 6px;
+  padding: 0px 3px;
+  background-color: #CCD0DD; 
+}
diff --git a/EarlyBlue/global/error-icon.gif b/EarlyBlue/global/icons/alert-error.gif
similarity index 100%
rename from EarlyBlue/global/error-icon.gif
rename to EarlyBlue/global/icons/alert-error.gif
diff --git a/EarlyBlue/global/alert-icon.gif b/EarlyBlue/global/icons/alert-exclam.gif
similarity index 100%
rename from EarlyBlue/global/alert-icon.gif
rename to EarlyBlue/global/icons/alert-exclam.gif
diff --git a/EarlyBlue/global/message-icon.gif b/EarlyBlue/global/icons/alert-message.gif
similarity index 100%
rename from EarlyBlue/global/message-icon.gif
rename to EarlyBlue/global/icons/alert-message.gif
diff --git a/EarlyBlue/global/question-icon.gif b/EarlyBlue/global/icons/alert-question.gif
similarity index 100%
rename from EarlyBlue/global/question-icon.gif
rename to EarlyBlue/global/icons/alert-question.gif
diff --git a/EarlyBlue/global/closebox.gif b/EarlyBlue/global/icons/close-button.gif
similarity index 100%
rename from EarlyBlue/global/closebox.gif
rename to EarlyBlue/global/icons/close-button.gif
diff --git a/EarlyBlue/global/loading.gif b/EarlyBlue/global/icons/loading.gif
similarity index 100%
rename from EarlyBlue/global/loading.gif
rename to EarlyBlue/global/icons/loading.gif
diff --git a/EarlyBlue/global/print-disabled.gif b/EarlyBlue/global/icons/print-disabled.gif
similarity index 100%
rename from EarlyBlue/global/print-disabled.gif
rename to EarlyBlue/global/icons/print-disabled.gif
diff --git a/EarlyBlue/global/print.gif b/EarlyBlue/global/icons/print.gif
similarity index 100%
rename from EarlyBlue/global/print.gif
rename to EarlyBlue/global/icons/print.gif
diff --git a/EarlyBlue/global/return-disabled.gif b/EarlyBlue/global/icons/return-disabled.gif
similarity index 100%
rename from EarlyBlue/global/return-disabled.gif
rename to EarlyBlue/global/icons/return-disabled.gif
diff --git a/EarlyBlue/global/return.gif b/EarlyBlue/global/icons/return.gif
similarity index 100%
rename from EarlyBlue/global/return.gif
rename to EarlyBlue/global/icons/return.gif
diff --git a/EarlyBlue/navigator/stop-disabled.gif b/EarlyBlue/global/icons/stop-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/stop-disabled.gif
rename to EarlyBlue/global/icons/stop-disabled.gif
diff --git a/EarlyBlue/navigator/stop.gif b/EarlyBlue/global/icons/stop.gif
similarity index 100%
rename from EarlyBlue/navigator/stop.gif
rename to EarlyBlue/global/icons/stop.gif
diff --git a/EarlyBlue/messenger/trash-disabled.gif b/EarlyBlue/global/icons/trash-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/trash-disabled.gif
rename to EarlyBlue/global/icons/trash-disabled.gif
diff --git a/EarlyBlue/messenger/trash.gif b/EarlyBlue/global/icons/trash.gif
similarity index 100%
rename from EarlyBlue/messenger/trash.gif
rename to EarlyBlue/global/icons/trash.gif
diff --git a/EarlyBlue/global/lessCOls_dis.gif b/EarlyBlue/global/lessCOls_dis.gif
deleted file mode 100644
index 2452e7f311ad413336c8b07f6e276b86de9fa59d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 59
zcmZ?wbhEHb<Y3@nnE0RJ|Ns974jh;{b0z}=gW^vXMg|5(1|1+9D9gd%z{Jy2zli$<
N|K%X|8`9hi)&Mm}5f1<W

diff --git a/EarlyBlue/global/lessCols.gif b/EarlyBlue/global/lessCols.gif
deleted file mode 100644
index 65f985b6067ebc935b2920857533898f972ffe8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51
zcmZ?wbhEHb<Y3@nX!y@?;J^U}1_s5SEQ~;kK?g*DWE_~dTIv^ezwH-m-oU_M4FETH
B3{C(5

diff --git a/EarlyBlue/global/lessCols_mo.gif b/EarlyBlue/global/lessCols_mo.gif
deleted file mode 100644
index 2cb5b752f7b963a71d0466784ad66b6c96b9612e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51
zcmZ?wbhEHb<Y3@nX!y@?;J|^jw3&)OSr{3BKnFyCWE_~dTIv^ezwH-m-oU_M4FG1Y
B4YL3M

diff --git a/EarlyBlue/global/listbox.css b/EarlyBlue/global/listbox.css
new file mode 100644
index 00000000..b82a6c89
--- /dev/null
+++ b/EarlyBlue/global/listbox.css
@@ -0,0 +1,106 @@
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1998-2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Joe Hewitt (hewitt@netscape.com)
+ *   Robert Kaiser <KaiRo@KaiRo.at>
+ */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ===== listbox.css =======================================================
+  == Styles used by XUL listbox-related elements.
+  ======================================================================= */
+
+/* ::::: listbox ::::: */
+
+listbox {
+  margin: 2px 4px;
+  border: 1px inset #CCD0DD;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+listrows {
+}
+
+/* ::::: listitem ::::: */
+
+listitem {
+  border: 1px solid transparent;
+}
+
+listbox:focus > listitem[selected="true"][current="true"] {
+  border: 1px dotted #9999CC;
+}
+
+listitem[selected="true"] {
+  background-color: #808080;
+  color: #FFFFFF;
+}
+
+listbox:focus > listitem[selected="true"] {
+  background-color: #336699;
+  color: #FFFFFF;
+}
+
+/* ::::: listheader ::::: */
+
+listheader { 
+  -moz-box-align: center;
+  border: 1px outset #CCD0DD;
+  background-color: #CCD0DD;
+  color: #000000;
+  padding: 0 4px;
+}
+
+listheader[sortable="true"]:hover:active {
+  border: 1px outset #CCD0DD;
+  padding: 1px 4px 0 5px;
+}
+
+.listheader-icon {
+  margin-right: 2px;
+}
+
+.listheader-label {
+  margin: 0px !important;
+}
+
+/* ..... sort direction icon ..... */
+
+.listheader-sortdirection {
+  list-style-image: none;
+}
+
+.listheader-sortdirection[sortdirection="ascending"] {
+  list-style-image: url("chrome://global/skin/tree/sort-asc.gif");
+}
+
+.listheader-sortdirection[sortdirection="descending"] {
+  list-style-image: url("chrome://global/skin/tree/sort-desc.gif");
+}
+
+/* ::::: listcell ::::: */
+
+.listcell-label {
+  margin: 0px !important;
+  padding: 0px 0px 1px 4px;
+  white-space: nowrap;
+}
diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index ace400e5..a87cc546 100644
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/global/menu.css
@@ -37,231 +37,201 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-menu, menuitem  
-  {
-/*    font                  : menu; */
-    color                 : #000000;
-    list-style-image      : none;
-  }
-
-menuitem 
-  {
-    padding               : 0px !important; 
-    cursor                : default !important;    
-  }
-
-menu[disabled="true"], menuitem[disabled="true"],
+/* ===== menu.css =======================================================
+  == Styles used by XUL menu-related elements.
+  ======================================================================= */
+
+/* ::::: menu/menuitem ::::: */
+
+menu, 
+menuitem {
+  -moz-box-align: center;
+  color: #000000;
+  list-style-image: none;
+}
+
+menuitem[default="true"] {
+  font-weight: bold;
+}  
+
+menu[disabled="true"],
+menuitem[disabled="true"],
 menu[menuactive="true"][disabled="true"],
-menuitem[menuactive="true"][disabled="true"]
-  {
-	  color                 : #999999;
-  }
-
-menuitem[default="true"]
-  {
-    font-weight           : bold;
-  }  
-  
+menuitem[menuactive="true"][disabled="true"] {
+  color: #999999;
+}
+
+/* ..... internal content .... */
+
+.menu-text, 
+.menu-accel,
+.menu-iconic-left,
+.menu-iconic-text,
+.menu-iconic-accel {
+  margin: 0px 2px 0px 0px !important;
+  color: inherit;
+}
+
+.menu-text {
+  margin-left: 18px !important;
+  font-weight: inherit;
+}
+
+.menu-accel {
+  margin-left: 4px;
+  padding-right: 14px;
+}
+
+.menu-iconic-accel {
+  margin-left: 4px;
+  padding-right: 14px;
+}
+
+.menu-iconic-icon {
+  list-style-image: inherit;
+}
+
+.menu-iconic-left {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  width: 16px;
+/*  height: 16px; */
+}
+
+/* ..... menu arrow box ..... */
+
+.menu-right {
+  margin: 0px 0px 0px 3px;
+  width: 8px;
+  list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
+}
+
+.menu-right[menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-arrow-hover.gif");
+}
+
+.menu-right[disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-arrow-disabled.gif") !important;
+}
+
+/* ::::: menu/menuitems in menubar ::::: */
+
+menubar > menu {
+  padding: 2px 0px 2px 3px;
+  margin: 0px 2px 0px 0px;
+  border: 1px solid #CCD0DD;
+}
+
+menubar > menu[menuactive="true"] {
+  border: 1px outset #CCD0DD;
+}
+
+menubar > menu[menuactive="true"][open="true"] {
+  border: 1px inset #CCD0DD;
+}
+
+/* ..... internal content .... */
+
+.menubar-left {
+  margin: 0px 2px 0px 0px;
+  color: inherit;
+}
+
+.menubar-text {
+  margin: 0px 2px 0px 0px !important;
+  color: inherit;
+}
+
+/* ::::: menu/menuitems in popups ::::: */
+
 menupopup > menu,
-menupopup > menuitem,
 popup > menu,
-popup > menuitem
-  {
-    max-width             : 42em; /* should move to content */
-    margin                : 0px;
-  }
-
-menuseparator 
-  {
-    border                : 1px inset #CCD0DD; 
-    margin                : 2px 0px 2px 0px;
-    cursor                : default !important;
-  }
-
-menubar > menu 
-  {
-    padding               : 2px 0px 2px 3px;
-    margin                : 0px 2px 1px 0px;
-    border                : 1px solid #CCD0DD;
-  }
-
-menubar > menu[menuactive="true"] 
-  {
-    border                : 1px outset #CCD0DD;
-  }
-
-menubar > menu[menuactive="true"][open="true"] 
-  {
-    border                : 1px inset #CCD0DD;
-  }
+menupopup > menuitem,
+popup > menuitem {
+  padding: 2px;
+  max-width: 42em;
+}
 
 menupopup > menu[menuactive="true"],
 menupopup > menuitem[menuactive="true"],
 popup > menu[menuactive="true"],
-popup > menuitem[menuactive="true"]
-  {
-    background-color      : #336699;
-    color                 : #FFFFFF;
-  }
-
-/** 
- * Atomic sub-parts of standard menus
- **/
-.menu-right 
-  {
-    margin                : 0px 0px 0px 3px;
-    width                 : 8px;
-    list-style-image      : url("chrome://global/skin/menu-arrow.gif");
-  }
-
-.menu-iconic-left 
-  {
-    color                 : inherit;
-    margin                : 0px 4px 0px 3px;
-    width                 : 16px;
-    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;
-  }
-
-.menu-iconic-text
-  {
-    margin                : 2px 2px 2px 0px;
-  }
-
-.menu-text 
-  {
-    margin                : 2px 2px 2px 23px;
-  }
-
-.menu-accel 
-  {
-    margin                : 2px 14px 2px 6px;
-  }
-
-.menu-iconic-accel 
-  {
-    margin                : 2px 14px 2px 4px;
-  }
-
-.menubar-text 
-  {
-    color                 : inherit;
-    margin-right          : 2px;
-  }
-
-menuitem[checked="true"] 
-  {
-    list-style-image      : url("chrome://global/skin/menu-check.gif");
-  }
-
-menuitem[checked="true"][menuactive="true"]
-  {
-  	list-style-image	  : url("chrome://global/skin/menu-check-hover.gif");
-  }
-
-menuitem[checked="true"][disabled="true"] 
-  {
-    list-style-image      : url("chrome://global/skin/menu-check-disabled.gif");
-  }
-
-menuitem[checked="true"][type="radio"] 
-  {
-    list-style-image      : url("chrome://global/skin/menu-radio.gif");
-  }
-
-menuitem[checked="true"][type="radio"][disabled="true"] 
-  {
-    list-style-image      : url("chrome://global/skin/menu-radio-disabled.gif");
-  }
-
-menuitem[checked="true"][type="radio"][menuactive="true"] 
-  {
-    list-style-image      : url("chrome://global/skin/menu-radio-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");
-  }
-
-/* ::::: autocomplete menuitems ::::: */
-
-.autocomplete-history-popup > menuitem
-  {
-    max-width              : none !important;
-    font-size              : smaller;
-  }
-
-/* ::::: menu/menuitems in a menulist popup ::::: */
-
-  menulist > menupopup > menuitem,
-  menulist > menupopup > menu
-    {
-      border              : 1px solid transparent;
-      padding             : 0px 7px !important;
-      min-width           : 0px;  /* should be in content*/
-      max-width           : none; /* should be in content*/
-/*      font                : message-box;
-      color               : -moz-FieldText; */
-    }
-
-  menulist > menupopup > menuitem > .menu-iconic-accel,
-  menulist > menupopup > menuitem > .menu-accel,
-  menulist > menupopup > menuitem > .menu-text,
-  menulist > menupopup > menuitem > .menu-iconic-text,
-  menulist > menupopup > menu > .menu-text,
-  menulist > menupopup > menu > .menu-accel,
-  menulist > menupopup > menu > .menu-iconic-text,
-  menulist > menupopup > menu > .menu-iconic-accel
-    {
-      margin-top          : 0px;
-      margin-bottom       : 0px;
-    }
-
-  menulist > menupopup > menuitem[menuactive="true"]
-    {
-      border              : 1px dotted #F5DB95;
-    }
-
-  menulist > menupopup > menuitem > .menu-iconic-left,
-  menulist > menupopup > menuitem > .menu-iconic-left[menuactive="true"]
-    {
-      list-style-image    : inherit;
-      width               : 0px;
-      border              : none;
-    }
-/*
-  menulist > menupopup > menuseparator
-    {
-      border-top: none;
-      border-bottom: 1px solid WindowText;
-    }
-*/
-  
-/* ::::: tree column picker ::::: */
-
-  .treecell-popupcell-menu 
-    {
-      margin-left: -4px;
-      list-style-image: url("chrome://global/skin/columnselect.gif");
-    }
+popup > menuitem[menuactive="true"] {
+  background-color: #336699;
+  color: #FFFFFF;
+}
+
+/* ::::: menu/menuitems in menulist popups ::::: */
+
+.menulist-menupopup > menuitem,
+menulist > menupopup > menuitem,
+.menulist-menupopup > menu,
+menulist > menupopup > menu {
+  border: 1px solid transparent;
+  padding: 1px 16px 1px 5px;
+  max-width: none;
+/*  font-size: smaller;
+  color: -moz-FieldText */
+}
+
+.menulist-menupopup > menuitem > .menu-iconic-left,
+menulist > menupopup > menuitem > .menu-iconic-left,
+.menulist-menupopup > menu > .menu-iconic-left,
+menulist > menupopup > menu > .menu-iconic-left {
+  display: none;
+}
+
+menulist > menupopup > menuitem[menuactive="true"] {
+  border: 1px dotted #666699;
+}
+
+/* ::::: checkbox menuitem ::::: */
+
+menuitem[checked="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check.gif");
+}
+
+menuitem[checked="true"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
+}
+
+menuitem[checked="true"][menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-hover.gif");
+}
+
+/* ::::: radio menuitem ::::: */
+
+menuitem[checked="true"][type="radio"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio.gif");
+}
+
+menuitem[checked="true"][type="radio"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-disabled.gif");
+}
+
+menuitem[checked="true"][type="radio"][menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-hover.gif");
+}
+
+/* ::::: menuseparator ::::: */
+
+menuseparator {
+  border: 1px inset #CCD0DD; 
+  margin: 2px 0px 2px 0px;
+}
+
+menulist > menupopup > menuseparator,
+.menulist-menupopup > menuseparator {
+  border: 1px inset #CCD0DD; 
+  margin: 2px 0px 2px 0px;
+}
+
+/* ::::: autocomplete ::::: */
+
+.autocomplete-history-popup > menuitem {
+  max-width: none !important;
+}
+
+.treecell-popupcell-menu {
+  margin-left: -2px;
+  list-style-image: url("chrome://global/skin/columnselect.gif");
+}
diff --git a/EarlyBlue/global/menu-arrow-disabled.gif b/EarlyBlue/global/menu/menu-arrow-disabled.gif
similarity index 100%
rename from EarlyBlue/global/menu-arrow-disabled.gif
rename to EarlyBlue/global/menu/menu-arrow-disabled.gif
diff --git a/EarlyBlue/global/menu-arrow-hover.gif b/EarlyBlue/global/menu/menu-arrow-hover.gif
similarity index 100%
rename from EarlyBlue/global/menu-arrow-hover.gif
rename to EarlyBlue/global/menu/menu-arrow-hover.gif
diff --git a/EarlyBlue/global/menu-arrow.gif b/EarlyBlue/global/menu/menu-arrow.gif
similarity index 100%
rename from EarlyBlue/global/menu-arrow.gif
rename to EarlyBlue/global/menu/menu-arrow.gif
diff --git a/EarlyBlue/global/menu-check-disabled.gif b/EarlyBlue/global/menu/menu-check-disabled.gif
similarity index 100%
rename from EarlyBlue/global/menu-check-disabled.gif
rename to EarlyBlue/global/menu/menu-check-disabled.gif
diff --git a/EarlyBlue/global/menu-check-hover.gif b/EarlyBlue/global/menu/menu-check-hover.gif
similarity index 100%
rename from EarlyBlue/global/menu-check-hover.gif
rename to EarlyBlue/global/menu/menu-check-hover.gif
diff --git a/EarlyBlue/global/menu-check.gif b/EarlyBlue/global/menu/menu-check.gif
similarity index 100%
rename from EarlyBlue/global/menu-check.gif
rename to EarlyBlue/global/menu/menu-check.gif
diff --git a/EarlyBlue/global/menu-radio-disabled.gif b/EarlyBlue/global/menu/menu-radio-disabled.gif
similarity index 100%
rename from EarlyBlue/global/menu-radio-disabled.gif
rename to EarlyBlue/global/menu/menu-radio-disabled.gif
diff --git a/EarlyBlue/global/menu-radio-hover.gif b/EarlyBlue/global/menu/menu-radio-hover.gif
similarity index 100%
rename from EarlyBlue/global/menu-radio-hover.gif
rename to EarlyBlue/global/menu/menu-radio-hover.gif
diff --git a/EarlyBlue/global/menu-radio.gif b/EarlyBlue/global/menu/menu-radio.gif
similarity index 100%
rename from EarlyBlue/global/menu-radio.gif
rename to EarlyBlue/global/menu/menu-radio.gif
diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css
index a2f0dfc2..8b3df34b 100644
--- a/EarlyBlue/global/menulist.css
+++ b/EarlyBlue/global/menulist.css
@@ -38,148 +38,118 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 
-/* outer frame */
-  menulist 
-    {
-      border              : none;
-      background-color    : #CCCCCC;
-      color               : #000000;
-      margin              : 1px 5px 2px 5px;
-    }
-    
-  menulist[disabled="true"] > .menulist-internal-box > .menulist-display-box
-    {
-/*      background-color    : -moz-Dialog; */
-      color               : #999999;
-    }
-    
-/* icon display frame */
-  .menulist-internal-box
-    {
-/*      border              : 1px inset #CCD0DD; */
-      -moz-user-focus     : ignore;
-    }  
-
-  .menulist-display-box,
-  menulist[open="true"]:focus > .menulist-internal-box > .menulist-display-box
-    {
-      border              : 1px inset #CCD0DD;
-      margin              : 0px;
-      background-color    : #FFFFFF;
-      color               : #000000;
-    }     
-    
-  menulist:focus > .menulist-internal-box > .menulist-display-box
-    {
-/*      border              : 1px dotted #999999; */
-      background-color    : #336699;
-      color               : #000000;
-    }
-      
-/* text display frame */
-  .menulist-text 
-    {
-      padding             : 0px 2px 0px 2px;
-      margin              : 0px;
-    }
-    
-/* drop marker display frame */
-  .menulist-dropmarker-box-1
-    {
-      border              : 1px outset #CCD0DD;
-      background-color    : -moz-Dialog;
-    }
-  
-  .menulist-dropmarker-box-2
-    {
-      border              : none;
-      padding             : 2px 1px 2px 1px;
-    }
-
-  .menulist-dropmarker
-    {
-      list-style-image    : url("chrome://global/skin/scroll-down.gif");
-    }
-  
-  .menulist-dropmarker[disabled="true"]
-    {
-      list-style-image    : url("chrome://global/skin/scroll-down-disabled.gif");
-    }
-
-  menulist:hover:active > .menulist-internal-box > .menulist-dropmarker-box-1[open="true"]
-    { 
-      border              : 1px inset #CCD0DD;
-    }
-    
-  menulist:hover:active > .menulist-internal-box > .menulist-dropmarker-box-1 > .menulist-dropmarker-box-2[open="true"]
-    {
-      border              : none;
-      padding             : 3px 0px 1px 2px;
-    }
-
-/**
- * <menulist>s for things like mailnews addressing widget
- **/
- 
-  .menulist-compact
-    {
-      margin              : 0px;
-      border              : 1px outset #CCD0DD;
-/*      background-color    : -moz-Dialog; */
-      -moz-user-focus     : normal;  
-    }    
-    
-  .menulist-compact-internal-box
-    {
-      border              : none;
-    }
-    
-  .menulist-compact-dropmarker
-    {
-      list-style-image    : url("chrome://global/skin/scroll-down.gif");
-      margin-left         : 2px;
-    }
-    
-  .menulist-compact-text
-    {
-      margin-right        : 3px;
-    }  
-
-  .menulist-compact:hover:active,
-  .menulist-compact[open="true"]
-    {
-      border              : 1px inset #CCD0DD;
-/*      background-color    : ThreeDShadow;
-      color               : ThreeDHighlight; */
-    }
-
-  .menulist-compact:hover:active > .menulist-compact-internal-box,
-  .menulist-compact[open="true"] > .menulist-compact-internal-box 
-    {
-      border              : none;
-    }
-    
-/**
- * Editable menulists (comboboxes) 
- */
-  
-html|*.menulist-editable-text 
-  {
-    border              : none !important;
-    margin              : 0px;
-    padding             : 0px;
-    font                : inherit;
-    background-color    : inherit;
-    color               : inherit;
-  }
-
-menulist[editable="true"] > .menulist-internal-box > .menulist-display-box
-  {
-    margin                : 0px;
-    padding               : 1px 2px 1px 2px;
-  }
-
-menulist[editable="true"]:focus > .menulist-internal-box > .menulist-display-box
-  {
-    border                : none !important;
-  }
+/* ===== menulist.css ===================================================
+  == Styles used by the XUL menulist element.
+  ======================================================================= */
+
+/* :::::::::: menulist :::::::::: */
+
+menulist {
+  margin: 2px 4px;
+  border: 1px inset #CCD0DD;
+  background-color: #CCCCCC;
+  color: #000000;
+}
+
+.menulist-label-box {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+/*  margin: 1px; */
+}
+
+.menulist-label-box,
+menulist[open="true"]:focus > .menulist-label-box {
+/*  border: 1px inset #CCD0DD; */
+  background-color: transparent;
+  color: inherit;
+}
+
+.menulist-label {
+  margin: 1px 3px !important;
+}
+
+/* ..... dropmarker ..... */
+
+.menulist-dropmarker {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  min-width: 15px;
+  border: 1px outset #CCD0DD;
+  background-color: #CCCCCC;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
+.menulist-dropmarker,
+menulist[disabled="true"]:hover:active > .menulist-dropmarker {
+  padding: 1px;
+}
+
+menulist[disabled="true"] > .menulist-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
+}
+
+menulist:hover:active > .menulist-dropmarker {
+  border: 1px inset #CCD0DD;
+  padding: 2px 0px 0px 2px;
+}
+
+/* ..... focused state ..... */
+
+menulist:focus > .menulist-label-box {
+/*  border: 1px dotted #999999; */
+  background-color: #336699;
+  color: #000000;
+}
+
+/* ..... disabled state ..... */
+
+menulist[disabled="true"] {
+  background-color: #CCCCCC;
+  color: #999999;
+}
+
+/* ::::: editable menulists ::::: */
+
+.menulist-editable-box {
+  background-color: #FFFFFF;
+  padding: 2px; 
+}
+
+html|*.menulist-editable-input {
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+  background-color: #FFFFFF;
+  color: #000000;
+  font: inherit;
+}
+
+/* ::::: compact menulists ::::: */
+
+.menulist-compact {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0px;
+  border: 1px outset #CCD0DD;
+/*  background-color: -moz-Dialog;
+  color: -moz-DialogText; */
+}
+
+.menulist-compact > .menulist-label {
+  margin: 0 3px !important;
+  text-align: right;
+}  
+
+.menulist-compact > .menulist-dropmarker {
+  margin-left: 2px;
+  border: none;
+  padding: 0 !important;
+  background: transparent;
+}
+
+.menulist-compact[open="true"] {
+  border: 1px inset #CCD0DD;
+/*  background-color: ThreeDShadow;
+  color: ThreeDHighlight; */
+}
+
diff --git a/EarlyBlue/global/menulistBindings.xml b/EarlyBlue/global/menulistBindings.xml
deleted file mode 100644
index 8ea276c5..00000000
--- a/EarlyBlue/global/menulistBindings.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="menulistBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:html="http://www.w3.org/1999/xhtml"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="menulist"
-           extends="chrome://global/content/bindings/menulist.xml#menulist">
-    <content>
-      <xul:hbox class="menulist-internal-box" flex="1">
-        <xul:hbox class="menulist-display-box" flex="1" align="center">
-          <xul:image class="menulist-icon" inherits="src"/>
-          <xul:label class="menulist-text" inherits="value=label,crop,accesskey" crop="right" flex="1"/>
-        </xul:hbox>
-        <xul:hbox class="menulist-dropmarker-box-1" inherits="open">
-          <xul:hbox class="menulist-dropmarker-box-2" flex="1" align="center" pack="center" inherits="open">
-            <xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:hbox>
-        </xul:hbox>
-      </xul:hbox>
-    <children includes="menupopup"/>
-    </content>
-  </binding>
-
-  <binding id="menulist-editable"
-           extends="chrome://global/content/bindings/menulist.xml#menulist-editable">
-    <content>
-      <xul:hbox class="menulist-internal-box" flex="1">
-        <xul:hbox class="menulist-display-box" flex="1" align="center">
-          <xul:image class="menulist-icon" inherits="src"/>
-          <html:input type="text" class="menulist-editable-text" inherits="value=label,accesskey" flex="1"/>
-        </xul:hbox>
-        <xul:hbox class="menulist-dropmarker-box-1" valign="middle" inherits="open">
-          <xul:hbox class="menulist-dropmarker-box-2" flex="1" align="center" pack="center" inherits="open">
-            <xul:image class="menulist-dropmarker" inherits="disabled"/>
-          </xul:hbox>
-        </xul:hbox>
-      </xul:hbox>
-    <children includes="menupopup"/>
-    </content>
-  </binding>
-  
-  <binding id="menulistpopup"
-           extends="chrome://global/content/bindings/popup.xml#popup">
-    <content>
-      <xul:vbox class="menulistpopup-internal-box" flex="1" style="overflow: auto">
-        <children/>
-      </xul:vbox>
-    </content>
-  </binding>
-   
-  <binding id="menulist-compact" extends="chrome://global/content/bindings/menulist.xml#menulist">
-    <content>
-      <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
-        <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
-        <xul:spacer flex="1"/>
-        <xul:label class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
-      </xul:hbox>
-    <children includes="menupopup"/>
-    </content>
-  </binding>
-
-</bindings>
diff --git a/EarlyBlue/global/outliner.css b/EarlyBlue/global/outliner.css
index 2ca9a576..324a0e7f 100644
--- a/EarlyBlue/global/outliner.css
+++ b/EarlyBlue/global/outliner.css
@@ -37,185 +37,203 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/******** Outliner widget **********/
+/* ===== outliner.css ===================================================
+  == Styles used by the XUL outline element.
+  ======================================================================= */
 
-/** basic outliner ****************************************************
- *  basic outliner widget for use in main windows where no decoration
- *  is required.
- **/
+/* ::::: outliner ::::: */
 
 outliner {
-  border-spacing        : 0px;     
-  border                : none;
-  background-color      : #FFFFFF;
-  color                 : #000000;   
+  border-spacing: 0px;     
+  border: none;
+  background-color: #FFFFFF;
+  color: #000000;   
 }
 
-outliner.inset {
-  border: 1px inset #CCD0DD;
-}
-
-outlinerbody {
-  -moz-user-select: none;
-}
+/* ::::: outliner rows ::::: */
 
-outlinerbody:-moz-outliner-row {
-  height: 18px;
+outlinerchildren:-moz-outliner-row {
   border: 1px solid transparent;
+  height: 18px;
 }
 
-outlinerbody:-moz-outliner-row(selected) {
+outlinerchildren:-moz-outliner-row(selected) {
   background-color: #808080;
 }
 
-outliner:focus > outlinerbody:-moz-outliner-row(selected, focus) {
+outlinerchildren:-moz-outliner-row(selected, focus) {
   background-color: #336699;
 }
 
-outlinerbody:-moz-outliner-row(current, focus) {
+outlinerchildren:-moz-outliner-row(current, focus) {
   border: 1px dotted #9999CC;
 }
 
-outlinerbody:-moz-outliner-cell {
-  padding: 0px 0px 1px 2px;
+/* ::::: outliner cells ::::: */
+
+outlinerchildren:-moz-outliner-cell {
+  padding: 0px 2px 0px 2px;
 }
 
-outlinerbody:-moz-outliner-cell-text {
+outlinerchildren:-moz-outliner-cell-text {
   color: inherit;
+  border: 2px solid transparent;
 }
 
-/*
-outlinerbody:-moz-outliner-cell-text(selected) {
-  color: #000000;
+outlinerchildren:-moz-outliner-cell-text(selected) {
+  color: #FFFFFF;
 }
 
-outlinerbody:-moz-outliner-cell-text(selected, focus) {
-  color: #000000;
+outlinerchildren:-moz-outliner-cell-text(selected, focus) {
+  color: #FFFFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(primary) {
+  border: 2px solid transparent;
+}
+
+outlinerchildren:-moz-outliner-cell-text(primary, drop) {
+  background-color: #336699;
+  color: #FFFFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(primary, dropBefore) {
+  border-top: 2px solid #000000;
+}
+
+outlinerchildren:-moz-outliner-cell-text(selected, primary, dropBefore) {
+  border-top: 2px solid #000000;
+}
+
+outlinerchildren:-moz-outliner-cell-text(primary, dropAfter) {
+  border-bottom: 2px solid #000000;
 }
-*/
 
-outlinerbody:-moz-outliner-line {
+outlinerchildren:-moz-outliner-cell-text(selected, primary, dropAfter) {
+  border-bottom: 2px solid #000000;
+}
+
+
+/* ::::: lines connecting cells ::::: */
+
+outlinerchildren:-moz-outliner-line {
+  visibility: hidden;
+}
+
+/*
+outlinerchildren:-moz-outliner-line {
   border: 1px dotted grey;
 }
 
-outlinerbody:-moz-outliner-line(selected) {
+outlinerchildren:-moz-outliner-line(selected, focus) {
   border: 1px dotted black;
 }
+*/
 
-outlinerbody:-moz-outliner-separator {
+outlinerchildren:-moz-outliner-separator {
   border: 1px outset #CCD0DD;
 }
 
+/* ::::: outliner columns ::::: */
+
 outlinercol { 
-/*  border: 1px solid #666699; */
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border: 1px outset #CCD0DD;
   background-color: #CCD0DD;
-  color: black;
+  color: #000000;
+  padding: 1px 4px;
 }
 
-.outlinercol-box,
-.outlinercol-image-box {
-  border: 1px outset #CCD0DD;
-}  
-
-.outlinercol-box {
-  padding: 0px 4px;
+outlinercolpicker { 
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border: 1px solid transparent;
+  background-color: #CCD0DD;
+  padding: 1px 0px;
 }
 
-.outlinercol-image-box {
-  padding: 0px 1px;
+.outlinercol-image {
+  padding: 1px;
 }
   
+.outlinercol-text {
+  margin: 0px !important;
+  padding: 0px !important;
+}
+
+/* ..... internal box ..... */
+
 outlinercol:hover:active {
   border: 1px solid #666699;
+  padding: 2px 3px 0px 5px;
 }
 
-outlinercol:hover:active > .outlinercol-box,
-outlinercol:hover:active > .outlinercol-image-box {
-  border-top: 1px solid transparent;
-  border-right: none;
-  border-bottom: none;
-  border-left: 1px solid transparent;
-}
-  
-outlinercol:hover:active > .outlinercol-box {
-  padding: 1px 4px 0px 5px;
+outlinercolpicker:hover:active {
+  border: 1px solid #666699;
 }
 
-outlinercol:hover:active > .outlinercol-image-box {
-  padding: 1px 1px 0px 2px;
+.outlinercol-image:hover:active {
+  padding: 2px 0px 0px 2px;
 }
 
-/* column drag and drop styles */
+/* ::::: column drag and drop styles ::::: */
 
 outlinercol[dragging="true"] {
-/*  border: 1px solid ThreeDDarkShadow; */
+  border: 1px solid transparent;
   background-color: #336699;
   color: #000000;
 }
 
-outlinercol[dragging="true"] > .outlinercol-box {
-  border: 1px solid transparent;
-}
-
 outlinercol[insertafter="true"] {
-/*  border-right: 1px solid #000000; */
-}
-
-outlinercol[insertafter="true"] > .outlinercol-box {
   border-right: 1px solid #000000;
 }
 
 outlinercol[insertbefore="true"] {
-/*  border-left: 1px solid #000000; */
-}
-
-outlinercol[insertbefore="true"] > .outlinercol-box {
   border-left: 1px solid #000000;
 }
 
-outlinerbody:-moz-outliner-column(insertbefore) {
+outlinerchildren:-moz-outliner-column(insertbefore) {
   border-left: 1px solid #000000;
 }
 
-outlinerbody:-moz-outliner-column(insertafter) {
+outlinerchildren:-moz-outliner-column(insertafter) {
   border-right: 1px solid #000000;
 }
 
-/* outliner header with sort direction indicators */
+/* ::::: sort direction indicator :::::  */
 
 .outlinercol-sortdirection {
   list-style-image: none;
 }
 
-.sortDirectionIndicator[sortDirection="ascending"] > .outlinercol-box > .outlinercol-sortdirection {
-  list-style-image: url("chrome://global/skin/sortAscending.gif");
+.sortDirectionIndicator[sortDirection="ascending"] .outlinercol-sortdirection {
+  list-style-image: url("chrome://global/skin/tree/sort-asc.gif");
 }
 
-.sortDirectionIndicator[sortDirection="descending"] > .outlinercol-box > .outlinercol-sortdirection {
-  list-style-image: url("chrome://global/skin/sortDescending.gif");
+.sortDirectionIndicator[sortDirection="descending"] .outlinercol-sortdirection {
+  list-style-image: url("chrome://global/skin/tree/sort-desc.gif");
 }
 
-.outliner-colpicker-icon
-{
-  list-style-image: url("chrome://global/skin/columnselect.gif");
+/* ::::: column picker :::::  */
+
+.outliner-columnpicker-icon {
+  list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
 }
 
-/* twisty rules */
-outlinerbody:-moz-outliner-twisty {
+/* ::::: twisty :::::  */
+
+outlinerchildren:-moz-outliner-twisty {
   padding-right: 2px;
   width: 12px; /* The image's width is 12 pixels */
-  list-style-image: url("chrome://global/skin/twisty-closed.gif");
+  list-style-image: url("chrome://global/skin/tree/twisty-closed.gif");
 }
   
-outlinerbody:-moz-outliner-twisty(open) {
+outlinerchildren:-moz-outliner-twisty(open) {
   width: 12px; /* The image's width is 12 pixels */
-  list-style-image: url("chrome://global/skin/twisty-open.gif");
+  list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
 }
 
-outlinerbody:-moz-outliner-indentation {
-  width: 16px;
-}
-
-.outlinercol-text {
-   margin: 0px;
+outlinerchildren:-moz-outliner-indentation {
+  width: 10px;
 }
diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css
index 608a8b9f..3891fcba 100644
--- a/EarlyBlue/global/popup.css
+++ b/EarlyBlue/global/popup.css
@@ -37,53 +37,45 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-menupopup, popup
-  {
-    /* DON'T DELETE.  Removes disappearance of scrollbars
-     * in content pane when window is made smaller.
-     * Talk to evaughan@netscape.com for details.
-     */
-    min-width             : 1px;
-    background-color      : #CCD0DD;
-  }
+/* ===== popup.css ======================================================
+  == Styles used by XUL popups.
+  ======================================================================= */
 
-/* XXX menupopups have to have a color explicitly specified. this is a bug */
-menupopup, popup 
-  {
-    border                : 1px outset #CCD0DD;
-  }
+/* ::::: menupopup ::::: */
 
-.popup-internal-box
-  {
-    padding               : 1px;
-  }  
-  
-/** Tooltips (tooltip <popup> element is deprecated! Use <tooltip> instead!)
- *  class="tooltip"
- **/
-.tooltip, tooltip
-  {
-    background-color      : #FFFFCC;
-    border                : 1px outset #FFFFCC;
-    color                 : #000000;
-    font                  : smaller;
-    padding               : 2px;
-    max-width             : 40em;
-  }
+menupopup,
+popup {
+  border: 1px outset #CCD0DD;
+  padding: 1px;
+  min-width: 1px;
+  background-color: #CCD0DD;
+}
 
-.tooltip > .popup-internal-box,
-tooltip > .popup-internal-box
-  {
-  	border                : 0px;
-  	padding               : 0px;
-  }
+tooltip {
+  background-color : #FFFFCC;
+  border : 1px outset #FFFFCC;
+  color: #000000;
+  font: smaller;
+  padding: 2px;
+  max-width: 40em;
+}
+
+.tooltip-label {
+  border: 0px;
+  padding: 0px;
+}
+
+tooltip[titletip="true"] {
+  margin: -2px 0px 0px -3px;
+  max-width: none;
+}
 
 /* rules for popups associated with menulists */
 
-  menulist > menupopup,
-  .menulist-menupopup
-    {
-      border              : 1px solid #666699;
-      min-width           : 0px;
-      background-color    : white;
-    }
+menulist > menupopup,
+.menulist-menupopup {
+  border: 1px solid #666699;
+  min-width: 0px;
+  padding: 0px;
+  background-color: white;
+}
diff --git a/EarlyBlue/global/progressmeter.css b/EarlyBlue/global/progressmeter.css
index fe9eaf63..0aa388de 100644
--- a/EarlyBlue/global/progressmeter.css
+++ b/EarlyBlue/global/progressmeter.css
@@ -37,63 +37,39 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/** 
- * XUL <progressmeter> 
- **/
-  progressmeter[mode="undetermined"] > .progressmeter-internal-box
-    {
-      background-image    : url(chrome://global/skin/progressmeter-busy.gif);
-      background-color    : #CCD0DD;
-    }
- 
-  progressmeter[mode="undetermined"] > .progressmeter-internal-box > .progressmeter-stack > .progressmeter-progressbar 
-    {
-      visibility          : collapse;
-    }
-
-  progressmeter
-    {
-      min-width           : 100px;
-      min-height          : 16px;
-      border              : 1px inset #CCD0DD;
-      background-color    : #999999;
-    }
+/* ===== progressmeter.css ==============================================
+  == Styles used by the XUL progressmeter element.
+  ======================================================================= */
 
-  .progressmeter-statusbar 
-    {
-      border              : 1px solid #CCD0DD;
-      background-color    : #666699;
-      margin              : 0px 2px 0px 2px;
-    }
+/* ::::: progressmeter ::::: */
 
-  .progressmeter-statusbar > .progressmeter-internal-box
-    {
-      background-color    : #666699;
-    }
+progressmeter {
+  margin: 2px 4px;
+  border: 1px inset #CCD0DD;
+  background-color: #999999;
+  min-width: 128px;
+  height: 15px;
+}
 
-  .progress-text 
-    {
-      visibility          : collapse;
-    }    
-
-  .progressmeter-internal-box
-    {
-/*      border              : 1px solid -moz-Dialog; */
-      padding             : 1px;
-    }
-  
-  .progressmeter-inset  
-    {
-      margin              : 1px 5px 2px 5px;
-    }
-  
-  .progressmeter-inset > .progressmeter-internal-box 
-    {
-    }
+progressmeter[mode="undetermined"] {
+  background-image: url("chrome://global/skin/progressmeter/progressmeter-busy.gif");
+  background-color: #CCD0DD;
+}
+ 
+.progress-bar {
+  min-width: 0px;
+  background-color: #6699CC;
+}
 
-/* progress indicators */
-  .progress-bar 
-    {
-	    background-color    : #6699CC;
-    }
+.progress-bar[mode="undetermined"],
+.progress-remainder[mode="undetermined"] {
+  visibility: collapsed;
+}
 
+/* ::::: statusbar progressmeter ::::: */
+.progressmeter-statusbar {
+  margin: 0px 2px 0px 2px;
+  border: 1px solid #CCD0DD;
+  background-color: #666699;
+  min-width: 100px;
+}
diff --git a/EarlyBlue/global/progressmeter-busy.gif b/EarlyBlue/global/progressmeter/progressmeter-busy.gif
similarity index 100%
rename from EarlyBlue/global/progressmeter-busy.gif
rename to EarlyBlue/global/progressmeter/progressmeter-busy.gif
diff --git a/EarlyBlue/global/radio.css b/EarlyBlue/global/radio.css
index eae0b8bf..e8a5a901 100644
--- a/EarlyBlue/global/radio.css
+++ b/EarlyBlue/global/radio.css
@@ -37,96 +37,78 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* stylesheet for XUL <radio> element */
-
-/* default radio for dialogs */
-/* outer frame */
-  radio 
-    {
-      margin              : 3px 5px 3px 5px;
-    }
-
-  .radio-checkmark-box-1
-    {
-      border: 2px outset #CCD0DD;
-      -moz-border-radius  : 50%;
-      margin              : 0px 2px 0px 0px;
-      width               : 12px;
-      height              : 12px;
-    }
-
-  .radio-checkmark-box-1[disabled="true"]
-    {
-      background-color    : -moz-Dialog;
-    }
-
-  .radio-checkmark-box-2
-    {
-      -moz-border-radius  : 50%;
-      padding             : 1px;
-      width               : 11px;
-      height              : 11px;
-    }  
-
-  /* ensure that no list-style-image is inherited in from the Outside */
-  .radio-check
-    {
-      list-style-image    : none;
-    }
-
-  .radio-check[selected="true"]
-    {
-      list-style-image    : url(chrome://global/skin/check-radio.gif);
-    }
-  
-  .radio-check[selected="true"][disabled="true"]
-    {
-      list-style-image    : url(chrome://global/skin/check-radio-disabled.gif);
-    }
-
-  radio:hover:active > .radio-internal-box > .radio-checkmark-box-1
-    {
-      border: 2px inset #CCD0DD;
-    }
-
-  radio[disabled="true"] > .radio-internal-box > .radio-checkmark-box-1,
-  radio[disabled="true"]:active > .radio-internal-box > .radio-checkmark-box-1 
-    {
-      border: 2px outset #CCD0DD;
-    }
-
-/* text/icon frames */
-  .radio-text
-    {
-      margin              : 0px 0px 0px 2px;
-    }
-
-  .radio-icon 
-    {
-      list-style-image    : inherit;
-    }    
-
-  .radio-text
-    {
-      margin              : 0px !important;
-    }
-    
-  .radio-text[disabled="true"]
-    {
-      color               : #999999;
-    }
-  
-  radio[focused="true"] > .radio-internal-box > .radio-text-container
-    { 
-      border              : 1px dotted #9999CC;
-    }
+/* ===== radio.css ===================================================
+  == Styles used by the XUL radio element.
+  ======================================================================= */
+
+/* ::::: radio ::::: */
+
+radio {
+  -moz-box-align: center;
+  margin: 2px 4px;
+  padding: 1px 2px 1px 4px;
+}
+
+.radio-label-box {
+  margin-left: 2px;
+  border: 1px solid transparent;
+  padding: 0px 0px 1px 1px;
+}
+
+.radio-icon {
+  margin-right: 2px;
+}
+
+.radio-label {
+  margin: 0px !important;
+}
+
+/* ..... focused state ..... */
+
+radio[focused="true"] > .radio-label-box { 
+  border: 1px dotted #9999CC;
+}
+
+/* ..... disabled state ..... */
+
+
+radio[disabled="true"] {
+  color: #999999;
+}
   
-  .radio-text-container
-    {
-      border              : 1px solid transparent;
-    }
+/* ::::: checkmark image ::::: */
+
+.radio-check-box1 {
+  margin: 1px 0px;
+  border: 2px outset #CCD0DD;
+  -moz-border-radius: 50%;
+  width: 12px;
+  height: 12px;
+  background-color: transparent;
+}
+
+.radio-check-box2 {
+  -moz-border-radius: 50%;
+  padding: 1px;
+  width: 4px;
+  height: 4px;
+  list-style-image: none;
+}  
+
+radio:hover:active > .radio-check-box1 {
+  border: 2px inset #CCD0DD;
+}
+
+radio[disabled="true"]:hover:active .radio-check-box1 {
+  border: 2px outset #CCD0DD;
+}
+
+/* ..... selected state ..... */
+
+radio[selected="true"] > .radio-check-box1 > .radio-check-box2 {
+  list-style-image: url("chrome://global/skin/radio/radio-check.gif");
+}
   
-  .radio-internal-box
-    {
-      -moz-user-focus     : ignore;
-    }
+radio[selected="true"][disabled="true"] > .radio-check-box1 {
+  list-style-image: url("chrome://global/skin/radio/radio-check-disabled.gif") !important
+}
diff --git a/EarlyBlue/global/check-radio-disabled.gif b/EarlyBlue/global/radio/radio-check-disabled.gif
similarity index 100%
rename from EarlyBlue/global/check-radio-disabled.gif
rename to EarlyBlue/global/radio/radio-check-disabled.gif
diff --git a/EarlyBlue/global/check-radio.gif b/EarlyBlue/global/radio/radio-check.gif
similarity index 100%
rename from EarlyBlue/global/check-radio.gif
rename to EarlyBlue/global/radio/radio-check.gif
diff --git a/EarlyBlue/global/scroll-down.gif b/EarlyBlue/global/scroll-down.gif
deleted file mode 100755
index 62edbfd4fe314be23d79cfa20ce2f78ef0ad0125..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 56
zcmZ?wbhEHb<YwSzX!y@?;J^U}1_s5SEQ~;kK?g*DWE`0ITl!auzumZ~aMP_{4=!C7
HVXy`Ol9CY;

diff --git a/EarlyBlue/global/scroll-down-disabled.gif b/EarlyBlue/global/scrollbar/button-down-disabled.gif
similarity index 100%
rename from EarlyBlue/global/scroll-down-disabled.gif
rename to EarlyBlue/global/scrollbar/button-down-disabled.gif
diff --git a/EarlyBlue/global/dropmarker-down-on.gif b/EarlyBlue/global/scrollbar/button-down.gif
similarity index 100%
rename from EarlyBlue/global/dropmarker-down-on.gif
rename to EarlyBlue/global/scrollbar/button-down.gif
diff --git a/EarlyBlue/global/scroll-left-disabled.gif b/EarlyBlue/global/scrollbar/button-left-disabled.gif
similarity index 100%
rename from EarlyBlue/global/scroll-left-disabled.gif
rename to EarlyBlue/global/scrollbar/button-left-disabled.gif
diff --git a/EarlyBlue/global/scroll-left.gif b/EarlyBlue/global/scrollbar/button-left.gif
similarity index 100%
rename from EarlyBlue/global/scroll-left.gif
rename to EarlyBlue/global/scrollbar/button-left.gif
diff --git a/EarlyBlue/global/scroll-right-disabled.gif b/EarlyBlue/global/scrollbar/button-right-disabled.gif
similarity index 100%
rename from EarlyBlue/global/scroll-right-disabled.gif
rename to EarlyBlue/global/scrollbar/button-right-disabled.gif
diff --git a/EarlyBlue/global/scroll-right.gif b/EarlyBlue/global/scrollbar/button-right.gif
similarity index 100%
rename from EarlyBlue/global/scroll-right.gif
rename to EarlyBlue/global/scrollbar/button-right.gif
diff --git a/EarlyBlue/global/scroll-up-disabled.gif b/EarlyBlue/global/scrollbar/button-up-disabled.gif
similarity index 100%
rename from EarlyBlue/global/scroll-up-disabled.gif
rename to EarlyBlue/global/scrollbar/button-up-disabled.gif
diff --git a/EarlyBlue/global/scroll-up.gif b/EarlyBlue/global/scrollbar/button-up.gif
similarity index 100%
rename from EarlyBlue/global/scroll-up.gif
rename to EarlyBlue/global/scrollbar/button-up.gif
diff --git a/EarlyBlue/global/scroll-thumb-horiz-disabled.gif b/EarlyBlue/global/scrollbar/thumb-horiz-grip-disabled.gif
similarity index 100%
rename from EarlyBlue/global/scroll-thumb-horiz-disabled.gif
rename to EarlyBlue/global/scrollbar/thumb-horiz-grip-disabled.gif
diff --git a/EarlyBlue/global/scroll-thumb-horiz.gif b/EarlyBlue/global/scrollbar/thumb-horiz-grip.gif
similarity index 100%
rename from EarlyBlue/global/scroll-thumb-horiz.gif
rename to EarlyBlue/global/scrollbar/thumb-horiz-grip.gif
diff --git a/EarlyBlue/global/scroll-thumb-vert-disabled.gif b/EarlyBlue/global/scrollbar/thumb-vert-grip-disabled.gif
similarity index 100%
rename from EarlyBlue/global/scroll-thumb-vert-disabled.gif
rename to EarlyBlue/global/scrollbar/thumb-vert-grip-disabled.gif
diff --git a/EarlyBlue/global/scroll-thumb-vert.gif b/EarlyBlue/global/scrollbar/thumb-vert-grip.gif
similarity index 100%
rename from EarlyBlue/global/scroll-thumb-vert.gif
rename to EarlyBlue/global/scrollbar/thumb-vert-grip.gif
diff --git a/EarlyBlue/global/scrollbarBindings.xml b/EarlyBlue/global/scrollbarBindings.xml
deleted file mode 100644
index 8c024acc..00000000
--- a/EarlyBlue/global/scrollbarBindings.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE window [
-<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
-%textcontextDTD;
-]>
-
-<bindings id="scrollbarBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:html="http://www.w3.org/1999/xhtml"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  
-  <binding id="thumbv" extends="xul:vbox">
-    <content>
-      <xul:image inherits="src"/>
-    </content>
-  </binding>
-
-  <binding id="thumbh" extends="xul:hbox">
-    <content>
-      <xul:image inherits="src"/>
-    </content>
-  </binding>
-
-  <binding id="scrollbar" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">
-    <content>
-      <xul:scrollbarbutton type="decrement" inherits="sborient=orient"/>
-      <xul:slider flex="1" inherits="curpos,maxpos,pageincrement,increment">
-        <xul:thumb inherits="align,src" flex="1"/>
-      </xul:slider>
-      <xul:scrollbarbutton type="increment" inherits="sborient=orient"/>
-    </content>
-  </binding>
-
-  <binding id="scrollbarbutton" extends="chrome://global/content/bindings/scrollbar.xml#scrollbarbutton">
-    <content>
-      <xul:box class="scrollbarbutton-box" flex="1">
-        <xul:image class="scrollbarbutton-icon" inherits="src"/>
-      </xul:box>
-    </content>
-  </binding>
-
-
-</bindings>
diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css
index 300853f8..cc59ec08 100644
--- a/EarlyBlue/global/scrollbars.css
+++ b/EarlyBlue/global/scrollbars.css
@@ -37,112 +37,104 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/********* XP Scrollbar *********/
-
-scrollbar 
-  {
-    -moz-binding          : url("chrome://global/skin/scrollbarBindings.xml#scrollbar"); 
-    cursor                : default;
-  }
-  
-/********* XP Scrollbar *********/
-
-thumb 
-  {
-    -moz-binding          : url("chrome://global/skin/scrollbarBindings.xml#thumbh");
-    background-color      : #CCCCCC;
-    border                : 1px outset #CCCCCC;
-    list-style-image      : url("chrome://global/skin/scroll-thumb-horiz.gif");
-    -moz-box-pack         : center;
-    -moz-box-align        : center;
-  }
+/* ===== scrollbars.css =================================================
+  == Styles used by XUL scrollbar-related elements.
+  ======================================================================= */
 
-thumb[disabled="true"] {
-    list-style-image      : url("chrome://global/skin/scroll-thumb-horiz-disabled.gif");
+/* ::::: scrollbar ::::: */
+
+scrollbar {
+  -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
+  cursor: default;
+  background-color: #999999;
+}
+
+/* ::::: slider ::::: */
+
+slider {
+  height: 13px;
 }
 
-scrollbar[orient="vertical"] > slider > thumb {
-    -moz-binding          : url("chrome://global/skin/scrollbarBindings.xml#thumbv"); 
-    list-style-image      : url("chrome://global/skin/scroll-thumb-vert.gif")
+slider[orient="vertical"] {
+  width: 13px;
 }
 
-scrollbar[orient="vertical"] > slider > thumb[disabled="true"] {
-    list-style-image      : url("chrome://global/skin/scroll-thumb-vert-disabled.gif")
+/* ::::: borders for thumb and buttons ::::: */
+
+thumb,
+scrollbarbutton {
+  border: 1px outset #CCCCCC;
+  background: #CCCCCC 50% 50% no-repeat;
+  padding: 1px;
+  min-width: 13px;
+  min-height: 13px;
 }
 
 thumb:active {
-   background-color: #DDDDDD;
-}
-
-  
-/**
- * Scrollbar button
- **/  
-scrollbarbutton 
-  {
-    -moz-binding          : url("chrome://global/skin/scrollbarBindings.xml#scrollbarbutton"); 
-    border                : 1px outset white;
-    background-color      : #CCCCCC;
-  }
-
-.scrollbarbutton-box
-  {
-    padding               : 1px;
-  }   
-
-scrollbarbutton:hover:active 
-  {
-    border-style          : inset;
-  }
-  
-scrollbarbutton:hover:active > .scrollbarbutton-box
-  {
-    padding               : 2px 0px 0px 2px;
-  }   
-
-scrollbarbutton[type="decrement"] 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-left.gif")
-  }
-
-scrollbarbutton[type="decrement"][disabled="true"] 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-left-disabled.gif") 
-  }
-
-scrollbarbutton[type="increment"] 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-right.gif")
-  }
-
-
-scrollbarbutton[type="increment"][disabled="true"] 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-right-disabled.gif") 
-  }
-
-
-scrollbarbutton[type="decrement"][sborient="vertical"]
-  {
-    list-style-image      : url("chrome://global/skin/scroll-up.gif")
-  }
-
-scrollbarbutton[type="decrement"][disabled="true"][sborient="vertical"]
-  {
-    list-style-image      : url("chrome://global/skin/scroll-up-disabled.gif") 
-  }
-
-scrollbarbutton[type="increment"][sborient="vertical"]
-  {
-    list-style-image      : url("chrome://global/skin/scroll-down.gif")
-  }
-
-scrollbarbutton[type="increment"][disabled="true"][sborient="vertical"]
-  {
-    list-style-image      : url("chrome://global/skin/scroll-down-disabled.gif") 
-  }
-
-slider 
-  {
-    background-color      : #999999;
-  }
+  background-color: #DDDDDD;
+}
+
+/* ::::: thumb (horizontal) ::::: */
+
+thumb {
+  background-image: url("chrome://global/skin/scrollbar/thumb-vert-grip.gif");
+}
+
+thumb[orient="horizontal"] {
+  background-image: url("chrome://global/skin/scrollbar/thumb-horiz-grip.gif");
+}
+
+thumb[disabled="true"] {
+  background-image: url("chrome://global/skin/scrollbar/thumb-vert-grip-disabled.gif");
+}
+
+thumb[orient="horizontal"][disabled="true"] {
+  background-image: url("chrome://global/skin/scrollbar/thumb-horiz-grip-disabled.gif");
+}
+
+/* ::::: scrollbar button ::::: */
+
+scrollbarbutton {
+}
+
+scrollbarbutton:hover:active {
+  border-style: inset;
+  padding: 2px 0px 0px 2px;
+}   
+
+/* ..... increment .... */
+
+scrollbarbutton[type="increment"] {
+  background-image: url("chrome://global/skin/scrollbar/button-right.gif")
+}
+
+
+scrollbarbutton[type="increment"][disabled="true"] {
+  background-image: url("chrome://global/skin/scrollbar/button-right-disabled.gif") 
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
+  background-image: url("chrome://global/skin/scrollbar/button-down.gif")
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] {
+  background-image: url("chrome://global/skin/scrollbar/button-down-disabled.gif")
+}
+
+/* ..... decrement .... */
+
+scrollbarbutton[type="decrement"] {
+  background-image: url("chrome://global/skin/scrollbar/button-left.gif")
+}
+
+scrollbarbutton[type="decrement"][disabled="true"] {
+  background-image: url("chrome://global/skin/scrollbar/button-left-disabled.gif") 
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
+   background-image: url("chrome://global/skin/scrollbar/button-up.gif")
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] {
+   background-image: url("chrome://global/skin/scrollbar/button-up-disabled.gif")
+}
diff --git a/EarlyBlue/global/scrollbox.css b/EarlyBlue/global/scrollbox.css
index 60aa6953..8ca5f337 100644
--- a/EarlyBlue/global/scrollbox.css
+++ b/EarlyBlue/global/scrollbox.css
@@ -37,33 +37,27 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/*
- * Autorepeatbutton
- */
-.autorepeatbutton-up 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-up.gif")
-  }
+/* ::::: Autorepeatbutton ::::: */
 
-.autorepeatbutton-down 
-  {
-    list-style-image      : url("chrome://global/skin/scroll-down.gif")
-  }
+.autorepeatbutton-up {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.gif")
+}
 
-autorepeatbutton 
-  {
-    -moz-box-align        : center;
-    -moz-box-pack         : center;
-    margin                : 1px 2px 2px 1px;
-    border                : 1px solid transparent;
-    padding               : 1px;
-    height                : 1em;  
-  }
+.autorepeatbutton-down {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif")
+}
 
-autorepeatbutton:hover 
-  {
-    background-color      : #336699;
-    margin                : 1px;
-    border                : 1px inset #CCD0DD;
-    padding               : 2px 1px 1px 2px;
-  }
+autorepeatbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 1px 2px 2px 1px;
+  border: 1px solid transparent;
+  padding: 1px;
+}
+
+autorepeatbutton:hover {
+  background-color: #336699;
+  margin: 1px;
+  border: 1px inset #CCD0DD;
+  padding: 2px 1px 1px 2px;
+}
diff --git a/EarlyBlue/global/seltab-leftedge.gif b/EarlyBlue/global/seltab-leftedge.gif
deleted file mode 100644
index b3553c25fa0102909140e47ed694d82d99eb41ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 99
zcmZ?wbhEHb<YEwFSj58c|Ns9pXU-TK8#6F~*gz5j6o0ZXGBB_(=zzE&wG7M}9=o*f
tsM{zxF|2R;`{>x&uZH(_OqsK&R-tj(x{P&eJ}onMyKZ^y{TdbqYXIV}BLV;b

diff --git a/EarlyBlue/global/seltab-rightedge.gif b/EarlyBlue/global/seltab-rightedge.gif
deleted file mode 100644
index 3cd16218bf823758fab684cb3d62c00271570494..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmZ?wbhEHb<YEwFSj5Wk|Ns9pXU@!=In&tKn1KPr1(HCZ_>+Z^fq|7l2gCuXWnk8+
z*m|aLm9BtGPD7t!@!rYi4U(ye_fAfc5??0%d+n!hhqg;@R672;_5PddUJMM@0N3gz
A&Hw-a

diff --git a/EarlyBlue/global/spinbtn-dn-act.gif b/EarlyBlue/global/spinbutton/spinbtn-dn-act.gif
similarity index 100%
rename from EarlyBlue/global/spinbtn-dn-act.gif
rename to EarlyBlue/global/spinbutton/spinbtn-dn-act.gif
diff --git a/EarlyBlue/global/spinbtn-dn.gif b/EarlyBlue/global/spinbutton/spinbtn-dn.gif
similarity index 100%
rename from EarlyBlue/global/spinbtn-dn.gif
rename to EarlyBlue/global/spinbutton/spinbtn-dn.gif
diff --git a/EarlyBlue/global/spinbtn-up-act.gif b/EarlyBlue/global/spinbutton/spinbtn-up-act.gif
similarity index 100%
rename from EarlyBlue/global/spinbtn-up-act.gif
rename to EarlyBlue/global/spinbutton/spinbtn-up-act.gif
diff --git a/EarlyBlue/global/spinbtn-up.gif b/EarlyBlue/global/spinbutton/spinbtn-up.gif
similarity index 100%
rename from EarlyBlue/global/spinbtn-up.gif
rename to EarlyBlue/global/spinbutton/spinbtn-up.gif
diff --git a/EarlyBlue/global/spinbuttons.css b/EarlyBlue/global/spinbuttons.css
index e3be01d8..4439c705 100644
--- a/EarlyBlue/global/spinbuttons.css
+++ b/EarlyBlue/global/spinbuttons.css
@@ -39,17 +39,17 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 .up {
-  list-style-image: url("chrome://global/skin/spinbtn-up.gif")
+  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-up.gif")
 }
 
 .up:hover:active {
-  list-style-image: url("chrome://global/skin/spinbtn-up-act.gif")
+  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-up-act.gif")
 }
 
 .down {
-  list-style-image: url("chrome://global/skin/spinbtn-dn.gif")
+  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-dn.gif")
 }
 
 .down:hover:active {
-  list-style-image: url("chrome://global/skin/spinbtn-dn-act.gif")
+  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-dn-act.gif")
 }
diff --git a/EarlyBlue/global/splitter.css b/EarlyBlue/global/splitter.css
index dc847d97..dd534234 100644
--- a/EarlyBlue/global/splitter.css
+++ b/EarlyBlue/global/splitter.css
@@ -37,137 +37,99 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/******* Splitters *******/
-
-/** 
- * XXX - We want to deprecate all usages of 'box' in this file and replace with
- *       vbox/hbox. This should happen after the chrome is converted to use
- *       these XUL elements. 
- */
-
-  splitter 
-    {
-      cursor                : e-resize;
-      background-color      : #CCD0DD;
-      -moz-box-align        : center;
-      -moz-box-pack         : center;
-      border                : none;
-      border-left           : 1px solid #9999CC;
-      border-right          : 1px solid #9999CC;
-    }
-  
-  grippy, grippy[collapse="before"]
-    {
-      background-color      : #CCCCCC;
-      border                : 1px outset #CCD0DD;
-      list-style-image      : url("chrome://global/skin/grippy-vertical-before.gif");
-      cursor                : pointer;
-      min-height            : 1px;
-    }
-  
-  grippy:hover
-    {
-      background-color      : #99CCFF;
-    }
-  
-  grippy:hover:active
-    {
-      border                : 1px inset #CCD0DD;
-    }
-  
-  splitter[state="collapsed"] > grippy
-    {
-      list-style-image      : url("chrome://global/skin/grippy-vertical-after.gif");
-    }  
-    
-  .grippy-box
-    {
-    }  
-    
-  .grippy-image
-    {
-      list-style-image      : inherit;
-    }  
-    
-  splitter[state="dragging"],
-  splitter:hover:active
-    {
-      background-color      : #999999;
-    }
-  
-  rows > splitter
-    {
-      cursor              : n-resize;
-    }
-    
-  splitter[orient="vertical"]
-    {
-      cursor              : n-resize;
-      border              : none;
-      border-top          : 1px solid #9999CC;
-      border-bottom       : 1px solid #9999CC;
-    }
-    
-/* Grippy alignment */
-
-/* Vertical splitter (between two boxes, horizontally stacked), collapse to left */
-  splitter > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-vertical-before.gif");
-/*
-      border-left         : 1px solid #9999CC;
-      border-right        : 1px solid #9999CC;
-*/
-    }  
-    
-  splitter > grippy > .grippy-box
-    {
-      border-left         : none;
-      border-right        : none;
-    }  
-
-  splitter[state="collapsed"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-vertical-after.gif");
-    }
-
-/* Vertical splitter (between two boxes, horizontally stacked), collapse to right */
-  splitter[collapse="after"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-vertical-after.gif");
-    }  
-    
-  splitter[collapse="after"][state="collapsed"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-vertical-before.gif");
-    }
-
-/* Horizontal splitter (between two boxes, vertically stacked), collapse to left */
-  splitter[orient="vertical"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-horizontal-before.gif");
-/*
-      border-top          : 1px solid #9999CC;
-      border-bottom       : 1px solid #9999CC;
-*/
-    }  
-    
-  splitter[orient="vertical"] > grippy > .grippy-box
-    {
-    }  
-
-  splitter[state="collapsed"][orient="vertical"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-horizontal-after.gif");
-    }
-    
-/* Horizontal splitter (between two boxes, vertically stacked), collapse to right */
-  splitter[collapse="after"][orient="vertical"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-horizontal-after.gif");
-    }  
-    
-  splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy
-    {
-      list-style-image    : url("chrome://global/skin/grippy-horizontal-before.gif");
-    }
+/* ===== splitter.css ===================================================
+  == Styles used by the XUL splitter element.
+  ======================================================================= */
+
+/* ::::: splitter (vertical) ::::: */
+
+splitter {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  cursor: e-resize;
+  border: none;
+  border-left: 1px solid #9999CC;
+  border-right: 1px solid #9999CC;
+  min-width: 8px;
+  background-color: #CCD0DD;
+}
+
+splitter[state="dragging"],
+splitter:hover:active {
+  background-color: #999999;
+}
+
+/* ::::: splitter (horizontal) ::::: */
+
+splitter[orient="vertical"] {
+  cursor: n-resize;
+  border: none;
+  border-top: 1px solid #9999CC;
+  border-bottom: 1px solid #9999CC;
+  min-height: 8px;
+}
+
+/* ::::: splitter grippy ::::: */
+
+grippy {
+  cursor: pointer;
+  border: 1px outset #CCD0DD;
+  min-width: 6px;
+  min-height: 115px;
+  background-color: #CCCCCC;
+  background-repeat: no-repeat;
+}
+
+grippy:hover {
+  background-color: #99CCFF;
+}
+
+grippy:hover:active {
+  border: 1px inset #CCD0DD;
+}
+
+splitter[orient="vertical"] > grippy {
+  min-width: 115px;
+  min-height: 6px;
+}
+
+/* ..... normal state ..... */
+
+/* vertical grippies */
+splitter[collapse="before"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vert-before.gif");
+}
+
+splitter[collapse="after"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vert-after.gif");
+}
+
+/* horizontal grippies */
+splitter[collapse="before"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-horiz-before.gif");
+}
+
+splitter[collapse="after"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-horiz-after.gif");
+}
+
+/* ..... collapsed state ..... */
+
+/* vertical grippies */
+splitter[collapse="before"][state="collapsed"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vert-after.gif");
+}
+
+splitter[collapse="after"][state="collapsed"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vert-before.gif");
+}
+
+/* horizontal grippies */
+splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-horiz-after.gif");
+}
+
+splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-horiz-before.gif");
+}
+
diff --git a/EarlyBlue/global/grippy-horizontal-after.gif b/EarlyBlue/global/splitter/grip-horiz-after.gif
similarity index 100%
rename from EarlyBlue/global/grippy-horizontal-after.gif
rename to EarlyBlue/global/splitter/grip-horiz-after.gif
diff --git a/EarlyBlue/global/grippy-horizontal-before.gif b/EarlyBlue/global/splitter/grip-horiz-before.gif
similarity index 100%
rename from EarlyBlue/global/grippy-horizontal-before.gif
rename to EarlyBlue/global/splitter/grip-horiz-before.gif
diff --git a/EarlyBlue/global/grippy-vertical-after.gif b/EarlyBlue/global/splitter/grip-vert-after.gif
similarity index 100%
rename from EarlyBlue/global/grippy-vertical-after.gif
rename to EarlyBlue/global/splitter/grip-vert-after.gif
diff --git a/EarlyBlue/global/grippy-vertical-before.gif b/EarlyBlue/global/splitter/grip-vert-before.gif
similarity index 100%
rename from EarlyBlue/global/grippy-vertical-before.gif
rename to EarlyBlue/global/splitter/grip-vert-before.gif
diff --git a/EarlyBlue/global/stop-disabled.gif b/EarlyBlue/global/stop-disabled.gif
deleted file mode 100755
index a9be55d9dea5c1bd286054ddc5d784136de52f3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155
zcmZ?wbhEHblw=TP*v!E2|Ns974<0li0R{$!0|yQONvuHeCkrD313QBbNET!U1B=Ip
z6P~O0TD(5H^hbh5R+8kTWu07-JLFc~t}BS#Y%F~_(vh2WzIPkrs}|?Di|o$-rc6)#
d;IfCKSS6in`<;1J2RCfHr8)cj3uhJvYXFr6HD~|;

diff --git a/EarlyBlue/global/stop.gif b/EarlyBlue/global/stop.gif
deleted file mode 100755
index 004a0787b2969ca6d2a1e9d83458fcd17b21dd48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 154
zcmZ?wbhEHblw=TP*v!E2|Ns974<4kYoq;0;28II%4gg84K=CIFBLf3FgAPa*WCjC^
z`-c;rtM^*GKD+csf<~58;yk4lqM6zga+amNxh-cLb}Ox;UM1n|^xZ4+Tu&Q*tv=b{
f@!;|?pRhH;IoFQPDcU-3{d#A;+2^NlFjxZs_OUoP

diff --git a/EarlyBlue/global/tab-leftedge.gif b/EarlyBlue/global/tab-leftedge.gif
deleted file mode 100644
index c1653783188f3ee86055ddedc84fd7779141d5d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 105
zcmZ?wbhEHb<YEwFSj5Wk|Ns9pXU@!=In&tKn1KPr1(HCZ_>+Z^fq|7l2gCuXWnk8e
z*kygkeUFg~!}@z4&OPg8U{QJ8`?P41g6gKXr&h&FEi6`iULE;xbDXEdkAo4M4AuZT
CJ|-0a

diff --git a/EarlyBlue/global/tab-rightedge.gif b/EarlyBlue/global/tab-rightedge.gif
deleted file mode 100644
index db883b8bcef37a7d041c29492fd43ddef02e48a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 100
zcmZ?wbhEHb<YEwFSj56`=FFLyGiMqb8#6F4{Qv(SNJ4<(PZmZ71{MY#5ErDDfmyR+
w%bCJex(xGFL^u>T=gvH4_|Uxa;>_HXnQd3OH%t6ExKV0T#l2|TKqdxj0AubS0ssI2

diff --git a/EarlyBlue/global/tabBindings.xml b/EarlyBlue/global/tabBindings.xml
deleted file mode 100644
index d9effd65..00000000
--- a/EarlyBlue/global/tabBindings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="tabBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs">
-    <content>
-      <children/>
-      <xul:stack flex="1">
-        <xul:spacer class="tabs-spacer"/>
-        <xul:hbox class="tabs-misc-dec" align="center">
-          <xul:spacer flex="1"/>
-        </xul:hbox>
-      </xul:stack>
-    </content>
-  </binding>
-
-  <binding id="tabpanels" extends="chrome://global/content/bindings/tabbox.xml#tabpanels">
-    <content>
-      <xul:hbox class="tabpanels-inner-box" flex="1">
-        <children/> 
-      </xul:hbox>
-    </content>
-  </binding>
-
-</bindings>
diff --git a/EarlyBlue/global/tabbox.css b/EarlyBlue/global/tabbox.css
index 8a88026b..7a76e127 100644
--- a/EarlyBlue/global/tabbox.css
+++ b/EarlyBlue/global/tabbox.css
@@ -37,147 +37,72 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/*============ tabpanels widget =============*/
+/* ===== tabbox.css =================================================
+  == Styles used by XUL tab-related elements.
+  ======================================================================= */
 
-tabpanels {
-  padding: 5px;
-}
-
-/* we give all tabpanel types a full border
-   tabpanel is the box in which contents show up */
+/* ::::: tabs ::::: */
 
-/* top tabs */
-tabs + tabpanels {
-  border: 1px outset #CCD0DD;
+.tabs-left,
+.tabs-right {
+/*
+  border-bottom: 2px solid;
+  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
+*/
 }
 
-/* bottom tabs */
-tabbox > tabpanels {
-  border: 1px outset #CCD0DD;
-}
+/* ::::: tabpanels ::::: */
 
-/* left tabs */
-tabbox[orient="horizontal"] > tabs + tabpanels {
-  border: 1px outset #CCD0DD;
-}
+/* tabpanel is the box in which contents show up */
 
-/* right tabs */
-tabbox[orient="horizontal"] > tabpanels {
+tabpanels {
   border: 1px outset #CCD0DD;
+  padding: 5px;
+  background-color: #CCD0DD;
+  color: #000000;
+  -moz-user-focus: normal;
 }
 
-/* border on bottom only, no padding (used in search) */
-tabpanels.light {
-  border: none;
-  border-bottom: 1px outset #CCD0DD;
-  padding: 0px;
-}
-
-.tabpanels-inner-box {
-}
-
-/* tabs-spacer ========================== */
-
-/* top tabs */
-tabbox > tabs > .tabs-spacer {
-}
-
-/* bottom tabs */
-tabbox > tabpanels + tabs > .tabs-spacer {
-}
-
-/* left tabs */
-tabbox[orient="horizontal"] > tabs > .tabs-spacer {
-}
-
-/* right tabs */
-tabbox[orient="horizontal"] > tabpanels + tabs > .tabs-spacer {
-}
-
-/*============ tab widget ============*/
-/* NOTE: there should be code in here for indenting the first tab
-   by two pixels, however, this needs to be done with a spacer to
-   fill in the border, but current attempts to use said spacer 
-   result in said spacer not rendering.  Will revisit.  - JRH */
+/* ::::: tab ::::: */
 
-/* tabs is the strip showing the tabs, while tab is the tab (switcher) itself */
-   
 tab {
+  margin-top: 2px;
   border: 1px outset #CCD0DD;
-  color: black; 
+  padding: 1px 4px 2px 4px;
+  background-color: #CCD0DD;
+  color: #000000;
 }
 
-tab > .tab-box > .tab-text {
-  border: 1px solid transparent;
-  padding: 0px 1px 0px 1px;
+.tab-text {
+  margin: 0 !important;
 }
 
-tab:focus > .tab-box > .tab-text {
-  border: 1px dotted #9999CC;
-}
-
-.tab-box {
-  margin: 0px;
-  padding: 1px 3px 1px 3px !important;
+tab[selected="true"]  {
+  font-weight: bold;
 }
 
-/* top tabs */
-tabs tab[first-tab="true"]  { 
-  margin-left: 2px;
+/*
+tab[first-tab="true"][selected="true"] {
+  padding-right: 5px;
+  padding-left: 5px;
 }
+*/
 
-tabs tab  { 
-  margin-top: 2px;
-  border-bottom: none;
-/*  -moz-border-radius: 4px 4px 0px 0px; */
-}
+/* ::::: tab-bottom ::::::::::
+   :: Tabs that are attached to the bottom of a panel, but not necessarily
+   :: a tabpanels.
+   ::::: */
 
-tabs tab > .tab-box { 
-/*  -moz-border-radius: 4px 4px 0px 0px; */
-}
-
-/* bottom tabs */
-tabpanels + tabs > tab { 
-  margin-top: 0px;
+.tab-bottom {
+  margin-top: 0;
   margin-bottom: 2px;
-  border-top: none;
-/*  -moz-border-radius: 0px 0px 4px 4px; */
-  padding: 1px 5px 3px 5px;
-}
-
-tabpanels + tabs > tab > .tab-box { 
-/*  -moz-border-radius: 0px 0px 4px 4px; */
+  padding: 2px 4px 1px 4px;
 }
 
-/* left tabs */
-tabbox[orient="horizontal"] > tabs[orient="vertical"] tab[first-tab="true"]  { 
-  margin-top: 2px;
-}
+/* ::::: tabs-bottom ::::: */
 
-tabbox[orient="horizontal"] > tabs[orient="vertical"] tab  { 
-  margin-left: 2px;
-  border-right: none;
-/*  -moz-border-radius: 4px 0px 0px 4px; */
-}
-
-tabbox[orient="horizontal"] > tabs[orient="vertical"] tab > .tab-box  { 
-/*  -moz-border-radius: 4px 0px 0px 4px; */
-}
-
-/* right tabs */
-tabbox[orient="horizontal"] > tabpanels + tabs[orient="vertical"] > tab { 
-  margin-right: 2px;
-  margin-left: 0px;
-  border-left: none;
-/*  -moz-border-radius: 0px 4px 4px 0px !important; */
-}
-
-tabbox[orient="horizontal"] > tabpanels + tabs[orient="vertical"] > tab > .tab-box { 
-/*  -moz-border-radius: 0px 4px 4px 0px !important; */
-}
-
-/* selected tabs ============================= */
-
-tab[selected="true"]  {
-  font-weight: bold;
+.tabs-bottom > .tabs-left,
+.tabs-bottom > .tabs-right {
+  border-top: 1px solid #666699;
+  border-bottom: none;
 }
diff --git a/EarlyBlue/global/taskbar-addressbook.gif b/EarlyBlue/global/taskbar-addressbook.gif
deleted file mode 100755
index a2860a3cb11bdf118d7d47f08ccd189baa040179..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmZ?wbhEHblxE;#IK;s4|NsB_GtQ@_&17I;0Fpp11StMwVPs%nXV3wPGl0}GFo#s^
z(*7r~=_Jbzi+IP~ya^giGNP7GUa~A%zBgK7!_zOF7P^=9c1LR7U6aamLc#vpiZH{Z
pHn$h8;WmrrnJ8RL<FTDKQBKX|UYW?P>{pfRJmlIxSTZtL0{}$0I(7g6

diff --git a/EarlyBlue/global/taskbar-composer.gif b/EarlyBlue/global/taskbar-composer.gif
deleted file mode 100755
index bcdb874bb9c73fdb7f58cfca5037e312fd224919..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmZ?wbhEHblxE;#SoELa|NsB<XPi$<o0*(Eg@J+Lz<~om5(pH3vM@3*urla?I3TqS
z%uW%z&V1V7sqP?faNkMI6$dB8&Sj369<WX>V&$5kxr^C0pEu7doH>7fwEpu`9N{i!
z-@Rb&%(0#MbY_=VW9Vw0L&>TP4Av)}NOCW^mcFu>X~xBAmr{;$iEi!vl)Q(p)veXU
g(L-YIvB_T?0|Yn%OdM>d^KdZpGcgs)2r^g$0NqGLNB{r;

diff --git a/EarlyBlue/global/taskbar-gotmail.gif b/EarlyBlue/global/taskbar-gotmail.gif
deleted file mode 100755
index 8d1dd6c0d1b3600efd4b691d250d3c17da99b89a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 188
zcmZ?wbhEHblxE;#*v!E2|NsB5Uw_V@aXu|=W^(eBsHiCn3=9Vj95DWG3}j#e#h)yU
z3=HfHIv^>K84N6$A5K`F+hOtgq$*p2Mpx)_-V>^8a&|MNmMeZS?PJQB_wvE6hL|4X
zhMOEMj)@agIG7yguGCnNRkL7DfqO4oXk>bc$Iminr}zYGUa_X69Rb=?T~~+a@VR_T
XsdsRz6*E^3P;6GO?5-7LV6X-Nz;8cK

diff --git a/EarlyBlue/global/taskbar-mail.gif b/EarlyBlue/global/taskbar-mail.gif
deleted file mode 100755
index 6baf0cddc44fafe9f886ff9a90dcc507f37304fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 180
zcmV;l089TzNk%w1VH*Gr0HXf@|NsB>_4%Ke&t_(sV`G$BT9g0)0KmY&A^8LW000L7
zEC2ui02=@f06+s>c&gL>(5*RuXcp+)L=eC*EtO!ND9Vk@=DL9^vJ95qXGoXY1%VmR
zY{c_LKtLVsP<c6JyQg%;Y6=R3?4U3pbUjp}WdQV*2}q^*YC-qh<S?a&Q-vD4i2lJ!
i0029818TcJ-nHiKCKL!>f`Rj~`|p5uUVBc35db?6YEN+h

diff --git a/EarlyBlue/global/taskbar-navigator.gif b/EarlyBlue/global/taskbar-navigator.gif
deleted file mode 100755
index 4b04beb02242e197e020971eb45eb0a533187cd6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmZ?wbhEHblxE;#*!-X2|NsAAzy8e6pO=?6FC$}idit!iw3!SH3<nMz0FszM@h1x-
z0|N(x4oC`Qh678Kz)8<k!9`hJ&BvS6o08pPof2aol}FClC3^oltKz=5!5N=yrS#et
z-));Gemu;{sPw>7{axNaxr`F@j%ID$aog*aH<KXqsbJpcvF+L`lz;OadKVC({ix|^
bxDtbPrKd-sqF08Irz}IgkY~BLAcHjkk{Lro

diff --git a/EarlyBlue/global/textbox.css b/EarlyBlue/global/textbox.css
index df0f4c73..e5791898 100644
--- a/EarlyBlue/global/textbox.css
+++ b/EarlyBlue/global/textbox.css
@@ -35,94 +35,65 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@import url("chrome://global/content/autocomplete.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* ===== textbox.css ==================================================
+  == Styles used by the XUL textbox element.
+  ======================================================================= */
+
+/* ::::: textbox ::::: */
+
+textbox {
+  cursor: text;
+  margin: 2px 4px;
+  border: 1px inset #CCD0DD;
+  padding: 1px 0px 1px 2px;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+html|*.textbox-input, 
+html|*.textbox-textarea {
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+  background-color: inherit;
+  color: inherit;
+  font: inherit;
+}
+
+/* ..... readonly state ..... */
 
-/** generic text fields (in dialogs)
- **/
- 
-/* outer frame */
-  textbox
-    {
-      border              : 1px inset #CCD0DD;
-      color               : #000000;
-      padding             : 0px;
-      margin              : 1px 3px 2px 4px;
-      background-color    : #FFFFFF;
-      cursor              : text;
-    }
-    
-  textbox[readonly="true"]
-    {
-      background-color    : #CCCCCC;
-    }
-  
-  textbox[focused="true"]
-    {
-      border              : 2px solid #6699cc;
-      margin              : 0px 2px 1px 3px;
-    }
-    
-  textbox[focused="true"][readonly="true"]
-    {
-      border              : 1px inset #CCCCCC;
-      margin              : 1px 3px 2px 4px;
-    }
+textbox[readonly="true"] {
+  background-color: #CCCCCC;
+  color: #000000;
+}
 
-/* internal frame */
-  .textbox-internal-box, .textarea-internal-box
-    {
-      margin              : 0px;
-      padding             : 1px 2px 1px 2px;
-      border              : none;
-    }
-  
-/* internal text widget */
-  html|*.textbox-input, html|*.textbox-textarea
-    {
-      border              : none !important;
-      margin              : 0px;
-      padding             : 0px;
-      font                : inherit;
-      background-color    : inherit;
-      color               : inherit;
-    }
+/* ..... disabled state ..... */
 
-  textbox[disabled="true"] 
-    {
-      cursor              : default !important;
-      background-color    : white;
-      color               : #CCCCCC;
-    } 
-    
-/** plain atomic textboxs, class="plain" **/
-  textbox.plain, 
-  textbox.plain > .textbox-internal-box, 
-  textbox.plain > .textarea-internal-box
-    {
-      padding             : 0px !important;
-      margin              : 0px !important;
-      border              : none !important;
-    }
+textbox[disabled="true"] {
+  cursor: default;
+  background-color: #FFFFFF;
+  color: #CCCCCC;
+} 
 
-/** inline edit textbox **/
+textbox[focused="true"] {
+  border: 2px solid #6699cc;
+  margin: 1px 3px;
+}
 
-.textbox-inline-edit 
-  {
-    border                : 1px solid #6699FF !important;
-    margin                : 0px !important;
-  }
+textbox[focused="true"][readonly="true"] {
+  border: 1px inset #CCCCCC;
+  margin: 2px 4px;
+}
 
-.textbox-inline-edit > .textbox-internal-box > html|*.textbox-input 
-  {
-    border                : none !important;
-    padding               : 0px !important;
-    margin                : 0px !important;
-  }
+/* ::::: plain textbox ::::: */
 
-.textbox-inline-edit > .textbox-internal-box 
-  {
-    border                : none !important;
-    padding               : 1px !important;
-    margin                : 0px !important;
-  }
+textbox.plain {
+  padding: 0px !important;
+  margin: 0px !important;
+  border: none !important;
+}
diff --git a/EarlyBlue/global/toolbar.css b/EarlyBlue/global/toolbar.css
index 615026fc..0335b6bf 100644
--- a/EarlyBlue/global/toolbar.css
+++ b/EarlyBlue/global/toolbar.css
@@ -37,111 +37,64 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-toolbox
-  {
-    background-color      : #CCD0DD;
-  }
+/* ===== toolbar.css ====================================================
+  == Styles used by XUL toolbar-related elements.
+  ======================================================================= */
 
-toolbar
-  {
-    background-color      : #CCD0DD;
-    border-bottom         : 1px solid #9999CC;
-    /*
-     * DON'T DELETE.  Removes disappearance of scrollbars in content
-     * pane when window is made smaller.
-     * Talk to evaughan@netscape.com for details.
-     */
-    min-width             : 1px;      
-  }
-  
-.toolbar-holder
-  {
-  }  
+/* ::::: toolbox ::::: */
 
-menubar
-  {
-    /* DON'T DELETE.  Removes disappearance of scrollbars
-     * in content pane when window is made smaller.
-     * Talk to evaughan@netscape.com for details.
-     */
-    min-width             : 1px;
-    background-color      : #CCD0DD;
-    border-bottom         : 1px solid #9999CC;
-   }
+toolbox {
+  background-color: #CCD0DD;
+}
 
-toolbargrippy
-  {
-    -moz-box-orient       : vertical;
-    background-color      : #666699;
-    border                : 1px solid #999999;
-    width                 : 10px;
-    padding-bottom        : 1px;
-  }
+/* ::::: toolbar & menubar ::::: */
 
-.toolbargrippy-twisty
-  {
-    list-style-image      : url("chrome://global/skin/toolbargrippy-twisty.gif");
-    margin-top            : 2px;
-  }
+toolbar,
+menubar {
+  border-bottom: 1px solid #9999CC;
+  background-color: #CCD0DD;
+  min-width: 1px; /* DON'T DELETE!
+    Prevents hiding of scrollbars in browser when window is made smaller.*/
+}
 
-/*
-.toolbargrippy-texture
+.toolbar-holder
   {
-    margin                : 5px 3px 1px 2px;
-    background-image      : url("chrome://global/skin/toolbargrippy-texture.gif");
-    background-position   : 50% 0%;
-    background-repeat     : repeat-y;
-  } 
-*/
+  }  
 
-toolbargrippy[tbgrippy-collapsed="true"] 
-  {
-    -moz-box-orient       : horizontal;
-    height                : 10px;
-    padding-right         : 1px;
-  }
+/* ::::: toolbargrippy ::::: */
 
-.toolbargrippy-twisty-collapsed
-  {
-    list-style-image      : url("chrome://global/skin/tbg-twisty-collapsed.gif");
-    margin-left           : 2px;
-  }
+toolbargrippy {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  border: 1px solid #999999;
+  background-color: #666699;
+  width: 9px;
+  padding: 2px 0px;
+  list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow.gif");
+}
 
-/*
-.toolbargrippy-texture-collapsed
-  {
-    margin                : 2px 1px 1px 5px;
-    background-image      : url("chrome://global/skin/tbg-texture-collapsed.gif");
-    background-position   : 0% 50%;
-    background-repeat     : repeat-x;
-  } 
-*/
+toolbargrippy:hover {
+  background-color: #6699FF;
+}
 
-.collapsed-tray-spacer
-  {
-    border-bottom         : none;
-  }  
-  
-toolbargrippy:hover
-  {
-    background-color      : #6699FF;
-  }
-  
-toolbar[collapsed="true"] > toolbargrippy
-  {
-    width                 : 30px;
-  }
-  
-toolbarseparator 
-  {
-    width                 : 1px;
-    border-right          : 1px solid #666699;
-    margin                : 2px 0.2em 2px 0.2em;
-  }
-  
-.toolbar-focustarget
-  {
-    -moz-user-focus       : ignore !important;
-  } 
+/* ::::: collapsed tray and grippies ::::: */
+
+toolbargrippy[tbgrippy-collapsed="true"] {
+  -moz-box-orient: horizontal;
+  width: 40px;
+  height: 9px;
+  padding: 0px 2px;
+  list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow-collapsed.gif");
+}
+
+.collapsed-tray-spacer {
+  border-bottom: 1px solid #9999CC;
+}  
 
+/* ::::: toolbarseparator ::::: */
 
+toolbarseparator {
+  margin: 2px 0.2em 2px 0.2em;
+  border-right: 1px solid #666699; 
+  width: 1px;
+}
diff --git a/EarlyBlue/global/tbg-twisty-collapsed.gif b/EarlyBlue/global/toolbar/tbgrip-arrow-collapsed.gif
similarity index 100%
rename from EarlyBlue/global/tbg-twisty-collapsed.gif
rename to EarlyBlue/global/toolbar/tbgrip-arrow-collapsed.gif
diff --git a/EarlyBlue/global/toolbargrippy-twisty.gif b/EarlyBlue/global/toolbar/tbgrip-arrow.gif
similarity index 100%
rename from EarlyBlue/global/toolbargrippy-twisty.gif
rename to EarlyBlue/global/toolbar/tbgrip-arrow.gif
diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css
index 649148a2..8eb3840c 100644
--- a/EarlyBlue/global/toolbarbutton.css
+++ b/EarlyBlue/global/toolbarbutton.css
@@ -42,17 +42,16 @@
   == Styles used by the XUL button element.
   ======================================================================= */
 
-toolbarbutton {
-  margin              : 0px;
-  background-color    : transparent;
-  color               : #000000;
-}
+/* ::::: toolbarbutton ::::: */
 
-.toolbarbutton-box {
-  -moz-box-align      : center;
-  -moz-box-pack       : center;
-  border              : 1px solid transparent;
-  padding             : 2px;
+toolbarbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0px;
+  border: 1px solid transparent;
+  padding: 1px;
+  background-color: transparent;
+  color: #000000;
 }
 
 .toolbarbutton-icon {
@@ -61,124 +60,116 @@ toolbarbutton {
 
 .toolbarbutton-text {
   margin: 0px !important;
+  padding: 0px;
+  text-align: center;
 }
 
-toolbarbutton[value] > .toolbarbutton-box > .toolbarbutton-text {
-  padding-left        : 4px;
-}    
-
 toolbarbutton:hover,
 toolbarbutton[buttonover="true"],
-toolbarbutton[open="true"] {
+toolbarbutton.toolbarbutton-menubutton-button[open="true"] {
 } 
-    
-toolbarbutton:hover > .toolbarbutton-box {
-  border              : 1px outset #CCD0DD;
-}
 
-toolbarbutton:hover:active {
+toolbarbutton:hover {
+  border: 1px outset #CCD0DD;
 }
 
-toolbarbutton:hover:active > .toolbarbutton-box,
-toolbarbutton[open="true"] > .toolbarbutton-box {
-  padding             : 3px 1px 1px 3px;
-  border              : 1px inset #CCD0DD;
+toolbarbutton:hover:active,
+toolbarbutton[open="true"] {
+  padding: 2px 0px 0px 2px;
+  border: 1px inset #CCD0DD;
 }
     
-toolbarbutton[disabled="true"],
-toolbarbutton[disabled="true"]:hover,
-toolbarbutton[disabled="true"]:hover:active {
-  color               : #999999;
-}
-
-toolbarbutton[disabled="true"] > .toolbarbutton-box,
-toolbarbutton[disabled="true"]:hover > .toolbarbutton-box,
-toolbarbutton[disabled="true"]:hover:active > .toolbarbutton-box,
-toolbarbutton[disabled="true"][buttonover="true"] > .toolbarbutton-box,
-toolbarbutton[disabled="true"][buttondown="true"] > .toolbarbutton-box {
-  border              : 1px solid transparent;
-  padding             : 2px;
+toolbarbutton[disabled="true"] {
+  border: 1px solid transparent !important;
+  padding: 1px !important;
+  color: #999999 !important;
 }
 
 /* ..... checked state ..... */
 
-toolbarbutton[checked="true"] > .toolbarbutton-box {
-  border              : 1px inset #CCD0DD;
-  background-color    : #DDDDDD;
+toolbarbutton[checked="true"] {
+  padding: 2px !important;
+  border: 1px inset #CCD0DD !important;
+  background-color: #DDDDDD !important;
 }
     
-toolbarbutton[checked="true"]:hover > .toolbarbutton-box {
-  border              : 1px inset #CCD0DD;
-  background-color    : #CCD0DD;
-  background-image    : none;
-}
-
 /* ::::: toolbarbutton menu ::::: */
 
-.toolbarbutton-dropmarker {
-  list-style-image      : url("chrome://global/skin/scroll-down.gif");
+.toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
-.toolbarbutton-dropmarker[disabled="true"] {
-  list-style-image      : url("chrome://global/skin/scroll-down-disabled.gif");
+.toolbarbutton-menu-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }
 
 /* ::::: toolbarbutton menu-button ::::: */
 
-.toolbarbutton-menubutton-dropmarker-box {
-  -moz-box-align: start;
-  -moz-box-pack: center;
+toolbarbutton[type="menu-button"] {
+  -moz-box-align: stretch;
 }
 
-toolbarbutton[type="menu-button"]:hover:active {
+toolbarbutton[type="menu-button"],
+toolbarbutton[type="menu-button"]:hover,
+toolbarbutton[type="menu-button"]:hover:active,
+toolbarbutton[type="menu-button"][open="true"],
+toolbarbutton[type="menu-button"][disabled="true"],
+toolbarbutton[type="menu-button"][disabled="true"]:hover,
+toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
+  border: none !important;
+  padding: 0px !important;
 }
 
 .toolbarbutton-menubutton-button {
-  border: none !important;
-  color: inherit;
+  -moz-box-align: center;
+  -moz-box-pack: center;
 }
 
+.toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-dropmarker {
-  list-style-image: url("chrome://global/skin/scroll-down.gif");
+  border: 1px solid transparent;
 } 
-
+ 
+.toolbarbutton-menubutton-button[disabled="true"],
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  list-style-image: url("chrome://global/skin/scroll-down-disabled.gif");
+  border: 1px solid transparent !important;
 } 
 
-.toolbarbutton-menubutton-dropmarker-box {
-  border                : 1px solid transparent;
-  padding               : 1px 0px 1px 0px;
+toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][buttonover="true"] > .toolbarbutton-menubutton-dropmarker {
+  border: 1px outset #CCD0DD;
 }
 
-toolbarbutton[disabled="true"]:hover > .toolbarbutton-menubutton-box
-  > .toolbarbutton-menubutton-button  > .toolbarbutton-box
-{
-  border                : 1px solid transparent;
+toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  border: 1px inset #CCD0DD;
 }
 
-toolbarbutton:hover > .toolbarbutton-menubutton-box
-  > .toolbarbutton-menubutton-button  > .toolbarbutton-box,
-toolbarbutton:hover > .toolbarbutton-menubutton-box
-  > .toolbarbutton-menubutton-dropmarker-box,
-toolbarbutton[buttonover="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-dropmarker-box
-{
-  border                : 1px outset #CCD0DD;
+toolbarbutton[type="menu-button"][buttondown="true"] > toolbarbutton.toolbarbutton-menubutton-button,
+toolbarbutton[type="menu-button"][open="true"] > toolbarbutton.toolbarbutton-menubutton-button {
+  padding: 2px 0px 0px 2px !important;
 }
 
-toolbarbutton[buttondown="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-dropmarker-box,
-toolbarbutton[open="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-dropmarker-box,
-toolbarbutton[open="true"] > .toolbarbutton-menubutton-box 
-  > .toolbarbutton-menubutton-button > .toolbarbutton-box
-{
-  border                : 1px inset #CCD0DD;
-  padding               : 2px 0px 0px 0px;
+/* .......... dropmarker .......... */
+
+.toolbarbutton-menubutton-dropmarker {
+  -moz-box-align: center;
+  padding: 0px 1px 15px 1px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
-.toolbarbutton-menubutton-dropmarker-box[disabled="true"] {
-  border: 1px solid transparent !important;
-  padding: 0px !important;
+toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 1px 0px 14px 2px;
+}
+
+.toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding: 0px 1px 15px 1px !important;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important;
 }
diff --git a/EarlyBlue/global/tree.css b/EarlyBlue/global/tree.css
index 2d82b0d8..241e6ad3 100644
--- a/EarlyBlue/global/tree.css
+++ b/EarlyBlue/global/tree.css
@@ -208,7 +208,7 @@ treecell.propertylist
 
 .tree-cell-twisty 
   {
-    list-style-image      : url("chrome://global/skin/twisty-closed.gif");
+    list-style-image      : url("chrome://global/skin/tree/twisty-closed.gif");
     -moz-user-focus       : ignore;
     padding-right         : 2px;
   }
@@ -230,7 +230,7 @@ treeitem[container="true"] > treerow > .treecell-indent > .tree-cell-primary-ico
 
 treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty 
   {
-    list-style-image      : url("chrome://global/skin/twisty-open.gif");
+    list-style-image      : url("chrome://global/skin/tree/twisty-open.gif");
   }
 
 treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty {               
@@ -246,19 +246,19 @@ treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty {
 
 .sortDirectionIndicator[sortDirection="ascending"]  > .treecell-header-box > .tree-header-sortdirection 
   {
-    list-style-image      : url("chrome://global/skin/sortAscending.gif");
+    list-style-image      : url("chrome://global/skin/tree/sort-asc.gif");
   }
 
 .sortDirectionIndicator[sortDirection="descending"] > .treecell-header-box > .tree-header-sortdirection 
   {
-    list-style-image      : url("chrome://global/skin/sortDescending.gif");
+    list-style-image      : url("chrome://global/skin/tree/sort-desc.gif");
   }
 
 /* column selection popup menu icon */
 
 .treecell-popup-icon
   {
-    list-style-image      : url("chrome://global/skin/columnselect.gif");
+    list-style-image      : url("chrome://global/skin/tree/columnpicker.gif");
   }
 
 /* Inline Editable Treecells */
diff --git a/EarlyBlue/global/columnselect.gif b/EarlyBlue/global/tree/columnpicker.gif
similarity index 100%
rename from EarlyBlue/global/columnselect.gif
rename to EarlyBlue/global/tree/columnpicker.gif
diff --git a/EarlyBlue/global/sortAscending.gif b/EarlyBlue/global/tree/sort-asc.gif
similarity index 100%
rename from EarlyBlue/global/sortAscending.gif
rename to EarlyBlue/global/tree/sort-asc.gif
diff --git a/EarlyBlue/global/sortDescending.gif b/EarlyBlue/global/tree/sort-desc.gif
similarity index 100%
rename from EarlyBlue/global/sortDescending.gif
rename to EarlyBlue/global/tree/sort-desc.gif
diff --git a/EarlyBlue/global/twisty-closed.gif b/EarlyBlue/global/tree/twisty-closed.gif
similarity index 100%
rename from EarlyBlue/global/twisty-closed.gif
rename to EarlyBlue/global/tree/twisty-closed.gif
diff --git a/EarlyBlue/global/twisty-open.gif b/EarlyBlue/global/tree/twisty-open.gif
similarity index 100%
rename from EarlyBlue/global/twisty-open.gif
rename to EarlyBlue/global/tree/twisty-open.gif
diff --git a/EarlyBlue/global/wizardOverlay.css b/EarlyBlue/global/wizardOverlay.css
index d71e5ab2..f149862e 100644
--- a/EarlyBlue/global/wizardOverlay.css
+++ b/EarlyBlue/global/wizardOverlay.css
@@ -38,16 +38,16 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #wiz-back-button {
-  list-style-image            : url("chrome://global/skin/scroll-left.gif");
+  list-style-image            : url("chrome://global/skin/arrow/arrow-left.gif");
 }
 #wiz-back-button[disabled] {
-  list-style-image            : url("chrome://global/skin/scroll-left-disabled.gif");
+  list-style-image            : url("chrome://global/skin/arrow/arrow-left-disabled.gif");
 }
 #wiz-next-button {
-  list-style-image            : url("chrome://global/skin/scroll-right.gif");
+  list-style-image            : url("chrome://global/skin/arrow/arrow-right.gif");
 }
 #wiz-next-button[disabled] {
-  list-style-image            : url("chrome://global/skin/scroll-right-disabled.gif");
+  list-style-image            : url("chrome://global/skin/arrow/arrow-right-disabled.gif");
 }
 
 #wizardButtons 
@@ -61,3 +61,4 @@
     margin-right              : 44px;
     width                     : 30em;
   } 
+
diff --git a/EarlyBlue/messenger/abcard.gif b/EarlyBlue/messenger/abcard.gif
deleted file mode 100755
index 51d15cea7abed7ac6a58ea463060f90c86de7bf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 131
zcmZ?wbhEHb6ky<E*v!E2|NsBAv@-_|9AF?0DE?$&WME)o&;cn2nZdwf5OBhCHHXFP
x-p2n5H)<U<rp2W#(^#<S?u>Ogwpn_+)|$^dt}C@tb@g9^NxnjvnO;f^)&LaHAxHoK

diff --git a/EarlyBlue/messenger/accountCentral.css b/EarlyBlue/messenger/accountCentral.css
index 8b339f5d..5fbc8f13 100644
--- a/EarlyBlue/messenger/accountCentral.css
+++ b/EarlyBlue/messenger/accountCentral.css
@@ -35,18 +35,28 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/* ===== accountCentral.css ==========================================
-  == Styles for the Messenger Account Central panel.
-  ======================================================================= */
-
 @import url("chrome://messenger/skin/");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+/* ===== accountCentral.css ==========================================
+  == Styles for the Messenger Account Central panel.
+  ======================================================================= */
+
 #acctCentralGrid {
   background-color: #CCD0DD;
 }
 
+separator {
+  height: 5px;
+}
+
+separator.thin {
+  height: 15px;
+}
+
+/* ::::: rows ::::: */
+
 #acctCentralHeaderRow {
   margin: 5px 5px 5px 5px;
   background-color: #666699;
@@ -76,8 +86,10 @@
   font-size: 15px;
 }
 
+/* ::::: links ::::: */
+
 .acctCentralLinkText {
-  cursor:pointer;
+  cursor: pointer;
   color: #336699;
   text-decoration: normal;
 }
@@ -86,5 +98,3 @@
   color: #6699FF;
   text-decoration: underline;
 }
-
-
diff --git a/EarlyBlue/messenger/accountManage.css b/EarlyBlue/messenger/accountManage.css
index bf82f550..211b1c52 100644
--- a/EarlyBlue/messenger/accountManage.css
+++ b/EarlyBlue/messenger/accountManage.css
@@ -48,5 +48,3 @@
 .specialFolderPickerGrid {
   margin-left: 20px;
 }
-
-
diff --git a/EarlyBlue/messenger/accountWizard.css b/EarlyBlue/messenger/accountWizard.css
index f8b992c4..1f2eb90f 100644
--- a/EarlyBlue/messenger/accountWizard.css
+++ b/EarlyBlue/messenger/accountWizard.css
@@ -50,5 +50,3 @@
   width: 8em; 
   margin-left: 5px;
 }
-
-
diff --git a/EarlyBlue/communicator/search/icons.css b/EarlyBlue/messenger/addressbook/abResultsPane.css
similarity index 74%
rename from EarlyBlue/communicator/search/icons.css
rename to EarlyBlue/messenger/addressbook/abResultsPane.css
index 34873f20..25ae75f2 100644
--- a/EarlyBlue/communicator/search/icons.css
+++ b/EarlyBlue/messenger/addressbook/abResultsPane.css
@@ -11,15 +11,16 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is "Classic" theme of mozilla.org code.
+ * The Original Code is Mozilla addressbook.
  *
  * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
+ * Seth Spitzer <sspitzer@netscape.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
+ *  Joe Hewitt <hewitt@netscape.com>
+ *  Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
  * either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -37,12 +38,12 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* Default Icon */
-
-titledbutton[loading="true"] {
-	list-style-image: url("chrome://global/skin/loading.gif") ! important ;
+outlinerchildren:-moz-outliner-image(GeneratedName) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
 }
 
-titledbutton.iconic {
-	list-style-image: url("chrome://global/skin/document.gif");
+outlinerchildren:-moz-outliner-image(GeneratedName, MailList) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
 }
diff --git a/EarlyBlue/messenger/addressbook/addressPanes.css b/EarlyBlue/messenger/addressbook/addressPanes.css
index 2a40f084..85d45c08 100644
--- a/EarlyBlue/messenger/addressbook/addressPanes.css
+++ b/EarlyBlue/messenger/addressbook/addressPanes.css
@@ -46,25 +46,19 @@
 /* ::::: directory pane icons ::::: */
 
 .ab-directory-icon {
-  list-style-image: url("chrome://messenger/skin/addressbook/myaddrbk.gif");
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.gif");
   margin-right: 1px;
   margin-left: 1px;
 }
 
 .ab-directory-icon[IsMailList="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/list.gif");
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.gif");
   margin-right: 1px;
   margin-left: 1px;
 }
 
-/* ::::: result pane icons ::::: */
-
-.ab-results-icon {
-  list-style-image: url("chrome://messenger/skin/abcard.gif");
-  margin-right: 1px;
-}
-
-.ab-results-icon[IsMailList="true"] {
-  list-style-image: url("chrome://messenger/skin/addressbook/list.gif");
+.ab-directory-icon[IsRemote="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif");
   margin-right: 1px;
+  margin-left: 1px;
 }
diff --git a/EarlyBlue/messenger/addressbook/addressbook.css b/EarlyBlue/messenger/addressbook/addressbook.css
index 0abe47c4..0fe1507c 100644
--- a/EarlyBlue/messenger/addressbook/addressbook.css
+++ b/EarlyBlue/messenger/addressbook/addressbook.css
@@ -45,68 +45,47 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* :::::  addressbook image precaching ::::: */
-
-#resource_bundle_addressbook {
-  -moz-binding: url("chrome://messenger/skin/addressbook/resources.xml#resource_bundle_addressbook");
-}
-
 /* ::::: primary toolbar buttons ::::: */
 
 #button-newcard {
-	list-style-image:url("chrome://messenger/skin/addressbook/newcard.gif");
+  list-style-image:url("chrome://messenger/skin/addressbook/icons/newcard.gif");
 }
 
-#button-newcard[disabled="true"],
-#button-newcard[disabled="true"]:hover,
-#button-newcard[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/addressbook/newcard-disabled.gif");
-  } 
+#button-newcard[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/newcard-disabled.gif") !important;
+} 
 
 #button-newlist {
-	list-style-image: url("chrome://messenger/skin/addressbook/newlist.gif");
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/newlist.gif");
 }
 
-#button-newlist[disabled="true"],
-#button-newlist[disabled="true"]:hover,
-#button-newlist[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/addressbook/newlist-disabled.gif");
-  } 
+#button-newlist[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/newlist-disabled.gif") !important;
+} 
 
 #button-editcard {
-	list-style-image:url("chrome://messenger/skin/addressbook/person.gif");
+  list-style-image:url("chrome://messenger/skin/addressbook/icons/person.gif");
 }
 
-#button-editcard[disabled="true"],
-#button-editcard[disabled="true"]:hover,
-#button-editcard[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/addressbook/person-disabled.gif");
-  } 
+#button-editcard[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/person-disabled.gif") !important;
+} 
 
 #button-newmessage {
-	list-style-image:url("chrome://messenger/skin/addressbook/newmsg.gif");
+  list-style-image:url("chrome://messenger/skin/addressbook/icons/newmsg.gif");
 }
 
-#button-newmessage[disabled="true"],
-#button-newmessage[disabled="true"]:hover,
-#button-newmessage[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/addressbook/newmsg-disabled.gif");
-  } 
+#button-newmessage[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/newmsg-disabled.gif") !important;
+} 
 
 #button-delete {
-	list-style-image:url("chrome://messenger/skin/addressbook/trash.gif");
+  list-style-image:url("chrome://global/skin/icons/icons/trash.gif");
 }
 
-#button-delete[disabled="true"],
-#button-delete[disabled="true"]:hover,
-#button-delete[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/addressbook/trash-disabled.gif");
-  } 
+#button-delete[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/trash-disabled.gif") !important;
+} 
 
 /* ::::: sidebar header ::::: */
 
@@ -127,61 +106,61 @@ sidebarheader {
 }
 
 #CardViewBox {
-	-moz-user-focus: ignore;
-	overflow: auto;
-	min-width: 150px;
-	background-color: #CCD0DD;
+  -moz-user-focus: ignore;
+  overflow: auto;
+  min-width: 150px;
+  background-color: #CCD0DD;
 }
 
 #CardViewInnerBox {
-	margin-top: 2px;
-	margin-bottom: 2px;
-	padding-left: 8px;
-	padding-right: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding-left: 8px;
+  padding-right: 8px;
 }
 
 #CardTitle {
-	font-size: 150%;
-	font-weight: bold;
-	border-bottom: 2px solid black;
-	min-width: 120px;
-	margin: 0px;
+  font-size: 150%;
+  font-weight: bold;
+  border-bottom: 2px solid black;
+  min-width: 120px;
+  margin: 0px;
 }
  
 .cardViewGroup {
-	margin-top: 8px;
-	padding-bottom: 5px;
-	min-width: 50px;
+  margin-top: 8px;
+  padding-bottom: 5px;
+  min-width: 50px;
 }
 
 .CardViewHeading {
-	padding: 1px;
-	padding-left: 5px;
-	margin: 0px 0px 1px 0px;
-	background-color: #9999CC;
-	color: #FFFFFF;
-	font-weight: bold;
-	min-width: 30px;
+  padding: 1px;
+  padding-left: 5px;
+  margin: 0px 0px 1px 0px;
+  background-color: #9999CC;
+  color: #FFFFFF;
+  font-weight: bold;
+  min-width: 30px;
 }
 
 .CardViewText,
 .CardViewLink {
-	padding-left: 20px;
-	padding-right: 2px;
-	min-width: 30px;
-	margin: 0px;
+  padding-left: 20px;
+  padding-right: 2px;
+  min-width: 30px;
+  margin: 0px;
 }
 
 .CardViewLink {
-	color: blue;
-	text-decoration: underline;
-	cursor: pointer;
+  color: blue;
+  text-decoration: underline;
+  cursor: pointer;
 }
 
 html|a {
-	padding-left: 0px;
-	padding-right: 2px;
-	border: none !important;
+  padding-left: 0px;
+  padding-right: 2px;
+  border: none !important;
 }
 
 html|p {
@@ -205,4 +184,3 @@ html|p {
 #resultsTree {
 /*  border-left: 1px solid ThreeDShadow; */
 }
-
diff --git a/EarlyBlue/messenger/addressbook/cardDialog.css b/EarlyBlue/messenger/addressbook/cardDialog.css
index 03215528..fc05d2f9 100644
--- a/EarlyBlue/messenger/addressbook/cardDialog.css
+++ b/EarlyBlue/messenger/addressbook/cardDialog.css
@@ -47,20 +47,19 @@
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
-	width: 25em;
+  width: 25em;
 }
 
 .CardEditLabel {
-	padding: 0px;
-	margin-top: 3px;
+  padding: 0px;
+  margin-top: 3px;
 }
 
 .alignBoxWithFieldset {
-	margin-left: 6px;
-	margin-right: 5px;
+  margin-left: 6px;
+  margin-right: 5px;
 }
 
 .stateZipSpacer {
   width: 3em;
 }
-
diff --git a/EarlyBlue/messenger/addressbook/edit.gif b/EarlyBlue/messenger/addressbook/edit.gif
deleted file mode 100644
index 9bf3f8ffa2ff7c1b76facfe071f7d613f2590bbd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 87
zcmZ?wbhEHb6l4%!X!y_Y|Ns932M#FyWMO1rU}Vr?00NMV1Cw4)KL^|C%BYMfMwZK)
pvp#pUDy_&2Qwn|cs`mP!F6p+uqH9ytrf;*6Nq*~K?8(Sr4FD8rAGiPj

diff --git a/EarlyBlue/messenger/addressbook/icons/abcard.gif b/EarlyBlue/messenger/addressbook/icons/abcard.gif
new file mode 100755
index 0000000000000000000000000000000000000000..2016698c6d2227f2e2e437030a06876c6269c351
GIT binary patch
literal 90
zcmZ?wbhEHb6ky<ESjfQe|NsBAv@<{w2o!&^FfuSOG3YP=0Z5*KNqb7a=E1k;8|F+o
qCb{bDrkCd!<s@S7vM-yiTy%c>rd-KIGqTUAY__po&mqOdU=097*(0a`

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/addressbook/icons/ablist.gif b/EarlyBlue/messenger/addressbook/icons/ablist.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9e5222ba13de22116896c7bb4fe701842a2e4cfe
GIT binary patch
literal 91
zcmZ?wbhEHb6ky<ESjfO|;J|^jv@`$z{|AzaKUo;L7?>G!7=QpI&%mTJr{D76+w(1R
srnm{FO_P59tTvow+T&|WXPszU#62-bC;Z!~Sj$&B{pSNX_*ogO0oIiwn*aa+

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/addressbook/myaddrbk.gif b/EarlyBlue/messenger/addressbook/icons/addrbook.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/myaddrbk.gif
rename to EarlyBlue/messenger/addressbook/icons/addrbook.gif
diff --git a/EarlyBlue/messenger/addressbook/newcard-disabled.gif b/EarlyBlue/messenger/addressbook/icons/newcard-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/newcard-disabled.gif
rename to EarlyBlue/messenger/addressbook/icons/newcard-disabled.gif
diff --git a/EarlyBlue/messenger/addressbook/newcard.gif b/EarlyBlue/messenger/addressbook/icons/newcard.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/newcard.gif
rename to EarlyBlue/messenger/addressbook/icons/newcard.gif
diff --git a/EarlyBlue/messenger/addressbook/newlist-disabled.gif b/EarlyBlue/messenger/addressbook/icons/newlist-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/newlist-disabled.gif
rename to EarlyBlue/messenger/addressbook/icons/newlist-disabled.gif
diff --git a/EarlyBlue/messenger/addressbook/newlist.gif b/EarlyBlue/messenger/addressbook/icons/newlist.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/newlist.gif
rename to EarlyBlue/messenger/addressbook/icons/newlist.gif
diff --git a/EarlyBlue/messenger/addressbook/newmsg-disabled.gif b/EarlyBlue/messenger/addressbook/icons/newmsg-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/newmsg-disabled.gif
rename to EarlyBlue/messenger/addressbook/icons/newmsg-disabled.gif
diff --git a/EarlyBlue/messenger/addressbook/newmsg.gif b/EarlyBlue/messenger/addressbook/icons/newmsg.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/newmsg.gif
rename to EarlyBlue/messenger/addressbook/icons/newmsg.gif
diff --git a/EarlyBlue/messenger/addressbook/person-disabled.gif b/EarlyBlue/messenger/addressbook/icons/person-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/person-disabled.gif
rename to EarlyBlue/messenger/addressbook/icons/person-disabled.gif
diff --git a/EarlyBlue/messenger/addressbook/person.gif b/EarlyBlue/messenger/addressbook/icons/person.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/person.gif
rename to EarlyBlue/messenger/addressbook/icons/person.gif
diff --git a/EarlyBlue/messenger/addressbook/remote-abook-down.gif b/EarlyBlue/messenger/addressbook/icons/remote-addrbook-error.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/remote-abook-down.gif
rename to EarlyBlue/messenger/addressbook/icons/remote-addrbook-error.gif
diff --git a/EarlyBlue/messenger/addressbook/remote-abook.gif b/EarlyBlue/messenger/addressbook/icons/remote-addrbook.gif
similarity index 100%
rename from EarlyBlue/messenger/addressbook/remote-abook.gif
rename to EarlyBlue/messenger/addressbook/icons/remote-addrbook.gif
diff --git a/EarlyBlue/messenger/addressbook/list.gif b/EarlyBlue/messenger/addressbook/list.gif
deleted file mode 100644
index b4d086f99da4e2bdfd00da2e44cbf50b00f3ab5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77
zcmZ?wbhEHb6ky<CXkcJCaNs~%+8M>4EQ}05paUX6G7d~CJ^h&rPJMjP`5?4H`*QZL
cdfho1S<h}R73xfk7IX8hy7svJ1S^9z0FCJzLI3~&

diff --git a/EarlyBlue/messenger/addressbook/resources.xml b/EarlyBlue/messenger/addressbook/resources.xml
deleted file mode 100644
index d4f02485..00000000
--- a/EarlyBlue/messenger/addressbook/resources.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-
-<bindings id="resourcesBindings" xmlns="http://www.mozilla.org/xbl">
-         
-  <binding id="resource_bundle_addressbook">
-    <resources>
-   </resources>	
-  </binding>
-          
-</bindings>
diff --git a/EarlyBlue/messenger/addressbook/selectAddressesDialog.css b/EarlyBlue/messenger/addressbook/selectAddressesDialog.css
index 3d807d6d..1304a9ee 100644
--- a/EarlyBlue/messenger/addressbook/selectAddressesDialog.css
+++ b/EarlyBlue/messenger/addressbook/selectAddressesDialog.css
@@ -47,7 +47,7 @@
 /* ::::: Select Addresses dialog ::::: */
 
 #dirTreeBox {
-	width: 180px;
+  width: 180px;
 }
 
 #resultsTree {
@@ -55,38 +55,37 @@
 }
  
 #vertical-splitter {
-  min-width     : 4px;
+  min-width: 4px;
 }
 
 #addToBucketButtonBox {
-	padding			: 0.3em; 
-	min-width		: 10px;
+  padding: 0.3em; 
+  min-width: 10px;
 }
 
 #bucketBox {
-	height			: 170px;
+  height: 170px;
 }
 
 #addressBucket {
-	height			: 100px; 
-	min-width		: 10px;
+  height: 100px; 
+  min-width: 10px;
 }
 
 #rightColumnButtonBox { /* Column with "New", "Edit" and "Remove" buttons */
-	padding			: .5em; 
-	padding-right	: 0px;
+  padding: .5em; 
+  padding-right: 0px;
 }
 
 .third-column-spacer {  /* Vertical Spacers between 3rd column buttons */
-	height			: 10px;
+  height: 10px;
 }
 
 .middle-button-spacer { /* Spacers between To, CC, and BCC buttons */
-	width			: 10px;
+  width: 10px;
 }
 
 #bucket-splitter {
   border: none;
   min-height: 4px;
 }
-
diff --git a/EarlyBlue/messenger/addressbook/trash-disabled.gif b/EarlyBlue/messenger/addressbook/trash-disabled.gif
deleted file mode 100755
index 9e594ba416b86f79318985ebbcabb4ec4aa0c91b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmZ?wbhEHb6krfw*v!Dt(9m%1+`0cm1I3>#j0_Bn3_1)z05XGtMc3ej=jy2pcV-&D
so4Sov$!t>M@~UZSyQF)jDOw%hcIVl*f8Vys_bOdp8g@8Xm5IR`0P#XdtN;K2

diff --git a/EarlyBlue/messenger/addressbook/trash.gif b/EarlyBlue/messenger/addressbook/trash.gif
deleted file mode 100755
index fd97313175ea64a35a0edffa7b5654f1c6724479..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmZ?wbhEHb6krfw*v!C?oO})l{u2!pf3h$#FfcOcFaQC_3<efmgA<;sr!w4`Y5Z>L
qHdZCGNr}s=rm5|c?wO`&b$r{MXW#yP+bZ9yba`pm;b2uJ25SKMzevCU

diff --git a/EarlyBlue/messenger/addtoab.gif b/EarlyBlue/messenger/addtoab.gif
deleted file mode 100755
index 4e8a95d4b9eb32003300eacc93f5a843bb8cd17f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmZ?wbhEHb6krfw*v!E2|Ns932M(M$Gczp>h|Vw&0*XIb7#SEC8FWAjL1s9x*cqH~
zShZIyV?ycDh=@X&jfryRzG*LeAG^&<d2>unaqFfz>vzZbAFtvp-SfD!Xw%b>lPk0$
RUj13I;+CJtBo_t-YXA$WE@1!w

diff --git a/EarlyBlue/messenger/dialogs.css b/EarlyBlue/messenger/dialogs.css
index a2778c23..d1cd2ff9 100644
--- a/EarlyBlue/messenger/dialogs.css
+++ b/EarlyBlue/messenger/dialogs.css
@@ -54,21 +54,40 @@ menu.push {
 }
 
 menu.push:hover:active,
-menu.push[open],
-menu.push[toggled="1"] {
+menu.push[open] {
   border-style: inset;
   padding: 3px 1px 1px 3px;
 }
 
-menu.push[toggled="2"] {
-   background-color: #DDDDDD;
-   border: 1px solid #666699;
-}
-
 menu.push[disabled="true"],
 menu.push[disabled="true"]:hover,
 menu.push[disabled="true"]:hover:active {
   color: #999999;
 }
 
+/* ::::: askSendFormat.xul ::::: */
+
+askSendFormat {
+  width: 40em;
+}
 
+#askImageBox {
+ -moz-box-align: start;
+}
+
+#convertYes {
+  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
+}
+
+#convertAltering {
+  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
+}
+
+#convertNo {
+  list-style-image:url("chrome://global/skin/icons/alert-exclam.gif");
+}
+
+/* Workaround for bug 50217. Please remove this rule, when this bug is fixed. */
+#convertDefault {
+  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
+}
diff --git a/EarlyBlue/messenger/filterDialog.css b/EarlyBlue/messenger/filterDialog.css
index d891dc5b..39b68ac0 100644
--- a/EarlyBlue/messenger/filterDialog.css
+++ b/EarlyBlue/messenger/filterDialog.css
@@ -35,14 +35,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@import url("chrome://messenger/skin/");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ===== filterDialog.css ===============================================
   == Styles for the Mail Filters dialog.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
-
 /* ::::: columns :::::: */
 
 .enabledcol {
diff --git a/EarlyBlue/messenger/flagcol.gif b/EarlyBlue/messenger/flagcol.gif
deleted file mode 100755
index 04dae03670e0af936b4b3dc6fb2299c2e513148d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1260
zcmZuw&r4ia6h5ZXOeZrz3Ahq^l~8K26T_uYBNS(J)JJu+{vZ?rGLG+N9+`P>c=OCe
zXu<=*gph@hAiX<Vl0p}S;vW!FC|T6I)=gcx5Tszt$|B9l_ih^KqIVeXk8{p<zVACT
z<IdQZgXIqDp!<}p*nVTX#kj@s3#>n1{Pf4G_V)HvDwWA(Iy*bNy1Kf%yL)?k`}+D8
z78a(arV53^;NT#C7xT=_E<HAX@$v4<!^7QQe%_EoibxX~fJ>5+lq4<5NMak4ij*R)
z$S7i)Dm5uhT9eVlwo)2WhO{ALh;e4pOokIgKq^87QY703Qc5MImeNScwjb_FNv)(&
zl5Km0m6lpdqa|B5$W}&bBaM-4D-}!4(y(Mp6vV+4)NFtBL=&I_26f0yWZ(fyD`l)C
zw8TYgWwc_e5Dc_Y#wfOG!A7$(3_*!9Xii8aLLnOpPy<HLnmB@15CJ@3fSNs`KpU;u
znguavjJq+Kt#{Cd-Uu7kY^{X%a2nRaOV|dJ;0kPjZfJ!#r~zq|fhO45{uVSr1xzvn
zq$7?8EVd(oWl)H&xHIgt!^HG377PKd!)EvjFEKp01&3e>YM>soghXgc>JysDXh8@4
z(GZA$L@Ck{#0|v&c(-B4=^6DbE-toOt@ZWw&CSi7ot^FN?Y+Id{r&xegM*`^qmz@9
z)6-Kvd$qOoG>+rshr`5n!;TYH&)@BBZS)WIBZz-Q2c1uSMQ0y%PyD*|+gj?<XE#3G
z7=C{D?DgkS>YE=64?92p<oEB7e<-e99J>AJ!3I6Q_rZsE`kk4}U$1A&FP}J<)G+nD
zxi#iY7KJlfEX_Of-)7Szp<9mJWf6p;9xQvx!+B{nn=boe#rKw7KYI7J(sV-+C}H12
z_omm3+z`2yps|{~k2_;xB=DP2xKfF{z!!6Fgmy;@rP<=RGdEwHEsl!0iTrHwI=<O-
zHl1%a-TG1u7%eZV{x85an^&t;-TJDS^8Dpi5Z-DE$FJnF=|XTvd@(S9gX>0t-!G<1
z+4SVVxVW0f<4C@gAI&2zo32Jt<Jy%gm`1Mt9-|sGa+RQ-gy*YX6Ef;`Xa$v8P5411
z%8iCw4u$6n<<(py{OgnDS{DCt;I<n!Avi}pd;u<uOqcwntGR)5ZFDh1=kR&IGOAX-
NSqW;nrFw&C=q+-%7r+1j

diff --git a/EarlyBlue/messenger/folderMenus.css b/EarlyBlue/messenger/folderMenus.css
index 2d4bd258..364d017e 100644
--- a/EarlyBlue/messenger/folderMenus.css
+++ b/EarlyBlue/messenger/folderMenus.css
@@ -44,119 +44,95 @@
 /* ::::: folder icons for menus ::::: */
 
 .folderMenuItem {
-  list-style-image: url("chrome://messenger/skin/folder-closed.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
 }
 
-
 .folderMenuItem[open="true"] {
-  list-style-image: url("chrome://messenger/skin/folder-open.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-open.gif");
 }
 
 /* ..... special folders ..... */
 
-.folderMenuItem[SpecialFolder="Inbox"] 
-  {
-    list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Inbox"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Trash"] 
-  {
-    list-style-image: url("chrome://messenger/skin/folder-trash.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Trash"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/folder-trash.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Sent"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/folder-sent.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Sent"] 
-  {
-    list-style-image: url("chrome://messenger/skin/folder-sent.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Unsent Messages"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/folder-outbox.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Unsent Messages"] 
-  {
-    list-style-image: url("chrome://messenger/skin/folder-outbox.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Drafts"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/folder-draft.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Drafts"] 
-  {
-    list-style-image: url("chrome://messenger/skin/folder-draft.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Templates"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/folder-template.gif");
-  }
-
-.folderMenuItem[SpecialFolder="Templates"] 
-  {
-    list-style-image: url("chrome://messenger/skin/folder-template.gif");
-  }
-
-.folderMenuItem[IsServer="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/server-mail.gif");
-  }
-
-.folderMenuItem[IsServer="true"][open="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/server-mail.gif");
-  }
+.folderMenuItem[SpecialFolder="Inbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
+}
+
+.folderMenuItem[SpecialFolder="Inbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
+}
+
+.folderMenuItem[SpecialFolder="Trash"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
+}
+
+.folderMenuItem[SpecialFolder="Trash"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
+}
+
+.folderMenuItem[SpecialFolder="Sent"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
+}
+
+.folderMenuItem[SpecialFolder="Sent"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
+}
+
+.folderMenuItem[SpecialFolder="Unsent Messages"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
+}
+
+.folderMenuItem[SpecialFolder="Unsent Messages"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
+}
+
+.folderMenuItem[SpecialFolder="Templates"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
+}
+
+.folderMenuItem[SpecialFolder="Templates"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
+}
+
+.folderMenuItem[IsServer="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
+}
+
+.folderMenuItem[IsServer="true"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
+}
 
 /* IMAP folders */
-.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
-  }
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
+}
 
 /* POP3 folders */
-.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"]
-  {
-    list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
-  }
+.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
+}
 
 /* Local Servers */
-.folderMenuItem[IsServer="true"][ServerType="none"]
-  {
-    list-style-image      : url("chrome://messenger/skin/server-local.gif");
-  }
+.folderMenuItem[IsServer="true"][ServerType="none"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
+}
 
 /* News folders */
-.folderMenuItem[ServerType="nntp"] 
-  {
-    list-style-image      : url("chrome://messenger/skin/folder-newsgroup.gif");
-  }
-
-.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"]
-  {
-    list-style-image      : url("chrome://messenger/skin/server-news-lock.gif");
-  }
-
-.folderMenuItem[IsServer="true"][ServerType="nntp"]
-  {
-    list-style-image      : url("chrome://messenger/skin/server-news.gif");
-  }
-
+.folderMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
+}
 
+.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
+}
 
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
+}
diff --git a/EarlyBlue/messenger/folderPane.css b/EarlyBlue/messenger/folderPane.css
index 183bc258..ecffe09b 100644
--- a/EarlyBlue/messenger/folderPane.css
+++ b/EarlyBlue/messenger/folderPane.css
@@ -44,159 +44,155 @@
   == Styles for the Folder pane in the Messenger 3-pane window.
   ======================================================================= */
 
-/* ::::: connecting lines ::::: */
-
-outlinerbody:-moz-outliner-line
-{
-  visibility: hidden;
-}
-
 /* ::::: mail folder ::::: */
 
-outlinerbody:-moz-outliner-image(folderNameCol) {
+outlinerchildren:-moz-outliner-image(folderNameCol) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-closed.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, newMessages-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, newMessages-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-new-closed.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.gif");
 }
 
 /* ..... Inbox ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Inbox) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Inbox) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.gif");
 }
 
 /* ..... Sent ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Sent) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Sent) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-sent.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.gif");
 }
 
 /* ..... Unsent ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Unsent Messages) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Unsent Messages) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-outbox.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.gif");
 }
 
 /* ..... Drafts ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Drafts) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Drafts) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-draft.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.gif");
 }
 
 /* ..... Templates ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Templates) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Templates) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-template.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.gif");
 }
 
 /* ..... Trash ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, specialFolder-Trash) {
+outlinerchildren:-moz-outliner-image(folderNameCol, specialFolder-Trash) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-trash.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, isServer-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, isServer-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-mail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, biffState-NewMail, isServer-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, biffState-NewMail, isServer-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
 }
 
-outlinerbody:-moz-outliner-cell-text(folderNameCol, newMessages-true),
-outlinerbody:-moz-outliner-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
+outlinerchildren:-moz-outliner-cell-text(folderNameCol, newMessages-true),
+outlinerchildren:-moz-outliner-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
   font-weight: bold;
 }
 
 /* ..... Server Folders ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, isServer-true, serverType-none) {
+outlinerchildren:-moz-outliner-image(folderNameCol, isServer-true, serverType-none) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-local.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
 }
 
 /* ..... News Folders ..... */
 
-outlinerbody:-moz-outliner-image(folderNameCol, serverType-nntp) {
+outlinerchildren:-moz-outliner-image(folderNameCol, serverType-nntp) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, isServer-true, serverType-nntp) {
+outlinerchildren:-moz-outliner-image(folderNameCol, isServer-true, serverType-nntp) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-news.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
 }
 
-outlinerbody:-moz-outliner-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+outlinerchildren:-moz-outliner-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
 
 /* ::::: All Servers ::::: */
 
-outlinerbody:-moz-outliner-cell-text(closed, subfoldersHaveUnreadMessages-true)
-{
+outlinerchildren:-moz-outliner-cell-text(closed, subfoldersHaveUnreadMessages-true) {
   font-weight: bold;
 }
 
-outlinerbody:-moz-outliner-cell-text(folderNameCol, isServer-true),
-outlinerbody:-moz-outliner-cell-text(hasUnreadMessages-true) {
+outlinerchildren:-moz-outliner-cell-text(folderNameCol, isServer-true),
+outlinerchildren:-moz-outliner-cell-text(hasUnreadMessages-true) {
   font-weight: bold;
 }
 
-outlinerbody:-moz-outliner-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
+outlinerchildren:-moz-outliner-cell-text(folderNameCol, noSelect-true) {
+  color: #808080;
   font-style: italic;
 }
 
-#folder-panel {
-  min-width: 10px;
-}
-
-#folderTree {
-  border: none;
-}
-  
 .tree-folder-checkbox {
   list-style-image: none;
 }
 
-outlinerbody:-moz-outliner-image(syncCol) {
-  list-style-image: url("chrome://messenger/skin/dot.gif");
+outlinerchildren:-moz-outliner-image(syncCol) {
+  list-style-image: url("chrome://messenger/skin/icons/dot.gif");
 }
 
-outlinerbody:-moz-outliner-image(syncCol, synchronize-true) {
-  list-style-image: url("chrome://messenger/skin/check.gif");
+outlinerchildren:-moz-outliner-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
 
-outlinerbody:-moz-outliner-image(syncCol, isServer-true) {
+outlinerchildren:-moz-outliner-image(syncCol, isServer-true) {
   list-style-image: none;
 }
 
+#folder-panel {
+  min-width: 10px;
+}
+
+#folderTree {
+  border: none;
+}
+
+#folderUnreadCol,
+#folderTotalCol {
+  text-align: right;
+}
diff --git a/EarlyBlue/messenger/attach.gif b/EarlyBlue/messenger/icons/attach.gif
similarity index 100%
rename from EarlyBlue/messenger/attach.gif
rename to EarlyBlue/messenger/icons/attach.gif
diff --git a/EarlyBlue/messenger/check.gif b/EarlyBlue/messenger/icons/check.gif
similarity index 100%
rename from EarlyBlue/messenger/check.gif
rename to EarlyBlue/messenger/icons/check.gif
diff --git a/EarlyBlue/messenger/dot.gif b/EarlyBlue/messenger/icons/dot.gif
similarity index 100%
rename from EarlyBlue/messenger/dot.gif
rename to EarlyBlue/messenger/icons/dot.gif
diff --git a/EarlyBlue/messenger/icons/flagcol.gif b/EarlyBlue/messenger/icons/flagcol.gif
new file mode 100755
index 0000000000000000000000000000000000000000..3c9fdab2dabac5c111cdd49f5f7a1db60bd04e2c
GIT binary patch
literal 94
zcmZ?wbhEHb<YVAvIK%)14gVP!{{Lra00AHa3KV~`FfuZ*Gw6VnfYdTDD_88g^N*WF
kk;!IK)Qs0Pu?D$4DqT~VdDtC$w2F^~hukio$G~6>06K0VSO5S3

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/flaggedmail.gif b/EarlyBlue/messenger/icons/flaggedmail.gif
similarity index 100%
rename from EarlyBlue/messenger/flaggedmail.gif
rename to EarlyBlue/messenger/icons/flaggedmail.gif
diff --git a/EarlyBlue/messenger/folder-closed.gif b/EarlyBlue/messenger/icons/folder-closed.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-closed.gif
rename to EarlyBlue/messenger/icons/folder-closed.gif
diff --git a/EarlyBlue/messenger/folder-draft.gif b/EarlyBlue/messenger/icons/folder-draft.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-draft.gif
rename to EarlyBlue/messenger/icons/folder-draft.gif
diff --git a/EarlyBlue/messenger/folder-inbox-new.gif b/EarlyBlue/messenger/icons/folder-inbox-new.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-inbox-new.gif
rename to EarlyBlue/messenger/icons/folder-inbox-new.gif
diff --git a/EarlyBlue/messenger/folder-inbox.gif b/EarlyBlue/messenger/icons/folder-inbox.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-inbox.gif
rename to EarlyBlue/messenger/icons/folder-inbox.gif
diff --git a/EarlyBlue/messenger/folder-new-closed.gif b/EarlyBlue/messenger/icons/folder-new-closed.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-new-closed.gif
rename to EarlyBlue/messenger/icons/folder-new-closed.gif
diff --git a/EarlyBlue/messenger/folder-newsgroup.gif b/EarlyBlue/messenger/icons/folder-newsgroup.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-newsgroup.gif
rename to EarlyBlue/messenger/icons/folder-newsgroup.gif
diff --git a/EarlyBlue/messenger/folder-open.gif b/EarlyBlue/messenger/icons/folder-open.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-open.gif
rename to EarlyBlue/messenger/icons/folder-open.gif
diff --git a/EarlyBlue/messenger/folder-outbox.gif b/EarlyBlue/messenger/icons/folder-outbox.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-outbox.gif
rename to EarlyBlue/messenger/icons/folder-outbox.gif
diff --git a/EarlyBlue/messenger/folder-sent.gif b/EarlyBlue/messenger/icons/folder-sent.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-sent.gif
rename to EarlyBlue/messenger/icons/folder-sent.gif
diff --git a/EarlyBlue/messenger/folder-template.gif b/EarlyBlue/messenger/icons/folder-template.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-template.gif
rename to EarlyBlue/messenger/icons/folder-template.gif
diff --git a/EarlyBlue/messenger/folder-trash.gif b/EarlyBlue/messenger/icons/folder-trash.gif
similarity index 100%
rename from EarlyBlue/messenger/folder-trash.gif
rename to EarlyBlue/messenger/icons/folder-trash.gif
diff --git a/EarlyBlue/messenger/icons/message-mail-attach-offline.gif b/EarlyBlue/messenger/icons/message-mail-attach-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e8c34fbe2a6d53337a3b5563565d680a4be64dcd
GIT binary patch
literal 114
zcmZ?wbhEHb6ky<EIK;qk;J|^jv@<}EmNxT05>Wif!pHywIv@h1mVw!vW7nN^%KOY(
zWc67Bm9O90R2rVj%Dp_U>6%{3_MI96>#t?5R++I_HYktd%*-}>50)b-e)9s{nHa1A
D3|%hb

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/message-mail-attach.gif b/EarlyBlue/messenger/icons/message-mail-attach.gif
similarity index 100%
rename from EarlyBlue/messenger/message-mail-attach.gif
rename to EarlyBlue/messenger/icons/message-mail-attach.gif
diff --git a/EarlyBlue/messenger/icons/message-mail-imapdelete-offline.gif b/EarlyBlue/messenger/icons/message-mail-imapdelete-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0a9f34ce448684e5a17a12a08ef79cca6da4df7d
GIT binary patch
literal 86
zcmZ?wbhEHb6ky<ESjfO|;J|^jv@<}EmNrv|0SG|i3{3hh{VQi1Kf6&FcusKBz3ZL)
nb&Mu8ax*xU1zPfUZF?kk?A=<aO<s$w{$0v#lj&Z>z+epkKF=Y7

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/message-mail-imapdelete.gif b/EarlyBlue/messenger/icons/message-mail-imapdelete.gif
similarity index 100%
rename from EarlyBlue/messenger/message-mail-imapdelete.gif
rename to EarlyBlue/messenger/icons/message-mail-imapdelete.gif
diff --git a/EarlyBlue/messenger/icons/message-mail-new-offline.gif b/EarlyBlue/messenger/icons/message-mail-new-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5c7e69639e68dabedf9e973a1cce9c7f464d805a
GIT binary patch
literal 111
zcmZ?wbhEHb6ky<EIK;qk;J^Xn|Hf%)Gt<(}0KtD4Q2fcl$iTqPpu+$JAhit4CKbEx
z=;+BgJ{4XVC1oX>z@a7MI_HI@2D9ptR}O31{~X%vbGmTGI}4c&?7ucPZJ3*(xyeI_
G!5RSCVJ$TP

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/message-mail-new.gif b/EarlyBlue/messenger/icons/message-mail-new.gif
similarity index 100%
rename from EarlyBlue/messenger/message-mail-new.gif
rename to EarlyBlue/messenger/icons/message-mail-new.gif
diff --git a/EarlyBlue/messenger/icons/message-mail-offline.gif b/EarlyBlue/messenger/icons/message-mail-offline.gif
new file mode 100644
index 0000000000000000000000000000000000000000..71e860ed46ce75b3568d20bc963363dd0e354bfe
GIT binary patch
literal 87
zcmZ?wbhEHb6krfwSjfPTmUadR{)2(yPZmZ71||j_1|R^*GcajP>0f#JE#IO!mm3;3
kA3KmI%R0B9_KxYaM=Vuo-f1Fh_APRKdhzi0T1EzI0I_=`nE(I)

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/message-mail.gif b/EarlyBlue/messenger/icons/message-mail.gif
similarity index 100%
rename from EarlyBlue/messenger/message-mail.gif
rename to EarlyBlue/messenger/icons/message-mail.gif
diff --git a/EarlyBlue/messenger/message-news-attach.gif b/EarlyBlue/messenger/icons/message-news-attach.gif
similarity index 100%
rename from EarlyBlue/messenger/message-news-attach.gif
rename to EarlyBlue/messenger/icons/message-news-attach.gif
diff --git a/EarlyBlue/messenger/message-news-new.gif b/EarlyBlue/messenger/icons/message-news-new.gif
similarity index 100%
rename from EarlyBlue/messenger/message-news-new.gif
rename to EarlyBlue/messenger/icons/message-news-new.gif
diff --git a/EarlyBlue/messenger/message-news.gif b/EarlyBlue/messenger/icons/message-news.gif
similarity index 100%
rename from EarlyBlue/messenger/message-news.gif
rename to EarlyBlue/messenger/icons/message-news.gif
diff --git a/EarlyBlue/messenger/icons/readcol.gif b/EarlyBlue/messenger/icons/readcol.gif
new file mode 100755
index 0000000000000000000000000000000000000000..376f4ba6b9ec0efc431aed826df347c738bf6f66
GIT binary patch
literal 76
zcmZ?wbhEHb<YVAvSjfO&3<UpYrlrmN|Np<@PZmZ724)5w1|R^*Gcd`{>0f!e_5lxv
c!xqUEp%$;Nh8~*cqja)YW3yXc5CelX0AN=bQUCw|

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/readmail.gif b/EarlyBlue/messenger/icons/readmail.gif
similarity index 100%
rename from EarlyBlue/messenger/readmail.gif
rename to EarlyBlue/messenger/icons/readmail.gif
diff --git a/EarlyBlue/messenger/server-local.gif b/EarlyBlue/messenger/icons/server-local.gif
similarity index 100%
rename from EarlyBlue/messenger/server-local.gif
rename to EarlyBlue/messenger/icons/server-local.gif
diff --git a/EarlyBlue/messenger/server-mail-new.gif b/EarlyBlue/messenger/icons/server-mail-new.gif
similarity index 100%
rename from EarlyBlue/messenger/server-mail-new.gif
rename to EarlyBlue/messenger/icons/server-mail-new.gif
diff --git a/EarlyBlue/messenger/server-mail.gif b/EarlyBlue/messenger/icons/server-mail.gif
similarity index 100%
rename from EarlyBlue/messenger/server-mail.gif
rename to EarlyBlue/messenger/icons/server-mail.gif
diff --git a/EarlyBlue/messenger/server-news-lock.gif b/EarlyBlue/messenger/icons/server-news-lock.gif
similarity index 100%
rename from EarlyBlue/messenger/server-news-lock.gif
rename to EarlyBlue/messenger/icons/server-news-lock.gif
diff --git a/EarlyBlue/messenger/server-news.gif b/EarlyBlue/messenger/icons/server-news.gif
similarity index 100%
rename from EarlyBlue/messenger/server-news.gif
rename to EarlyBlue/messenger/icons/server-news.gif
diff --git a/EarlyBlue/messenger/server-remote-lock.gif b/EarlyBlue/messenger/icons/server-remote-lock.gif
similarity index 100%
rename from EarlyBlue/messenger/server-remote-lock.gif
rename to EarlyBlue/messenger/icons/server-remote-lock.gif
diff --git a/EarlyBlue/messenger/server-remote.gif b/EarlyBlue/messenger/icons/server-remote.gif
similarity index 100%
rename from EarlyBlue/messenger/server-remote.gif
rename to EarlyBlue/messenger/icons/server-remote.gif
diff --git a/EarlyBlue/messenger/thread-closed.gif b/EarlyBlue/messenger/icons/thread-closed.gif
similarity index 100%
rename from EarlyBlue/messenger/thread-closed.gif
rename to EarlyBlue/messenger/icons/thread-closed.gif
diff --git a/EarlyBlue/messenger/thread-new-closed.gif b/EarlyBlue/messenger/icons/thread-new-closed.gif
similarity index 100%
rename from EarlyBlue/messenger/thread-new-closed.gif
rename to EarlyBlue/messenger/icons/thread-new-closed.gif
diff --git a/EarlyBlue/messenger/thread-new-open.gif b/EarlyBlue/messenger/icons/thread-new-open.gif
similarity index 100%
rename from EarlyBlue/messenger/thread-new-open.gif
rename to EarlyBlue/messenger/icons/thread-new-open.gif
diff --git a/EarlyBlue/messenger/thread-open.gif b/EarlyBlue/messenger/icons/thread-open.gif
similarity index 100%
rename from EarlyBlue/messenger/thread-open.gif
rename to EarlyBlue/messenger/icons/thread-open.gif
diff --git a/EarlyBlue/messenger/icons/threadcol.gif b/EarlyBlue/messenger/icons/threadcol.gif
new file mode 100755
index 0000000000000000000000000000000000000000..9e3d66ea807f10b351a3015de6e5b72ce5dd3b35
GIT binary patch
literal 64
zcmZ?wbhEHb<YVAvXkY+=|Ns9h{$ycfWME{_0r5dH3{2uZ{hX)wK2!48!uC^O-nQ&?
N*SPJPH#$TZtO4%q5!nC$

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/unreadmail.gif b/EarlyBlue/messenger/icons/unreadmail.gif
similarity index 100%
rename from EarlyBlue/messenger/unreadmail.gif
rename to EarlyBlue/messenger/icons/unreadmail.gif
diff --git a/EarlyBlue/messenger/icons/unthreadcol.gif b/EarlyBlue/messenger/icons/unthreadcol.gif
new file mode 100755
index 0000000000000000000000000000000000000000..7c68ea6cb6208fa2e54ab5a85b5e0a944bc06d08
GIT binary patch
literal 65
zcmZ?wbhEHb<YVAvXkY+=|Ns9h{$ycfWME{_0r5dH3``O|{gMaXzEBD<Ia!{!y5{A~
O+Ssp+ZkB4S4AuY-9}>O*

literal 0
HcmV?d00001

diff --git a/EarlyBlue/messenger/winclassic.gif b/EarlyBlue/messenger/icons/winclassic.gif
similarity index 100%
rename from EarlyBlue/messenger/winclassic.gif
rename to EarlyBlue/messenger/icons/winclassic.gif
diff --git a/EarlyBlue/messenger/winwide.gif b/EarlyBlue/messenger/icons/winwide.gif
similarity index 100%
rename from EarlyBlue/messenger/winwide.gif
rename to EarlyBlue/messenger/icons/winwide.gif
diff --git a/EarlyBlue/messenger/inbox.gif b/EarlyBlue/messenger/inbox.gif
deleted file mode 100644
index b70e02bf6d3a15c3a3ee18dad567641bb9effbad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 879
zcmc(eziQQC42ECf&>oj^Ky)f<+d;G)4n(oypi}>$gHmu7N@l?uC^|?57q@r~4qkwZ
zl%hf|psN&n3)(3@`EJ5*3rXHQdGq^i?`~~AcsbKdf28V{RZ-<tR;7+IE2GjYtx}zg
ztcVJ)unKjpXL*!+xs|J1Ez6?J%dAW&m9i8iFIkBIZKTnnnQHZ%ev#>!mZ=^~6p`T>
zmZ7E~>5=Z~mac}P)*{W*EKM-dnu?UCEX7o)5d#`Zu*fkOZKTnnS-nulJddyl^?r;c
zau2s~^}0}yG!L^du{}`KhCE~;*251l>BbKB2Z9ZuMhs{uDTRZ<Xd{i5+PO{>^UPgs
zB>ORz$jnXn%DPaHbeRhuaT){Qq8y{y7Ax@sOuDfHCKhHxs1XC2PO#u$Fxp6~Pt?_<
ziFx8;7|DK&B{KEL(Y}s*cXFJtZ5~(Y+F^9NKD_JJVMiZfY}iTzx^FT#T6jqFIdCP+
zV<$%aueWkBxg@P?qXGJ#(DaF3OqX}Q-2C=vdgadDzl(>*@0MylIh?JY99>=6+c=${
z9e-H7_x$URX9wSpZfw6<KAr#m`SIG?_5GdKzute^ynp`r_N!Y@-#)&)Fww(*)Wc+7

diff --git a/EarlyBlue/messenger/mailWindow1.css b/EarlyBlue/messenger/mailWindow1.css
index 32e3b701..e58161d7 100644
--- a/EarlyBlue/messenger/mailWindow1.css
+++ b/EarlyBlue/messenger/mailWindow1.css
@@ -46,17 +46,22 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: outliner focus-ring border adjustments ::::: */
+/* :::::
+   :: Make sure the min height is small so we can
+   :: resize the pane vertically -EDV
+   ::::: */
 
-#threadOutliner
-  {
-/*    border-bottom         : 1px solid ThreeDHighlight;
-    border-left           : 1px solid ThreeDShadow; */
-    min-width             : 1px;
-  }
+#messagepanebox {
+  min-height: 10px;
+  height: 0px;
+}
 
-#searchBox
-  {
-/*    border-left         : 1px solid ThreeDShadow; */
-  }
+/* ..... outliner adjustments ..... */
+ 
+#folderOutliner {
+  min-width: 1px;
+}
 
+#threadOutliner {
+  min-width: 1px;
+}
diff --git a/EarlyBlue/messenger/mailfolder.gif b/EarlyBlue/messenger/mailfolder.gif
deleted file mode 100644
index 75b86fd562b225819654cd89ad5e9c71ec7285c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 869
zcmc(ev1*lJ42Iv@GaPU^&~|fa2V3-PSu6(>I@oq9baAMQhylT=m!NRKp`1<3*40h7
zt|D|OS-N-9i;zz7$#)ZeTS)Te$(#Q_Jbw9X|IJJ@{gtX;Rz;OpS(Q4<tc*&pv`Td{
zvLY(H!Yb6Yp5;;Q<yNk4wJeJ=FS9bCRLWA6yksQ;w2?-OW~$Y5`bDN^TBdp|QACDk
zScaN{q({1^Te=#GT8lJKvoyg-YbsKnvJ_LHMhs{u!6L_Cw2?-OX7xfH^E|>L)cY}(
z$UWS`)$2k*(mc$<#P&c@8}g8aSPwtIq#HZf9|$&t8Zn@uq!bPYqm49LYUesl%rkej
zk?hA<A~QGPE9*i*(q%4u#AytGi*k%+Tdc$nFzLn)m{^z%p+*d7I>Ca2!Du6`K2cYb
zCgzEYVI=!8mdMl}NBcVN-N|vnws~BoYlqS8`tYt>haG){v0*C>=)TF|XyGBv=fIUP
zkDVCxzuxx!WKDXic?0x6q3MBMO&=Y7zx?@Wy7A=o)$i4>7Y|Ecr`kFAyt(`QZg2MX
mdbPFqIC+2j=jdYR<aGY+{N2r$`PuTr)sM%A%gOo!E&c)bT3{Lg

diff --git a/EarlyBlue/messenger/messageBody.css b/EarlyBlue/messenger/messageBody.css
index 37990d2c..4b43cd21 100644
--- a/EarlyBlue/messenger/messageBody.css
+++ b/EarlyBlue/messenger/messageBody.css
@@ -37,32 +37,51 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ===== messageBody.css ================================================
-  == Styles for the body of a mail message.
-  ======================================================================= */
-
-/* 
- * These are the style attributes for the XUL display.
- */
-window						          { overflow: auto; }
-mailheader					        { display: block; }
-mailattachcount				      { display: none; }
-
-headerdisplayname			      { font-weight: bold;  white-space: pre; }
-header						          { text-align: left; }
-
-/* 
- * For printing/HTML display...
- */
-table[name=header-part1]    { background-color: #EFEFEF; border: 0px solid #EFEFEF; border-left-width: 4px; }
-table[name=header-part2]    { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
-table[name=header-part3]    { background-color: #DEDEDE; border: 0px solid #DEDEDE; border-left-width: 4px; }
-div.headerdisplayname       { font-weight: bold;  white-space: pre; display: inline; }
-
-html {
+/* ===== messageBody.css =================================================
+   == Styles for the body of a mail message.
+   ======================================================================= */
+
+window {
+  overflow: auto;
+}
+
+mailattachcount {
+  display: none;
+}
+
+/* :::: message header ::::: */
+
+header {
+  text-align: left;
+}
+
+html|html {
+  /* XXX Doesn't seem to work. (Same with "html|body".) */
   background-color: white;
 }
 
+headerdisplayname {
+  font-weight: bold;
+  white-space: pre;
+}
+
+table[name="header-part1"] {
+  border-left: 4px solid #EFEFEF;
+  background-color: #EFEFEF;
+}
+
+table[name="header-part2"],
+table[name="header-part3"] {
+  border: 4px solid #DEDEDE;
+  background-color: #DEDEDE;
+}
+
+div.headerdisplayname {
+  display: inline;
+  font-weight: bold;
+  white-space: pre;
+}
+
 /* ::::: message text, incl. quotes ::::: */
 
 .moz-text-flowed blockquote {
@@ -75,25 +94,31 @@ html {
   margin: inherit;
   font-family: inherit;
 }
+
 .moz-text-plain[wrap="true"] {
   white-space: -moz-pre-wrap;
 }
+
 .moz-text-plain[wrap="false"] {
   white-space: pre;
 }
+
 .moz-text-plain[wrap="flow"] .moz-txt-sig {
   white-space: -moz-pre-wrap;
 }
+
 .moz-text-plain[graphical-quote="false"] blockquote {
   margin: inherit;
   border-left: inherit;
   padding-left: inherit;
 }
+
 .moz-text-plain[graphical-quote="true"] blockquote {
   margin: inherit;
   border-width: medium;
   border-color: gray;
 }
+
 .moz-text-plain[graphical-quote="true"] .moz-txt-citetags {
   display: none;
 }
@@ -104,9 +129,10 @@ html {
 .moz-signature {
   color: gray;
 }
+
 .moz-txt-sig > a,
 .moz-signature > a {
-  color: #7777FF /* light blue */;
+  color: #7777FF; /* light blue */
 }
 
 /* ::::: smilies ::::: */
@@ -122,23 +148,23 @@ span[-moz-smiley] > span {
 }
 
 span[-moz-smiley="s1"] {
-  background-image: url(chrome://global/skin/smiley/smile_n.gif);
+  background-image: url(chrome://editor/content/images/smile_n.gif);
 }
 span[-moz-smiley="s2"] {
-  background-image: url(chrome://global/skin/smiley/frown_n.gif);
+  background-image: url(chrome://editor/content/images/frown_n.gif);
 }
 span[-moz-smiley="s3"] {
-  background-image: url(chrome://global/skin/smiley/wink_n.gif);
+  background-image: url(chrome://editor/content/images/wink_n.gif);
 }
 span[-moz-smiley="s4"] { 
-  background-image: url(chrome://global/skin/smiley/tongue_n.gif);
+  background-image: url(chrome://editor/content/images/tongue_n.gif);
 }
 span[-moz-smiley="s5"] {
-  background-image: url(chrome://global/skin/smiley/laughing_n.gif);
+  background-image: url(chrome://editor/content/images/laughing_n.gif);
 }
 span[-moz-smiley="s6"] {
-  background-image: url(chrome://global/skin/smiley/embarrassed_n.gif);
+  background-image: url(chrome://editor/content/images/embarrassed_n.gif);
 }
 span[-moz-smiley="s7"] {
-  background-image: url(chrome://global/skin/smiley/undecided_n.gif);
+  background-image: url(chrome://editor/content/images/undecided_n.gif);
 }
diff --git a/EarlyBlue/messenger/messageHeader.css b/EarlyBlue/messenger/messageHeader.css
index 97ff2520..e8aa85e5 100644
--- a/EarlyBlue/messenger/messageHeader.css
+++ b/EarlyBlue/messenger/messageHeader.css
@@ -38,142 +38,110 @@
  * ***** END LICENSE BLOCK ***** */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for XUL elements */
 
 /* ===== messageHeader.css ==============================================
   == Styles for the header toolbars of a mail message.
   ======================================================================= */
 
+/* ::::: msg header toolbars ::::: */
+
 #collapsedHeaderView,
-#expandedHeaderView
-  {
-    min-width             : 1px;
-  }
-
-mail-headerfield,
-mail-toggle-headerfield
-  { 
-    padding               : 0px; 
-    padding-left          : 1px; 
-    padding-right         : 1px; 
-  }
-
-.buttonTopSpacer     
-  { 
-    height                : 0.3em; 
-  }
-
-.buttonSpacer        
-  { 
-    width                 : 0.5em; 
-  }
-
-.headerValueBox 
-  { 
-    width                 : 7.7em;
-    -moz-box-pack         : end;
-  }
-
-.headerBox              
-  { 
-    overflow              : hidden; 
-    min-width             : 50px;
-  }
-
-#addToAddressBookButton 
-  {
-	  list-style-image      : url("chrome://messenger/skin/addtoab.gif");
-    min-height            : 20px;
-    margin                : 0px;
-  }
+#expandedHeaderView {
+  min-width: 1px;
+}
+
+/* ::::: msg header buttons ::::: */
 
 #expandedAttachmentBox {
   width: 20em;
   height: 0px;
-  list-style-image: url("chrome://messenger/skin/attach.gif");
-}
-
-#attachmentText
-{
-  font-weight: bold;
+  list-style-image: url("chrome://messenger/skin/icons/attach.gif");
 }
 
 #attachmentTree {
-  margin: 3px;
-  marginleft: 0px;
+  margin: 3px 3px 3px 0px;
   height: 0px;
   width: 20em;
 }
 
-.emailDisplayImage
-  {
-    -moz-box-pack: end;
-  }
-
-.emailDisplayButton 
-  {
-    color                 : #336699;
-    cursor                : pointer;
-    margin                : 0px;
-    padding               : 0px; 
-    padding-left          : 1px; 
-    padding-right         : 1px; 
-  }
-
-.emailDisplayButton:hover
-  {
-    color                 : black;
-    background-color      : #336699;
-  }
-
-.showMoreAddressesButton 
-{
-  list-style-image      : url("chrome://global/skin/twisty-closed.gif");
-}
-
-.showFewerAddressesButton 
-{
-  list-style-image      : url("chrome://global/skin/twisty-open.gif");
-}
-
-.headerValue 
-  { 
-    white-space           : normal; 
-    min-width             : 50px; 
-  }
-
-.subjectvalue
- {
-  font-weight             : bold;
- }
-
-.headerdisplayname 
-  { 
-    font-weight           : bold; 
-    margin-right          : 0.5em; 
-    margin-left           : 0.5em; 
-    min-height: 16px;
-  }
-
-#msgHeaderView
-  {
-    border-left           : none;
-    border-right          : none;
-    border-bottom         : 1px solid #9999CC;
-  }
-       
-.expandHeaderViewButton {
-  list-style-image: url("chrome://global/skin/twisty-open.gif");
-  margin-left: .5em;
-  margin-right: .5em;
+#attachmentText {
+  font-weight: bold;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+  border-left: none;
+  border-right: none;
+}
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  border-bottom: 1px solid #9999CC;
+  min-width: 1px;
+}
+
+.headerNameBox {
+  width: 7.7em;
+}
+
+.headerName {
+  margin: 0em .25em 0em 0em;
+  min-height: 16px;
+  font-weight: bold;
+  text-align: right;
+}
+
+.headerValue {
+  margin: 0em 0em .25em 0em;
+  min-width: 50px;
+  white-space: normal;
+}
+
+.subjectvalue {
+  font-weight: bold;
+}
+
+/* ::::: msg header email addresses ::::: */
+
+.emailDisplayButton {
+  color: #336699;
+  cursor: pointer;
+  margin: 0px;
+  padding: 0px 1px; 
+}
+
+.emailDisplayButton:hover {
+  color: black;
+  background-color: #336699;
+}
+
+/* ::::: email address twisty ::::: */
+
+.addresstwisty {
+  margin: 1px;
+  list-style-image: url("chrome://global/skin/tree/twisty-closed.gif");
+}
+
+.addresstwisty[open] {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
 }
 
-.collapsedHeaderViewButton 
-{
-  list-style-image: url("chrome://global/skin/twisty-closed.gif");
-  margin-left: .5em;
+/* ::::: view expand and collapse twisties  ::::: */
+
+.expandHeaderViewButton,
+.collapsedHeaderViewButton  {
+  margin: 2px .5em 0 .5em;
+  padding: 0px;
 }
 
+.expandHeaderViewButton {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
+}
+
+.collapsedHeaderViewButton  {
+  list-style-image: url("chrome://global/skin/tree/twisty-closed.gif");
+}
 
 /* ::::: collapsed view styles ::::: */
 
@@ -181,35 +149,30 @@ mail-toggle-headerfield
   -moz-box-pack: center;
 }
 
-#collapseddateValue
-{
-  margin-left: .7em;
+#collapseddateValue {
+  margin: 0 .5em;
+  text-align: right;
 }
 
-#collapsedfromBox
-{
+#collapsedfromBox {
   width: 18em;
 }
 
-#collapseddateBox
-{
+#collapseddateBox {
   width: 12em;
 }
 
-.collapsedHeaderDisplayName 
-{ 
-  font-weight: bold; 
-  margin-left: .7em;
+.collapsedHeaderDisplayName { 
+  margin: 0 .5em 0 .7em;
   min-height: 16px;
+  font-weight: bold;
 }
 
-.collapsedAttachmentButton
-{
-  list-style-image: url("chrome://messenger/skin/message-mail-attach.gif");
-  margin-right: .5em;
-  margin-left: 1em;
+.collapsedHeaderValue {
+  margin: 0;
 }
 
-[hide] {
-  visibility: hidden;
+.collapsedAttachmentButton {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
+  margin-right: .5em;
 }
diff --git a/EarlyBlue/messenger/messageWindow.css b/EarlyBlue/messenger/messageWindow.css
index 5248d6fe..9e38df0a 100644
--- a/EarlyBlue/messenger/messageWindow.css
+++ b/EarlyBlue/messenger/messageWindow.css
@@ -35,15 +35,15 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ===== messageWindow.css ==============================================
   == Styles for the message window.
   ======================================================================= */
 
-@import url("chrome://messenger/skin/");
-@import url("chrome://messenger/skin/primaryToolbar.css");
-  
 /* ::::: message header borders ::::: */
 
 /*
@@ -51,4 +51,3 @@
   border: 1px outset ThreeDFace !important;
 }
 */
-
diff --git a/EarlyBlue/messenger/messenger.css b/EarlyBlue/messenger/messenger.css
index 720d6748..7ed2b579 100644
--- a/EarlyBlue/messenger/messenger.css
+++ b/EarlyBlue/messenger/messenger.css
@@ -43,14 +43,3 @@
 @import url("chrome://messenger/content/messenger.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: image precaching ::::: */
-
-#resource_bundle_messenger {
-   -moz-binding: url("chrome://messenger/skin/resources.xml#resource_bundle_messenger");
-}
-
-
-  
-
-
diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css
index 168141cd..578e6530 100644
--- a/EarlyBlue/messenger/messengercompose/messengercompose.css
+++ b/EarlyBlue/messenger/messengercompose/messengercompose.css
@@ -44,263 +44,161 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* ::::: image precaching ::::: */
+/* ::::: primary toolbar buttons ::::: */
  
-#resource_bundle_messengercompose {
-  -moz-binding: url("chrome://messenger/skin/resources.xml#resource_bundle_messengercompose");
+#button-send {
+  list-style-image: url("chrome://messenger/skin/messengercompose/send.gif");
 }
 
-/* ::::: primary toolbar buttons ::::: */
- 
-#button-send 
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/send.gif");
-  }
-
-#button-send[disabled="true"],
-#button-send[disabled="true"]:hover,
-#button-send[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/send-disabled.gif");
-  } 
-
-#button-send[offline="true"]
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/sendlater.gif");
-  }
-
-#button-send[offline="true"][disabled="true"],
-#button-send[offline="true"][disabled="true"]:hover,
-#button-send[offline="true"][disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/sendlater-disabled.gif");
-  }
-
-#button-address 
-  {
-          list-style-image      : url("chrome://messenger/skin/messengercompose/address.gif");
-  }
-
-#button-address[disabled="true"],
-#button-address[disabled="true"]:hover,
-#button-address[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/address-disabled.gif");
-  } 
-
-#button-attach 
-  {
-          list-style-image      : url("chrome://messenger/skin/messengercompose/attach.gif");
-  }
-
-#button-attach[disabled="true"],
-#button-attach[disabled="true"]:hover,
-#button-attach[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/attach-disabled.gif");
-  } 
-
-#button-quote 
-  {
-          list-style-image      : url("chrome://messenger/skin/messengercompose/quote.gif");
-  }
-
-#button-quote[disabled="true"],
-#button-quote[disabled="true"]:hover,
-#button-quote[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/quote-disabled.gif");
-  } 
-
-#spellingButton
-  {
-    list-style-image  : url("chrome://editor/skin/images/spell.gif");
-  }
-
-#spellingButton[disabled="true"],
-#spellingButton[disabled="true"]:hover,
-#spellingButton[disabled="true"]:hover:active
-  {
-    list-style-image   : url("chrome://editor/skin/images/spell-disabled.gif");
-  }
-
-#button-save 
-  {
-          list-style-image      : url("chrome://messenger/skin/messengercompose/savemsg.gif");
-  }
-
-#button-save[disabled="true"],
-#button-save[disabled="true"]:hover,
-#button-save[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/messengercompose/savemsg-disabled.gif");
-  } 
-
-#button-stop 
-  {
-          list-style-image      : url("chrome://global/skin/stop.gif");
-  }
-
-#button-stop[disabled="true"],
-#button-stop[disabled="true"]:hover,
-#button-stop[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://global/skin/stop-disabled.gif");
-  } 
+#button-send[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/send-disabled.gif") !important;
+} 
+
+#button-send[offline="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/sendlater.gif");
+}
+
+#button-send[offline="true"][disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/sendlater-disabled.gif") !important;
+}
+
+#button-address {
+  list-style-image: url("chrome://messenger/skin/messengercompose/address.gif");
+}
+
+#button-address[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/address-disabled.gif") !important;
+} 
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/messengercompose/attach.gif");
+}
+
+#button-attach[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/attach-disabled.gif") !important;
+} 
+
+#button-quote {
+  list-style-image: url("chrome://messenger/skin/messengercompose/quote.gif");
+}
+
+#button-quote[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/quote-disabled.gif") !important;
+} 
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/images/spell.gif");
+}
+
+#spellingButton[disabled="true"] {
+  list-style-image: url("chrome://editor/skin/images/spell-disabled.gif") !important;
+}
+
+#button-save {
+  list-style-image: url("chrome://messenger/skin/messengercompose/savemsg.gif");
+}
+
+#button-save[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/messengercompose/savemsg-disabled.gif") !important;
+} 
+
+#button-stop {
+  list-style-image: url("chrome://global/skin/icons/stop.gif");
+}
+
+#button-stop[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/stop-disabled.gif") !important;
+} 
 
 /* addressing widget */
   
-#addressingWidgetTree
-  {
-    height                : 80px;
-    width                 : 0px;
-    margin                : 0px;
-    -moz-user-focus       : none;
-    background-color      : #FFFFFF;
-  }  
+#addressingWidgetTree {
+  height: 80px;
+  width: 0px;
+  margin: 0px;
+  -moz-user-focus: none;
+  background-color: #FFFFFF;
+}  
   
-#listcol-addressingWidget 
-  {
-    width                 : 9em;
-    border-right          : 1px solid #CCD0DD;
-  }
+#listcol-addressingWidget {
+  width: 9em;
+  border-right: 1px solid #CCD0DD;
+}
   
 #addressingWidgetTree > treechildren > treeitem > treerow,
 #addressingWidgetTree > treechildren > treeitem[selected="true"] > treerow {
-  border                  : none;
-  background-color        : inherit;
-  color                   : inherit;
+  border: none;
+  background-color: inherit;
+  color: inherit;
 }
 
-.treecell-addressingWidget
-  {
-    border-bottom         : 1px solid #CCD0DD;
-    padding               : 0px !important;
-  }
-  
-.treecell-addressingWidget:first-child 
-  {
-    border-bottom         : none;
-  }
-
-.dummy-row-cell:first-child
-  {
-    border-bottom         : 1px solid #CCD0DD;
-  }
-
-.person-icon 
-  {
-    list-style-image      : url("chrome://messenger/skin/abcard.gif");
-    margin                : 0px 3px 0px 3px;
-  }
-
-outlinerbody:-moz-outliner-cell-text(default-match)
-  {
-    margin: 2px -3px 2px 15px;
-    border: none;
-  }
-
-outlinerbody:-moz-outliner-image(local-abook) 
-  {
-    margin: 2px -1px 2px 4px;
-    border: none;
-    list-style-image: url("chrome://messenger/skin/addressbook/myaddrbk.gif");
-  }
-
-outlinerbody:-moz-outliner-image(remote-abook) 
-  {
-    margin: 2px -3px 2px 2px;
-    border: none;
-    list-style-image: url("chrome://messenger/skin/addressbook/remote-abook.gif");
-  }
-
-outlinerbody:-moz-outliner-image(remote-err) 
-  {
-    margin: 2px -3px 2px 2px;
-    border: none;
-    list-style-image: url("chrome://messenger/skin/addressbook/remote-abook-down.gif");
-  }
-
-#msgheaderstoolbar-box
-  {
-/*    padding-top           : 2px; */
-  }
-  
-/* this applies to two boxes to left and right of attachmentbucket-sizer */
-#msgheaderstoolbar-box > vbox
-  {
-    padding               : 3px;
-  }
-
-#compose-toolbar-sizer
-  {
-    height                : 5px;
-    border-top            : 1px solid #CCD0DD; 
-    border-bottom         : 1px solid #CCD0DD; 
-  }    
-  
-#content-frame
-  {
-    border                : 1px inset #CCD0DD;
-  }
-
-#appcontent
-  {
-/*    border-left           : 1px solid ThreeDShadow;
-    border-right          : 1px solid ThreeDHighlight;
-    border-top            : 1px solid ThreeDShadow; */
-  }  
-
-#attachmentbucket-sizer
-  {
-    width                 : 5px;
-  }
+.treecell-addressingWidget {
+  border-bottom: 1px solid #CCD0DD;
+  padding: 0px !important;
+}
   
-#msgIdentity, #msgSubject
-  {
-    margin-right          : 0px;
-  }  
+.treecell-addressingWidget:first-child {
+  border-bottom: none;
+}
 
-#msgSubject
-  {
-    margin-top            : 2px;
-  }
+.textbox-addressingWidget {
+  -moz-box-align: center;
+}
+
+.dummy-row-cell:first-child {
+  border-bottom: 1px solid #CCD0DD;
+}
+
+.aw-menulist {
+  -moz-user-focus: ignore;
+}
 
-#attachmentBucket
-  {
-    margin                : 0px;
-    -moz-user-focus       : normal !important;
-  }
+.person-icon {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
+  margin: 0px 3px 0px 3px;
+}
 
-#attachmentBucketText
-  {
-    margin-bottom         : 2px;
-    -moz-user-focus       : none;
-  }
+/* ::::: autocomplete icons ::::: */
 
+outlinerbody:-moz-outliner-cell-text(default-match) {
+  margin: 2px -3px 2px 15px;
+  border: none;
+}
 
-/* askSendFormat dialog */
+outlinerbody:-moz-outliner-image(local-abook) {
+  margin: 2px -1px 2px 4px;
+  border: none;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/addrbook.gif");
+}
 
-#askSendFormat {
-	width: 40em;
+outlinerbody:-moz-outliner-image(remote-abook) {
+  margin: 2px -3px 2px 2px;
+  border: none;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif");
 }
 
-#askImageBox {
- -moz-box-align: start;
+outlinerbody:-moz-outliner-image(remote-err) {
+  margin: 2px -3px 2px 2px;
+  border: none;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook-error.gif");
 }
 
-#convertYes {
-	list-style-image:url("chrome://global/skin/question-icon.gif");
+/* ::::: EarlyBlue layout corrections ::::: */
+
+#addresses-box,
+#attachments-box {
+  padding: 1px 5px;
 }
 
-#convertAltering {
-	list-style-image:url("chrome://global/skin/question-icon.gif");
+#msgIdentity,
+#msgSubject {
+  margin-right: 0px;
 }
 
-#convertNo {
-	list-style-image:url("chrome://global/skin/alert-icon.gif");
+#attachmentBucket {
+  margin: 3px 0px 2px 0px;
 }
 
-#convertDefault {
-	list-style-image:url("chrome://global/skin/question-icon.gif");
-} /* Workaround for bug 50217. Please remove this rule, when this bug is fixed. */
+#compose-toolbar-sizer {
+  border-top: none;
+}
diff --git a/EarlyBlue/messenger/newshost.gif b/EarlyBlue/messenger/newshost.gif
deleted file mode 100644
index 2a3cb60a05cb94667670728029cb7254a0b848cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 887
zcmc(ey=s<W42ExiC|~W;!AZIlL0S}{X0Zr@wrX_}`hkvGN)ExnrGp?&{@@fRtwWEX
zV8O+$L(sw1r5=G!A{644=Olc#kmSylJMVkv?(M6qkLNY7KT`F}s;KfRt5Qdql~L)H
zR;f-#Rz!tYScSUQvpmYZ+{)FhmSs`qWmYDXN?D4Mm#jp9HqvO(OtpGWzsU4V%T$jg
zipcN`%TQC0^hoz~OIJftYmw$@mL?c!O-0I6mSQT@hye{HSmYRtHqvO(tX`;No<~@O
zdOyYzxrbZ0dR-_;nul4K*d8cqLmsja>){8ObYlnm1Hpz+BL*~-l)}Maw2?+j?Odmc
zdFHM*lKmJ<WacJ(WnCypy3B=-IE?{tQI64Ui<S5RCf(Qp6AQB;)QAC1Cs=SW7;U80
zC+cd_#5{2^jATE?5}EqrXkW*@J2_6+Hjk@x?J&AsAKrEAu%nMKHf*H<-8UH=Ej*<8
z9JmtZu@j^I*IWF1`h;{*ml~k|2~DPYFj@HY^VOGUJ2MxillLFiG&gto`1`L%x1P@~
zU;n&x|NPAtGmB4tJp6sM{`&0Z)9sBb9}nLwt)AOHSlPPqZejM``r+HXuP<%q%>MFp
M@7wOisgt_)4?-nqh5!Hn

diff --git a/EarlyBlue/messenger/prefPanels.css b/EarlyBlue/messenger/prefPanels.css
index 16653026..772c141e 100644
--- a/EarlyBlue/messenger/prefPanels.css
+++ b/EarlyBlue/messenger/prefPanels.css
@@ -47,18 +47,15 @@
 /* :::::: layout preference icons ::::: */
 
 #classic {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/winclassic.gif");
+  min-height: 32px;
+  list-style-image: url("chrome://messenger/skin/icons/winclassic.gif");
 }
 
 #wide {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/winwide.gif");
+  min-height: 32px;
+  list-style-image: url("chrome://messenger/skin/icons/winwide.gif");
 }
 
-.smileface
-  {
-    list-style-image : url("chrome://global/skin/smiley/smile_n.gif");
-  }
-
-
+.smileface {
+  list-style-image: url("chrome://editor/content/images/smile_n.gif");
+}
diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index 1f8b5a90..539cbfed 100644
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -43,134 +43,90 @@
 
 /* ::::: primary toolbar buttons ::::: */
 
-#button-getmsg 
-  {
-	  list-style-image      : url("chrome://messenger/skin/getmsg.gif");
-  } 
-
-#button-getmsg[disabled="true"],
-#button-getmsg[disabled="true"][buttonover="true"],
-#button-getmsg[disabled="true"][buttondown="true"]
-  {
-    list-style-image      : url("chrome://messenger/skin/getmsg-disabled.gif");
-  } 
-
-#button-newmsg 
-  {
-	  list-style-image      : url("chrome://messenger/skin/newmsg.gif");
-  } 
-
-#button-newmsg[disabled="true"],
-#button-newmsg[disabled="true"]:hover,
-#button-newmsg[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/newmsg-disabled.gif");
-  } 
-
-#button-reply 
-  {
-	  list-style-image      : url("chrome://messenger/skin/reply.gif");
-  } 
-
-#button-reply[disabled="true"],
-#button-reply[disabled="true"]:hover,
-#button-reply[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/reply-disabled.gif");
-  } 
-
-#button-replyall 
-  {
-	  list-style-image      : url("chrome://messenger/skin/replyall.gif");
-  } 
-
-#button-replyall[disabled="true"],
-#button-replyall[disabled="true"]:hover,
-#button-replyall[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/replyall-disabled.gif");
-  } 
-
-#button-forward 
-  {
-	  list-style-image      : url("chrome://messenger/skin/forward.gif");
-  } 
-
-#button-forward[disabled="true"],
-#button-forward[disabled="true"]:hover,
-#button-forward[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/forward-disabled.gif");
-  } 
-
-#button-file 
-  {
-	  list-style-image      : url("chrome://messenger/skin/file.gif");
-  } 
-
-#button-file[disabled="true"],
-#button-file[disabled="true"]:hover,
-#button-file[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/file-disabled.gif");
-  } 
-
-#button-next 
-  {
-	  list-style-image      : url("chrome://messenger/skin/next.gif");
-  } 
-
-#button-next[disabled="true"],
-#button-next[disabled="true"]:hover,
-#button-next[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/next-disabled.gif");
-  } 
-
-#button-delete 
-  {
-	  list-style-image      : url("chrome://messenger/skin/trash.gif");
-  } 
-
-#button-delete[disabled="true"],
-#button-delete[disabled="true"]:hover,
-#button-delete[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://messenger/skin/trash-disabled.gif");
-  } 
+#button-getmsg {
+  list-style-image: url("chrome://messenger/skin/toolbar/getmsg.gif");
+}
+
+#button-getmsg[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/getmsg-disabled.gif") !important;
+}
+
+#button-newmsg {
+  list-style-image: url("chrome://messenger/skin/toolbar/newmsg.gif");
+}
+
+#button-newmsg[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/newmsg-disabled.gif") !important;
+}
+
+#button-reply {
+  list-style-image: url("chrome://messenger/skin/toolbar/reply.gif");
+}
+
+#button-reply[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/reply-disabled.gif") !important;
+}
+
+#button-replyall {
+  list-style-image: url("chrome://messenger/skin/toolbar/replyall.gif");
+}
+
+#button-replyall[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/replyall-disabled.gif") !important;
+}
+
+#button-forward {
+  list-style-image: url("chrome://messenger/skin/toolbar/forward.gif");
+}
+
+#button-forward[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/forward-disabled.gif") !important;
+}
+
+#button-file {
+  list-style-image: url("chrome://messenger/skin/toolbar/file.gif");
+}
+
+#button-file[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/file-disabled.gif") !important;
+}
+
+#button-next {
+  list-style-image: url("chrome://messenger/skin/toolbar/next.gif");
+}
+
+#button-next[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/next-disabled.gif") !important;
+}
+
+#button-delete {
+  list-style-image: url("chrome://global/skin/icons/trash.gif");
+}
+
+#button-delete[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/trash-disabled.gif") !important;
+}
 
 #button-mark {
-	list-style-image	: url("chrome://messenger/skin/mark.gif");
-}
-
-#button-mark[disabled="true"],
-#button-mark[disabled="true"][buttonover="true"],
-#button-mark[disabled="true"][buttondown="true"]
-  {
-    list-style-image      : url("chrome://messenger/skin/mark-disabled.gif");
-  } 
-
-#button-print 
-  {
-    list-style-image      : url("chrome://global/skin/print.gif");
-  }
-
-#button-print[disabled="true"],
-#button-print[disabled="true"][buttonover="true"],
-#button-print[disabled="true"][buttondown="true"]
-  {
-    list-style-image      : url("chrome://global/skin/print-disabled.gif");
-  }
-
-#button-stop 
-  {
-	  list-style-image      : url("chrome://global/skin/stop.gif");
-  } 
-
-#button-stop[disabled="true"],
-#button-stop[disabled="true"]:hover,
-#button-stop[disabled="true"]:hover:active
-  {
-    list-style-image      : url("chrome://global/skin/stop-disabled.gif");
-  } 
+  list-style-image: url("chrome://messenger/skin/toolbar/mark.gif");
+}
+
+#button-mark[disabled="true"] {
+  list-style-image: url("chrome://messenger/skin/toolbar/mark-disabled.gif") !important;
+}
+
+#button-print {
+  list-style-image: url("chrome://global/skin/icons/print.gif");
+}
 
+#button-print[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/print-disabled.gif") !important;
+}
+
+#button-stop {
+  list-style-image: url("chrome://global/skin/icons/stop.gif");
+}
+
+#button-stop[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/stop-disabled.gif") !important;
+}
diff --git a/EarlyBlue/messenger/readcol.gif b/EarlyBlue/messenger/readcol.gif
deleted file mode 100755
index 81a859929c168b4cff03aeae6254238bfbe215f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 861
zcmXAoJ!{lK5Qj%N<N^^A45_Y33NcYcna0!Z3SWv~3R53Jn6Hq=;txth3ke93>8^-E
z3PJJ-q6QH&MXDTvsZs=jU{d8I$oTBKaO}?Q&hKsR?mxVDySqFg6LKbHHTBcft)Xg~
zZPw52_uo%itya6;9v>f{oSdAVp6+xyv$L~vb8|~eOA8ANy<V@|?dH=a7Z>;CP5jE=
z`(KZa_CIW{sfdZVNC2*)DyHHpp_27ZP0Yki!X)ccbukxr374#$8e$<H5+TVs#Zw{+
zB9JC@@I<o`sH&;DYN%%Aqc&4F4b!ajT$`)AhHF+eytYsejnJ%}mg=dInpG&mQHr$6
z4<{s`0z)5fiw(YDxmi?8P*S*CxMg*S0uPI@tZq@`X^|Kz&hT7B6{Fb30X-<fYe@tu
zOn?Ul(&~{05BIELVFqIA2+x`w-r(js(z8ZM_9RWTWJzp<L@LC9Z@gj-H;ASUnW(G$
z6||rNQ)a+(?)ie1btFWFLs+Sk`06m39%Eq$q)yD_N|p?dv`C0Z=)pa+#3G(bf00>6
ziyZhN1QAGDdCnyj%>ex0*g3tEnSQ^&va+(ey1Kr;zPr1-wY4=I4i63v4i68HkB?7J
zPe-Fso}UZ`8%@)cA5Kcvjhz!~=1=Q_$X~h6CI5&Ck@g)qAL~5$IQaCeeR+Orur_F3
vTsj}yJ6l`+{Br8rjkqfPFRw<u`JLgdjc?DdJbL~3$KI2jw>OtBw&d<VFoK?;

diff --git a/EarlyBlue/messenger/resources.xml b/EarlyBlue/messenger/resources.xml
deleted file mode 100644
index d44e2b9c..00000000
--- a/EarlyBlue/messenger/resources.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<bindings id="resourcesBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-          
- <binding id="resource_bundle_messenger">
-   <resources>
-      <image src="chrome://messenger/skin/getmsg-disabled.gif"/>
-      <image src="chrome://messenger/skin/newmsg.gif"/>
-      <image src="chrome://messenger/skin/newmsg-disabled.gif"/>
-      <image src="chrome://messenger/skin/mark.gif"/>
-      <image src="chrome://messenger/skin/mark-disabled.gif"/>
-      <image src="chrome://messenger/skin/reply.gif"/>
-      <image src="chrome://messenger/skin/reply-disabled.gif"/>
-      <image src="chrome://messenger/skin/replyall.gif"/>
-      <image src="chrome://messenger/skin/replyall-disabled.gif"/>
-      <image src="chrome://messenger/skin/forward.gif"/>
-      <image src="chrome://messenger/skin/forward-disabled.gif"/>
-      <image src="chrome://messenger/skin/file.gif"/>
-      <image src="chrome://messenger/skin/file-disabled.gif"/>
-      <image src="chrome://messenger/skin/next.gif"/>
-      <image src="chrome://messenger/skin/next-disabled.gif"/>
-      <image src="chrome://messenger/skin/trash.gif"/>
-      <image src="chrome://messenger/skin/trash-disabled.gif"/>
-      <image src="chrome://messenger/skin/readmail.gif"/>
-      <image src="chrome://messenger/skin/unreadmail.gif"/>
-      <image src="chrome://messenger/skin/flagcol.gif"/>
-      <image src="chrome://messenger/skin/readmail.gif"/>
-      <image src="chrome://global/skin/print.gif"/>
-      <image src="chrome://global/skin/print-disabled.gif"/>
-      <image src="chrome://global/skin/stop.gif"/>
-      <image src="chrome://global/skin/stop-disabled.gif"/>
-   </resources>	
-  </binding>
-     
-  <binding id="resource_bundle_messengercompose">
-    <resources>
-      <image src="chrome://messenger/skin/messengercompose/address-disabled.gif"/>
-    </resources>
-  </binding>        
-
-</bindings>
diff --git a/EarlyBlue/messenger/searchDialog.css b/EarlyBlue/messenger/searchDialog.css
index 0d601d94..03698962 100644
--- a/EarlyBlue/messenger/searchDialog.css
+++ b/EarlyBlue/messenger/searchDialog.css
@@ -48,5 +48,3 @@
 #searchTermTree {
   min-height: 50px;
 }
-
-
diff --git a/EarlyBlue/messenger/subscribe.css b/EarlyBlue/messenger/subscribe.css
index 40b42baf..3c4a941b 100644
--- a/EarlyBlue/messenger/subscribe.css
+++ b/EarlyBlue/messenger/subscribe.css
@@ -52,55 +52,52 @@
 /* ::::: subscribed icons  :::::: */
 
 .subscribedcol {
-  list-style-image: url("chrome://messenger/skin/dot.gif");
+  list-style-image: url("chrome://messenger/skin/icons/dot.gif");
 }
 
 .subscribedcol[Subscribed="true"] {
-  list-style-image: url("chrome://messenger/skin/check.gif");
+  list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
 
 /* ::::: folder icons :::::: */
 
 .tree-cell-subscribe-icon {
-  list-style-image: url("chrome://messenger/skin/folder-closed.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.gif");
 }
 
 .tree-cell-subscribe-icon[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
 }
 
 /* ::::: server icons :::::: */
 
 .subscribeMenuItem {
-  list-style-image: url("chrome://messenger/skin/server-mail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
 .subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
 .subscribeMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/server-news.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
 }
 
 .subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
-  list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
 
 /* ::::: for search in subscribe ::::: */
 
 outlinerbody:-moz-outliner-image(nameCol, nntp) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
 }
 
 outlinerbody:-moz-outliner-image(subscribedCol) {
-  list-style-image: url("chrome://messenger/skin/dot.gif");
+  list-style-image: url("chrome://messenger/skin/icons/dot.gif");
 }
 
 outlinerbody:-moz-outliner-image(subscribedCol, subscribed) {
-  list-style-image: url("chrome://messenger/skin/check.gif");
+  list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
-
-
-
diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index 886511ce..5d20528e 100644
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -43,51 +43,52 @@
   == Styles for the thread pane in the Messenger 3-pane window.
   ======================================================================= */
 
-/* ::::: connecting lines ::::: */
+/* ::::: thread decoration ::::: */
 
-outlinerbody:-moz-outliner-line
-{
-  visibility: hidden;
+outlinerchildren:-moz-outliner-cell-text(read) {
+  font-weight: normal;
 }
 
-/* ::::: thread decoration ::::: */
-
-outlinerbody:-moz-outliner-cell-text(unread) {
+outlinerchildren:-moz-outliner-cell-text(unread) {
   font-weight: bold;
 }
 
 /* on a collapsed thread, if the top level message is read, but the thread has
  * unread children, underline the text.  4.x mac did this, very slick 
  */
-outlinerbody:-moz-outliner-cell-text(container, closed, hasUnread, read) {
+outlinerchildren:-moz-outliner-cell-text(container, closed, hasUnread, read) {
   text-decoration: underline;
 }
 
 /* ::::: priority colors ::::: */
-
-outlinerbody:-moz-outliner-cell-text(priorityCol, priority-highest) {
+/****
+ ****  Priority colors currently not being used at the moment.  It has been
+ ****  disabled so as to not conflict with the labels color feature.
+ ****
+outlinerchildren:-moz-outliner-cell-text(priorityCol, priority-highest) {
   color: red;
 }
 
-outlinerbody:-moz-outliner-cell-text(priorityCol, priority-high) {
+outlinerchildren:-moz-outliner-cell-text(priorityCol, priority-high) {
   color: rgb(128, 0, 0);
 }
 
-outlinerbody:-moz-outliner-cell-text(priorityCol, priority-lowest) {
+outlinerchildren:-moz-outliner-cell-text(priorityCol, priority-lowest) {
   color: rgb(170, 170, 170);
 }
 
-outlinerbody:-moz-outliner-cell-text(priorityCol, priority-low) {
+outlinerchildren:-moz-outliner-cell-text(priorityCol, priority-low) {
   color: rgb(85, 85, 85);
 }
 
-outlinerbody:-moz-outliner-cell-text(priorityCol, selected) {
+outlinerchildren:-moz-outliner-cell-text(priorityCol, selected) {
   color: -moz-DialogText;
 }
 
-outlinerbody:-moz-outliner-cell-text(priorityCol, selected, focus) {
+outlinerchildren:-moz-outliner-cell-text(priorityCol, selected, focus) {
   color: HighlightText;
 }
+ ****/
 
 /* ::::: message icons ::::: */
 
@@ -96,98 +97,120 @@ outlinerbody:-moz-outliner-cell-text(priorityCol, selected, focus) {
 /* ..... thread column ..... */
 
 outlinercol.threadColumnHeader {
-  list-style-image: url("chrome://messenger/skin/unthreadcol.gif");
+  list-style-image: url("chrome://messenger/skin/icons/unthreadcol.gif");
 }
 
 outlinercol.threadColumnHeader[sortDirection="ascending"]  {
-  list-style-image: url("chrome://messenger/skin/threadcol.gif");
+  list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
 }
 
 outlinercol.threadColumnHeader[sortDirection="descending"] {
-  list-style-image: url("chrome://messenger/skin/threadcol.gif");
+  list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
 }
 
-outlinerbody:-moz-outliner-image(threadCol, container) {
-  list-style-image: url("chrome://messenger/skin/thread-closed.gif");
+outlinerchildren:-moz-outliner-image(threadCol, container) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed.gif");
 }
 
-outlinerbody:-moz-outliner-image(threadCol, container, open) {
-  list-style-image: url("chrome://messenger/skin/thread-open.gif");
+outlinerchildren:-moz-outliner-image(threadCol, container, open) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-open.gif");
 }
 
-outlinerbody:-moz-outliner-image(threadCol, container, hasUnread) {
-  list-style-image: url("chrome://messenger/skin/thread-new-closed.gif");
+outlinerchildren:-moz-outliner-image(threadCol, container, hasUnread) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed.gif");
 }
 
-outlinerbody:-moz-outliner-image(threadCol, container, hasUnread, open) {
-  list-style-image: url("chrome://messenger/skin/thread-new-open.gif");
+outlinerchildren:-moz-outliner-image(threadCol, container, hasUnread, open) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-open.gif");
 }
 
 /* ..... read column ..... */
 
 outlinercol.readColumnHeader {
-  list-style-image: url("chrome://messenger/skin/readcol.gif");
+  list-style-image: url("chrome://messenger/skin/icons/readcol.gif");
 }
 
-outlinerbody:-moz-outliner-image(unreadButtonColHeader) {
-  list-style-image: url("chrome://messenger/skin/readmail.gif");
+outlinerchildren:-moz-outliner-image(unreadButtonColHeader) {
+  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
 }
 
-outlinerbody:-moz-outliner-image(unreadButtonColHeader, unread) {
-  list-style-image: url("chrome://messenger/skin/unreadmail.gif");
+outlinerchildren:-moz-outliner-image(unreadButtonColHeader, unread) {
+  list-style-image: url("chrome://messenger/skin/icons/unreadmail.gif");
 }
 
 /* ..... flag column ..... */
 
 outlinercol.flagColumnHeader {
-  list-style-image: url("chrome://messenger/skin/flagcol.gif");
+  list-style-image: url("chrome://messenger/skin/icons/flagcol.gif");
 }
 
-outlinerbody:-moz-outliner-image(flaggedCol) {
-  list-style-image: url("chrome://messenger/skin/readmail.gif");
+outlinerchildren:-moz-outliner-image(flaggedCol) {
+  list-style-image: url("chrome://messenger/skin/icons/readmail.gif");
 }
 
-outlinerbody:-moz-outliner-image(flaggedCol, flagged) {
-  list-style-image: url("chrome://messenger/skin/flaggedmail.gif");
+outlinerchildren:-moz-outliner-image(flaggedCol, flagged) {
+  list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif");
 }
 
 /* ..... subject column ..... */
 
-outlinerbody:-moz-outliner-image(subjectCol) {
+outlinerchildren:-moz-outliner-image(subjectCol) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/message-mail.gif");
+}
+
+outlinerchildren:-moz-outliner-image(subjectCol, new) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-mail.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, new) {
+outlinerchildren:-moz-outliner-image(subjectCol, attach) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-mail-new.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, attach) {
+outlinerchildren:-moz-outliner-image(subjectCol, imapdeleted) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-mail-attach.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, imapdeleted) {
+outlinerchildren:-moz-outliner-image(subjectCol, offline) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-mail-imapdelete.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offline.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, news) {
+outlinerchildren:-moz-outliner-image(subjectCol, new, offline) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-news.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offline.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, news, new) {
+outlinerchildren:-moz-outliner-image(subjectCol, attach, offline) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-news-new.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offline.gif");
 }
 
-outlinerbody:-moz-outliner-image(subjectCol, news, attach) {
+outlinerchildren:-moz-outliner-image(subjectCol, imapdeleted, offline) {
   padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/message-news-attach.gif");
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdel-offline.gif");
 }
 
+outlinerchildren:-moz-outliner-image(subjectCol, news) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
+}
 
+outlinerchildren:-moz-outliner-image(subjectCol, news, new) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
+}
 
+outlinerchildren:-moz-outliner-image(subjectCol, news, attach) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach.gif");
+}
 
+#sizeCol,
+#unreadCol,
+#totalCol {
+  text-align: right;
+}
diff --git a/EarlyBlue/messenger/threadPaneLabels.css b/EarlyBlue/messenger/threadPaneLabels.css
new file mode 100644
index 00000000..7cbfd20b
--- /dev/null
+++ b/EarlyBlue/messenger/threadPaneLabels.css
@@ -0,0 +1,562 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla 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/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Scott MacGregor (mscott@netscape.com)
+ *   Joe Hewitt (hewitt@netscape.com)
+ *   Sean Su <ssu@netscape.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/* ===== threadPaneLabels.css ===========================================
+   == Styles for the thread pane in the Messenger 3-pane window.
+   ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread labels decoration ::::: */
+
+/* There are 10x7 color definitions (size of the color picker used)
+   times 2 (2 style definitions for each color) +  2 general black
+   and white color definitions.
+   The color definitions can be in the following formats:
+     color: red;
+     color: #FF0000;
+     color: rgb(128, 0, 0); 
+*/
+outlinerchildren:-moz-outliner-cell-text(lc-FFFFFF) {
+  color: #FFFFFF
+}
+outlinerchildren:-moz-outliner-row(lc-FFFFFF, selected) {
+  background-color: #FFFFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-CCCCCC) {
+  color: #CCCCCC
+}
+outlinerchildren:-moz-outliner-row(lc-CCCCCC, selected) {
+  background-color: #CCCCCC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-C0C0C0) {
+  color: #C0C0C0
+}
+outlinerchildren:-moz-outliner-row(lc-C0C0C0, selected) {
+  background-color: #C0C0C0;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-999999) {
+  color: #999999
+}
+outlinerchildren:-moz-outliner-row(lc-999999, selected) {
+  background-color: #999999;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-666666) {
+  color: #666666
+}
+outlinerchildren:-moz-outliner-row(lc-666666, selected) {
+  background-color: #666666;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-333333) {
+  color: #333333
+}
+outlinerchildren:-moz-outliner-row(lc-333333, selected) {
+  background-color: #333333;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-000000) {
+  color: #000000
+}
+outlinerchildren:-moz-outliner-row(lc-000000, selected) {
+  background-color: #000000;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFCCCC) {
+  color: #FFCCCC
+}
+outlinerchildren:-moz-outliner-row(lc-FFCCCC, selected) {
+  background-color: #FFCCCC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FF6666) {
+  color: #FF6666
+}
+outlinerchildren:-moz-outliner-row(lc-FF6666, selected) {
+  background-color: #FF6666;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FF0000) {
+  color: #FF0000
+}
+outlinerchildren:-moz-outliner-row(lc-FF0000, selected) {
+  background-color: #FF0000;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-CC0000) {
+  color: #CC0000
+}
+outlinerchildren:-moz-outliner-row(lc-CC0000, selected) {
+  background-color: #CC0000;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-990000) {
+  color: #990000
+}
+outlinerchildren:-moz-outliner-row(lc-990000, selected) {
+  background-color: #990000;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-660000) {
+  color: #660000
+}
+outlinerchildren:-moz-outliner-row(lc-660000, selected) {
+  background-color: #660000;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-330000) {
+  color: #330000
+}
+outlinerchildren:-moz-outliner-row(lc-330000, selected) {
+  background-color: #330000;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFCC99) {
+  color: #FFCC99
+}
+outlinerchildren:-moz-outliner-row(lc-FFCC99, selected) {
+  background-color: #FFCC99;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FF9966) {
+  color: #FF9966
+}
+outlinerchildren:-moz-outliner-row(lc-FF9966, selected) {
+  background-color: #FF9966;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FF9900) {
+  color: #FF9900
+}
+outlinerchildren:-moz-outliner-row(lc-FF9900, selected) {
+  background-color: #FF9900;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FF6600) {
+  color: #FF6600
+}
+outlinerchildren:-moz-outliner-row(lc-FF6600, selected) {
+  background-color: #FF6600;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-CC6600) {
+  color: #CC6600
+}
+outlinerchildren:-moz-outliner-row(lc-CC6600, selected) {
+  background-color: #CC6600;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-993300) {
+  color: #993300
+}
+outlinerchildren:-moz-outliner-row(lc-993300, selected) {
+  background-color: #993300;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-663300) {
+  color: #663300
+}
+outlinerchildren:-moz-outliner-row(lc-663300, selected) {
+  background-color: #663300;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFFF99) {
+  color: #FFFF99
+}
+outlinerchildren:-moz-outliner-row(lc-FFFF99, selected) {
+  background-color: #FFFF99;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFFF66) {
+  color: #FFFF66
+}
+outlinerchildren:-moz-outliner-row(lc-FFFF66, selected) {
+  background-color: #FFFF66;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFCC66) {
+  color: #FFCC66
+}
+outlinerchildren:-moz-outliner-row(lc-FFCC66, selected) {
+  background-color: #FFCC66;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFCC33) {
+  color: #FFCC33
+}
+outlinerchildren:-moz-outliner-row(lc-FFCC33, selected) {
+  background-color: #FFCC33;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-CC9933) {
+  color: #CC9933
+}
+outlinerchildren:-moz-outliner-row(lc-CC9933, selected) {
+  background-color: #CC9933;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-996633) {
+  color: #996633
+}
+outlinerchildren:-moz-outliner-row(lc-996633, selected) {
+  background-color: #996633;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-663333) {
+  color: #663333
+}
+outlinerchildren:-moz-outliner-row(lc-663333, selected) {
+  background-color: #663333;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFFFCC) {
+  color: #FFFFCC
+}
+outlinerchildren:-moz-outliner-row(lc-FFFFCC, selected) {
+  background-color: #FFFFCC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFFF33) {
+  color: #FFFF33
+}
+outlinerchildren:-moz-outliner-row(lc-FFFF33, selected) {
+  background-color: #FFFF33;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFFF00) {
+  color: #FFFF00
+}
+outlinerchildren:-moz-outliner-row(lc-FFFF00, selected) {
+  background-color: #FFFF00;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFCC00) {
+  color: #FFCC00
+}
+outlinerchildren:-moz-outliner-row(lc-FFCC00, selected) {
+  background-color: #FFCC00;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-999900) {
+  color: #999900
+}
+outlinerchildren:-moz-outliner-row(lc-999900, selected) {
+  background-color: #999900;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-666600) {
+  color: #666600
+}
+outlinerchildren:-moz-outliner-row(lc-666600, selected) {
+  background-color: #666600;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-333300) {
+  color: #333300
+}
+outlinerchildren:-moz-outliner-row(lc-333300, selected) {
+  background-color: #333300;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-99FF99) {
+  color: #99FF99
+}
+outlinerchildren:-moz-outliner-row(lc-99FF99, selected) {
+  background-color: #99FF99;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-66FF99) {
+  color: #66FF99
+}
+outlinerchildren:-moz-outliner-row(lc-66FF99, selected) {
+  background-color: #66FF99;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-33FF33) {
+  color: #33FF33
+}
+outlinerchildren:-moz-outliner-row(lc-33FF33, selected) {
+  background-color: #33FF33;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-33CC00) {
+  color: #33CC00
+}
+outlinerchildren:-moz-outliner-row(lc-33CC00, selected) {
+  background-color: #33CC00;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-009900) {
+  color: #009900
+}
+outlinerchildren:-moz-outliner-row(lc-009900, selected) {
+  background-color: #009900;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-006600) {
+  color: #006600
+}
+outlinerchildren:-moz-outliner-row(lc-006600, selected) {
+  background-color: #006600;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-003300) {
+  color: #003300
+}
+outlinerchildren:-moz-outliner-row(lc-003300, selected) {
+  background-color: #003300;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-99FFFF) {
+  color: #99FFFF
+}
+outlinerchildren:-moz-outlinerrow(lc-99FFFF, selected) {
+  background-color: #99FFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-33FFFF) {
+  color: #33FFFF
+}
+outlinerchildren:-moz-outliner-row(lc-33FFFF, selected) {
+  background-color: #33FFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-66CCCC) {
+  color: #66CCCC
+}
+outlinerchildren:-moz-outliner-row(lc-66CCCC, selected) {
+  background-color: #66CCCC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-00CCCC) {
+  color: #00CCCC
+}
+outlinerchildren:-moz-outliner-row(lc-00CCCC, selected) {
+  background-color: #00CCCC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-339999) {
+  color: #339999
+}
+outlinerchildren:-moz-outliner-row(lc-339999, selected) {
+  background-color: #339999;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-336666) {
+  color: #336666
+}
+outlinerchildren:-moz-outliner-row(lc-336666, selected) {
+  background-color: #336666;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-003333) {
+  color: #003333
+}
+outlinerchildren:-moz-outliner-row(lc-003333, selected) {
+  background-color: #003333;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-CCFFFF) {
+  color: #CCFFFF
+}
+outlinerchildren:-moz-outliner-row(lc-CCFFFF, selected) {
+  background-color: #CCFFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-66FFFF) {
+  color: #66FFFF
+}
+outlinerchildren:-moz-outliner-row(lc-66FFFF, selected) {
+  background-color: #66FFFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-33CCFF) {
+  color: #33CCFF
+}
+outlinerchildren:-moz-outliner-row(lc-33CCFF, selected) {
+  background-color: #33CCFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-3366FF) {
+  color: #3366FF
+}
+outlinerchildren:-moz-outliner-row(lc-3366FF, selected) {
+  background-color: #3366FF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-3333FF) {
+  color: #3333FF
+}
+outlinerchildren:-moz-outliner-row(lc-3333FF, selected) {
+  background-color: #3333FF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-000099) {
+  color: #000099
+}
+outlinerchildren:-moz-outliner-row(lc-000099, selected) {
+  background-color: #000099;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-000066) {
+  color: #000066
+}
+outlinerchildren:-moz-outliner-row(lc-000066, selected) {
+  background-color: #000066;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-CCCCFF) {
+  color: #CCCCFF
+}
+outlinerchildren:-moz-outliner-row(lc-CCCCFF, selected) {
+  background-color: #CCCCFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-9999FF) {
+  color: #9999FF
+}
+outlinerchildren:-moz-outliner-row(lc-9999FF, selected) {
+  background-color: #9999FF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-6666CC) {
+  color: #6666CC
+}
+outlinerchildren:-moz-outliner-row(lc-6666CC, selected) {
+  background-color: #6666CC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-6633FF) {
+  color: #6633FF
+}
+outlinerchildren:-moz-outliner-row(lc-6633FF, selected) {
+  background-color: #6633FF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-6600CC) {
+  color: #6600CC
+}
+outlinerchildren:-moz-outliner-row(lc-6600CC, selected) {
+  background-color: #6600CC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-333399) {
+  color: #333399
+}
+outlinerchildren:-moz-outliner-row(lc-333399, selected) {
+  background-color: #333399;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-330099) {
+  color: #330099
+}
+outlinerchildren:-moz-outliner-row(lc-330099, selected) {
+  background-color: #330099;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-FFCCFF) {
+  color: #FFCCFF
+}
+outlinerchildren:-moz-outliner-row(lc-FFCCFF, selected) {
+  background-color: #FFCCFF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-FF99FF) {
+  color: #FF99FF
+}
+outlinerchildren:-moz-outliner-row(lc-FF99FF, selected) {
+  background-color: #FF99FF;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-CC66CC) {
+  color: #CC66CC
+}
+outlinerchildren:-moz-outliner-row(lc-CC66CC, selected) {
+  background-color: #CC66CC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-CC33CC) {
+  color: #CC33CC
+}
+outlinerchildren:-moz-outliner-row(lc-CC33CC, selected) {
+  background-color: #CC33CC;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-993399) {
+  color: #993399
+}
+outlinerchildren:-moz-outliner-row(lc-993399, selected) {
+  background-color: #993399;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-663366) {
+  color: #663366
+}
+outlinerchildren:-moz-outliner-row(lc-663366, selected) {
+  background-color: #663366;
+}
+
+outlinerchildren:-moz-outliner-cell-text(lc-330033) {
+  color: #330033
+}
+outlinerchildren:-moz-outliner-row(lc-330033, selected) {
+  background-color: #330033;
+}
+
+
+outlinerchildren:-moz-outliner-cell-text(lc-white, selected) {
+  color: #FFFFFF
+}
+outlinerchildren:-moz-outliner-cell-text(lc-black, selected) {
+  color: #000000
+}
+
diff --git a/EarlyBlue/messenger/threadcol.gif b/EarlyBlue/messenger/threadcol.gif
deleted file mode 100755
index 8385800c5bb7a07c4e7c295330e3226b16c4e1d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1248
zcmZuw&r4ia6h33bPA85y8&?wUxQbvW6E1<8u0|boAWp;|gg`;&$Ge$VXWkp$JUa?m
zJO~&l6j}n33t338g)Ry~@&_oC{HS-Wo4RrlkV50m5Yp4{-9*TucNp%EbIy0Z?>jRy
zrRlH7D}yvh4=G-e{YG|+aEqcntiSet{qt>aZ*MZ0?C<Z-WHLiTL&L+vBO@cDqod2q
z%X4#c6B85T<Kuik;`#YQdSw3Qe-2-~d2{&tZ$C*QMWl%gz$HmZN|KgjB(aT2MM{xY
zWE8PYm70_$t;uL&TPY1GL)wrr#5gl)Cc`lzAQhnkDUxjiDW#H9OKGHJ+Yfi8q*l@>
z$+kVhN=vP!(UL72WGf@Jk;X{2m5QZiX;`u)3gTc2YPLUmq6ts|gF58KGVp+<l`>Wm
zTH>O$GFq`!2nO0HV-#DpV53<XhM-s(G{>Z3p^yy)r~xBrjU7QNhyWfiK+PUeppDjS
z&4L&-#@!gr);nlJZ-fnNwpPM>I1OvzC2WI9a0NC%H?%?=)POX~Kojh2e+wF;0w$gT
z(h<i47Tb})GAKk>+!^-SVPbk13x)vKVKaP%mlz)0f<v$bHBgUPLLxN9^)bzOw4j6j
zXb40=q7>-};)Y@XeB7|(^b2KIR#v**?&jv^*4Ea+!NKnC?$OcF@$vD=$;s*I>Dk%Y
z`T04&f4jZC6Gc({!(n2(VaEw8`>r>Upbs>LApQ}9^hGjH@4p<LeYU;-pf7Rt+gJ11
z{msFIc=9;^^p77hqu-4sf3Cj#@yb_Mp08(iUO(!))I-^SSEoz2ilQ`CEH9Oo?xs_d
zfl~>cy6^+h^6Rd0ajtHpQx#9Fd2ZeD!jErj9VZaJ681fC?zx@N36NX!+Z*xwOlew7
z`d%jt)@q^adt%WE(e8A)yilAeEiM%oic?~7wy;pVgKs*OP8B*Gr&VnNqw9u^{{^^d
z^P07W)7lVou2=8+!D>g8yjm`un()`fjeH&l#|eFJOx!M~Q@8Rn;(7s(lZA3&s(`d~
zsu70mo7b+v|6J<=qv5x6HNO>yml|#dGFmNY1(jw~cz!4<?Y2`1gzE|AHXS5<^2u_o
wh|e7O-U&JooTDsXh6|Io%U<<*F5i=&fdT5l=VA?n4S>{Zelu5XwTZs@59qTJ9RL6T

diff --git a/EarlyBlue/messenger/file-disabled.gif b/EarlyBlue/messenger/toolbar/file-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/file-disabled.gif
rename to EarlyBlue/messenger/toolbar/file-disabled.gif
diff --git a/EarlyBlue/messenger/file.gif b/EarlyBlue/messenger/toolbar/file.gif
similarity index 100%
rename from EarlyBlue/messenger/file.gif
rename to EarlyBlue/messenger/toolbar/file.gif
diff --git a/EarlyBlue/messenger/forward-disabled.gif b/EarlyBlue/messenger/toolbar/forward-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/forward-disabled.gif
rename to EarlyBlue/messenger/toolbar/forward-disabled.gif
diff --git a/EarlyBlue/messenger/forward.gif b/EarlyBlue/messenger/toolbar/forward.gif
similarity index 100%
rename from EarlyBlue/messenger/forward.gif
rename to EarlyBlue/messenger/toolbar/forward.gif
diff --git a/EarlyBlue/messenger/getmsg-disabled.gif b/EarlyBlue/messenger/toolbar/getmsg-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/getmsg-disabled.gif
rename to EarlyBlue/messenger/toolbar/getmsg-disabled.gif
diff --git a/EarlyBlue/messenger/getmsg.gif b/EarlyBlue/messenger/toolbar/getmsg.gif
similarity index 100%
rename from EarlyBlue/messenger/getmsg.gif
rename to EarlyBlue/messenger/toolbar/getmsg.gif
diff --git a/EarlyBlue/messenger/mark-disabled.gif b/EarlyBlue/messenger/toolbar/mark-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/mark-disabled.gif
rename to EarlyBlue/messenger/toolbar/mark-disabled.gif
diff --git a/EarlyBlue/messenger/mark.gif b/EarlyBlue/messenger/toolbar/mark.gif
similarity index 100%
rename from EarlyBlue/messenger/mark.gif
rename to EarlyBlue/messenger/toolbar/mark.gif
diff --git a/EarlyBlue/messenger/newmsg-disabled.gif b/EarlyBlue/messenger/toolbar/newmsg-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/newmsg-disabled.gif
rename to EarlyBlue/messenger/toolbar/newmsg-disabled.gif
diff --git a/EarlyBlue/messenger/newmsg.gif b/EarlyBlue/messenger/toolbar/newmsg.gif
similarity index 100%
rename from EarlyBlue/messenger/newmsg.gif
rename to EarlyBlue/messenger/toolbar/newmsg.gif
diff --git a/EarlyBlue/messenger/next-disabled.gif b/EarlyBlue/messenger/toolbar/next-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/next-disabled.gif
rename to EarlyBlue/messenger/toolbar/next-disabled.gif
diff --git a/EarlyBlue/messenger/next.gif b/EarlyBlue/messenger/toolbar/next.gif
similarity index 100%
rename from EarlyBlue/messenger/next.gif
rename to EarlyBlue/messenger/toolbar/next.gif
diff --git a/EarlyBlue/messenger/reply-disabled.gif b/EarlyBlue/messenger/toolbar/reply-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/reply-disabled.gif
rename to EarlyBlue/messenger/toolbar/reply-disabled.gif
diff --git a/EarlyBlue/messenger/reply.gif b/EarlyBlue/messenger/toolbar/reply.gif
similarity index 100%
rename from EarlyBlue/messenger/reply.gif
rename to EarlyBlue/messenger/toolbar/reply.gif
diff --git a/EarlyBlue/messenger/replyall-disabled.gif b/EarlyBlue/messenger/toolbar/replyall-disabled.gif
similarity index 100%
rename from EarlyBlue/messenger/replyall-disabled.gif
rename to EarlyBlue/messenger/toolbar/replyall-disabled.gif
diff --git a/EarlyBlue/messenger/replyall.gif b/EarlyBlue/messenger/toolbar/replyall.gif
similarity index 100%
rename from EarlyBlue/messenger/replyall.gif
rename to EarlyBlue/messenger/toolbar/replyall.gif
diff --git a/EarlyBlue/messenger/unthreadcol.gif b/EarlyBlue/messenger/unthreadcol.gif
deleted file mode 100755
index 26950c454e3f407870b7f5222e49f542fbb49013..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1251
zcmZuwO>0v@6up(8F*cHJy0ME%L9|d}%OF@?rES_qY?OW=f>84D#ym~l3ooz6f{O=2
z3(|!k6lT|j3N8fgFHl4gI}2Cs#;&>$ilE(9M6c(K3ND-w=HuRb?m6cslf{X1BjpTb
zXocbx*>7aG2)8JDiS_a2llNZ}i9|A)?C$RF>FMe1?d|L9>+kO$7#NtJpP!zd9vvMW
z85!Zb5ns8oMGwtq{<8J<)2FRxPajAkMWl%gz$HmZN|KgjB(aT2MM{xYWE8PYm70_$
zt;uL&TPY1GL)wrr#5gl)Cc`lzAQhnkDUxjiDW#H9OKGHJ+Yfi8q*l@>$+kVhN=vP!
z(UL72WGf@Jk;X{2m5QZiX;`u)3gTc2YPLUmq6ts|gF58KGVp+<l`>WmTH>O$GFq`!
z2nO0HV-#DpV53<XhM-s(G{>Z3p^yy)r~xBrjU7QNhyWfiK+PUeppDjS&4L&-#@!gr
z);nlJZ-fnNwpPM>I1OvzC2WI9a0NC%H?%?=)POX~Kojh2e+wF;0w$gT(h<i47Tb})
zGAKk>+!^-SVPbk13x)vKVKaP%mlz)0f<v$bHBgUPLLxN9^)bzOw4j6jXb40=q7>-}
z;)Y@X{NAwR^q8^>3k#i2XL)&fZEbCHb8};3V|#mhXJ==3cXw}ZZ-0OP;NXD2e_daH
z6h%?|!(n2(VaEw8`z_JcML%c|LHr{!bR;=U-;ef9Jzsxy??~6_>+e2@*DI8{IGB8q
zeRDr`>gMN_;oZXOiBq>%4_;K>Jv@E#aDuWwZ%q_06-05oP?{^wT}!9N0;e20HQ@)M
z>DOH4;#^rur^=pK^xT@`g}>hx+fE>SCG30P+;H2W6Ck(hx0d4f$>M|<^SyQ$ELKC;
z_r$CdqTSwnX{In)oSiGo6voBuRDPy#72k9!oyxb{PP5VgM#l~7{{=X2^BUE<(_9kM
zu2<{$!L7C^devMyHR|6HXNQJxaGcQh2F2x4I(2DiQVi$uIF>Kv$MZ-_r|MzYI)CO2
z29Rt1#i;wOT-9&J;kmlohKyztT0y1J5S|~3a;xQ(1L1l?xeW&ie|)lB%i<pgZaYC6
rf^(GRV{l>Ya>=U<=Y|e-(eVr&!sqYGEP7!bFtw`R$W@vxq6@zOn2i+H

diff --git a/EarlyBlue/navigator/back-disabled.gif b/EarlyBlue/navigator/icons/back-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/back-disabled.gif
rename to EarlyBlue/navigator/icons/back-disabled.gif
diff --git a/EarlyBlue/navigator/back.gif b/EarlyBlue/navigator/icons/back.gif
similarity index 100%
rename from EarlyBlue/navigator/back.gif
rename to EarlyBlue/navigator/icons/back.gif
diff --git a/EarlyBlue/navigator/forward-disabled.gif b/EarlyBlue/navigator/icons/forward-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/forward-disabled.gif
rename to EarlyBlue/navigator/icons/forward-disabled.gif
diff --git a/EarlyBlue/navigator/forward.gif b/EarlyBlue/navigator/icons/forward.gif
similarity index 100%
rename from EarlyBlue/navigator/forward.gif
rename to EarlyBlue/navigator/icons/forward.gif
diff --git a/EarlyBlue/navigator/reload-disabled.gif b/EarlyBlue/navigator/icons/reload-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/reload-disabled.gif
rename to EarlyBlue/navigator/icons/reload-disabled.gif
diff --git a/EarlyBlue/navigator/reload.gif b/EarlyBlue/navigator/icons/reload.gif
similarity index 100%
rename from EarlyBlue/navigator/reload.gif
rename to EarlyBlue/navigator/icons/reload.gif
diff --git a/EarlyBlue/navigator/first-disabled.gif b/EarlyBlue/navigator/linkButtons/first-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/first-disabled.gif
rename to EarlyBlue/navigator/linkButtons/first-disabled.gif
diff --git a/EarlyBlue/navigator/first.gif b/EarlyBlue/navigator/linkButtons/first.gif
similarity index 100%
rename from EarlyBlue/navigator/first.gif
rename to EarlyBlue/navigator/linkButtons/first.gif
diff --git a/EarlyBlue/navigator/last-disabled.gif b/EarlyBlue/navigator/linkButtons/last-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/last-disabled.gif
rename to EarlyBlue/navigator/linkButtons/last-disabled.gif
diff --git a/EarlyBlue/navigator/last.gif b/EarlyBlue/navigator/linkButtons/last.gif
similarity index 100%
rename from EarlyBlue/navigator/last.gif
rename to EarlyBlue/navigator/linkButtons/last.gif
diff --git a/EarlyBlue/navigator/next-disabled.gif b/EarlyBlue/navigator/linkButtons/next-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/next-disabled.gif
rename to EarlyBlue/navigator/linkButtons/next-disabled.gif
diff --git a/EarlyBlue/navigator/next.gif b/EarlyBlue/navigator/linkButtons/next.gif
similarity index 100%
rename from EarlyBlue/navigator/next.gif
rename to EarlyBlue/navigator/linkButtons/next.gif
diff --git a/EarlyBlue/navigator/previous-disabled.gif b/EarlyBlue/navigator/linkButtons/previous-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/previous-disabled.gif
rename to EarlyBlue/navigator/linkButtons/previous-disabled.gif
diff --git a/EarlyBlue/navigator/previous.gif b/EarlyBlue/navigator/linkButtons/previous.gif
similarity index 100%
rename from EarlyBlue/navigator/previous.gif
rename to EarlyBlue/navigator/linkButtons/previous.gif
diff --git a/EarlyBlue/navigator/top-disabled.gif b/EarlyBlue/navigator/linkButtons/top-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/top-disabled.gif
rename to EarlyBlue/navigator/linkButtons/top-disabled.gif
diff --git a/EarlyBlue/navigator/top.gif b/EarlyBlue/navigator/linkButtons/top.gif
similarity index 100%
rename from EarlyBlue/navigator/top.gif
rename to EarlyBlue/navigator/linkButtons/top.gif
diff --git a/EarlyBlue/navigator/up-disabled.gif b/EarlyBlue/navigator/linkButtons/up-disabled.gif
similarity index 100%
rename from EarlyBlue/navigator/up-disabled.gif
rename to EarlyBlue/navigator/linkButtons/up-disabled.gif
diff --git a/EarlyBlue/navigator/up.gif b/EarlyBlue/navigator/linkButtons/up.gif
similarity index 100%
rename from EarlyBlue/navigator/up.gif
rename to EarlyBlue/navigator/linkButtons/up.gif
diff --git a/EarlyBlue/navigator/linkToolbar.css b/EarlyBlue/navigator/linkToolbar.css
index 7c5ff795..f7eac85e 100644
--- a/EarlyBlue/navigator/linkToolbar.css
+++ b/EarlyBlue/navigator/linkToolbar.css
@@ -45,74 +45,51 @@
  * Link toolbar items
  **/
 
-#link-top
-{
-  list-style-image    : url("chrome://navigator/skin/top.gif");
+#link-top {
+  list-style-image: url("chrome://navigator/skin/linkButtons/top.gif");
 }
 
-#link-top[disabled="true"],
-#link-top[disabled="true"]:hover,
-#link-top[disabled="true"]:hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/top-disabled.gif");
+#link-top[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/linkButtons/top-disabled.gif") !important;
 }
 
-#link-up
-{
-  list-style-image    : url("chrome://navigator/skin/up.gif");
+#link-up {
+  list-style-image: url("chrome://navigator/skin/linkButtons/up.gif");
 }
 
-#link-up[disabled="true"],
-#link-up[disabled="true"]:hover,
-#link-up[disabled="true"]:hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/up-disabled.gif");
+#link-up[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/linkButtons/up-disabled.gif") !important;
 }
 
-#link-first
-{
-  list-style-image    : url("chrome://navigator/skin/first.gif");
+#link-first {
+  list-style-image: url("chrome://navigator/skin/linkButtons/first.gif");
 }
 
-#link-first[disabled="true"],
-#link-first[disabled="true"]:hover,
-#link-first[disabled="true"]:hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/first-disabled.gif");
+#link-first[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/linkButtons/first-disabled.gif") !important;
 }
 
-#link-prev
-{
-  list-style-image    : url("chrome://navigator/skin/previous.gif");
+#link-prev {
+  list-style-image: url("chrome://navigator/skin/linkButtons/previous.gif");
 }
 
-#link-prev[disabled="true"],
-#link-prev[disabled="true"]:hover,
-#link-prev[disabled="true"]:hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/previous-disabled.gif");
+#link-prev[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/linkButtons/previous-disabled.gif") !important;
 }
 
 #link-next
 {
-  list-style-image    : url("chrome://navigator/skin/next.gif");
+  list-style-image: url("chrome://navigator/skin/linkButtons/next.gif");
 }
 
-#link-next[disabled="true"],
-#link-next[disabled="true"]:hover,
-#link-next[disabled="true"]:hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/next-disabled.gif");
+#link-next[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/linkButtons/next-disabled.gif") !important;
 }
 
-#link-last
-{
-  list-style-image    : url("chrome://navigator/skin/last.gif");
+#link-last {
+  list-style-image    : url("chrome://navigator/skin/linkButtons/last.gif");
 }
 
-#link-last[disabled="true"],
-#link-last[disabled="true"]:hover,
-#link-last[disabled="true"]:hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/last-disabled.gif");
+#link-last[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/linkButtons/last-disabled.gif") !important;
 }
diff --git a/EarlyBlue/navigator/navigator.css b/EarlyBlue/navigator/navigator.css
index d05c0d59..1c550240 100644
--- a/EarlyBlue/navigator/navigator.css
+++ b/EarlyBlue/navigator/navigator.css
@@ -38,260 +38,215 @@
 /** Contains style definitions for the navigator application 
  **/
 
-@import url(chrome://navigator/content/navigator.css);
-@import url(chrome://communicator/skin/);
-@import url(chrome://navigator/skin/personalToolbar.css);
-@import url(chrome://communicator/skin/sidebar/sidebar.css);
+@import url("chrome://navigator/content/navigator.css");
+@import url("chrome://communicator/skin/");
+@import url("chrome://communicator/skin/sidebar/sidebar.css");
+@import url("chrome://communicator/skin/bookmarks/bookmarksToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/********** resource bundle binding **********/
+/* ::::: primary toolbar buttons ::::: */
 
-#resource_bundle_navigator
-  {
-    -moz-binding            : url('chrome://navigator/skin/resources.xml#resource_bundle_navigator')      
-  } 
+#back-button {
+  list-style-image: url("chrome://navigator/skin/icons/back.gif");
+}
 
-/*
-#content
-  {
-    border-left           : 1px solid ThreeDDarkShadow;
-    border-top            : 1px solid ThreeDDarkShadow;
-    border-bottom         : 1px solid ThreeDFace;
-  }
-
-#browser
-  {
-    border-left           : 1px solid ThreeDShadow;
-  }  
-*/
+#back-button[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/icons/back-disabled.gif") !important;
+}
 
-#bookmarks-button
-  {
-    list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
-  }
-  
-#bookmarks-button[open="true"]
-  {
-    list-style-image    : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
-  }
-  
-/*
- * Images for the main buttons
- */
-#back-button 
-  {
-    list-style-image      : url("chrome://navigator/skin/back.gif");
-  }
-
-#back-button[disabled="true"]
-  {
-    list-style-image      : url("chrome://navigator/skin/back-disabled.gif") !important;
-  }
-
-#forward-button 
-  {
-    list-style-image      : url("chrome://navigator/skin/forward.gif");
-  }
-
-#forward-button[disabled="true"]
-  {
-    list-style-image      : url("chrome://navigator/skin/forward-disabled.gif") !important;
-  }
-
-#reload-button 
-  {
-  list-style-image        : url("chrome://navigator/skin/reload.gif");
-  }
-
-#reload-button[disabled="true"]
-  {
-	  list-style-image      : url("chrome://navigator/skin/reload-disabled.gif") !important;
-  }
-
-#stop-button 
-  {
-	  list-style-image      : url("chrome://navigator/skin/stop.gif");
-  } 
-
-#stop-button[disabled="true"]
-  {
-    list-style-image      : url("chrome://navigator/skin/stop-disabled.gif") !important;
-  } 
-
-#print-button 
-  {
-    list-style-image      : url("chrome://global/skin/print.gif");
-  }
+#forward-button {
+  list-style-image: url("chrome://navigator/skin/icons/forward.gif");
+}
+
+#forward-button[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/icons/forward-disabled.gif") !important;
+}
+
+#reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/reload.gif");
+}
+
+#reload-button[disabled="true"] {
+  list-style-image: url("chrome://navigator/skin/icons/reload-disabled.gif") !important;
+}
+
+#stop-button {
+  list-style-image: url("chrome://global/skin/icons/stop.gif");
+}
+
+#stop-button[disabled="true"] {
+  list-style-image: url("chrome://global/skin/icons/stop-disabled.gif") !important;
+} 
+
+#print-button {
+  list-style-image: url("chrome://global/skin/icons/print.gif");
+}
 
 #print-button[disabled="true"] {
-    list-style-image      : url("chrome://global/skin/print-disabled.gif") !important;
-  }
+  list-style-image: url("chrome://global/skin/icons/print-disabled.gif") !important;
+}
 
 /* Hides text below the above buttons */
-.toolbarbutton-1 > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box > .toolbarbutton-text,
-.toolbarbutton-1 > .toolbarbutton-box > .toolbarbutton-text {
+.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text,
+.toolbarbutton-1 > .toolbarbutton-text {
   display: none;
 }
 
-/*all the urlbar stuff*/
+#fullscreen-exit-button {
+  list-style-image: none;
+}
+
+#fullscreen-exit-button > .toolbarbutton-text {
+  display: normal;
+}
+
+/* ::::: nav-bar-inner ::::: */
+
+#nav-bar-inner {
+  padding-left: 0px;
+  min-width: 0px;
+  margin: 7px 4px 8px 4px; 
+}
+  
+#urlbar {
+  border: 1px inset #CCD0DD;
+  margin: 0px 7px 0px 0px;
+}  
+
+/* ::::: page proxy icon ::::: */
+ 
+#page-proxy-deck,
+#page-proxy-favicon,
+#page-proxy-button {
+  width: 16px;
+  height: 16px;
+}
 
 #page-proxy-deck {
-    cursor                : grab;
-    margin                : 1px;
-    width                 : 16px;
-    height                : 16px;
-}                                                                               
-
-#page-proxy-button
-  {
-    list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); 
-    padding-top           : 2px;
-    padding-bottom        : 2px;
-    width                 : 16px;
-    height                : 16px;
-  } 
+  cursor: grab;
+  margin: 1px 1px 1px 2px;
+}
+
+#page-proxy-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); 
+  padding-top: 2px;
+  padding-bottom: 2px;
+} 
+
+#page-proxy-favicon {
+  list-style-image: none;
+} 
 
 /*
-#page-proxy-button[pageproxystate="valid"]:hover
-  {
-    list-style-image      : url("chrome://communicator/skin/bookmarks/location-hover.gif");
-  }
+#page-proxy-button[pageproxystate="valid"]:hover  {
+  list-style-image: url("chrome://communicator/skin/bookmarks/location-hover.gif");
+}
   
-#page-proxy-button[pageproxystate="valid"]:hover:active
-  {
-    list-style-image      : url("chrome://communicator/skin/bookmarks/location-clicked.gif");
-  }
-
-#page-proxy-button[pageproxystate="invalid"] 
-  {
-    cursor                  : default;
-    list-style-image        : url("chrome://communicator/skin/bookmarks/location-disabled.gif");
-  }
+#page-proxy-button[pageproxystate="valid"]:hover:active {
+  list-style-image: url("chrome://communicator/skin/bookmarks/location-act.gif");
+}
+
+#page-proxy-button[pageproxystate="invalid"] {
+  cursor: default;
+  list-style-image: url("chrome://communicator/skin/bookmarks/location-dis.gif");
+}
 */
 
-#page-proxy-favicon
-{
-    list-style-image      : none;
-    padding               : 0px;
-    width                 : 16px;
-    height                : 16px;
+/* ::::: autocomplete ::::: */
+
+/*
+.autocomplete-history-dropmarker {
+  border-right-width: 1px;
+  border-bottom-width: 1px;
+  -moz-border-right-colors: ThreeDShadow;
+  -moz-border-bottom-colors: ThreeDShadow;
 }
+*/
 
-#content-frame 
-  {
-    min-width             : 0px;
-    min-height            : 0px;
-  }
-  
-#nav-bar-inner {
-  padding-left            : 0px;
-  min-width               : 0px;
-  margin                  : 9px 4px; 
+.autocomplete-outlinerbody:-moz-outliner-cell-text(value) {
+  padding-left: 13px;
 }
-  
-#urlbar  .autocomplete-icon-box {
-  border                  : 1px inset #CCD0DD;
-  border-right            : none;
-}  
 
-#urlbar .autocomplete-textbox-container {
-  border                  : 1px inset #CCD0DD;
-  border-left             : none;
+.autocomplete-outlinerbody:-moz-outliner-cell-text(comment) {
+  color: #808080;
+/*  font-style: italic; */
 }
 
-#urlbar-group {
-  border                  : none;
-  margin                  : 0px 5px 0px 0px;
-}  
+.autocomplete-search-box {
+  border-top: 1px solid #9999CC;
+  background-color: #666699;
+  color: #000000;
+}
 
-#urlbar-container {
-  border                  : none;
-}  
+.autocomplete-result-popup[nomatch] > .autocomplete-search-box {
+  border-top: 1px solid #666699;
+}
+
+.autocomplete-search-engine {
+  padding: 2px;
+}
+
+.autocomplete-search-engine[menuactive="true"] {
+  background-color: #9999CC;
+  color: #000000;
+}
+
+.autocomplete-search-engine-img {
+  margin-right: 4px;
+}
+
+/* ::::: go and searchbuttons ::::: */
 
 #search-button, 
 #go-button {
-/*  font                    : message-box; */
-  font-weight             : bold;
-  margin                  : 0px 3px 0px 0px;
-  background-color        : #9999CC;
+  margin: 0px 3px 0px 0px;
+/*  min-height: 25px; */
+  font-weight: bold;
+  background-color: #9999CC;
 }
 
-#search-button > .button-box, 
-#go-button > .button-box {
-  border                  : 1px outset #9999CC;
+#search-button {
+/*  list-style-image: url("chrome://communicator/skin/icons/search.gif"); */
+  font-weight: bold;
 }
 
-#search-button:hover:active > .button-box, 
-#go-button:hover:active > .button-box {
-  border                  : 1px inset #9999CC;
+/* ::::: personal toolbar ::::: */
+
+#bookmarks-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
 }
 
-#search-button
-  {
-/*    list-style-image      : url("chrome://communicator/skin/search.gif"); */
-    font-weight           : bold;
-  }
+#bookmarks-button[open="true"] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+}
 
-.menuitem-iconic
-  {
-    padding               : 1px;
-  }
+#home-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/home.gif");
+}
 
-/* ::::: urlbar autocomplete widget ::::: */
+/* ::::: sidebar splitter ::::: */
 
-.autocomplete-outlinerbody:-moz-outliner-cell-text(value) 
-  {
-    padding-left        : 13px;
-  }
+/*
+#sidebar-splitter {
+  border-left: none;
+  border-right: none;
+  min-width: 5px; 
+}
+*/
 
-.autocomplete-outlinerbody:-moz-outliner-cell-text(comment) 
-  {
-/*    font-style          : italic; */
-  }
+/* ::::: content area ::::: */
 
 /*
-.autocomplete-history-button 
-  {
-    border              : 1px outset -moz-Dialog;
-  }
-
-.autocomplete-history-button[open="true"] 
-  {
-    border              : 1px solid ThreeDShadow;
-  }
-
-.autocomplete-history-button-internal-box,
-.autocomplete-history-button[open="true"] > .autocomplete-history-button-internal-box 
-  {
-    border              : none;
-  }
+#content {
+  border-top: 1px solid ThreeDDarkShadow;
+  border-bottom: 1px solid ThreeDLightShadow;
+  border-left: 2px solid;
+  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+}
+
+#status-bar {
+  border-top: none;
+}
 */
 
-.autocomplete-search-box 
-  {
-    border-top            : 1px solid #9999CC;
-    background-color      : #666699;
-    color                 : #000000;
-  }
-
-.autocomplete-result-popup[nomatch="true"] > .autocomplete-search-box 
-  {
-    border-top            : 1px solid #666699;
-  }
-
-.autocomplete-search-engine 
-  {
-    padding               : 2px;
-  }
-
-.autocomplete-search-engine[menuactive="true"] 
-  {
-    background-color      : #9999CC;
-    color                 : #000000;
-  }
-
-.autocomplete-search-engine-img 
-  {
-    margin-right          : 4px;
-  }
diff --git a/EarlyBlue/navigator/resources.xml b/EarlyBlue/navigator/resources.xml
deleted file mode 100644
index d58024ca..00000000
--- a/EarlyBlue/navigator/resources.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<bindings id="NavigatorResourcesBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:html="http://www.w3.org/1999/xhtml"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-          
-         
- <binding id="resource_bundle_navigator" extends="" >
-   <resources>
-     <!-- begin resources -->
-     <image src="chrome://navigator/skin/back.gif" />
-     <image src="chrome://navigator/skin/forward.gif" />
-     <!-- end resources -->
-   </resources>	
-  </binding>
-          
-</bindings>
diff --git a/EarlyBlue/navigator/turbo-systray.gif b/EarlyBlue/navigator/turbo-systray.gif
deleted file mode 100644
index ec6c48947907216edaaf6a52f8e8ba285cfdde8d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1124
zcmZ?wbhEHb3}TRD_|5<ZUd0U6dl_0l;M%ow|3|@S2#lBz&;jKDP+nl*_{YG`A>*-O
z!NFz@VXc@G8x|gJ7f|+^<FWD4VI~RVtUD(*E<WC`;M{d3W5JS>lQn`@#hl!<^z?Lf
z_fvB`H!nLo+oHHj<-q3U=jS^#bIE#bSrN#@W*~Io<d&Dmm#|K=nrkJx>Pjyo6T^a2
zrAw~%MQ$yVef@Fuu{BJWxHtk7v~O-tGh_?!4u5-Xd+cMe1=iuY*LKS@CX4I|G-x>7
z%75S0W`=?1Qpw-v-p-zu>v62tHi<3A;_<b!ea5eBZ7OvePAPGgf4fsy+IW6_a{I9r
z*FQhGzQS?UwHLEY^RI14oZh<T=eyjyt<38FXDU8ESboHH+1$T>wx_*5U282b7y7K^
z$&F;M-(u$r%YXE4wXf4ZSGoE5v##pN>+c!b-q>34*=>5Z<))W^VwQdnkDeUJ{=oMe
kqrkKXcD5by&AhkR72^U9raWwwNb9)NB9kQ|z`$S)0NJLSZ~y=R

diff --git a/EarlyBlue/navigator/turbo.css b/EarlyBlue/navigator/turbo.css
deleted file mode 100644
index ffb0a27e..00000000
--- a/EarlyBlue/navigator/turbo.css
+++ /dev/null
@@ -1,43 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla 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/MPL/
- *
- * 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 "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#turboTrayImage {
-  list-style-image: url("chrome://navigator/skin/turbo-systray.gif");
-  border: 2px inset ThreeDHighlight !important;
-}
diff --git a/EarlyBlue/preview.png b/EarlyBlue/preview.png
deleted file mode 100755
index 334a41cbbd4f494514dfa0a63d83f0902534ebe2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3376
zcmV-04bSq4P)<h;3K|Lk000e1NJLTq00Dvk003490ssI2O+W@y00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4AuYu4Fv(54dnCy000McNliru(F_R^G!L11UfBQu482K2
zK~#90?VUY{9LW{O|GkV31qyCJ;0qKSvknAG7J6YF?H*zbMr@$Ka|pBt0>g+~4&lIP
zl^BdakY;rlM+-C9AkZnfz2E``hnYY^i3HoQh6|i%QK01D@SKGV;utgzYSmX;UsGLG
z-PJSmehj-kJ=L#Xy{h_mRZVwKa^uDg5ClQQqjBNF1;fYbTDvk=2!dEl8UV6P{aKn;
z>Iy*+i^)=K2MB^#bQ<hmcl*TTYp^$r;S50#i^%b4h}Rv`Ac7#Oq>*n8_J-Z<wpoK#
zSC)l62ZzsBSC$VBpBKtiup=DK4CZES?8|9b7DXL1XQA}g!H!S3+;Vrb;NWT~3+5IQ
zDi`@!r71W2HZk{)aG`w5$Sw#C{*BEzC{!_~+VRgQtOn)QDy~bLequu`|J|@Z1J#-8
zV;-utRE*aWwQ$N>U0IfgONFfQhqG<|uK_lC;*aI`@Rki5mhf#$$U?BGbU?SqEqDKb
z3vpB0%!`wMYF~DKCtM4zb5-f5b1rg@vT--dy4EP~QEpiF0y9FVs1=RrNlv1hn-rQu
z;bcsODHxy3ZPMrCm=eDJ1Z!+VKJOLUa4wX+5uN|w8mQ7Hzg@KKQ)6O@&Q+zKK25P`
zL5fneG3ffmoKaYY4ACzXDV?1%1Y0M0DAJyk&0UuZR0R||vjeLh3tny$1h<~7n-}Dj
z>%Y_@*zw6l@K(-FnbMi5?L>)ZzsTd`e_k(x!ZKtaZrSqq%2D=rOj&cf^Q3292C5%a
z+q7D9*#!%3qX{_+!A_7|1h?G|jA)rhE_<EFQ{gXP^q;|o@<eCZAXq+T1Ews`f&>2A
zms<$szd`Q;<|3PNwrmguOPfWr7FMI!+&O>MO_G9*hKi1ag)ugNxM8kt<AXdD@|nvB
zMshoXS%d$c4hUJxxfBh!;ILs&Q4goKZ|6`5S(xqk*SOAtb0arQ7<COv{?tZ0YA7)_
zB>jHha8DWC+DZ_N=u0YY4n%j`h61A@S!LadSH|LBc?*hV8+XXMXzmgHcgAfU*E5%Z
z*#)$0KSZ6yaS($>Lj*xYhVHN@2qH2hLj*xYrU81q89@+HX#ge>%ASoXbA=#?#iRjf
z7N`Nxv#1GzC?9$jH9-)Op(Sd9AR<H0q9zC;GW0BJf*>MO>{-+cOZH3=7Fxe2h#(Yx
z7Ig*G@E)jitt}`~x7*GBbrj1Vf|w`jxI}G!z*sE!u@7kwK?J0ZGK7=5QwI%VFeM@l
zB8aerd<ZOn!QQC5-3($X>_c-Oetm!Q@+baw(zSM24GI{sQh9LyAF*8^=9Z8$G}sG#
z=SSFaP$(txK@c4lu~|`~zkdFg*e($BNiZ1-u0dr`D<$G17D|a8etq9Qar96S1S8Da
z&`f9$qfkdJiNW3o<59OO?VKGZlgaMx?(*{TFOy_-b@lGuyHB1x8IQ-Y{UT<P0HYzH
z|KxAGT?___^kqyyl;X0vx%u$nLuKNc3<QJ_&C2ZT)vH$*FJ5eB*_Xf(kY-sg%l-)f
z`2FL@>+9>0{Uc@#Um4P!!-Z3QEEZOYu3fvP`{>@idp?#QJb19RwbcPSKo4jEofORs
zO(1KvE^lo7XEO1zPb?r_GE{R7Vl1o@Ddol>PnK+LZLy6G&;*((_A>z3LE1}O8L*!u
zmw){6)TvYaQAv_aBzfX@DibKlQ`#R=0n8cxZyEN(+N=-mGGwDcvK}d?X+hZB+%$X?
zU5N&J;$jfbtjx}mB-!2Fy?OIy2LO-)y$nadPKu)}>+fd(GT^iK-n+VBv$HwYhzf9A
zqMnIy5RXozs#&qNS$;kt-?h{r0F%k&=FQt}pp^o^K5z&45@=<}fFW=Mw1GbG-Nwf9
zvUpQYk|arz<lE-IdCGhzq@j>tO)z4=U+_@pgW$iASXo$kztWW8lDucWWzI#0W=?|`
zv6RUED=-$o+G-GhBuRR`TOA<HFanN%ylg|@V>El64%?Fg?PgOrb~2gd+QIsj{8vti
zYR4LR*1Qk-Ti$<$*$!U{hHMIwyvj$-H!hR1?sikzwFZM)E0J<uhLSIz(P@zGJH+mG
zdA<Z-GMTV3P7~+=8885LfF{reni!4t_j@}#qv5cfWx``U?WLqpO63Am(f!VtE!azm
zY-FL7$Z=ApJ7br(^y5jbG$>U1>PeF1-o1NAXtMiR?f_k&2lRkDzz)y`M!jCM-Tt^$
z`{A)SQ#HsuTq1JZm#A&VL{+MiEHwEnEQ$s}A0h*_U7TjTefxH4X$eiVM!>rtb?E@B
z&E{Y<N;{oatCjYKgJJKBKYnrb>Q%Q~blqF|9hvU?siONsIT?z@Sr~%n7xptTJBy`3
z3?W2{ur$gN9slp<WtNtfc6WEz*4F;Cv2g@+fhI5lTBA{WXXp0q+ewn(4(u!6Fm-~o
zS`@rEI!|Pj3svT&E4~!G@R`@VgrmHQG&}fSzF2c5imO44JVcuHpi(mRyhc$6>o&J;
z-2$)!0O$eD6r)k=Sc8lQ3fsz^hPTQC<xk!A>#{IssytkGY#~#+w{uB=n>oZ2J~yYR
zY{6A0EBSu@>#*vtTGWYko#$T$E?v4b91i!hj9p88Jww__7w6PnHc`GGj7ykXTW6>{
z#kz7@4$%w+O<;X}{ovr>XOAEEfB`T>v)K$*mc{9NI;LI<Fn<Jl(1*ivZ1u#wdxH;A
zNg7mT0oT{p*C!JIcPh)0m{USN1h(d<_d47`#zIu{KoLa61bzr?Z97;UG>B2#5KZNW
z|Nbww3&ea9ScZss<?1KDdH&+N*j^CxNlky5gCK~-fn<mvh{%u(5d;w#k|Ba1B11An
z5JY51h6sX)49O5d5RqvBNYmI}5CpNnG~PYCN=^2x?zf2%1TpJ0fXwi5y4J4D6@nlZ
zlLjC>x%?++vPKX@1<dvm^<Zxp+XaFkd^wh(?sl7h*&koeXACiU8tjeOE4DkOKoVRB
zs1|~7e24vDZ<wo(ePoXxvAj3RALvz|r&tX3hW-BW)3C2!&+6k?Kv=B_Iy;votus^$
z{v`c=KVKW_Znt?2N>kGkwdKQ=S67w~4xj7Zdcvz`zK4IyE0KIS@9pZ!Prr0*@1cKj
z94zR{h<C+Q_5r?t44-0Jy3LaDf2XE*aBr#u{&r-XYr*V~y~E0sQv;~0i}C_x!-=(_
zqT`?%BB;{!>&L%_(eJ0iOFs7C@Hu<QJ+@Zp%E;*VQ)TV2qVXGr;A3JRpF$b2o)ESc
z%IjKgwNL@(07ldr10jFIz7VS`%j_k;<@d{Pr($j&K29q4<ols7g<M!jomoh1cFa&l
zb}F{4BhOGnUysT%%IR(FLlqo3;KELMk5D!KGUs0l=7wRY9bI^pSr`tH;}9e=MJfFB
zMRR18KRT*xi@7T2+w5=tRv10n4;lx1qkg}8vP}&5F|&@`PdP_<D6896mO@Uco2%NF
zSC~PwGUlT^<s?)tuYIV6xmDh#g`)9qm6<AoR>)6CHKj`<R7!rJgAY19Ye9~lt{`%Y
z(m5{&M~56whwc`HVxu9ObF7?(A88lLj^QTHg6`OiiQJ|GmK7$HLbqPVa<{bUIqp-g
zECe|dn*A@Di&7JH*39|x-9FSg-?J7Bp70;pHw=en?AH7OQfxHDMmqAZ+?4veH_j0e
z#zZAyv-m2Xb_^EmPe<~&&l7Ww_RGvRS`b$6rdm^uUW54HQwviYhWxf{jhKPaP(<8X
zjLlrkAOH1KewtJC*x+UKDN8lYx2T5|cvW6Yb8Z+#vnV?k195(tgYUOCXW*&H4A{31
z!6n&Ad$$GnQkZMnt-L|{fJ4^GfS5xhgn~~a1V^_%W!})idnNneur?=SSqo-Q@~nmG
zP}YvpNkgL*Fvruj*daJ^-H?Fpx}l0EWd`KyhHyMco_;&r99+|ADCr!O&P?^|7djTX
z7D6$fzf)%OJ<)uyI3;DcjYi96(P|+$E~BCPpd1Ym1TkC8%o4Q{(jbDE1Lz^J1VKcG
z9s)}cL}VHO(lv20KYKR%^wVF&@P{CXg=4nYh6sX~14xDlf`|;s5J3=;@x6TUd;?#d
z!+E2bZ{Fb7FY!k8(P`ky8QeOHpHFk-#TXA?<Ez(r`UYcFf-}JR)A)Xj7s`)M^4YKO
z=PT2b5kyhmzZTnr8N^G5&H@J?;<Pc%w_{v>sTPh88~FPN_(*^Jw_`kgjl(g9ukmuM
z7BT=IH1M~x_~;DI0&jpvZ*b)$UR#%fAc(kl$<Q~`G-wQLX*3AHqjNZ?%Kya}pZ|bI
zukr6`<C+HWhqL(I`^Uw2`Ub!K9*3IY5>I<&S_*<7s^b3&W9%~-+1jH30000<MNUMn
GLSTY;<V~so

-- 
2.43.0