diff --git a/calendar/resources/content/calendarDayView.xul b/calendar/resources/content/calendarDayView.xul
index 59987cdb947..fec73f1f2b4 100644
--- a/calendar/resources/content/calendarDayView.xul
+++ b/calendar/resources/content/calendarDayView.xul
@@ -42,7 +42,7 @@
 
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!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.js b/calendar/resources/content/calendarEventDialog.js
index f338462826e..35c7b8872fb 100644
--- a/calendar/resources/content/calendarEventDialog.js
+++ b/calendar/resources/content/calendarEventDialog.js
@@ -297,11 +297,7 @@ function loadCalendarEventDialog()
    setFieldValue( "advanced-repeat-dayofweek", ( gEvent.recurWeekNumber > 0 && gEvent.recurWeekNumber != 5 ), "selected" );
    setFieldValue( "advanced-repeat-dayofweek-last", ( gEvent.recurWeekNumber == 5 ), "selected" );
    
-   // set up OK, Cancel
-   doSetOKCancel( onOKCommand, 0 );
-   
    // start focus on title
-   
    var firstFocus = document.getElementById( "title-field" );
    firstFocus.focus();
 }
diff --git a/calendar/resources/content/calendarEventDialog.xul b/calendar/resources/content/calendarEventDialog.xul
index 792792f8977..478932fedcf 100644
--- a/calendar/resources/content/calendarEventDialog.xul
+++ b/calendar/resources/content/calendarEventDialog.xul
@@ -53,7 +53,7 @@
 <?xml-stylesheet href="chrome://calendar/skin/contactsSelectAddressesDialog.css" ?>
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE dialog 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
@@ -61,10 +61,13 @@
 ]>
 
 
-<window
+<dialog
    id="calendar-new-eventwindow"
    title="Calendar Event"
    onload="loadCalendarEventDialog()"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#">
@@ -478,11 +481,6 @@
 
             
          </vbox> <!-- standard-dialog-content -->
-    
-        
-         <!-- Bottom Box -->    
-        <box id="okCancelButtonsRight"/>        
-        
     </vbox> <!-- dialog-box -->
 
-</window>
+</dialog>
diff --git a/calendar/resources/content/calendarMenuOverlay.xul b/calendar/resources/content/calendarMenuOverlay.xul
index 7355f1c3b88..9620f71a15b 100644
--- a/calendar/resources/content/calendarMenuOverlay.xul
+++ b/calendar/resources/content/calendarMenuOverlay.xul
@@ -42,7 +42,7 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
 	<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" > %navigatorDTD;
    <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
diff --git a/calendar/resources/content/calendarMonthView.xul b/calendar/resources/content/calendarMonthView.xul
index 5bc23ae5f2d..230d63a3f6e 100644
--- a/calendar/resources/content/calendarMonthView.xul
+++ b/calendar/resources/content/calendarMonthView.xul
@@ -39,7 +39,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
diff --git a/calendar/resources/content/calendarOverlay.xul b/calendar/resources/content/calendarOverlay.xul
index 1c2a2ccaeff..da80f043bd1 100644
--- a/calendar/resources/content/calendarOverlay.xul
+++ b/calendar/resources/content/calendarOverlay.xul
@@ -41,7 +41,7 @@
 
 <?xml-stylesheet href="chrome://calendar/skin/calendarOverlay.css" type="text/css"?> 
 
-<!DOCTYPE window SYSTEM "chrome://calendar/locale/calendarOverlay.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://calendar/locale/calendarOverlay.dtd" >
 
 <!-- This is the overlay that addes "Calendar" to the (global) task menu and to the component bar icons on the status bar. -->
 
