Bug 1612166 - Move calendar skin files in 'lightning' directory into 'base' directory. r=Fallen,Paenglab
authorPaul Morris <paul@thunderbird.net>
Mon, 10 Feb 2020 15:36:59 -0500
changeset 37346 3d6cb3e7f57414dd148679609a8a70e33fcc3426
parent 37345 51f53932665f8a208b5f1b8e3a045ea622bc57df
child 37347 e24490bb032167720b9667af2c91ac964bb654d9
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen, Paenglab
bugs1612166
Bug 1612166 - Move calendar skin files in 'lightning' directory into 'base' directory. r=Fallen,Paenglab Eliminate the "chrome://lightning/skin/" and the "chrome://lightning-common/skin/" paths.
calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml
calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
calendar/base/content/dialogs/calendar-print-dialog.xhtml
calendar/base/themes/common/accountCentral.css
calendar/base/themes/common/html-item-editing.css
calendar/base/themes/common/images/todayButton-arrow.svg
calendar/base/themes/common/imip.css
calendar/base/themes/common/jar.inc.mn
calendar/base/themes/common/lightning-toolbar.css
calendar/base/themes/common/lightning.css
calendar/base/themes/common/suite-accountCentral.css
calendar/base/themes/linux/imip.css
calendar/base/themes/linux/jar.mn
calendar/base/themes/linux/lightning-toolbar.css
calendar/base/themes/linux/lightning.css
calendar/base/themes/osx/imip.css
calendar/base/themes/osx/jar.mn
calendar/base/themes/osx/lightning-toolbar.css
calendar/base/themes/osx/lightning.css
calendar/base/themes/windows/imip.css
calendar/base/themes/windows/jar.mn
calendar/base/themes/windows/lightning-toolbar.css
calendar/base/themes/windows/lightning.css
calendar/lightning/content/html-item-editing/lightning-item-iframe.html
calendar/lightning/content/lightning-item-iframe.xhtml
calendar/lightning/jar.mn
calendar/lightning/moz.build
calendar/lightning/themes/common/accountCentral.css
calendar/lightning/themes/common/html-item-editing.css
calendar/lightning/themes/common/images/todayButton-arrow.svg
calendar/lightning/themes/common/imip.css
calendar/lightning/themes/common/jar.inc.mn
calendar/lightning/themes/common/lightning-toolbar.css
calendar/lightning/themes/common/lightning.css
calendar/lightning/themes/common/suite-accountCentral.css
calendar/lightning/themes/linux/imip.css
calendar/lightning/themes/linux/jar.mn
calendar/lightning/themes/linux/lightning-toolbar.css
calendar/lightning/themes/linux/lightning.css
calendar/lightning/themes/linux/moz.build
calendar/lightning/themes/moz.build
calendar/lightning/themes/osx/imip.css
calendar/lightning/themes/osx/jar.mn
calendar/lightning/themes/osx/lightning-toolbar.css
calendar/lightning/themes/osx/lightning.css
calendar/lightning/themes/osx/moz.build
calendar/lightning/themes/windows/imip.css
calendar/lightning/themes/windows/jar.mn
calendar/lightning/themes/windows/lightning-toolbar.css
calendar/lightning/themes/windows/lightning.css
calendar/lightning/themes/windows/moz.build
calendar/resources/content/publishDialog.xhtml
common/src/customizeToolbar.xhtml
mail/base/content/messageWindow.xhtml
mail/base/content/messenger.xhtml
mail/components/preferences/aboutPreferences.xhtml
mailnews/base/content/msgAccountCentral.xhtml
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml
@@ -3,17 +3,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
 ]>
 
 <window title="&invite.title.label;"
         windowtype="Calendar:EventDialog:Attendees"
--- a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
@@ -4,17 +4,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-daypicker.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
   %dialogDTD;
 ]>
 
 <window title="&recurrence.title.label;"
         windowtype="Calendar:EventDialog:Recurrence"
