diff --git a/calendar/resources/Makefile.in b/calendar/resources/Makefile.in
index 5b5334d93f5..1a820591be8 100644
--- a/calendar/resources/Makefile.in
+++ b/calendar/resources/Makefile.in
@@ -44,9 +44,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 libs::
-	@$(REGCHROME) content penglobal penglobal.jar
-	@$(REGCHROME) skin modern/penglobal penglobal.jar
-	@$(REGCHROME) locale en-US/penglobal penglobal.jar
 	@$(REGCHROME) content calendar calendar.jar
 	@$(REGCHROME) skin modern/calendar calendar.jar
 	@$(REGCHROME) locale en-US/calendar calendar.jar
diff --git a/calendar/resources/content/alertDialog.xul b/calendar/resources/content/alertDialog.xul
index a19b992cb52..96d9bcd5d99 100644
--- a/calendar/resources/content/alertDialog.xul
+++ b/calendar/resources/content/alertDialog.xul
@@ -48,7 +48,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul
index 034a9b7a9ec..49cceae38b8 100644
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@@ -59,9 +59,9 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-    <!ENTITY % dtd3 SYSTEM "chrome://penglobal/locale/unifinder.dtd" > %dtd3;
+    <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/unifinder.dtd" > %dtd3;
     <!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/calendarMenu.dtd" > %dtd4;
 ]>
 
diff --git a/calendar/resources/content/calendarDayView.xul b/calendar/resources/content/calendarDayView.xul
index b5f68f4a00d..e71bb29d28e 100644
--- a/calendar/resources/content/calendarDayView.xul
+++ b/calendar/resources/content/calendarDayView.xul
@@ -49,7 +49,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/calendarEventAlertDialog.xul b/calendar/resources/content/calendarEventAlertDialog.xul
index a19b992cb52..96d9bcd5d99 100644
--- a/calendar/resources/content/calendarEventAlertDialog.xul
+++ b/calendar/resources/content/calendarEventAlertDialog.xul
@@ -48,7 +48,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/calendarEventDialog.xul b/calendar/resources/content/calendarEventDialog.xul
index 0ed9f7f35b9..9282e18e637 100644
--- a/calendar/resources/content/calendarEventDialog.xul
+++ b/calendar/resources/content/calendarEventDialog.xul
@@ -44,13 +44,13 @@
 
 <!-- CSS File with all styles specific to the dialog -->
 <?xml-stylesheet href="chrome://calendar/skin/calendarEventDialog.css" ?>
-<?xml-stylesheet href="chrome://penglobal/skin/dialogOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 
 
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/calendarMonthView.xul b/calendar/resources/content/calendarMonthView.xul
index 8a37cf816b6..23917c5e4fb 100644
--- a/calendar/resources/content/calendarMonthView.xul
+++ b/calendar/resources/content/calendarMonthView.xul
@@ -46,7 +46,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/calendarWeekView.xul b/calendar/resources/content/calendarWeekView.xul
index 4bf28ae42c3..7b3c9dea2bb 100644
--- a/calendar/resources/content/calendarWeekView.xul
+++ b/calendar/resources/content/calendarWeekView.xul
@@ -46,7 +46,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/dateUtils.js b/calendar/resources/content/dateUtils.js
index ff36e75750a..a8578aedfd3 100644
--- a/calendar/resources/content/dateUtils.js
+++ b/calendar/resources/content/dateUtils.js
@@ -81,7 +81,7 @@ function DateFormater()
    // we be notified of a locale change instead, then we could
    // get the bundle once.
    
-   this.dateStringBundle = srGetStrBundle("chrome://penglobal/locale/dateFormat.properties");
+   this.dateStringBundle = srGetStrBundle("chrome://calendar/locale/dateFormat.properties");
 
 }
 
diff --git a/calendar/resources/content/datepicker/datepicker-overlay.xul b/calendar/resources/content/datepicker/datepicker-overlay.xul
index 523e0c428f6..8b4c77dfa94 100644
--- a/calendar/resources/content/datepicker/datepicker-overlay.xul
+++ b/calendar/resources/content/datepicker/datepicker-overlay.xul
@@ -38,14 +38,14 @@
 <!-- CSS Files -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://penglobal/skin/datepicker/datepicker.css" ?>
+<?xml-stylesheet href="chrome://calendar/skin/datepicker/datepicker.css" ?>
 
 
 <!-- DTD Files -->
 
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/datepicker/datepicker.js b/calendar/resources/content/datepicker/datepicker.js
index b91433d44a9..d4680b2c0cc 100644
--- a/calendar/resources/content/datepicker/datepicker.js
+++ b/calendar/resources/content/datepicker/datepicker.js
@@ -46,7 +46,7 @@
 *
 * To use the datepicker include the overlay in your XUL, this .js file is included from there
 