diff --git a/calendar/resources/content/calendarRepeatOverlay.xul b/calendar/resources/content/calendarRepeatOverlay.xul
index 739e4a936d0..e69de29bb2d 100644
--- a/calendar/resources/content/calendarRepeatOverlay.xul
+++ b/calendar/resources/content/calendarRepeatOverlay.xul
@@ -1,139 +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): 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 ***** -->
-
-<!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-]>
-
-
-<!-- This is the overlay that addes repeating information to the event and task dialogs. -->
-
-<overlay id="calendarRepeatOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-   <!-- Repeat -->    
-      <vbox id="repeat-outer-box">
-        <hbox id="repeat-box" align="center">
-          <checkbox id="repeat-checkbox" class="proper-align" label="&newevent.repeat.label;"  checked="false" oncommand="commandRepeat()"/>
-          <textbox id="repeat-length-field" class="cursor-pointer" disable-controller="repeat" value="1"  oninput="repeatLengthKeyDown( this )"/>
-                  
-          <menulist crop="none" oncommand="repeatUnitCommand( this )" labelnumber="labelplural"  id="repeat-length-units" disable-controller="repeat">
-              <menupopup>
-                  <menuitem label="&repeat.units.days;"   labelplural="&repeat.units.days;"   labelsingular="&repeat.units.days.singular;"   id="repeat-length-days"   value="days" />
-                  <menuitem label="&repeat.units.weeks;"  labelplural="&repeat.units.weeks;"  labelsingular="&repeat.units.weeks.singular;"  id="repeat-length-weeks"  value="weeks"/>
-                  <menuitem label="&repeat.units.months;" labelplural="&repeat.units.months;" labelsingular="&repeat.units.months.singular;" id="repeat-length-months" value="months"/>
-                  <menuitem label="&repeat.units.years;"  labelplural="&repeat.units.years;"  labelsingular="&repeat.units.years.singular;"  id="repeat-length-years"  value="years" />
-              </menupopup>
-          </menulist>
-        </hbox>
-             
-        
-        <hbox id="repeat-extenstions-week" disabled="true" disable-controller="repeat" collapsed="false" align="center">
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Sun" id="advanced-repeat-week-0" value="0" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Mon" id="advanced-repeat-week-1" value="1" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Tue" id="advanced-repeat-week-2" value="2" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Wed" id="advanced-repeat-week-3" value="3" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Thu" id="advanced-repeat-week-4" value="4" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Fri" id="advanced-repeat-week-5" value="5" checked="false" />
-          <checkbox disable-controller="repeat" class="repeat-day-class" label="Sat" id="advanced-repeat-week-6" value="6" checked="false" />
-        </hbox>
-             
-        
-        <hbox id="repeat-extenstions-month" diabled="true" collapsed="true" align="center">
-            <vbox align="center">
-               <radiogroup id="advanced-repeat-month" disable-controller="repeat">
-                  <radio disable-controller="repeat" id="advanced-repeat-dayofmonth"      label="On the xth day of the month" selected="true"/>
-                  <radio disable-controller="repeat" id="advanced-repeat-dayofweek"       label="4th Tuesday of the month"/>
-                  <radio disable-controller="repeat" id="advanced-repeat-dayofweek-last"  label="Last Tuesday of the month" disabled="true"/>
-               </radiogroup>
-            </vbox>
-        </hbox>
-             
-        <spacer height="10" />
-          
-        <hbox align="center">
-          <spacer class="repeat-left-spacer" />
-          <radiogroup id="repeat-until-group" disable-controller="repeat">
-            <radio id="repeat-forever-radio" disable-controller="repeat" label="&newevent.forever.label;" oncommand="commandUntil()"/>
-            <hbox id="repeat-end-box" align="center">
-                <vbox>
-                   <hbox>
-                      <radio id="repeat-until-radio" disable-controller="repeat" label="&newevent.until.label;" oncommand="commandUntil()"/>
-                      <spacer id="until-spacer"/>
-                      <textbox id="repeat-end-date-text" readonly="true" value="" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                      <image class="event-date-button-class" id="repeat-end-date-button" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                   </hbox>
-                   <label id="repeat-time-warning" class="warning-text-class" value="&newevent.recurend.warning;" collapsed="true"/>
-                </vbox>
-            </hbox>
-          </radiogroup>
-        </hbox>
-        
-        <hbox align="center">
-          <spacer class="repeat-left-spacer" />
-          <groupbox>
-            <caption label="&newevent.exceptions.caption;"/>
-            <grid>
-               <columns>
-                  <column flex="1"/>
-                  <column/>
-               </columns>
-               <rows>
-                  <row>
-                     <hbox align="center">
-                        <textbox id="exception-dates-text" disable-controller="repeat" readonly="true" value="" onmousedown="prepareDatePicker('exception-dates-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                        <image class="event-date-button-class" disable-controller="repeat" id="exception-dates-button" onmousedown="prepareDatePicker('exception-dates-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                     </hbox>   
-                     <button id="exception-add-button" label="&newevent.addexceptions.label;" disable-controller="repeat" oncommand="addException()"/>
-                  </row>
-                  <row>
-                     <listbox id="exception-dates-listbox" disable-controller="repeat" rows="4"/>
-                     <vbox>
-                        <button label="&newevent.deleteexceptions.label;" disable-controller="repeat" oncommand="removeSelectedExceptionDate()"/>
-                     </vbox>
-                  </row>
-               </rows>
-            </grid>
-          </groupbox>
-        </hbox>
-      </vbox>
-   <!-- /Repeat -->
-
-</overlay>
diff --git a/calendar/resources/content/calendarServerDialog.js b/calendar/resources/content/calendarServerDialog.js
index b4d740aa028..e5065b64f8f 100644
--- a/calendar/resources/content/calendarServerDialog.js
+++ b/calendar/resources/content/calendarServerDialog.js
@@ -115,9 +115,6 @@ function loadCalendarServerDialog()
       titleDataItem = document.getElementById( "data-event-title-edit" );
    }
    
