Bug 1230991 - Move common files from platform directories to common. r=Fallen
authorRichard Marti <richard.marti@gmail.com>
Mon, 07 Dec 2015 17:42:25 +0100
changeset 26620 9f6e321843df51b9ab1a68683e0c07daa7c9ca2e
parent 26619 5b6134bca3a7e46ed4aa4206330c92f28f8fe1da
child 26621 c436a14a110297b5bb4b97e4b89440f235384d5c
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1230991
Bug 1230991 - Move common files from platform directories to common. r=Fallen
calendar/base/content/calendar-base-view.xml
calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
calendar/base/content/dialogs/calendar-event-dialog.xul
calendar/base/content/dialogs/calendar-properties-dialog.xul
calendar/base/content/dialogs/calendar-providerUninstall-dialog.xul
calendar/base/content/dialogs/calendar-subscriptions-dialog.xul
calendar/base/content/dialogs/calendar-summary-dialog.xul
calendar/base/content/today-pane.xul
calendar/base/content/widgets/minimonth.xml
calendar/base/jar.mn
calendar/base/themes/common/dialogs/calendar-properties-dialog.css
calendar/base/themes/linux/widgets/minimonth.css
calendar/base/themes/osx/widgets/minimonth.css
calendar/base/themes/windows/widgets/minimonth.css
calendar/import-export/calMonthGridPrinter.html
calendar/import-export/calWeekPrinter.html
calendar/lightning/content/lightning-standalone.xul
calendar/lightning/content/messenger-overlay-sidebar.xul
calendar/lightning/jar.mn
calendar/resources/content/calendarCreation.xul
calendar/resources/content/datetimepickers/datetimepickers.xml
calendar/resources/jar.mn
calendar/resources/moz.build
calendar/resources/skin/classic/datetimepickers/datetimepickers.css
calendar/resources/skin/classic/dialogOverlay.css
calendar/resources/skin/datetimepickers.css
calendar/resources/skin/dialogOverlay.css
--- a/calendar/base/content/calendar-base-view.xml
+++ b/calendar/base/content/calendar-base-view.xml
@@ -7,17 +7,17 @@
 <bindings id="calendar-multiday-view-bindings"
   xmlns="http://www.mozilla.org/xbl"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="calendar-base-view">
     <resources>
-      <stylesheet src="chrome://calendar/skin/calendar-alarms.css"/>
+      <stylesheet src="chrome://calendar-common/skin/calendar-alarms.css"/>
     </resources>
     <implementation>
       <field name="mWeekStartOffset">0</field>
       <field name="mRangeStartDate">null</field>;
       <field name="mRangeEndDate">null</field>;
       <field name="mWorkdaysOnly">false</field>
       <field name="mPendingRefreshJobs">null</field>
       <field name="mCalendar">null</field>
@@ -700,17 +700,17 @@
         <body><![CDATA[
           cal.navigationBar.setDateRange(aStartDate, aEndDate);
         ]]></body>
       </method>
 
       <property name="selectedDay"
                 onget="return this.startDate"
                 onset="return this.startDate"/>
-       
+
       <method name="getSelectedItems">
         <parameter name="aCount"/>
         <body><![CDATA[
           aCount.value = this.mSelectedItems.length;
           return this.mSelectedItems;
         ]]></body>
       </method>
       <method name="setSelectedItems">
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
@@ -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/skin/calendar-attendees.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/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://calendar/content/datetimepickers/datetimepickers.css"?>
 
 <!DOCTYPE dialog [
   <!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-reminder.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
@@ -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/skin/calendar-alarms.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-alarms.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://calendar/locale/dialogs/calendar-event-dialog-reminder.dtd" >
 
 <dialog id="calendar-event-dialog-reminder"
         title="&reminderdialog.title;"
--- a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
@@ -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/content/datetimepickers/datetimepickers.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-timezone-highlighter.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-timezone-highlighter.css"?>
 
 <!DOCTYPE dialog [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd3;
   <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/preferences/timezones.dtd" > %dtd4;
 ]>
 
--- a/calendar/base/content/dialogs/calendar-event-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xul
@@ -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/skin/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-attendees.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/content/widgets/calendar-widget-bindings.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://calendar/content/datetimepickers/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
 
 <!DOCTYPE dialog [
--- a/calendar/base/content/dialogs/calendar-properties-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-properties-dialog.xul
@@ -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/skin/calendar-properties-dialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/calendar-properties-dialog.css" type="text/css"?>
 
 <!DOCTYPE dialog
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 <dialog
--- a/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xul
@@ -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 type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-providerUninstall-dialog.css"?>
+<?xml-stylesheet type="text/css" href="chrome://calendar-common/skin/calendar-providerUninstall-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/widgets/calendar-widget-bindings.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-management.css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://calendar/locale/provider-uninstall.dtd" >
 
 <dialog id="calendar-provider-uninstall-dialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&providerUninstall.title;"
--- a/calendar/base/content/dialogs/calendar-subscriptions-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-subscriptions-dialog.xul
@@ -1,48 +1,48 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-subscriptions-dialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-subscriptions-dialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/calendar-subscriptions-dialog.css" type="text/css"?>
 
 <!DOCTYPE dialog
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar-subscriptions-dialog.dtd" >  %dtd1;
-]>     
+]>
 
 <dialog
   id="calendar-subscriptions-dialog"
   title="&calendar.subscriptions.dialog.title;"
   windowtype="Calendar:SubscriptionsDialog"
   buttons="accept,cancel"
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();"
   onload="return onLoad();"
   onunload="return onUnload();"
-  onkeypress="onKeyPress(event);" 
+  onkeypress="onKeyPress(event);"
   persist="screenX screenY width height"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <!-- Javascript includes -->
   <script type="application/javascript" src="chrome://calendar/content/calendar-subscriptions-dialog.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calUtils.js"/>
   <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
 
   <vbox flex="1">
     <grid flex="1">
       <columns>
         <column flex="1"/>
         <column/>
       </columns>
-      <rows>  
+      <rows>
         <row>
           <label value="&calendar.subscriptions.dialog.search.label.value;"
                  crop="end"/>
         </row>
         <row>
           <textbox id="search-textbox" onkeypress="onTextBoxKeyPress(event);"/>
           <button label="&calendar.subscriptions.dialog.search.button.label;"
                   oncommand="onSearch();"/>
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xul
@@ -1,32 +1,32 @@
 <?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-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-attendees.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/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/common/dialogs/calendar-event-dialog.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/datetimepickers/datetimepickers.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/content/calendar-bindings.css"?>
 
 <!DOCTYPE dialog [
   <!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" >
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
   %globalDTD;
   %calendarDTD;
   %dialogDTD;
   %brandDTD;
-]>     
+]>
 
 <!-- Dialog id is changed during excution to allow different Window-icons
      on this dialog. document.loadOverlay() will not work on this one. -->
 <dialog id="calendar-summary-dialog"
         windowtype="Calendar:EventSummaryDialog"
         onload="onLoad()"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();"
--- a/calendar/base/content/today-pane.xul
+++ b/calendar/base/content/today-pane.xul
@@ -11,17 +11,17 @@
     <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd4;
     <!ENTITY % dtd5 SYSTEM "chrome://global/locale/global.dtd" > %dtd5;
     <!ENTITY % dtd6 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd6;
 ]>
 
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/widgets/minimonth.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/javascript" src="chrome://calendar/content/today-pane.js"/>
 <script type="application/javascript" src="chrome://calendar/content/agenda-listbox.js"/>
 <script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
 <script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
 <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
--- a/calendar/base/content/widgets/minimonth.xml
+++ b/calendar/base/content/widgets/minimonth.xml
@@ -23,17 +23,17 @@
    bugs that occur when minimonth is displayed in a popup (as in datepicker):
      Currently (2005.3)
        whenever a child popup is hidden, the parent popup needs to be reshown.
          Use onpopuplisthidden to reshow parent popop (hidePopup, openPopup).
        When title month or year changes, parent popup may need to be reshown.
          Use onmonthchange to reshow parent popop (hidePopup, openPopup).
 */
 -->
-<!DOCTYPE bindings 
+<!DOCTYPE bindings
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://global/locale/global.dtd" > %dtd2;
 ]>
 
 <bindings id="xulMiniMonth"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