-      <?xul-overlay href="chrome://penglobal/content/datepicker-overlay.xul"?>
+      <?xul-overlay href="chrome://calendar/content/datepicker/datepicker-overlay.xul"?>
 *
 *
     <popup  id="oe-date-picker-popup"  oncommand="yourCommandFunction( this )" >
diff --git a/calendar/resources/content/dayView.xul b/calendar/resources/content/dayView.xul
index b5f68f4a00d..e71bb29d28e 100644
--- a/calendar/resources/content/dayView.xul
+++ b/calendar/resources/content/dayView.xul
@@ -49,7 +49,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/eventDialog.xul b/calendar/resources/content/eventDialog.xul
index 0ed9f7f35b9..9282e18e637 100644
--- a/calendar/resources/content/eventDialog.xul
+++ b/calendar/resources/content/eventDialog.xul
@@ -44,13 +44,13 @@
 
 <!-- CSS File with all styles specific to the dialog -->
 <?xml-stylesheet href="chrome://calendar/skin/calendarEventDialog.css" ?>
-<?xml-stylesheet href="chrome://penglobal/skin/dialogOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 
 
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/monthView.xul b/calendar/resources/content/monthView.xul
index 8a37cf816b6..23917c5e4fb 100644
--- a/calendar/resources/content/monthView.xul
+++ b/calendar/resources/content/monthView.xul
@@ -46,7 +46,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/test/testAll.html b/calendar/resources/content/test/testAll.html
index 13e8bbd346f..e69de29bb2d 100644
--- a/calendar/resources/content/test/testAll.html
+++ b/calendar/resources/content/test/testAll.html
@@ -1,49 +0,0 @@
-<!-- ***** 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 OEone Calendar Code, released October 31st, 2001.
-   -
-   - The Initial Developer of the Original Code is
-   - OEone Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Garth Smedley <garths@oeone.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 LGPL or the GPL. 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 ***** -->
-
-<html>
-<head>
-<title>JsUnit Test Suite</title>
-<script type="application/x-javascript" src="chrome://penglobal/content/test/jsunit/app/jsUnitCore.js"></script>
-<script type="application/x-javascript" src="chrome://penglobal/content/test/jsunit/app/jsUnitUtility.js"></script>
-<script type="application/x-javascript" src="chrome://calendar/content/test/testAll.js"></script>
-</head>
-<body>
-<p >JsUnit Test Suite</p>
-<p >This page contains a suite of tests for testing calendar.</p>
-</body>
-</html>
-
diff --git a/calendar/resources/content/timepicker/timepicker-overlay.xul b/calendar/resources/content/timepicker/timepicker-overlay.xul
index 3f7e8ae59b0..4fc50860e30 100644
--- a/calendar/resources/content/timepicker/timepicker-overlay.xul
+++ b/calendar/resources/content/timepicker/timepicker-overlay.xul
@@ -38,13 +38,13 @@
 <!-- CSS Files  -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://penglobal/skin/timepicker/timepicker.css" ?>
