Bug 1547054 - Remove unnecessary type attributes (i.e. [type="application/javascript"]) on non-test script tags. r=Paenglab,philipp DONTBUILD
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sun, 28 Apr 2019 22:14:40 +0200
changeset 34367 340b555c26cfee24bddfa077ae075b7131892083
parent 34366 1b88307f4cbb9ef927ef011a983dc777f0abb558
child 34368 ee166a9bb9e027f5e857c802bcf94a512f10c44f
push id2407
push userclokep@gmail.com
push dateMon, 20 May 2019 17:11:26 +0000
treeherdercomm-beta@193428fd6fd4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPaenglab, philipp
bugs1547054
Bug 1547054 - Remove unnecessary type attributes (i.e. [type="application/javascript"]) on non-test script tags. r=Paenglab,philipp DONTBUILD
calendar/base/content/calendar-common-sets.xul
calendar/base/content/calendar-task-view.xul
calendar/base/content/calendar-unifinder-todo.xul
calendar/base/content/calendar-unifinder.xul
calendar/base/content/calendar-views.xul
calendar/base/content/dialogs/calendar-alarm-dialog.xul
calendar/base/content/dialogs/calendar-conflicts-dialog.xul
calendar/base/content/dialogs/calendar-error-prompt.xul
calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
calendar/base/content/dialogs/calendar-event-dialog.xul
calendar/base/content/dialogs/calendar-invitations-dialog.xul
calendar/base/content/dialogs/calendar-migration-dialog.xul
calendar/base/content/dialogs/calendar-occurrence-prompt.xul
calendar/base/content/dialogs/calendar-print-dialog.xul
calendar/base/content/dialogs/calendar-properties-dialog.xul
calendar/base/content/dialogs/calendar-providerUninstall-dialog.xul
calendar/base/content/dialogs/calendar-subscriptions-dialog.xul
calendar/base/content/dialogs/calendar-summary-dialog.xul
calendar/base/content/dialogs/chooseCalendarDialog.xul
calendar/base/content/preferences/editCategory.xul
calendar/base/content/today-pane.xul
calendar/lightning/content/html-item-editing/lightning-item-iframe.html
calendar/lightning/content/imip-bar-overlay.xul
calendar/lightning/content/lightning-calendar-creation.xul
calendar/lightning/content/lightning-calendar-properties.xul
calendar/lightning/content/lightning-item-iframe.xul
calendar/lightning/content/lightning-migration.xul
calendar/lightning/content/messenger-overlay-messageWindow.xul
calendar/lightning/content/messenger-overlay-preferences.xul
calendar/lightning/content/messenger-overlay-sidebar.xul
calendar/lightning/content/suite-overlay-addons.xul
calendar/lightning/content/suite-overlay-sidebar.xul
calendar/providers/caldav/content/caldav-lightning-calendar-creation.xul
calendar/providers/caldav/content/caldav-lightning-calendar-properties.xul
calendar/providers/gdata/content/browserRequest.xul
calendar/providers/gdata/content/gdata-calendar-creation.xul
calendar/providers/gdata/content/gdata-calendar-properties.xul
calendar/providers/gdata/content/gdata-event-dialog-reminder.xul
calendar/providers/gdata/content/gdata-event-dialog.xul
calendar/providers/gdata/content/gdata-lightning-item-iframe.xul
calendar/providers/gdata/content/gdata-migration-overlay.xul
calendar/providers/gdata/content/gdata-migration-wizard.xul
calendar/resources/content/calendarCreation.xul
calendar/resources/content/publishDialog.xul
chat/content/browserRequest.xul
common/src/customizeToolbar.xul
common/src/viewSource.xul
editor/ui/composer/content/EditorContextMenuOverlay.xul
editor/ui/composer/content/editingOverlay.xul
editor/ui/composer/content/editor.xul
editor/ui/composer/content/editorOverlay.xul
editor/ui/composer/content/editorTasksOverlay.xul
editor/ui/dialogs/content/EdAdvancedEdit.xul
editor/ui/dialogs/content/EdButtonProps.xul
editor/ui/dialogs/content/EdColorPicker.xul
editor/ui/dialogs/content/EdColorProps.xul
editor/ui/dialogs/content/EdConvertToTable.xul
editor/ui/dialogs/content/EdDialogTemplate.xul
editor/ui/dialogs/content/EdDictionary.xul
editor/ui/dialogs/content/EdFieldSetProps.xul
editor/ui/dialogs/content/EdFormProps.xul
editor/ui/dialogs/content/EdHLineProps.xul
editor/ui/dialogs/content/EdImageProps.xul
editor/ui/dialogs/content/EdInputImage.xul
editor/ui/dialogs/content/EdInputProps.xul
editor/ui/dialogs/content/EdInsSrc.xul
editor/ui/dialogs/content/EdInsertChars.xul
editor/ui/dialogs/content/EdInsertMath.xul
editor/ui/dialogs/content/EdInsertTOC.xul
editor/ui/dialogs/content/EdInsertTable.xul
editor/ui/dialogs/content/EdLabelProps.xul
editor/ui/dialogs/content/EdLinkChecker.xul
editor/ui/dialogs/content/EdLinkProps.xul
editor/ui/dialogs/content/EdListProps.xul
editor/ui/dialogs/content/EdNamedAnchorProps.xul
editor/ui/dialogs/content/EdPageProps.xul
editor/ui/dialogs/content/EdReplace.xul
editor/ui/dialogs/content/EdSelectProps.xul
editor/ui/dialogs/content/EdSnapToGrid.xul
editor/ui/dialogs/content/EdSpellCheck.xul
editor/ui/dialogs/content/EdTableProps.xul
editor/ui/dialogs/content/EdTextAreaProps.xul
editor/ui/dialogs/content/EditConflict.xul
editor/ui/dialogs/content/EditorPublish.xul
editor/ui/dialogs/content/EditorPublishProgress.xul
editor/ui/dialogs/content/EditorPublishSettings.xul
editor/ui/dialogs/content/EditorSaveAsCharset.xul
mail/base/content/ABSearchDialog.xul
mail/base/content/FilterListDialog.xul
mail/base/content/SearchDialog.xul
mail/base/content/aboutDialog.xul
mail/base/content/aboutRights.xhtml
mail/base/content/browserRequest.xul
mail/base/content/glodaFacetView.xhtml
mail/base/content/glodaFacetViewWrapper.xul
mail/base/content/hiddenWindow.xul
mail/base/content/messageWindow.xul
mail/base/content/messenger.xul
mail/base/content/multimessageview.xhtml
mail/base/content/newTagDialog.xul
mail/base/content/safeMode.xul
mail/base/content/sanitize.xul
mail/base/content/systemIntegrationDialog.xul
mail/base/test/browser/files/menulist.xul
mail/components/about-support/content/aboutSupport.xhtml
mail/components/accountcreation/content/emailWizard.xul
mail/components/activity/content/activity.xul
mail/components/addrbook/content/abContactsPanel.xul
mail/components/addrbook/content/abEditCardDialog.xul
mail/components/addrbook/content/abEditListDialog.xul
mail/components/addrbook/content/abMailListDialog.xul
mail/components/addrbook/content/abNewCardDialog.xul
mail/components/addrbook/content/addressbook.xul
mail/components/cloudfile/box/management.xhtml
mail/components/cloudfile/hightail/fileExceedsQuota.xul
mail/components/cloudfile/hightail/management.xhtml
mail/components/compose/content/messengercompose.xul
mail/components/downloads/content/aboutDownloads.xul
mail/components/im/content/addbuddy.xul
mail/components/im/content/am-im.xul
mail/components/im/content/imAccountWizard.xul
mail/components/im/content/imAccounts.xul
mail/components/im/content/joinchat.xul
mail/components/im/messages/bubbles/Footer.html
mail/components/im/messages/dark/Footer.html
mail/components/im/messages/mail/Footer.html
mail/components/im/messages/papersheets/Footer.html
mail/components/migration/content/migration.xul
mail/components/newmailaccount/content/accountProvisioner.xhtml
mail/components/preferences/aboutPreferences.xul
mail/components/preferences/advanced.inc.xul
mail/components/preferences/applicationManager.xul
mail/components/preferences/applications.inc.xul
mail/components/preferences/attachmentReminder.xul
mail/components/preferences/chat.inc.xul
mail/components/preferences/colors.xul
mail/components/preferences/compose.inc.xul
mail/components/preferences/connection.xul
mail/components/preferences/display.inc.xul
mail/components/preferences/dockoptions.xul
mail/components/preferences/fonts.xul
mail/components/preferences/general.inc.xul
mail/components/preferences/messengerLanguages.xul
mail/components/preferences/notifications.xul
mail/components/preferences/offline.xul
mail/components/preferences/privacy.inc.xul
mail/components/preferences/receipts.xul
mail/components/preferences/security.inc.xul
mail/components/preferences/sendoptions.xul
mail/extensions/mailviews/content/mailViewList.xul
mail/extensions/mailviews/content/mailViewSetup.xul
mail/test/mozmill/content-tabs/html/test-lwthemes.html
mail/test/mozmill/cookies/html/cookietest1.html
mail/test/mozmill/cookies/html/cookietest2.html
mail/test/mozmill/utils/html/collections.html
mailnews/addrbook/content/abAddressBookNameDialog.xul
mailnews/addrbook/prefs/content/pref-directory-add.xul
mailnews/addrbook/prefs/content/pref-editdirectories.xul
mailnews/base/content/folderProps.xul
mailnews/base/content/junkLog.xul
mailnews/base/content/markByDate.xul
mailnews/base/content/msgAccountCentral.xul
mailnews/base/content/msgPrintEngine.xul
mailnews/base/content/msgSelectOfflineFolders.xul
mailnews/base/content/msgSynchronize.xul
mailnews/base/content/newFolderDialog.xul
mailnews/base/content/newmailalert.xul
mailnews/base/content/newsError.xhtml
mailnews/base/content/renameFolderDialog.xul
mailnews/base/content/shutdownWindow.xul
mailnews/base/content/subscribe.xul
mailnews/base/content/virtualFolderListEdit.xul
mailnews/base/content/virtualFolderProperties.xul
mailnews/base/prefs/content/AccountManager.xul
mailnews/base/prefs/content/AccountWizard.xul
mailnews/base/prefs/content/SmtpServerEdit.xul
mailnews/base/prefs/content/am-addressing.inc.xul
mailnews/base/prefs/content/am-addressing.xul
mailnews/base/prefs/content/am-archiveoptions.xul
mailnews/base/prefs/content/am-copies.xul
mailnews/base/prefs/content/am-identities-list.xul
mailnews/base/prefs/content/am-identity-edit.xul
mailnews/base/prefs/content/am-junk.xul
mailnews/base/prefs/content/am-main.xul
mailnews/base/prefs/content/am-offline.xul
mailnews/base/prefs/content/am-server-advanced.xul
mailnews/base/prefs/content/am-server.xul
mailnews/base/prefs/content/am-serverwithnoidentities.xul
mailnews/base/prefs/content/am-smtp.xul
mailnews/base/prefs/content/removeAccount.xul
mailnews/base/search/content/CustomHeaders.xul
mailnews/base/search/content/FilterEditor.xul
mailnews/base/search/content/viewLog.xul
mailnews/compose/content/askSendFormat.xul
mailnews/compose/content/sendProgress.xul
mailnews/extensions/dsn/content/am-dsn.xul
mailnews/extensions/mdn/content/am-mdn.xul
mailnews/extensions/newsblog/content/am-newsblog.xul
mailnews/extensions/newsblog/content/feed-subscriptions.xul
mailnews/extensions/newsblog/content/feedAccountWizard.xul
mailnews/extensions/smime/content/am-smime.xul
mailnews/extensions/smime/content/certFetchingStatus.xul
mailnews/extensions/smime/content/certpicker.xul
mailnews/extensions/smime/content/msgCompSecurityInfo.xul
mailnews/extensions/smime/content/msgReadSecurityInfo.xul
mailnews/import/content/fieldMapImport.xul
mailnews/import/content/import-test.html
mailnews/import/content/importDialog.xul
mailnews/news/content/downloadheaders.xul
--- a/calendar/base/content/calendar-common-sets.xul
+++ b/calendar/base/content/calendar-common-sets.xul
@@ -6,17 +6,17 @@
 <!DOCTYPE overlay [
   <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
   <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %eventDialogDTD;
   <!ENTITY % menuOverlayDTD SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %menuOverlayDTD;
 ]>
 
 <overlay id="calendar-common-sets-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://calendar/content/calendar-common-sets.js"/>
+  <script src="chrome://calendar/content/calendar-common-sets.js"/>
 
   <broadcasterset id="calendar_broadcasters">
     <broadcaster id="modeBroadcaster" mode="calendar"/>
     <broadcaster id="calendarviewBroadcaster"/>
     <broadcaster id="unifinder-todo-filter-broadcaster"
                  persist="value"
                  value="throughcurrent"/>
   </broadcasterset>
--- a/calendar/base/content/calendar-task-view.xul
+++ b/calendar/base/content/calendar-task-view.xul
@@ -10,26 +10,26 @@
 <!DOCTYPE overlay [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/menuOverlay.dtd" > %dtd3;
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://calendar/content/calFilter.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree-view.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-task-view.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-item-bindings.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-menus.js"/>
+  <script src="chrome://calendar/content/calFilter.js"/>
+  <script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
+  <script src="chrome://calendar/content/calendar-task-tree-view.js"/>
+  <script src="chrome://calendar/content/calendar-task-tree.js"/>
+  <script src="chrome://calendar/content/calendar-task-view.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calApplicationUtils.js"/>
+  <script src="chrome://calendar/content/calendar-item-bindings.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://calendar/content/calendar-menus.js"/>
 
   <vbox id="calendarDisplayDeck">
     <vbox id="calendar-task-box" flex="1"
           onselect="taskDetailsView.onSelect(event);">
       <hbox id="task-addition-box" align="center">
         <box align="center" flex="1">
           <toolbarbutton id="calendar-add-task-button"
                          label="&calendar.newtask.button.label;"
--- a/calendar/base/content/calendar-unifinder-todo.xul
+++ b/calendar/base/content/calendar-unifinder-todo.xul
@@ -7,20 +7,20 @@
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
   <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd3;
 ]>
 
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-task-view.css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript" src="chrome://calendar/content/calFilter.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-task-tree-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder-todo.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://calendar/content/calFilter.js"/>
+  <script src="chrome://calendar/content/calendar-task-tree-utils.js"/>
+  <script src="chrome://calendar/content/calendar-unifinder-todo.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
 
   <vbox id="todo-tab-panel" persist="height,collapsed" flex="1">
     <!-- This second vbox means all of this is added to the DOM at once,
          so the label's binding doesn't complain about not having a control. -->
     <vbox flex="1">
       <box id="todo-label" align="left" collapsed="true">
         <label flex="1" crop="end" style="font-weight: bold" value="&calendar.unifinder.todoitems.label;" control="unifinder-todo-tree"/>
       </box>
--- a/calendar/base/content/calendar-unifinder.xul
+++ b/calendar/base/content/calendar-unifinder.xul
@@ -4,18 +4,18 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-task-tree.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/skin/calendar-unifinder.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://calendar/locale/calendar.dtd">
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://calendar/content/calendar-unifinder.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://calendar/content/calendar-unifinder.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
 
   <vbox id="calendar-view-box">
     <vbox id="bottom-events-box" insertbefore="calendar-nav-control" persist="height">
       <hbox id="unifinder-searchBox" persist="collapsed">
         <box align="center">
           <menulist id="event-filter-menulist" value="P7D" persist="value">
             <menupopup id="event-filter-menupopup" oncommand="refreshEventTree()">
               <menuitem id="event-filter-all"
--- a/calendar/base/content/calendar-views.xul
+++ b/calendar/base/content/calendar-views.xul
@@ -10,17 +10,17 @@
 
 <!DOCTYPE overlay [
   <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
   <!ENTITY % dtd2 SYSTEM "chrome://global/locale/global.dtd" > %dtd2;
 ]>
 
 <overlay id="calendar-views-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://calendar/content/calendar-event-gripbar.js"/>
+  <script src="chrome://calendar/content/calendar-event-gripbar.js"/>
   <vbox id="calendar-view-box" context="calendar-view-context-menu">
     <hbox id="calendar-nav-control">
       <vbox flex="1">
         <hbox flex="1" class="navigation-inner-box" align="center">
           <!-- If you are extending a view, add attributes to these
                nodes for your view. i.e if your view has the id
                "foobar-view", then you need to add the attribute
                tooltiptext-foobar="..." -->
--- a/calendar/base/content/dialogs/calendar-alarm-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-alarm-dialog.xul
@@ -21,19 +21,19 @@
         windowtype="Calendar:AlarmWindow"
         persist="screenX screenY width height"
         onload="setupWindow(); window.arguments[0].wrappedJSObject.window_onLoad();"
         onunload="finishWindow();"
         onfocus="onFocusWindow();"
         onkeypress="if (event.key == 'Escape') { window.close(); }"
         width="600"
         height="300">
-  <script type="application/javascript" src="chrome://calendar/content/calendar-alarm-dialog.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/widgets/calendar-alarm-widget.js"/>
+  <script src="chrome://calendar/content/calendar-alarm-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script src="chrome://calendar/content/widgets/calendar-alarm-widget.js"/>
 
   <hbox id="readonly-notification">
     <!-- notificationbox will be added here lazily. -->
   </hbox>
 
   <richlistbox id="alarm-richlist" flex="1" onselect="onSelectAlarm(event)"/>
 
   <hbox pack="end" id="alarm-actionbar" align="center">
--- a/calendar/base/content/dialogs/calendar-conflicts-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-conflicts-dialog.xul
@@ -6,18 +6,18 @@
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-views.css"?>
 
 <dialog id="calendar-conflicts-dialog"
         windowtype="Calendar:Conflicts"
         onload="onLoad()"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://calendar/content/mouseoverPreviews.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://calendar/content/mouseoverPreviews.js"/>
