diff --git a/calendar/base/jar.mn b/calendar/base/jar.mn
index db6bee5db4..b0314d4da4 100644
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -166,11 +166,14 @@ calendar.jar:
 
 # The following files are added for aero support on windows.
 #ifdef XP_WIN
-% style chrome://calendar/content/calendar-common-sets.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
-% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
-% style chrome://calendar/content/calendar-occurrence-prompt.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
-% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar-aero.css os=WINNT osversion>=6
-    skin/calendar/calendar-aero.css                        (themes/@THEME@/calendar-aero.css)
+% style chrome://calendar/content/calendar-event-dialog.xul chrome://calendar-windows/skin/calendar.css os=WINNT osversion>=6
+% style chrome://calendar/content/calendar-occurrence-prompt.xul chrome://calendar-windows/skin/calendar.css os=WINNT osversion>=6
+% skin calendar-windows classic/1.0 chrome/calendar/skin/calendar/win-classic/ os=WINNT osversion<6
+% skin calendar-windows classic/1.0 chrome/calendar/skin/calendar/win-aero/ os=WINNT osversion>=6
+    skin/calendar/win-classic/calendar.css                 (themes/@THEME@/win-classic/calendar.css)
+    skin/calendar/win-classic/lightning.css                (themes/@THEME@/win-classic/lightning.css)
+    skin/calendar/win-aero/calendar.css                    (themes/@THEME@/win-aero/calendar.css)
+    skin/calendar/win-aero/lightning.css                   (themes/@THEME@/win-aero/lightning.css)
     skin/calendar/calendar-event-dialog-toolbar-aero.png   (themes/@THEME@/dialogs/images/calendar-event-dialog-toolbar-aero.png)
     skin/calendar/calendar-occurrence-prompt-aero.png      (themes/@THEME@/images/calendar-occurrence-prompt-aero.png)
     skin/calendar/tasks-actions-aero.png                   (themes/@THEME@/images/tasks-actions-aero.png)
diff --git a/calendar/base/themes/winstripe/calendar-task-view.css b/calendar/base/themes/winstripe/calendar-task-view.css
index 143a465890..8b11b3d20b 100644
--- a/calendar/base/themes/winstripe/calendar-task-view.css
+++ b/calendar/base/themes/winstripe/calendar-task-view.css
@@ -36,6 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@import url(chrome://calendar-windows/skin/calendar.css);
+
 #calendar-task-view-splitter {
     border: none;
     min-height: 5px;
diff --git a/calendar/base/themes/winstripe/calendar-aero.css b/calendar/base/themes/winstripe/win-aero/calendar.css
similarity index 83%
rename from calendar/base/themes/winstripe/calendar-aero.css
rename to calendar/base/themes/winstripe/win-aero/calendar.css
index 194dd844c0..f50f6fef50 100644
--- a/calendar/base/themes/winstripe/calendar-aero.css
+++ b/calendar/base/themes/winstripe/win-aero/calendar.css
@@ -35,27 +35,27 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#task-actions-category {
-    list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
-    -moz-image-region: rect(0 18px 18px 0);
+#task-actions-toolbar > #task-actions-category {
+  list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+  -moz-image-region: rect(0 18px 18px 0);
 }
 
-#task-actions-markcompleted {
-    list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
-    -moz-image-region: rect(0 34px 18px 18px);
+#task-actions-toolbar > #task-actions-markcompleted {
+  list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+  -moz-image-region: rect(0 34px 18px 18px);
 }
 
-#task-actions-priority {
-    list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
-    -moz-image-region: rect(0 52px 18px 34px);
+#task-actions-toolbar > #task-actions-priority {
+  list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+  -moz-image-region: rect(0 52px 18px 34px);
 }
 
-#calendar-delete-task-button {
-    list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png);
-    -moz-image-region: rect(0 144px 18px 126px);
+#task-actions-toolbar > #calendar-delete-task-button {
+  list-style-image: url(chrome://messenger/skin/icons/mail-toolbar.png);
+  -moz-image-region: rect(0 144px 18px 126px);
 }
 