+<?xml-stylesheet href="chrome://calendar/skin/timepicker/timepicker.css" ?>
 
 <!-- DTD Files -->
 
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/content/unifinder/unifinder-overlay.xul b/calendar/resources/content/unifinder/unifinder-overlay.xul
index 16c0f4f65ce..e69de29bb2d 100644
--- a/calendar/resources/content/unifinder/unifinder-overlay.xul
+++ b/calendar/resources/content/unifinder/unifinder-overlay.xul
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** 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 OEone Calendar Code, released October 31st, 2001.
-   -
-   - The Initial Developer of the Original Code is
-   - OEone Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Garth Smedley <garths@oeone.com> 
-   -                 Mike Potter <mikep@oeone.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 LGPL or the GPL. 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 ***** -->
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-
-<!-- CSS File with all styles specific to the unifinder -->
-<?xml-stylesheet href="chrome://penglobal/content/unifinderxul.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://penglobal/skin/unifinder/unifinder.css" type="text/css"?> 
-
-<!-- DTD File with all strings specific to the unifinder -->
-<!DOCTYPE window 
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
-    <!ENTITY % dtd2 SYSTEM "chrome://penglobal/locale/unifinder.dtd" > %dtd2;
-]>
-
-
-<overlay
-   id="unifinder-overlay"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-   
-   
-    
-    <vbox id="unifinder-categories-box"  >
-        <vbox id="unifinder-categories-content-box" flex="1"  >
-            
-            <tree id="unifinder-categories-tree" class="unifinder-tree-class"  flex="1" >
-                <treechildren id="unifinder-categories-tree-children" flex="1"/>
-            </tree>
-        
-        </vbox>
-    </vbox>
-            
-                    
-    <tree id="unifinder-search-results-tree" class="unifinder-tree-class" flex="1">
-        <treechildren id="unifinder-search-results-tree-children" flex="1"/>
-    </tree>
-
-    <splitter id="unifinder-splitter" collapse="before" persist="state hidden collapsed"
-           class="chromeclass-extrachrome sidebar-splitter">
-       <grippy class="sidebar-splitter-grippy"/>
-    </splitter>
-
-  
-  </overlay>
-
diff --git a/calendar/resources/content/unifinder/unifinderBindings.xml b/calendar/resources/content/unifinder/unifinderBindings.xml
index a209bed69e0..9fac93352ae 100644
--- a/calendar/resources/content/unifinder/unifinderBindings.xml
+++ b/calendar/resources/content/unifinder/unifinderBindings.xml
@@ -37,7 +37,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE window [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/unifinder.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/unifinder.dtd" > %dtd1;
 ]>
 
 <bindings id="unifinderBindings"
@@ -46,7 +46,7 @@
 
   <binding id="unifinder-base">
     <resources>
-      <stylesheet src="chrome://penglobal/skin/unifinder/unifinder.css"/>
+      <stylesheet src="chrome://calendar/skin/unifinder/unifinder.css"/>
     </resources>
   </binding>
 
@@ -152,7 +152,7 @@
 
   <binding id="unifinder-button-base" extends="xul:button">
     <resources>
-      <stylesheet src="chrome://penglobal/skin/unifinder/unifinder.css"/>
+      <stylesheet src="chrome://calendar/skin/unifinder/unifinder.css"/>
     </resources>
     <content orient="vertical">
         <xul:unifinder-image-button class="unifinder-button-image"  unifinder-button-part="button"   /> 