-   // set up OK, Cancel
-   doSetOKCancel( onOKCommand, 0 );
-   
    // start focus on title
    
    var firstFocus = document.getElementById( "server-name-textbox" );
diff --git a/calendar/resources/content/calendarServerDialog.xul b/calendar/resources/content/calendarServerDialog.xul
index 98af71d665e..5be80786c20 100644
--- a/calendar/resources/content/calendarServerDialog.xul
+++ b/calendar/resources/content/calendarServerDialog.xul
@@ -43,16 +43,19 @@
 <?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE dialog 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 
-<window
+<dialog
    id="calendar-new-serverwindow"
    title="Calendar Server"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
    onload="loadCalendarServerDialog()"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -102,11 +105,6 @@
          </vbox>
             
       </vbox> <!-- standard-dialog-content -->
-    
-        
-      <!-- Bottom Box -->    
-      <box id="okCancelButtonsRight"/>        
-        
    </vbox> <!-- dialog-box -->
 
-</window>
+</dialog>
diff --git a/calendar/resources/content/calendarToDoDialog.js b/calendar/resources/content/calendarToDoDialog.js
index c4632037b8c..cbb85dfa88d 100644
--- a/calendar/resources/content/calendarToDoDialog.js
+++ b/calendar/resources/content/calendarToDoDialog.js
@@ -208,9 +208,6 @@ function loadCalendarToDoDialog()
    updateAlarmItemEnabled();
    updateCompletedItemEnabled();
    
-   // set up OK, Cancel
-   doSetOKCancel( onOKCommand, 0 );
-   
    // start focus on title
    
    var firstFocus = document.getElementById( "title-field" );
diff --git a/calendar/resources/content/calendarToDoDialog.xul b/calendar/resources/content/calendarToDoDialog.xul
index 88f428e1a85..036bd8da18c 100644
--- a/calendar/resources/content/calendarToDoDialog.xul
+++ b/calendar/resources/content/calendarToDoDialog.xul
@@ -48,16 +48,19 @@
 <?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE dialog 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 
-<window
+<dialog
    id="calendar-new-eventwindow"
    title="Calendar Event"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
    onload="loadCalendarToDoDialog()"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -256,11 +259,6 @@
             </grid>
             
          </vbox> <!-- standard-dialog-content -->
-    
-        
-         <!-- Bottom Box -->    
-        <box id="okCancelButtonsRight"/>        
-        
     </vbox> <!-- dialog-box -->
 