+  <script><![CDATA[
     const { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
     function onLoad() {
         let docEl = document.documentElement;
         let item = window.arguments[0].item;
         let vbox = getPreviewForItem(item, false);
         if (vbox) {
             document.getElementById("item-box").replaceWith(vbox);
         }
--- a/calendar/base/content/dialogs/calendar-error-prompt.xul
+++ b/calendar/base/content/dialogs/calendar-error-prompt.xul
@@ -17,17 +17,17 @@
         windowtype="Calendar:ErrorPrompt"
         buttons="accept"
         onload="loadErrorPrompt()"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="500"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
-    <script type="application/javascript"><![CDATA[
+    <script><![CDATA[
         function loadErrorPrompt() {
             var args = window.arguments[0].QueryInterface(Ci.nsIDialogParamBlock);
             document.getElementById("general-text").value = args.GetString(0);
             document.getElementById("error-code").value = args.GetString(1);
             document.getElementById("error-description").value = args.GetString(2);
             this.sizeToContent();
         }
         function toggleDetails() {
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xul
@@ -22,24 +22,23 @@
         defaultButton="none"
         height="500"
         persist="screenX screenY height width"
         orient="vertical"
         style="padding-top: 8px; padding-bottom: 10px; padding-inline-start: 8px; padding-inline-end: 10px;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-event-dialog-attendees-custom-elements.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-attendees.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
+  <script src="chrome://calendar/content/calendar-event-dialog-attendees-custom-elements.js"/>
+  <script src="chrome://calendar/content/calendar-event-dialog-attendees.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calendar-statusbar.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <hbox align="center" pack="end">
     <spacer flex="1"/>
     <label value="&event.freebusy.suggest.slot;"/>
     <button label="&event.freebusy.button.previous.slot;"
             dir="normal"
             class="left-icon"
             id="previous-slot"
--- a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xul
@@ -21,23 +21,23 @@
 <dialog id="calendar-event-dialog-recurrence"
         title="&recurrence.title.label;"
         windowtype="Calendar:EventDialog:Recurrence"
         onload="onLoad()"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-recurrence.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
+  <script src="chrome://calendar/content/calendar-event-dialog-recurrence.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-statusbar.js"/>
 
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <!-- recurrence pattern -->
   <groupbox id="recurrence-pattern-groupbox">
     <label id="recurrence-pattern-caption" class="header">&event.recurrence.pattern.label;</label>
     <grid id="recurrence-pattern-grid">
       <columns id="recurrence-pattern-columns">
         <column id="recurrence-pattern-description-column"/>
         <column id="recurrence-pattern-controls-column"/>
--- a/calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.xul
@@ -18,20 +18,20 @@
 <dialog id="calendar-event-dialog-reminder"
         title="&reminderdialog.title;"
         windowtype="Calendar:EventDialog:Reminder"
         onload="onLoad()"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-reminder.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
+  <script src="chrome://calendar/content/calendar-event-dialog-reminder.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <hbox id="reminder-notifications" class="notification-inline" flex="1">
     <!-- notificationbox will be added here lazily. -->
   </hbox>
 
   <!-- Listbox with custom reminders -->
   <vbox flex="1">
     <richlistbox id="reminder-listbox"
--- a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xul
@@ -20,21 +20,21 @@
 <dialog id="calendar-event-dialog-timezone"
         title="&timezone.title.label;"
         windowtype="Calendar:EventDialog:Timezone"
         onload="onLoad()"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-event-dialog-timezone.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
+  <script src="chrome://calendar/content/calendar-event-dialog-timezone.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <hbox align="center">
     <spacer flex="1"/>
     <datetimepicker id="timezone-time" disabled="true"/>
   </hbox>
 
   <menulist id="timezone-menulist" oncommand="updateTimezone()">
     <menupopup id="timezone-menupopup" style="height: 460px;"/>
--- a/calendar/base/content/dialogs/calendar-event-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xul
@@ -32,26 +32,21 @@
 <dialog title="&event.title.label;"
         windowtype="Calendar:EventDialog"
         onload="onLoadLightningItemPanel();"
         onunload="onUnloadLightningItemPanel();"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript"
-          src="chrome://lightning/content/lightning-item-panel.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/toolbarIconColor.js"/>
+  <script src="chrome://lightning/content/lightning-item-panel.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/toolbarIconColor.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="languageBundle"
                   src="chrome://global/locale/languageNames.properties"/>
   </stringbundleset>
 
   <!-- Command updater -->
   <commandset id="globalEditMenuItems"
--- a/calendar/base/content/dialogs/calendar-invitations-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-invitations-dialog.xul
@@ -17,20 +17,20 @@
   windowtype="Calendar:InvitationsDialog"
   buttons="accept,cancel"
   onload="return onLoad();"
   onunload="return onUnload();"
   persist="screenX screenY width height"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-invitations-dialog.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-invitations-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
-  <script type="application/javascript" >
+  <script >
     var invitationsText = "&calendar.invitations.dialog.invitations.text;";
   </script>
 
   <vbox id="dialog-box" flex="1">
     <stack flex="1">
       <richlistbox id="invitations-listbox" flex="1"/>
       <hbox id="updating-box" align="center" pack="center" hidden="true">
         <label value="&calendar.invitations.dialog.statusmessage.updating.text;"
--- a/calendar/base/content/dialogs/calendar-migration-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-migration-dialog.xul
@@ -18,18 +18,18 @@
         title="&migration.title;"
         windowtype="Calendar:MigrationWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="gMigrateWizard.loadMigrators()"
         branded="true"
         persist="screenX screenY">
 
-    <script type="application/javascript" src="chrome://calendar/content/calendar-migration-dialog.js"/>
-    <script type="application/javascript" src="chrome://calendar/content/import-export.js"/>
+    <script src="chrome://calendar/content/calendar-migration-dialog.js"/>
+    <script src="chrome://calendar/content/import-export.js"/>
 
     <wizardpage id="wizardPage1"
                 pageid="initialPage"
                 next="progressPage"
                 label="&migration.welcome;">
         <label id="wizard-desc" control="datasource-list">&migration.list.description;</label>
         <vbox id="datasource-list" flex="1"/>
     </wizardpage>
--- a/calendar/base/content/dialogs/calendar-occurrence-prompt.xul
+++ b/calendar/base/content/dialogs/calendar-occurrence-prompt.xul
@@ -11,17 +11,17 @@
 <dialog id="calendar-occurrence-prompt"
         buttons="accept,cancel"
         windowtype="Calendar:OccurrencePrompt"
         onload="onLoad()"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
         xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
         xhtml2:role="wairole:alertdialog">
-  <script type="application/javascript"><![CDATA[
+  <script><![CDATA[
       const { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 
       document.addEventListener("dialogaccept", () => exitOccurrenceDialog(1));
       document.addEventListener("dialogcancel", () => exitOccurrenceDialog(0));
 
       function exitOccurrenceDialog(aReturnValue) {
           window.arguments[0].value = aReturnValue;
           window.close();
--- a/calendar/base/content/dialogs/calendar-print-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-print-dialog.xul
@@ -21,20 +21,20 @@
         onload="loadCalendarPrintDialog();"
         buttons="accept,cancel"
         buttonlabelaccept="&calendar.print.button.label;"
         buttonaccesskeyaccept="&calendar.print.button.accesskey;"
         defaultButton="accept"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript" src="chrome://calendar/content/calendar-print-dialog.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
+  <script src="chrome://calendar/content/calendar-print-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <hbox id="firstHbox" flex="1">
     <vbox id="groupboxVbox">
       <groupbox id="settingsGroup">
         <label class="header">&calendar.print.settingsGroup.label;</label>
 
         <grid>
           <columns>
--- a/calendar/base/content/dialogs/calendar-properties-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-properties-dialog.xul
@@ -20,18 +20,18 @@
     buttonlabelextra1="&calendarproperties.unsubscribe.label;"
     buttonaccesskeyextra1="&calendarproperties.unsubscribe.accesskey;"
     onload="onLoad()"
     persist="screenX screenY"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     width="500">
 
-  <script type="application/javascript" src="chrome://calendar/content/calendar-properties-dialog.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-properties-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
   <description id="force-disabled-description" hidden="true">&calendarproperties.forceDisabled.label;</description>
 
   <checkbox id="calendar-enabled-checkbox"
             label="&calendarproperties.enabled.label;"
             oncommand="setupEnabledCheckbox()"/>
 
   <grid id="calendar-properties-grid">
--- a/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xul
@@ -15,18 +15,18 @@
         title="&providerUninstall.title;"
         windowtype="Calendar:ProviderUninstall"
         height="320"
         width="480"
         onload="onLoad()"
         buttonlabelaccept="&providerUninstall.accept.label;"
         buttonaccesskeyaccept="&providerUninstall.accept.accesskey;">
 
-  <script type="application/javascript" src="chrome://calendar/content/calendar-providerUninstall-dialog.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-providerUninstall-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
   <description id="pre-name-description">&providerUninstall.preName.label;</description>
   <label id="provider-name-label"/>
   <description id="post-name-description">&providerUninstall.postName.label;</description>
   <description id="reinstall-note-description">&providerUninstall.reinstallNote.label;</description>
 
   <calendar-list-tree id="calendar-list-tree"
                       hidecolumnpicker="true"
--- a/calendar/base/content/dialogs/calendar-subscriptions-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-subscriptions-dialog.xul
@@ -20,18 +20,18 @@
   buttons="accept,cancel"
   onload="return onLoad();"
   onunload="return onUnload();"
   onkeypress="onKeyPress(event);"
   persist="screenX screenY width height"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-subscriptions-dialog.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-subscriptions-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
   <vbox flex="1">
     <grid flex="1">
       <columns>
         <column flex="1"/>
         <column/>
       </columns>
       <rows>
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xul
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xul
@@ -32,28 +32,22 @@
         onload="onLoad()"
         onunload="onUnload()"
         onresize="rearrangeAttendees();"
         persist="screenX screenY width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- Javascript includes -->
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-summary-dialog.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-item-editing.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-item-bindings.js"/>
+  <script src="chrome://calendar/content/calendar-summary-dialog.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script src="chrome://calendar/content/calApplicationUtils.js"/>
+  <script src="chrome://calendar/content/calendar-item-bindings.js"/>
 
   <toolbox id="summary-toolbox"
            class="mail-toolbox"
            mode="full"
            defaultmode="full"
            iconsize="small"
            defaulticonsize="small"
            labelalign="end"
--- a/calendar/base/content/dialogs/chooseCalendarDialog.xul
+++ b/calendar/base/content/dialogs/chooseCalendarDialog.xul
@@ -14,17 +14,17 @@
 <dialog id="chooseCalendar"
         title="&calendar.select.dialog.title;"
         windowtype="Calendar:CalendarPicker"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel"
         onload="setTimeout(loadCalendars, 0);"
         persist="screenX screenY height width">
 
-    <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-    <script type="application/javascript" src="chrome://calendar/content/chooseCalendarDialog.js"/>
+    <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+    <script src="chrome://calendar/content/chooseCalendarDialog.js"/>
 
     <vbox id="dialog-box" flex="1">
         <label id="prompt" control="calendar-list"/>
         <richlistbox id="calendar-list" flex="1" seltype="single"/>
         <description id="promptNotify"/>
     </vbox>
 </dialog>
--- a/calendar/base/content/preferences/editCategory.xul
+++ b/calendar/base/content/preferences/editCategory.xul
@@ -12,17 +12,17 @@
   <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd2;
 ]>
 
 <dialog id="editCategory"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel"
         onload="editCategoryLoad();">
-  <script type="application/javascript" src="chrome://calendar/content/preferences/editCategory.js"/>
+  <script src="chrome://calendar/content/preferences/editCategory.js"/>
 
   <vbox id="dialog-box">
     <label value="&pref.categories.name.label;"
            control="categoryName"/>
     <textbox id="categoryName"
              flex="1"
              onchange="categoryNameChanged()"
              oninput="delay(500, categoryNameChanged)"/>
--- a/calendar/base/content/today-pane.xul
+++ b/calendar/base/content/today-pane.xul
@@ -12,22 +12,22 @@
   <!ENTITY % dtd6 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd"> %dtd6;
 ]>
 
 <?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript" src="chrome://calendar/content/agenda-listbox.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/today-pane.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/agenda-listbox-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script src="chrome://calendar/content/agenda-listbox.js"/>
+  <script src="chrome://calendar/content/today-pane.js"/>
+  <script src="chrome://calendar/content/agenda-listbox-utils.js"/>
+  <script src="chrome://calendar/content/calendar-management.js"/>
+  <script src="chrome://calendar/content/calendar-dnd-listener.js"/>
+  <script src="chrome://calendar/content/calendar-item-editing.js"/>
 
   <modevbox id="today-pane-panel"
             mode="mail,calendar,task" modewidths="200,200,200" modesplitterstates="open,open,open"
             refcontrol="calendar_toggle_todaypane_command"
             broadcaster="modeBroadcaster" persist="modewidths">
     <sidebarheader align="center">
       <label id ="today-pane-header"/>
       <spacer flex="1"/>
--- a/calendar/lightning/content/html-item-editing/lightning-item-iframe.html
+++ b/calendar/lightning/content/html-item-editing/lightning-item-iframe.html
@@ -11,17 +11,17 @@
   </head>
   <body>
     <!-- This div's id must be "container" for React.js to use it -->
     <div id='container'>
       <p>
         If you can see this, React is still loading or is not working right.
       </p>
     </div>
-    <script type="application/javascript" src="resource://devtools/client/shared/vendor/react.js"></script>
-    <script type="application/javascript" src="resource://devtools/client/shared/vendor/react-dom.js"></script>
+    <script src="resource://devtools/client/shared/vendor/react.js"></script>
+    <script src="resource://devtools/client/shared/vendor/react-dom.js"></script>
     <script src='chrome://calendar/content/calendar-dialog-utils.js'></script>
     <script src='chrome://calendar/content/calendar-ui-utils.js'></script>
     <script src='chrome://global/content/globalOverlay.js'></script>
     <script src='chrome://lightning/content/lightning-item-iframe.js'></script>
     <script src='chrome://lightning/content/html-item-editing/react-code.js'></script>
   </body>
 </html>
--- a/calendar/lightning/content/imip-bar-overlay.xul
+++ b/calendar/lightning/content/imip-bar-overlay.xul
@@ -5,24 +5,20 @@
 
 <!DOCTYPE overlay [
     <!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
     %lightningDTD;
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-    <script type="application/javascript"
-            src="chrome://lightning/content/lightning-utils.js"/>
-    <script type="application/javascript"
-            src="chrome://lightning/content/imip-bar.js"/>
-    <script type="application/javascript"
-            src="chrome://calendar/content/calendar-management.js"/>
-    <script type="application/javascript"
-            src="chrome://calendar/content/calendar-ui-utils.js"/>
+    <script src="chrome://lightning/content/lightning-utils.js"/>
+    <script src="chrome://lightning/content/imip-bar.js"/>
+    <script src="chrome://calendar/content/calendar-management.js"/>
+    <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
     <vbox id="messagepanebox">
       <vbox id="singlemessage" insertbefore="msgHeaderView">
         <hbox id="imip-bar"
               class="lightning-notification-bar"
               collapsed="true"
               insertbefore="msgHeaderView"
               label="&lightning.imipbar.description;">
--- a/calendar/lightning/content/lightning-calendar-creation.xul
+++ b/calendar/lightning/content/lightning-calendar-creation.xul
@@ -6,22 +6,19 @@
 
 <?xml-stylesheet href="chrome://messenger/content/notification.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd">
 
 <overlay id="ltnCalendarCreationOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://lightning/content/lightning-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://lightning/content/lightning-calendar-creation.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://lightning/content/lightning-utils.js"/>
+  <script src="chrome://lightning/content/lightning-calendar-creation.js"/>
 
   <rows id="customize-rows">
     <hbox id="no-identity-notification" class="notification-inline" flex="1">
       <!-- notificationbox will be added here lazily. -->
     </hbox>
     <row id="calendar-email-identity-row"
          align="center"
          insertafter="no-identity-notification">
--- a/calendar/lightning/content/lightning-calendar-properties.xul
+++ b/calendar/lightning/content/lightning-calendar-properties.xul
@@ -6,22 +6,19 @@
 
 <?xml-stylesheet href="chrome://messenger/content/notification.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd">
 
 <overlay id="ltnCalendarPropertiesOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://lightning/content/lightning-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://lightning/content/lightning-calendar-properties.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://lightning/content/lightning-utils.js"/>
+  <script src="chrome://lightning/content/lightning-calendar-properties.js"/>
 
   <rows id="calendar-properties-rows">
     <hbox id="no-identity-notification" class="notification-inline" flex="1">
       <!-- notificationbox will be added here lazily. -->
     </hbox>
     <row id="calendar-email-identity-row"
          align="center"
          insertafter="no-identity-notification">
--- a/calendar/lightning/content/lightning-item-iframe.xul
+++ b/calendar/lightning/content/lightning-item-iframe.xul
@@ -34,34 +34,25 @@
 <window id="calendar-event-dialog-inner"
       onload="onLoad();"
       onunload="onEventDialogUnload();"
       onresize="rearrangeAttendees();"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml">
 
   <!-- JavaScript includes -->
-  <script type="application/javascript"
-          src="chrome://lightning/content/lightning-item-iframe.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calApplicationUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/printUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/calendar-statusbar.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript"
-          src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
+  <script src="chrome://lightning/content/lightning-item-iframe.js"/>
+  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calApplicationUtils.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://calendar/content/calendar-statusbar.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://calendar/content/datetimepickers/datetimepickers.js"/>
 
   <commandset id="">
     <command id="cmd_recurrence"
              oncommand="editRepeat();"/>
     <command id="cmd_attendees"
              oncommand="editAttendees();"/>
     <command id="cmd_email"
              oncommand="sendMailToAttendees(window.attendees);"/>
--- a/calendar/lightning/content/lightning-migration.xul
+++ b/calendar/lightning/content/lightning-migration.xul
@@ -14,18 +14,18 @@
 
 <!-- DTD File with all strings specific to the file -->
 <!DOCTYPE overlay
 [
 ]>
 
 <overlay id="ltnMigrationOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-    <script type="application/javascript" src="chrome://calendar/content/calendar-migration-dialog.js"/>
-    <script type="application/javascript"><![CDATA[
+    <script src="chrome://calendar/content/calendar-migration-dialog.js"/>
+    <script><![CDATA[
         function checkOld() {
             var calMgr = Cc["@mozilla.org/calendar/manager;1"].getService(Ci.calICalendarManager);
             var cals = calMgr.getCalendars({});
             if (!cals.length) {
                 // There are no calendars, so we are running for the first time
                 gDataMigrator.checkAndMigrate();
             }
         }
--- a/calendar/lightning/content/messenger-overlay-messageWindow.xul
+++ b/calendar/lightning/content/messenger-overlay-messageWindow.xul
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <overlay id="messsenger-overlay-messageWindow"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-    <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
-    <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
+    <script src="chrome://calendar/content/calendar-statusbar.js"/>
+    <script src="chrome://calendar/content/calendar-item-editing.js"/>
 </overlay>
--- a/calendar/lightning/content/messenger-overlay-preferences.xul
+++ b/calendar/lightning/content/messenger-overlay-preferences.xul
@@ -57,36 +57,29 @@
                 </tabpanel>
                 <tabpanel orient="vertical">
 #include ../../base/content/preferences/views.inc.xul
                 </tabpanel>
             </tabpanels>
         </tabbox>
     </prefpane>
 
-    <script type="application/javascript"
-            src="chrome://calendar/content/calendar-ui-utils.js"/>
-    <script type="application/javascript"
-            src="chrome://calendar/content/calendar-dialog-utils.js"/>
+    <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+    <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
 
     <!-- Get the localized text for use in the .js -->
-    <script type="application/javascript">
+    <script>
         var labelLong  = "&pref.dateformat.long;";
         var labelShort = "&pref.dateformat.short;";
         var noneLabel  = "&pref.categories.none.label;";
         var newTitle   = "&pref.categories.new.title;";
         var editTitle  = "&pref.categories.edit.title;";
         var overwrite  = "&pref.categories.overwrite;";
         var overwriteTitle = "&pref.categories.overwrite.title;";
         var noBlankCategories = "&pref.categories.noBlankCategories;";
     </script>
 
-    <script type="application/javascript"
-            src="chrome://calendar/content/preferences/general.js"/>
-    <script type="application/javascript"
-            src="chrome://calendar/content/preferences/alarms.js"/>
-    <script type="application/javascript"
-            src="chrome://calendar/content/preferences/categories.js"/>
-    <script type="application/javascript"
-            src="chrome://calendar/content/preferences/views.js"/>
-    <script type="application/javascript"
-            src="chrome://lightning/content/messenger-overlay-preferences.js"/>
+    <script src="chrome://calendar/content/preferences/general.js"/>
+    <script src="chrome://calendar/content/preferences/alarms.js"/>
+    <script src="chrome://calendar/content/preferences/categories.js"/>
+    <script src="chrome://calendar/content/preferences/views.js"/>
+    <script src="chrome://lightning/content/messenger-overlay-preferences.js"/>
 </overlay>
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -26,51 +26,51 @@
 <?xul-overlay href="chrome://calendar/content/calendar-common-sets.xul"?>
 <?xul-overlay href="chrome://calendar/content/calendar-views.xul"?>
 
 <?xul-overlay href="chrome://lightning/content/lightning-toolbar.xul"?>
 <?xul-overlay href="chrome://lightning/content/lightning-menus.xul"?>
 
 <overlay id="ltnSidebarOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://calendar/content/calendar-base-view.js"/>
+  <script src="chrome://calendar/content/calendar-base-view.js"/>
 
   <!-- NEEDED FOR MULTIPLE CALENDAR SUPPORT -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-management.js"/>
+  <script src="chrome://calendar/content/calendar-management.js"/>
 
   <!-- NEEDED FOR CLIPBOARD SUPPORT -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-clipboard.js"/>
+  <script src="chrome://calendar/content/calendar-clipboard.js"/>
 
   <!-- NEEDED FOR IMPORT / EXPORT SUPPORT -->
-  <script type="application/javascript" src="chrome://calendar/content/import-export.js"/>
+  <script src="chrome://calendar/content/import-export.js"/>
 
   <!-- NEEDED FOR PUBLICATION SUPPORT -->
-  <script type="application/javascript" src="chrome://calendar/content/publish.js"/>
+  <script src="chrome://calendar/content/publish.js"/>
 
-  <script type="application/javascript" src="chrome://calendar/content/calendar-item-editing.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-chrome-startup.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/mouseoverPreviews.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-views.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-creation.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-dnd-listener.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-statusbar.js"/>
-  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script src="chrome://calendar/content/calendar-item-editing.js"/>
+  <script src="chrome://calendar/content/calendar-chrome-startup.js"/>
+  <script src="chrome://calendar/content/mouseoverPreviews.js"/>
+  <script src="chrome://calendar/content/calendar-views.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://calendar/content/calendar-creation.js"/>
+  <script src="chrome://calendar/content/calendar-dnd-listener.js"/>
+  <script src="chrome://calendar/content/calendar-statusbar.js"/>
+  <script src="chrome://global/content/nsDragAndDrop.js"/>
 
   <!-- NEEDED FOR TASK VIEW/LIST SUPPORT -->
-  <script type="application/javascript" src="chrome://calendar/content/calendar-task-editing.js"/>
+  <script src="chrome://calendar/content/calendar-task-editing.js"/>
 
-  <script type="application/javascript" src="chrome://calendar/content/calendar-extract.js"/>
+  <script src="chrome://calendar/content/calendar-extract.js"/>
 
-  <script type="application/javascript" src="chrome://lightning/content/lightning-utils.js"/>
-  <script type="application/javascript" src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-invitations-manager.js"/>
+  <script src="chrome://lightning/content/lightning-utils.js"/>
+  <script src="chrome://lightning/content/messenger-overlay-sidebar.js"/>
+  <script src="chrome://calendar/content/calendar-invitations-manager.js"/>
 
   <!-- NEEDED FOR EVENT/TASK IN A TAB -->
-  <script type="application/javascript" src="chrome://lightning/content/lightning-item-panel.js"/>
+  <script src="chrome://lightning/content/lightning-item-panel.js"/>
 
   <window id="messengerWindow">
     <!-- Be sure to keep these sets, since they will be overlaid by
          calendar/base/content/calendar-common-sets.xul -->
     <commandset id="calendar_commands">
       <command id="agenda_delete_event_command" oncommand="agendaListbox.deleteSelectedItem(false);"/>
       <command id="agenda_edit_event_command" oncommand="agendaListbox.editSelectedItem(event);"/>
       <command id="switch2calendar"
--- a/calendar/lightning/content/suite-overlay-addons.xul
+++ b/calendar/lightning/content/suite-overlay-addons.xul
@@ -2,17 +2,17 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 <overlay id="suiteAddonsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"><![CDATA[
+  <script><![CDATA[
     var lightningPrefs = {
       guid: "{e2fda1a4-762b-4020-b5ad-a41df1933103}",
       handleEvent: function(aEvent) {
         var item = gListView.getListItemForID(this.guid);
         if (!item)
           return;
 
         item.showPreferences = this.showPreferences;
--- a/calendar/lightning/content/suite-overlay-sidebar.xul
+++ b/calendar/lightning/content/suite-overlay-sidebar.xul
@@ -2,17 +2,17 @@
 
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this file,
    - You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 <overlay id="suiteSidebarOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript" src="chrome://lightning/content/suite-overlay-sidebar.js"/>
+  <script src="chrome://lightning/content/suite-overlay-sidebar.js"/>
 
   <key id="openLightningKey" removeelement="true"/>
   <key id="openTasksKey" removeelement="true"/>
   <key id="calendar-new-event-key" removeelement="true"/>
   <key id="calendar-new-todo-key" removeelement="true"/>
 
   <menuitem id="CustomizeTaskActionsToolbar"
             oncommand="goCustomizeToolbar(document.getElementById('task-actions-toolbox'))"/>
--- a/calendar/providers/caldav/content/caldav-lightning-calendar-creation.xul
+++ b/calendar/providers/caldav/content/caldav-lightning-calendar-creation.xul
@@ -3,20 +3,18 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd">
 
 <overlay id="ltnCalendarCreationOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://lightning/content/caldav-lightning-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://lightning/content/caldav-lightning-calendar-creation.js"/>
+  <script src="chrome://lightning/content/caldav-lightning-utils.js"/>
+  <script src="chrome://lightning/content/caldav-lightning-calendar-creation.js"/>
 
   <rows id="customize-rows">
     <row id="calendar-force-email-scheduling-row"
          align="center"
          insertafter="calendar-email-identity-row">
       <spacer/>
       <!-- The capability to enforce email scheduling wouldn't be enabled in the calendar wizard
            atm because we would have to check the server capabilities with an OPTIONS request to
--- a/calendar/providers/caldav/content/caldav-lightning-calendar-properties.xul
+++ b/calendar/providers/caldav/content/caldav-lightning-calendar-properties.xul
@@ -3,20 +3,18 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://lightning/locale/lightning.dtd">
 
 <overlay id="ltnCalendarPropertiesOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://lightning/content/caldav-lightning-utils.js"/>
-  <script type="application/javascript"
-          src="chrome://lightning/content/caldav-lightning-calendar-properties.js"/>
+  <script src="chrome://lightning/content/caldav-lightning-utils.js"/>
+  <script src="chrome://lightning/content/caldav-lightning-calendar-properties.js"/>
 
   <rows id="calendar-properties-rows">
     <row id="calendar-force-email-scheduling-row"
          align="center"
          insertafter="calendar-email-identity-row">
       <spacer/>
       <checkbox id="force-email-scheduling"
                 label="&lightning.calendarproperties.forceEmailScheduling.label;"
--- a/calendar/providers/gdata/content/browserRequest.xul
+++ b/calendar/providers/gdata/content/browserRequest.xul
@@ -13,17 +13,17 @@
         buttons=","
         onload="loadRequestedUrl()"
         onclose="reportUserClosed()"
         title=""
         width="800"
         height="500"
         orient="vertical">
 
-  <script type="application/javascript" src="chrome://gdata-provider/content/browserRequest.js"/>
+  <script src="chrome://gdata-provider/content/browserRequest.js"/>
 
   <keyset id="mainKeyset">
     <key id="key_close" key="w" modifiers="accel" oncommand="cancelRequest()"/>
     <key id="key_close2"  keycode="VK_ESCAPE" oncommand="cancelRequest()"/>
   </keyset>
   <vbox id="header">
     <description id="dialogMessage"/>
     <hbox id="addressbox" flex="1" disabled="true">
--- a/calendar/providers/gdata/content/gdata-calendar-creation.xul
+++ b/calendar/providers/gdata/content/gdata-calendar-creation.xul
@@ -9,17 +9,17 @@
 ]>
 
 <?xml-stylesheet href="chrome://calendar/skin/calendar-management.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/widgets/calendar-widget-bindings.css" type="text/css"?>
 <?xml-stylesheet href="chrome://gdata-provider/skin/gdata-bindings.css" type="text/css"?>
 
 <overlay id="gdataCalendarCreation"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-calendar-creation.js"/>
+  <script src="chrome://gdata-provider/content/gdata-calendar-creation.js"/>
   <radiogroup id="calendar-format">
     <radio value="gdata" label="&gdata-provider.label;"/>
   </radiogroup>
 
   <wizard id="calendar-wizard">
     <description id="gdata-nextstep-description" hidden="true">&gdata.wizard.nextstep.description;</description>
 
     <wizardpage id="gdata-session"
--- a/calendar/providers/gdata/content/gdata-calendar-properties.xul
+++ b/calendar/providers/gdata/content/gdata-calendar-properties.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <overlay id="gdata-calendar-properties"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-calendar-properties.js"/>
+  <script src="chrome://gdata-provider/content/gdata-calendar-properties.js"/>
 </overlay>
--- a/calendar/providers/gdata/content/gdata-event-dialog-reminder.xul
+++ b/calendar/providers/gdata/content/gdata-event-dialog-reminder.xul
@@ -5,17 +5,17 @@
 
 <?xml-stylesheet type="text/css" href="chrome://messenger/content/notification.css"?>
 <?xml-stylesheet type="text/css" href="chrome://gdata-provider/skin/gdata-event-dialog-reminder.css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://gdata-provider/locale/gdata.dtd">
 
 <overlay id="gdata-event-dialog-reminder-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-event-dialog-reminder.js"/>
+  <script src="chrome://gdata-provider/content/gdata-event-dialog-reminder.js"/>
   <menupopup id="reminder-actions-menupopup">
     <menuitem id="reminder-action-SMS"
               class="reminder-icon menuitem-iconic"
               value="SMS"
               insertafter="reminder-action-EMAIL reminder-action-DISPLAY"
               provider="gdata"
               label="&gdata.reminder.action.sms.label;"/>
   </menupopup>
--- a/calendar/providers/gdata/content/gdata-event-dialog.xul
+++ b/calendar/providers/gdata/content/gdata-event-dialog.xul
@@ -2,17 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://gdata-provider/locale/gdata.dtd">
 
 <overlay id="gdata-calendar-event-dialog"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-event-dialog.js"/>
+  <script src="chrome://gdata-provider/content/gdata-event-dialog.js"/>
 
   <!-- Privacy items -->
   <menupopup id="options-privacy-menupopup">
     <menuitem id="gdata-options-privacy-default-menuitem"
               insertbefore="options-privacy-public-menuitem,options-privacy-private-menuitem"
               label="&gdata.privacy.default.label;"
               accesskey="&gdata.privacy.default.accesskey;"
               type="radio"
--- a/calendar/providers/gdata/content/gdata-lightning-item-iframe.xul
+++ b/calendar/providers/gdata/content/gdata-lightning-item-iframe.xul
@@ -2,17 +2,17 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://gdata-provider/locale/gdata.dtd">
 
 <overlay id="gdata-lightning-item-iframe"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-lightning-item-iframe.js"/>
+  <script src="chrome://gdata-provider/content/gdata-lightning-item-iframe.js"/>
 
   <menupopup id="item-alarm-menupopup">
     <menuitem id="gdata-reminder-default-menuitem"
               insertbefore="reminder-none-separator"
               label="&gdata.reminder.default;"
               provider="gdata"
               value="default"/>
   </menupopup>
--- a/calendar/providers/gdata/content/gdata-migration-overlay.xul
+++ b/calendar/providers/gdata/content/gdata-migration-overlay.xul
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <overlay id="gdata-migration-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-migration.js"/>
+  <script src="chrome://gdata-provider/content/gdata-migration.js"/>
 </overlay>
--- a/calendar/providers/gdata/content/gdata-migration-wizard.xul
+++ b/calendar/providers/gdata/content/gdata-migration-wizard.xul
@@ -11,16 +11,16 @@
         title="&gdata.migration.title;"
         windowtype="Calendar:GData:MigrationDialog"
         buttons="accept,cancel"
         acceptLabel="&gdata.migration.upgrade.label;"
         acceptKey="&gdata.migration.upgrade.accesskey;"
         width="300"
         height="300"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://gdata-provider/content/gdata-migration.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-views.js"/>
-  <script type="application/javascript" src="chrome://calendar/content/calendar-ui-utils.js"/>
+  <script src="chrome://gdata-provider/content/gdata-migration.js"/>
+  <script src="chrome://calendar/content/calendar-views.js"/>
+  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
 
   <description>&gdata.migration.description;</description>
   <vbox id="calendars-listbox" flex="1"/>
   <checkbox id="showagain-checkbox" label="&gdata.migration.showagain.label;"/>
 </dialog>
--- a/calendar/resources/content/calendarCreation.xul
+++ b/calendar/resources/content/calendarCreation.xul
@@ -16,17 +16,17 @@
 <wizard id="calendar-wizard"
         title="&wizard.title;"
         windowtype="Calendar:NewCalendarWizard"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="onLoad()"
         persist="screenX screenY">
 
-  <script type="application/javascript" src="chrome://calendar/content/calendarCreation.js"/>
+  <script src="chrome://calendar/content/calendarCreation.js"/>
 
   <wizardpage id="initialPage"
               pageid="initialPage"
               next="locationPage"
               label="&wizard.label;"
               description="&wizard.description;">
     <description>&initialpage.description;</description>
     <radiogroup id="calendar-type">
--- a/calendar/resources/content/publishDialog.xul
+++ b/calendar/resources/content/publishDialog.xul
@@ -20,18 +20,18 @@
         buttons="accept,cancel"
         onload="loadCalendarPublishDialog()"
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#">
 
   <!-- Javascript includes -->
-  <script type="application/javascript" src="chrome://calendar/content/publishDialog.js"/>
-  <script type="application/javascript">
+  <script src="chrome://calendar/content/publishDialog.js"/>
+  <script>
     var publishButtonLabel = "&calendar.publish.publish.button;";
     var closeButtonLabel = "&calendar.publish.close.button;";
   </script>
 
   <!-- Data used in JS from dtd -->
   <keyset id="dialogKeys"/>
 
   <!-- The dialog -->
--- a/chat/content/browserRequest.xul
+++ b/chat/content/browserRequest.xul
@@ -13,17 +13,17 @@
         buttons=","
         onload="loadRequestedUrl()"
         onclose="reportUserClosed()"
         title=""
         width="800"
         height="500"
         orient="vertical">
 
-  <script type="application/javascript" src="chrome://chat/content/browserRequest.js"/>
+  <script src="chrome://chat/content/browserRequest.js"/>
 
   <keyset id="mainKeyset">
     <key id="key_close"   key="w" modifiers="accel" oncommand="cancelRequest()"/>
     <key id="key_close2"  keycode="VK_ESCAPE" oncommand="cancelRequest()"/>
   </keyset>
   <hbox id="header">
     <image id="headerImage" src="chrome://chat/skin/prpl-generic/icon32.png"/>
     <vbox>
--- a/common/src/customizeToolbar.xul
+++ b/common/src/customizeToolbar.xul
@@ -41,21 +41,21 @@
         onload="overlayOnLoad();"
 #endif
         onunload="onUnload();"
         style="&dialog.dimensions;"
         persist="width height"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
 #ifdef MOZ_SUITE
-<script type="application/javascript" src="chrome://communicator/content/customizeToolbar.js"/>
+<script src="chrome://communicator/content/customizeToolbar.js"/>
 <stringbundle id="stringBundle" src="chrome://communicator/locale/customizeToolbar.properties"/>
 #else
-<script type="application/javascript" src="chrome://messenger/content/customizeToolbar.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
+<script src="chrome://messenger/content/customizeToolbar.js"/>
+<script src="chrome://messenger/content/mailCore.js"/>
 <stringbundle id="stringBundle" src="chrome://messenger/locale/customizeToolbar.properties"/>
 #endif
 
 <keyset id="CustomizeToolbarKeyset">
   <key id="cmd_close1" keycode="VK_ESCAPE" oncommand="onClose();"/>
   <key id="cmd_close2" keycode="VK_RETURN" oncommand="onClose();"/>
 </keyset>
 
--- a/common/src/viewSource.xul
+++ b/common/src/viewSource.xul
@@ -29,25 +29,25 @@
         titlemodifier="&mainWindow.titlemodifier;"
         titlepreface="&mainWindow.preface;"
         titlemenuseparator ="&mainWindow.titlemodifierseparator;"
         windowtype="navigator:view-source"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/printUtils.js"/>
 #ifndef MOZ_SUITE
-<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
+<script src="chrome://messenger/content/mailCore.js"/>
 #endif
-  <script type="application/javascript" src="chrome://messenger/content/viewSource.js"/>
-  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://messenger/content/viewSource.js"/>
+  <script src="chrome://global/content/viewZoomOverlay.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <stringbundle id="viewSourceBundle" src="chrome://messenger/locale/viewSource.properties"/>
 
   <command id="cmd_savePage" oncommand="ViewSourceSavePage();"/>
   <command id="cmd_print" oncommand="PrintUtils.printWindow(gBrowser.outerWindowID, gBrowser);"/>
   <command id="cmd_printpreview" oncommand="PrintUtils.printPreview(PrintPreviewListener);"/>
   <command id="cmd_pagesetup" oncommand="PrintUtils.showPageSetup();"/>
   <command id="cmd_close" oncommand="window.close();"/>
--- a/editor/ui/composer/content/EditorContextMenuOverlay.xul
+++ b/editor/ui/composer/content/EditorContextMenuOverlay.xul
@@ -3,18 +3,18 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://editor/locale/editorOverlay.dtd">
 
 <overlay id="ComposerContextMenuOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-<script type="application/javascript" src="chrome://editor/content/EditorContextMenu.js"/>
-<script type="application/javascript" src="chrome://editor/content/StructBarContextMenu.js"/>
+<script src="chrome://editor/content/EditorContextMenu.js"/>
+<script src="chrome://editor/content/StructBarContextMenu.js"/>
 
   <menupopup id="contentAreaContextMenu"
              onpopupshowing="return event.target != this ||
                                     editorContextPopupShowing(this);">
     <menuitem id="menu_pasteNoFormatting_cm"
               insertafter="context-paste"
               command="cmd_pasteNoFormatting"/>
 
--- a/editor/ui/composer/content/editingOverlay.xul
+++ b/editor/ui/composer/content/editingOverlay.xul
@@ -5,18 +5,17 @@
 
 <?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://editor/locale/editingOverlay.dtd">
 
 <overlay id="editingOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://editor/content/editingOverlay.js"/>
+  <script src="chrome://editor/content/editingOverlay.js"/>
 
   <stringbundleset>
     <stringbundle id="bundle_viewZoom"/>
   </stringbundleset>
 
   <keyset id="editorKeys">
     <key id="key_openRemoteEditor"
          key="&openRemoteCmd.key;"
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -42,22 +42,22 @@
         lightweightthemesfooter="status-bar"
         windowtype="composer:html"
         macanimationtype="document"
         drawtitle="true"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/javascript" src="chrome://editor/content/editor.js"/>
-  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script src="chrome://editor/content/editor.js"/>
+  <script src="chrome://editor/content/publishprefs.js"/>
+  <script src="chrome://communicator/content/contentAreaDD.js"/>
+  <script src="chrome://communicator/content/contentAreaClick.js"/>
+  <script src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://global/content/nsDragAndDrop.js"/>
 
   <popupset id="contentAreaContextSet"/>
   <menupopup id="structToolbarContext"/>
   <menupopup id="sidebarPopup"/>
   <menupopup id="popupNotificationMenu"/>
 
   <commandset id="editorCommands">
     <commandset id="commonEditorMenuItems"/>
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -9,18 +9,18 @@
 <!ENTITY % platformCommunicatorDTD SYSTEM
   "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicatorDTD;
 ]>
 
 <overlay id="editorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-<script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-<script type="application/javascript" src="chrome://editor/content/ComposerCommands.js"/>
+<script src="chrome://editor/content/editorUtilities.js"/>
+<script src="chrome://editor/content/ComposerCommands.js"/>
 
   <keyset id="editorKeys">
     <!-- defined in globalOverlay -->
     <key id="key_newNavigator"/>
     <key id="key_newPrivateWindow"/>
     <key id="key_newBlankPage"/>
     <key id="key_save"
          key="&saveCmd.key;"
--- a/editor/ui/composer/content/editorTasksOverlay.xul
+++ b/editor/ui/composer/content/editorTasksOverlay.xul
@@ -3,18 +3,17 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/tasksOverlay.dtd">
 
 <overlay id="editorTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://editor/content/editorApplicationOverlay.js"/>
+  <script src="chrome://editor/content/editorApplicationOverlay.js"/>
 
   <keyset id="tasksKeys">
     <key id="key_editor" key="&editorCmd.commandkey;" command="Tasks:Editor" modifiers="accel"/>
   </keyset>
 
   <commandset id="tasksCommands">
     <command id="Tasks:Editor" oncommand="toEditor();"/>
   </commandset>
--- a/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -14,28 +14,28 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     id="advancedEditDlg"
     style="width: 40em;"
     title="&WindowTitle.label;"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
   <!-- element page functions -->
-  <script type="application/javascript" src="chrome://editor/content/EdAEHTMLAttributes.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdAECSSAttributes.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdAEJSEAttributes.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdAEAttributes.js"/>
+  <script src="chrome://editor/content/EdAEHTMLAttributes.js"/>
+  <script src="chrome://editor/content/EdAECSSAttributes.js"/>
+  <script src="chrome://editor/content/EdAEJSEAttributes.js"/>
+  <script src="chrome://editor/content/EdAEAttributes.js"/>
 
   <!-- global dialog functions -->
-  <script type="application/javascript" src="chrome://editor/content/EdAdvancedEdit.js"/>
+  <script src="chrome://editor/content/EdAdvancedEdit.js"/>
 
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <hbox>
     <label value="&currentattributesfor.label;"/>
     <label class="header" id="tagLabel"/>
   </hbox>
 
   <separator class="thin"/>
 
--- a/editor/ui/dialogs/content/EdButtonProps.xul
+++ b/editor/ui/dialogs/content/EdButtonProps.xul
@@ -14,19 +14,19 @@
 ]>
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdButtonProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdButtonProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header">&Settings.label;</label>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="ButtonType" value="&ButtonType.label;" accesskey="&ButtonType.accesskey;"/>
--- a/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/editor/ui/dialogs/content/EdColorPicker.xul
@@ -8,19 +8,19 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdColorPicker.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdColorPicker.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdColorPicker.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <hbox id="TableOrCellGroup" align="center" collapsed="true">
     <label control="CellOrTableGroup" value="&background.label;" accesskey="&background.accessKey;"/>
     <radiogroup id="CellOrTableGroup" orient="horizontal">
       <radio id="TableRadio" label="&table.label;" accesskey="&table.accessKey;"/>
       <radio id="CellRadio"  label="&cell.label;"  accesskey="&cell.accessKey;"/>
--- a/editor/ui/dialogs/content/EdColorProps.xul
+++ b/editor/ui/dialogs/content/EdColorProps.xul
@@ -14,19 +14,19 @@
 <!ENTITY % edDialogOverlay SYSTEM "chrome://editor/locale/EdDialogOverlay.dtd">
 %edDialogOverlay;
 ]>
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdColorProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdColorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox align="start">
     <label class="header">&pageColors.label;</label>
     <radiogroup id="PageColorGroup">
       <radio id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
         accesskey="&defaultColorsRadio.accessKey;"
--- a/editor/ui/dialogs/content/EdConvertToTable.xul
+++ b/editor/ui/dialogs/content/EdConvertToTable.xul
@@ -10,20 +10,20 @@
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdConvertToTable.dtd">
 
 <dialog title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
    onload = "Startup()"
    style="min-width:20em">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script type="application/javascript" src="chrome://editor/content/EdConvertToTable.js"/>
+  <script src="chrome://editor/content/EdConvertToTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <description class="wrap" flex="1">&instructions1.label;</description>
   <description class="wrap" flex="1">&instructions2.label;</description>
   <radiogroup id="SepRadioGroup" persist="index character" index="0" character="">
     <radio id="comma" label="&commaRadio.label;" oncommand="SelectCharacter('0');"/>
     <radio id="space" label="&spaceRadio.label;" oncommand="SelectCharacter('1');"/>
     <hbox>
--- a/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -10,14 +10,14 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/Ed?????????.dtd">
 <!-- dialog containing a control requiring initial setup -->
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/Ed?????.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/Ed?????.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 </dialog>
--- a/editor/ui/dialogs/content/EdDictionary.xul
+++ b/editor/ui/dialogs/content/EdDictionary.xul
@@ -7,19 +7,19 @@
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPersonalDictionary.dtd">
 <dialog buttons="cancel" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     persist="screenX screenY"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDictionary.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdDictionary.js"/>
 
   <grid>
     <columns><column style="width: 15em" flex="1"/><column flex="1"/></columns>
     <rows>
       <row>
         <label value="&wordEditField.label;"
                control="WordInput"
                accesskey="&wordEditField.accessKey;"/>
--- a/editor/ui/dialogs/content/EdFieldSetProps.xul
+++ b/editor/ui/dialogs/content/EdFieldSetProps.xul
@@ -14,19 +14,19 @@
 ]>
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdFieldSetProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdFieldSetProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header" accesskey="&Legend.accesskey;">&Legend.label;</label>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <checkbox id="EditText" label="&EditLegendText.label;" accesskey="&EditLegendText.accesskey;" checked="true" disabled="true"
--- a/editor/ui/dialogs/content/EdFormProps.xul
+++ b/editor/ui/dialogs/content/EdFormProps.xul
@@ -15,21 +15,21 @@
 ]>
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdFormProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdFormProps.js"/>
 
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header">&Settings.label;</label>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="FormName" value="&FormName.label;" accesskey="&FormName.accesskey;"/>
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/editor/ui/dialogs/content/EdHLineProps.xul
@@ -14,20 +14,20 @@
 %edDialogOverlay;
 ]>
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script type="application/javascript" src="chrome://editor/content/EdHLineProps.js"/>
+  <script src="chrome://editor/content/EdHLineProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header">&dimensionsBox.label;</label>
     <grid>
       <columns><column/><column/><column /></columns>
       <rows>
         <row align="center">
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -16,21 +16,21 @@
 ]>
 
 <!-- dialog containing a control requiring initial setup -->
 <dialog id="imageDlg" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()"
     buttons="accept,cancel">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageProps.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageDialog.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageLinkLoader.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdImageProps.js"/>
+  <script src="chrome://editor/content/EdImageDialog.js"/>
+  <script src="chrome://editor/content/EdImageLinkLoader.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="imageLocationTab" label="&imageLocationTab.label;"/>
       <tab id="imageDimensionsTab" label="&imageDimensionsTab.label;"/>
       <tab id="imageAppearanceTab" label="&imageAppearanceTab.label;"/>
--- a/editor/ui/dialogs/content/EdInputImage.xul
+++ b/editor/ui/dialogs/content/EdInputImage.xul
@@ -16,20 +16,20 @@
 <!ENTITY % edDialogOverlay SYSTEM "chrome://editor/locale/EdDialogOverlay.dtd">
 %edDialogOverlay;
 ]>
 
 <dialog title="&windowTitleImage.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdInputImage.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageDialog.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInputImage.js"/>
+  <script src="chrome://editor/content/EdImageDialog.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="imageInputTab" label="&imageInputTab.label;"/>
       <tab id="imageLocationTab" label="&imageLocationTab.label;"/>
       <tab id="imageDimensionsTab" label="&imageDimensionsTab.label;"/>
--- a/editor/ui/dialogs/content/EdInputProps.xul
+++ b/editor/ui/dialogs/content/EdInputProps.xul
@@ -14,19 +14,19 @@
 ]>
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdInputProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInputProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header" control="InputType" accesskey="&InputType.accesskey;">&InputType.label;</label>
     <menulist id="InputType" oncommand="SelectInputType();">
       <menupopup>
         <menuitem label="&text.value;"/>
         <menuitem label="&password.value;"/>
--- a/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/editor/ui/dialogs/content/EdInsSrc.xul
@@ -12,19 +12,19 @@
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     buttonlabelaccept="&insertButton.label;"
     buttonaccesskeyaccept="&insertButton.accesskey;">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdInsSrc.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInsSrc.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label id="srcMessage" value="&sourceEditField.label;"/>
   <vbox flex="1" style="width: 30em; height: 20em;">
     <html:textarea id="srcInput" rows="18" flex="1"/>
   </vbox>
   <!-- Will this accept the embedded HTML tags? -->
--- a/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/editor/ui/dialogs/content/EdInsertChars.xul
@@ -14,19 +14,19 @@
         onfocus = "onFocus()"
         buttonlabelaccept="&insertButton.label;"
         buttonlabelcancel="&closeButton.label;"
         ondialogaccept = "return onAccept();"
         ondialogcancel = "return onClose();"
         style = "width: 20em">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdInsertChars.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInsertChars.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header">&category.label;</label>
     <radiogroup id="CatGrp" persist="category letter_index char_index">
       <radio id="AccentUpper" label="&accentUpper.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio id="AccentLower" label="&accentLower.label;"   oncommand="ChangeCategory(this.id)"/>
       <radio id="Upper"       label="&otherUpper.label;"    oncommand="ChangeCategory(this.id)"/>
--- a/editor/ui/dialogs/content/EdInsertMath.xul
+++ b/editor/ui/dialogs/content/EdInsertMath.xul
@@ -12,22 +12,19 @@
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttonlabelaccept="&insertButton.label;"
         buttonaccesskeyaccept="&insertButton.accesskey;">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript"
-          src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript"
-          src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript"
-          src="chrome://editor/content/EdInsertMath.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInsertMath.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label id="srcMessage" value="&sourceEditField.label;"/>
   <html:textarea id="input" rows="5" oninput="updateMath();"
                  placeholder="\sqrt{x_1} + \frac{π^3}{2}"/>
   <vbox flex="1" style="overflow: auto; width: 30em; height: 5em;">
     <description id="output"/>
--- a/editor/ui/dialogs/content/EdInsertTOC.xul
+++ b/editor/ui/dialogs/content/EdInsertTOC.xul
@@ -11,20 +11,20 @@
 
 <dialog title="&Window.title;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup();"
     oncancel="window.close(); return true;">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
 
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdInsertTOC.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInsertTOC.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <spacer id="dummy" style="display:none"/>
   <vbox flex="1">
     <groupbox><label class="header">&buildToc.label;</label>
       <grid>
         <columns><column/><column style="min-width: 6em"/><column/></columns>
         <rows>
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/editor/ui/dialogs/content/EdInsertTable.xul
@@ -14,19 +14,19 @@
 %edDialogOverlay;
 ]>
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdInsertTable.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdInsertTable.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <groupbox><label class="header">&size.label;</label>
     <grid>
       <columns>
         <column flex="1"/>
         <column flex="1"/>
         <column flex="6"/>
--- a/editor/ui/dialogs/content/EdLabelProps.xul
+++ b/editor/ui/dialogs/content/EdLabelProps.xul
@@ -14,19 +14,19 @@
 ]>
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdLabelProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdLabelProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header" accesskey="&Settings.accesskey;">&Settings.label;</label>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <checkbox id="EditText" label="&EditLabelText.label;" accesskey="&EditLabelText.accesskey;" checked="true" disabled="true"
--- a/editor/ui/dialogs/content/EdLinkChecker.xul
+++ b/editor/ui/dialogs/content/EdLinkChecker.xul
@@ -8,19 +8,19 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EdLinkChecker.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()"
     buttonlabelcancel="&closeButton.label;">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdLinkChecker.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdLinkChecker.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <listbox rows="8" id="LinksList" class="MinWidth20" flex="1"/>
   <hbox align="center">
     <spacer class="bigspacer"/>
     <image class="progressitem" progress="done"/>
     <label value="&succeeded.label;"/>
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -15,20 +15,20 @@
 <!ENTITY % edDialogOverlay SYSTEM "chrome://editor/locale/EdDialogOverlay.dtd">
 %edDialogOverlay;
 ]>
 
 <dialog id="linkDlg" title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
    onload = "Startup()">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdLinkProps.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdImageLinkLoader.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdLinkProps.js"/>
+  <script src="chrome://editor/content/EdImageLinkLoader.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <vbox style="min-width: 20em">
     <groupbox><label id="linkTextCaption" class="header"/>
       <vbox>
         <label id="linkTextMessage" control="linkTextInput"/>
         <textbox id="linkTextInput"/>
--- a/editor/ui/dialogs/content/EdListProps.xul
+++ b/editor/ui/dialogs/content/EdListProps.xul
@@ -13,19 +13,19 @@
 %edDialogOverlay;
 ]>
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdListProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdListProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox flex="1"><label class="header">&ListType.label;</label>
     <menulist id="ListType" oncommand="SelectListType()">
       <menupopup>
         <menuitem label="&none.value;"/>
         <menuitem value="ul" label="&bulletList.value;"/>
--- a/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -14,19 +14,19 @@
 %edDialogOverlay;
 ]>
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdNamedAnchorProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label control="nameInput"
          value="&anchorNameEditField.label;"
          accesskey="&anchorNameEditField.accessKey;"/>
   <textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()"
              tooltiptext="&nameInput.tooltip;"/>
--- a/editor/ui/dialogs/content/EdPageProps.xul
+++ b/editor/ui/dialogs/content/EdPageProps.xul
@@ -7,19 +7,19 @@
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorPageProperties.dtd">
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdPageProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdPageProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <grid>
     <columns><column flex="1"/><column flex="2"/></columns>
     <rows>
       <row>
         <label value="&location.label;"/>
         <label value="&locationNewPage.label;" id="PageLocation"/>
--- a/editor/ui/dialogs/content/EdReplace.xul
+++ b/editor/ui/dialogs/content/EdReplace.xul
@@ -11,19 +11,19 @@
 
 <dialog id="replaceDlg" title="&replaceDialog.title;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
    persist="screenX screenY"
    buttons="cancel"
    onload="onLoad()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdReplace.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdReplace.js"/>
   <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
 
   <hbox>
     <vbox>
       <spacer class="spacer"/>
       <grid align="start">
         <columns><column/><column/></columns>
         <rows>
--- a/editor/ui/dialogs/content/EdSelectProps.xul
+++ b/editor/ui/dialogs/content/EdSelectProps.xul
@@ -14,19 +14,19 @@
 ]>
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdSelectProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdSelectProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <!-- Setting rows="7" on tree isn't working, equalsize vbox sets tree height. -->
   <vbox equalsize="always">
     <tree id="SelectTree" onselect="treeBoxObject.view.selectionChanged();" onkeyup="onTreeKeyUp(event);">
       <treecols id="SelectCols">
         <treecol id="SelectTextCol" flex="3" label="&TextHeader.label;" primary="true"/>
--- a/editor/ui/dialogs/content/EdSnapToGrid.xul
+++ b/editor/ui/dialogs/content/EdSnapToGrid.xul
@@ -8,20 +8,20 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSnapToGrid.dtd">
 
 <dialog title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
   <!--- Element-specific methods -->
-  <script type="application/javascript" src="chrome://editor/content/EdSnapToGrid.js"/>
+  <script src="chrome://editor/content/EdSnapToGrid.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <checkbox id="enableSnapToGrid"
             label="&enableSnapToGrid.label;"
             accesskey="&enableSnapToGrid.accessKey;"
             oncommand="toggleSnapToGrid();"/>
 
--- a/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -9,21 +9,21 @@
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSpellCheck.dtd">
 
 <!-- dialog containing a control requiring initial setup -->
 <dialog id="spellCheckDlg" buttons="cancel" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     persist="screenX screenY"
     onload="Startup()">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdSpellCheck.js"/>
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://editor/content/EdSpellCheck.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
 
   <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
   <stringbundle id="regionBundle" src="chrome://global/locale/regionNames.properties"/>
 
   <grid>
     <columns>
       <column class="spell-check"/>
       <column class="spell-check" flex="1"/>
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/editor/ui/dialogs/content/EdTableProps.xul
@@ -19,19 +19,19 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()"
     buttons="accept,extra1,cancel"
     buttonlabelclose="&closeButton.label;"
     buttonlabelextra1="&applyButton.label;"
     buttonaccesskeyextra1="&applyButton.accesskey;">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdTableProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdTableProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="TableTab" label="&tableTab.label;"/>
       <tab id="CellTab" label="&cellTab.label;"/>
     </tabs>
--- a/editor/ui/dialogs/content/EdTextAreaProps.xul
+++ b/editor/ui/dialogs/content/EdTextAreaProps.xul
@@ -15,19 +15,19 @@
 
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdTextAreaProps.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EdTextAreaProps.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox><label class="header">&Settings.label;</label>
     <grid><columns><column/><column/></columns>
       <rows>
         <row align="center">
           <label control="TextAreaName" value="&TextAreaName.label;" accesskey="&TextAreaName.accessKey;"/>
--- a/editor/ui/dialogs/content/EditConflict.xul
+++ b/editor/ui/dialogs/content/EditConflict.xul
@@ -9,19 +9,19 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditConflict.dtd">
 
 <dialog buttons="cancel" title="&windowTitle.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload="Startup()">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EditConflict.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EditConflict.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <label value ="&conflictWarning.label;"/>
   <spacer class="bigspacer"/>
   <label value ="&conflictResolve.label;"/>
   <spacer class="bigspacer"/>
   <hbox flex="1">
--- a/editor/ui/dialogs/content/EditorPublish.xul
+++ b/editor/ui/dialogs/content/EditorPublish.xul
@@ -15,21 +15,21 @@
 <dialog title="&windowTitle.label;"
         id="publishDlg"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup()"
         buttons="accept,cancel"
         buttonlabelaccept="&publishButton.label;">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EditorPublish.js"/>
-  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EditorPublish.js"/>
+  <script src="chrome://editor/content/publishprefs.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <tabbox id="TabBox">
     <tabs flex="1">
       <tab id="PublishTab" oncommand="SelectPublishTab()" label="&publishTab.label;"/>
       <tab id="SettingsTab" oncommand="SelectSettingsTab()" label="&settingsTab.label;"/>
     </tabs>
--- a/editor/ui/dialogs/content/EditorPublishProgress.xul
+++ b/editor/ui/dialogs/content/EditorPublishProgress.xul
@@ -10,20 +10,20 @@
 
 <dialog title=""
     id="publishProgressDlg"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     buttons="cancel"
     buttonlabelclose="&closeButton.label;"
     onload="Startup()">
 
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EditorPublishProgress.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/publishprefs.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EditorPublishProgress.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox>
     <caption><label id="PublishToSite"/></caption>
     <label value="&siteUrl.label;"/>
     <hbox>
       <label class="indent bold" id="PublishUrl"/>
--- a/editor/ui/dialogs/content/EditorPublishSettings.xul
+++ b/editor/ui/dialogs/content/EditorPublishSettings.xul
@@ -13,20 +13,20 @@
 
 <dialog title="&windowTitleSettings.label;"
         id="publishSettingsDlg"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup()"
         buttons="accept,cancel">
 
   <!-- Methods common to all editor dialogs -->
-  <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="application/javascript" src="chrome://editor/content/EditorPublishSettings.js"/>
-  <script type="application/javascript" src="chrome://editor/content/publishprefs.js"/>
+  <script src="chrome://editor/content/editorUtilities.js"/>
+  <script src="chrome://editor/content/EdDialogCommon.js"/>
+  <script src="chrome://editor/content/EditorPublishSettings.js"/>
+  <script src="chrome://editor/content/publishprefs.js"/>
 
   <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <hbox id="SettingsPanel">
     <groupbox align="center">
       <label class="header">&publishSites.label;</label>
       <!-- XXX: If tree isn't wrapped in vbox, it appears BELOW next vbox -->
       <vbox flex="1">
--- a/editor/ui/dialogs/content/EditorSaveAsCharset.xul
+++ b/editor/ui/dialogs/content/EditorSaveAsCharset.xul
@@ -8,19 +8,19 @@
 
 <!DOCTYPE dialog SYSTEM "chrome://editor/locale/EditorSaveAsCharset.dtd">
 
 <dialog title="&windowTitle2.label;"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
     onload = "Startup()"
     style="width: 32em;">
 
-    <script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-    <script type="application/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-    <script type="application/javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
+    <script src="chrome://editor/content/editorUtilities.js"/>
+    <script src="chrome://editor/content/EdDialogCommon.js"/>
+    <script src="chrome://editor/content/EditorSaveAsCharset.js"/>
 
     <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
     <groupbox>
         <label class="header">&documentTitleTitle.label;</label>
         <label id="EnterTitleLabel"/>
         <textbox id="TitleInput" oninput="TitleChanged();"/>
         <description id="TitleHelp" class="wrap" style="width:1em" />
--- a/mail/base/content/ABSearchDialog.xul
+++ b/mail/base/content/ABSearchDialog.xul
@@ -30,27 +30,27 @@
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/ABSearchDialog.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/searchTerm.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://global/content/nsDragAndDrop.js"/>
+  <script src="chrome://messenger/content/mailWindow.js"/>
+  <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/commandglue.js"/>
+  <script src="chrome://messenger/content/ABSearchDialog.js"/>
+  <script src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/searchTerm.js"/>
+  <script src="chrome://messenger/content/dateFormat.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <keyset id="mailKeys">
     <key key="&closeCmd.key;" modifiers="accel" oncommand="onSearchStop(); closeWindow(true);"/>
     <key keycode="VK_ESCAPE" oncommand="onSearchStop(); closeWindow(true);"/>
   </keyset>
 
   <commandset id="AbCommands">
     <command id="cmd_properties" oncommand="onProperties();"/>
--- a/mail/base/content/FilterListDialog.xul
+++ b/mail/base/content/FilterListDialog.xul
@@ -18,19 +18,19 @@
   windowtype="mailnews:filterlist"
   style="width: 45em; height: 31em;"
   onload="onLoad();"
   onunload="onFilterUnload();"
   onclose="return onFilterClose();"
   persist="width height screenX screenY"
   title="&window.title;">
 
-  <script type="application/javascript" src="chrome://messenger/content/searchWidgets.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/FilterListDialog.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/searchWidgets.js"/>
+  <script src="chrome://messenger/content/FilterListDialog.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
   <keyset>
     <key key="&closeCmd.key;" modifiers="accel" oncommand="if (onFilterClose()) window.close();"/>
     <key keycode="VK_ESCAPE" oncommand="if (onFilterClose()) window.close();"/>
--- a/mail/base/content/SearchDialog.xul
+++ b/mail/base/content/SearchDialog.xul
@@ -26,31 +26,31 @@
         title="&searchDialogTitle.label;"
         style="width: 52em; height: 34em;"
         persist="screenX screenY width height sizemode">
 
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
-  <script type="application/javascript" src="chrome://messenger/content/searchWidgets.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/threadPane.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/SearchDialog.js"/>
-  <script type="application/javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/searchTerm.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
+  <script src="chrome://messenger/content/searchWidgets.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/mailWindow.js"/>
+  <script src="chrome://messenger/content/folderDisplay.js"/>
+  <script src="chrome://messenger/content/messageDisplay.js"/>
+  <script src="chrome://messenger/content/threadPane.js"/>
+  <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/mailCommands.js"/>
+  <script src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script src="chrome://messenger/content/commandglue.js"/>
+  <script src="chrome://messenger/content/SearchDialog.js"/>
+  <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+  <script src="chrome://messenger/content/searchTerm.js"/>
+  <script src="chrome://messenger/content/dateFormat.js"/>
 
   <commands id="commands">
     <commandset id="mailSearchItems"
                 commandupdater="true"
                 events="mail-search"
                 oncommandupdate="goUpdateSearchItems(this)">
       <command id="cmd_open" oncommand="goDoCommand('cmd_open')" disabled="true"/>
       <command id="button_delete" oncommand="goDoCommand('button_delete')" disabled="true"/>
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -27,22 +27,22 @@
         inwindowmenu="false"
 #else
         title="&aboutDialog.title;"
 #endif
         role="dialog"
         aria-describedby="version distribution distributionId currentChannelText communityDesc contributeDesc trademark"
         >
 
-  <script type="application/javascript" src="chrome://messenger/content/aboutDialog.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/specialTabs.js"/>
+  <script src="chrome://messenger/content/aboutDialog.js"/>
+  <script src="chrome://messenger/content/specialTabs.js"/>
   <!-- This one is for openURL -->
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
 #ifdef MOZ_UPDATER
-  <script type="application/javascript" src="chrome://messenger/content/aboutDialog-appUpdater.js"/>
+  <script src="chrome://messenger/content/aboutDialog-appUpdater.js"/>
 #endif
 
   <vbox id="aboutDialogContainer">
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
         <hbox align="baseline">
 #expand   <label id="version">__MOZ_APP_VERSION_DISPLAY__</label>
--- a/mail/base/content/aboutRights.xhtml
+++ b/mail/base/content/aboutRights.xhtml
@@ -59,11 +59,11 @@
     <li>&rights.webservices-term5;</li>
     <li>&rights.webservices-term6;</li>
 #else
     <li>&rights.webservices-term1-unbranded;</li>
 #endif
   </ol>
 </div>
 
-  <script type="application/javascript" src="chrome://global/content/aboutRights.js"/>
+  <script src="chrome://global/content/aboutRights.js"/>
 </body>
 </html>
--- a/mail/base/content/browserRequest.xul
+++ b/mail/base/content/browserRequest.xul
@@ -13,17 +13,17 @@
         buttons=","
         onload="loadRequestedUrl()"
         onclose="reportUserClosed()"
         title=""
         width="800"
         height="500"
         orient="vertical">
 
-  <script type="application/javascript" src="chrome://messenger/content/browserRequest.js"/>
+  <script src="chrome://messenger/content/browserRequest.js"/>
 
   <keyset id="mainKeyset">
     <key id="key_close" key="w" modifiers="accel" oncommand="cancelRequest()"/>
     <key id="key_close2"  keycode="VK_ESCAPE" oncommand="cancelRequest()"/>
   </keyset>
   <hbox id="header">
   <hbox id="addressbox" flex="1" disabled="true">
     <image id="security-button" src="chrome://messenger/skin/icons/mailicon32.png"/>
--- a/mail/base/content/glodaFacetView.xhtml
+++ b/mail/base/content/glodaFacetView.xhtml
@@ -18,27 +18,23 @@
       version="-//W3C//DTD XHTML 1.1//EN"
       dir="&locale.dir;">
 <head>
   <!-- Themes -->
   <link rel="stylesheet"
         href="chrome://messenger/skin/glodaFacetView.css"
         type="text/css"/>
   <!-- Custom elements -->
-  <script type="application/javascript"
-          src="chrome://messenger/content/glodaFacet.js"></script>
+  <script src="chrome://messenger/content/glodaFacet.js"></script>
   <!-- Global Context -->
-  <script type="application/javascript"
-          src="chrome://messenger/content/glodaFacetView.js"></script>
+  <script src="chrome://messenger/content/glodaFacetView.js"></script>
   <!-- Libs -->
-  <script type="application/javascript"
-          src="chrome://messenger/content/protovis-r2.6-modded.js"></script>
+  <script src="chrome://messenger/content/protovis-r2.6-modded.js"></script>
   <!-- Facet Binding Stuff that doesn't belong in XBL -->
-  <script type="application/javascript"
-          src="chrome://messenger/content/glodaFacetVis.js"></script>
+  <script src="chrome://messenger/content/glodaFacetVis.js"></script>
 </head>
 <body id="body" onload="reachOutAndTouchFrame()"
       onmouseup="return clickOnBody(event)">
   <facet-popup-menu class="popup-menu" variety="invisible"/>
   <div id="table">
     <div>
         <div class="facets facets-sidebar" id="facets">
           <h1 id="filter-header-label">&glodaFacetView.filters.label;</h1>
--- a/mail/base/content/glodaFacetViewWrapper.xul
+++ b/mail/base/content/glodaFacetViewWrapper.xul
@@ -1,18 +1,17 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 <window id="window" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript"
-      src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://global/content/viewZoomOverlay.js"/>
+  <script><![CDATA[
     function getBrowser() {
         return document.getElementById('browser');
     }
   ]]></script>
   <commandset id="selectEditMenuItems">
     <command id="cmd_fullZoomReduce" oncommand="ZoomManager.reduce();"/>
     <command id="cmd_fullZoomEnlarge" oncommand="ZoomManager.enlarge();"/>
     <command id="cmd_fullZoomReset" oncommand="ZoomManager.reset();"/>
--- a/mail/base/content/hiddenWindow.xul
+++ b/mail/base/content/hiddenWindow.xul
@@ -31,41 +31,41 @@
 <!ENTITY % msgHdrViewOverlayDTD SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
 %msgHdrViewOverlayDTD;
 ]>
 
 <window id="hidden-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="hiddenWindowStartup();">
 
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
-<script type="application/javascript" src="chrome://messenger/content/hiddenWindow.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailTabs.js"/>
-<script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
-<script type="application/javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
-<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/javascript" src="chrome://messenger/content/quickFilterBar.js"/>
-<script type="application/javascript" src="chrome://messenger/content/newmailaccount/uriListener.js"/>
-<script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://messenger/content/commandglue.js"/>
+<script src="chrome://messenger/content/mailWindow.js"/>
+<script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
+<script src="chrome://messenger/content/searchBar.js"/>
+<script src="chrome://messenger/content/hiddenWindow.js"/>
+<script src="chrome://messenger/content/mailCommands.js"/>
+<script src="chrome://messenger/content/junkCommands.js"/>
+<script src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script src="chrome://messenger/content/mailTabs.js"/>
+<script src="chrome://messenger/content/messageDisplay.js"/>
+<script src="chrome://messenger/content/folderDisplay.js"/>
+<script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+<script src="chrome://messenger/content/mail-offline.js"/>
+<script src="chrome://global/content/printUtils.js"/>
+<script src="chrome://messenger/content/msgViewPickerOverlay.js"/>
+<script src="chrome://global/content/viewZoomOverlay.js"/>
+<script src="chrome://communicator/content/utilityOverlay.js"/>
+<script src="chrome://messenger/content/mailCore.js"/>
+<script src="chrome://messenger/content/quickFilterBar.js"/>
+<script src="chrome://messenger/content/newmailaccount/uriListener.js"/>
+<script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
 #ifdef XP_MACOSX
-<script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
+<script src="chrome://global/content/macWindowMenu.js"/>
 #endif
 
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -76,51 +76,51 @@
     <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
     <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
   </stringbundleset>
 
   <linkset>
     <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/messageWindow.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/nsContextMenu.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/phishingDetector.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/editContactPanel.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/toolbarIconColor.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/msgHdrView.js"/>
-  <script type="application/javascript" src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailTabs.js"/>
-  <script type="application/javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
-  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/quickFilterBar.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/commandglue.js"/>
+  <script src="chrome://messenger/content/folderDisplay.js"/>
+  <script src="chrome://messenger/content/messageDisplay.js"/>
+  <script src="chrome://messenger/content/mailWindow.js"/>
+  <script src="chrome://messenger/content/messageWindow.js"/>
+  <script src="chrome://messenger/content/accountUtils.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://messenger/content/nsContextMenu.js"/>
+  <script src="chrome://messenger/content/mailContextMenus.js"/>
+  <script src="chrome://messenger/content/phishingDetector.js"/>
+  <script src="chrome://communicator/content/contentAreaClick.js"/>
+  <script src="chrome://global/content/nsDragAndDrop.js"/>
+  <script src="chrome://messenger/content/msgViewNavigation.js"/>
+  <script src="chrome://messenger/content/editContactPanel.js"/>
+  <script src="chrome://messenger/content/toolbarIconColor.js"/>
+  <script src="chrome://messenger/content/msgHdrView.js"/>
+  <script src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
+  <script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
+  <script src="chrome://messenger/content/mailCommands.js"/>
+  <script src="chrome://messenger/content/junkCommands.js"/>
+  <script src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script src="chrome://messenger/content/mailTabs.js"/>
+  <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+  <script src="chrome://messenger/content/mail-offline.js"/>
+  <script src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://messenger/content/msgViewPickerOverlay.js"/>
+  <script src="chrome://global/content/viewZoomOverlay.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://messenger/content/mailCore.js"/>
+  <script src="chrome://messenger/content/quickFilterBar.js"/>
 #ifdef XP_MACOSX
-  <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
+  <script src="chrome://global/content/macWindowMenu.js"/>
 #endif
-  <script type="application/javascript" src="chrome://messenger/content/newmailaccount/uriListener.js"/>
+  <script src="chrome://messenger/content/newmailaccount/uriListener.js"/>
 
   <commandset id="mailCommands">
 #include mainCommandSet.inc.xul
     <commandset id="mailSearchMenuItems"/>
     <commandset id="attachmentCommands">
       <command id="cmd_openAllAttachments"
                oncommand="goDoCommand('cmd_openAllAttachments');"
                disabled="true"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -95,76 +95,76 @@
   <stringbundle id="charsetBundle" src="chrome://communicator/content/labelsencodings.properties"/>
   <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
 </stringbundleset>
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
 </linkset>
 
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail-compacttheme.js"/>
-<script type="application/javascript" src="chrome://messenger/content/selectionsummaries.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="application/javascript" src="chrome://messenger/content/specialTabs.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://messenger/content/commandglue.js"/>
+<script src="chrome://messenger/content/msgViewNavigation.js"/>
+<script src="chrome://messenger/content/mailWindow.js"/>
+<script src="chrome://messenger/content/mail-compacttheme.js"/>
+<script src="chrome://messenger/content/selectionsummaries.js"/>
+<script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script src="chrome://messenger/content/specialTabs.js"/>
 <!-- accountProvisionerTab.js relies on code from specialTabs.js, and so much be loaded after it. -->
-<script type="application/javascript" src="chrome://messenger/content/newmailaccount/accountProvisionerTab.js"/>
-<script type="application/javascript" src="chrome://messenger/content/glodaFacetTab.js"/>
-<script type="application/javascript" src="chrome://gloda/content/overlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
-<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/nsContextMenu.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/folderPane.js"/>
-<script type="application/javascript" src="chrome://messenger/content/phishingDetector.js"/>
-<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/javascript" src="chrome://messenger/content/editContactPanel.js"/>
-<script type="application/javascript" src="chrome://messenger/content/toolbarIconColor.js"/>
-<script type="application/javascript" src="chrome://messenger/content/jsTreeView.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgHdrView.js"/>
-<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/javascript" src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/chat-messenger.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/imStatusSelector.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/imContextMenu.js"/>
-<script type="application/javascript" src="chrome://messenger/content/preferences/preferencesTab.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailTabs.js"/>
-<script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
-<script type="application/javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
-<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
-<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/quickFilterBar.js"/>
-<script type="application/javascript" src="chrome://messenger/content/newmailaccount/uriListener.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/chat-conversation-info.js"/>
-<script type="application/javascript" src="chrome://gloda/content/autocomplete-richlistitem.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/chat-contact.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/chat-group.js"/>
-<script type="application/javascript" src="chrome://messenger/content/chat/chat-imconv.js"/>
+<script src="chrome://messenger/content/newmailaccount/accountProvisionerTab.js"/>
+<script src="chrome://messenger/content/glodaFacetTab.js"/>
+<script src="chrome://gloda/content/overlay.js"/>
+<script src="chrome://messenger/content/searchBar.js"/>
+<script src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
+<script src="chrome://global/content/contentAreaUtils.js"/>
+<script src="chrome://messenger/content/nsContextMenu.js"/>
+<script src="chrome://messenger/content/mailContextMenus.js"/>
+<script src="chrome://messenger/content/accountUtils.js"/>
+<script src="chrome://messenger/content/folderPane.js"/>
+<script src="chrome://messenger/content/phishingDetector.js"/>
+<script src="chrome://communicator/content/contentAreaClick.js"/>
+<script src="chrome://global/content/nsDragAndDrop.js"/>
+<script src="chrome://messenger/content/editContactPanel.js"/>
+<script src="chrome://messenger/content/toolbarIconColor.js"/>
+<script src="chrome://messenger/content/jsTreeView.js"/>
+<script src="chrome://messenger/content/msgHdrView.js"/>
+<script src="chrome://global/content/nsDragAndDrop.js"/>
+<script src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
+<script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
+<script src="chrome://messenger/content/chat/chat-messenger.js"/>
+<script src="chrome://messenger/content/chat/imStatusSelector.js"/>
+<script src="chrome://messenger/content/chat/imContextMenu.js"/>
+<script src="chrome://messenger/content/preferences/preferencesTab.js"/>
+<script src="chrome://messenger/content/mailCore.js"/>
+<script src="chrome://messenger/content/mailCommands.js"/>
+<script src="chrome://messenger/content/junkCommands.js"/>
+<script src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script src="chrome://messenger/content/mailTabs.js"/>
+<script src="chrome://messenger/content/messageDisplay.js"/>
+<script src="chrome://messenger/content/folderDisplay.js"/>
+<script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+<script src="chrome://messenger/content/mail-offline.js"/>
+<script src="chrome://global/content/printUtils.js"/>
+<script src="chrome://messenger/content/msgViewPickerOverlay.js"/>
+<script src="chrome://global/content/viewZoomOverlay.js"/>
+<script src="chrome://communicator/content/utilityOverlay.js"/>
+<script src="chrome://messenger/content/quickFilterBar.js"/>
+<script src="chrome://messenger/content/newmailaccount/uriListener.js"/>
+<script src="chrome://messenger/content/chat/chat-conversation-info.js"/>
+<script src="chrome://gloda/content/autocomplete-richlistitem.js"/>
+<script src="chrome://messenger/content/chat/chat-contact.js"/>
+<script src="chrome://messenger/content/chat/chat-group.js"/>
+<script src="chrome://messenger/content/chat/chat-imconv.js"/>
 #ifdef XP_MACOSX
-<script type="application/javascript" src="chrome://messenger/content/macMessengerMenu.js"/>
-<script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
+<script src="chrome://messenger/content/macMessengerMenu.js"/>
+<script src="chrome://global/content/macWindowMenu.js"/>
 #endif
 
 <!-- move needed functions into a single js file -->
-<script type="application/javascript" src="chrome://messenger/content/threadPane.js"/>
+<script src="chrome://messenger/content/threadPane.js"/>
 
 <commandset id="mailCommands">
 #include mainCommandSet.inc.xul
   <commandset id="mailSearchMenuItems"/>
   <commandset id="globalEditMenuItems"
               commandupdater="true"
               events="create-menu-edit"
               oncommandupdate="goUpdateGlobalEditMenuItems()"/>
--- a/mail/base/content/multimessageview.xhtml
+++ b/mail/base/content/multimessageview.xhtml
@@ -24,18 +24,17 @@
           href="chrome://messenger/skin/primaryToolbar.css"/>
     <link rel="stylesheet" media="screen" type="text/css"
           href="chrome://messenger/skin/messageHeader.css"/>
     <link rel="stylesheet" media="screen, print" type="text/css"
           href="chrome://messenger/skin/multimessageview.css"/>
     <link rel="stylesheet" media="print" type="text/css"
           href="chrome://messenger/content/multimessageview_print.css"/>
     <title>&window.title;</title>
-    <script type="application/javascript"
-            src="chrome://messenger/content/multimessageview.js"/>
+    <script src="chrome://messenger/content/multimessageview.js"/>
   </head>
   <body>
     <div id="heading_wrapper">
       <vbox id="header-view-toolbox" class="inline-toolbox"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
         <hbox id="header-view-toolbar">
           <toolbarbutton id="hdrArchiveButton"
                          class="toolbarbutton-1 msgHeaderView-button hdrArchiveButton"
--- a/mail/base/content/newTagDialog.xul
+++ b/mail/base/content/newTagDialog.xul
@@ -12,16 +12,16 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&newTagDialog1.title;"
         onload="onLoad();">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/newTagDialog.js"/>
+  <script src="chrome://messenger/content/newTagDialog.js"/>
   <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
   <hbox>
     <textbox id="name" oninput="doEnabling();" flex="1"/>
     <html:input type="color" id="tagColorPicker"/>
   </hbox>
   <separator/>
 </dialog>
--- a/mail/base/content/safeMode.xul
+++ b/mail/base/content/safeMode.xul
@@ -28,17 +28,17 @@
             buttonaccesskeycancel="&quitApplicationCmdUnix.accesskey;"
 #endif
             buttonlabelextra1="&continueButton.label;"
             buttonaccesskeyextra1="&continueButton.accesskey;"
             width="&window.width;"
             onload="onLoad();"
             buttondisabledaccept="true">
 
-  <script type="application/javascript" src="chrome://messenger/content/safeMode.js"/>
+  <script src="chrome://messenger/content/safeMode.js"/>
 
   <stringbundle id="preferencesBundle" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
   <description>&safeModeDescription.label;</description>
 
   <separator class="thin"/>
 
   <label value="&safeModeDescription2.label;"/>
--- a/mail/base/content/sanitize.xul
+++ b/mail/base/content/sanitize.xul
@@ -22,20 +22,18 @@
         noneverythingtitle="&sanitizeDialog2.title;"
         style="width: &dialog.width;"
         onload="gSanitizePromptDialog.init();">
 
   <vbox id="SanitizeDialogPane">
     <stringbundle id="bundleBrowser"
             src="chrome://messenger/locale/messenger.properties"/>
 
-    <script type="application/javascript"
-            src="chrome://messenger/content/sanitize.js"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/sanitizeDialog.js"/>
+    <script src="chrome://messenger/content/sanitize.js"/>
+    <script src="chrome://messenger/content/sanitizeDialog.js"/>
 
     <hbox id="SanitizeDurationBox" align="center">
       <label value="&clearTimeDuration.label;"
              accesskey="&clearTimeDuration.accesskey;"
              control="sanitizeDurationChoice"
              id="sanitizeDurationLabel"/>
       <menulist id="sanitizeDurationChoice"
                 onselect="gSanitizePromptDialog.selectByTimespan();"
--- a/mail/base/content/systemIntegrationDialog.xul
+++ b/mail/base/content/systemIntegrationDialog.xul
@@ -34,18 +34,17 @@
         id="systemIntegrationDialog"
         buttons="accept,cancel"
         buttonlabelaccept="&acceptIntegration.label;"
         buttonlabelcancel="&cancelIntegration.label;"
         buttonlabelcancel2="&cancelIntegration2.label;"
         onload="gSystemIntegrationDialog.onLoad();"
         title="&systemIntegration.title;">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/systemIntegrationDialog.js"/>
+  <script src="chrome://messenger/content/systemIntegrationDialog.js"/>
 
   <label control="defaultClientList">&defaultClient.intro;</label>
   <vbox id="defaultClientList">
     <checkbox id="checkMail"
               label="&email.label;"
               tooltiptext="&unsetDefault.tooltip;"/>
     <checkbox id="checkNews"
               label="&newsgroups.label;"
--- a/mail/base/test/browser/files/menulist.xul
+++ b/mail/base/test/browser/files/menulist.xul
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/content/bindings.css"?>
 <?xml-stylesheet type="text/css" href="chrome://messenger/skin/menulist.css"?>
 
 <page align="start" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <button id="before" label="I'm just a button" onclick="alert('I\'m a button!')"/>
 
   <menulist>
     <menupopup>
       <menuitem value="foo" label="foo"/>
       <menuitem value="bar" label="bar"/>
     </menupopup>
--- a/mail/components/about-support/content/aboutSupport.xhtml
+++ b/mail/components/about-support/content/aboutSupport.xhtml
@@ -21,28 +21,25 @@
           type="text/css"/>
 <!-- Added for TB -->
     <link rel="stylesheet" href="chrome://messenger/skin/aboutSupport.css"
           type="text/css"/>
     <!-- Private data is hidden by default. -->
     <link rel="stylesheet" href="chrome://messenger/content/about-support/hide-private.css"
           type="text/css" id="about-support-private"/>
 <!-- End of TB addition -->
-    <script type="application/javascript"
-            src="chrome://messenger/content/about-support/aboutSupport.js"/>
+    <script src="chrome://messenger/content/about-support/aboutSupport.js"/>
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="toolkit/about/aboutSupport.ftl"/>
     <link rel="localization" href="toolkit/global/resetProfile.ftl"/>
     <link rel="localization" href="toolkit/global/processTypes.ftl"/>
 <!-- Added for TB -->
     <link rel="localization" href="messenger/aboutSupportMail.ftl"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/about-support/accounts.js"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/about-support/export.js"/>
+    <script src="chrome://messenger/content/about-support/accounts.js"/>
+    <script src="chrome://messenger/content/about-support/export.js"/>
 <!-- End of TB addition -->
   </head>
 
   <body class="wide-container">
 
 #ifndef ANDROID
     <div id="action-box" class="notice-box">
       <div id="reset-box">
--- a/mail/components/accountcreation/content/emailWizard.xul
+++ b/mail/components/accountcreation/content/emailWizard.xul
@@ -28,44 +28,30 @@
           src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="strings"
           src="chrome://messenger/locale/accountCreation.properties"/>
     <stringbundle id="utilstrings"
           src="chrome://messenger/locale/accountCreationUtil.properties"/>
     <stringbundle id="bundle_messenger"
           src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/util.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/accountConfig.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/emailWizard.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/sanitizeDatatypes.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/fetchhttp.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/readFromXML.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/guessConfig.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/verifyConfig.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/fetchConfig.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/exchangeAutoDiscover.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/createInBackend.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/MyBadCertHandler.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountUtils.js" />
-  <script type="application/javascript"
-          src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/accountcreation/util.js"/>
+  <script src="chrome://messenger/content/accountcreation/accountConfig.js"/>
+  <script src="chrome://messenger/content/accountcreation/emailWizard.js"/>
+  <script src="chrome://messenger/content/accountcreation/sanitizeDatatypes.js"/>
+  <script src="chrome://messenger/content/accountcreation/fetchhttp.js"/>
+  <script src="chrome://messenger/content/accountcreation/readFromXML.js"/>
+  <script src="chrome://messenger/content/accountcreation/guessConfig.js"/>
+  <script src="chrome://messenger/content/accountcreation/verifyConfig.js"/>
+  <script src="chrome://messenger/content/accountcreation/fetchConfig.js"/>
+  <script src="chrome://messenger/content/accountcreation/exchangeAutoDiscover.js"/>
+  <script src="chrome://messenger/content/accountcreation/createInBackend.js"/>
+  <script src="chrome://messenger/content/accountcreation/MyBadCertHandler.js"/>
+  <script src="chrome://messenger/content/accountUtils.js" />
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <keyset id="mailKeys">
     <key keycode="VK_ESCAPE" oncommand="window.close();"/>
   </keyset>
 
   <panel id="insecureserver-cleartext-panel" class="popup-panel">
     <hbox>
       <image class="insecureLarry"/>
--- a/mail/components/activity/content/activity.xul
+++ b/mail/components/activity/content/activity.xul
@@ -30,26 +30,21 @@
         statictitle="&activity.title;"
         width="&window.width2;" height="&window.height;"
         screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         onload="activityObject.startup();"
         onunload="activityObject.shutdown();"
         onclose="return closeWindow(false);">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/activity.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/activity-widgets.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/activity.js"/>
+  <script src="chrome://messenger/content/activity-widgets.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/nsDragAndDrop.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
 
   <stringbundleset id="activitySet">
     <stringbundle id="brandStrings"
                   src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
   <!-- Use this commandset for command which do not depend on focus or
        selection -->
--- a/mail/components/addrbook/content/abContactsPanel.xul
+++ b/mail/components/addrbook/content/abContactsPanel.xul
@@ -19,25 +19,25 @@
       onload="AbPanelLoad();"
       onunload="AbPanelUnload();"
       selectedaddresses="true">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abContactsPanel.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://global/content/nsDragAndDrop.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/utilityOverlay.js"/>
+  <script src="chrome://messenger/content/addressbook/addressbook.js"/>
+  <script src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+  <script src="chrome://messenger/content/addressbook/abContactsPanel.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <commandset id="CommandUpdate_AddressBook"
               commandupdater="true"
               events="focus,addrbook-select"
               oncommandupdate="CommandUpdate_AddressBook()">
     <command id="cmd_addrTo" oncommand="addSelectedAddresses('addr_to')" disabled="true"/>
     <command id="cmd_addrCc" oncommand="addSelectedAddresses('addr_cc')" disabled="true"/>
     <command id="cmd_addrBcc" oncommand="addSelectedAddresses('addr_bcc')" disabled="true"/>
--- a/mail/components/addrbook/content/abEditCardDialog.xul
+++ b/mail/components/addrbook/content/abEditCardDialog.xul
@@ -15,18 +15,18 @@
   id="abcardWindow"
   icon="abcardWindow"
   onload="OnLoadEditCard()">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCard.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/addressbook/abCard.js"/>
+  <script><![CDATA[
     document.addEventListener("dialogaccept", EditCardOKButton);
     document.addEventListener("dialogcancel", EditCardCancelButton);
   ]]></script>
 
 #include abCard.inc.xul
 
 </dialog>
--- a/mail/components/addrbook/content/abEditListDialog.xul
+++ b/mail/components/addrbook/content/abEditListDialog.xul
@@ -14,20 +14,20 @@
         ondragover="DragOverAddressListTree(event);"
         ondrop="DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
   <!-- move needed functions into a single js file -->
-  <script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
+  <script><![CDATA[
     document.addEventListener("dialogaccept", EditListOKButton);
   ]]></script>
 
   <vbox id="editlist">
     <hbox id="ListNameContainer" align="center">
       <spacer flex="1"/>
       <label control="ListName" value="&ListName.label;" accesskey="&ListName.accesskey;" class="CardEditLabel"/>
       <hbox class="CardEditWidth">
--- a/mail/components/addrbook/content/abMailListDialog.xul
+++ b/mail/components/addrbook/content/abMailListDialog.xul
@@ -15,21 +15,21 @@
         ondragover="DragOverAddressListTree(event);"
         ondrop="DropOnAddressListTree(event);">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
   <!-- move needed functions into a single js file -->
-  <script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script><![CDATA[
     document.addEventListener("dialogaccept", MailListOKButton);
   ]]></script>
 
   <hbox align="center">
     <label control="abPopup" value="&addToAddressBook.label;" accesskey="&addToAddressBook.accesskey;"/>
     <menulist is="menulist-addrbooks" id="abPopup"
               supportsmaillists="true"
               writable="true"/>
--- a/mail/components/addrbook/content/abNewCardDialog.xul
+++ b/mail/components/addrbook/content/abNewCardDialog.xul
@@ -20,20 +20,20 @@
     icon="abcardWindow"
     windowtype="mailnews:newcarddialog"
     onload="OnLoadNewCard()">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCard.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript"><![CDATA[
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/addressbook/abCard.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script><![CDATA[
     document.addEventListener("dialogaccept", NewCardOKButton);
     document.addEventListener("dialogcancel", NewCardCancelButton);
   ]]></script>
 
   <hbox align="center">
     <label id="abPopupLabel" control="abPopup" value="&chooseAddressBook.label;" accesskey="&chooseAddressBook.accesskey;"/>
     <menulist is="menulist-addrbooks" id="abPopup" writable="true"/>
   </hbox>
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -35,39 +35,39 @@
     fullscreenbutton="true">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
-<script type="application/javascript" src="chrome://messenger/content/jsTreeView.js"/>
-<script type="application/javascript" src="chrome://messenger/content/addressbook/abTrees.js"/>
-<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail-compacttheme.js"/>
-<script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
-<script type="application/javascript" src="chrome://messenger/content/addressbook/map-list.js"/>
-<script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
+<script src="chrome://messenger/content/jsTreeView.js"/>
+<script src="chrome://messenger/content/addressbook/abTrees.js"/>
+<script src="chrome://messenger/content/accountUtils.js"/>
+<script src="chrome://messenger/content/mailCore.js"/>
+<script src="chrome://messenger/content/mail-compacttheme.js"/>
+<script src="chrome://messenger/content/addressbook/addressbook.js"/>
+<script src="chrome://messenger/content/addressbook/map-list.js"/>
+<script src="chrome://messenger/content/addressbook/abCommon.js"/>
+<script src="chrome://communicator/content/contentAreaClick.js"/>
+<script src="chrome://global/content/printUtils.js"/>
+<script src="chrome://messenger/content/msgPrintEngine.js"/>
 
 <!-- move needed functions into a single js file -->
-<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://communicator/content/utilityOverlay.js"/>
+<script src="chrome://global/content/nsDragAndDrop.js"/>
+<script src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
 #ifdef XP_MACOSX
-<script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
+<script src="chrome://global/content/macWindowMenu.js"/>
 #endif
-<script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-<script type="application/javascript" src="chrome://messenger/content/addressbook/abCardView.js"/>
-<script type="application/javascript" src="chrome://messenger/content/toolbarIconColor.js"/>
+<script src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+<script src="chrome://messenger/content/addressbook/abCardView.js"/>
+<script src="chrome://messenger/content/toolbarIconColor.js"/>
 
 <commandset id="addressBook">
   <commandset id="CommandUpdate_AddressBook"
               commandupdater="true"
               events="focus,addrbook-select"
               oncommandupdate="CommandUpdate_AddressBook()"/>
   <commandset id="selectEditMenuItems"
               commandupdater="true"
--- a/mail/components/cloudfile/box/management.xhtml
+++ b/mail/components/cloudfile/box/management.xhtml
@@ -5,20 +5,18 @@
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
   <!ENTITY % managementDTD SYSTEM "chrome://messenger/locale/cloudfile/management.dtd"> %managementDTD;
   <!ENTITY % boxDTD SYSTEM "chrome://messenger/locale/cloudfile/Box/management.dtd"> %boxDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <script type="application/javascript"
-            src="chrome://messenger/content/protovis-r2.6-modded.js"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/cloudfile/Box/management.js"
+    <script src="chrome://messenger/content/protovis-r2.6-modded.js"/>
+    <script src="chrome://messenger/content/cloudfile/Box/management.js"
             defer="true"/>
     <link rel="stylesheet"
         type="text/css"
         href="chrome://messenger/skin/preferences/preferences.css" />
   </head>
   <body id="provider-management">
     <div id="provider-header">
       <div id="provider-terms">
--- a/mail/components/cloudfile/hightail/fileExceedsQuota.xul
+++ b/mail/components/cloudfile/hightail/fileExceedsQuota.xul
@@ -13,14 +13,13 @@
 <?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/cloudfile/Hightail/fileExceedsLimit.css" type="text/css"?>
 
 <dialog id="fileExceedsQuota"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept"
         title="&fileExceedsQuota.title;">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/cloudfile/Hightail/fileExceedsQuota.js"/>
+  <script src="chrome://messenger/content/cloudfile/Hightail/fileExceedsQuota.js"/>
 
   <description id="title">&fileExceedsQuota.storageLimitReached;</description>
   <description id="currentStorage">&fileExceedsQuota.description;</description>
 </dialog>
--- a/mail/components/cloudfile/hightail/management.xhtml
+++ b/mail/components/cloudfile/hightail/management.xhtml
@@ -5,20 +5,18 @@
 
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
   <!ENTITY % managementDTD SYSTEM "chrome://messenger/locale/cloudfile/management.dtd"> %managementDTD;
   <!ENTITY % hightailDTD SYSTEM "chrome://messenger/locale/cloudfile/Hightail/management.dtd"> %hightailDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-    <script type="application/javascript"
-            src="chrome://messenger/content/protovis-r2.6-modded.js"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/cloudfile/Hightail/management.js"
+    <script src="chrome://messenger/content/protovis-r2.6-modded.js"/>
+    <script src="chrome://messenger/content/cloudfile/Hightail/management.js"
             defer="true"/>
     <link rel="stylesheet"
         type="text/css"
         href="chrome://messenger/skin/preferences/preferences.css" />
   </head>
   <body id="provider-management">
     <div id="provider-header">
       <div id="provider-terms">
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -58,43 +58,43 @@
   <stringbundle id="bundle_comp_smime"  src="chrome://messenger-smime/locale/msgCompSMIMEOverlay.properties"/>
   <stringbundle id="charsetBundle"      src="chrome://communicator/content/labelsencodings.properties"/>
 </stringbundleset>
 
 <linkset>
   <html:link rel="localization" href="toolkit/main-window/findbar.ftl"/>
 </linkset>
 
-<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mailCore.js"/>
-<script type="application/javascript" src="chrome://messenger/content/mail-compacttheme.js"/>
-<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/javascript" src="chrome://editor/content/editor.js"/>
-<script type="application/javascript" src="chrome://editor/content/editorUtilities.js"/>
-<script type="application/javascript" src="chrome://editor/content/ComposerCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
-<script type="application/javascript" src="chrome://messenger/content/messengercompose/bigFileObserver.js"/>
-<script type="application/javascript" src="chrome://messenger/content/messengercompose/cloudAttachmentLinkManager.js"/>
+<script src="chrome://global/content/printUtils.js"/>
+<script src="chrome://messenger/content/accountUtils.js"/>
+<script src="chrome://messenger/content/mailCore.js"/>
+<script src="chrome://messenger/content/mail-compacttheme.js"/>
+<script src="chrome://communicator/content/contentAreaClick.js"/>
+<script src="chrome://editor/content/editor.js"/>
+<script src="chrome://editor/content/editorUtilities.js"/>
+<script src="chrome://editor/content/ComposerCommands.js"/>
+<script src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+<script src="chrome://messenger/content/messengercompose/bigFileObserver.js"/>
+<script src="chrome://messenger/content/messengercompose/cloudAttachmentLinkManager.js"/>
 
 <!-- drag and drop -->
-<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
-<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script src="chrome://global/content/nsDragAndDrop.js"/>
 
 <!-- move needed functions into a single js file -->
-<script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
+<script src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://global/content/contentAreaUtils.js"/>
+<script src="chrome://global/content/viewZoomOverlay.js"/>
 #ifdef XP_MACOSX
-<script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
+<script src="chrome://global/content/macWindowMenu.js"/>
 #endif
-<script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-<script type="application/javascript" src="chrome://messenger/content/toolbarIconColor.js"/>
-<script type="application/javascript" src="chrome://messenger-smime/content/msgCompSMIMEOverlay.js"/>
+<script src="chrome://communicator/content/utilityOverlay.js"/>
+<script src="chrome://messenger/content/toolbarIconColor.js"/>
+<script src="chrome://messenger-smime/content/msgCompSMIMEOverlay.js"/>
 
 <commandset id="composeCommands">
   <commandset id="msgComposeCommandUpdate"
               commandupdater="true"
               events="focus"
               oncommandupdate="CommandUpdate_MsgCompose()"/>
   <commandset id="globalEditMenuItems"
               commandupdater="true"
--- a/mail/components/downloads/content/aboutDownloads.xul
+++ b/mail/components/downloads/content/aboutDownloads.xul
@@ -14,20 +14,18 @@
 
 <window id="aboutDownloads"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:xhtml="http://www.w3.org/1999/xhtml"
         title="&aboutDownloads.title;"
         onload="DownloadsView.init();">
   <xhtml:link rel="shortcut icon"
               href="chrome://messenger/skin/downloads/download.svg"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/downloads/aboutDownloads.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/downloads/aboutDownloads.js"/>
 
   <commandset id="msgDownloadCommands"
               commandupdater="true"
               events="focus,select,contextmenu">
     <command id="msgDownloadsCmd_open"
              oncommand="goDoCommand('msgDownloadsCmd_open')"/>
     <command id="msgDownloadsCmd_show"
              oncommand="goDoCommand('msgDownloadsCmd_show')"/>
--- a/mail/components/im/content/addbuddy.xul
+++ b/mail/components/im/content/addbuddy.xul
@@ -10,17 +10,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   id="addBuddyDialog"
   windowtype="Messenger:AddBuddy"
   title="&addBuddyWindow.title;"
   buttons="accept,cancel"
   onload="addBuddy.onload()"
   buttondisabledaccept="true">
-  <script type="application/javascript" src="chrome://messenger/content/chat/addbuddy.js"/>
+  <script src="chrome://messenger/content/chat/addbuddy.js"/>
 
   <stringbundle id="chatBundle" src="chrome://messenger/locale/chat.properties"/>
   <hbox>
     <vbox id="nameBox">
       <hbox align="center" flex="1">
         <label value="&name.label;" control="name"/>
       </hbox>
       <hbox align="center" flex="1">
--- a/mail/components/im/content/am-im.xul
+++ b/mail/components/im/content/am-im.xul
@@ -8,18 +8,18 @@
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-im.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   id="account"
   title="&accountWindow.title;"
   buttons="accept,cancel"
   onload="parent.onPanelLoaded('am-im.xul');">
-  <script type="application/javascript" src="chrome://chat/content/imAccountOptionsHelper.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/am-im.js"/>
+  <script src="chrome://chat/content/imAccountOptionsHelper.js"/>
+  <script src="chrome://messenger/content/am-im.js"/>
 
   <hbox>
     <image id="protocolIcon"/>
     <vbox flex="1">
       <label id="accountName" crop="end" class="header"/>
       <label id="protocolName"/>
     </vbox>
   </hbox>
--- a/mail/components/im/content/imAccountWizard.xul
+++ b/mail/components/im/content/imAccountWizard.xul
@@ -15,18 +15,18 @@
   %brandDTD;
 ]>
 
 <wizard id="accountWizard" title="&windowTitle.label;"
         windowtype="Messenger:accountWizard"
         onload="accountWizard.onload();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript" src="chrome://chat/content/imAccountOptionsHelper.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/chat/imAccountWizard.js"/>
+  <script src="chrome://chat/content/imAccountOptionsHelper.js"/>
+  <script src="chrome://messenger/content/chat/imAccountWizard.js"/>
 
   <stringbundle id="accountsBundle" src="chrome://messenger/locale/imAccounts.properties"/>
 
   <wizardpage id="accountprotocol" pageid="accountprotocol" next="accountusername"
               label="&accountProtocolTitle.label;">
     <description>&accountProtocolInfo.label;</description>
     <separator/>
     <label value="&accountProtocolField.label;" control="protolist"
--- a/mail/components/im/content/imAccounts.xul
+++ b/mail/components/im/content/imAccounts.xul
@@ -20,21 +20,21 @@
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         id="accountManager"
         windowtype="Messenger:Accounts"
         title="&accountsWindow.title;"
         style="&accountsWindow2.style;"
         persist="width height screenX screenY">
- <script type="application/javascript" src="chrome://messenger/content/chat/imAccounts.js"/>
- <script type="application/javascript" src="chrome://messenger/content/chat/imStatusSelector.js"/>
- <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js" />
- <script type="application/javascript" src="chrome://global/content/nsTransferable.js" />
- <script type="application/javascript" src="chrome://chat/content/chat-account-richlistitem.js" />
+ <script src="chrome://messenger/content/chat/imAccounts.js"/>
+ <script src="chrome://messenger/content/chat/imStatusSelector.js"/>
+ <script src="chrome://global/content/nsDragAndDrop.js" />
+ <script src="chrome://global/content/nsTransferable.js" />
+ <script src="chrome://chat/content/chat-account-richlistitem.js" />
  <stringbundle id="accountsBundle" src="chrome://messenger/locale/imAccounts.properties"/>
 
  <linkset>
    <html:link rel="localization" href="security/certificates/certManager.ftl"/>
  </linkset>
 
  <stringbundle id="chatBundle" src="chrome://messenger/locale/chat.properties"/>
 
--- a/mail/components/im/content/joinchat.xul
+++ b/mail/components/im/content/joinchat.xul
@@ -13,17 +13,17 @@
         xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="joinChatDialog"
         windowtype="Messenger:JoinChat"
         title="&joinChatWindow.title;"
         buttons="accept,cancel"
         onload="joinChat.onload()"
         autojoinLabel="&autojoin.label;"
         autojoinAccesskey="&autojoin.accesskey;">
-  <script type="application/javascript" src="chrome://messenger/content/chat/joinchat.js"/>
+  <script src="chrome://messenger/content/chat/joinchat.js"/>
   <div xmlns="http://www.w3.org/1999/xhtml" id="joinChatGrid">
     <div>
       <xul:label value="&account.label;" control="accountlist"/>
     </div>
     <div>
       <xul:menulist id="accountlist" onselect="joinChat.onAccountSelect();"/>
     </div>
     <div class="optional-col required">
--- a/mail/components/im/messages/bubbles/Footer.html
+++ b/mail/components/im/messages/bubbles/Footer.html
@@ -1,13 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<script type="application/javascript">
+<script>
 // See chat/content/conversation-browser.js _exposeMethodsToContent
 /* globals convScrollEnabled, scrollToElement */
 
 /* [pseudo_color, pseudo_background, bubble_borders] */
 const elements_lightness = [[75, 94, 80], [75, 94, 80], [70, 93, 75], [65, 92, 70], [55, 90, 65], [48, 90, 60], [44, 86, 50], [44, 88, 60], [45, 88, 70], [45, 90, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [45, 92, 70], [60, 92, 70], [70, 93, 75], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80], [75, 94, 80]];
 
 const bubble_background = "hsl(#, 100%, 97%)";
 const bubble_borders = "hsl(#, 100%, #%)";
--- a/mail/components/im/messages/dark/Footer.html
+++ b/mail/components/im/messages/dark/Footer.html
@@ -1,13 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<script type="application/javascript">
+<script>
 const p_border_top = "1px solid hsla(#, 100%, 80%, 0.4)";
 const p_background = "-moz-linear-gradient(top, hsla(#, 100%, 80%, 0.3), hsla(#, 100%, 80%, 0.1) 30px)";
 const nick_background = "-moz-linear-gradient(top, hsla(#, 100%, 80%, 0.3), hsla(#, 100%, 80%, 0.1) 1em)";
 
 function setColors(target) {
   var senderColor = target.getAttribute("data-senderColor");
 
   if (!senderColor)
--- a/mail/components/im/messages/mail/Footer.html
+++ b/mail/components/im/messages/mail/Footer.html
@@ -1,13 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<script type="application/javascript">
+<script>
 
 function checkNewText(target) {
   if (target.tagName == "P" && target.className == "event") {
     let parent = target.parentNode;
     // We need to start a group with this element if there are at least 4
     // system messages and they aren't already grouped.
     if (!parent.grouped && parent.querySelector("p.event:nth-of-type(4)")) {
       var p = document.createElement("p");
--- a/mail/components/im/messages/papersheets/Footer.html
+++ b/mail/components/im/messages/papersheets/Footer.html
@@ -1,13 +1,13 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<script type="application/javascript">
+<script>
 
 const bg_gradient = "background: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1) 15px, hsla(#, 100%, 98%, 1) 15px, hsla(#, 100%, 98%, 1));";
 const bg_context_gradient = "background: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.05) 15px, hsla(#, 20%, 98%, 1) 15px, hsla(#, 20%, 98%, 1));";
 const bg_color = "background-color: hsl(#, 100%, 98%);";
 
 var body = document.getElementById("ibcontent");
 
 
--- a/mail/components/migration/content/migration.xul
+++ b/mail/components/migration/content/migration.xul
@@ -12,17 +12,17 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&migrationWizard.title;"
         onload="MigrationWizard.init()"
         onunload="MigrationWizard.uninit()"
         style="width: 40em;"
         branded="true"
         buttons="accept,cancel">
 
-  <script type="application/javascript" src="chrome://messenger/content/migration/migration.js"/>
+  <script src="chrome://messenger/content/migration/migration.js"/>
 
   <stringbundle id="bundle" src="chrome://messenger/locale/migration/migration.properties"/>
 
   <wizardpage id="importSource" pageid="importSource" next="selectProfile"
               label="&importSource.title;">
     <deck id="importSourceFound" selectedIndex="0">
     <vbox>
 #ifdef XP_WIN
--- a/mail/components/newmailaccount/content/accountProvisioner.xhtml
+++ b/mail/components/newmailaccount/content/accountProvisioner.xhtml
@@ -17,36 +17,29 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
   <title>&window.title;</title>
 
   <link rel="stylesheet"
         type="text/css"
         href="chrome://messenger/skin/newmailaccount/accountProvisioner.css" />
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/util.js">
+  <script src="chrome://messenger/content/accountcreation/util.js">
   </script>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/accountConfig.js">
+  <script src="chrome://messenger/content/accountcreation/accountConfig.js">
   </script>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/sanitizeDatatypes.js">
+  <script src="chrome://messenger/content/accountcreation/sanitizeDatatypes.js">
   </script>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/readFromXML.js">
+  <script src="chrome://messenger/content/accountcreation/readFromXML.js">
   </script>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountcreation/createInBackend.js">
+  <script src="chrome://messenger/content/accountcreation/createInBackend.js">
   </script>
-  <script type="application/javascript"
-          src="chrome://communicator/content/utilityOverlay.js">
+  <script src="chrome://communicator/content/utilityOverlay.js">
   </script>
-  <script type="application/javascript"
-          src="chrome://messenger/content/newmailaccount/accountProvisioner.js">
+  <script src="chrome://messenger/content/newmailaccount/accountProvisioner.js">
   </script>
 </head>
 <body dir="&locale.dir;">
   <div id="window" class="vbox">
 
     <div id="content" class="boxFlex vbox">
 
       <div id="upper" class="contentPadded">
--- a/mail/components/preferences/aboutPreferences.xul
+++ b/mail/components/preferences/aboutPreferences.xul
@@ -26,17 +26,17 @@
 #endif
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
          title="&prefWindow.titleGNOME;">
 #else
          title="&prefWindow.titleMAC;">
 #endif
 #endif
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
 
   <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundlePreferences"
                 src="chrome://messenger/locale/preferences/preferences.properties"/>
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="messenger/preferences/preferences.ftl"/>
     <html:link rel="localization" href="messenger/preferences/fonts.ftl"/>
@@ -94,14 +94,14 @@
         </hbox>
         <browser class="dialogFrame"
                  autoscroll="false"
                  disablehistory="true"/>
       </vbox>
     </vbox>
   </stack>
 
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/preferences.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/subdialogs.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://communicator/content/contentAreaClick.js"/>
+  <script src="chrome://messenger/content/preferences/preferences.js"/>
+  <script src="chrome://messenger/content/preferences/subdialogs.js"/>
 </preftab>
--- a/mail/components/preferences/advanced.inc.xul
+++ b/mail/components/preferences/advanced.inc.xul
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneAdvanced" label="&paneAdvanced.title;">
 #ifdef MOZ_UPDATER
-    <script type="application/javascript" src="chrome://messenger/content/aboutDialog-appUpdater.js"/>
+    <script src="chrome://messenger/content/aboutDialog-appUpdater.js"/>
 #endif
-    <script type="application/javascript" src="chrome://messenger/content/preferences/advanced.js"/>
-    <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+    <script src="chrome://messenger/content/preferences/advanced.js"/>
+    <script src="chrome://communicator/content/utilityOverlay.js"/>
 
 #ifdef HAVE_SHELL_SERVICE
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
     <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
 #endif
 
     <tabbox id="advancedPrefs" flex="1" onselect="gAdvancedPane.tabSelectionChanged();">
       <tabs id="advancedPrefsTabs">
--- a/mail/components/preferences/applicationManager.xul
+++ b/mail/components/preferences/applicationManager.xul
@@ -10,20 +10,18 @@
 <dialog id="appManager"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel"
         onload="gAppManagerDialog.init();"
         title="&appManager.title;"
         style="&appManager.style;"
         persist="screenX screenY">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/preferences/applications.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/preferences/applicationManager.js"/>
+  <script src="chrome://messenger/content/preferences/applications.js"/>
+  <script src="chrome://messenger/content/preferences/applicationManager.js"/>
 
   <commandset id="appManagerCommandSet">
     <command id="cmd_delete"
              oncommand="gAppManagerDialog.remove();"
              disabled="true"/>
   </commandset>
 
   <keyset id="appManagerKeyset">
--- a/mail/components/preferences/applications.inc.xul
+++ b/mail/components/preferences/applications.inc.xul
@@ -1,24 +1,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneApplications" label="&paneAttachments.title;">
 
-    <script type="application/javascript">
+    <script>
     <![CDATA[
 #ifdef MOZ_WIDGET_GTK
       var ICON_URL_APP      = "moz-icon://dummy.exe?size=16";
 #else
       var ICON_URL_APP      = "chrome://messenger/skin/preferences/application.png";
 #endif
     ]]>
     </script>
-    <script type="application/javascript"
-            src="chrome://messenger/content/preferences/applications.js"/>
+    <script src="chrome://messenger/content/preferences/applications.js"/>
 
     <commandset id="appPaneCommandSet">
       <command id="cmd_delete"
                oncommand="gApplicationsPane.onDelete();"/>
     </commandset>
 
     <keyset id="appPaneKeyset">
       <key keycode="VK_BACK" modifiers="any" command="cmd_delete"/>
@@ -60,18 +59,17 @@
                       accesskey="&actionColumn2.accesskey;" persist="sortDirection"
                       flex="1" onclick="gApplicationsPane.sort(event);"/>
           </listheader>
           <richlistbox id="handlersView"
                        preference="pref.downloads.disable_button.edit_actions"/>
 
           <separator class="thin"/>
 
-          <script type="application/javascript"
-                  src="chrome://messenger/content/preferences/downloads.js"/>
+          <script src="chrome://messenger/content/preferences/downloads.js"/>
 
           <vbox align="start">
             <radiogroup id="saveWhere" flex="1"
                         preference="browser.download.useDownloadDir"
                         onsyncfrompreference="return gDownloadDirSection.onReadUseDownloadDir();">
             <hbox id="saveToRow" align="center">
               <radio id="saveTo" value="true"
                      label="&saveTo.label;"
--- a/mail/components/preferences/attachmentReminder.xul
+++ b/mail/components/preferences/attachmentReminder.xul
@@ -16,17 +16,17 @@
 <dialog id="attachmentReminderOptionsDialog" type="child"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         dlgbuttons="accept,cancel"
         title="&attachmentReminderDialog.title;"
         onload="gAttachmentReminderOptionsDialog.init();"
         style="width:38em;">
 
   <prefpane id="attachmentReminderOptionsDialogPane">
-    <script type="application/javascript" src="chrome://messenger/content/preferences/attachmentReminder.js"/>
+    <script src="chrome://messenger/content/preferences/attachmentReminder.js"/>
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <groupbox>
       <label control="keywordList">&attachKeywordText.label;</label>
       <hbox>
         <richlistbox id="keywordList" flex="1" height="250px"
                      ondblclick="gAttachmentReminderOptionsDialog.editKeyword();"/>
         <vbox>
--- a/mail/components/preferences/chat.inc.xul
+++ b/mail/components/preferences/chat.inc.xul
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneChat" label="&paneChat.title;">
-    <script type="application/javascript" src="chrome://messenger/content/preferences/chat.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/messagestyle.js"/>
+    <script src="chrome://messenger/content/preferences/chat.js"/>
+    <script src="chrome://messenger/content/preferences/messagestyle.js"/>
 
     <stringbundle id="themesBundle"
                   src="chrome://messenger/locale/preferences/messagestyle.properties"/>
 
     <tabbox id="chatPrefs" flex="1" onselect="gChatPane.tabSelectionChanged();">
       <tabs id="chatPrefsTabs">
         <tab id="chatGeneralTab"       label="&generalTab.label;"/>
         <tab id="chatMessageStylesTab" label="&messageStyleTab.title;"/>
--- a/mail/components/preferences/colors.xul
+++ b/mail/components/preferences/colors.xul
@@ -76,11 +76,11 @@
                     value="0" id="documentColorAutomatic"/>
           <menuitem label="&overridePageColors.never.label;"
                     value="1" id="documentColorNever"/>
         </menupopup>
       </menulist>
     </vbox>
   </prefpane>
 
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/colors.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://messenger/content/preferences/colors.js"/>
 </dialog>
--- a/mail/components/preferences/compose.inc.xul
+++ b/mail/components/preferences/compose.inc.xul
@@ -1,15 +1,15 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneCompose" label="&paneComposition.title;">
-    <script type="application/javascript" src="chrome://messenger/content/preferences/compose.js"/>
-    <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-    <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+    <script src="chrome://messenger/content/preferences/compose.js"/>
+    <script src="chrome://global/content/contentAreaUtils.js"/>
+    <script src="chrome://communicator/content/utilityOverlay.js"/>
 
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
     <tabbox id="composePrefs" flex="1" onselect="gComposePane.tabSelectionChanged();">
       <tabs id="composePrefsTabs">
         <tab id="generalTab" label="&itemGeneral.label;"/>
         <tab id="addressingTab" label="&itemAutoComplete.label;"/>
         <tab id="spellingTab" label="&itemSpellCheck.label;"/>
--- a/mail/components/preferences/connection.xul
+++ b/mail/components/preferences/connection.xul
@@ -19,18 +19,18 @@
         onload="gConnectionsDialog.checkForSystemProxy(); gConnectionsDialog.initDnsOverHttpsUI();"
 #ifdef XP_MACOSX
         style="width: &window.macWidth; !important;">
 #else
         style="width: &window.width; !important;">
 #endif
 
   <prefpane id="ConnectionsDialogPane">
-    <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/connection.js"/>
+    <script src="chrome://global/content/preferencesBindings.js"/>
+    <script src="chrome://messenger/content/preferences/connection.js"/>
 
     <groupbox>
       <label><html:h2>&proxyTitle.label;</html:h2></label>
 
       <radiogroup id="networkProxyType" preference="network.proxy.type"
                   onsyncfrompreference="return gConnectionsDialog.readProxyType();">
         <radio value="0" label="&noProxyTypeRadio.label;" accesskey="&noProxyTypeRadio.accesskey;"/>
         <radio value="4" label="&WPADTypeRadio.label;" accesskey="&WPADTypeRadio.accesskey;"/>
--- a/mail/components/preferences/display.inc.xul
+++ b/mail/components/preferences/display.inc.xul
@@ -1,16 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneDisplay" label="&paneDisplay.title;">
-    <script type="application/javascript"
-            src="chrome://mozapps/content/preferences/fontbuilder.js"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/preferences/display.js"/>
+    <script src="chrome://mozapps/content/preferences/fontbuilder.js"/>
+    <script src="chrome://messenger/content/preferences/display.js"/>
 
     <tabbox id="displayPrefs" flex="1" onselect="gDisplayPane.tabSelectionChanged();">
       <tabs id="displayPrefsTabs">
         <tab id="formattingTab" label="&itemFormatting.label;"/>
         <tab id="tagTab" label="&itemTags.label;"/>
         <tab id="displayTab" label="&itemAdvanced.label;"/>
       </tabs>
 
--- a/mail/components/preferences/dockoptions.xul
+++ b/mail/components/preferences/dockoptions.xul
@@ -36,11 +36,11 @@
                  accesskey="&newMessagesCountDock.label;"/>
         </radiogroup>
       </groupbox>
       <separator/>
       <description class="bold">&directNotificationSettings.label;</description>
     </hbox>
   </prefpane>
 
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/dockoptions.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://messenger/content/preferences/dockoptions.js"/>
 </dialog>
--- a/mail/components/preferences/fonts.xul
+++ b/mail/components/preferences/fonts.xul
@@ -21,20 +21,20 @@
 
   <keyset>
     <key data-l10n-id="fonts-window-close" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <vbox id="FontsDialogPane" class="prefpane largeDialogContainer">
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
-    <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-    <script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/fonts.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/menulist-charsetpicker.js"/>
+    <script src="chrome://global/content/preferencesBindings.js"/>
+    <script src="chrome://mozapps/content/preferences/fontbuilder.js"/>
+    <script src="chrome://messenger/content/preferences/fonts.js"/>
+    <script src="chrome://messenger/content/menulist-charsetpicker.js"/>
     <linkset>
       <html:link rel="localization" href="messenger/preferences/fonts.ftl"/>
     </linkset>
 
     <groupbox>
       <hbox align="center">
         <label control="selectLangs">
           <html:h2 accesskey="&language.accesskey;">&language.label;</html:h2>
--- a/mail/components/preferences/general.inc.xul
+++ b/mail/components/preferences/general.inc.xul
@@ -1,14 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneGeneral" label="&paneGeneral.title;">
-    <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/general.js"/>
+    <script src="chrome://communicator/content/utilityOverlay.js"/>
+    <script src="chrome://messenger/content/preferences/general.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <groupbox>
       <label><html:h2>&messengerStartPage.label;</html:h2></label>
         <hbox align="start">
           <checkbox id="mailnewsStartPageEnabled" label="&enableStartPage.label;"
                     preference="mailnews.start_page.enabled"
--- a/mail/components/preferences/messengerLanguages.xul
+++ b/mail/components/preferences/messengerLanguages.xul
@@ -16,18 +16,18 @@
         onload="gMessengerLanguagesDialog.onLoad();"
         onbeforeaccept="return gMessengerLanguagesDialog.beforeAccept();">
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="messenger/preferences/languages.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/messengerLanguages.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://messenger/content/preferences/messengerLanguages.js"/>
 
   <vbox id="messengerLanguagesDialogPane"
         class="prefpane largeDialogContainer"
         flex="1">
     <description data-l10n-id="messenger-languages-description"/>
     <hbox flex="1">
       <vbox flex="1">
         <richlistbox id="selectedLocales" flex="1"/>
--- a/mail/components/preferences/notifications.xul
+++ b/mail/components/preferences/notifications.xul
@@ -33,11 +33,11 @@
                preference="alerts.totalOpenTime"
                onsyncfrompreference="return Preferences.get(this.getAttribute('preference')).value / 1000;"
                onsynctopreference="return this.value * 1000;"/>
       <label id="totalOpenTimeEnd" value="&totalOpenTimeEnd.label;"/>
     </hbox>
     <separator/>
   </prefpane>
 
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/preferences/notifications.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://messenger/content/preferences/notifications.js"/>
 </dialog>
--- a/mail/components/preferences/offline.xul
+++ b/mail/components/preferences/offline.xul
@@ -14,18 +14,18 @@
 
 <dialog id="OfflineSettingsDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
             onload="gOfflineDialog.dialogSetup();"
             dlgbuttons="accept,cancel"
             title="&offlineDialog.title;">
 
   <prefpane id="OfflineSettingsDialogPane">
-    <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/offline.js"/>
+    <script src="chrome://global/content/preferencesBindings.js"/>
+    <script src="chrome://messenger/content/preferences/offline.js"/>
 
     <checkbox label="&checkAutoDetect.label;"
               accesskey="&checkAutoDetect.accesskey;"
               preference="offline.autoDetect"/>
 
     <separator class="thin"/>
 
     <label value="&titleStartUp;" control="whenStartingUp"/>
--- a/mail/components/preferences/privacy.inc.xul
+++ b/mail/components/preferences/privacy.inc.xul
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="panePrivacy" label="&panePrivacy.title;">
-    <script type="application/javascript" src="chrome://messenger/content/preferences/privacy.js"/>
+    <script src="chrome://messenger/content/preferences/privacy.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <!-- Mail Content -->
     <groupbox id="mailContentGroup">
       <label><html:h2>&captionMailContent.label;</html:h2></label>
       <hbox id="remoteContentBox">
         <checkbox id="acceptRemoteContent"
--- a/mail/components/preferences/receipts.xul
+++ b/mail/components/preferences/receipts.xul
@@ -14,18 +14,18 @@
 
 <dialog id="ReturnReceiptsDialog" type="child"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         dlgbuttons="accept,cancel"
         title="&dialog.title;"
         onload="enableDisableAllowedReceipts();">
 
   <prefpane id="ReturnReceiptsDialogPane">
-    <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/receipts.js"/>
+    <script src="chrome://global/content/preferencesBindings.js"/>
+    <script src="chrome://messenger/content/preferences/receipts.js"/>
 
     <vbox id="returnReceiptSettings" align="start">
       <checkbox id="alwaysRequest" label="&requestReceipt.label;"
                 preference="mail.receipt.request_return_receipt_on"
                 accesskey="&requestReceipt.accesskey;"/>
     </vbox>
 
     <separator class="thin"/>
--- a/mail/components/preferences/security.inc.xul
+++ b/mail/components/preferences/security.inc.xul
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
   <prefpane id="paneSecurity" label="&paneSecurity.title;">
-    <script type="application/javascript" src="chrome://messenger/content/preferences/security.js"/>
+    <script src="chrome://messenger/content/preferences/security.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
     <stringbundle id="bundleMasterPwPreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/>
 
     <tabbox id="securityPrefs" flex="1" onselect="gSecurityPane.tabSelectionChanged();">
       <tabs id="securityPrefsTabs">
         <tab id="junkTab" label="&itemJunk.label;"/>
         <tab id="phishingTab" label="&itemPhishing.label;"/>
--- a/mail/components/preferences/sendoptions.xul
+++ b/mail/components/preferences/sendoptions.xul
@@ -18,18 +18,18 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         dlgbuttons="accept,cancel"
         style="min-height: 33em;"
         title="&dialog.title;"
         onload="gSendOptionsDialog.init();">
 
   <prefpane id="SendOptionsDialogPane">
-    <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/preferences/sendoptions.js"/>
+    <script src="chrome://global/content/preferencesBindings.js"/>
+    <script src="chrome://messenger/content/preferences/sendoptions.js"/>
 
     <stringbundle id="bundlePreferences" src="chrome://messenger/locale/preferences/preferences.properties"/>
 
     <groupbox>
       <label><html:h2>&sendMail.title;</html:h2></label>
 
       <checkbox id="autoDowngrade"
                 label="&autoDowngrade.label;"
--- a/mail/extensions/mailviews/content/mailViewList.xul
+++ b/mail/extensions/mailviews/content/mailViewList.xul
@@ -17,17 +17,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="mailViewListOnLoad();"
         windowtype="mailnews:mailviewlist"
         title="&mailViewListTitle.label;"
         width="400" height="340"
         buttons="accept"
         persist="screenX screenY width height">
 
-  <script type="application/javascript" src="chrome://messenger/content/mailViewList.js"/>
+  <script src="chrome://messenger/content/mailViewList.js"/>
 
   <vbox flex="1">
     <hbox flex="1">
       <richlistbox id="mailViewList"
                    class="theme-listbox"
                    flex="1"
                    onselect="onMailViewSelect(event);"/>
 
--- a/mail/extensions/mailviews/content/mailViewSetup.xul
+++ b/mail/extensions/mailviews/content/mailViewSetup.xul
@@ -24,20 +24,20 @@
         title="&mailViewSetupTitle.label;"
         style="width: 52em; height: 22em;"
         persist="screenX screenY width height">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailViewSetup.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/searchTerm.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/mailViewSetup.js"/>
+  <script src="chrome://messenger/content/searchTerm.js"/>
+  <script src="chrome://messenger/content/dateFormat.js"/>
 
   <vbox flex="1">
     <separator class="thin"/>
     <vbox>
        <hbox align="center">
          <label value="&mailViewHeading.label;" accesskey="&mailViewHeading.accesskey;" control="name"/>
          <textbox tabindex="0" id="name" oninput="doEnabling();"/>
       </hbox>
--- a/mail/test/mozmill/content-tabs/html/test-lwthemes.html
+++ b/mail/test/mozmill/content-tabs/html/test-lwthemes.html
@@ -1,12 +1,12 @@
 <html><head>
 <title>test lightweight themes</title>
 </head><body>
-<script type="text/javascript">
+<script>
 var themes = [
   {
     id: "test-01",
     name: "Test 01",
     headerURL: "test.png",
     footerURL: "test.png",
     textcolor: "#fff",
     accentcolor: "#6b6b6b"
--- a/mail/test/mozmill/cookies/html/cookietest1.html
+++ b/mail/test/mozmill/cookies/html/cookietest1.html
@@ -1,12 +1,12 @@
 <html>
   <head>
     <title>Cookie Test</title> 
-    <script type="text/javascript">
+    <script>
       document.cookie = "name=CookieTest";
     </script>
   </head>
   <body bgcolor="#FFFFFF">
     <div align="center">
       <h1>Cookie Test</h1>
     </div>
   </body>
--- a/mail/test/mozmill/cookies/html/cookietest2.html
+++ b/mail/test/mozmill/cookies/html/cookietest2.html
@@ -1,13 +1,13 @@
 <html>
   <head>
     <title>Cookie Test 2</title> 
   </head>
   <body bgcolor="#FFFFFF">
-    <script type="text/javascript">
+    <script>
       var theCookie = document.cookie;
     </script>
     <div align="center">
       <h1>Cookie Test Result</h1>
     </div>
   </body>
 </html>
--- a/mail/test/mozmill/utils/html/collections.html
+++ b/mail/test/mozmill/utils/html/collections.html
@@ -1,12 +1,12 @@
 <html>
   <head>
     <title>Collections</title>
-    <script type="application/javascript">
+    <script>
       const JS_HAS_SYMBOLS = typeof Symbol === "function";
       const ITERATOR_SYMBOL = JS_HAS_SYMBOLS ? Symbol.iterator : "@@iterator";
       var gIterator = (function*() {
         yield 1; yield 2; yield 3; yield 4; yield 5;
       })();
 
       var gCustomIterator = {
         _array: [6, 7, 8, 9],
--- a/mailnews/addrbook/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/content/abAddressBookNameDialog.xul
@@ -11,15 +11,15 @@
         style="width: 36em;"
         onload="abNameOnLoad();">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook"
                   src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
+  <script src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
 
   <hbox align="center">
     <label control="name" value="&name.label;" accesskey="&name.accesskey;"/>
     <textbox id="name" oninput="abNameDoOkEnabling();" flex="1"/>
   </hbox>
 </dialog>
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xul
@@ -10,17 +10,17 @@
 <dialog id="addDirectory"
         style="width: &newDirectoryWidth;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         onunload="onUnload();"
         buttons="accept,cancel">
 
-  <script type="application/javascript" src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
+  <script src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_replication" src="chrome://messenger/locale/addressbook/replicationProgress.properties"/>
 
   <keyset id="keyset"/>
   <vbox id="editDirectory">
 
     <tabbox style="margin:5px">
       <tabs id="directoryTabBox">
--- a/mailnews/addrbook/prefs/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/content/pref-editdirectories.xul
@@ -9,20 +9,18 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         id="editDirectories"
         title="&pref.ldap.window.title;"
         buttons="accept"
         onload="onInitEditDirectories();"
         onunload="onUninitEditDirectories();">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/addressbook/pref-editdirectories.js"/>
+  <script src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script src="chrome://messenger/content/addressbook/pref-editdirectories.js"/>
 
   <stringbundle id="bundle_addressBook"
                 src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <label value="&directoriesText.label;"
          accesskey="&directoriesText.accesskey;" control="directoriesList"/>
   <hbox flex="1">
     <richlistbox id="directoriesList"
--- a/mailnews/base/content/folderProps.xul
+++ b/mailnews/base/content/folderProps.xul
@@ -12,20 +12,20 @@
   id="folderPropertiesDialog"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   title="&folderProps.windowtitle.label;"
   buttons="accept,cancel"
   onload="folderPropsOnLoad();" style="width: 56ch;">
 
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/retention.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/folderProps.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/menulist-charsetpicker.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/retention.js"/>
+  <script src="chrome://messenger/content/folderProps.js"/>
+  <script src="chrome://messenger/content/menulist-charsetpicker.js"/>
 
 <tabbox id="folderPropTabBox">
   <tabs id="folderPropTabs">
     <tab id="GeneralTab" label="&generalInfo.label;"/>
     <tab id="Retention" label="&retention.label;"/>
     <tab id="SynchronizationTab" hidefor="movemail,pop3,rss,none" label="&folderSynchronizationTab.label;"/>
     <tab id="SharingTab" hidefor="movemail,pop3,rss,none,nntp" label="&folderSharingTab.label;"/>
     <tab id="QuotaTab" hidefor="movemail,pop3,rss,none,nntp" label="&folderQuotaTab.label;"/>
--- a/mailnews/base/content/junkLog.xul
+++ b/mailnews/base/content/junkLog.xul
@@ -15,17 +15,17 @@
         title="&adaptiveJunkLog.title;"
         windowtype="mailnews:junklog"
         buttons="accept"
         buttonlabelaccept="&closeLog.label;"
         buttonaccesskeyaccept="&closeLog.accesskey;"
         persist="screenX screenY width height"
         style="width: 40em; height: 25em;">
 
-  <script type="application/javascript" src="chrome://messenger/content/junkLog.js"/>
+  <script src="chrome://messenger/content/junkLog.js"/>
 
   <vbox flex="1">
     <hbox>
       <label value="&adaptiveJunkLogInfo.label;"/>
       <spacer flex="1"/>
       <button label="&clearLog.label;"
               accesskey="&clearLog.accesskey;"
               oncommand="clearLog();"/>
--- a/mailnews/base/content/markByDate.xul
+++ b/mailnews/base/content/markByDate.xul
@@ -9,18 +9,18 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/markByDate.dtd">
 
 <dialog
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   title="&messageMarkByDate.label;"
   buttons="accept,cancel"
   onload="onLoad();">
 
-  <script type="application/javascript" src="chrome://messenger/content/markByDate.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
+  <script src="chrome://messenger/content/markByDate.js"/>
+  <script src="chrome://messenger/content/dateFormat.js"/>
 
   <hbox align="center" pack="end">
     <label control="lowerDate"
            value="&markByDateLower.label;"
            accesskey="&markByDateLower.accesskey;"/>
     <textbox size="11" id="lowerDate"/>
   </hbox>
   <hbox align="center" pack="end">
--- a/mailnews/base/content/msgAccountCentral.xul
+++ b/mailnews/base/content/msgAccountCentral.xul
@@ -18,32 +18,24 @@
       onload="OnInit();">
 
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_messenger"
                 src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/accountUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/msgAccountCentral.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/mailCore.js"/>
+  <script src="chrome://messenger/content/AccountManager.js"/>
+  <script src="chrome://messenger/content/accountUtils.js"/>
+  <script src="chrome://messenger/content/commandglue.js"/>
+  <script src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script src="chrome://messenger/content/mailWindow.js"/>
+  <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script src="chrome://messenger/content/msgAccountCentral.js"/>
+  <script src="chrome://messenger/content/mailCore.js"/>
 
   <grid id="acctCentralGrid" flex="1" style="overflow: auto;">
     <columns id="acctCentralColumns">
       <column flex="40" id="acctCentralActionsColumn"/>
       <column flex="60" id="acctCentralHelpDataColumn"/>
     </columns>
 
     <rows id="acctCentralRows">
--- a/mailnews/base/content/msgPrintEngine.xul
+++ b/mailnews/base/content/msgPrintEngine.xul
@@ -20,22 +20,19 @@
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 
   <!-- Provide shortcut keys for toolkit's print preview; commands will be overridden by printUtils.js -->
   <key id="printKb" key="&printCmd.key;" command="cmd_print" modifiers="accel"/>
   <key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
 
-  <script type="application/javascript"
-          src="chrome://global/content/printUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/msgPrintEngine.js"/>
+  <script src="chrome://global/content/printUtils.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/msgPrintEngine.js"/>
 
   <!-- The main display frame -->
   <browser id="content"
            type="content"
            primary="true"
            name="content"
            src="about:blank"
            flex="1"
--- a/mailnews/base/content/msgSelectOfflineFolders.xul
+++ b/mailnews/base/content/msgSelectOfflineFolders.xul
@@ -13,20 +13,18 @@
         title="&MsgSelect.label;"
         width="450" height="400"
         persist="width height"
         onload="gSelectOffline.load();">
 
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/msgSelectOfflineFolders.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/folderPane.js"/>
+  <script src="chrome://messenger/content/msgSelectOfflineFolders.js"/>
+  <script src="chrome://messenger/content/folderPane.js"/>
 
   <label class="desc" control="synchronizeTree">&MsgSelectDesc.label;</label>
 
   <tree id="synchronizeTree"
         flex="1"
         hidecolumnpicker="true"
         seltype="multiple"
         disableKeyNavigation="true"
--- a/mailnews/base/content/msgSynchronize.xul
+++ b/mailnews/base/content/msgSynchronize.xul
@@ -11,17 +11,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         id="msg-synchronizer"
         windowtype="mailnews:synchronizeOffline"
         title="&MsgSynchronize.label;"
         onload="OnLoad();"
         style="width: 35em;">
 
-<script type="application/javascript" src="chrome://messenger/content/msgSynchronize.js"/>
+<script src="chrome://messenger/content/msgSynchronize.js"/>
 
     <keyset id="keyset"/>
     <label hidden="true" wsm_persist="true" id="server.type"/>
 
     <description class="desc">&MsgSyncDesc.label;</description>
     <separator class="thin"/>
     <label value="&MsgSyncDirections.label;"/>
 
--- a/mailnews/base/content/newFolderDialog.xul
+++ b/mailnews/base/content/newFolderDialog.xul
@@ -14,17 +14,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&newFolderDialog.title;"
         onload="onLoad();"
         buttonlabelaccept="&accept.label;"
         buttonaccesskeyaccept="&accept.accesskey;">
 
   <stringbundleset id="stringbundleset"/>
-  <script type="application/javascript" src="chrome://messenger/content/newFolderDialog.js"/>
+  <script src="chrome://messenger/content/newFolderDialog.js"/>
 
     <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
     <textbox id="name" oninput="doEnabling();"/>
 
     <separator/>
 
     <label value="&description.label;" accesskey="&description.accesskey;" control="msgNewFolderPicker"/>
 
--- a/mailnews/base/content/newmailalert.xul
+++ b/mailnews/base/content/newmailalert.xul
@@ -10,18 +10,18 @@
 <window id="newMailAlertNotification"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         windowtype="alert:alert"
         role="alert"
         align="start"
         onload="onAlertLoad()">
 
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/javascript" src="chrome://messenger/content/foldersummary.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/newmailalert.js"/>
+  <script src="chrome://messenger/content/foldersummary.js"/>
+  <script src="chrome://messenger/content/newmailalert.js"/>
 
   <stack id="alertContainer" mousethrough="always">
     <hbox id="alertBox">
       <hbox id ="alertImageBox" align="center" pack="center">
         <image id="alertImage"/>
       </hbox>
 
       <vbox id="alertTextBox">
--- a/mailnews/base/content/newsError.xhtml
+++ b/mailnews/base/content/newsError.xhtml
@@ -42,11 +42,11 @@
             <li id="messageIdDesc">&trySearching.title; &lt;<span id="msgId"/>&gt; (<span id="msgKey"/>)</li>
           </ul>
         </div>
       </div>
       <!-- This button really means "remove all expired articles", but we use
            the "errorTryAgain" id to piggyback on toolkit's CSS. -->
       <button id="errorTryAgain">&removeExpiredArticles.title;</button>
     </div>
-    <script type="application/javascript" src="chrome://messenger/content/newsError.js"/>
+    <script src="chrome://messenger/content/newsError.js"/>
   </body>
 </html>
--- a/mailnews/base/content/renameFolderDialog.xul
+++ b/mailnews/base/content/renameFolderDialog.xul
@@ -9,13 +9,13 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&renameFolderDialog.title;"
         buttonlabelaccept="&accept.label;"
         buttonaccesskeyaccept="&accept.accesskey;"
         onload="onLoad();">
 
   <stringbundleset id="stringbundleset"/>
-  <script type="application/javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
+  <script src="chrome://messenger/content/renameFolderDialog.js"/>
 
   <label value="&rename.label;" accesskey="&rename.accesskey;" control="name"/>
   <textbox id="name" oninput="doEnabling();"/>
 </dialog>
--- a/mailnews/base/content/shutdownWindow.xul
+++ b/mailnews/base/content/shutdownWindow.xul
@@ -8,17 +8,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="padding: 20px; width: 350px"
         onload="onLoad()"
         buttons="cancel">
 
-  <script type="application/javascript" src="chrome://messenger/content/shutdownWindow.js"/>
+  <script src="chrome://messenger/content/shutdownWindow.js"/>
   <stringbundle id="bundle_shutdown" src="chrome://messenger/locale/shutdownWindow.properties"/>
 
   <vbox align="center">
     <label id="shutdownStatus_label" value="" />
     <separator class="thin" />
   </vbox>
 
   <html:progress id="shutdown_progressmeter" max="100" />
--- a/mailnews/base/content/subscribe.xul
+++ b/mailnews/base/content/subscribe.xul
@@ -17,22 +17,19 @@
         persist="width height screenX screenY"
         onload="SubscribeOnLoad()"
         onunload="SubscribeOnUnload()"
         windowtype="mailnews:subscribe">
 
   <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/subscribe.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://messenger/content/mailWindow.js"/>
+  <script src="chrome://messenger/content/subscribe.js"/>
 
   <vbox flex="1" style="width: 40em; height: 25em;">
     <hbox>
       <vbox>
         <hbox pack="end" align="center" flex="1">
           <label value="&server.label;"
                  accesskey="&server.accesskey;"
                  control="serverMenu"/>
--- a/mailnews/base/content/virtualFolderListEdit.xul
+++ b/mailnews/base/content/virtualFolderListEdit.xul
@@ -11,20 +11,18 @@
 <dialog id="searchFolderWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&virtualFolderListTitle.title;"
         windowtype="mailnews:virtualFolderList"
         style="width: 27em; height: 25em;"
         persist="width height screenX screenY"
         onload="gSelectVirtual.load();">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/virtualFolderListEdit.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/folderPane.js"/>
+  <script src="chrome://messenger/content/virtualFolderListEdit.js"/>
+  <script src="chrome://messenger/content/folderPane.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 
   <label control="folderPickerTree">&virtualFolderDesc.label;</label>
 
     <tree id="folderPickerTree"
--- a/mailnews/base/content/virtualFolderProperties.xul
+++ b/mailnews/base/content/virtualFolderProperties.xul
@@ -29,23 +29,23 @@
         windowtype="mailnews:virtualFolderProperties">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_search"    src="chrome://messenger/locale/search.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_folder"    src="chrome://messenger/locale/folderWidgets.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/searchWidgets.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/virtualFolderProperties.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/searchTerm.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/searchWidgets.js"/>
+  <script src="chrome://messenger/content/mailCommands.js"/>
+  <script src="chrome://messenger/content/commandglue.js"/>
+  <script src="chrome://messenger/content/virtualFolderProperties.js"/>
+  <script src="chrome://messenger/content/searchTerm.js"/>
+  <script src="chrome://messenger/content/dateFormat.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <hbox>
     <vbox>
       <hbox flex="1" align="center">
         <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
       </hbox>
       <hbox id="chooseFolderLocationLabel" flex="1" align="center">
         <label value="&description.label;" accesskey="&description.accesskey;"
--- a/mailnews/base/prefs/content/AccountManager.xul
+++ b/mailnews/base/prefs/content/AccountManager.xul
@@ -13,23 +13,23 @@
         title="&accountManagerTitle.label;"
         style="&accountManager.size;"
         persist="width height screenX screenY"
         buttons="accept,cancel"
         onload="onLoad(event);"
         onunload="onUnload();">
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
-<script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+<script src="chrome://messenger/content/accountUtils.js"/>
+<script src="chrome://messenger/content/am-prefs.js"/>
+<script src="chrome://messenger/content/AccountManager.js"/>
 #ifdef MOZ_SUITE
-<script type="application/javascript" src="chrome://messenger/content/am-help.js"/>
+<script src="chrome://messenger/content/am-help.js"/>
 #endif
-<script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+<script src="chrome://messenger/content/amUtils.js"/>
 
   <hbox flex="1">
     <vbox style="&accountTree.width;">
       <tree flex="1" onselect="onAccountTreeSelect(null, null);" id="accounttree"
             seltype="single" hidecolumnpicker="true">
         <treecols>
           <treecol id="AccountCol" flex="1" primary="true" hideheader="true"/>
         </treecols>
--- a/mailnews/base/prefs/content/AccountWizard.xul
+++ b/mailnews/base/prefs/content/AccountWizard.xul
@@ -18,25 +18,25 @@
 #else
         onload="onAccountWizardLoad();"
 #endif
         style="&accountWizard.size;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/AccountWizard.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/aw-accounttype.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/aw-identity.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/aw-incoming.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/aw-outgoing.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/aw-accname.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/aw-done.js"/>
+  <script src="chrome://messenger/content/accountUtils.js"/>
+  <script src="chrome://messenger/content/amUtils.js"/>
+  <script src="chrome://messenger/content/AccountWizard.js"/>
+  <script src="chrome://messenger/content/aw-accounttype.js"/>
+  <script src="chrome://messenger/content/aw-identity.js"/>
+  <script src="chrome://messenger/content/aw-incoming.js"/>
+  <script src="chrome://messenger/content/aw-outgoing.js"/>
+  <script src="chrome://messenger/content/aw-accname.js"/>
+  <script src="chrome://messenger/content/aw-done.js"/>
 
   <!-- Account Type page : Displays choices of mail and news accounts that user can create -->
   <wizardpage id="accounttype" pageid="accounttype"
               label="&accountTypeTitle.label;">
     <vbox flex="1">
       <description>&accountSetupInfo2.label;</description>
       <description>&accountTypeDesc2.label;</description>
       <label control="acctyperadio">&accountTypeDirections.label;</label>
--- a/mailnews/base/prefs/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/content/SmtpServerEdit.xul
@@ -17,18 +17,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         onload="onLoad();">
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_messenger"
                 src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/SmtpServerEdit.js"/>
+  <script src="chrome://messenger/content/SmtpServerEdit.js"/>
   <vbox id="smtpServerEditor">
     <groupbox>
       <label class="header">&settings.caption;</label>
       <grid flex="1">
         <columns>
           <column/>
           <column flex="1"/>
         </columns>
--- a/mailnews/base/prefs/content/am-addressing.inc.xul
+++ b/mailnews/base/prefs/content/am-addressing.inc.xul
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-    <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+    <script src="chrome://messenger/content/customElements.js"/>
     <vbox flex="1" id="compositionAndAddressing">
       <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
       <groupbox>
         <label class="header">&compositionGroupTitle.label;</label>
         <hbox align="center">
           <checkbox wsm_persist="true" id="identity.composeHtml" label="&useHtml.label;"
                     accesskey="&useHtml.accesskey;"
--- a/mailnews/base/prefs/content/am-addressing.xul
+++ b/mailnews/base/prefs/content/am-addressing.xul
@@ -10,18 +10,18 @@
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-addressing.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&addressing.label;"
       onload="onLoad();">
 
 
   <vbox flex="1" style="overflow: auto;">
-    <script type="application/javascript" src="chrome://messenger/content/am-addressing.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+    <script src="chrome://messenger/content/am-addressing.js"/>
+    <script src="chrome://messenger/content/amUtils.js"/>
+    <script src="chrome://messenger/content/am-prefs.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&addressing.label;"/>
     </hbox>
 #include am-addressing.inc.xul
   </vbox>
 </page>
--- a/mailnews/base/prefs/content/am-archiveoptions.xul
+++ b/mailnews/base/prefs/content/am-archiveoptions.xul
@@ -11,17 +11,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         id="archive-options"
         title="&dialogTitle.label;"
         width="350" height="350"
         persist="width height"
         onload="onLoadArchiveOptions();">
 
-  <script type="application/javascript" src="chrome://messenger/content/am-archiveoptions.js"/>
+  <script src="chrome://messenger/content/am-archiveoptions.js"/>
 
   <vbox flex="1">
     <label>&archiveGranularityPrefix.label;</label>
     <radiogroup id="archiveGranularity">
       <radio label="&archiveFlat.label;" accesskey="&archiveFlat.accesskey;"
              class="indent"/>
       <radio label="&archiveYearly.label;"
              accesskey="&archiveYearly.accesskey;" class="indent"/>
--- a/mailnews/base/prefs/content/am-copies.xul
+++ b/mailnews/base/prefs/content/am-copies.xul
@@ -9,18 +9,18 @@
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-copies.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&copyAndFolderTitle.label;"
       onload="parent.onPanelLoaded('am-copies.xul');">
 
   <vbox flex="1" style="overflow: auto;">
-    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-copies.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+    <script src="chrome://messenger/content/AccountManager.js"/>
+    <script src="chrome://messenger/content/am-copies.js"/>
+    <script src="chrome://messenger/content/amUtils.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&copyAndFolderTitle.label;"/>
     </hbox>
 #include am-copies.inc.xul
   </vbox>
 </page>
--- a/mailnews/base/prefs/content/am-identities-list.xul
+++ b/mailnews/base/prefs/content/am-identities-list.xul
@@ -13,18 +13,17 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   onload="onLoad();"
   buttons="accept"
   buttonlabelaccept="&identitiesListClose.label;"
   buttonaccesskeyaccept="&identitiesListClose.accesskey;"
   style="width: 40em;">
 
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="application/javascript"
-        src="chrome://messenger/content/am-identities-list.js"/>
+<script src="chrome://messenger/content/am-identities-list.js"/>
 
 <commandset>
   <command id="cmd_add"     oncommand="openIdentityEditor(null);"/>
   <command id="cmd_edit"    oncommand="onEdit(event);" disabled="true"/>
   <command id="cmd_default" oncommand="onSetDefault(event);" disabled="true"/>
   <command id="cmd_delete"  oncommand="onDelete(event);" disabled="true"/>
 </commandset>
 
--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@@ -26,31 +26,24 @@
         onload="onLoadIdentityProperties();"
         style="&identityDialog.style;">
 
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_messenger"
                 src="chrome://messenger/locale/messenger.properties"/>
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-identity-edit.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-copies.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-addressing.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-smime.js"/>
-  <script type="application/javascript">
+  <script src="chrome://messenger/content/am-prefs.js"/>
+  <script src="chrome://messenger/content/am-identity-edit.js"/>
+  <script src="chrome://messenger/content/amUtils.js"/>
+  <script src="chrome://messenger/content/AccountManager.js"/>
+  <script src="chrome://messenger/content/am-copies.js"/>
+  <script src="chrome://messenger/content/am-addressing.js"/>
+  <script src="chrome://messenger/content/am-smime.js"/>
+  <script>
   <![CDATA[
     window.addEventListener("load", smimeOnLoadEditor, false);
   ]]>
   </script>
 
   <description>&identityListDesc.label;</description>
   <separator class="thin"/>
 
--- a/mailnews/base/prefs/content/am-junk.xul
+++ b/mailnews/base/prefs/content/am-junk.xul
@@ -16,20 +16,20 @@
 %junkMailDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&junkSettings.label;"
       onload="parent.onPanelLoaded('am-junk.xul');">
 
   <vbox flex="1" style="overflow: auto;">
-    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-junk.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+    <script src="chrome://messenger/content/AccountManager.js"/>
+    <script src="chrome://messenger/content/am-junk.js"/>
+    <script src="chrome://messenger/content/am-prefs.js"/>
+    <script src="chrome://messenger/content/amUtils.js"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&junkSettings.label;"/>
     </hbox>
 
     <groupbox>
       <label class="header">&junkClassification.label;</label>
--- a/mailnews/base/prefs/content/am-main.xul
+++ b/mailnews/base/prefs/content/am-main.xul
@@ -11,21 +11,20 @@
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml"
       onload="parent.onPanelLoaded('am-main.xul');">
 
   <vbox flex="1" style="overflow: auto;">
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
-    <script type="application/javascript" src="chrome://messenger/content/am-identity-edit.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-main.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
-    <script type="application/javascript"
-            src="chrome://messenger/content/amUtils.js"/>
+    <script src="chrome://messenger/content/am-identity-edit.js"/>
+    <script src="chrome://messenger/content/am-main.js"/>
+    <script src="chrome://messenger/content/am-prefs.js"/>
+    <script src="chrome://messenger/content/amUtils.js"/>
 
     <hbox id="am-main-title" class="dialogheader">
       <label class="dialogheader-title" defaultTitle="&accountTitle.label;"/>
     </hbox>
 
     <hbox align="center">
       <label value="&accountName.label;" control="server.prettyName"
              accesskey="&accountName.accesskey;"/>
--- a/mailnews/base/prefs/content/am-offline.xul
+++ b/mailnews/base/prefs/content/am-offline.xul
@@ -8,19 +8,19 @@
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-offline.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       onload="parent.onPanelLoaded('am-offline.xul');">
 
   <vbox flex="1" style="overflow: auto;">
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 
-    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/retention.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-offline.js"/>
+    <script src="chrome://messenger/content/AccountManager.js"/>
+    <script src="chrome://messenger/content/retention.js"/>
+    <script src="chrome://messenger/content/am-offline.js"/>
 
     <label hidden="true" wsm_persist="true" id="server.type"/>
     <label id="imap.autoSyncMaxAgeDays" hidden="true"
            wsm_persist="true" preftype="int"
            prefstring="mail.server.%serverkey%.autosync_max_age_days"/>
 
     <hbox id="headertitle" class="dialogheader">
       <label class="dialogheader-title"/>
--- a/mailnews/base/prefs/content/am-server-advanced.xul
+++ b/mailnews/base/prefs/content/am-server-advanced.xul
@@ -11,18 +11,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/am-server-advanced.dtd">
 
 <dialog
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         title="&serverAdvanced.label;"
         buttons="accept,cancel"
         onload="onLoad();">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-server-advanced.js"/>
+  <script src="chrome://messenger/content/am-server-advanced.js"/>
   <stringbundle id="bundle_prefs"
                 src="chrome://messenger/locale/prefs.properties"/>
 
     <label id="serverPrettyName"/>
 
     <separator class="thin"/>
 
     <!-- IMAP Panel -->
--- a/mailnews/base/prefs/content/am-server.xul
+++ b/mailnews/base/prefs/content/am-server.xul
@@ -12,21 +12,21 @@
 %trashDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&serverSettings.label;"
       onload="parent.onPanelLoaded('am-server.xul');">
 
   <vbox flex="1" style="overflow: auto;">
-    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-server.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/menulist-charsetpicker.js"/>
+    <script src="chrome://messenger/content/AccountManager.js"/>
+    <script src="chrome://messenger/content/am-server.js"/>
+    <script src="chrome://messenger/content/am-prefs.js"/>
+    <script src="chrome://messenger/content/amUtils.js"/>
+    <script src="chrome://messenger/content/menulist-charsetpicker.js"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
     <label hidden="true" wsm_persist="true" id="server.type"/>
     <label hidden="true"
            wsm_persist="true"
            preftype="string"
            prefattribute="value"
            prefstring="mail.server.%serverkey%.storeContractID"
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xul
@@ -10,18 +10,18 @@
 <!ENTITY % accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >%accountNoIdentDTD;
 <!ENTITY % accountServerTopDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">%accountServerTopDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&accountTitle.label;"
       onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');">
 
-  <script type="application/javascript" src="chrome://messenger/content/am-serverwithnoidentities.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script src="chrome://messenger/content/am-serverwithnoidentities.js"/>
+  <script src="chrome://messenger/content/amUtils.js"/>
 
   <hbox class="dialogheader">
     <label class="dialogheader-title" value="&accountTitle.label;"/>
   </hbox>
 
   <label hidden="true"
          wsm_persist="true"
          preftype="string"
--- a/mailnews/base/prefs/content/am-smtp.xul
+++ b/mailnews/base/prefs/content/am-smtp.xul
@@ -6,20 +6,18 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-advanced.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&smtpServer.label;"
       onload="gSmtpServerListWindow.onLoad();">
-  <script type="application/javascript"
-          src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-smtp.js"/>
+  <script src="chrome://messenger/content/amUtils.js"/>
+  <script src="chrome://messenger/content/am-smtp.js"/>
 
   <stringbundle id="bundle_messenger"
                 src="chrome://messenger/locale/messenger.properties"/>
 
   <vbox flex="1" style="overflow: auto;">
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&smtpServer.label;"/>
     </hbox>
--- a/mailnews/base/prefs/content/removeAccount.xul
+++ b/mailnews/base/prefs/content/removeAccount.xul
@@ -20,18 +20,17 @@
         width="600"
         buttons="accept,disclosure,cancel"
         buttonlabelaccept="&removeButton.label;"
         buttonaccesskeyaccept="&removeButton.accesskey;"
         defaultButton="cancel"
         onload="onLoad();">
   <stringbundle id="bundle_removeAccount"
                 src="chrome://messenger/locale/removeAccount.properties"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/removeAccount.js"/>
+  <script src="chrome://messenger/content/removeAccount.js"/>
   <deck id="infoPane">
     <vbox flex="1">
       <label id="accountName"></label>
       <separator class="thin"/>
       <checkbox id="removeAccount"
                 label="&removeAccount.label;"
                 checked="true"
                 disabled="true"
--- a/mailnews/base/search/content/CustomHeaders.xul
+++ b/mailnews/base/search/content/CustomHeaders.xul
@@ -17,17 +17,17 @@
         title="&window.title;"
         buttons="accept,cancel,extra1,extra2">
 
   <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
   <stringbundle id="bundle_custom" src="chrome://messenger/locale/custom.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/CustomHeaders.js"/>
+  <script src="chrome://messenger/content/CustomHeaders.js"/>
 
   <grid flex="1">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
     <rows>
       <row>
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -25,23 +25,23 @@
   onload="filterEditorOnLoad();">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript" src="chrome://messenger/content/searchWidgets.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/FilterEditor.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/searchTerm.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/customElements.js"/>
+  <script src="chrome://messenger/content/searchWidgets.js"/>
+  <script src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script src="chrome://messenger/content/mailCommands.js"/>
+  <script src="chrome://messenger/content/FilterEditor.js"/>
+  <script src="chrome://messenger/content/searchTerm.js"/>
+  <script src="chrome://messenger/content/dateFormat.js"/>
+  <script src="chrome://messenger/content/customElements.js"/>
 
   <commandset>
     <command id="cmd_updateFilterType" oncommand="updateFilterType();"/>
     <command id="cmd_updateClassificationMenu" oncommand="gFilterTypeSelector.updateClassificationMenu();"/>
   </commandset>
 
   <vbox>
     <hbox align="center">
--- a/mailnews/base/search/content/viewLog.xul
+++ b/mailnews/base/search/content/viewLog.xul
@@ -14,17 +14,17 @@
         title="&viewLog.title;"
         windowtype="mailnews:filterlog"
         buttons="accept"
         buttonlabelaccept="&closeLog.label;"
         buttonaccesskeyaccept="&closeLog.accesskey;"
         persist="screenX screenY width height"
         style="width: 40em; height: 25em;">
 
-  <script type="application/javascript" src="chrome://messenger/content/viewLog.js"/>
+  <script src="chrome://messenger/content/viewLog.js"/>
 
   <vbox flex="1">
     <description>&viewLogInfo.text;</description>
     <hbox>
       <checkbox id="logFilters"
                 label="&enableLog.label;"
                 accesskey="&enableLog.accesskey;"
                 oncommand="toggleLogFilters();"/>
--- a/mailnews/compose/content/askSendFormat.xul
+++ b/mailnews/compose/content/askSendFormat.xul
@@ -11,18 +11,17 @@
         title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         buttonpack="center"
         onload="Startup();"
         buttonlabelaccept="&send.label;"
         buttonaccesskeyaccept="&send.accesskey;"
         style="width: 75ch;">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
+  <script src="chrome://messenger/content/messengercompose/askSendFormat.js"/>
 
   <stringbundle id="askSendFormatStringBundle"
                 src="chrome://messenger/locale/messengercompose/askSendFormat.properties"/>
 
     <separator class="thin"/>
     <hbox>
       <separator orient="vertical"/>
       <vbox id="askImageBox">
--- a/mailnews/compose/content/sendProgress.xul
+++ b/mailnews/compose/content/sendProgress.xul
@@ -12,18 +12,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&sendDialog.title;"
         style="width: 56ch;"
         onload="onLoad();"
         onunload="onUnload();"
         buttons="cancel">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/messengercompose/sendProgress.js"/>
+  <script src="chrome://messenger/content/messengercompose/sendProgress.js"/>
   <stringbundle id="sendProgressStringBundle"
                 src="chrome://messenger/locale/messengercompose/sendProgress.properties"/>
 
     <grid flex="1">
       <columns>
         <column/>
         <column flex="1"/>
       </columns>
--- a/mailnews/extensions/dsn/content/am-dsn.xul
+++ b/mailnews/extensions/dsn/content/am-dsn.xul
@@ -9,18 +9,18 @@
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-dsn.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       onload="parent.onPanelLoaded('am-dsn.xul');">
 
   <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-dsn.properties"/>
-  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/am-dsn.js"/>
+  <script src="chrome://messenger/content/AccountManager.js"/>
+  <script src="chrome://messenger/content/am-dsn.js"/>
 
   <hbox class="dialogheader">
     <label class="dialogheader-title" value="&pane.title;"/>
   </hbox>
 
   <groupbox>
 
     <label class="header">&pane.title;</label>
--- a/mailnews/extensions/mdn/content/am-mdn.xul
+++ b/mailnews/extensions/mdn/content/am-mdn.xul
@@ -11,19 +11,19 @@
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-mdn.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       title="&pane.title;"
       onload="parent.onPanelLoaded('am-mdn.xul');">
 
   <vbox flex="1" style="overflow: auto;">
     <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-mdn.properties"/>
-    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-mdn.js"/>
+    <script src="chrome://messenger/content/AccountManager.js"/>
+    <script src="chrome://messenger/content/amUtils.js"/>
+    <script src="chrome://messenger/content/am-mdn.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&pane.title;"/>
     </hbox>
 
     <groupbox>
 
       <label class="header">&pane.title;</label>
--- a/mailnews/extensions/newsblog/content/am-newsblog.xul
+++ b/mailnews/extensions/newsblog/content/am-newsblog.xul
@@ -17,26 +17,21 @@
 %accountServerTopDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
       class="color-dialog"
       title="&accountTitle.label;"
       onload="parent.onPanelLoaded('am-newsblog.xul');">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger-newsblog/content/am-newsblog.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger/content/am-prefs.js"/>
+  <script src="chrome://messenger/content/AccountManager.js"/>
+  <script src="chrome://messenger-newsblog/content/am-newsblog.js"/>
+  <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+  <script src="chrome://messenger/content/amUtils.js"/>
+  <script src="chrome://messenger/content/am-prefs.js"/>
 
   <vbox flex="1" style="overflow: auto;">
 
     <hbox id="am-newsblog-title" class="dialogheader">
       <label class="dialogheader-title" defaultTitle="&accountTitle.label;"/>
     </hbox>
 
     <description class="secDesc">&accountSettingsDesc.label;</description>
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xul
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xul
@@ -24,20 +24,18 @@
         title="&feedSubscriptions.label;"
         windowtype="Mail:News-BlogSubscriptions"
         persist="width height screenX screenY sizemode"
         onload="FeedSubscriptions.onLoad();"
         onclose="return FeedSubscriptions.onClose();"
         onkeypress="FeedSubscriptions.onKeyPress(event);"
         onmousedown="FeedSubscriptions.onMouseDown(event);">
 
-  <script type="application/javascript"
-          src="chrome://messenger/content/specialTabs.js"/>
-  <script type="application/javascript"
-          src="chrome://messenger-newsblog/content/feed-subscriptions.js"/>
+  <script src="chrome://messenger/content/specialTabs.js"/>
+  <script src="chrome://messenger-newsblog/content/feed-subscriptions.js"/>
 
   <linkset>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
   <keyset id="extensionsKeys">
     <key id="key_close"
          key="&cmd.close.commandKey;"
--- a/mailnews/extensions/newsblog/content/feedAccountWizard.xul
+++ b/mailnews/extensions/newsblog/content/feedAccountWizard.xul
@@ -14,18 +14,17 @@
   %imDTD;
 ]>
 
 <wizard id="FeedAccountWizard"
         title="&feedWindowTitle.label;"
         onload="FeedAccountWizard.onLoad();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml">
 
-  <script type="application/javascript"
-          src="chrome://messenger-newsblog/content/feedAccountWizard.js"/>
+  <script src="chrome://messenger-newsblog/content/feedAccountWizard.js"/>
 
   <!-- Account setup page : User gets a choice to enter a name for the account -->
   <!-- Defaults : Feed account name -> default string -->
   <wizardpage id="accountsetuppage"
               pageid="accountsetuppage"
               label="&accnameTitle.label;">
     <vbox flex="1">
       <description>&accnameDesc.label;</description>
--- a/mailnews/extensions/smime/content/am-smime.xul
+++ b/mailnews/extensions/smime/content/am-smime.xul
@@ -7,18 +7,18 @@
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-smime.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         class="color-dialog"
         onload="parent.onPanelLoaded('am-smime.xul');">
 
   <vbox flex="1" style="overflow: auto;">
-    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/javascript" src="chrome://messenger/content/am-smime.js"/>
+    <script src="chrome://messenger/content/AccountManager.js"/>
+    <script src="chrome://messenger/content/am-smime.js"/>
 
     <hbox class="dialogheader">
       <label class="dialogheader-title" value="&securityTitle.label;"/>
     </hbox>
 
 #include am-smime.inc.xul
   </vbox>
 
--- a/mailnews/extensions/smime/content/certFetchingStatus.xul
+++ b/mailnews/extensions/smime/content/certFetchingStatus.xul
@@ -11,13 +11,13 @@
 <dialog id="certFetchingStatus" title="&title.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   style="width: 50em;"
   buttons="cancel"
   buttonlabelcancel="&stop.label;"
   onload="onLoad();">
 
   <stringbundle id="bundle_ldap" src="chrome://mozldap/locale/ldap.properties"/>
-<script type="application/javascript" src="chrome://messenger-smime/content/certFetchingStatus.js"/>
+<script src="chrome://messenger-smime/content/certFetchingStatus.js"/>
 
   <description>&info.message;</description>
 
 </dialog>
--- a/mailnews/extensions/smime/content/certpicker.xul
+++ b/mailnews/extensions/smime/content/certpicker.xul
@@ -12,18 +12,17 @@
 
 <dialog id="certPicker" title="&certPicker.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   style="width: 50em;"
   buttons="accept,cancel"
   onload="onLoad();">
 
-<script type="application/javascript"
-        src="chrome://messenger/content/certpicker.js"/>
+<script src="chrome://messenger/content/certpicker.js"/>
 
   <hbox align="center">
     <label id="pickerInfo" value="&certPicker.info;"/>
     <!-- The items in this menulist must never be sorted,
          but remain in the order filled by the application
     -->
     <menulist id="nicknames" oncommand="onCertSelected();">
       <menupopup/>
--- a/mailnews/extensions/smime/content/msgCompSecurityInfo.xul
+++ b/mailnews/extensions/smime/content/msgCompSecurityInfo.xul
@@ -10,17 +10,17 @@
 
 <dialog id="msgCompSecurityInfo" title="&title.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   style="width: 50em;"
   persist="width height"
   buttons="accept"
   onload="onLoad();">
 
-  <script type="application/javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
+  <script src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
   <script><![CDATA[
       function resizeColumns() {
         let list = document.getElementById("infolist");
         let cols = list.getElementsByTagName("treecol");
         list.style.setProperty("--recipientWidth", cols[0].getBoundingClientRect().width + "px");
         list.style.setProperty("--statusWidth", cols[1].getBoundingClientRect().width + "px");
         list.style.setProperty("--issuedWidth", cols[2].getBoundingClientRect().width + "px");
         list.style.setProperty("--expireWidth", cols[3].getBoundingClientRect().width - 5 + "px");
--- a/mailnews/extensions/smime/content/msgReadSecurityInfo.xul
+++ b/mailnews/extensions/smime/content/msgReadSecurityInfo.xul
@@ -9,17 +9,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/msgReadSecurityInfo.dtd">
 
 <dialog id="msgReadSecurityInfo" title="&status.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
   style="width: 40em;"
   buttons="accept"
   onload="onLoad();">
 
-  <script type="application/javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
+  <script src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
 
   <stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/>
 
   <vbox flex="1">
     <label id="signatureLabel"/>
     <label id="signatureHeader" collapsed="true"/>
     <description id="signatureExplanation"/>
     <vbox id="signatureCert" collapsed="true">
--- a/mailnews/import/content/fieldMapImport.xul
+++ b/mailnews/import/content/fieldMapImport.xul
@@ -13,17 +13,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/fieldMapImport.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel"
         title="&fieldMapImport.title;"
         style="&fieldMapImport.size;"
         onload="OnLoadFieldMapImport();">
 
-  <script type="application/javascript" src="chrome://messenger/content/fieldMapImport.js"/>
+  <script src="chrome://messenger/content/fieldMapImport.js"/>
   <script><![CDATA[
       function resizeColumns() {
         let list = document.getElementById("fieldList");
         let cols = list.getElementsByTagName("treecol");
         list.style.setProperty("--column1width", cols[0].getBoundingClientRect().width + "px");
         list.style.setProperty("--column2width", cols[1].getBoundingClientRect().width + "px");
       }
       addEventListener("load", resizeColumns, { once: true });
--- a/mailnews/import/content/import-test.html
+++ b/mailnews/import/content/import-test.html
@@ -1,16 +1,16 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html>
 <body>
 
-<script type="application/javascript">
+<script>
 
 function toImport(importType)
 {
 	/*
 	window.openDialog("chrome:/messenger/content/fieldMapImport.xul",
 					  "fieldMapImportDialog",
 					  "chrome,modal");
 	*/
--- a/mailnews/import/content/importDialog.xul
+++ b/mailnews/import/content/importDialog.xul
@@ -21,18 +21,18 @@
         style="width: &window.width; !important;"
 #endif
         title="&importDialog.windowTitle;">
 
   <stringbundle id="bundle_importMsgs" src="chrome://messenger/locale/importMsgs.properties"/>
   <stringbundle id="bundle_addressbook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_vcardImportMsgs" src="chrome://messenger/locale/vCardImportMsgs.properties"/>
   <stringbundle id="bundle_feeds" src="chrome://messenger-newsblog/locale/newsblog.properties"/>
-  <script type="application/javascript" src="chrome://messenger/content/importDialog.js"/>
-  <script type="application/javascript" src="chrome://messenger-newsblog/content/feed-subscriptions.js"/>
+  <script src="chrome://messenger/content/importDialog.js"/>
+  <script src="chrome://messenger-newsblog/content/feed-subscriptions.js"/>
 
   <keyset id="dialogKeys"/>
 
   <hbox class="box-header" id="header"
        title="&importTitle.label;"
        description="&importShortDesc.label;"/>
 
   <deck id="stateDeck" selectedIndex="0" style="min-height: 30em">
--- a/mailnews/news/content/downloadheaders.xul
+++ b/mailnews/news/content/downloadheaders.xul
@@ -8,17 +8,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml"
         style="max-width: 27em;"
         buttonpack="center"
         onload="OnLoad();">
 
   <stringbundle id="bundle_news" src="chrome://messenger/locale/news.properties"/>
-  <script type="application/javascript" src="chrome://messenger/content/downloadheaders.js"/>
+  <script src="chrome://messenger/content/downloadheaders.js"/>
 
   <label class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel" control="downloadGroup"/>
   <description style="width: 25em; max-width: 25em;" id="info" control="downloadGroup"/>
   <separator class="thin"/>
   <vbox class="indent">
     <radiogroup id="downloadGroup">
       <radio id="all" label="&all.label;" accesskey="&all.accesskey;"
              oncommand="setupDownloadUI(false);"/>