diff --git a/calendar/resources/content/unifinder/unifinderOverlay.js b/calendar/resources/content/unifinder/unifinderOverlay.js
index f668cc83878..e69de29bb2d 100644
--- a/calendar/resources/content/unifinder/unifinderOverlay.js
+++ b/calendar/resources/content/unifinder/unifinderOverlay.js
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<!-- ***** 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 OEone Calendar Code, released October 31st, 2001.
-   -
-   - The Initial Developer of the Original Code is
-   - OEone Corporation.
-   - Portions created by the Initial Developer are Copyright (C) 2001
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s): Garth Smedley <garths@oeone.com> 
-   -                 Mike Potter <mikep@oeone.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 LGPL or the GPL. 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 ***** -->
-   
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-
-<!-- CSS File with all styles specific to the unifinder -->
-<?xml-stylesheet href="chrome://penglobal/skin/unifinder/unifinder.css" ?>
-
-<!-- DTD File with all strings specific to the unifinder -->
-<!DOCTYPE window 
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
-    <!ENTITY % dtd2 SYSTEM "chrome://penglobal/locale/unifinder.dtd" > %dtd2;
-	<!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd3;
-]>
-
-<?xul-overlay href="chrome://calendar/content/unifinder/unifinderOverlay.xul"?>
-
-<overlay
-   id="unifinder-overlay"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-   
-<!-- Javascript includes -->
-
-
-
-   <unifinder id="calendar-unifinder-overlay">
-   
-        <!--
-        <unifinder-button id="unifinder-new-category-button" class="unifinder-new-category-button" tooltip="aTooltip" tooltiptext="&unifinder.toolbar.newfolder.tooltip;" oncommand="unifinderNewCategoryCommand()" />
-        -->
-        <unifinder-button id="unifinder-remove-button" class="unifinder-remove-button" tooltip="aTooltip" tooltiptext="&calendar.tools.delete.tooltip;" label="&calendar.delete.label;" oncommand="unifinderRemoveCommand()" />
-        <unifinder-button id="unifinder-modify-button" class="unifinder-modify-button" tooltip="aTooltip" tooltiptext="&calendar.tools.modify.tooltip;" label="&calendar.modify.label;" oncommand="unifinderModifyCommand()" />
- 
-        <box flex="1">
-            <tabbox   class="unifinder-tab-box" unifinder-tab-box="true" orient="vertical" flex="1" >
-                <tabs  class="unifinder-tab" orient="horizontal" >
-                    <tab label="&calendar.main.tab.label;" />
-                    <tab label="&unifinder.tab.search.label;" />
-                </tabs>
-                
-                <spacer class="unifinder-tabs-spacer" />
-                
-                <tabpanels  flex="1">
-                    <vbox id="unifinder-categories-box" flex="1"/>
-                    <vbox flex="1">
-                        <unifinder-search-controls keypressfunction="unifinderSearchKeyPress( this, event )" />
-                        <tree id="unifinder-search-results-tree" flex="1" />
-                    </vbox>
-                </tabpanels>
-            </tabbox>
-        </box>
-   </unifinder>     
-
-  </overlay>
-
diff --git a/calendar/resources/content/weekView.xul b/calendar/resources/content/weekView.xul
index 4bf28ae42c3..7b3c9dea2bb 100644
--- a/calendar/resources/content/weekView.xul
+++ b/calendar/resources/content/weekView.xul
@@ -46,7 +46,7 @@
 <!-- DTD File with all strings specific to the calendar -->
 <!DOCTYPE window 
 [
-    <!ENTITY % dtd1 SYSTEM "chrome://penglobal/locale/global.dtd" > %dtd1;
+    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
diff --git a/calendar/resources/locale/en-US/dateFormat.properties b/calendar/resources/locale/en-US/dateFormat.properties
new file mode 100644
index 00000000000..2cbf361a001
--- /dev/null
+++ b/calendar/resources/locale/en-US/dateFormat.properties
@@ -0,0 +1,82 @@
+# ***** 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 OEone Calendar Code, released October 31st, 2001.
+#
+# The Initial Developer of the Original Code is
+# OEone Corporation.
+# Portions created by OEone Corporation are Copyright (C) 2001
+# OEone Corporation. All Rights Reserved.
+#
+# Contributor(s): Garth Smedley <garths@oeone.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 *****
+
+# Month names - Add full names when needed 
+
+month.1.Mmm=Jan
+month.2.Mmm=Feb
+month.3.Mmm=Mar
+month.4.Mmm=Apr
+month.5.Mmm=May
+month.6.Mmm=Jun
+month.7.Mmm=Jul
+month.8.Mmm=Aug
+month.9.Mmm=Sep
+month.10.Mmm=Oct
+month.11.Mmm=Nov
+month.12.Mmm=Dec
+
+month.1.name=January
+month.2.name=February
+month.3.name=March
+month.4.name=April
+month.5.name=May
+month.6.name=June
+month.7.name=July
+month.8.name=August
+month.9.name=September
+month.10.name=October
+month.11.name=November
+month.12.name=December
+
+day.1.name=Sunday
+day.2.name=Monday
+day.3.name=Tuesday
+day.4.name=Wednesday
+day.5.name=Thursday
+day.6.name=Friday
+day.7.name=Saturday
+
+day.1.Mmm=Sun
+day.2.Mmm=Mon
+day.3.Mmm=Tue
+day.4.Mmm=Wed
+day.5.Mmm=Thu
+day.6.Mmm=Fri
+day.7.Mmm=Sat
+
+am-string=AM
+pm-string=PM
diff --git a/calendar/resources/locale/en-US/global.dtd b/calendar/resources/locale/en-US/global.dtd
new file mode 100644
index 00000000000..b8f75544214
--- /dev/null
+++ b/calendar/resources/locale/en-US/global.dtd
@@ -0,0 +1,110 @@
+<!-- ***** 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 OEone Calendar Code, released October 31st, 2001.
+   -
+   - The Initial Developer of the Original Code is
+   - OEone Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 2001
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s): Garth Smedley <garths@oeone.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 LGPL or the GPL. 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 ***** -->
+
+<!ENTITY time.midnight "Midnight" >
+<!ENTITY time.1 "1:00 AM" >
+<!ENTITY time.2 "2:00 AM" >
+<!ENTITY time.3 "3:00 AM" >
+<!ENTITY time.4 "4:00 AM" >
+<!ENTITY time.5 "5:00 AM" >
+<!ENTITY time.6 "6:00 AM" >
+<!ENTITY time.7 "7:00 AM" >
+<!ENTITY time.8 "8:00 AM" >
+<!ENTITY time.9 "9:00 AM" >
+<!ENTITY time.10 "10:00 AM" >
+<!ENTITY time.11 "11:00 AM" >
+<!ENTITY time.noon "Noon" >
+<!ENTITY time.13 "1:00 PM" >
+<!ENTITY time.14 "2:00 PM" >
+<!ENTITY time.15 "3:00 PM" >
+<!ENTITY time.16 "4:00 PM" >
+<!ENTITY time.17 "5:00 PM" >
+<!ENTITY time.18 "6:00 PM" >
+<!ENTITY time.19 "7:00 PM" >
+<!ENTITY time.20 "8:00 PM" >
+<!ENTITY time.21 "9:00 PM" >
+<!ENTITY time.22 "10:00 PM" >
+<!ENTITY time.23 "11:00 PM" >
+
+<!-- Month Names -->
+<!ENTITY day.1.Ddd "Sun" >
+<!ENTITY day.2.Ddd "Mon" >
+<!ENTITY day.3.Ddd "Tue" >
+<!ENTITY day.4.Ddd "Wed" >
+<!ENTITY day.5.Ddd "Thu" >
+<!ENTITY day.6.Ddd "Fri" >
+<!ENTITY day.7.Ddd "Sat" >
+
+<!ENTITY day.1.DDD "SUN" >
+<!ENTITY day.2.DDD "MON" >
+<!ENTITY day.3.DDD "TUE" >
+<!ENTITY day.4.DDD "WED" >
+<!ENTITY day.5.DDD "THU" >
+<!ENTITY day.6.DDD "FRI" >
+<!ENTITY day.7.DDD "SAT" >
+
+<!ENTITY day.1.name "Sunday" >
+<!ENTITY day.2.name "Monday" >
+<!ENTITY day.3.name "Tuesday" >
+<!ENTITY day.4.name "Wednesday" >
+<!ENTITY day.5.name "Thursday" >
+<!ENTITY day.6.name "Friday" >
+<!ENTITY day.7.name "Saturday" >
+
+<!ENTITY time.am "AM" >
+<!ENTITY time.pm "PM" >
+<!ENTITY time.midnight "Midnight" >
+<!ENTITY time.noon "Noon" >
+
+
+<!ENTITY month.1.MMM "JAN" >
+<!ENTITY month.2.MMM "FEB" >
+<!ENTITY month.3.MMM "MAR" >
+<!ENTITY month.4.MMM "APR" >
+<!ENTITY month.5.MMM "MAY" >
+<!ENTITY month.6.MMM "JUN" >
+<!ENTITY month.7.MMM "JUL" >
+<!ENTITY month.8.MMM "AUG" >
+<!ENTITY month.9.MMM "SEP" >
+<!ENTITY month.10.MMM "OCT" >
+<!ENTITY month.11.MMM "NOV" >
+<!ENTITY month.12.MMM "DEC" >
+
+<!ENTITY time.AM "AM" >
+<!ENTITY time.PM "PM" >
+
+<!ENTITY more.label "MORE" >
+<!ENTITY less.label "LESS" >
diff --git a/calendar/resources/locale/en-US/penglobal/contents.rdf b/calendar/resources/locale/en-US/penglobal/contents.rdf
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/calendar/resources/locale/en-US/penglobal/dateFormat.properties b/calendar/resources/locale/en-US/penglobal/dateFormat.properties
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/calendar/resources/locale/en-US/penglobal/global.dtd b/calendar/resources/locale/en-US/penglobal/global.dtd
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/calendar/resources/locale/en-US/penglobal/unifinder.dtd b/calendar/resources/locale/en-US/unifinder.dtd
similarity index 100%
rename from calendar/resources/locale/en-US/penglobal/unifinder.dtd
rename to calendar/resources/locale/en-US/unifinder.dtd
diff --git a/calendar/resources/makefile.win b/calendar/resources/makefile.win
index 3d431219476..7740a00c71b 100644
--- a/calendar/resources/makefile.win
+++ b/calendar/resources/makefile.win
@@ -39,9 +39,6 @@ DEPTH=..\..
 include <$(DEPTH)\config\rules.mak>
 
 chrome::
