Bug 1612166 - Remove 'chrome://calendar-common/skin/' path. r=Fallen
authorPaul Morris <paul@thunderbird.net>
Mon, 10 Feb 2020 13:21:13 -0500
changeset 37345 51f53932665f8a208b5f1b8e3a045ea622bc57df
parent 37344 171779b184e0be3f5b397bd985d4a3d1a371ac58
child 37346 3d6cb3e7f57414dd148679609a8a70e33fcc3426
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
bugs1612166
Bug 1612166 - Remove 'chrome://calendar-common/skin/' path. r=Fallen Use chrome://calendar/skin/shared/ instead, as in mail code.
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-event-dialog.xhtml
calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
calendar/base/content/dialogs/calendar-print-dialog.xhtml
calendar/base/content/dialogs/calendar-properties-dialog.xhtml
calendar/base/content/dialogs/calendar-providerUninstall-dialog.xhtml
calendar/base/content/dialogs/calendar-summary-dialog.xhtml
calendar/base/themes/common/calendar-alarms.css
calendar/base/themes/common/calendar-attendees.css
calendar/base/themes/common/calendar-occurrence-prompt.css
calendar/base/themes/common/calendar-task-tree.css
calendar/base/themes/common/calendar-task-view.css
calendar/base/themes/common/calendar-views.css
calendar/base/themes/common/dialogs/calendar-alarm-dialog.css
calendar/base/themes/common/dialogs/calendar-event-dialog.css
calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
calendar/base/themes/common/dialogs/calendar-timezone-highlighter.css
calendar/base/themes/common/jar.inc.mn
calendar/base/themes/common/today-pane.css
calendar/base/themes/common/widgets/calendar-widgets.css
calendar/base/themes/common/widgets/minimonth.css
calendar/base/themes/linux/calendar-daypicker.css
calendar/base/themes/linux/calendar-task-tree.css
calendar/base/themes/linux/calendar-task-view.css
calendar/base/themes/linux/calendar-unifinder.css
calendar/base/themes/linux/calendar-views.css
calendar/base/themes/linux/dialogs/calendar-alarm-dialog.css
calendar/base/themes/linux/dialogs/calendar-invitations-dialog.css
calendar/base/themes/linux/dialogs/calendar-subscriptions-dialog.css
calendar/base/themes/linux/jar.mn
calendar/base/themes/linux/today-pane.css
calendar/base/themes/linux/widgets/calendar-widgets.css
calendar/base/themes/osx/calendar-daypicker.css
calendar/base/themes/osx/calendar-task-tree.css
calendar/base/themes/osx/calendar-task-view.css
calendar/base/themes/osx/calendar-unifinder.css
calendar/base/themes/osx/calendar-views.css
calendar/base/themes/osx/dialogs/calendar-alarm-dialog.css
calendar/base/themes/osx/dialogs/calendar-invitations-dialog.css
calendar/base/themes/osx/dialogs/calendar-subscriptions-dialog.css
calendar/base/themes/osx/jar.mn
calendar/base/themes/osx/today-pane.css
calendar/base/themes/osx/widgets/calendar-widgets.css
calendar/base/themes/windows/calendar-daypicker.css
calendar/base/themes/windows/calendar-task-tree.css
calendar/base/themes/windows/calendar-task-view.css
calendar/base/themes/windows/calendar-unifinder.css
calendar/base/themes/windows/calendar-views.css
calendar/base/themes/windows/dialogs/calendar-alarm-dialog.css
calendar/base/themes/windows/dialogs/calendar-invitations-dialog.css
calendar/base/themes/windows/dialogs/calendar-subscriptions-dialog.css
calendar/base/themes/windows/jar.mn
calendar/base/themes/windows/today-pane.css
calendar/base/themes/windows/widgets/calendar-widgets.css
calendar/import-export/calHtmlExport.js
calendar/import-export/calMonthGridPrinter.js
calendar/import-export/calWeekPrinter.js
calendar/lightning/content/lightning-item-iframe.xhtml
calendar/lightning/jar.mn
calendar/lightning/themes/common/accountCentral.css
calendar/lightning/themes/common/imip.css
calendar/lightning/themes/common/lightning-toolbar.css
calendar/lightning/themes/common/lightning.css
calendar/resources/content/calendarCreation.xhtml
common/src/customizeToolbar.xhtml
mail/base/content/messenger.xhtml
mail/components/preferences/aboutPreferences.xhtml
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.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-common/skin/calendar-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.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"?>
 
 <!DOCTYPE window [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
 ]>
 
--- a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.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://messenger/skin/messenger.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-daypicker.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.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"?>
 
 <!DOCTYPE window [
   <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
   %dialogDTD;
 ]>
--- a/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.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://messenger/content/notification.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.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"?>
 
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/dialogs/calendar-event-dialog-reminder.dtd" >
 
 <window title="&reminderdialog.title;"
         windowtype="Calendar:EventDialog:Reminder"
         onload="onLoad()"
--- a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.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/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-timezone-highlighter.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.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"?>
 
 <!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;
 ]>
@@ -36,13 +36,13 @@
     <datetimepicker id="timezone-time" disabled="true"/>
   </hbox>
 
   <menulist id="timezone-menulist" oncommand="updateTimezone()">
     <menupopup id="timezone-menupopup" style="height: 460px;"/>
   </menulist>
 
   <stack id="timezone-stack">
-    <image src="chrome://calendar-common/skin/timezone_map.png"/>
+    <image src="chrome://calendar/skin/shared/timezone_map.png"/>
     <image class="timezone-highlight" tzid="+0000" id="highlighter"/>
   </stack>
 </dialog>
 </window>
--- a/calendar/base/content/dialogs/calendar-event-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xhtml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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-common/skin/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.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/shared/dialogs/calendar-event-dialog.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://messenger/skin/primaryToolbar.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 #ifdef MOZ_SUITE
 <?xml-stylesheet type="text/css" href="chrome://communicator/skin/communicator.css"?>
 #endif
 
--- a/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
+++ b/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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/" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/calendar-occurrence-prompt.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-occurrence-prompt.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/calendar-occurrence-prompt.dtd">
 
 <window windowtype="Calendar:OccurrencePrompt"
         onload="onLoad()"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
         xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
--- a/calendar/base/content/dialogs/calendar-print-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-print-dialog.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 type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.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://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;
--- a/calendar/base/content/dialogs/calendar-properties-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-properties-dialog.xhtml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTf-8"?>
 <!-- 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"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/calendar-properties-dialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-properties-dialog.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/notification.css" type="text/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/calendarCreation.dtd" > %dtd3;
--- a/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xhtml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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-common/skin/calendar-providerUninstall-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/calendar-widgets.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-providerUninstall-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/calendar-widgets.css"?>
 
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/provider-uninstall.dtd" >
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&providerUninstall.title;"
         windowtype="Calendar:ProviderUninstall"
         height="320"
         width="480"
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xhtml
@@ -1,20 +1,20 @@
 <?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-common/skin/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-attendees.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.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/content/calendar-summary-dialog.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd" >
   <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" >
   <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" >