-</window>
+</dialog>
diff --git a/calendar/resources/content/calendarWeekView.xul b/calendar/resources/content/calendarWeekView.xul
index f2bce5bb119..ba43a7cd1c7 100644
--- a/calendar/resources/content/calendarWeekView.xul
+++ b/calendar/resources/content/calendarWeekView.xul
@@ -39,7 +39,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!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-overlay.xul b/calendar/resources/content/datepicker/datepicker-overlay.xul
index 3a68882d2dc..e69de29bb2d 100644
--- a/calendar/resources/content/datepicker/datepicker-overlay.xul
+++ b/calendar/resources/content/datepicker/datepicker-overlay.xul
@@ -1,365 +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> 
-   -
-   - 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 ***** -->
-
-<!-- CSS Files -->
-
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<?xml-stylesheet href="chrome://calendar/skin/datepicker/datepicker.css" ?>
-
-
-<!-- DTD Files -->
-
-<!DOCTYPE window 
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
-    <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
-]>
-
-<!-- Overlay -->
-
-<overlay
-   id="oe-date-picker-overlay"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-   
-<!-- Javascript includes -->
-
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/datepicker/datepicker.js"/>
-
-<!-- Popup that holds the picker -->
-
-<popup onpopupshowing="oeDatePicker.onpopupshowing(this)" id="oe-date-picker-popup" >
-  <vbox id="oe-date-picker-overlay-box" flex="1"/>
-</popup>
-
-<!-- Box with insides of the picker -->
-
-<vbox id="oe-date-picker-overlay-box" >
-
-
-   <!-- Year controls -->
-      <hbox id="oe-date-picker-year-controls-box"  >
-
-         <box flex="1">   
-            <image id="oe-date-picker-year-previous-button" onclick="oeDatePicker.previousYearCommand()"/>
-         </box>
-                
-         <label id="oe-date-picker-year-title-text" value="" />
-        
-         <box flex="1" id="oe-date-picker-year-next-button-box" >
-            <image id="oe-date-picker-year-next-button" onclick="oeDatePicker.nextYearCommand()"/> 
-         </box>  
-
-    </hbox> 
-    
-    
-    <!-- Year Grid -->
-
-    <grid id="oe-date-picker-year-grid" flex="1">
-        <columns>
-            <column class="oe-date-picker-year-column-class" flex="1"/>
-            <column class="oe-date-picker-year-column-class" flex="1"/>
-            <column class="oe-date-picker-year-column-class" flex="1"/>
-            <column class="oe-date-picker-year-column-class" flex="1"/>
-        </columns>
-        <rows >
-            <row flex="1"  >
-                <vbox class="oe-date-picker-year-month-box-class"  id="oe-date-picker-year-month-1-box"  onclick="oeDatePicker.clickMonth(this, 1)" >
-                    <spacer flex="1" />
-                    <box ><label  class="oe-date-picker-year-month-name-class"  value="&month.1.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-2-box"  onclick="oeDatePicker.clickMonth(this, 2)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.2.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-3-box"  onclick="oeDatePicker.clickMonth(this, 3)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.3.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-4-box"  onclick="oeDatePicker.clickMonth(this, 4)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.4.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-            </row>  
-            <row flex="1"  >
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-5-box"  onclick="oeDatePicker.clickMonth(this, 5)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.5.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class"  id="oe-date-picker-year-month-6-box" onclick="oeDatePicker.clickMonth(this, 6)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.6.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class"  id="oe-date-picker-year-month-7-box" onclick="oeDatePicker.clickMonth(this, 7)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.7.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class"  id="oe-date-picker-year-month-8-box" onclick="oeDatePicker.clickMonth(this, 8)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.8.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-            </row>  
-            <row flex="1"  >
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-9-box"  onclick="oeDatePicker.clickMonth(this, 9)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.9.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class"  id="oe-date-picker-year-month-10-box" onclick="oeDatePicker.clickMonth(this, 10)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.10.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-11-box"  onclick="oeDatePicker.clickMonth(this, 11)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.11.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-                <vbox class="oe-date-picker-year-month-box-class" id="oe-date-picker-year-month-12-box"  onclick="oeDatePicker.clickMonth(this, 12)" >
-                    <spacer flex="1" />
-                    <box><label  class="oe-date-picker-year-month-name-class"  value="&month.12.MMM;" /></box> 
-                    <spacer flex="1" />
-                </vbox>  
-            </row>  
-        
-        
-        </rows>
-    
-    </grid>  <!-- Year Grid -->
-    
-    
-    <!-- Month Grid -->
-    <box id="oe-date-picker-month-grid-box" flex="1">
-        
-        <grid id="oe-date-picker-month-grid" flex="1">
-            <columns>
-                <column flex="1"/>
-                <column flex="1"/>
-                <column flex="1"/>
-                <column flex="1"/>
-                <column flex="1"/>
-                <column flex="1"/>
-                <column flex="1"/>
-                <column flex="1"/>
-            </columns>
-            <rows>
-           
-                <row id="oe-date-picker-month-days-header-box">
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-1-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.1.DDD;" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-2-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.2.DDD;" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-3-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.3.DDD;" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-4-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.4.DDD;" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-5-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.5.DDD;" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-6-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.6.DDD;" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-days-box-header-class" id="oe-date-picker-month-day-7-header-box">
-                        <label class="oe-date-picker-month-days-header-class" value="&day.7.DDD;" />
-                    </vbox>    
-                </row>
-                
-                <row>
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-1-box" onclick="oeDatePicker.clickDay(1)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-1" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-2-box" onclick="oeDatePicker.clickDay(2)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-2" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-3-box" onclick="oeDatePicker.clickDay(3)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-3" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-4-box" onclick="oeDatePicker.clickDay(4)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-4" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-5-box" onclick="oeDatePicker.clickDay(5)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-5" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-6-box" onclick="oeDatePicker.clickDay(6)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-6" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-7-box" onclick="oeDatePicker.clickDay(7)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-7" value="" />
-                    </vbox>    
-                </row>
-                
-                <row>
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-8-box" onclick="oeDatePicker.clickDay(8)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-8" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-9-box" onclick="oeDatePicker.clickDay(9)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-9" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-10-box" onclick="oeDatePicker.clickDay(10)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-10" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-11-box" onclick="oeDatePicker.clickDay(11)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-11" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-12-box" onclick="oeDatePicker.clickDay(12)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-12" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-13-box"  onclick="oeDatePicker.clickDay(13)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-13" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-14-box" onclick="oeDatePicker.clickDay(14)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-14" value="" />
-                    </vbox>    
-                </row>
-                
-                <row>
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-15-box" onclick="oeDatePicker.clickDay(15)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-15" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-16-box" onclick="oeDatePicker.clickDay(16)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-16" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-17-box" onclick="oeDatePicker.clickDay(17)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-17" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-18-box" onclick="oeDatePicker.clickDay(18)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-18" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-19-box" onclick="oeDatePicker.clickDay(19)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-19" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-20-box" onclick="oeDatePicker.clickDay(20)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-20" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-21-box" onclick="oeDatePicker.clickDay(21)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-21" value="" />
-                    </vbox>    
-                </row>
-                
-                <row>
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-22-box" onclick="oeDatePicker.clickDay(22)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-22" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-23-box" onclick="oeDatePicker.clickDay(23)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-23" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-24-box" onclick="oeDatePicker.clickDay(24)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-24" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"   id="oe-date-picker-month-day-25-box" onclick="oeDatePicker.clickDay(25)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-25" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-26-box" onclick="oeDatePicker.clickDay(26)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-26" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-27-box" onclick="oeDatePicker.clickDay(27)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-27" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-28-box" onclick="oeDatePicker.clickDay(28)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-28" value="" />
-                    </vbox>    
-                </row>
-                
-                <row>
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-29-box" onclick="oeDatePicker.clickDay(29)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-29" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class" id="oe-date-picker-month-day-30-box" onclick="oeDatePicker.clickDay(30)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-30" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-31-box" onclick="oeDatePicker.clickDay(31)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-31" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-32-box" onclick="oeDatePicker.clickDay(32)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-32" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-33-box" onclick="oeDatePicker.clickDay(33)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-33" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-34-box" onclick="oeDatePicker.clickDay(34)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-34" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-35-box" onclick="oeDatePicker.clickDay(35)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-35" value="" />
-                    </vbox>    
-                </row>
-                
-                <row>
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-36-box" onclick="oeDatePicker.clickDay(36)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-36" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-37-box" onclick="oeDatePicker.clickDay(37)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-37" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-38-box" onclick="oeDatePicker.clickDay(38)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-38" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-39-box" onclick="oeDatePicker.clickDay(39)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-39" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"   id="oe-date-picker-month-day-40-box" onclick="oeDatePicker.clickDay(40)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-40" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"   id="oe-date-picker-month-day-41-box" onclick="oeDatePicker.clickDay(41)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-41" value="" />
-                    </vbox>    
-                    <vbox class="oe-date-picker-month-day-box-class"  id="oe-date-picker-month-day-42-box" onclick="oeDatePicker.clickDay(42)">
-                        <label  class="oe-date-picker-month-day-number-class" id="oe-date-picker-month-day-text-42" value="" />
-                    </vbox>    
-                </row>
-            </rows>
-        </grid>  <!-- Month Grid -->
-        
-    </box>  <!-- Month Grid Box -->
-        
-
-</vbox>   <!-- Box with insides of the picker -->
-</overlay>
-
diff --git a/calendar/resources/content/dayView.xul b/calendar/resources/content/dayView.xul
index 59987cdb947..fec73f1f2b4 100644
--- a/calendar/resources/content/dayView.xul
+++ b/calendar/resources/content/dayView.xul
@@ -42,7 +42,7 @@
 
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!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.js b/calendar/resources/content/eventDialog.js
index f338462826e..35c7b8872fb 100644
--- a/calendar/resources/content/eventDialog.js
+++ b/calendar/resources/content/eventDialog.js
@@ -297,11 +297,7 @@ function loadCalendarEventDialog()
    setFieldValue( "advanced-repeat-dayofweek", ( gEvent.recurWeekNumber > 0 && gEvent.recurWeekNumber != 5 ), "selected" );
    setFieldValue( "advanced-repeat-dayofweek-last", ( gEvent.recurWeekNumber == 5 ), "selected" );
    