-        $(REGCHROME) content penglobal penglobal.jar
-        $(REGCHROME) skin modern/penglobal penglobal.jar
-        $(REGCHROME) locale en-US/penglobal penglobal.jar
         $(REGCHROME) content calendar calendar.jar
         $(REGCHROME) skin modern/calendar calendar.jar
         $(REGCHROME) locale en-US/calendar calendar.jar
diff --git a/calendar/resources/skin/modern/datepicker/datepicker.css b/calendar/resources/skin/modern/datepicker/datepicker.css
index 05d2f30b295..664285d8d6b 100644
--- a/calendar/resources/skin/modern/datepicker/datepicker.css
+++ b/calendar/resources/skin/modern/datepicker/datepicker.css
@@ -56,14 +56,14 @@
 
 #oe-date-picker-year-previous-button
 {
-   list-style-image        : url("chrome://penglobal/skin/datepicker/left_arrow.png");
+   list-style-image        : url("chrome://calendar/skin/datepicker/left_arrow.png");
    
 }
 
 
 #oe-date-picker-year-next-button
 {
-   list-style-image        : url("chrome://penglobal/skin/datepicker/right_arrow.png");
+   list-style-image        : url("chrome://calendar/skin/datepicker/right_arrow.png");
 }
 
 #oe-date-picker-year-next-button-box