--- a/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
@@ -3,17 +3,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/content/notification.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/dialogs/calendar-event-dialog-reminder.dtd" >
 
 <window title="&reminderdialog.title;"
         windowtype="Calendar:EventDialog:Reminder"
         onload="onLoad()"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
--- a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
@@ -2,17 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-timezone-highlighter.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd3;
   <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/preferences/timezones.dtd" > %dtd4;
 ]>
 
--- a/calendar/base/content/dialogs/calendar-print-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-print-dialog.xhtml
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/shared/grid-layout.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-print-dialog.css"?>
 
 <!DOCTYPE dialog [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
rename from calendar/lightning/themes/common/accountCentral.css
rename to calendar/base/themes/common/accountCentral.css
rename from calendar/lightning/themes/common/html-item-editing.css
rename to calendar/base/themes/common/html-item-editing.css
rename from calendar/lightning/themes/common/images/todayButton-arrow.svg
rename to calendar/base/themes/common/images/todayButton-arrow.svg
rename from calendar/lightning/themes/common/imip.css
rename to calendar/base/themes/common/imip.css
--- a/calendar/base/themes/common/jar.inc.mn
+++ b/calendar/base/themes/common/jar.inc.mn
@@ -2,40 +2,44 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This is not a complete / proper jar manifest. It is included by the
 # actual theme-specific manifests, so that shared resources need only
 # be specified once. As a result, the source file paths are relative
 # to the location of the actual manifest.
 
+    skin/classic/calendar/shared/accountCentral.css                              (../common/accountCentral.css)
     skin/classic/calendar/shared/calendar-alarms.css                             (../common/calendar-alarms.css)
     skin/classic/calendar/shared/calendar-attendees.css                          (../common/calendar-attendees.css)
     skin/classic/calendar/shared/calendar-creation-wizard.css                    (../common/calendar-creation-wizard.css)
     skin/classic/calendar/shared/calendar-daypicker.css                          (../common/calendar-daypicker.css)
     skin/classic/calendar/shared/calendar-itip-icons.svg                         (../common/calendar-itip-icons.svg)
     skin/classic/calendar/shared/calendar-occurrence-prompt.css                  (../common/calendar-occurrence-prompt.css)
     skin/classic/calendar/shared/calendar-occurrence.svg                         (../common/calendar-occurrence.svg)
     skin/classic/calendar/shared/calendar-preferences.css                        (../common/calendar-preferences.css)
     skin/classic/calendar/shared/calendar-providerUninstall-dialog.css           (../common/calendar-providerUninstall-dialog.css)
     skin/classic/calendar/shared/calendar-task-tree.css                          (../common/calendar-task-tree.css)
     skin/classic/calendar/shared/calendar-task-view.css                          (../common/calendar-task-view.css)
     skin/classic/calendar/shared/calendar-unifinder.css                          (../common/calendar-unifinder.css)
     skin/classic/calendar/shared/calendar-views.css                              (../common/calendar-views.css)
+    skin/classic/calendar/shared/datetimepickers.css                             (../../../resources/skin/datetimepickers.css)
+    skin/classic/calendar/shared/dialogOverlay.css                               (../../../resources/skin/dialogOverlay.css)
     skin/classic/calendar/shared/dialogs/calendar-alarm-dialog.css               (../common/dialogs/calendar-alarm-dialog.css)
     skin/classic/calendar/shared/dialogs/calendar-event-dialog.css               (../common/dialogs/calendar-event-dialog.css)
     skin/classic/calendar/shared/dialogs/calendar-invitations-dialog.css         (../common/dialogs/calendar-invitations-dialog.css)
     skin/classic/calendar/shared/dialogs/calendar-subscriptions-dialog.css       (../common/dialogs/calendar-subscriptions-dialog.css)
     skin/classic/calendar/shared/calendar-properties-dialog.css                  (../common/dialogs/calendar-properties-dialog.css)
     skin/classic/calendar/shared/calendar-timezone-highlighter.css               (../common/dialogs/calendar-timezone-highlighter.css)
     skin/classic/calendar/shared/calendar-event-dialog-attendees.png             (../common/dialogs/images/calendar-event-dialog-attendees.png)
     skin/classic/calendar/shared/calendar-invitations-dialog-button-images.png   (../common/dialogs/images/calendar-invitations-dialog-button-images.png)
     skin/classic/calendar/shared/calendar-invitations-dialog-list-images.png     (../common/dialogs/images/calendar-invitations-dialog-list-images.png)
     skin/classic/calendar/shared/chain-lock.svg                                  (../common/dialogs/images/chain-lock.svg)
     skin/classic/calendar/shared/chain-unlock.svg                                (../common/dialogs/images/chain-unlock.svg)
+    skin/classic/calendar/shared/html-item-editing.css                           (../common/html-item-editing.css)
     skin/classic/calendar/shared/link-image-bottom.svg                           (../common/dialogs/images/link-image-bottom.svg)
     skin/classic/calendar/shared/link-image-top.svg                              (../common/dialogs/images/link-image-top.svg)
     skin/classic/calendar/shared/statusbar-priority.svg                          (../common/dialogs/images/statusbar-priority.svg)
     skin/classic/calendar/shared/icons/alarm-no.svg                              (../common/icons/alarm-no.svg)
     skin/classic/calendar/shared/icons/alarm.svg                                 (../common/icons/alarm.svg)
     ../icons/default/calendar-alarm-dialog.png                                   (../common/icons/calendar-alarm-dialog.png)
     ../icons/default/calendar-event-dialog.png                                   (../common/icons/calendar-event-dialog.png)
     ../icons/default/calendar-event-summary-dialog.png                           (../common/icons/calendar-event-summary-dialog.png)
@@ -61,28 +65,33 @@
     skin/classic/calendar/shared/icons/status.svg                                (../common/icons/status.svg)
     skin/classic/calendar/shared/icons/synchronize.svg                           (../common/icons/synchronize.svg)
     skin/classic/calendar/shared/icons/task-tab.svg                              (../common/icons/task-tab.svg)
     skin/classic/calendar/shared/icons/task.svg                                  (../common/icons/task.svg)
     skin/classic/calendar/shared/icons/tentative.svg                             (../common/icons/tentative.svg)
     skin/classic/calendar/shared/icons/timezones.svg                             (../common/icons/timezones.svg)
     skin/classic/calendar/shared/icons/today.svg                                 (../common/icons/today.svg)
     skin/classic/calendar/shared/icons/warn.svg                                  (../common/icons/warn.svg)
+    skin/classic/calendar/shared/imip.css                                        (../common/imip.css)
     skin/classic/calendar/shared/attendee-icons.png                              (../common/images/attendee-icons.png)
     skin/classic/calendar/shared/checkbox-images.png                             (../common/images/checkbox-images.png)
     skin/classic/calendar/shared/event-continue.svg                              (../common/images/event-continue.svg)
     skin/classic/calendar/shared/event-end.svg                                   (../common/images/event-end.svg)
     skin/classic/calendar/shared/event-grippy-bottom.png                         (../common/images/event-grippy-bottom.png)
     skin/classic/calendar/shared/event-grippy-left.png                           (../common/images/event-grippy-left.png)
     skin/classic/calendar/shared/event-grippy-right.png                          (../common/images/event-grippy-right.png)
     skin/classic/calendar/shared/event-grippy-top.png                            (../common/images/event-grippy-top.png)
     skin/classic/calendar/shared/event-start.svg                                 (../common/images/event-start.svg)
+    skin/classic/calendar/shared/lightning.css                                   (../common/lightning.css)
+    skin/classic/calendar/shared/lightning-toolbar.css                           (../common/lightning-toolbar.css)
+    skin/classic/calendar/shared/suite-accountCentral.css                        (../common/suite-accountCentral.css)
     skin/classic/calendar/shared/task-images.png                                 (../common/images/task-images.png)
     skin/classic/calendar/shared/timezone_map.png                                (../common/images/timezone_map.png)
     skin/classic/calendar/shared/timezones.png                                   (../common/images/timezones.png)
+    skin/classic/calendar/shared/todayButton-arrow.svg                           (../common/images/todayButton-arrow.svg)
     skin/classic/calendar/shared/todo-complete.svg                               (../common/images/todo-complete.svg)
     skin/classic/calendar/shared/todo.svg                                        (../common/images/todo.svg)
     skin/classic/calendar/shared/today-pane.css                                  (../common/today-pane.css)
     skin/classic/calendar/shared/view-cycler.svg                                 (../common/view-cycler.svg)
     skin/classic/calendar/shared/widgets/calendar-widgets.css                    (../common/widgets/calendar-widgets.css)
     skin/classic/calendar/shared/widgets/drag-center.svg                         (../common/widgets/images/drag-center.svg)
     skin/classic/calendar/shared/widgets/nav-arrow.svg                           (../common/widgets/images/nav-arrow.svg)
     skin/classic/calendar/shared/widgets/nav-today.svg                           (../common/widgets/images/nav-today.svg)
rename from calendar/lightning/themes/common/lightning-toolbar.css
rename to calendar/base/themes/common/lightning-toolbar.css
rename from calendar/lightning/themes/common/lightning.css
rename to calendar/base/themes/common/lightning.css
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/base/themes/common/lightning.css
@@ -96,17 +96,17 @@
 #calendar-status-todaypane-button[hideLabel] > .toolbarbutton-text,
 #calendar-status-todaypane-button[hideLabel] > .toolbarbutton-icon-end {
   display: none;
 }
 
 #calendar-status-todaypane-button > .toolbarbutton-icon-end {
   -moz-context-properties: fill;
   fill: currentColor;