@@ -309,17 +309,17 @@
           }
         ]]>
       </handler>
     </handlers>
   </binding>
 
   <binding id="minimonth" extends="xul:box">
     <resources>
-      <stylesheet src="chrome://calendar/skin/widgets/minimonth.css"/>
+      <stylesheet src="chrome://calendar-common/skin/widgets/minimonth.css"/>
     </resources>
     <content orient="vertical" xbl:inherits="onchange,onmonthchange,onpopuplisthidden,readonly">
         <xul:minimonth-header anonid="minimonth-header" xbl:inherits="readonly,month,year"/>
         <xul:vbox anonid="minimonth-calendar" class="minimonth-cal-box">
           <xul:hbox class="minimonth-row-head" anonid="minimonth-row-header" equalsize="always">
             <xul:text class="minimonth-row-header-week" flex="1"/>
             <xul:text class="minimonth-row-header" flex="1"/>
             <xul:text class="minimonth-row-header" flex="1"/>
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -127,40 +127,40 @@ calendar.jar:
     ../skin/common/timezones.png                      (themes/common/images/timezones.png)
     ../skin/common/calendar-event-dialog.png          (themes/common/dialogs/images/calendar-event-dialog.png)
     ../skin/common/widgets/nav-arrow.svg              (themes/common/widgets/images/nav-arrow.svg)
     ../skin/common/widgets/nav-today.svg              (themes/common/widgets/images/nav-today.svg)
     ../skin/common/widgets/nav-today-hov.svg          (themes/common/widgets/images/nav-today-hov.svg)
     ../skin/common/widgets/view-navigation.svg        (themes/common/widgets/images/view-navigation.svg)
     ../skin/common/widgets/view-navigation-hov.svg    (themes/common/widgets/images/view-navigation-hov.svg)
     ../skin/common/widgets/drag-center.svg            (themes/common/widgets/images/drag-center.svg)
+    ../skin/common/calendar-alarms.css                (themes/common/calendar-alarms.css)
+    ../skin/common/calendar-attendees.css             (themes/common/calendar-attendees.css)
+    ../skin/common/calendar-creation-wizard.css       (themes/common/calendar-creation-wizard.css)
     ../skin/common/calendar-daypicker.css             (themes/common/calendar-daypicker.css)
     ../skin/common/calendar-management.css            (themes/common/calendar-management.css)
     ../skin/common/calendar-occurrence-prompt.css     (themes/common/calendar-occurrence-prompt.css)
+    ../skin/common/calendar-printing.css              (themes/common/calendar-printing.css)
+    ../skin/common/calendar-providerUninstall-dialog.css (themes/common/calendar-providerUninstall-dialog.css)
     ../skin/common/calendar-task-tree.css             (themes/common/calendar-task-tree.css)
     ../skin/common/calendar-task-view.css             (themes/common/calendar-task-view.css)
     ../skin/common/calendar-toolbar.svg               (themes/common/calendar-toolbar.svg)
     ../skin/common/calendar-itip-icons.svg            (themes/common/calendar-itip-icons.svg)
     ../skin/common/calendar-unifinder.css             (themes/common/calendar-unifinder.css)
     ../skin/common/calendar-views.css                 (themes/common/calendar-views.css)
     ../skin/common/today-pane.css                     (themes/common/today-pane.css)
     ../skin/common/dialogs/calendar-alarm-dialog.css  (themes/common/dialogs/calendar-alarm-dialog.css)
     ../skin/common/dialogs/calendar-event-dialog.css  (themes/common/dialogs/calendar-event-dialog.css)
+    ../skin/common/calendar-properties-dialog.css     (themes/common/dialogs/calendar-properties-dialog.css)
+    ../skin/common/calendar-subscriptions-dialog.css  (themes/common/dialogs/calendar-subscriptions-dialog.css)
+    ../skin/common/calendar-timezone-highlighter.css  (themes/common/dialogs/calendar-timezone-highlighter.css)
     ../skin/common/widgets/calendar-widgets.css       (themes/common/widgets/calendar-widgets.css)
     ../skin/common/widgets/minimonth.css              (themes/common/widgets/minimonth.css)
 
 # Linux theme files
-    ../skin/linux/calendar/calendar-alarms.css                            (themes/common/calendar-alarms.css)
-    ../skin/linux/calendar/calendar-attendees.css                         (themes/common/calendar-attendees.css)
-    ../skin/linux/calendar/calendar-creation-wizard.css                   (themes/common/calendar-creation-wizard.css)
-    ../skin/linux/calendar/calendar-timezone-highlighter.css              (themes/common/dialogs/calendar-timezone-highlighter.css)
-    ../skin/linux/calendar/calendar-properties-dialog.css                 (themes/common/dialogs/calendar-properties-dialog.css)
-    ../skin/linux/calendar/calendar-subscriptions-dialog.css              (themes/common/dialogs/calendar-subscriptions-dialog.css)
-    ../skin/linux/calendar/calendar-providerUninstall-dialog.css          (themes/common/calendar-providerUninstall-dialog.css)
-    ../skin/linux/calendar/calendar-printing.css                          (themes/common/calendar-printing.css)
     ../skin/linux/calendar/cal-icon32.png                                 (themes/linux/images/cal-icon32.png)
     ../skin/linux/calendar/cal-icon24.png                                 (themes/linux/images/cal-icon24.png)
     ../skin/linux/calendar/calendar-alarm-dialog.css                      (themes/linux/dialogs/calendar-alarm-dialog.css)
     ../skin/linux/calendar/calendar-daypicker.css                         (themes/linux/calendar-daypicker.css)
     ../skin/linux/calendar/calendar-event-dialog.css                      (themes/linux/dialogs/calendar-event-dialog.css)
     ../skin/linux/calendar/calendar-event-dialog-attendees.png            (themes/linux/dialogs/images/calendar-event-dialog-attendees.png)
     ../skin/linux/calendar/calendar-invitations-dialog.css                (themes/linux/dialogs/calendar-invitations-dialog.css)
     ../skin/linux/calendar/calendar-invitations-dialog-button-images.png  (themes/linux/dialogs/images/calendar-invitations-dialog-button-images.png)
@@ -169,28 +169,19 @@ calendar.jar:
     ../skin/linux/calendar/calendar-task-tree.css                         (themes/linux/calendar-task-tree.css)
     ../skin/linux/calendar/calendar-task-view.css                         (themes/linux/calendar-task-view.css)
     ../skin/linux/calendar/calendar-unifinder.css                         (themes/linux/calendar-unifinder.css)
     ../skin/linux/calendar/calendar-views.css                             (themes/linux/calendar-views.css)
     ../skin/linux/calendar/checkbox-images.png                            (themes/linux/images/checkbox-images.png)
     ../skin/linux/calendar/ok-cancel.png                                  (themes/linux/images/ok-cancel.png)
     ../skin/linux/calendar/today-pane.css                                 (themes/linux/today-pane.css)
     ../skin/linux/calendar/widgets/calendar-widgets.css                   (themes/linux/widgets/calendar-widgets.css)
-    ../skin/linux/calendar/widgets/minimonth.css                          (themes/linux/widgets/minimonth.css)
     ../skin/linux/calendar/calendar-occurrence-prompt.png                 (themes/linux/images/calendar-occurrence-prompt.png)
 
 # OS X theme files