@@ -107,7 +107,7 @@
 
 #oe-date-picker-month-grid-box
 {
-   background-image        : url("chrome://penglobal/skin/datepicker/day_grid.png");
+   background-image        : url("chrome://calendar/skin/datepicker/day_grid.png");
    background-repeat       : no-repeat;
 }
 
diff --git a/calendar/resources/skin/modern/dialogOverlay.css b/calendar/resources/skin/modern/dialogOverlay.css
new file mode 100644
index 00000000000..4f05bff4d85
--- /dev/null
+++ b/calendar/resources/skin/modern/dialogOverlay.css
@@ -0,0 +1,234 @@
+/* ***** 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 OEone Calendar Code, released October 31st, 2001.
+ *
+ * The Initial Developer of the Original Code is
+ * OEone Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Colin Phillips <colinp@oeone.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 ***** */
+
+
+/*********************************************
+*
+* Dialog Overlay Cascading Style Sheet
+* Defines the default look for all dialogs
+*
+**********************************************/
+
+/* box surrounding the dialog */
+#dialog-box
+{
+	border					:1px #003399 solid;
+	background-color		:#E7EEEC;
+}
+
+/* dialog title */
+#standard-dialog-title
+{
+	border					:1px #000000 solid;
+	background-image			:url('chrome://calendar/skin/dialog/standard-dialog-title-background.png');
+	background-repeat			:repeat;
+   -moz-box-pack       : end;
+}
+
+/* this needs 1 px padding because of the 1 px border in the standard-dialog-title */
+#standard-dialog-title-icon
+{
+	padding : 1px;
+}
+
+#standard-dialog-title-text
+{
+	color						:#FFFFFF;
+	font-family					:Helvetica;
+	font-size					:14pt;
+}
+
+/* Standard Dialog Menu */
+#standard-dialog-title-menu
+{
+}
+
+/* dialog tips */
+#standard-dialog-tips
+{
+	border-right				:1px #000000 solid;
+	border-left				:1px #000000 solid;
+	border-bottom				:1px #000000 solid;
+	/* background-color			:#FFFFFF;*/
+	backround-color				:#E7EEEC;
+	font-family				:Helvetica;
+	font-size				:8pt;
+	background-image			:url('chrome://calendar/skin/dialog/standard-dialog-tips-bg.png');
+	background-repeat			:repeat-y;
+	
+}
+
+/* the main content of the dialog */
+#standard-dialog-content
+{
+	backround-color				:#E7EEEC;
+	padding					:10px;
+}
+
+/* Message Title */
+#message-dialog-title-warning,
+#message-dialog-title-information,
+#message-dialog-title-critical,
+#message-dialog-title-question
+{
+	border					:1px #000000 solid;
+	background-image			:url('chrome://calendar/skin/dialog/standard-dialog-title-background.png');
+	background-repeat			:repeat;
+   -moz-box-pack       : center;
+}
+
+#message-dialog-title-warning-text,
+#message-dialog-title-information-text,
+#message-dialog-title-critical-text,
+#message-dialog-title-question-text
+{
+	color						:#FFFFFF;
+	font-family					:Helvetica;
+	font-size					:14pt;
+}
+
+/*  Message contents */
+#message-dialog-content-warning,
+#message-dialog-content-information,
+#message-dialog-content-critical,
+#message-dialog-content-question
+{
+	backround-color				:#E7EEEC;
+	padding			:10px;
+   -moz-box-align : center;
+}
+
+/* Details for dialogs, provides advanced functionality */
+#advanced-dialog-content
+{
+	padding			:10px;
+}    
+
+/* Bigger margin and make the default button bigger than regular buttons */
+.dialog-btn-class[default="true"]
+{
+  min-height: 20px;
+}
+
+.dialog-btn-class
+{
+  height: 15px;
+  margin-left: 4px;
+  margin-right: 4px;
+}
+
+
+/* Advanced Components less/more toggle*/
+button.showLess,
+button.showMore
+{
+   margin              	: 0px; 
+   border              	: 0px;
+   min-width           	: 0px; 
+   padding           	: 0px;
+   -moz-user-focus     	: ignore !important;
+} 
+
+/* Standard Dialog Command Button Bars */
+#standard-dialog-command
+{
+	background-color: #083A7C;
+}
+
+/* center the content vertically instead of stretching it */
+
+#standard-dialog-commands-wizard,
+#standard-dialog-commands-confirmation,
+#standard-dialog-commands-confirmation-nocancel,
+#standard-dialog-commands-standard,
+#standard-dialog-commands-standard-nocancel
+{
+   -moz-box-align : center;
+   min-height : 30px;
+}
+
+/* center the buttons vertically instead of stretching them,
+   allows buttons to be different sizes
+*/
+
+.standard-dialog-commands-button-box-class
+{
+   -moz-box-align : center;
+}
+
+
+/*Standard Dialog Buttons */
+#standard-dialog-commands-wizard-btn-previous,
+#standard-dialog-commands-wizard-btn-next,
+#standard-dialog-commands-wizard-btn-finish,
+#standard-dialog-commands-confirmation-btn-yes,
+#standard-dialog-commands-confirmation-btn-no,
+#standard-dialog-commands-standard-btn-ok
+{
+
+}
+
+#standard-dialog-commands-wizard-btn-cancel,
+#standard-dialog-commands-confirmation-btn-cancel,
+#standard-dialog-commands-standard-btn-cancel
+{
+}
+
+/* Message Dialog Command Button Bars */
+#message-dialog-commands-warning,
+#message-dialog-commands-warning-nocancel,
+#message-dialog-commands-information,
+#message-dialog-commands-critical,
+#message-dialog-commands-question,
+#message-dialog-commands-question-nocancel
+{
+	background-color: #083A7C;
+}
+
+/* Buttons */
+#dialog-btn-ok,
+#dialog-btn-yes,
+#dialog-btn-no,
+#mp-titlebar-ctrl-close-btn 
+{
+}
+
+#commonDialog-content-box
+{
+   -moz-box-align : start;
+}
+
+ 
diff --git a/calendar/resources/skin/modern/timepicker/timepicker.css b/calendar/resources/skin/modern/timepicker/timepicker.css
index 024206dab94..1fd2252257a 100644
--- a/calendar/resources/skin/modern/timepicker/timepicker.css
+++ b/calendar/resources/skin/modern/timepicker/timepicker.css
@@ -172,7 +172,7 @@
 
 #oe-time-picker-minutes-bottom-image
 {
-   list-style-image     : url("chrome://penglobal/skin/timepicker/time_picker_minutes_bottom.png");
+   list-style-image     : url("chrome://calendar/skin/timepicker/time_picker_minutes_bottom.png");
    padding-right        : 2px;
 }
 
