diff --git a/calendar/lightning/jar.mn b/calendar/lightning/jar.mn
index 5d47c219977..5901a97ca31 100644
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -21,14 +21,10 @@ calendar.jar:
   content/calendar/dateUtils.js			(/calendar/resources/content/dateUtils.js)
   content/calendar/selectAddressesDialog.js	(/calendar/resources/content/selectAddressesDialog.js)
   content/calendar/attachFile.js		(/calendar/resources/content/attachFile.js)
-  content/calendar/datetimepickers/datepicker.css (/calendar/resources/content/datetimepickers/datepicker.css)
-  content/calendar/datetimepickers/datepicker.xbl (/calendar/resources/content/datetimepickers/datepicker.xbl)
-  content/calendar/datetimepickers/datetimepicker.css (/calendar/resources/content/datetimepickers/datetimepicker.css)
-  content/calendar/datetimepickers/datetimepicker.xbl (/calendar/resources/content/datetimepickers/datetimepicker.xbl)
-  content/calendar/datetimepickers/timepicker.css (/calendar/resources/content/datetimepickers/timepicker.css)
-  content/calendar/datetimepickers/timepicker.xbl (/calendar/resources/content/datetimepickers/timepicker.xbl)
+  content/calendar/datetimepickers/datetimepickers.css (/calendar/resources/content/datetimepickers/datetimepickers.css)
+  content/calendar/datetimepickers/datetimepickers.xml (/calendar/resources/content/datetimepickers/datetimepickers.xml)
   content/calendar/datetimepickers/minimonth.css (/calendar/resources/content/datetimepickers/minimonth.css)
-  content/calendar/datetimepickers/minimonth.xbl (/calendar/resources/content/datetimepickers/minimonth.xbl)
+  content/calendar/datetimepickers/minimonth.xml (/calendar/resources/content/datetimepickers/minimonth.xml)
   content/calendar/calendar-multiday-view.css	(/calendar/base/content/calendar-multiday-view.css)
   content/calendar/calendar-multiday-view.xml	(/calendar/base/content/calendar-multiday-view.xml)
   content/calendar/calendar-item-editing.js	(/calendar/base/content/calendar-item-editing.js)
@@ -56,3 +52,9 @@ classic.jar:
 #expand  skin/classic/calendar/all_day_event_hover.png	(/calendar/resources/skin/classic/all_day_event_hover.png)
 #expand  skin/classic/calendar/all_day_event_down.png	(/calendar/resources/skin/classic/all_day_event_down.png)
 #expand  skin/classic/calendar/week-view-corner.png	(/calendar/resources/skin/classic/week-view-corner.png)
+#expand  skin/classic/calendar/datetimepickers/datetimepickers.css (/calendar/resources/skin/classic/datetimepickers/datetimepickers.css)
+#expand  skin/classic/calendar/datetimepickers/minimonth.css (/calendar/resources/skin/classic/datetimepickers/minimonth.css)
+#expand  skin/classic/calendar/datetimepickers/left-arrow-hover.gif (/calendar/resources/skin/classic/datetimepickers/left-arrow-hover.gif)
+#expand  skin/classic/calendar/datetimepickers/left-arrow.gif (/calendar/resources/skin/classic/datetimepickers/left-arrow.gif)
+#expand  skin/classic/calendar/datetimepickers/right-arrow-hover.gif (/calendar/resources/skin/classic/datetimepickers/right-arrow-hover.gif)
+#expand  skin/classic/calendar/datetimepickers/right-arrow.gif (/calendar/resources/skin/classic/datetimepickers/right-arrow.gif)
diff --git a/calendar/resources/content/datetimepickers/datepicker.css b/calendar/resources/content/datetimepickers/datepicker.css
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/datetimepickers/datepicker.xbl b/calendar/resources/content/datetimepickers/datepicker.xbl
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/datetimepickers/datetimepicker.css b/calendar/resources/content/datetimepickers/datetimepicker.css
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/datetimepickers/datetimepicker.xbl b/calendar/resources/content/datetimepickers/datetimepicker.xbl
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/datetimepickers/minimonth.css b/calendar/resources/content/datetimepickers/minimonth.css
index fee193e1e82..b973c1863e4 100755
--- a/calendar/resources/content/datetimepickers/minimonth.css
+++ b/calendar/resources/content/datetimepickers/minimonth.css
@@ -1,14 +1,14 @@
 @import url("chrome://calendar/skin/datetimepickers/minimonth.css");
 
 minimonth {
-	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xbl#minimonth");
+	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xml#minimonth");
 }
 
 .minimonth-navbtn {
-	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xbl#minimonth-navbtn");
+	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xml#minimonth-navbtn");
 }
 
 .minimonth-day {
-	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xbl#minimonth-day");
+	-moz-binding: url("chrome://calendar/content/datetimepickers/minimonth.xml#minimonth-day");
 }
 