-   // set up OK, Cancel
-   doSetOKCancel( onOKCommand, 0 );
-   
    // start focus on title
-   
    var firstFocus = document.getElementById( "title-field" );
    firstFocus.focus();
 }
diff --git a/calendar/resources/content/eventDialog.xul b/calendar/resources/content/eventDialog.xul
index 792792f8977..478932fedcf 100644
--- a/calendar/resources/content/eventDialog.xul
+++ b/calendar/resources/content/eventDialog.xul
@@ -53,7 +53,7 @@
 <?xml-stylesheet href="chrome://calendar/skin/contactsSelectAddressesDialog.css" ?>
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE dialog 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
@@ -61,10 +61,13 @@
 ]>
 
 
-<window
+<dialog
    id="calendar-new-eventwindow"
    title="Calendar Event"
    onload="loadCalendarEventDialog()"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#">
@@ -478,11 +481,6 @@
 
             
          </vbox> <!-- standard-dialog-content -->
-    
-        
-         <!-- Bottom Box -->    
-        <box id="okCancelButtonsRight"/>        
-        
     </vbox> <!-- dialog-box -->
 
-</window>
+</dialog>
diff --git a/calendar/resources/content/menuOverlay.xul b/calendar/resources/content/menuOverlay.xul
index 7355f1c3b88..9620f71a15b 100644
--- a/calendar/resources/content/menuOverlay.xul
+++ b/calendar/resources/content/menuOverlay.xul
@@ -42,7 +42,7 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
 	<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" > %navigatorDTD;
    <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