-    ../skin/osx/calendar/calendar-alarms.css                            (themes/common/calendar-alarms.css)
-    ../skin/osx/calendar/calendar-attendees.css                         (themes/common/calendar-attendees.css)
-    ../skin/osx/calendar/calendar-creation-wizard.css                   (themes/common/calendar-creation-wizard.css)
-    ../skin/osx/calendar/calendar-timezone-highlighter.css              (themes/common/dialogs/calendar-timezone-highlighter.css)
-    ../skin/osx/calendar/calendar-properties-dialog.css                 (themes/common/dialogs/calendar-properties-dialog.css)
-    ../skin/osx/calendar/calendar-subscriptions-dialog.css              (themes/common/dialogs/calendar-subscriptions-dialog.css)
-    ../skin/osx/calendar/calendar-providerUninstall-dialog.css          (themes/common/calendar-providerUninstall-dialog.css)
-    ../skin/osx/calendar/calendar-printing.css                          (themes/common/calendar-printing.css)
     ../skin/osx/calendar/cal-icon32.png                                 (themes/osx/images/cal-icon32.png)
     ../skin/osx/calendar/cal-icon24.png                                 (themes/osx/images/cal-icon24.png)
     ../skin/osx/calendar/calendar-alarm-dialog.css                      (themes/osx/dialogs/calendar-alarm-dialog.css)
     ../skin/osx/calendar/calendar-daypicker.css                         (themes/osx/calendar-daypicker.css)
     ../skin/osx/calendar/calendar-event-dialog.css                      (themes/osx/dialogs/calendar-event-dialog.css)
     ../skin/osx/calendar/calendar-event-dialog-attendees.png            (themes/osx/dialogs/images/calendar-event-dialog-attendees.png)
     ../skin/osx/calendar/calendar-invitations-dialog.css                (themes/osx/dialogs/calendar-invitations-dialog.css)
     ../skin/osx/calendar/calendar-invitations-dialog-button-images.png  (themes/osx/dialogs/images/calendar-invitations-dialog-button-images.png)
@@ -199,30 +190,21 @@ calendar.jar:
     ../skin/osx/calendar/calendar-task-tree.css                         (themes/osx/calendar-task-tree.css)
     ../skin/osx/calendar/calendar-task-view.css                         (themes/osx/calendar-task-view.css)
     ../skin/osx/calendar/calendar-unifinder.css                         (themes/osx/calendar-unifinder.css)
     ../skin/osx/calendar/calendar-views.css                             (themes/osx/calendar-views.css)
     ../skin/osx/calendar/checkbox-images.png                            (themes/osx/images/checkbox-images.png)
     ../skin/osx/calendar/ok-cancel.png                                  (themes/osx/images/ok-cancel.png)
     ../skin/osx/calendar/today-pane.css                                 (themes/osx/today-pane.css)
     ../skin/osx/calendar/widgets/calendar-widgets.css                   (themes/osx/widgets/calendar-widgets.css)
-    ../skin/osx/calendar/widgets/minimonth.css                          (themes/osx/widgets/minimonth.css)
     ../skin/osx/calendar/calendar-occurrence-prompt.png                 (themes/osx/images/calendar-occurrence-prompt.png)
     ../skin/osx/calendar/checkbox-images-graphite.png                   (themes/osx/images/checkbox-images-graphite.png)
     ../skin/osx/calendar/sidebar-item.png                               (themes/osx/images/sidebar-item.png)
 
 # Windows theme files
-    ../skin/windows/calendar/calendar-alarms.css                            (themes/common/calendar-alarms.css)
-    ../skin/windows/calendar/calendar-attendees.css                         (themes/common/calendar-attendees.css)
-    ../skin/windows/calendar/calendar-creation-wizard.css                   (themes/common/calendar-creation-wizard.css)
-    ../skin/windows/calendar/calendar-timezone-highlighter.css              (themes/common/dialogs/calendar-timezone-highlighter.css)
-    ../skin/windows/calendar/calendar-properties-dialog.css                 (themes/common/dialogs/calendar-properties-dialog.css)
-    ../skin/windows/calendar/calendar-subscriptions-dialog.css              (themes/common/dialogs/calendar-subscriptions-dialog.css)
-    ../skin/windows/calendar/calendar-providerUninstall-dialog.css          (themes/common/calendar-providerUninstall-dialog.css)
-    ../skin/windows/calendar/calendar-printing.css                          (themes/common/calendar-printing.css)
     ../skin/windows/calendar/cal-icon32.png                                 (themes/windows/images/cal-icon32.png)
     ../skin/windows/calendar/cal-icon24.png                                 (themes/windows/images/cal-icon24.png)
     ../skin/windows/calendar/calendar-alarm-dialog.css                      (themes/windows/dialogs/calendar-alarm-dialog.css)
     ../skin/windows/calendar/calendar-daypicker.css                         (themes/windows/calendar-daypicker.css)
     ../skin/windows/calendar/calendar-event-dialog.css                      (themes/windows/dialogs/calendar-event-dialog.css)
     ../skin/windows/calendar/calendar-event-dialog-attendees.png            (themes/windows/dialogs/images/calendar-event-dialog-attendees.png)
     ../skin/windows/calendar/calendar-invitations-dialog.css                (themes/windows/dialogs/calendar-invitations-dialog.css)
     ../skin/windows/calendar/calendar-invitations-dialog-button-images.png  (themes/windows/dialogs/images/calendar-invitations-dialog-button-images.png)
@@ -231,16 +213,15 @@ calendar.jar:
     ../skin/windows/calendar/calendar-task-tree.css                         (themes/windows/calendar-task-tree.css)
     ../skin/windows/calendar/calendar-task-view.css                         (themes/windows/calendar-task-view.css)
     ../skin/windows/calendar/calendar-unifinder.css                         (themes/windows/calendar-unifinder.css)
     ../skin/windows/calendar/calendar-views.css                             (themes/windows/calendar-views.css)
     ../skin/windows/calendar/checkbox-images.png                            (themes/windows/images/checkbox-images.png)
     ../skin/windows/calendar/ok-cancel.png                                  (themes/windows/images/ok-cancel.png)
     ../skin/windows/calendar/today-pane.css                                 (themes/windows/today-pane.css)
     ../skin/windows/calendar/widgets/calendar-widgets.css                   (themes/windows/widgets/calendar-widgets.css)
-    ../skin/windows/calendar/widgets/minimonth.css                          (themes/windows/widgets/minimonth.css)
     ../skin/windows/calendar/calendar-event-dialog-toolbar.png              (themes/windows/dialogs/images/calendar-event-dialog-toolbar.png)
     ../skin/windows/calendar/calendar-event-dialog-toolbar-small.png        (themes/windows/dialogs/images/calendar-event-dialog-toolbar-small.png)
     ../skin/windows/calendar/calendar-occurrence-prompt.png                 (themes/windows/images/calendar-occurrence-prompt.png)
     ../skin/windows/calendar/tasks-actions.png                              (themes/windows/images/tasks-actions.png)
     ../skin/windows/calendar/toolbar-large.png                              (themes/windows/images/toolbar-large.png)
     ../skin/windows/calendar/toolbar-small.png                              (themes/windows/images/toolbar-small.png)
     ../skin/windows/calendar/calendar-occurrence-prompt-aero.png            (themes/windows/images/calendar-occurrence-prompt-aero.png)
--- a/calendar/base/themes/common/dialogs/calendar-properties-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-properties-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/. */
 
 #calendar-properties-grid {
-    -moz-margin-start: 20px;
+    margin-inline-start: 20px;
 }
 
 #calendar-properties-rows > row {
     min-height: 26px;
 }