-  list-style-image: url(chrome://lightning-common/skin/todayButton-arrow.svg);
+  list-style-image: url(chrome://calendar/skin/shared/todayButton-arrow.svg);
 }
 
 #calendar-status-todaypane-button[checked="true"] > .toolbarbutton-icon-end {
   transform: scaleY(-1);
 }
 
 /* iMIP notification bar */
 #imip-bar > image {
rename from calendar/lightning/themes/common/suite-accountCentral.css
rename to calendar/base/themes/common/suite-accountCentral.css
rename from calendar/lightning/themes/linux/imip.css
rename to calendar/base/themes/linux/imip.css
--- a/calendar/lightning/themes/linux/imip.css
+++ b/calendar/base/themes/linux/imip.css
@@ -1,5 +1,5 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/imip.css);
+@import url(chrome://calendar/skin/shared/imip.css);
--- a/calendar/base/themes/linux/jar.mn
+++ b/calendar/base/themes/linux/jar.mn
@@ -9,10 +9,13 @@ calendar.jar:
     skin/classic/calendar/calendar-task-tree.css                           (calendar-task-tree.css)
     skin/classic/calendar/calendar-task-view.css                           (calendar-task-view.css)
     skin/classic/calendar/calendar-unifinder.css                           (calendar-unifinder.css)
     skin/classic/calendar/calendar-views.css                               (calendar-views.css)
     skin/classic/calendar/calendar-alarm-dialog.css                        (dialogs/calendar-alarm-dialog.css)
     skin/classic/calendar/calendar-event-dialog.css                        (dialogs/calendar-event-dialog.css)
     skin/classic/calendar/calendar-subscriptions-dialog.css                (dialogs/calendar-subscriptions-dialog.css)
     skin/classic/calendar/calendar-invitations-dialog.css                  (dialogs/calendar-invitations-dialog.css)
+    skin/classic/calendar/imip.css                                         (imip.css)
+    skin/classic/calendar/lightning.css                                    (lightning.css)
+    skin/classic/calendar/lightning-toolbar.css                            (lightning-toolbar.css)
     skin/classic/calendar/today-pane.css                                   (today-pane.css)
     skin/classic/calendar/widgets/calendar-widgets.css                     (widgets/calendar-widgets.css)
rename from calendar/lightning/themes/linux/lightning-toolbar.css
rename to calendar/base/themes/linux/lightning-toolbar.css
--- a/calendar/lightning/themes/linux/lightning-toolbar.css
+++ b/calendar/base/themes/linux/lightning-toolbar.css
@@ -1,5 +1,5 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/lightning-toolbar.css);
+@import url(chrome://calendar/skin/shared/lightning-toolbar.css);
rename from calendar/lightning/themes/linux/lightning.css
rename to calendar/base/themes/linux/lightning.css
--- a/calendar/lightning/themes/linux/lightning.css
+++ b/calendar/base/themes/linux/lightning.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/lightning.css);
+@import url(chrome://calendar/skin/shared/lightning.css);
 
 .lightning-notification-bar {
   background-color: #baeeff;
   color: #000;
   border-bottom: 1px solid ThreeDDarkShadow;
   padding: 3px;
 }
 
rename from calendar/lightning/themes/osx/imip.css
rename to calendar/base/themes/osx/imip.css
--- a/calendar/lightning/themes/osx/imip.css
+++ b/calendar/base/themes/osx/imip.css
@@ -1,10 +1,10 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/imip.css);
+@import url(chrome://calendar/skin/shared/imip.css);
 
 .invitation-table {
     margin-top: 1em;
     margin-bottom: 1em;
 }
--- a/calendar/base/themes/osx/jar.mn
+++ b/calendar/base/themes/osx/jar.mn
@@ -11,12 +11,15 @@ calendar.jar:
     skin/classic/calendar/calendar-unifinder.css                             (calendar-unifinder.css)
     skin/classic/calendar/calendar-views.css                                 (calendar-views.css)
     skin/classic/calendar/calendar-alarm-dialog.css                          (dialogs/calendar-alarm-dialog.css)
     skin/classic/calendar/calendar-event-dialog.css                          (dialogs/calendar-event-dialog.css)
     skin/classic/calendar/calendar-invitations-dialog.css                    (dialogs/calendar-invitations-dialog.css)
     skin/classic/calendar/calendar-subscriptions-dialog.css                  (dialogs/calendar-subscriptions-dialog.css)
     skin/classic/calendar/checkbox-images-graphite.png                       (images/checkbox-images-graphite.png)
     skin/classic/calendar/checkbox-images.png                                (images/checkbox-images.png)
+    skin/classic/calendar/imip.css                                           (imip.css)
+    skin/classic/calendar/lightning.css                                      (lightning.css)
+    skin/classic/calendar/lightning-toolbar.css                              (lightning-toolbar.css)
     skin/classic/calendar/locked-selected-mac.svg                            (images/locked-selected-mac.svg)
+    skin/classic/calendar/today-pane.css                                     (today-pane.css)
     skin/classic/calendar/warn-selected-mac.svg                              (images/warn-selected-mac.svg)
-    skin/classic/calendar/today-pane.css                                     (today-pane.css)
     skin/classic/calendar/widgets/calendar-widgets.css                       (widgets/calendar-widgets.css)
rename from calendar/lightning/themes/osx/lightning-toolbar.css
rename to calendar/base/themes/osx/lightning-toolbar.css
--- a/calendar/lightning/themes/osx/lightning-toolbar.css
+++ b/calendar/base/themes/osx/lightning-toolbar.css
@@ -1,5 +1,5 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/lightning-toolbar.css);
+@import url(chrome://calendar/skin/shared/lightning-toolbar.css);
rename from calendar/lightning/themes/osx/lightning.css
rename to calendar/base/themes/osx/lightning.css
--- a/calendar/lightning/themes/osx/lightning.css
+++ b/calendar/base/themes/osx/lightning.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/lightning.css);
+@import url(chrome://calendar/skin/shared/lightning.css);
 
 .lightning-notification-bar {
     background-color: #baeeff;
     padding: 6px 8px;
     color: #000;
 }
 
 #calendarContent:-moz-lwtheme {
rename from calendar/lightning/themes/windows/imip.css
rename to calendar/base/themes/windows/imip.css
--- a/calendar/lightning/themes/windows/imip.css
+++ b/calendar/base/themes/windows/imip.css
@@ -1,5 +1,5 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/imip.css);
+@import url(chrome://calendar/skin/shared/imip.css);
--- a/calendar/base/themes/windows/jar.mn
+++ b/calendar/base/themes/windows/jar.mn
@@ -9,10 +9,13 @@ calendar.jar:
     skin/classic/calendar/calendar-task-tree.css                         (calendar-task-tree.css)
     skin/classic/calendar/calendar-task-view.css                         (calendar-task-view.css)
     skin/classic/calendar/calendar-unifinder.css                         (calendar-unifinder.css)
     skin/classic/calendar/calendar-views.css                             (calendar-views.css)
     skin/classic/calendar/calendar-alarm-dialog.css                      (dialogs/calendar-alarm-dialog.css)
     skin/classic/calendar/calendar-event-dialog.css                      (dialogs/calendar-event-dialog.css)
     skin/classic/calendar/calendar-invitations-dialog.css                (dialogs/calendar-invitations-dialog.css)
     skin/classic/calendar/calendar-subscriptions-dialog.css              (dialogs/calendar-subscriptions-dialog.css)
+    skin/classic/calendar/imip.css                                       (imip.css)
+    skin/classic/calendar/lightning.css                                  (lightning.css)
+    skin/classic/calendar/lightning-toolbar.css                          (lightning-toolbar.css)
     skin/classic/calendar/today-pane.css                                 (today-pane.css)
     skin/classic/calendar/widgets/calendar-widgets.css                   (widgets/calendar-widgets.css)
rename from calendar/lightning/themes/windows/lightning-toolbar.css
rename to calendar/base/themes/windows/lightning-toolbar.css
--- a/calendar/lightning/themes/windows/lightning-toolbar.css
+++ b/calendar/base/themes/windows/lightning-toolbar.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/lightning-toolbar.css);
+@import url(chrome://calendar/skin/shared/lightning-toolbar.css);
 
 #calendar-toolbar2,
 #task-toolbar2 {
   border-top-width: 0;
 }
 
 @media (-moz-windows-glass) {
   #calendar-toolbox:not(:-moz-lwtheme) {
rename from calendar/lightning/themes/windows/lightning.css
rename to calendar/base/themes/windows/lightning.css
--- a/calendar/lightning/themes/windows/lightning.css
+++ b/calendar/base/themes/windows/lightning.css
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url(chrome://lightning-common/skin/lightning.css);
+@import url(chrome://calendar/skin/shared/lightning.css);
 
 .lightning-notification-bar {
     background-color: #baeeff;
     color: #000;
     border-bottom: 1px solid ThreeDDarkShadow;
     padding: 3px;
 }
 
--- a/calendar/lightning/content/html-item-editing/lightning-item-iframe.html
+++ b/calendar/lightning/content/html-item-editing/lightning-item-iframe.html
@@ -2,17 +2,17 @@
 <html>
   <head>
     <meta charset='utf-8'>
     <title>Event in a Tab</title>
     <!--
         "chrome://global/skin/global.css" cannot be included here due to
          namespaces, see https://bugzilla.mozilla.org/show_bug.cgi?id=1297392#c4
     -->
-    <link rel="stylesheet" type="text/css" href="chrome://lightning-common/skin/html-item-editing.css">
+    <link rel="stylesheet" type="text/css" href="chrome://calendar/skin/shared/html-item-editing.css">
   </head>
   <body>
     <!-- This div's id must be "container" for React.js to use it -->
     <div id='container'>
       <p>
         If you can see this, React is still loading or is not working right.
       </p>
     </div>
--- a/calendar/lightning/content/lightning-item-iframe.xhtml
+++ b/calendar/lightning/content/lightning-item-iframe.xhtml
@@ -6,17 +6,17 @@
 <!-- XXX some of these css files may not be needed here.
     widget-bindings.css definitely is needed here -->
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://lightning-common/skin/datetimepickers.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
 
 <!DOCTYPE window [
     <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
     <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
     <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -1,15 +1,15 @@
 #filter substitution
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 lightning.jar:
-% override chrome://messagebody/skin/imip.css chrome://lightning/skin/imip.css
+% override chrome://messagebody/skin/imip.css chrome://calendar/skin/imip.css
 % override chrome://messagebody/skin/calendar-event-dialog-attendees.png chrome://calendar/skin/shared/calendar-event-dialog-attendees.png
 % content lightning %content/
     content/calendar-appmenu-panelviews.inc.xhtml          (content/calendar-appmenu-panelviews.inc.xhtml)
     content/calendar-buttons-mail-toolbar.inc.xhtml        (content/calendar-buttons-mail-toolbar.inc.xhtml)
     content/calendar-commands.inc.xhtml                    (content/calendar-commands.inc.xhtml)
     content/calendar-context-menus-and-tooltips.inc.xhtml  (content/calendar-context-menus-and-tooltips.inc.xhtml)
     content/calendar-keys.inc.xhtml                        (content/calendar-keys.inc.xhtml)
     content/calendar-menu-events-tasks.inc.xhtml           (content/calendar-menu-events-tasks.inc.xhtml)
--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -7,17 +7,16 @@ DIRS += [
     '../libical',
     '../base',
     '../providers',
     '../import-export',
     '../itip',
     'components',
     '../locales',
     'modules',
-    'themes',
 ]
 
 TEST_DIRS += ['../test']
 
 JAR_MANIFESTS += ['jar.mn']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['THEME'] = 'windows'
deleted file mode 100644
--- a/calendar/lightning/themes/common/jar.inc.mn
+++ /dev/null
@@ -1,19 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# This is not a complete / proper jar manifest. It is included by the
-# actual theme-specific manifests, so that shared resources need only
-# be specified once. As a result, the source file paths are relative
-# to the location of the actual manifest.
-
-% skin lightning-common classic/1.0 %skin/lightning-common/
-    skin/lightning-common/accountCentral.css               (../common/accountCentral.css)
-    skin/lightning-common/html-item-editing.css            (../common/html-item-editing.css)
-    skin/lightning-common/todayButton-arrow.svg            (../common/images/todayButton-arrow.svg)
-    skin/lightning-common/imip.css                         (../common/imip.css)
-    skin/lightning-common/lightning.css                    (../common/lightning.css)
-    skin/lightning-common/lightning-toolbar.css            (../common/lightning-toolbar.css)
-    skin/lightning-common/suite-accountCentral.css         (../common/suite-accountCentral.css)
-    skin/lightning-common/datetimepickers.css              (../../../resources/skin/datetimepickers.css)
-    skin/lightning-common/dialogOverlay.css                (../../../resources/skin/dialogOverlay.css)
deleted file mode 100644
--- a/calendar/lightning/themes/linux/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-lightning.jar:
-% skin lightning classic/1.0 %skin/linux/
-#include ../common/jar.inc.mn
-    skin/linux/imip.css                                    (imip.css)
-    skin/linux/lightning.css                               (lightning.css)
-    skin/linux/lightning-toolbar.css                       (lightning-toolbar.css)
deleted file mode 100644
--- a/calendar/lightning/themes/linux/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/calendar/lightning/themes/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
-    DIRS += ['linux']
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    DIRS += ['osx']
-else:
-    DIRS += ['windows']
deleted file mode 100644
--- a/calendar/lightning/themes/osx/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-lightning.jar:
-% skin lightning classic/1.0 %skin/osx/ os=Darwin
-#include ../common/jar.inc.mn
-    skin/osx/imip.css                                      (imip.css)
-    skin/osx/lightning.css                                 (lightning.css)
-    skin/osx/lightning-toolbar.css                         (lightning-toolbar.css)
deleted file mode 100644
--- a/calendar/lightning/themes/osx/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/calendar/lightning/themes/windows/jar.mn
+++ /dev/null
@@ -1,10 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-lightning.jar:
-% skin lightning classic/1.0 %skin/windows/ os=WINNT
-#include ../common/jar.inc.mn
-    skin/windows/imip.css                                  (imip.css)
-    skin/windows/lightning.css                             (lightning.css)
-    skin/windows/lightning-toolbar.css                     (lightning-toolbar.css)
deleted file mode 100644
--- a/calendar/lightning/themes/windows/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-JAR_MANIFESTS += ['jar.mn']
--- a/calendar/resources/content/publishDialog.xhtml
+++ b/calendar/resources/content/publishDialog.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <!-- CSS File with all styles specific to the dialog -->
-<?xml-stylesheet href="chrome://lightning-common/skin/dialogOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/shared/dialogOverlay.css" type="text/css"?>
 
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 <window title="&calendar.publish.dialog.title;"
--- a/common/src/customizeToolbar.xhtml
+++ b/common/src/customizeToolbar.xhtml
@@ -26,17 +26,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressbook.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
 #endif
 <?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://lightning/skin/lightning-toolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/lightning-toolbar.css" type="text/css"?>
 
 <window id="CustomizeToolbarWindow"
         title="&dialog.title;"
 #ifdef MOZ_SUITE
         onload="onLoad();"
 #else
         windowtype="mailnews:customizeToolbar"
         onload="overlayOnLoad();"
--- a/mail/base/content/messageWindow.xhtml
+++ b/mail/base/content/messageWindow.xhtml
@@ -9,17 +9,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/editContactPanel.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/customizableui/panelUI.css" type="text/css"?>
-<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/lightning.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
 %msgHdrViewOverlayDTD;
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -20,17 +20,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgHdrViewSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/smime/msgReadSMIMEOverlay.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/customizableui/panelUI.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 
 <!-- Calendar CSS -->
-<?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/lightning.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-event-dialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-event-dialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-unifinder.css" type="text/css"?>
@@ -38,17 +38,17 @@
 <?xml-stylesheet href="chrome://calendar/skin/calendar-task-tree.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/calendar-alarms.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/widgets/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 
-<?xml-stylesheet href="chrome://lightning/skin/lightning-toolbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/lightning-toolbar.css" type="text/css"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
 %msgHdrViewOverlayDTD;
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
--- a/mail/components/preferences/aboutPreferences.xhtml
+++ b/mail/components/preferences/aboutPreferences.xhtml
@@ -8,17 +8,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
 <?xml-stylesheet href="chrome://messenger/content/messenger.css"?>
 <?xml-stylesheet href="chrome://messenger/content/preferences/handlers.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/applications.css"?>
 <?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
 <?xml-stylesheet href="chrome://calendar/skin/shared/calendar-preferences.css" type="text/css"?>
-<?xml-stylesheet href="chrome://lightning/skin/lightning.css"?>
+<?xml-stylesheet href="chrome://calendar/skin/lightning.css"?>
 
 <!DOCTYPE preftab [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % preferencesDTD SYSTEM "chrome://messenger/locale/preferences/preferences.dtd">
 %preferencesDTD;
 <!ENTITY % generalDTD SYSTEM "chrome://messenger/locale/preferences/general.dtd" >
 %generalDTD;
--- a/mailnews/base/content/msgAccountCentral.xhtml
+++ b/mailnews/base/content/msgAccountCentral.xhtml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://messenger/skin/accountCentral.css" type="text/css"?>
-<?xml-stylesheet href="chrome://lightning-common/skin/accountCentral.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/shared/accountCentral.css" type="text/css"?>
 
 <!DOCTYPE window [
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
    %brandDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
    %globalDTD;
   <!ENTITY % acctCentralDTD SYSTEM "chrome://messenger/locale/msgAccountCentral.dtd">
    %acctCentralDTD;