diff --git a/calendar/resources/content/monthView.xul b/calendar/resources/content/monthView.xul
index 5bc23ae5f2d..230d63a3f6e 100644
--- a/calendar/resources/content/monthView.xul
+++ b/calendar/resources/content/monthView.xul
@@ -39,7 +39,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
diff --git a/calendar/resources/content/pref/calendarPref.xul b/calendar/resources/content/pref/calendarPref.xul
index e96abc0033d..6196f95b2b7 100644
--- a/calendar/resources/content/pref/calendarPref.xul
+++ b/calendar/resources/content/pref/calendarPref.xul
@@ -40,7 +40,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!-- DTD File with all strings specific to the file -->
-<!DOCTYPE window 
+<!DOCTYPE page 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarPrefs.dtd" > %dtd1;
 ]>
diff --git a/calendar/resources/content/pref/calendarPrefOverlay.xul b/calendar/resources/content/pref/calendarPrefOverlay.xul
index 51c0054d3b7..7ff48b47a72 100644
--- a/calendar/resources/content/pref/calendarPrefOverlay.xul
+++ b/calendar/resources/content/pref/calendarPrefOverlay.xul
@@ -35,7 +35,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
    <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/calendarPrefs.dtd" >
    %calendarPrefsOverlayDTD;
 ]>
diff --git a/calendar/resources/content/pref/prefOverlay.xul b/calendar/resources/content/pref/prefOverlay.xul
index 51c0054d3b7..7ff48b47a72 100644
--- a/calendar/resources/content/pref/prefOverlay.xul
+++ b/calendar/resources/content/pref/prefOverlay.xul
@@ -35,7 +35,7 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
    <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/calendarPrefs.dtd" >
    %calendarPrefsOverlayDTD;
 ]>