deleted file mode 100644
--- a/calendar/base/themes/linux/widgets/minimonth.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@import url(chrome://calendar-common/skin/widgets/minimonth.css);
deleted file mode 100644
--- a/calendar/base/themes/osx/widgets/minimonth.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@import url(chrome://calendar-common/skin/widgets/minimonth.css);
deleted file mode 100644
--- a/calendar/base/themes/windows/widgets/minimonth.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-@import url(chrome://calendar-common/skin/widgets/minimonth.css);
--- a/calendar/import-export/calMonthGridPrinter.html
+++ b/calendar/import-export/calMonthGridPrinter.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title id="title"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" type="text/css" href="chrome://calendar/skin/calendar-printing.css"/>
+    <link rel="stylesheet" type="text/css" href="chrome://calendar-common/skin/calendar-printing.css"/>
     <style type="text/css" id="sheet">
       .main-table { font-size: 26px; font-weight: bold; }
       .day-name { border: 1px solid black; background-color: white; font-size: 12px; font-weight: bold; }
       .day-box { border: 1px solid black; vertical-align: top; }
       .out-of-month { background-color: white !important; }
       .day-off { background-color: white !important; }
   </style>
   </head>
--- a/calendar/import-export/calWeekPrinter.html
+++ b/calendar/import-export/calWeekPrinter.html
@@ -1,15 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title id="title"/>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link rel="stylesheet" type="text/css" href="chrome://calendar/skin/calendar-printing.css"/>
+    <link rel="stylesheet" type="text/css" href="chrome://calendar-common/skin/calendar-printing.css"/>
     <style type="text/css" id="sheet"/>
   </head>
   <body>
     <div id="week-container"/>
     <div id="tasks-list-box" hidden="true">
       <h3 id="tasks-title"/>
       <ul class="taskList" id="task-container"/>
     </div>
--- a/calendar/lightning/content/lightning-standalone.xul
+++ b/calendar/lightning/content/lightning-standalone.xul
@@ -3,22 +3,22 @@
    - 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/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd" >
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/content/calendar-multiday-view.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/widgets/minimonth.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.css" type="text/css"?>
 
 <window
   id="lightning"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <!-- messenger-overlay-sidebar expects to overlay a vbox named "folderPaneBox" and a 
+  <!-- messenger-overlay-sidebar expects to overlay a vbox named "folderPaneBox" and a
      - deck named "calendarDisplayDeck".  So we oblige.
     -->
   <hbox flex="1">
     <vbox id="folderPaneBox" flex="1"/>
     <splitter />
     <deck id="calendarDisplayDeck" flex="4"/>
   </hbox>
 </window>
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -13,17 +13,17 @@
   <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd"> %messengerDTD;
 ]>
 
 <?xml-stylesheet href="chrome://lightning/skin/lightning.css" type="text/css"?>
 
 <?xml-stylesheet href="chrome://calendar/content/calendar-view-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/calendar-bindings.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/widgets/minimonth.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/widgets/minimonth.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
 
 <?xul-overlay href="chrome://calendar/content/calendar-calendars-list.xul"?>
 <?xul-overlay href="chrome://calendar/content/calendar-common-sets.xul"?>
 <?xul-overlay href="chrome://calendar/content/calendar-views.xul"?>
 
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -28,17 +28,17 @@ lightning.jar:
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-unifinder-todo.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/calendar-task-view.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://calendar/content/today-pane.xul
 % overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/suite-overlay-sidebar.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % overlay chrome://lightning/content/lightning-standalone.xul chrome://lightning/content/messenger-overlay-sidebar.xul
 % overlay chrome://calendar/content/calendarCreation.xul chrome://lightning/content/lightning-calendar-creation.xul
 % overlay chrome://calendar/content/calendar-properties-dialog.xul chrome://lightning/content/lightning-calendar-properties.xul
-% override chrome://lightning/skin/accountCentral.css chrome://lightning/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
+% override chrome://lightning/skin/accountCentral.css chrome://lightning-common/skin/suite-accountCentral.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % content lightning %content/lightning/
     content/lightning/imip-bar.js                          (content/imip-bar.js)
     content/lightning/imip-bar-overlay.xul                 (content/imip-bar-overlay.xul)
     content/lightning/lightning-calendar-creation.xul      (content/lightning-calendar-creation.xul)
     content/lightning/lightning-calendar-creation.js       (content/lightning-calendar-creation.js)
     content/lightning/lightning-calendar-properties.xul    (content/lightning-calendar-properties.xul)
     content/lightning/lightning-calendar-properties.js     (content/lightning-calendar-properties.js)
     content/lightning/lightning-invitation.xhtml           (content/lightning-invitation.xhtml)
@@ -63,56 +63,53 @@ lightning.jar:
 % skin lightning classic/1.0 chrome/skin/osx/lightning/ os=Darwin
 % skin lightning classic/1.0 chrome/skin/windows/lightning/ os=WINNT
 % skin lightning-common classic/1.0 chrome/skin/lightning-common/
 % style chrome://global/content/customizeToolbar.xul chrome://lightning/skin/lightning-toolbar.css
 % style chrome://calendar/content/calendar-event-dialog.xul chrome://communicator/skin/communicator.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % style chrome://global/content/customizeToolbar.xul chrome://lightning-common/skin/lightning.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 % style chrome://global/content/customizeToolbar.xul chrome://calendar-common/skin/dialogs/calendar-event-dialog.css application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
     ../skin/lightning-common/mode-switch-icons.png            (themes/common/images/mode-switch-icons.png)
+    ../skin/lightning-common/suite-accountCentral.css         (themes/common/suite-accountCentral.css)
 
 # Linux theme files
     ../skin/linux/lightning/accountCentral.css                (themes/linux/accountCentral.css)
     ../skin/linux/lightning/imip.css                          (themes/linux/imip.css)
     ../skin/linux/lightning/imip.png                          (themes/linux/imip.png)
     ../skin/linux/lightning/lightning.css                     (themes/linux/lightning.css)
     ../skin/linux/lightning/lightning-toolbar.css             (themes/linux/lightning-toolbar.css)
     ../skin/linux/lightning/lightning-widgets.css             (themes/linux/lightning-widgets.css)
-    ../skin/linux/lightning/suite-accountCentral.css          (themes/common/suite-accountCentral.css)
 
 # OS X theme files
     ../skin/osx/lightning/accountCentral.css                  (themes/osx/accountCentral.css)
     ../skin/osx/lightning/imip.css                            (themes/osx/imip.css)
     ../skin/osx/lightning/imip.png                            (themes/osx/imip.png)
     ../skin/osx/lightning/lightning.css                       (themes/osx/lightning.css)
     ../skin/osx/lightning/lightning-toolbar.css               (themes/osx/lightning-toolbar.css)
     ../skin/osx/lightning/lightning-widgets.css               (themes/osx/lightning-widgets.css)
-    ../skin/osx/lightning/suite-accountCentral.css            (themes/common/suite-accountCentral.css)
 
 # Windows theme files
     ../skin/windows/lightning/accountCentral.css              (themes/windows/accountCentral.css)
     ../skin/windows/lightning/imip.css                        (themes/windows/imip.css)
     ../skin/windows/lightning/imip.png                        (themes/windows/imip.png)
     ../skin/windows/lightning/lightning.css                   (themes/windows/lightning.css)
     ../skin/windows/lightning/lightning-toolbar.css           (themes/windows/lightning-toolbar.css)
     ../skin/windows/lightning/lightning-widgets.css           (themes/windows/lightning-widgets.css)
     ../skin/windows/lightning/imip-aero.png                   (themes/windows/images/imip-aero.png)
     ../skin/windows/lightning/mode-switch-icons-aero.png      (themes/windows/images/mode-switch-icons-aero.png)
     ../skin/windows/lightning/mode-switch-icons-inverted.png  (themes/windows/images/mode-switch-icons-inverted.png)
-    ../skin/windows/lightning/suite-accountCentral.css        (themes/common/suite-accountCentral.css)
 
 
 calendar.jar:
     content/calendar/calendarCreation.xul                  (/calendar/resources/content/calendarCreation.xul)
     content/calendar/calendarCreation.js                   (/calendar/resources/content/calendarCreation.js)
     content/calendar/datetimepickers/datetimepickers.css   (/calendar/resources/content/datetimepickers/datetimepickers.css)
     content/calendar/datetimepickers/datetimepickers.xml   (/calendar/resources/content/datetimepickers/datetimepickers.xml)
     content/calendar/mouseoverPreviews.js                  (/calendar/resources/content/mouseoverPreviews.js)
     content/calendar/publish.js                            (/calendar/resources/content/publish.js)
     content/calendar/publishDialog.js                      (/calendar/resources/content/publishDialog.js)
     content/calendar/publishDialog.xul                     (/calendar/resources/content/publishDialog.xul)
     content/calendar/sound.wav                             (/calendar/resources/content/sound.wav)
+    ../skin/lightning-common/datetimepickers.css           (/calendar/resources/skin/datetimepickers.css)
+    ../skin/lightning-common/dialogOverlay.css             (/calendar/resources/skin/dialogOverlay.css)
     ../skin/lightning-common/imip.css                      (themes/common/imip.css)
     ../skin/lightning-common/lightning.css                 (themes/common/lightning.css)
     ../skin/lightning-common/lightning-toolbar.css         (themes/common/lightning-toolbar.css)
-    ../skin/linux/calendar/datetimepickers/datetimepickers.css    (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
-    ../skin/osx/calendar/datetimepickers/datetimepickers.css      (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
-    ../skin/windows/calendar/datetimepickers/datetimepickers.css  (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
--- a/calendar/resources/content/calendarCreation.xul
+++ b/calendar/resources/content/calendarCreation.xul
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-creation-wizard.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar-common/skin/calendar-creation-wizard.css" type="text/css"?>
 
 <!DOCTYPE dialog [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 <wizard id="calendar-wizard"
         title="&wizard.title;"
--- a/calendar/resources/content/datetimepickers/datetimepickers.xml
+++ b/calendar/resources/content/datetimepickers/datetimepickers.xml
@@ -1,41 +1,41 @@
 <?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!--
 /*  This defines <datepicker/> <timepicker/> and <datetimepicker/>
     which all descend from datetimepicker-base to get date/time parsing
     and consistent behavior.
     It relies on <minimonth/> for the date picker's drop down.
     You can be notified of change event as follows:
       <datepicker id="my-date-picker" onchange="myDatePick( this );"/>
-    May get/set value in javascript with 
+    May get/set value in javascript with
       document.getElementById("my-date-picker").value = new Date();
     May disable/enable in javascript with
       document.getElementById("my-date-picker").disabled = true;
     May also disable/enable a datetimepicker's component
-      datepicker or timepicker individually with 
+      datepicker or timepicker individually with
       document.getElementById("my-datetimepicker").datepickerdisabled = true;
       document.getElementById("my-datetimepicker").timepickerdisabled = true;
 
 */
 -->
 <bindings id="xulDatePicker"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
           xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <binding id="datetextpicker"
-           extends="chrome://calendar/content/datetimepickers/datetimepickers.xml#datetimepicker-base">               
+           extends="chrome://calendar/content/datetimepickers/datetimepickers.xml#datetimepicker-base">
     <content>
       <xul:hbox flex="1">
         <xul:textbox anonid="date-textbox" flex="1"
                      onfocus="this.select();"
                      onkeypress="if (event.keyCode == Components.interfaces.nsIDOMKeyEvent.DOM_VK_RETURN) fireGoEvent();"/>
         <xul:button anonid="date-go-button" oncommand="fireGoEvent()"/>
       </xul:hbox>
     </content>
@@ -66,17 +66,17 @@
         }
 
         // note that some languages have different conjugations of
         // next/last depending on the day
         this.mRelationWords = [
             {word:calGetString("calendar", "last1"), offset: -1},
             {word:calGetString("calendar", "last2"), offset: -1},
             {word:calGetString("calendar", "next1"), offset: 0},
-            {word:calGetString("calendar", "next2"), offset: 0}];        
+            {word:calGetString("calendar", "next2"), offset: 0}];
 
         // Set the value to today
         var text = document.getAnonymousElementByAttribute(this, "anonid", "date-textbox");
         text.value = calGetString("calendar", "today");
       ]]></constructor>
 
       <property name="value">
         <getter><![CDATA[
@@ -96,17 +96,17 @@
           var text = document.getAnonymousElementByAttribute(this, "anonid", "date-textbox");
           var date = this.parseLanguageDate(text.value);
           if (!date) {
             date = this.parseDateTime(text.value);
           }
           if (date) {
             // format fails if year <= 1600 on win2k, so try format first.
             var prettyDate;
-            try { 
+            try {
               prettyDate = this.formatDate(date);
             } catch (ex) {} // fall thru
           }
           if (date && prettyDate) {
             this.mValue = date;
             text.value = prettyDate;
             this.fireEvent("command", date);
             return;
@@ -208,39 +208,39 @@
           return null;
         ]]></body>
       </method>
     </implementation>
   </binding>
 
   <binding id="datepicker" extends="chrome://calendar/content/datetimepickers/datetimepickers.xml#datetimepicker-base">
     <!-- ::::::::::::::::: CONTENT ::::::::::::::::::::::::: -->
-    <!-- Desired behavior: when user is done editing the date field 
-         and either leaves the field (onblur) or closes the dialog 
+    <!-- Desired behavior: when user is done editing the date field
+         and either leaves the field (onblur) or closes the dialog
          (13 is enter/return key), parse the date and redisplay it
          in the date field using the current format to verify
          whether the date was parsed correctly.
          This cannot be done with textbox oninput, so use a workaround.
          This was done with textbox onkeypress="parseTextBoxDate(true)"
          and onblur="parseTextBoxDate(true)" which worked in Moz1.6, but
          no longer works in Moz1.7.
          Therefore constructor stores attribute kDatePicker on the textbox,
          and the onblur and onkeypress commands navigate to this kDatePicker.
          xul:Textbox contains an xul:hbox which contains html:input.
          Onkeypress and onblur are not documented attributes of xul:textbox,
          but become attributes of the html:input.
-         Not clear how to navigate from the textbox to the input, otherwise 
+         Not clear how to navigate from the textbox to the input, otherwise
          could put kDatePicker property on the input element.
          [document.getAnonymousNodes(textBox) fails as of Moz1.7b]).
          So navigate parents to textbox in order to call parseTextBoxDate.
          [this comment is outside the <content> so it won't become a
          node that interferes with navigation to interior nodes.] -->
     <resources>
       <stylesheet src="chrome://calendar/content/widgets/calendar-widget-bindings.css"/>
-    </resources>               
+    </resources>
     <content>
       <xul:hbox flex="1" id="hbox" class="datepicker-box-class">
         <xul:menulist editable="true" sizetopopup="false"
                       class="datepicker-text-class"
                       onchange="this.kDatePicker.parseTextBoxDate(true, event);"
                       onkeypress="if (event.keyCode == 13) this.kDatePicker.parseTextBoxDate(true);"
                       xbl:inherits="disabled">
           <xul:menupopup popupanchor="bottomright" popupalign="topright"
@@ -524,31 +524,31 @@
         </getter>
       </property>
 
     </implementation>
   </binding>
 
   <binding id="timepicker" extends="chrome://calendar/content/datetimepickers/datetimepickers.xml#datetimepicker-base">
     <!-- ::::::::::::::::: CONTENT ::::::::::::::::::::::::: -->
-    <!-- Desired behavior: when user is done editing the time field 
-         and either leaves the field (onblur) or closes the dialog 
+    <!-- Desired behavior: when user is done editing the time field
+         and either leaves the field (onblur) or closes the dialog
          (13 is enter/return key), parse the time and redisplay it
          in the time field using the current format to verify
          whether the time was parsed correctly.
          This cannot be done with textbox oninput, so use a workaround.
          This was done with textbox onkeypress="parseTextBoxTime(true)"
          and onblur="parseTextBoxTime(true)" which worked in Moz1.6, but
          no longer works in Moz1.7.
          Therefore constructor stores attribute kTimePicker on the textbox,
          and the onblur and onkeypress commands navigate to this kTimePicker.
          xul:Textbox contains an xul:hbox which contains html:input.
          Onkeypress and onblur are not documented attributes of xul:textbox,
          but become attributes of the html:input.
-         Not clear how to navigate from the textbox to the input, otherwise 
+         Not clear how to navigate from the textbox to the input, otherwise
          could put kTimePicker property on the input element.
          [document.getAnonymousNodes(textBox) fails as of Moz1.7b]).
          So navigate parents to textbox in order to call parseTextBoxTime.
          [this comment is outside the <content> so it won't become a
          node that interferes with navigation to interior nodes.] -->
     <content>
       <xul:hbox flex="1" id="hbox" class="timepicker-box-class">
         <xul:menulist editable="true" sizetopopup="false"
@@ -639,17 +639,17 @@
       </method>
 
       <method name="onPopup">
         <parameter name="aPopup" />
         <body>
           <![CDATA[
             // select all to remove cursor since can't type while popped-up
             this.select();
-            var timePickerGrid = aPopup.childNodes[0]; 
+            var timePickerGrid = aPopup.childNodes[0];
             timePickerGrid.onPopupShowing(this, aPopup);
           ]]>
         </body>
       </method>
 
       <method name="onHide">
         <parameter name="aPopup"/>
         <body>
@@ -687,17 +687,17 @@
   <binding id="timepicker-hour">
     <content>
       <xul:spacer flex="1"/>
       <xul:vbox anonid="hourbox"
                 onclick="clickHour(this.parentNode, this.parentNode.getAttribute('value'))"
                 ondblclick="doubleClickHour(this.parentNode, this.parentNode.getAttribute('value'))">
         <xul:box>
           <xul:label class="time-picker-hour-label" anonid="hourlabel" xbl:inherits="value=label,selected"/>
-        </xul:box> 
+        </xul:box>
         <xul:spacer flex="1"/>
       </xul:vbox>
       <xul:spacer flex="1"/>
     </content>
     <implementation>
       <field name="mPixelScrollDelta">0</field>
     </implementation>
     <handlers>
@@ -781,19 +781,19 @@
         event.preventDefault();
         ]]>
       </handler>
     </handlers>
   </binding>
 
   <binding id="timepicker-grids" extends="xul:box">
     <resources>