--- a/calendar/base/themes/common/calendar-alarms.css
+++ b/calendar/base/themes/common/calendar-alarms.css
@@ -6,25 +6,25 @@
  * Reminder icons (used from the event dialog, reminder dialog, views, ...)
  */
 .reminder-icon {
     -moz-context-properties: fill;
     fill: currentColor;
 }
 
 .reminder-icon[value="DISPLAY"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/alarm.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/alarm.svg);
 }
 
 .alarm-icons-box[suppressed="true"] > .reminder-icon[value="DISPLAY"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/alarm-no.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/alarm-no.svg);
 }
 
 .reminder-icon[value="EMAIL"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/email.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/email.svg);
 }
 
 .alarm-icons-box[flashing="true"] > .reminder-icon[value="DISPLAY"] {
     background: red;
     fill: white;
 }
 
 .alarm-icons-box > .reminder-icon {
--- a/calendar/base/themes/common/calendar-attendees.css
+++ b/calendar/base/themes/common/calendar-attendees.css
@@ -59,18 +59,18 @@ html|input.textbox-addressingWidget:disa
 
 .itip-icon {
     --itip-icon-partstat: -16px -16px; /* default: NEEDS-ACTION */
     --itip-icon-role: 0px; /* default: REQ-PARTICIPANT */
     --itip-icon-usertype: -32px; /* default: INDIVIDUAL */
     width: 16px;
     height: 16px;
     max-height: 16px;
-    background-image: url(chrome://calendar-common/skin/calendar-itip-icons.svg),
-                      url(chrome://calendar-common/skin/calendar-itip-icons.svg);
+    background-image: url(chrome://calendar/skin/shared/calendar-itip-icons.svg),
+                      url(chrome://calendar/skin/shared/calendar-itip-icons.svg);
     background-position: var(--itip-icon-partstat), var(--itip-icon-usertype) var(--itip-icon-role);
 }
 .itip-icon[partstat="ACCEPTED"] {
     --itip-icon-partstat: 0px 0px;
 }
 .itip-icon[partstat="DECLINED"] {
     --itip-icon-partstat: 0px -16px;
 }
@@ -141,17 +141,17 @@ html|span.ac-emphasize-text {
 .status-icon > .menu-iconic-left,
 .role-icon > .menu-iconic-left,
 .usertype-icon > .menu-iconic-left {
     visibility: inherit;
 }
 
 .status-icon {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/shared/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 48px 14px 36px);
 }
 
 .status-icon[disabled="true"] {
     -moz-image-region: rect(14px 48px 28px 36px);
 }
 
 .status-icon[status="ACCEPTED"] {
@@ -179,17 +179,17 @@ html|span.ac-emphasize-text {
     -moz-image-region: rect(0px 48px 14px 36px);
 }
 .status-icon[status="TENTATIVE"][disabled="true"] {
     -moz-image-region: rect(14px 48px 28px 36px);
 }
 
 .role-icon {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
+    list-style-image: url(chrome://calendar/skin/shared/calendar-event-dialog-attendees.png);
     -moz-image-region: rect(0px 159px 16px 138px);
 }
 
 .role-icon[disabled="true"] {
     -moz-image-region: rect(0px 159px 16px 138px);
 }
 
 .role-icon[role="REQ-PARTICIPANT"] {
@@ -218,17 +218,17 @@ html|span.ac-emphasize-text {
 }
 .role-icon[role="NON-PARTICIPANT"][disabled="true"] {
     -moz-image-region: rect(0px 222px 16px 201px);
 }
 
 .usertype-icon,
 .usertype-icon[cutype="INDIVIDUAL"] {
     margin: 0 3px;
-    list-style-image: url(chrome://calendar-common/skin/attendee-icons.png);
+    list-style-image: url(chrome://calendar/skin/shared/attendee-icons.png);
     -moz-image-region: rect(0px 16px 16px 0px);
 }
 .usertype-icon[disabled="true"],
 .usertype-icon[cutype="INDIVIDUAL"][disabled="true"] {
     -moz-image-region: rect(16px 16px 32px 0px);
 }
 
 .usertype-icon[cutype="GROUP"] {
--- a/calendar/base/themes/common/calendar-occurrence-prompt.css
+++ b/calendar/base/themes/common/calendar-occurrence-prompt.css
@@ -38,26 +38,26 @@
 }
 
 .occurrence-accept-buttons > .button-box > .button-text {
   margin: 0 3px !important;
 }
 
 #accept-buttons-box[type="mixed"] > #accept-occurrence-button,
 #accept-buttons-box[type="event"] > #accept-occurrence-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-occurrence.svg#event-single);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-occurrence.svg#event-single);
 }
 
 #accept-buttons-box[type="mixed"] > #accept-parent-button,
 #accept-buttons-box[type="mixed"] > #accept-allfollowing-button,
 #accept-buttons-box[type="event"] > #accept-parent-button,
 #accept-buttons-box[type="event"] > #accept-allfollowing-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-occurrence.svg#event-all);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-occurrence.svg#event-all);
 }
 
 #accept-buttons-box[type="task"] > .occurrence-accept-buttons {
-  list-style-image: url(chrome://calendar-common/skin/calendar-occurrence.svg#task-single);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-occurrence.svg#task-single);
 }
 
 #accept-buttons-box[type="task"] > #accept-parent-button,
 #accept-buttons-box[type="task"] > #accept-allfollowing-button {
-  list-style-image: url(chrome://calendar-common/skin/calendar-occurrence.svg#task-all);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-occurrence.svg#task-all);
 }
--- a/calendar/base/themes/common/calendar-task-tree.css
+++ b/calendar/base/themes/common/calendar-task-tree.css
@@ -59,40 +59,40 @@
     font-style: italic;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-cell-text(duetoday) {
     font-weight: bold;
 }
 
 .calendar-task-tree-col-priority {
-    list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/priority.svg);
     -moz-context-properties: fill;
     fill: currentColor;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, normalpriority) {
-    list-style-image: url(chrome://calendar-common/skin/task-images.png);
+    list-style-image: url(chrome://calendar/skin/shared/task-images.png);
     -moz-image-region: rect(0 13px 13px 0);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, highpriority) {
-    list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/priority.svg);
     -moz-context-properties: fill;
     fill: red;
     margin-inline-start: -2px;
 }
 
 :root[lwt-tree-brighttext] .calendar-task-tree >
   treechildren::-moz-tree-image(calendar-task-tree-col-priority, highpriority) {
     fill: #ff7a7a;
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, lowpriority) {
-    list-style-image: url(chrome://calendar-common/skin/task-images.png);
+    list-style-image: url(chrome://calendar/skin/shared/task-images.png);
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-priority, selected, lowpriority) {
     -moz-image-region: rect(0 39px 13px 26px);
 }
 
 :root[lwt-tree-brighttext] .calendar-task-tree >
--- a/calendar/base/themes/common/calendar-task-view.css
+++ b/calendar/base/themes/common/calendar-task-view.css
@@ -156,17 +156,17 @@
 #unifinder-todo-tree > .calendar-task-tree {
     margin-bottom: 3px;
 }
 
 /* ::::: task actions toolbar ::::: */
 
 #calendar-add-task-button {
     margin-inline-start: 5px;
-    list-style-image: url(chrome://calendar-common/skin/icons/newtask.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/newtask.svg);
     -moz-image-region: rect(0 16px 16px 0);
     -moz-context-properties: fill, fill-opacity;
     fill: currentColor;
     fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 :root[lwt-tree] #calendar-add-task-button {
     -moz-appearance: none;
@@ -204,21 +204,21 @@
     padding-inline-start: 5px;
 }
 
 #task-actions-category {
     list-style-image: url(chrome://messenger/skin/icons/tag.svg);
 }
 
 #task-actions-markcompleted {
-    list-style-image: url(chrome://calendar-common/skin/icons/complete.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/complete.svg);
 }
 
 #task-actions-priority {
-    list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/priority.svg);
 }
 
 #calendar-delete-task-button {
     list-style-image: url(chrome://messenger/skin/icons/delete.svg);
 }
 
 .input-container {
     display: flex;
--- a/calendar/base/themes/common/calendar-views.css
+++ b/calendar/base/themes/common/calendar-views.css
@@ -171,36 +171,36 @@
     display: none;
 }
 
 .multiday-view-main-box .calendar-item-image {
   margin-top: 4px;
 }
 
 .calendar-item-image[itemType="todo"] {
-    list-style-image: url("chrome://calendar-common/skin/todo.svg");
+    list-style-image: url("chrome://calendar/skin/shared/todo.svg");
     display: -moz-box;
 }
 
 .calendar-item-image[itemType="todo"][progress="completed"] {
-    list-style-image: url("chrome://calendar-common/skin/todo-complete.svg");
+    list-style-image: url("chrome://calendar/skin/shared/todo-complete.svg");
 }
 
 .calendar-item-image[type="start"] {
-    list-style-image: url("chrome://calendar-common/skin/event-start.svg");
+    list-style-image: url("chrome://calendar/skin/shared/event-start.svg");
     display: -moz-box;
 }
 
 .calendar-item-image[type="continue"] {
-    list-style-image: url("chrome://calendar-common/skin/event-continue.svg");
+    list-style-image: url("chrome://calendar/skin/shared/event-continue.svg");
     display: -moz-box;
 }
 
 .calendar-item-image[type="end"] {
-    list-style-image: url("chrome://calendar-common/skin/event-end.svg");
+    list-style-image: url("chrome://calendar/skin/shared/event-end.svg");
     display: -moz-box;
 }
 
 .calendar-item-image[type]:-moz-locale-dir(ltr) {
   transform: rotate(-90deg);
 }
 
 .calendar-item-image[type]:-moz-locale-dir(rtl) {
@@ -859,32 +859,32 @@ calendar-event-gripbar[parentorient="hor
     cursor: w-resize;
 }
 
 calendar-event-gripbar[parentorient="horizontal"][whichside="end"] {
     cursor: e-resize;
 }
 
 calendar-event-box[orient="vertical"] .calendar-event-box-grippy-top image {
-    list-style-image: url("chrome://calendar-common/skin/event-grippy-top.png");
+    list-style-image: url("chrome://calendar/skin/shared/event-grippy-top.png");
     visibility: hidden;
 }
 
 calendar-event-box[orient="vertical"] .calendar-event-box-grippy-bottom image {
-    list-style-image: url("chrome://calendar-common/skin/event-grippy-bottom.png");
+    list-style-image: url("chrome://calendar/skin/shared/event-grippy-bottom.png");
     visibility: hidden;
 }
 
 calendar-event-box[orient="horizontal"] .calendar-event-box-grippy-top image {
-    list-style-image: url("chrome://calendar-common/skin/event-grippy-left.png");
+    list-style-image: url("chrome://calendar/skin/shared/event-grippy-left.png");
     visibility: hidden;
 }
 
 calendar-event-box[orient="horizontal"] .calendar-event-box-grippy-bottom image {
-    list-style-image: url("chrome://calendar-common/skin/event-grippy-right.png");
+    list-style-image: url("chrome://calendar/skin/shared/event-grippy-right.png");
     visibility: hidden;
 }
 
 calendar-event-box[gripBars="start"]:not([readonly="true"]):hover .calendar-event-box-grippy-top image,
 calendar-event-box[gripBars="end"]:not([readonly="true"]):hover .calendar-event-box-grippy-bottom image,
 calendar-event-box[gripBars="both"]:not([readonly="true"]):hover .calendar-event-box-grippy-top image,
 calendar-event-box[gripBars="both"]:not([readonly="true"]):hover .calendar-event-box-grippy-bottom image {
     visibility: visible;
@@ -1151,22 +1151,22 @@ radio.calview:not([selected=true]):hover
     fill: currentColor;
 }
 
 .item-classification-box[classification="PUBLIC"] {
     display: none;
 }
 
 .item-classification-box[classification="PRIVATE"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/private.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/private.svg);
     display: -moz-box;
 }
 
 .item-classification-box[classification="CONFIDENTIAL"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/confidential.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/confidential.svg);
     display: -moz-box;
 }
 
 .fgdragspacer {
     display: inherit;
     overflow: hidden;
 }
 
--- a/calendar/base/themes/common/dialogs/calendar-alarm-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-alarm-dialog.css
@@ -50,33 +50,33 @@ richlistitem[is="calendar-alarm-widget-r
 .alarm-details-label {
     color: HighlightText;
     text-decoration: underline;
 }
 
 richlistitem[is="calendar-alarm-widget-richlistitem"][selected="true"] .alarm-calendar-image {
     -moz-context-properties: fill;
     fill: currentColor;
-    list-style-image: url(chrome://calendar-common/skin/icons/icon32.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/icon32.svg);
     margin-top: 2px;
 }
 
 .snooze-popup-button {
     min-width: 0;
     -moz-appearance: toolbarbutton;
     -moz-context-properties: fill;
     fill: currentColor;
 }
 
 .snooze-popup-ok-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/complete.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/complete.svg);
 }
 
 .snooze-popup-cancel-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/decline.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/decline.svg);
 }
 
 .snooze-popup-button > .button-box > .button-icon {
     margin: 0;
 }
 
 .snooze-popup-button > .button-box {
     border: 0;
--- a/calendar/base/themes/common/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
@@ -46,17 +46,17 @@ window[systemcolors] > dialog {
 }
 
 #button-save[mode="send"] {
   list-style-image: url("chrome://messenger/skin/icons/send.svg");
 }
 
 #saveandcloseButton,
 #button-saveandclose {
-  list-style-image: url(chrome://calendar-common/skin/icons/save-close.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/save-close.svg);
 }
 
 #button-saveandclose[mode="send"] {
   list-style-image: url("chrome://messenger/skin/icons/send.svg");
 }
 
 #button-attendees {
   list-style-image: url(chrome://messenger/skin/icons/address.svg);
@@ -73,41 +73,41 @@ window[systemcolors] > dialog {
 #deleteButton,
 #button-delete.cal-event-toolbarbutton {
   /* !important to override the SM #button-delete states */
   list-style-image: url(chrome://messenger/skin/icons/delete.svg) !important;
   -moz-image-region: auto !important;
 }
 
 #button-priority {
-  list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/priority.svg);
 }
 
 #button-status {
-  list-style-image: url(chrome://calendar-common/skin/icons/status.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/status.svg);
 }
 
 #button-freebusy {
-  list-style-image: url(chrome://calendar-common/skin/icons/freebusy.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/freebusy.svg);
 }
 
 #button-timezones {
-  list-style-image: url(chrome://calendar-common/skin/icons/timezones.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/timezones.svg);
 }
 
 #acceptButton {
-  list-style-image: url(chrome://calendar-common/skin/icons/complete.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/complete.svg);
 }
 
 #tentativeButton {
-  list-style-image: url(chrome://calendar-common/skin/icons/tentative.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/tentative.svg);
 }
 
 #declineButton {
-  list-style-image: url(chrome://calendar-common/skin/icons/decline.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/decline.svg);
 }
 
 /*--------------------------------------------------------------------
  *   Event dialog counter box section
  *-------------------------------------------------------------------*/
 
 #counter-proposal-box {
   background-color: rgb(186, 238, 255);
@@ -141,23 +141,23 @@ label.label {
 
 .cal-event-toolbarbutton .toolbarbutton-icon {
   width: 18px;
   height: 18px;
 }
 
 .icon-holder[type="calendarEvent"],
 .tabmail-tab[type="calendarEvent"] {
-  list-style-image: url(chrome://calendar-common/skin/icons/event.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/event.svg);
   -moz-image-region: auto;
 }
 
 .icon-holder[type="calendarTask"],
 .tabmail-tab[type="calendarTask"] {
-  list-style-image: url(chrome://calendar-common/skin/icons/task.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/task.svg);
   -moz-image-region: auto;
 }
 
 #event-grid {
   padding-top: 8px;
   padding-inline-start: 8px;
   padding-inline-end: 10px;
   border-spacing: 0;
@@ -285,29 +285,29 @@ label.label {
   margin: 2px 4px;
 }
 
 /*--------------------------------------------------------------------
  *   Event dialog keep duration button
  *-------------------------------------------------------------------*/
 
 #keepduration-button {
-  list-style-image: url(chrome://calendar-common/skin/chain-unlock.svg);
+  list-style-image: url(chrome://calendar/skin/shared/chain-unlock.svg);
   padding-top: 3px;
   padding-bottom: 3px;
   margin-inline-start: -3px;
   margin-bottom: -15px;
   position: relative;
   -moz-user-focus: normal;
   -moz-context-properties: fill;
   fill: CurrentColor;
 }
 
 #keepduration-button[keep="true"] {
-  list-style-image: url(chrome://calendar-common/skin/chain-lock.svg);
+  list-style-image: url(chrome://calendar/skin/shared/chain-lock.svg);
   fill: Highlight;
 }
 
 #keepduration-button[disabled="true"] {
   fill: GrayText;
 }
 
 #keepduration-button > label {
@@ -317,39 +317,39 @@ label.label {
 .keepduration-link-image {
   margin-inline-start: -1px;
   -moz-context-properties: fill, stroke-opacity;
   fill: CurrentColor;
   stroke-opacity: 0;
 }
 
 #link-image-top {
-  list-style-image: url(chrome://calendar-common/skin/link-image-top.svg);
+  list-style-image: url(chrome://calendar/skin/shared/link-image-top.svg);
   margin-top: 0.6em;
   margin-bottom: -0.6em;
 }
 
 #link-image-top[keep="true"] {
   stroke-opacity: 1;
 }
 
 #link-image-bottom {
-  list-style-image: url(chrome://calendar-common/skin/link-image-bottom.svg);
+  list-style-image: url(chrome://calendar/skin/shared/link-image-bottom.svg);
   margin-top: -0.6em;
   margin-bottom: 0.6em;
 }
 
 /*--------------------------------------------------------------------
  *   Event dialog statusbar images
  *-------------------------------------------------------------------*/
 
 .cal-statusbar-1 {
   -moz-box-orient: vertical;
   min-width: 0;
-  list-style-image: url("chrome://calendar-common/skin/statusbar-priority.svg");
+  list-style-image: url("chrome://calendar/skin/shared/statusbar-priority.svg");
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 /*--------------------------------------------------------------------
  *   Event dialog statusbarpanels
  *-------------------------------------------------------------------*/
 
@@ -655,44 +655,44 @@ calendar-event-freebusy-day > box {
 }
 
 .dummy-row-cell:first-child {
   border-top: none;
 }
 
 .zoom-in-icon {
   margin: 3px 3px;
-  list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-event-dialog-attendees.png);
   -moz-image-region: rect(0px 97px 14px 84px);
 }
 .zoom-in-icon[disabled="true"] {
   -moz-image-region: rect(14px 97px 28px 84px);
 }
 
 .zoom-out-icon {
   margin: 3px 3px;
-  list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-event-dialog-attendees.png);
   -moz-image-region: rect(0px 110px 14px 97px);
 }
 .zoom-out-icon[disabled="true"] {
   -moz-image-region: rect(14px 110px 28px 97px);
 }
 
 .left-icon {
   margin: 3px 3px;
-  list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-event-dialog-attendees.png);
   -moz-image-region: rect(0px 124px 14px 110px);
 }
 .left-icon[disabled="true"] {
   -moz-image-region: rect(14px 124px 28px 110px);
 }
 
 .right-icon {
   margin: 3px 3px;
-  list-style-image: url(chrome://calendar-common/skin/calendar-event-dialog-attendees.png);
+  list-style-image: url(chrome://calendar/skin/shared/calendar-event-dialog-attendees.png);
   -moz-image-region: rect(0px 138px 14px 124px);
   -moz-box-direction: reverse;
 }
 .right-icon[disabled="true"] {
   -moz-image-region: rect(14px 138px 28px 124px);
 }
 
 .left-icon .button-icon {
--- a/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-invitations-dialog.css
@@ -35,27 +35,27 @@ richlistitem[is="calendar-invitations-ri
   border-bottom: 1px dotted #7F9DB9;
 }
 
 .calendar-invitations-richlistitem-title {
   font-weight: bold;
 }
 
 .calendar-invitations-richlistitem-icon[status="NEEDS-ACTION"] {
-  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-list-images.png");
+  list-style-image: url("chrome://calendar/skin/shared/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 32px 32px 0px);
 }
 
 .calendar-invitations-richlistitem-icon[status="ACCEPTED"] {
-  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-list-images.png");
+  list-style-image: url("chrome://calendar/skin/shared/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 64px 32px 32px);
 }
 
 .calendar-invitations-richlistitem-icon[status="DECLINED"] {
-  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-list-images.png");
+  list-style-image: url("chrome://calendar/skin/shared/calendar-invitations-dialog-list-images.png");
   -moz-image-region: rect(0px 96px 32px 64px);
 }
 
 .calendar-invitations-richlistitem-button {
   margin-bottom: 10px;
   visibility: hidden;
 }
 
@@ -66,16 +66,16 @@ richlistitem[is="calendar-invitations-ri
 .calendar-invitations-richlistitem-button .button-icon {
   margin-top: 0px;
   margin-bottom: 0px;
   margin-inline-start: 0px;
   margin-inline-end: 5px;
 }
 
 .calendar-invitations-richlistitem-accept-button {
-  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-button-images.png");
+  list-style-image: url("chrome://calendar/skin/shared/calendar-invitations-dialog-button-images.png");
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 .calendar-invitations-richlistitem-decline-button {
-  list-style-image: url("chrome://calendar-common/skin/calendar-invitations-dialog-button-images.png");
+  list-style-image: url("chrome://calendar/skin/shared/calendar-invitations-dialog-button-images.png");
   -moz-image-region: rect(0px 32px 16px 16px);
 }
--- a/calendar/base/themes/common/dialogs/calendar-timezone-highlighter.css
+++ b/calendar/base/themes/common/dialogs/calendar-timezone-highlighter.css
@@ -1,14 +1,14 @@
 /* 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/. */
 
 .timezone-highlight {
-   list-style-image: url(chrome://calendar-common/skin/timezones.png);
+   list-style-image: url(chrome://calendar/skin/shared/timezones.png);
 }
 .timezone-highlight[tzid="none"] {
   display: none;
 }
 .timezone-highlight[tzid="+0000"] {
   -moz-image-region: rect(0 7360px 287px 6900px);
 }
 .timezone-highlight[tzid="+0100"] {
--- a/calendar/base/themes/common/jar.inc.mn
+++ b/calendar/base/themes/common/jar.inc.mn
@@ -2,90 +2,89 @@
 # 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 calendar-common classic/1.0 %skin/common/
-    skin/common/calendar-alarms.css                             (../common/calendar-alarms.css)
-    skin/common/calendar-attendees.css                          (../common/calendar-attendees.css)
-    skin/common/calendar-creation-wizard.css                    (../common/calendar-creation-wizard.css)
-    skin/common/calendar-daypicker.css                          (../common/calendar-daypicker.css)
-    skin/common/calendar-itip-icons.svg                         (../common/calendar-itip-icons.svg)
-    skin/common/calendar-occurrence-prompt.css                  (../common/calendar-occurrence-prompt.css)
-    skin/common/calendar-occurrence.svg                         (../common/calendar-occurrence.svg)
-    skin/common/calendar-preferences.css                        (../common/calendar-preferences.css)
-    skin/common/calendar-providerUninstall-dialog.css           (../common/calendar-providerUninstall-dialog.css)
-    skin/common/calendar-task-tree.css                          (../common/calendar-task-tree.css)
-    skin/common/calendar-task-view.css                          (../common/calendar-task-view.css)
-    skin/common/calendar-unifinder.css                          (../common/calendar-unifinder.css)
-    skin/common/calendar-views.css                              (../common/calendar-views.css)
-    skin/common/dialogs/calendar-alarm-dialog.css               (../common/dialogs/calendar-alarm-dialog.css)
-    skin/common/dialogs/calendar-event-dialog.css               (../common/dialogs/calendar-event-dialog.css)
-    skin/common/dialogs/calendar-invitations-dialog.css         (../common/dialogs/calendar-invitations-dialog.css)
-    skin/common/dialogs/calendar-subscriptions-dialog.css       (../common/dialogs/calendar-subscriptions-dialog.css)
-    skin/common/calendar-properties-dialog.css                  (../common/dialogs/calendar-properties-dialog.css)
-    skin/common/calendar-timezone-highlighter.css               (../common/dialogs/calendar-timezone-highlighter.css)
-    skin/common/calendar-event-dialog-attendees.png             (../common/dialogs/images/calendar-event-dialog-attendees.png)
-    skin/common/calendar-invitations-dialog-button-images.png   (../common/dialogs/images/calendar-invitations-dialog-button-images.png)
-    skin/common/calendar-invitations-dialog-list-images.png     (../common/dialogs/images/calendar-invitations-dialog-list-images.png)
-    skin/common/chain-lock.svg                                  (../common/dialogs/images/chain-lock.svg)
-    skin/common/chain-unlock.svg                                (../common/dialogs/images/chain-unlock.svg)
-    skin/common/link-image-bottom.svg                           (../common/dialogs/images/link-image-bottom.svg)
-    skin/common/link-image-top.svg                              (../common/dialogs/images/link-image-top.svg)
-    skin/common/statusbar-priority.svg                          (../common/dialogs/images/statusbar-priority.svg)
-    skin/common/icons/alarm-no.svg                              (../common/icons/alarm-no.svg)
-    skin/common/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)
-    ../icons/default/calendar-task-dialog.png                   (../common/icons/calendar-task-dialog.png)
-    ../icons/default/calendar-task-summary-dialog.png           (../common/icons/calendar-task-summary-dialog.png)
-    skin/common/icons/complete.svg                              (../common/icons/complete.svg)
-    skin/common/icons/confidential.svg                          (../common/icons/confidential.svg)
-    skin/common/icons/decline.svg                               (../common/icons/decline.svg)
-    skin/common/icons/edit.svg                                  (../common/icons/edit.svg)
-    skin/common/icons/email.svg                                 (../common/icons/email.svg)
-    skin/common/icons/event.svg                                 (../common/icons/event.svg)
-    skin/common/icons/find.svg                                  (../common/icons/find.svg)
-    skin/common/icons/freebusy.svg                              (../common/icons/freebusy.svg)
-    skin/common/icons/icon32.svg                                (../common/icons/icon32.svg)
-    skin/common/icons/imip-bar.svg                              (../common/icons/imip-bar.svg)
-    skin/common/icons/locked.svg                                (../common/icons/locked.svg)
-    skin/common/icons/newevent.svg                              (../common/icons/newevent.svg)
-    skin/common/icons/newtask.svg                               (../common/icons/newtask.svg)
-    skin/common/icons/pane.svg                                  (../common/icons/pane.svg)
-    skin/common/icons/priority.svg                              (../common/icons/priority.svg)
-    skin/common/icons/private.svg                               (../common/icons/private.svg)
-    skin/common/icons/save-close.svg                            (../common/icons/save-close.svg)
-    skin/common/icons/status.svg                                (../common/icons/status.svg)
-    skin/common/icons/synchronize.svg                           (../common/icons/synchronize.svg)
-    skin/common/icons/task-tab.svg                              (../common/icons/task-tab.svg)
-    skin/common/icons/task.svg                                  (../common/icons/task.svg)
-    skin/common/icons/tentative.svg                             (../common/icons/tentative.svg)
-    skin/common/icons/timezones.svg                             (../common/icons/timezones.svg)
-    skin/common/icons/today.svg                                 (../common/icons/today.svg)
-    skin/common/icons/warn.svg                                  (../common/icons/warn.svg)
-    skin/common/attendee-icons.png                              (../common/images/attendee-icons.png)
-    skin/common/checkbox-images.png                             (../common/images/checkbox-images.png)
-    skin/common/event-continue.svg                              (../common/images/event-continue.svg)
-    skin/common/event-end.svg                                   (../common/images/event-end.svg)
-    skin/common/event-grippy-bottom.png                         (../common/images/event-grippy-bottom.png)
-    skin/common/event-grippy-left.png                           (../common/images/event-grippy-left.png)
-    skin/common/event-grippy-right.png                          (../common/images/event-grippy-right.png)
-    skin/common/event-grippy-top.png                            (../common/images/event-grippy-top.png)
-    skin/common/event-start.svg                                 (../common/images/event-start.svg)
-    skin/common/task-images.png                                 (../common/images/task-images.png)
-    skin/common/timezone_map.png                                (../common/images/timezone_map.png)
-    skin/common/timezones.png                                   (../common/images/timezones.png)
-    skin/common/todo-complete.svg                               (../common/images/todo-complete.svg)
-    skin/common/todo.svg                                        (../common/images/todo.svg)
-    skin/common/today-pane.css                                  (../common/today-pane.css)
-    skin/common/view-cycler.svg                                 (../common/view-cycler.svg)
-    skin/common/widgets/calendar-widgets.css                    (../common/widgets/calendar-widgets.css)
-    skin/common/widgets/drag-center.svg                         (../common/widgets/images/drag-center.svg)
-    skin/common/widgets/nav-arrow.svg                           (../common/widgets/images/nav-arrow.svg)
-    skin/common/widgets/nav-today.svg                           (../common/widgets/images/nav-today.svg)
-    skin/common/widgets/minimonth.css                           (../common/widgets/minimonth.css)
-    skin/common/icons/cal-icon24.png                            (../linux/images/cal-icon24.png)
+    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/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/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)
+    ../icons/default/calendar-task-dialog.png                                    (../common/icons/calendar-task-dialog.png)
+    ../icons/default/calendar-task-summary-dialog.png                            (../common/icons/calendar-task-summary-dialog.png)
+    skin/classic/calendar/shared/icons/complete.svg                              (../common/icons/complete.svg)
+    skin/classic/calendar/shared/icons/confidential.svg                          (../common/icons/confidential.svg)
+    skin/classic/calendar/shared/icons/decline.svg                               (../common/icons/decline.svg)
+    skin/classic/calendar/shared/icons/edit.svg                                  (../common/icons/edit.svg)
+    skin/classic/calendar/shared/icons/email.svg                                 (../common/icons/email.svg)
+    skin/classic/calendar/shared/icons/event.svg                                 (../common/icons/event.svg)
+    skin/classic/calendar/shared/icons/find.svg                                  (../common/icons/find.svg)
+    skin/classic/calendar/shared/icons/freebusy.svg                              (../common/icons/freebusy.svg)
+    skin/classic/calendar/shared/icons/icon32.svg                                (../common/icons/icon32.svg)
+    skin/classic/calendar/shared/icons/imip-bar.svg                              (../common/icons/imip-bar.svg)
+    skin/classic/calendar/shared/icons/locked.svg                                (../common/icons/locked.svg)
+    skin/classic/calendar/shared/icons/newevent.svg                              (../common/icons/newevent.svg)
+    skin/classic/calendar/shared/icons/newtask.svg                               (../common/icons/newtask.svg)
+    skin/classic/calendar/shared/icons/pane.svg                                  (../common/icons/pane.svg)
+    skin/classic/calendar/shared/icons/priority.svg                              (../common/icons/priority.svg)
+    skin/classic/calendar/shared/icons/private.svg                               (../common/icons/private.svg)
+    skin/classic/calendar/shared/icons/save-close.svg                            (../common/icons/save-close.svg)
+    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/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/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/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)
+    skin/classic/calendar/shared/widgets/minimonth.css                           (../common/widgets/minimonth.css)
+    skin/classic/calendar/shared/icons/cal-icon24.png                            (../linux/images/cal-icon24.png)
--- a/calendar/base/themes/common/today-pane.css
+++ b/calendar/base/themes/common/today-pane.css
@@ -66,17 +66,17 @@
 
 .today-pane-cycler {
   -moz-appearance: none;
   border-radius: 2px;
   padding-left: 5px;
   padding-right: 5px;
   -moz-context-properties: fill;
   fill: currentColor;
-  list-style-image: url("chrome://calendar-common/skin/view-cycler.svg");
+  list-style-image: url("chrome://calendar/skin/shared/view-cycler.svg");
 }
 
 .today-pane-cycler:hover {
   background-color: hsla(0,0%,0%,.1);
   color: inherit;
 }
 
 .today-pane-cycler:hover:active {
@@ -143,25 +143,25 @@
   text-align: center;
 }
 
 #dragCenter-image-container {
   pointer-events: none;
 }
 
 #dragCenter-image {
-  list-style-image: url("chrome://calendar-common/skin/widgets/drag-center.svg");
+  list-style-image: url("chrome://calendar/skin/shared/widgets/drag-center.svg");
 }
 
 .miniday-nav-buttons {
   margin-top: 2px;
   min-width: 19px;
   -moz-user-focus: normal;
   -moz-context-properties: fill, fill-opacity;
-  list-style-image: url("chrome://calendar-common/skin/widgets/nav-arrow.svg");
+  list-style-image: url("chrome://calendar/skin/shared/widgets/nav-arrow.svg");
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 .miniday-nav-buttons,
 #miniday-dropdown-button {
   -moz-appearance: none;
   -moz-user-focus: normal;
@@ -186,17 +186,17 @@
 }
 
 #previous-day-button:-moz-locale-dir(ltr),
 #next-day-button:-moz-locale-dir(rtl) {
   transform: scaleX(-1);
 }
 
 #today-button {
-  list-style-image: url("chrome://calendar-common/skin/widgets/nav-today.svg");
+  list-style-image: url("chrome://calendar/skin/shared/widgets/nav-today.svg");
 }
 
 .miniday-nav-buttons[disabled] {
   opacity: .3;
 }
 
 .miniday-nav-buttons > .toolbarbutton-icon {
   margin: 1px;
@@ -228,17 +228,17 @@
 
 #agenda-toolbar {
   border: none;
   padding: 4px 1px;
 }
 
 #todaypane-new-event-button {
   -moz-user-focus: normal;
-  list-style-image: url(chrome://calendar-common/skin/icons/newevent.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/newevent.svg);
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 :root[lwt-tree] #todaypane-new-event-button {
   -moz-appearance: none;
   -moz-user-focus: normal;
@@ -408,18 +408,18 @@ richlistitem[is="agenda-allday-richlisti
   fill: currentColor;
 }
 
 .agenda-allday-container-box .agenda-multiDayEvent-image {
   margin-top: 0.6em;
 }
 
 .agenda-multiDayEvent-image[type="start"] {
-  list-style-image: url("chrome://calendar-common/skin/event-start.svg");
+  list-style-image: url("chrome://calendar/skin/shared/event-start.svg");
 }
 
 .agenda-multiDayEvent-image[type="continue"] {
-  list-style-image: url("chrome://calendar-common/skin/event-continue.svg");
+  list-style-image: url("chrome://calendar/skin/shared/event-continue.svg");
 }
 
 .agenda-multiDayEvent-image[type="end"] {
-  list-style-image: url("chrome://calendar-common/skin/event-end.svg");
+  list-style-image: url("chrome://calendar/skin/shared/event-end.svg");
 }
--- a/calendar/base/themes/common/widgets/calendar-widgets.css
+++ b/calendar/base/themes/common/widgets/calendar-widgets.css
@@ -44,17 +44,17 @@ checkbox.treenode-checkbox:-moz-locale-d
 checkbox.treenode-checkbox > .checkbox-label-center-box > .checkbox-label-box > .checkbox-label {
   font-weight: bold;
   border-bottom: 1px solid -moz-Dialog;
 }
 
 .view-navigation-button {
   -moz-context-properties: fill;
   fill: currentColor;
-  list-style-image: url(chrome://calendar-common/skin/view-cycler.svg);
+  list-style-image: url(chrome://calendar/skin/shared/view-cycler.svg);
   -moz-user-focus: normal;
 }
 
 :root[lwt-tree] .view-navigation-button {
   -moz-appearance: none;
   -moz-user-focus: normal;
   border: 1px solid transparent;
   border-radius: var(--toolbarbutton-border-radius);
@@ -200,14 +200,14 @@ checkbox.treenode-checkbox > .checkbox-l
 
 #calendar-list > richlistitem > .calendar-readstatus {
   margin: 0 2px;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 #calendar-list > richlistitem[calendar-readonly="true"] > .calendar-readstatus {
-  list-style-image: url(chrome://calendar-common/skin/icons/locked.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/locked.svg);
 }
 
 #calendar-list > richlistitem[calendar-readfailed="true"] > .calendar-readstatus {
-  list-style-image: url(chrome://calendar-common/skin/icons/warn.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/warn.svg);
 }
--- a/calendar/base/themes/common/widgets/minimonth.css
+++ b/calendar/base/themes/common/widgets/minimonth.css
@@ -119,17 +119,17 @@ calendar-minimonth[readonly="true"] .min
   font-weight: bold;
   padding: 0px;
   -moz-user-focus: normal;
 }
 
 .minimonth-nav-btns {
   -moz-appearance: none;
   padding: 4px;
-  list-style-image: url("chrome://calendar-common/skin/widgets/nav-arrow.svg");
+  list-style-image: url("chrome://calendar/skin/shared/widgets/nav-arrow.svg");
   -moz-user-focus: normal;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
 .minimonth-nav-btns:active,
 .minimonth-nav-btns:focus,
 .minimonth-nav-btns:hover {
@@ -145,17 +145,17 @@ calendar-minimonth[readonly="true"] .min
 }
 
 .minimonth-nav-btns:-moz-locale-dir(ltr)[dir="-1"],
 .minimonth-nav-btns:-moz-locale-dir(rtl)[dir="1"] {
   transform: scaleX(-1);
 }
 
 .minimonth-nav-btns[dir="0"] {
-  list-style-image: url("chrome://calendar-common/skin/widgets/nav-today.svg");
+  list-style-image: url("chrome://calendar/skin/shared/widgets/nav-today.svg");
 }
 
 .minimonth-cal-box {
   border-spacing: 0px;
 }
 
 .minimonth-cal-box th, .minimonth-cal-box td {
   width: 12.5%; /* 100% / 8 columns */
--- a/calendar/base/themes/linux/calendar-daypicker.css
+++ b/calendar/base/themes/linux/calendar-daypicker.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://calendar-common/skin/calendar-daypicker.css);
+@import url(chrome://calendar/skin/shared/calendar-daypicker.css);
 
 button[is="calendar-daypicker"] {
   border-top: 1px solid ThreeDShadow;
   border-left: 1px solid ThreeDShadow;
 }
 
 button[is="calendar-daypicker"][bottom="true"] {
   border-bottom: 1px solid ThreeDShadow;
--- a/calendar/base/themes/linux/calendar-task-tree.css
+++ b/calendar/base/themes/linux/calendar-task-tree.css
@@ -1,17 +1,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/. */
 
-@import url(chrome://calendar-common/skin/calendar-task-tree.css);
+@import url(chrome://calendar/skin/shared/calendar-task-tree.css);
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed),
 .calendar-task-tree-col-completed {
-    list-style-image: url(chrome://calendar-common/skin/checkbox-images.png);
+    list-style-image: url(chrome://calendar/skin/shared/checkbox-images.png);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
 .calendar-task-tree-col-completed {
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, duetoday),
--- a/calendar/base/themes/linux/calendar-task-view.css
+++ b/calendar/base/themes/linux/calendar-task-view.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://calendar-common/skin/calendar-task-view.css);
+@import url(chrome://calendar/skin/shared/calendar-task-view.css);
 
 :root[lwt-tree-brighttext] #calendar-task-details-container {
     --toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
     --toolbarbutton-hover-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
     --toolbarbutton-header-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
     --toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4));
     --toolbarbutton-active-bordercolor: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .7));
     --toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
--- a/calendar/base/themes/linux/calendar-unifinder.css
+++ b/calendar/base/themes/linux/calendar-unifinder.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://calendar-common/skin/calendar-unifinder.css);
+@import url(chrome://calendar/skin/shared/calendar-unifinder.css);
 
 :root[lwt-tree-brighttext] #unifinder-searchBox {
   --toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
   --toolbarbutton-hover-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
   --toolbarbutton-header-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
   --toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4));
   --toolbarbutton-active-bordercolor: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .7));
   --toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
--- a/calendar/base/themes/linux/calendar-views.css
+++ b/calendar/base/themes/linux/calendar-views.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://calendar-common/skin/calendar-views.css);
+@import url(chrome://calendar/skin/shared/calendar-views.css);
 
 /* Navigation controls for the views */
 #calendar-nav-control {
     background-color: AppWorkspace;
     --calview-tabline-color: highlight;
     --calview-border-color: ThreeDShadow;
     --calview-border-bottom-color: ThreeDShadow;
 }
--- a/calendar/base/themes/linux/dialogs/calendar-alarm-dialog.css
+++ b/calendar/base/themes/linux/dialogs/calendar-alarm-dialog.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://calendar-common/skin/dialogs/calendar-alarm-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-alarm-dialog.css);
 
 .snooze-popup-ok-button:hover {
     background-color: -moz-menuhover;
 }
 
 .snooze-popup-cancel-button:hover {
     background-color: -moz-menuhover;
 }
--- a/calendar/base/themes/linux/dialogs/calendar-invitations-dialog.css
+++ b/calendar/base/themes/linux/dialogs/calendar-invitations-dialog.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://calendar-common/skin/dialogs/calendar-invitations-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-invitations-dialog.css);
--- a/calendar/base/themes/linux/dialogs/calendar-subscriptions-dialog.css
+++ b/calendar/base/themes/linux/dialogs/calendar-subscriptions-dialog.css
@@ -1,9 +1,9 @@
 /* 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://calendar-common/skin/dialogs/calendar-subscriptions-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-subscriptions-dialog.css);
 
 button {
   margin-top: 3px;
 }
--- a/calendar/base/themes/linux/jar.mn
+++ b/calendar/base/themes/linux/jar.mn
@@ -1,18 +1,18 @@
 # 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/.
 
 calendar.jar:
-% skin calendar classic/1.0 %skin/linux/
+% skin calendar classic/1.0 %skin/classic/calendar/
 #include ../common/jar.inc.mn
-    skin/linux/calendar-daypicker.css                           (calendar-daypicker.css)
-    skin/linux/calendar-task-tree.css                           (calendar-task-tree.css)
-    skin/linux/calendar-task-view.css                           (calendar-task-view.css)
-    skin/linux/calendar-unifinder.css                           (calendar-unifinder.css)
-    skin/linux/calendar-views.css                               (calendar-views.css)
-    skin/linux/calendar-alarm-dialog.css                        (dialogs/calendar-alarm-dialog.css)
-    skin/linux/calendar-event-dialog.css                        (dialogs/calendar-event-dialog.css)
-    skin/linux/calendar-subscriptions-dialog.css                (dialogs/calendar-subscriptions-dialog.css)
-    skin/linux/calendar-invitations-dialog.css                  (dialogs/calendar-invitations-dialog.css)
-    skin/linux/today-pane.css                                   (today-pane.css)
-    skin/linux/widgets/calendar-widgets.css                     (widgets/calendar-widgets.css)
+    skin/classic/calendar/calendar-daypicker.css                           (calendar-daypicker.css)
+    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/today-pane.css                                   (today-pane.css)
+    skin/classic/calendar/widgets/calendar-widgets.css                     (widgets/calendar-widgets.css)
--- a/calendar/base/themes/linux/today-pane.css
+++ b/calendar/base/themes/linux/today-pane.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://calendar-common/skin/today-pane.css);
+@import url(chrome://calendar/skin/shared/today-pane.css);
 
 #today-pane-splitter {
   -moz-appearance: none;
 }
 
 #today-pane-panel > .sidebar-header {
   height: 33px;
 }
--- a/calendar/base/themes/linux/widgets/calendar-widgets.css
+++ b/calendar/base/themes/linux/widgets/calendar-widgets.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://calendar-common/skin/widgets/calendar-widgets.css);
+@import url(chrome://calendar/skin/shared/widgets/calendar-widgets.css);
 
 #task-tree-filtergroup {
   padding-inline-start: 12px;
 }
 
 #calendar-list-pane #calendar-list richlistitem {
   padding-inline-start: 14px;
 }
--- a/calendar/base/themes/osx/calendar-daypicker.css
+++ b/calendar/base/themes/osx/calendar-daypicker.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://calendar-common/skin/calendar-daypicker.css);
+@import url(chrome://calendar/skin/shared/calendar-daypicker.css);
 
 button[is="calendar-daypicker"] {
   border-top: 1px solid #808080;
   border-left: 1px solid #808080;
 }
 
 button[is="calendar-daypicker"][bottom="true"] {
   border-bottom: 1px solid #808080;
--- a/calendar/base/themes/osx/calendar-task-tree.css
+++ b/calendar/base/themes/osx/calendar-task-tree.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://calendar-common/skin/calendar-task-tree.css);
+@import url(chrome://calendar/skin/shared/calendar-task-tree.css);
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed),
 .calendar-task-tree-col-completed > .treecol-icon {
     list-style-image: url(chrome://calendar/skin/checkbox-images.png);
     width: 16px;
     height: 16px;
 }
 
--- a/calendar/base/themes/osx/calendar-task-view.css
+++ b/calendar/base/themes/osx/calendar-task-view.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://calendar-common/skin/calendar-task-view.css);
+@import url(chrome://calendar/skin/shared/calendar-task-view.css);
 
 #calendar-task-details-container {
     background-color: ButtonFace;
     border-bottom-width: 0;
     padding-top: 2px;
     overflow: hidden;
 }
 
--- a/calendar/base/themes/osx/calendar-unifinder.css
+++ b/calendar/base/themes/osx/calendar-unifinder.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://calendar-common/skin/calendar-unifinder.css);
+@import url(chrome://calendar/skin/shared/calendar-unifinder.css);
 
 /* added for new id ..... search box ..... */
 #unifinder-searchBox {
     background: linear-gradient(#eaeaea, #d1d1d1);
     border-bottom: 1px solid #bebebe;
     height: 30px;
 }
 
--- a/calendar/base/themes/osx/calendar-views.css
+++ b/calendar/base/themes/osx/calendar-views.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://calendar-common/skin/calendar-views.css);
+@import url(chrome://calendar/skin/shared/calendar-views.css);
 
 calendar-event-column {
     -moz-user-focus: normal;
 }
 
 /** Start time bar **/
 
 .calendar-time-bar-label {
--- a/calendar/base/themes/osx/dialogs/calendar-alarm-dialog.css
+++ b/calendar/base/themes/osx/dialogs/calendar-alarm-dialog.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://calendar-common/skin/dialogs/calendar-alarm-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-alarm-dialog.css);
--- a/calendar/base/themes/osx/dialogs/calendar-invitations-dialog.css
+++ b/calendar/base/themes/osx/dialogs/calendar-invitations-dialog.css
@@ -1,11 +1,11 @@
 /* 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://calendar-common/skin/dialogs/calendar-invitations-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-invitations-dialog.css);
 
 .calendar-invitations-richlistitem-button {
   /* Workaround for making the checked button actually look checked */
   -moz-appearance: tab;
   min-height: 20px;
 }
--- a/calendar/base/themes/osx/dialogs/calendar-subscriptions-dialog.css
+++ b/calendar/base/themes/osx/dialogs/calendar-subscriptions-dialog.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://calendar-common/skin/dialogs/calendar-subscriptions-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-subscriptions-dialog.css);
--- a/calendar/base/themes/osx/jar.mn
+++ b/calendar/base/themes/osx/jar.mn
@@ -1,22 +1,22 @@
 # 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/.
 
 calendar.jar:
-% skin calendar classic/1.0 %skin/osx/ os=Darwin
+% skin calendar classic/1.0 %skin/classic/calendar/ os=Darwin
 #include ../common/jar.inc.mn
-    skin/osx/calendar-daypicker.css                             (calendar-daypicker.css)
-    skin/osx/calendar-task-tree.css                             (calendar-task-tree.css)
-    skin/osx/calendar-task-view.css                             (calendar-task-view.css)
-    skin/osx/calendar-unifinder.css                             (calendar-unifinder.css)
-    skin/osx/calendar-views.css                                 (calendar-views.css)
-    skin/osx/calendar-alarm-dialog.css                          (dialogs/calendar-alarm-dialog.css)
-    skin/osx/calendar-event-dialog.css                          (dialogs/calendar-event-dialog.css)
-    skin/osx/calendar-invitations-dialog.css                    (dialogs/calendar-invitations-dialog.css)
-    skin/osx/calendar-subscriptions-dialog.css                  (dialogs/calendar-subscriptions-dialog.css)
-    skin/osx/checkbox-images-graphite.png                       (images/checkbox-images-graphite.png)
-    skin/osx/checkbox-images.png                                (images/checkbox-images.png)
-    skin/osx/locked-selected-mac.svg                            (images/locked-selected-mac.svg)
-    skin/osx/warn-selected-mac.svg                              (images/warn-selected-mac.svg)
-    skin/osx/today-pane.css                                     (today-pane.css)
-    skin/osx/widgets/calendar-widgets.css                       (widgets/calendar-widgets.css)
+    skin/classic/calendar/calendar-daypicker.css                             (calendar-daypicker.css)
+    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/checkbox-images-graphite.png                       (images/checkbox-images-graphite.png)
+    skin/classic/calendar/checkbox-images.png                                (images/checkbox-images.png)
+    skin/classic/calendar/locked-selected-mac.svg                            (images/locked-selected-mac.svg)
+    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)
--- a/calendar/base/themes/osx/today-pane.css
+++ b/calendar/base/themes/osx/today-pane.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://calendar-common/skin/today-pane.css);
+@import url(chrome://calendar/skin/shared/today-pane.css);
 
 #today-pane-panel > .sidebar-header {
   height: 32px;
 }
 
 #today-pane-panel:-moz-lwtheme > .sidebar-header {
   text-shadow: none;
 }
--- a/calendar/base/themes/osx/widgets/calendar-widgets.css
+++ b/calendar/base/themes/osx/widgets/calendar-widgets.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://calendar-common/skin/widgets/calendar-widgets.css);
+@import url(chrome://calendar/skin/shared/widgets/calendar-widgets.css);
 
 #task-tree-filtergroup {
   padding-inline-start: 18px;
 }
 
 #calendar-list-pane #calendar-list richlistitem {
   padding-inline-start: 18px;
 }
--- a/calendar/base/themes/windows/calendar-daypicker.css
+++ b/calendar/base/themes/windows/calendar-daypicker.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://calendar-common/skin/calendar-daypicker.css);
+@import url(chrome://calendar/skin/shared/calendar-daypicker.css);
 
 button[is="calendar-daypicker"] {
   border-top: 1px solid ThreeDShadow;
   border-left: 1px solid ThreeDShadow;
 }
 
 button[is="calendar-daypicker"][bottom="true"] {
   border-bottom: 1px solid ThreeDShadow;
--- a/calendar/base/themes/windows/calendar-task-tree.css
+++ b/calendar/base/themes/windows/calendar-task-tree.css
@@ -1,17 +1,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/. */
 
-@import url(chrome://calendar-common/skin/calendar-task-tree.css);
+@import url(chrome://calendar/skin/shared/calendar-task-tree.css);
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed),
 .calendar-task-tree-col-completed {
-    list-style-image: url(chrome://calendar-common/skin/checkbox-images.png);
+    list-style-image: url(chrome://calendar/skin/shared/checkbox-images.png);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),
 .calendar-task-tree-col-completed {
     -moz-image-region: rect(0 26px 13px 13px);
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, duetoday),
--- a/calendar/base/themes/windows/calendar-task-view.css
+++ b/calendar/base/themes/windows/calendar-task-view.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://calendar-common/skin/calendar-task-view.css);
+@import url(chrome://calendar/skin/shared/calendar-task-view.css);
 
 :root[lwt-tree-brighttext] #calendar-task-details-container {
     --toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
     --toolbarbutton-hover-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
     --toolbarbutton-header-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
     --toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4));
     --toolbarbutton-active-bordercolor: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .7));
     --toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
--- a/calendar/base/themes/windows/calendar-unifinder.css
+++ b/calendar/base/themes/windows/calendar-unifinder.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://calendar-common/skin/calendar-unifinder.css);
+@import url(chrome://calendar/skin/shared/calendar-unifinder.css);
 
 :root[lwt-tree-brighttext] #unifinder-searchBox {
   --toolbarbutton-hover-background: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
   --toolbarbutton-hover-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .5));
   --toolbarbutton-header-bordercolor: var(--lwt-toolbarbutton-hover-background, rgba(255, 255, 255, .25));
   --toolbarbutton-active-background: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4));
   --toolbarbutton-active-bordercolor: var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .7));
   --toolbarbutton-active-boxshadow: 0 0 0 1px var(--lwt-toolbarbutton-active-background, rgba(255, 255, 255, .4)) inset;
--- a/calendar/base/themes/windows/calendar-views.css
+++ b/calendar/base/themes/windows/calendar-views.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://calendar-common/skin/calendar-views.css);
+@import url(chrome://calendar/skin/shared/calendar-views.css);
 
 /* Navigation controls for the views */
 #calendar-nav-control {
     background-color: ButtonFace;
     border-top: 1px solid ThreeDShadow;
     --calview-tabline-color: #0a84ff;
     --calview-border-color: ThreeDShadow;
     --calview-border-bottom-color: ThreeDShadow;
--- a/calendar/base/themes/windows/dialogs/calendar-alarm-dialog.css
+++ b/calendar/base/themes/windows/dialogs/calendar-alarm-dialog.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://calendar-common/skin/dialogs/calendar-alarm-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-alarm-dialog.css);
 
 .snooze-popup-ok-button:hover {
     background-color: -moz-menuhover;
 }
 
 .snooze-popup-cancel-button:hover {
     background-color: -moz-menuhover;
 }
--- a/calendar/base/themes/windows/dialogs/calendar-invitations-dialog.css
+++ b/calendar/base/themes/windows/dialogs/calendar-invitations-dialog.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://calendar-common/skin/dialogs/calendar-invitations-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-invitations-dialog.css);
--- a/calendar/base/themes/windows/dialogs/calendar-subscriptions-dialog.css
+++ b/calendar/base/themes/windows/dialogs/calendar-subscriptions-dialog.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://calendar-common/skin/dialogs/calendar-subscriptions-dialog.css);
+@import url(chrome://calendar/skin/shared/dialogs/calendar-subscriptions-dialog.css);
--- a/calendar/base/themes/windows/jar.mn
+++ b/calendar/base/themes/windows/jar.mn
@@ -1,18 +1,18 @@
 # 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/.
 
 calendar.jar:
-% skin calendar classic/1.0 %skin/windows/ os=WINNT
+% skin calendar classic/1.0 %skin/classic/calendar/ os=WINNT
 #include ../common/jar.inc.mn
-    skin/windows/calendar-daypicker.css                         (calendar-daypicker.css)
-    skin/windows/calendar-task-tree.css                         (calendar-task-tree.css)
-    skin/windows/calendar-task-view.css                         (calendar-task-view.css)
-    skin/windows/calendar-unifinder.css                         (calendar-unifinder.css)
-    skin/windows/calendar-views.css                             (calendar-views.css)
-    skin/windows/calendar-alarm-dialog.css                      (dialogs/calendar-alarm-dialog.css)
-    skin/windows/calendar-event-dialog.css                      (dialogs/calendar-event-dialog.css)
-    skin/windows/calendar-invitations-dialog.css                (dialogs/calendar-invitations-dialog.css)
-    skin/windows/calendar-subscriptions-dialog.css              (dialogs/calendar-subscriptions-dialog.css)
-    skin/windows/today-pane.css                                 (today-pane.css)
-    skin/windows/widgets/calendar-widgets.css                   (widgets/calendar-widgets.css)
+    skin/classic/calendar/calendar-daypicker.css                         (calendar-daypicker.css)
+    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/today-pane.css                                 (today-pane.css)
+    skin/classic/calendar/widgets/calendar-widgets.css                   (widgets/calendar-widgets.css)
--- a/calendar/base/themes/windows/today-pane.css
+++ b/calendar/base/themes/windows/today-pane.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://calendar-common/skin/today-pane.css);
+@import url(chrome://calendar/skin/shared/today-pane.css);
 
 .today-subpane {
   border-bottom-color: ThreeDShadow;
 }
 
 #today-pane-splitter {
   border-top-width: 0;
   min-height: 0;
--- a/calendar/base/themes/windows/widgets/calendar-widgets.css
+++ b/calendar/base/themes/windows/widgets/calendar-widgets.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://calendar-common/skin/widgets/calendar-widgets.css);
+@import url(chrome://calendar/skin/shared/widgets/calendar-widgets.css);
 
 #task-tree-filtergroup {
   padding-inline-start: 12px;
 }
 
 #calendar-list-pane #calendar-list richlistitem {
   padding-inline-start: 14px;
 }
--- a/calendar/import-export/calHtmlExport.js
+++ b/calendar/import-export/calHtmlExport.js
@@ -24,17 +24,17 @@ calHtmlExporter.prototype = {
         defaultExtension: "html",
         extensionFilter: wildmat,
         description: label,
       },
     ];
   },
 
   exportToStream: function(aStream, aItems, aTitle) {
-    let document = cal.xml.parseFile("chrome://calendar-common/skin/printing/calHtmlExport.html");
+    let document = cal.xml.parseFile("chrome://calendar/skin/shared/printing/calHtmlExport.html");
     let itemContainer = document.getElementById("item-container");
     document.getElementById("title").textContent = aTitle || cal.l10n.getCalString("HTMLTitle");
 
     // Sort aItems
     aItems.sort((a, b) => {
       let start_a = a[cal.dtz.startDateProp(a)];
       if (!start_a) {
         return -1;
--- a/calendar/import-export/calMonthGridPrinter.js
+++ b/calendar/import-export/calMonthGridPrinter.js
@@ -17,17 +17,17 @@ calMonthPrinter.prototype = {
   classID: Components.ID("{f42d5132-92c4-487b-b5c8-38bf292d74c1}"),
 
   get name() {
     return cal.l10n.getCalString("monthPrinterName");
   },
 
   formatToHtml: function(aStream, aStart, aEnd, aItems, aTitle) {
     let document = cal.xml.parseFile(
-      "chrome://calendar-common/skin/printing/calMonthGridPrinter.html"
+      "chrome://calendar/skin/shared/printing/calMonthGridPrinter.html"
     );
     let defaultTimezone = cal.dtz.defaultTimezone;
 
     // Set page title
     document.getElementById("title").textContent = aTitle;
 
     cal.view.colorTracker.addColorsToDocument(document);
 
--- a/calendar/import-export/calWeekPrinter.js
+++ b/calendar/import-export/calWeekPrinter.js
@@ -16,17 +16,17 @@ calWeekPrinter.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.calIPrintFormatter]),
   classID: Components.ID("{2d6ec97b-9109-4b92-89c5-d4b4806619ce}"),
 
   get name() {
     return cal.l10n.getCalString("weekPrinterName");
   },
 
   formatToHtml: function(aStream, aStart, aEnd, aItems, aTitle) {
-    let document = cal.xml.parseFile("chrome://calendar-common/skin/printing/calWeekPrinter.html");
+    let document = cal.xml.parseFile("chrome://calendar/skin/shared/printing/calWeekPrinter.html");
     let defaultTimezone = cal.dtz.defaultTimezone;
 
     // Set page title
     document.getElementById("title").textContent = aTitle;
 
     cal.view.colorTracker.addColorsToDocument(document);
 
     // Table that maps YYYY-MM-DD to the DOM node container where items are to be added
--- a/calendar/lightning/content/lightning-item-iframe.xhtml
+++ b/calendar/lightning/content/lightning-item-iframe.xhtml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 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/. -->
 
 <!-- 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-common/skin/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-attendees.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://messenger/skin/primaryToolbar.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/dialogs/calendar-event-dialog.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">
     <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
     %brandDTD;
     %globalDTD;
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -1,16 +1,16 @@
 #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/calendar-event-dialog-attendees.png chrome://calendar-common/skin/calendar-event-dialog-attendees.png
+% 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)
     content/calendar-status-bar.inc.xhtml                  (content/calendar-status-bar.inc.xhtml)
--- a/calendar/lightning/themes/common/accountCentral.css
+++ b/calendar/lightning/themes/common/accountCentral.css
@@ -2,10 +2,10 @@
  * 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-newCalendar-row > hbox > label:-moz-locale-dir(rtl) {
   background-position: right;
 }
 
 #lightning-newCalendar-row > hbox > label {
-  background: url(chrome://calendar-common/skin/icons/cal-icon24.png) no-repeat;
+  background: url(chrome://calendar/skin/shared/icons/cal-icon24.png) no-repeat;
 }
--- a/calendar/lightning/themes/common/imip.css
+++ b/calendar/lightning/themes/common/imip.css
@@ -3,18 +3,18 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 .invitation-table .itip-icon {
     --itip-icon-partstat: -16px -16px; /* default: NEEDS-ACTION */
     --itip-icon-role: 0px; /* default: REQ-PARTICIPANT */
     --itip-icon-usertype: -32px; /* default: INDIVIDUAL */
     width: 16px;
     height: 16px;
-    background-image: url(chrome://calendar-common/skin/calendar-itip-icons.svg),
-                      url(chrome://calendar-common/skin/calendar-itip-icons.svg);
+    background-image: url(chrome://calendar/skin/shared/calendar-itip-icons.svg),
+                      url(chrome://calendar/skin/shared/calendar-itip-icons.svg);
     background-position: var(--itip-icon-partstat), var(--itip-icon-usertype) var(--itip-icon-role);
 }
 .invitation-table .itip-icon[partstat="ACCEPTED"] {
     --itip-icon-partstat: 0px 0px;
 }
 .invitation-table .itip-icon[partstat="DECLINED"] {
     --itip-icon-partstat: 0px -16px;
 }
--- a/calendar/lightning/themes/common/lightning-toolbar.css
+++ b/calendar/lightning/themes/common/lightning-toolbar.css
@@ -4,51 +4,51 @@
 
 /* Lightning "Calendar" Toolbarbutton */
 #lightning-button-calendar {
     list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
 }
 
 /* Lightning "Tasks" Toolbarbutton */
 #lightning-button-tasks {
-    list-style-image: url(chrome://calendar-common/skin/icons/task-tab.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/task-tab.svg);
 }
 
 /* Toolbar buttons */
 #calendar-synchronize-button,
 #task-synchronize-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/synchronize.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/synchronize.svg);
 }
 
 #extractEventButton,
 #task-newevent-button,
 #calendar-newevent-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/newevent.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/newevent.svg);
 }
 
 #extractTaskButton,
 #task-newtask-button,
 #calendar-newtask-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/newtask.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/newtask.svg);
 }
 
 #calendar-edit-button,
 #task-edit-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/edit.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/edit.svg);
 }
 
 #calendar-delete-button,
 #task-delete-button {
     list-style-image: url(chrome://messenger/skin/icons/delete.svg);
 }
 
 #calendar-goto-today-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/today.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/today.svg);
 }
 
 #calendar-print-button,
 #task-print-button {
     list-style-image: url(chrome://messenger/skin/icons/print.svg);
 }
 
 #calendar-unifinder-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/find.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/find.svg);
 }
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/lightning/themes/common/lightning.css
@@ -6,30 +6,30 @@
 #calendar-tab-button,
 #newMsgButton-calendar-menuitem {
     list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
     -moz-image-region: auto;
 }
 
 #task-tab-button,
 #newMsgButton-task-menuitem {
-    list-style-image: url(chrome://calendar-common/skin/icons/task-tab.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/task-tab.svg);
     -moz-image-region: auto;
 }
 
 /* ::: tab icons ::: */
 .icon-holder[type="calendar"],
 .tabmail-tab[type="calendar"] {
     list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
     -moz-image-region: auto;
 }
 
 .icon-holder[type="tasks"],
 .tabmail-tab[type="tasks"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/task-tab.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/task-tab.svg);
     -moz-image-region: auto;
 }
 
 :root[lwt-tree] #ltnSidebar {
     background-color: var(--sidebar-background-color);
     color: var(--sidebar-text-color);
 }
 
@@ -69,17 +69,17 @@
 
 :root[lwthemetextcolor="bright"] #calendar-status-todaypane-button:hover:active {
   background: rgba(255, 255, 255, .4);
   border-color: rgba(255, 255, 255, .7);
   box-shadow: 0 0 rgba(255, 255, 255, .4) inset;
 }
 
 #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
-    list-style-image: url(chrome://calendar-common/skin/icons/pane.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/pane.svg);
     width: 16px;
     height: 16px;
     -moz-context-properties: fill, fill-opacity;
     fill: currentColor;
     fill-opacity: var(--toolbarbutton-icon-fill-opacity);
 }
 
 #calendar-status-todaypane-button > stack > .toolbarbutton-day-text {
@@ -107,63 +107,63 @@
 #calendar-status-todaypane-button[checked="true"] > .toolbarbutton-icon-end {
   transform: scaleY(-1);
 }
 
 /* iMIP notification bar */
 #imip-bar > image {
   -moz-context-properties: fill;
   fill: currentColor;
-  list-style-image: url(chrome://calendar-common/skin/icons/imip-bar.svg);
+  list-style-image: url(chrome://calendar/skin/shared/icons/imip-bar.svg);
 }
 
 .imipMoreButton > .toolbarbutton-icon {
   display: none;
 }
 
 /* Write button */
 #newMsgButton-mail-menuitem {
   list-style-image: url(chrome://messenger/skin/icons/newmsg.svg);
 }
 
 .imipAcceptRecurrencesButton,
 .imipAcceptButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/complete.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/complete.svg);
 }
 
 .imipDeclineCounterButton,
 .imipDeclineRecurrencesButton,
 .imipDeclineButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/decline.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/decline.svg);
 }
 
 .imipTentativeRecurrencesButton,
 .imipTentativeButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/tentative.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/tentative.svg);
 }
 
 .imipDetailsButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/find.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/find.svg);
 }
 
 .imipAddButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/newevent.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/newevent.svg);
 }
 
 .imipRescheduleButton,
 .imipUpdateButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/synchronize.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/synchronize.svg);
 }
 
 .imipDeleteButton {
     list-style-image: url(chrome://messenger/skin/icons/delete.svg);
 }
 
 .imipReconfirmButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
+    list-style-image: url(chrome://calendar/skin/shared/icons/priority.svg);
 }
 
 .imipAcceptLabel {
     font-weight: bold;
     font-style: italic;
 }
 
 #calsidebar_splitter,
--- a/calendar/resources/content/calendarCreation.xhtml
+++ b/calendar/resources/content/calendarCreation.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/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/content/notification.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/calendar-creation-wizard.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-creation-wizard.css" type="text/css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE window [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://lightning/locale/lightning.dtd"> %dtd3;
 ]>
 
--- a/common/src/customizeToolbar.xhtml
+++ b/common/src/customizeToolbar.xhtml
@@ -25,17 +25,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?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-common/skin/dialogs/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://lightning/skin/lightning-toolbar.css" type="text/css"?>
 
 <window id="CustomizeToolbarWindow"
         title="&dialog.title;"
 #ifdef MOZ_SUITE
         onload="onLoad();"
 #else
         windowtype="mailnews:customizeToolbar"
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -24,28 +24,28 @@
 <?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/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-common/skin/dialogs/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"?>
 
 <?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-common/skin/calendar-alarms.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.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"?>
 
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
--- a/mail/components/preferences/aboutPreferences.xhtml
+++ b/mail/components/preferences/aboutPreferences.xhtml
@@ -7,17 +7,17 @@
 <?xml-stylesheet href="chrome://global/skin/global.css"?>
 <?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-common/skin/calendar-preferences.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-preferences.css" type="text/css"?>
 <?xml-stylesheet href="chrome://lightning/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" >