diff --git a/calendar/resources/content/repeatOverlay.xul b/calendar/resources/content/repeatOverlay.xul
index 739e4a936d0..d4d0457719b 100644
--- a/calendar/resources/content/repeatOverlay.xul
+++ b/calendar/resources/content/repeatOverlay.xul
@@ -37,7 +37,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
 ]>
diff --git a/calendar/resources/content/serverDialog.js b/calendar/resources/content/serverDialog.js
index b4d740aa028..e5065b64f8f 100644
--- a/calendar/resources/content/serverDialog.js
+++ b/calendar/resources/content/serverDialog.js
@@ -115,9 +115,6 @@ function loadCalendarServerDialog()
       titleDataItem = document.getElementById( "data-event-title-edit" );
    }
    
-   // set up OK, Cancel
-   doSetOKCancel( onOKCommand, 0 );
-   
    // start focus on title
    
    var firstFocus = document.getElementById( "server-name-textbox" );
diff --git a/calendar/resources/content/serverDialog.xul b/calendar/resources/content/serverDialog.xul
index 98af71d665e..5be80786c20 100644
--- a/calendar/resources/content/serverDialog.xul
+++ b/calendar/resources/content/serverDialog.xul
@@ -43,16 +43,19 @@
 <?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE dialog 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 
-<window
+<dialog
    id="calendar-new-serverwindow"
    title="Calendar Server"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
    onload="loadCalendarServerDialog()"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -102,11 +105,6 @@
          </vbox>
             
       </vbox> <!-- standard-dialog-content -->
-    
-        
-      <!-- Bottom Box -->    
-      <box id="okCancelButtonsRight"/>        
-        
    </vbox> <!-- dialog-box -->
 
-</window>
+</dialog>
diff --git a/calendar/resources/content/timepicker/timepicker-overlay.xul b/calendar/resources/content/timepicker/timepicker-overlay.xul
index 8c2a208b5d4..de25c20852d 100644
--- a/calendar/resources/content/timepicker/timepicker-overlay.xul
+++ b/calendar/resources/content/timepicker/timepicker-overlay.xul
@@ -42,7 +42,7 @@
 
 <!-- DTD Files -->
 
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
diff --git a/calendar/resources/content/toDoDialog.js b/calendar/resources/content/toDoDialog.js
index c4632037b8c..cbb85dfa88d 100644
--- a/calendar/resources/content/toDoDialog.js
+++ b/calendar/resources/content/toDoDialog.js
@@ -208,9 +208,6 @@ function loadCalendarToDoDialog()
    updateAlarmItemEnabled();
    updateCompletedItemEnabled();
    
-   // set up OK, Cancel
-   doSetOKCancel( onOKCommand, 0 );
-   
    // start focus on title
    
    var firstFocus = document.getElementById( "title-field" );
diff --git a/calendar/resources/content/toDoDialog.xul b/calendar/resources/content/toDoDialog.xul
index 88f428e1a85..036bd8da18c 100644
--- a/calendar/resources/content/toDoDialog.xul
+++ b/calendar/resources/content/toDoDialog.xul
@@ -48,16 +48,19 @@
 <?xml-stylesheet href="chrome://calendar/skin/dialogOverlay.css" type="text/css"?>
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE dialog 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
 ]>
 
 
-<window
+<dialog
    id="calendar-new-eventwindow"
    title="Calendar Event"
+   buttons="accept,cancel"
+   ondialogaccept="return onOKCommand();"
+   ondialogcancel="return true;"
    onload="loadCalendarToDoDialog()"
    persist="screenX screenY"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -256,11 +259,6 @@
             </grid>
             
          </vbox> <!-- standard-dialog-content -->
-    
-        
-         <!-- Bottom Box -->    
-        <box id="okCancelButtonsRight"/>        
-        
     </vbox> <!-- dialog-box -->
 
-</window>
+</dialog>
diff --git a/calendar/resources/content/weekView.xul b/calendar/resources/content/weekView.xul
index f2bce5bb119..ba43a7cd1c7 100644
--- a/calendar/resources/content/weekView.xul
+++ b/calendar/resources/content/weekView.xul
@@ -39,7 +39,7 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!-- DTD File with all strings specific to the calendar -->
-<!DOCTYPE window 
+<!DOCTYPE overlay 
 [
     <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
     <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;