-      <stylesheet src="chrome://calendar/skin/datetimepickers/datetimepickers.css"/>
+      <stylesheet src="chrome://lightning-common/datetimepickers.css"/>
     </resources>
-    
+
     <!-- ::::::::::::::::: CONTENT ::::::::::::::::::::::::: -->
     <content>
       <!-- Box to hold time picker internals -->
       <vbox anonid="time-picker-grids"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
         <!-- Hour Grid -->
         <grid anonid="time-picker-hour-grid" format12hours="false">
           <columns>
@@ -826,17 +826,17 @@
               <timepicker-hour class="time-picker-hour-box-class" value="5"
                                anonid="time-picker-hour-box-5"    label="5"/>
               <timepicker-hour class="time-picker-hour-box-class" value="6"
                                anonid="time-picker-hour-box-6"    label="6"/>
               <timepicker-hour class="time-picker-hour-box-class" value="7"
                                anonid="time-picker-hour-box-7"    label="7"/>
               <timepicker-hour class="time-picker-hour-box-class" value="8"
                                anonid="time-picker-hour-box-8"    label="8"/>
-              <timepicker-hour class="time-picker-hour-box-class" value="9" 
+              <timepicker-hour class="time-picker-hour-box-class" value="9"
                                anonid="time-picker-hour-box-9"    label="9"/>
               <timepicker-hour class="time-picker-hour-box-class" value="10"
                                anonid="time-picker-hour-box-10"   label="10"/>
               <timepicker-hour class="time-picker-hour-box-class" value="11"
                                anonid="time-picker-hour-box-11"   label="11"/>
               <hbox anonid="amLabelBox"  class="timepicker-amLabelBox-class" hidden="true">
                 <label/>
               </hbox>