diff --git a/calendar/resources/content/datetimepickers/minimonth.xbl b/calendar/resources/content/datetimepickers/minimonth.xbl
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/datetimepickers/timepicker.css b/calendar/resources/content/datetimepickers/timepicker.css
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/datetimepickers/timepicker.xbl b/calendar/resources/content/datetimepickers/timepicker.xbl
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/calendar/resources/content/eventDialog.xul b/calendar/resources/content/eventDialog.xul
index e6e6cd95b07..00c34d7a7c8 100644
--- a/calendar/resources/content/eventDialog.xul
+++ b/calendar/resources/content/eventDialog.xul
@@ -44,7 +44,7 @@
 
 <!-- CSS File with all styles specific to the dialog -->
 <?xml-stylesheet href="chrome://calendar/skin/eventDialog.css" ?>
-<?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepicker.css" ?>
+<?xml-stylesheet href="chrome://calendar/content/datetimepickers/datetimepickers.css" ?>
 
 <!-- CSS for selecting contacts to invite to event -->
 <?xml-stylesheet href="chrome://calendar/skin/selectAddresses.css" ?>
diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn
index 0ac033c160f..7b0638a2993 100644
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -63,14 +63,10 @@ calendar.jar:
     content/calendar/converters/xcs2ics.xsl (content/converters/xcs2ics.xsl)
     content/calendar/converters/xcs2rdf.xsl (content/converters/xcs2rdf.xsl)
     content/calendar/converters/xml2xcs.xsl (content/converters/xml2xcs.xsl)
-    content/calendar/datetimepickers/datepicker.css (content/datetimepickers/datepicker.css)
-    content/calendar/datetimepickers/datepicker.xbl (content/datetimepickers/datepicker.xbl)
-    content/calendar/datetimepickers/datetimepicker.css (content/datetimepickers/datetimepicker.css)
-    content/calendar/datetimepickers/datetimepicker.xbl (content/datetimepickers/datetimepicker.xbl)
-    content/calendar/datetimepickers/timepicker.css (content/datetimepickers/timepicker.css)
-    content/calendar/datetimepickers/timepicker.xbl (content/datetimepickers/timepicker.xbl)
+    content/calendar/datetimepickers/datetimepickers.css (content/datetimepickers/datetimepickers.css)
+    content/calendar/datetimepickers/datetimepickers.xml (content/datetimepickers/datetimepickers.xml)
     content/calendar/datetimepickers/minimonth.css (content/datetimepickers/minimonth.css)
-    content/calendar/datetimepickers/minimonth.xbl (content/datetimepickers/minimonth.xbl)
+    content/calendar/datetimepickers/minimonth.xml (content/datetimepickers/minimonth.xml)
     content/calendar/pref/pref.xul (content/pref/pref.xul)
     content/calendar/pref/alarmPrefs.xul (content/pref/alarmPrefs.xul)
     content/calendar/pref/calendarPref.xul (content/pref/calendarPref.xul)
@@ -123,8 +119,7 @@ calendar.jar:
     skin/classic/calendar/taskbar-calalarm.gif (skin/classic/taskbar-calalarm.gif)
     skin/classic/calendar/taskbar-calalarm-act.gif (skin/classic/taskbar-calalarm-act.gif)
     skin/classic/calendar/week-view-corner.png (skin/classic/week-view-corner.png)
-    skin/classic/calendar/datetimepickers/datepicker.css (skin/classic/datetimepickers/datepicker.css)
-    skin/classic/calendar/datetimepickers/timepicker.css (skin/classic/datetimepickers/timepicker.css)
+    skin/classic/calendar/datetimepickers/datetimepickers.css (skin/classic/datetimepickers/datetimepickers.css)
     skin/classic/calendar/datetimepickers/minimonth.css (skin/classic/datetimepickers/minimonth.css)
     skin/classic/calendar/datetimepickers/left-arrow-hover.gif (skin/classic/datetimepickers/left-arrow-hover.gif)
     skin/classic/calendar/datetimepickers/left-arrow.gif (skin/classic/datetimepickers/left-arrow.gif)
@@ -162,8 +157,7 @@ calendar.jar:
     skin/modern/calendar/taskbar-calalarm.gif (skin/modern/taskbar-calalarm.gif)
     skin/modern/calendar/taskbar-calalarm-act.gif (skin/modern/taskbar-calalarm-act.gif)
     skin/modern/calendar/week-view-corner.png (skin/modern/week-view-corner.png)
-    skin/modern/calendar/datetimepickers/datepicker.css (skin/modern/datetimepickers/datepicker.css)
-    skin/modern/calendar/datetimepickers/timepicker.css (skin/modern/datetimepickers/timepicker.css)
+    skin/modern/calendar/datetimepickers/datetimepickers.css (skin/modern/datetimepickers/datetimepickers.css)
     skin/modern/calendar/datetimepickers/minimonth.css (skin/modern/datetimepickers/minimonth.css)
     skin/modern/calendar/datetimepickers/left-arrow-hover.gif (skin/modern/datetimepickers/left-arrow-hover.gif)
     skin/modern/calendar/datetimepickers/left-arrow.gif (skin/modern/datetimepickers/left-arrow.gif)