--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -48,16 +48,17 @@ lightning.jar:
     content/lightning/suite-overlay-sidebar.xul            (content/suite-overlay-sidebar.xul)
 % skin lightning classic/1.0 %skin/lightning/
 % style chrome://global/content/customizeToolbar.xul chrome://lightning/skin/lightning-toolbar.css
     skin/lightning/accountCentral.css                      (themes/@THEME@/accountCentral.css)
     skin/lightning/imip.css                                (themes/@THEME@/imip.css)
     skin/lightning/lightning.css                           (themes/@THEME@/lightning.css)
     skin/lightning/lightning-toolbar.css                   (themes/@THEME@/lightning-toolbar.css)
     skin/lightning/lightning-widgets.css                   (themes/@THEME@/lightning-widgets.css)
+    skin/lightning/common/imip.css                         (themes/common/imip.css)
     skin/lightning/suite-accountCentral.css                (themes/common/suite-accountCentral.css)
     skin/lightning/mode-switch-icons.png                   (themes/common/images/mode-switch-icons.png)
 #ifdef XP_WIN
     skin/lightning/mode-switch-icons-aero.png              (themes/winstripe/images/mode-switch-icons-aero.png)
     skin/lightning/mode-switch-icons-inverted.png          (themes/winstripe/images/mode-switch-icons-inverted.png)
 #endif
 
 

new file mode 100644
--- /dev/null
+++ b/calendar/lightning/themes/common/imip.css
@@ -0,0 +1,38 @@
+/* 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/. */
+
+table {
+       border: 3px solid -moz-default-color;
+       border-collapse: collapse;
+       width: 40em;
+       -moz-margin-start: auto;
+       -moz-margin-end: auto;
+}
+td {
+       padding: 3px;
+       vertical-align: top;
+       width: 2em;
+       text-align: left;
+}
+td.header {
+       background-color: Highlight;
+}
+td.description {
+       width: 9em;
+       text-align: right;
+       -moz-border-end: 1px solid rgba(255, 255, 255, 0.2);
+       background-color: rgba(0, 0, 0, 0.2);
+}
+td.content {
+       width: 29em;
+       background-color: -moz-default-background-color;
+}
+td.content p {
+       white-space: pre-wrap;
+}
+p.header {
+       color: HighlightText;
+       font-size: 1em;
+       font-weight: bold;
+}

--- a/calendar/lightning/themes/gnomestripe/imip.css
+++ b/calendar/lightning/themes/gnomestripe/imip.css
@@ -1,70 +1,5 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: 20; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Lightning code.
- *
- * The Initial Developer of the Original Code is the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Clint Talbert <cmtalbert@myfastmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
-table {
-       background-color: #f0ece4;
-       border: 3px solid black;
-       border-collapse: collapse;
-       width: 40em;
-       -moz-margin-start: auto;
-       -moz-margin-end: auto;
-}
-td {
-       padding: 3px;
-       vertical-align: top;
-       width: 2em;
-       text-align: left;
-}
-td.header {
-       background-color: #0a6cd0;
-}
-td.description {
-       width: 9em;
-       text-align: right;
-}
-td.content {
-       width: 29em;
-       background-color: white;
-}
-td.content p {
-       white-space: pre-wrap;
-}
-p.header {
-       color: white;
-       font-size: 1em;
-       font-weight: bold;
-}
+@import url(chrome://lightning/skin/common/imip.css);

--- a/calendar/lightning/themes/pinstripe/imip.css
+++ b/calendar/lightning/themes/pinstripe/imip.css
@@ -1,69 +1,10 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: 20; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Lightning code.
- *
- * The Initial Developer of the Original Code is the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Clint Talbert <cmtalbert@myfastmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url(chrome://lightning/skin/common/imip.css);
 
 table {
-       background-color: #f0ece4;
-       border: 3px solid black;
-       border-collapse: collapse;
-       width: 40em;
-       margin: 1em auto;
-}
-td {
-       padding: 3px;
-       vertical-align: top;
-       width: 2em;
-       text-align: left;
-}
-td.header {
-       background-color: #0a6cd0;
+       margin-top: 1em;
+       margin-bottom: 1em;
 }
-td.description {
-       width: 9em;
-       text-align: right;
-}
-td.content {
-       width: 29em;
-       background-color: white;
-}
-td.content p {
-       white-space: pre-wrap;
-}
-p.header {
-       color: white;
-       font-size: 1em;
-       font-weight: bold;
-}

--- a/calendar/lightning/themes/winstripe/imip.css
+++ b/calendar/lightning/themes/winstripe/imip.css
@@ -1,70 +1,5 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: 20; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Lightning code.
- *
- * The Initial Developer of the Original Code is the Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2006
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Clint Talbert <cmtalbert@myfastmail.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* 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/. */
 
-table {
-       background-color: #f0ece4;
-       border: 3px solid black;
-       border-collapse: collapse;
-       width: 40em;
-       -moz-margin-start: auto;
-       -moz-margin-end: auto;
-}
-td {
-       padding: 3px;
-       vertical-align: top;
-       width: 2em;
-       text-align: left;
-}
-td.header {
-       background-color: #0a6cd0;
-}
-td.description {
-       width: 9em;
-       text-align: right;
-}
-td.content {
-       width: 29em;
-       background-color: white;
-}
-td.content p {
-       white-space: pre-wrap;
-}
-p.header {
-       color: white;
-       font-size: 1em;
-       font-weight: bold;
-}
+@import url(chrome://lightning/skin/common/imip.css);