@@ -1088,17 +1088,17 @@
     <implementation>
       <constructor>
         <![CDATA[
           // set by onPopupShowing
           this.mPicker = null;
           this.mPopup = null;
 
           // The currently selected time
-          this.mSelectedTime = new Date(); 
+          this.mSelectedTime = new Date();
           // The selected hour and selected minute items
           this.mSelectedHourItem = null;
           this.mSelectedMinuteItem = null;
           // constants use to specify one and five minute view
           this.kMINUTE_VIEW_FIVE = 5;
           this.kMINUTE_VIEW_ONE = 1;
         ]]>
       </constructor>
@@ -1107,32 +1107,32 @@
       <method name="onPopupShowing">
         <parameter name="aPicker"/>
         <parameter name="aPopup"/>
         <body>
           <![CDATA[
             this.mPicker = aPicker;
             this.mPopup = aPopup;
 
-            // if there is a Date object in the popup item's 
+            // if there is a Date object in the popup item's
             // value attribute, use it, otherwise use Now.
             var inputTime = this.mPicker.value;
             if (inputTime) {
               this.mSelectedTime = new Date(inputTime);
             } else {
               this.mSelectedTime = new Date();
             }
 
             // select the hour item
             var hours24 = this.mSelectedTime.getHours();
             var hourItemId = "time-picker-hour-box-" + hours24;
             var hourItem = document.getAnonymousElementByAttribute(this, "anonid", hourItemId);
             this.selectHourItem( hourItem );
 
-            // Show the five minute view if we are an even five minutes, 
+            // Show the five minute view if we are an even five minutes,
             // otherwise one minute view
             var minutesByFive = this.calcNearestFiveMinutes( this.mSelectedTime );
 
             if (minutesByFive == this.mSelectedTime.getMinutes()) {
               this.clickLess();
             } else {
               this.clickMore();
             }
@@ -1167,19 +1167,19 @@
 
       <!-- Called when the less tab is clicked, and possibly at startup -->
       <method name="clickLess">
         <body>
           <![CDATA[
             // switch to five minute view
             this.switchMinuteView( this.kMINUTE_VIEW_FIVE );
 
-            // select closest five minute box, 
+            // select closest five minute box,
             // BUT leave the selected time at what may NOT be an even five minutes
-            // So that If they click more again the proper non-even-five minute 
+            // So that If they click more again the proper non-even-five minute
             // box will be selected
             var minutesByFive = this.calcNearestFiveMinutes(this.mSelectedTime);
             var fiveMinuteItemId = "time-picker-five-minute-box-"+minutesByFive;
             var fiveMinuteItem = document.getAnonymousElementByAttribute(this, "anonid", fiveMinuteItemId);
             this.selectMinuteItem(fiveMinuteItem);
           ]]>
         </body>
       </method>
@@ -1188,58 +1188,58 @@
       <method name="clickHour">
         <parameter name="hourItem"/>
         <parameter name="hourNumber"/>
         <body>
           <![CDATA[
             // select the item
             this.selectHourItem( hourItem );
 
-            // Change the hour in the selected time. 
+            // Change the hour in the selected time.
             this.mSelectedTime.setHours( hourNumber );
 
             this.hasChanged = true;
           ]]>
         </body>
       </method>
 
       <!-- Called when one of the hour boxes is double clicked
            Sets the time to the selected hour, on the hour, and closes the popup -->
       <method name="doubleClickHour">
         <parameter name="hourItem"/>
         <parameter name="hourNumber"/>
         <body>
           <![CDATA[
             // set the minutes to :00
             this.mSelectedTime.setMinutes(0);
-            
+
             // remove the popup grid
             this.mPopup.hidePopup();
           ]]>
         </body>
       </method>
-  
-      <!-- Called when one of the minute boxes is clicked, 
+
+      <!-- Called when one of the minute boxes is clicked,
            Calls the client's onchange and Closes the popup -->
       <method name="clickMinute">
         <parameter name="minuteItem"/>
         <parameter name="minuteNumber"/>
         <body>
           <![CDATA[
             // set the minutes in the selected time
             this.mSelectedTime.setMinutes(minuteNumber);
             this.selectMinuteItem(minuteItem);
             this.hasChanged = true;
             // remove the popup grid
             this.mPopup.hidePopup();
           ]]>
         </body>
       </method>
 
-      <!-- Called by clickMinute when one of the minute boxes is clicked, 
+      <!-- Called by clickMinute when one of the minute boxes is clicked,
            Sets the value property and calls the client's onchange. -->
       <method name="timeSelected">
         <body>
           <![CDATA[
             // Copy picked time to avoid problems changing Date object in place
             var pickedTime = new Date( this.mSelectedTime );
 
             // put the picked time in the value property, and update
@@ -1410,36 +1410,36 @@
 
     <!-- ::::::::::::::::: HANDLERS ::::::::::::::::::::::::: -->
 
     <handlers>
       <handler event="bindingattached" action="this.initialize();"/>
     </handlers>
 
   </binding>
-  
+
   <binding id="datetimepicker" extends="chrome://calendar/content/datetimepickers/datetimepickers.xml#datetimepicker-base"
            inherits="value,onchange,disabled,datepickerdisabled,timepickerdisabled">
     <!-- ::::::::::::::::: CONTENT ::::::::::::::::::::::::: -->
     <!-- onchange was simply "onDatePick()" in Moz1.6, but stopped working in Moz1.7
          so had to add navigation by parents. -->
     <content>
       <xul:hbox flex="1" anonid="hbox">
-        <xul:datepicker anonid="date-picker" 
+        <xul:datepicker anonid="date-picker"
                         onchange="this.parentNode.parentNode.onDatePick();"
                         xbl:inherits="value,disabled,disabled=datepickerdisabled"/>
-        <xul:timepicker anonid="time-picker" 
+        <xul:timepicker anonid="time-picker"
                         onchange="this.parentNode.parentNode.onTimePick();"
                         xbl:inherits="value,disabled,disabled=timepickerdisabled"/>
       </xul:hbox>
     </content>
 
     <!-- ::::::::::::::::: INTERFACE ::::::::::::::::::::::::: -->
     <implementation>
-      <property name="datepickerdisabled" 
+      <property name="datepickerdisabled"
                 onset="if (val) this.kDatePicker.setAttribute('disabled', 'true');
                        else this.kDatePicker.removeAttribute('disabled');"
                 onget="return this.kDatePicker.getAttribute('disabled')=='true';"/>
 
       <!-- timepicker may be disabled alone for all day events -->
       <property name="timepickerdisabled"
                 onset="if (val) this.kTimePicker.setAttribute('disabled', 'true');
                        else this.kTimePicker.removeAttribute('disabled');"
@@ -1458,17 +1458,17 @@
         ]]>
       </constructor>
 
       <method name="update">
         <parameter name="aValue"/>
         <parameter name="aRefresh"/>
         <body>
           <![CDATA[
-            if (aValue != null) {         
+            if (aValue != null) {
               this.mValue = aValue;
             }
             // set textBox.value property, not attribute
             this.kDatePicker.update(this.mValue, aRefresh);
             this.kTimePicker.update(this.mValue, aRefresh);
             if (aRefresh) {
               this.fireEvent("change");
             }
@@ -1524,40 +1524,40 @@
       <handler event="bindingattached" action="this.initialize();"/>
     </handlers>
 
   </binding>
 
   <binding id="datetimepicker-base" extends="chrome://global/content/bindings/general.xml#basecontrol"
            inherits="value,onchange">
     <resources>
-      <stylesheet src="chrome://calendar/skin/datetimepickers/datetimepickers.css"/>
+      <stylesheet src="chrome://lightning-common/datetimepickers.css"/>
     </resources>
     <implementation>
       <constructor>
         <![CDATA[
           this.initDateFormat();
           this.initTimeFormat();
         ]]>
       </constructor>
 
-      <property name="value" 
+      <property name="value"
                 onget="return this.mValue"
                 onset="this.update(val, false)"/>
 
-      <property name="lastDateParseIncludedTime" 
+      <property name="lastDateParseIncludedTime"
                 onget="return this.mLastDateParseIncludedTime;"
                 onset="this.mLastDateParseIncludedTime = val;" />
 
       <method name="update">
         <parameter name="aValue"/>
         <parameter name="aRefresh"/>
         <body>
           <![CDATA[
-            if (aValue != null) {         
+            if (aValue != null) {
               this.mValue = aValue;
             }
           ]]>
         </body>
       </method>
 
       <method name="fireEvent">
         <parameter name="aEventName"/>
@@ -1568,17 +1568,17 @@
             event.initEvent(aEventName, true, true);
             event.detail = aDetail;
             this.dispatchEvent(event);
           ]]>
         </body>
       </method>
 
       <!-- Parameter aValue may be a date or a date time. Dates are
-           read according to locale/OS setting (d-m-y or m-d-y or ...). 
+           read according to locale/OS setting (d-m-y or m-d-y or ...).
            (see initDateFormat). Uses parseTime() for times.
       -->
       <method name="parseDateTime">
         <parameter name="aValue"/>
         <body>
           <![CDATA[
             this.mLastDateParseIncludedTime = false;
             var tempDate = null;
@@ -1601,17 +1601,17 @@
               }
             } else {
               // SHORT DATE WITH ALPHABETIC MONTH, such as "dd MMM yy" or "MMMM dd, yyyy"
               // (\d+|[^\d\W]) is digits or letters, not both together.
               // Allows 31dec1999 (no delimiters between parts) if OS does (w2k does not).
               // Allows Dec 31, 1999 (comma and space between parts)
               // (Only accepts ASCII month names; JavaScript RegExp does not have an
               // easy way to describe unicode letters short of a HUGE character range
-              // regexp derived from the Alphabetic ranges in 
+              // regexp derived from the Alphabetic ranges in
               // http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt)
               // (.*)? binds to null if no suffix.
               var parseAlphShortDateRegex = /^\s*(\d+|[^\d\W]+)\W{0,2}(\d+|[^\d\W]+)\W{0,2}(\d+|[^\d\W]+)(.*)?$/;
               var datePartsArray = parseAlphShortDateRegex.exec(aValue);
               if (datePartsArray != null) {
                 year = Number(datePartsArray[this.yearIndex]);
                 var monthString = datePartsArray[this.monthIndex].toUpperCase();
                 for (var m = 0; m < this.alphaMonths.length; m++) {
@@ -1651,17 +1651,17 @@
                 }
               }
               tempDate = new Date(year, month, day, hours, minutes, seconds, 0);
             } //else did not match regex, not a valid date
             return tempDate;
           ]]>
         </body>
       </method>
-      
+
       <!-- Parse a variety of time formats so that cut and paste is likely to work.
            separator:            ':'         '.'        ' '        symbol        none
                                  "12:34:56"  "12.34.56" "12 34 56" "12h34m56s"   "123456"
            seconds optional:     "02:34"     "02.34"    "02 34"    "02h34m"      "0234"
            minutes optional:     "12"        "12"       "12"       "12h"         "12"
            1st hr digit optional:"9:34"      " 9.34"     "9 34"     "9H34M"       "934am"
            skip nondigit prefix  " 12:34"    "t12.34"   " 12 34"   "T12H34M"     "T0234"
            am/pm optional        "02:34 a.m.""02.34pm"  "02 34 A M" "02H34M P.M." "0234pm"
@@ -1734,99 +1734,99 @@
                     ampmCode = "PM";
                   } // else no match, ignore and treat as 24hour time.
                 }
               }
               if (ampmCode == "AM") {
                 if (hours == 12)
                   hours = 0;
               } else if (ampmCode == "PM") {
-                if (hours < 12) 
+                if (hours < 12)
                   hours += 12;
               }
               time = new Date(0, 0, 0, hours, minutes, seconds, 0);
             }  // else did not match regex, not valid time
             return time;
           ]]>
         </body>
       </method>