diff --git a/calendar/resources/skin/modern/unifinder/unifinder.css b/calendar/resources/skin/modern/unifinder/unifinder.css
index b006b5d4908..fb22005a8b8 100644
--- a/calendar/resources/skin/modern/unifinder/unifinder.css
+++ b/calendar/resources/skin/modern/unifinder/unifinder.css
@@ -176,7 +176,7 @@ tabpanels {
 
 #unifinder-toolbar
 {
-   background-image        : url("chrome://penglobal/skin/unifinder/topbar_striped.png");
+   background-image        : url("chrome://calendar/skin/unifinder/topbar_striped.png");
    background-repeat       : repeat;
 }
 
@@ -231,21 +231,21 @@ tabpanels {
 
 .unifinder-move-button  > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/move_up.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/move_up.png");
   }
 .unifinder-move-button[disabled="true"] > .unifinder-button-image,
 .unifinder-move-button[disabled="true"]:hover > .unifinder-button-image,
 .unifinder-move-button[disabled="true"]:hover:active > .unifinder-button-image
   {
-   list-style-image         : url("chrome://penglobal/skin/unifinder/move_disabled.png");
+   list-style-image         : url("chrome://calendar/skin/unifinder/move_disabled.png");
   }
 .unifinder-move-button:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/move_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/move_hover.png");
   }
 .unifinder-move-button:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/move_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/move_down.png");
   }
 
 /*--------------------------------------------------------------------
@@ -254,21 +254,21 @@ tabpanels {
 
 .unifinder-copy-button  > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/copy_up.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/copy_up.png");
   }
 .unifinder-copy-button[disabled="true"] > .unifinder-button-image,
 .unifinder-copy-button[disabled="true"]:hover > .unifinder-button-image,
 .unifinder-copy-button[disabled="true"]:hover:active > .unifinder-button-image
   {
-   list-style-image         : url("chrome://penglobal/skin/unifinder/copy_disabled.png");
+   list-style-image         : url("chrome://calendar/skin/unifinder/copy_disabled.png");
   }
 .unifinder-copy-button:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/copy_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/copy_hover.png");
   }
 .unifinder-copy-button:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/copy_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/copy_down.png");
   }
 
 /*--------------------------------------------------------------------
@@ -277,21 +277,21 @@ tabpanels {
 
 .unifinder-modify-button  > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/modify_up.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/modify_up.png");
   }
 .unifinder-modify-button[disabled="true"] > .unifinder-button-image,
 .unifinder-modify-button[disabled="true"]:hover > .unifinder-button-image,
 .unifinder-modify-button[disabled="true"]:hover:active > .unifinder-button-image
   {
-   list-style-image         : url("chrome://penglobal/skin/unifinder/modify_disabled.png");
+   list-style-image         : url("chrome://calendar/skin/unifinder/modify_disabled.png");
   }
 .unifinder-modify-button:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/modify_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/modify_hover.png");
   }
 .unifinder-modify-button:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/modify_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/modify_down.png");
   }
 
 /*--------------------------------------------------------------------
@@ -307,17 +307,17 @@ tabpanels {
 .unifinder-remove-button[disabled="true"]:hover > .unifinder-button-image,
 .unifinder-remove-button[disabled="true"]:hover:active > .unifinder-button-image
   {
-   list-style-image         : url("chrome://penglobal/skin/unifinder/remove_disabled.png");
+   list-style-image         : url("chrome://calendar/skin/unifinder/remove_disabled.png");
   }
 
 .unifinder-remove-button:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/remove_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/remove_hover.png");
   }
 
 .unifinder-remove-button:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/remove_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/remove_down.png");
   }
   
 /*--------------------------------------------------------------------
@@ -332,15 +332,15 @@ tabpanels {
 .unifinder-new-category-button[disabled="true"]:hover > .unifinder-button-image,
 .unifinder-new-category-button[disabled="true"]:hover:active > .unifinder-button-image
   {
-   list-style-image         : url("chrome://penglobal/skin/unifinder/newcategory_disabled.png");
+   list-style-image         : url("chrome://calendar/skin/unifinder/newcategory_disabled.png");
   }
 .unifinder-new-category-button:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/newcategory_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/newcategory_hover.png");
   }
 .unifinder-new-category-button:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/newcategory_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/newcategory_down.png");
   }
 
 /*--------------------------------------------------------------------
@@ -349,21 +349,21 @@ tabpanels {
 
 .unifinder-clear-results-button  > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/clearresults_up.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/clearresults_up.png");
   }
 .unifinder-clear-results-button[disabled="true"] > .unifinder-button-image,
 .unifinder-clear-results-button[disabled="true"]:hover > .unifinder-button-image,
 .unifinder-clear-results-button[disabled="true"]:hover:active > .unifinder-button-image
   {
-   list-style-image         : url("chrome://penglobal/skin/unifinder/clearresults_disabled.png");
+   list-style-image         : url("chrome://calendar/skin/unifinder/clearresults_disabled.png");
   }
 .unifinder-clear-results-button:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/clearresults_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/clearresults_hover.png");
   }
 .unifinder-clear-results-button:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/clearresults_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/clearresults_down.png");
   }
 
 
@@ -373,15 +373,15 @@ tabpanels {
 
 .unifinder-options-button-1  > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/options_button_up.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/options_button_up.png");
   }
 .unifinder-options-button-1:hover > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/options_button_hover.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/options_button_hover.png");
   }
 .unifinder-options-button-1:hover:active > .unifinder-button-image
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/options_button_down.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/options_button_down.png");
   }
 
 /*--------------------------------------------------------------------
@@ -392,15 +392,15 @@ tabpanels {
   {
     margin-right            : 2px;
     border                  : 1px solid #1d6fad;
-    list-style-image        : url("chrome://penglobal/skin/unifinder/options_button.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/options_button.png");
   }
 #unifinder-options-button-2:hover
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/options_button.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/options_button.png");
   }
 #unifinder-options-button-2:hover:active
   {
-    list-style-image        : url("chrome://penglobal/skin/unifinder/options_button.png");
+    list-style-image        : url("chrome://calendar/skin/unifinder/options_button.png");
   }
 
 .unifinder-button-text