-#calendar-add-task-button {
+#task-actions-toolbar > #calendar-add-task-button {
   list-style-image: url(chrome://calendar/skin/toolbar-small-aero.png);
 }
 
@@ -91,11 +91,13 @@
   }
 
   #unifinder-search-results-tree > treechildren::-moz-tree-row,
-  #calendar-task-tree > .calendar-task-tree > treechildren::-moz-tree-row {
-    border-bottom: 2px solid transparent;
+  #calendar-task-box
+      #calendar-task-tree > .calendar-task-tree > treechildren::-moz-tree-row {
+    border-bottom: 1px solid transparent;
   }
 
-  #calendar-task-tree > .calendar-task-tree > treechildren::-moz-tree-cell {
+  #calendar-task-box
+      #calendar-task-tree > .calendar-task-tree > treechildren::-moz-tree-cell {
     border-right: 1px solid transparent;
   }
 }
@@ -164,8 +166,8 @@
 }
 
 #today-pane-splitter,
-#calendar-view-splitter,
-#calendar-task-view-splitter {
+#calendar-view-box #calendar-view-splitter,
+#calendar-task-box #calendar-task-view-splitter {
   border: none;
   border-bottom: 1px solid #A9B7C9;
   min-height: 0;
@@ -176,8 +178,13 @@
   z-index: 10;
 }
 
+#calendar-nav-control,
+#calendar-task-details-container {
+  border-top-width: 0 !important;
+}
+
 #today-pane-panel {
-  -moz-border-start-width: 0;
+  -moz-border-start-width: 0 !important;
 }
 
 @media all and (-moz-windows-compositor) {
@@ -216,7 +223,7 @@
 #event-toolbar {
   -moz-appearance: none;
   border-style: none;
-  background-color: transparent;
+  background-color: transparent
 }
 
 #event-toolbar[iconsize="small"] .toolbarbutton-1 .toolbarbutton-icon {
diff --git a/calendar/lightning/themes/winstripe/lightning-aero.css b/calendar/base/themes/winstripe/win-aero/lightning.css
similarity index 92%
rename from calendar/lightning/themes/winstripe/lightning-aero.css
rename to calendar/base/themes/winstripe/win-aero/lightning.css
index 1814803ea7..0ee65c93a1 100644
--- a/calendar/lightning/themes/winstripe/lightning-aero.css
+++ b/calendar/base/themes/winstripe/win-aero/lightning.css
@@ -46,7 +46,7 @@
 .tabmail-tab[type="tasks"],
 #lightning-button-calendar,
 #lightning-button-tasks {
-  list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
+  list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png) !important;
 }
 
 #lightning-button-calendar,
@@ -68,8 +68,8 @@
   margin: 1px;
 }
 
-#newMsgButton-calendar-menuitem,
-#newMsgButton-task-menuitem,
-#calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
+#button-newmsg #newMsgButton-calendar-menuitem,
+#button-newmsg #newMsgButton-task-menuitem,
+#calendar-show-todaypane-panel > #calendar-status-todaypane-button > stack > .toolbarbutton-icon-begin {
   list-style-image: url(chrome://calendar/skin/toolbar-small-aero.png);
 }
diff --git a/calendar/base/themes/winstripe/win-classic/calendar.css b/calendar/base/themes/winstripe/win-classic/calendar.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/calendar/base/themes/winstripe/win-classic/lightning.css b/calendar/base/themes/winstripe/win-classic/lightning.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/calendar/lightning/themes/winstripe/lightning.css b/calendar/lightning/themes/winstripe/lightning.css
index bed4ceb5d3..960b59f56b 100644
--- a/calendar/lightning/themes/winstripe/lightning.css
+++ b/calendar/lightning/themes/winstripe/lightning.css
@@ -39,6 +39,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+@import url(chrome://calendar-windows/skin/lightning.css);
+
 #calsidebar_splitter {
     border-right: none;
 }