-      
+
       <method name="initDateFormat">
         <body>
           <![CDATA[
-            // probe the dateformat  
+            // probe the dateformat
             this.yearIndex = -1;
             this.monthIndex = -1;
             this.dayIndex = -1;
             this.twoDigitYear = false;
             this.alphaMonths = null;
             this.probeSucceeded = false;
             this.mLastDateParseIncludedTime = false;
 
             // SHORT NUMERIC DATE, such as 2002-03-04, 4/3/2002, or CE2002Y03M04D.
             // Made of digits & nonDigits.  (Nondigits may be unicode letters
             // which do not match \w, esp. in CJK locales.)
             this.parseShortDateRegex = /^\D*(\d+)\D+(\d+)\D+(\d+)\D?$/;
             var probeDate = new Date(2002,3-1,4); // month is 0-based
             var probeString = this.formatDate(probeDate);
             var probeArray = this.parseShortDateRegex.exec(probeString);
-            if (probeArray != null) { 
+            if (probeArray != null) {
               // Numeric month format
-              for (var i = 1; i <= 3; i++) { 
+              for (var i = 1; i <= 3; i++) {
                 switch (Number(probeArray[i])) {
                   case 2:    this.twoDigitYear = true; // fall thru
                   case 2002: this.yearIndex = i;       break;
                   case 3:    this.monthIndex = i;      break;
                   case 4:    this.dayIndex = i;        break;
                 }
               }
               // All three indexes are set (not -1) at this point.
               this.probeSucceeded = true;
             } else {
               // SHORT DATE WITH ALPHABETIC MONTH, such as "dd MMM yy" or "MMMM dd, yyyy"
               // (\d+|[^\d\W]) is digits or letters, not both together.
               // Allows 31dec1999 (no delimiters between parts) if OS does (w2k does not).
               // Allows Dec 31, 1999 (comma and space between parts)
               // (Only accepts ASCII month names; JavaScript RegExp does not have an
               // easy way to describe unicode letters short of a HUGE character range
-              // regexp derived from the Alphabetic ranges in 
+              // regexp derived from the Alphabetic ranges in
               // http://www.unicode.org/Public/UNIDATA/DerivedCoreProperties.txt)
               this.parseShortDateRegex = /^\s*(\d+|[^\d\W]+)\W{0,2}(\d+|[^\d\W]+)\W{0,2}(\d+|[^\d\W]+)\s*$/;
               probeArray = this.parseShortDateRegex.exec(probeString);
               if (probeArray != null) {
-                for (var j = 1; j <= 3; j++) { 
+                for (var j = 1; j <= 3; j++) {
                   switch (Number(probeArray[j])) {
                     case 2:    this.twoDigitYear = true; // fall thru
                     case 2002: this.yearIndex = j;       break;
                     case 4:    this.dayIndex = j;        break;
                     default:   this.monthIndex = j;      break;
                   }
                 }
                 if (this.yearIndex != -1 && this.dayIndex != -1 && this.monthIndex != -1) {
                   this.probeSucceeded = true;
                   // Fill this.alphaMonths with month names.
                   this.alphaMonths = new Array(12);
                   for (var m = 0; m < 12; m++) {
                     probeDate.setMonth(m);
                     probeString = this.formatDate(probeDate);
                     probeArray = this.parseShortDateRegex.exec(probeString);
-                    if (probeArray != null) 
+                    if (probeArray != null)
                       this.alphaMonths[m] = probeArray[this.monthIndex].toUpperCase();
                     else
                       this.probeSucceeded = false;
                   }
                 }
               }
             }
             if (! this.probeSucceeded)
               dump("\nOperating system short date format is not recognized: "+probeString+"\n");
           ]]>
         </body>
       </method>
-      
+
       <!-- Time format in 24-hour format or 12-hour format with am/pm string.
            Should match formats
                 HH:mm,       H:mm,       HH:mm:ss,       H:mm:ss
                 hh:mm tt,    h:mm tt,    hh:mm:ss tt,    h:mm:ss tt
              tt hh:mm,    tt h:mm,    tt hh:mm:ss,    tt h:mm:ss
            where
            HH is 24 hour digits, with leading 0.  H is 24 hour digits, no leading 0.
            hh is 12 hour digits, with leading 0.  h is 12 hour digits, no leading 0.
@@ -1834,22 +1834,22 @@
            tt is localized AM or PM string.
            ':' may be ':' or a units marker such as 'h', 'm', or 's' in  15h12m00s
            or may be omitted as in 151200.
       -->
       <method name="initTimeFormat">
         <body>
           <![CDATA[
             // probe the Time format
-            this.ampmIndex = null;  
+            this.ampmIndex = null;
             // Digits         HR       sep      MIN     sep      SEC     sep
-            //   Index:       2        3        4       5        6       7    
+            //   Index:       2        3        4       5        6       7
             var digitsExpr = "(\\d?\\d)(\\D)?(?:(\\d\\d)(\\D)?(?:(\\d\\d)(\\D)?)?)?";
             // any letters or '.': non-digit alphanumeric, period (a.m.), or space (P M)
-            var anyAmPmExpr = "(?:[^\\d\\W]|[. ])+"; 
+            var anyAmPmExpr = "(?:[^\\d\\W]|[. ])+";
             // digitsExpr has 6 captures, so index of first ampmExpr is 1, of last is 8.
             var probeTimeRegExp =
               new RegExp("^("+anyAmPmExpr+")?\\s?"+digitsExpr+"("+anyAmPmExpr+")?\\s*$");
             const PRE_INDEX=1, HR_INDEX=2, MIN_INDEX=4, SEC_INDEX=6, POST_INDEX=8;
             var amProbeTime = new Date(2000,0,1,6,12,34);
             var amProbeString = amProbeTime.toLocaleFormat("%X");
             var pmProbeTime = new Date(2000,0,1,18,12,34);
             var pmProbeString = pmProbeTime.toLocaleFormat("%X");
@@ -1863,17 +1863,17 @@
                   this.ampmIndex = PRE_INDEX;
                 } else if (amProbeArray[POST_INDEX] && pmProbeArray[POST_INDEX]) {
                   if (amProbeArray[POST_INDEX] != pmProbeArray[POST_INDEX]) {
                     this.ampmIndex = POST_INDEX;
                   } else {
                     // check if need to append previous character,
                     // captured by the optional separator pattern after seconds digits,
                     // or after minutes if no seconds, or after hours if no minutes.
-                    for (var k = SEC_INDEX; k >= HR_INDEX; k -= 2) { 
+                    for (var k = SEC_INDEX; k >= HR_INDEX; k -= 2) {
                       var nextSepI = k + 1;
                       var nextDigitsI = k + 2;
                       if ((k == SEC_INDEX ||
                            (!amProbeArray[nextDigitsI] && !pmProbeArray[nextDigitsI]))
                           && amProbeArray[nextSepI] && pmProbeArray[nextSepI]
                           && amProbeArray[nextSepI] != pmProbeArray[nextSepI])
                       {
                         amProbeArray[POST_INDEX] =
@@ -1896,17 +1896,17 @@
                     var uppercased = string.toUpperCase();
                     if (string != uppercased)
                       regExp += "|"+uppercased;
                     return regExp;
                   };
                   amFormatExpr = makeFormatRegExp(amProbeArray[this.ampmIndex]);
                   pmFormatExpr = makeFormatRegExp(pmProbeArray[this.ampmIndex]);
                 }
-              } 
+              }
             }
             // International formats ([roman, cyrillic]|arabic|chinese/kanji characters)
             // covering languages of U.N. (en,fr,sp,ru,ar,zh) and G8 (en,fr,de,it,ru,ja).
             // See examples at parseTimeOfDay.
             var amExpr =
               "[Aa\u0410\u0430][. ]?[Mm\u041c\u043c][. ]?|\u0635|\u4e0a\u5348|\u5348\u524d";
             var pmExpr =
               "[Pp\u0420\u0440][. ]?[Mm\u041c\u043c][. ]?|\u0645|\u4e0b\u5348|\u5348\u5f8c";
@@ -1966,11 +1966,11 @@
           <![CDATA[
             // remove leading zero in hours before colon in xx01:23pmxx
             return aValue.toLocaleFormat(this.kTimeFormatString).replace(/0(\d):/,"$1:");
           ]]>
         </body>
       </method>
     </implementation>
   </binding>
-  
+
 </bindings>
 
deleted file mode 100644
--- a/calendar/resources/jar.mn
+++ /dev/null
@@ -1,21 +0,0 @@
-#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/.
-
-calendar.jar:
-% content calendar %content/calendar/
-    content/calendar/calendarCreation.xul                  (content/calendarCreation.xul)
-    content/calendar/calendarCreation.js                   (content/calendarCreation.js)
-    content/calendar/publish.js                            (content/publish.js)
-    content/calendar/publishDialog.js                      (content/publishDialog.js)    
-    content/calendar/publishDialog.xul                     (content/publishDialog.xul)
-    content/calendar/mouseoverPreviews.js                  (content/mouseoverPreviews.js)
-    content/calendar/sound.wav                             (content/sound.wav)
-    content/calendar/datetimepickers/datetimepickers.css   (content/datetimepickers/datetimepickers.css)
-    content/calendar/datetimepickers/datetimepickers.xml   (content/datetimepickers/datetimepickers.xml)
-% skin calendar classic/1.0 %skin/calendar/
-    skin/calendar/dialogOverlay.css                        (skin/classic/dialogOverlay.css)
-    skin/calendar/datetimepickers/datetimepickers.css      (skin/classic/datetimepickers/datetimepickers.css)
-    skin/calendar/preferences/Options.png                  (/calendar/base/themes/@THEME@/preferences/Options.png)
-    skin/calendar/preferences/preferences.css              (/calendar/base/themes/@THEME@/preferences/preferences.css)
--- a/calendar/resources/moz.build
+++ b/calendar/resources/moz.build
@@ -1,15 +1,13 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-JAR_MANIFESTS += ['jar.mn']
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'windows'
 
 if CONFIG['MOZ_UPDATER']:
     DEFINES['MOZ_UPDATER'] = 1
 
rename from calendar/resources/skin/classic/datetimepickers/datetimepickers.css
rename to calendar/resources/skin/datetimepickers.css
rename from calendar/resources/skin/classic/dialogOverlay.css
rename to calendar/resources/skin/dialogOverlay.css
--- a/calendar/resources/skin/classic/dialogOverlay.css
+++ b/calendar/resources/skin/dialogOverlay.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/. */
 
 .field-label-box-class {
-  text-align   : right;
-  -moz-margin-end : 3px;
+  text-align: right;
+  margin-inline-end: 3px;
 }