Bug 1546501 - Remove unnecessary type attributes (i.e. [type="application/javascript"]) on non-test script tags r=mossop
authorBrian Grinstead <bgrinstead@mozilla.com>
Wed, 24 Apr 2019 19:43:57 +0000
changeset 530022 70858ec04904f0b15fc718e67a092cf736e69a39
parent 530021 8457ce7cc442cf10ebe42c8299fdcd4ce259981e
child 530023 d128c93735ff7f0654895ab0a4d987552efee242
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmossop
bugs1546501, 9060222
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1546501 - Remove unnecessary type attributes (i.e. [type="application/javascript"]) on non-test script tags r=mossop This is an autogenerated commit, generated with https://bug1546501.bmoattachments.org/attachment.cgi?id=9060222 Differential Revision: https://phabricator.services.mozilla.com/D28559
browser/base/content/aboutDialog.xul
browser/base/content/aboutNetError.xhtml
browser/base/content/aboutRestartRequired.xhtml
browser/base/content/aboutRobots.xhtml
browser/base/content/aboutTabCrashed.xhtml
browser/base/content/blockedSite.xhtml
browser/base/content/browser.xul
browser/base/content/macWindow.inc.xul
browser/base/content/newInstallPage.html
browser/base/content/pageinfo/pageInfo.xul
browser/base/content/safeMode.xul
browser/base/content/sanitize.xul
browser/base/content/webext-panels.xul
browser/base/content/webrtcIndicator.xul
browser/components/aboutconfig/content/aboutconfig.html
browser/components/downloads/content/contentAreaDownloadsView.xul
browser/components/enterprisepolicies/content/aboutPolicies.xhtml
browser/components/migration/content/aboutWelcomeBack.xhtml
browser/components/migration/content/migration.xul
browser/components/places/content/bookmarkProperties.xul
browser/components/places/content/bookmarksSidebar.xul
browser/components/places/content/historySidebar.xul
browser/components/places/content/places.xul
browser/components/pocket/content/panels/saved.html
browser/components/pocket/content/panels/signup.html
browser/components/preferences/applicationManager.xul
browser/components/preferences/browserLanguages.xul
browser/components/preferences/colors.xul
browser/components/preferences/connection.xul
browser/components/preferences/fonts.xul
browser/components/preferences/in-content/containers.xul
browser/components/preferences/in-content/home.xul
browser/components/preferences/in-content/main.xul
browser/components/preferences/in-content/preferences.xul
browser/components/preferences/in-content/privacy.xul
browser/components/preferences/in-content/search.xul
browser/components/preferences/in-content/sync.xul
browser/components/preferences/languages.xul
browser/components/preferences/sanitize.xul
browser/components/preferences/selectBookmark.xul
browser/components/preferences/sitePermissions.xul
browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
browser/components/sessionstore/content/aboutSessionRestore.xhtml
browser/components/shell/content/setDesktopBackground.xul
browser/components/syncedtabs/sidebar.xhtml
browser/extensions/formautofill/content/editAddress.xhtml
browser/extensions/formautofill/content/editCreditCard.xhtml
browser/extensions/formautofill/content/manageAddresses.xhtml
browser/extensions/formautofill/content/manageCreditCards.xhtml
browser/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html
devtools/client/aboutdebugging-new/index.html
devtools/client/aboutdebugging/aboutdebugging.xhtml
devtools/client/accessibility/index.html
devtools/client/debugger/index.html
devtools/client/dom/index.html
devtools/client/framework/connect/connect.xhtml
devtools/client/framework/toolbox-options.xhtml
devtools/client/framework/toolbox-process-window.html
devtools/client/framework/toolbox.xul
devtools/client/inspector/index.xhtml
devtools/client/inspector/markup/markup.xhtml
devtools/client/memory/index.xhtml
devtools/client/performance-new/index.xhtml
devtools/client/performance/index.xul
devtools/client/responsive.html/index.xhtml
devtools/client/scratchpad/index.xul
devtools/client/shared/widgets/VariablesView.xul
devtools/client/shared/widgets/graphs-frame.xhtml
devtools/client/storage/index.xul
devtools/client/styleeditor/index.xul
devtools/client/webconsole/index.html
devtools/client/webide/content/addons.xhtml
devtools/client/webide/content/details.xhtml
devtools/client/webide/content/devicepreferences.xhtml
devtools/client/webide/content/logs.xhtml
devtools/client/webide/content/newapp.xul
devtools/client/webide/content/prefs.xhtml
devtools/client/webide/content/project-listing.xhtml
devtools/client/webide/content/runtime-listing.xhtml
devtools/client/webide/content/runtimedetails.xhtml
devtools/client/webide/content/webide.xul
devtools/client/webide/content/wifi-auth.xhtml
devtools/startup/aboutdevtools/aboutdevtools.xhtml
docshell/resources/content/netError.xhtml
layout/tools/recording/recording.xul
security/manager/pki/resources/content/certManager.xul
security/manager/pki/resources/content/certViewer.xul
security/manager/pki/resources/content/changepassword.xul
security/manager/pki/resources/content/choosetoken.xul
security/manager/pki/resources/content/clientauthask.xul
security/manager/pki/resources/content/createCertInfo.xul
security/manager/pki/resources/content/deletecert.xul
security/manager/pki/resources/content/device_manager.xul
security/manager/pki/resources/content/downloadcert.xul
security/manager/pki/resources/content/editcacert.xul
security/manager/pki/resources/content/exceptionDialog.xul
security/manager/pki/resources/content/load_device.xul
security/manager/pki/resources/content/protectedAuth.xul
security/manager/pki/resources/content/resetpassword.xul
security/manager/pki/resources/content/setp12password.xul
toolkit/components/aboutcheckerboard/content/aboutCheckerboard.xhtml
toolkit/components/aboutmemory/content/aboutMemory.xhtml
toolkit/components/aboutperformance/content/aboutPerformance.xhtml
toolkit/components/alerts/resources/content/alert.xul
toolkit/components/apppicker/content/appPicker.xul
toolkit/components/passwordmgr/content/passwordManager.xul
toolkit/components/perf/test_pm.xul
toolkit/components/pictureinpicture/content/player.xhtml
toolkit/components/printing/content/printPageSetup.xul
toolkit/components/printing/content/printPreviewProgress.xul
toolkit/components/printing/content/printProgress.xul
toolkit/components/prompts/content/commonDialog.xul
toolkit/components/prompts/content/selectDialog.xul
toolkit/components/reader/content/aboutReader.html
toolkit/content/aboutAbout.xhtml
toolkit/content/aboutNetworking.xhtml
toolkit/content/aboutProfiles.xhtml
toolkit/content/aboutRights-unbranded.xhtml
toolkit/content/aboutRights.xhtml
toolkit/content/aboutServiceWorkers.xhtml
toolkit/content/aboutSupport.xhtml
toolkit/content/aboutTelemetry.xhtml
toolkit/content/aboutUrlClassifier.xhtml
toolkit/content/aboutwebrtc/aboutWebrtc.html
toolkit/content/datepicker.xhtml
toolkit/content/plugins.html
toolkit/content/resetProfile.xul
toolkit/content/timepicker.xhtml
toolkit/crashreporter/content/crashes.xhtml
toolkit/mozapps/extensions/content/blocklist.xul
toolkit/mozapps/extensions/content/extensions.xul
toolkit/mozapps/extensions/content/pluginPrefs.xul
toolkit/mozapps/extensions/content/shortcuts.html
toolkit/mozapps/preferences/changemp.xul
toolkit/mozapps/preferences/removemp.xul
toolkit/mozapps/update/content/history.xul
toolkit/mozapps/update/content/updates.xul
toolkit/profile/content/createProfileWizard.xul
toolkit/profile/content/profileDowngrade.xul
toolkit/profile/content/profileSelection.xul
tools/leak-gauge/leak-gauge.html
--- a/browser/base/content/aboutDialog.xul
+++ b/browser/base/content/aboutDialog.xul
@@ -34,19 +34,19 @@
 #include macWindow.inc.xul
 #endif
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="browser/aboutDialog.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
+  <script src="chrome://browser/content/aboutDialog.js"/>
 #ifdef MOZ_UPDATER
-  <script type="application/javascript" src="chrome://browser/content/aboutDialog-appUpdater.js"/>
+  <script src="chrome://browser/content/aboutDialog-appUpdater.js"/>
 #endif
 
   <vbox id="aboutDialogContainer">
     <hbox id="clientBox">
       <vbox id="leftBox" flex="1"/>
       <vbox id="rightBox" flex="1">
         <label id="release" hidden="true">
         <!-- This string is explicitly not translated -->
--- a/browser/base/content/aboutNetError.xhtml
+++ b/browser/base/content/aboutNetError.xhtml
@@ -228,10 +228,10 @@
         <div id="certificateErrorDebugInformation">
           <button id="copyToClipboard" data-telemetry-id="clipboard_button_top">&certerror.copyToClipboard.label;</button>
           <div id="certificateErrorText"/>
           <button id="copyToClipboard" data-telemetry-id="clipboard_button_bot">&certerror.copyToClipboard.label;</button>
         </div>
       </div>
     </div>
   </body>
-  <script type="application/javascript" src="chrome://browser/content/aboutNetError.js"/>
+  <script src="chrome://browser/content/aboutNetError.js"/>
 </html>
--- a/browser/base/content/aboutRestartRequired.xhtml
+++ b/browser/base/content/aboutRestartRequired.xhtml
@@ -33,11 +33,10 @@
       </div>
       <!-- Restart Button -->
       <div id="restartButtonContainer" class="button-container">
         <button id="restart" data-l10n-id="restart-button-label" class="primary" autocomplete="off"
                 onclick="AboutRestartRequired.restart();"></button>
       </div>
     </div>
   </body>
-  <script type="text/javascript"
-          src="chrome://browser/content/aboutRestartRequired.js"/>
+  <script src="chrome://browser/content/aboutRestartRequired.js"/>
 </html>
--- a/browser/base/content/aboutRobots.xhtml
+++ b/browser/base/content/aboutRobots.xhtml
@@ -53,10 +53,10 @@
       <!-- Button -->
       <div class="button-container">
         <button id="errorTryAgain"
                 data-l10n-id="error-try-again"
                 data-l10n-attrs="label2"></button>
       </div>
     </div>
   </body>
-  <script type="application/javascript" src="chrome://browser/content/aboutRobots.js"/>
+  <script src="chrome://browser/content/aboutRobots.js"/>
 </html>
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -77,10 +77,10 @@
 
       <div class="button-container">
         <button id="closeTab" data-l10n-id="crashed-close-tab-button"></button>
         <button id="restoreTab" class="primary" data-l10n-id="crashed-restore-tab-button"></button>
         <button id="restoreAll" autofocus="true" data-l10n-id="crashed-restore-all-button"/>
       </div>
     </div>
   </body>
-  <script type="text/javascript" src="chrome://browser/content/aboutTabCrashed.js"/>
+  <script src="chrome://browser/content/aboutTabCrashed.js"/>
 </html>
--- a/browser/base/content/blockedSite.xhtml
+++ b/browser/base/content/blockedSite.xhtml
@@ -53,10 +53,10 @@
           <p id="learn_more">
               <a id="learn_more_link" data-l10n-name="learn_more_link"></a>
               <a id="firefox_support" data-l10n-name="firefox_support"></a>
           </p>
         </div>
       </div>
     </div>
   </body>
-  <script type="application/javascript" src="chrome://browser/content/blockedSite.js"/>
+  <script src="chrome://browser/content/blockedSite.js"/>
 </html>
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -75,17 +75,17 @@
 #endif
         >
 
 # All JS files which are needed by browser.xul and other top level windows to
 # support MacOS specific features *must* go into the global-scripts.inc file so
 # that they can be shared with macWindow.inc.xul.
 #include global-scripts.inc
 
-<script type="application/javascript">
+<script>
   Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);
   Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);
 #ifdef MOZ_DATA_REPORTING
   Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
 #endif
 #ifndef MOZILLA_OFFICIAL
   Services.scriptloader.loadSubScript("chrome://browser/content/browser-development-helpers.js", this);
--- a/browser/base/content/macWindow.inc.xul
+++ b/browser/base/content/macWindow.inc.xul
@@ -10,17 +10,17 @@
 # below that are shared with browser.xul. When including this file,
 # browser-doctype.inc must also be included.
 
 # All JS files which are needed by browser.xul and other top level windows to
 # support MacOS specific features *must* go into the global-scripts.inc file so
 # that they can be shared with browser.xul.
 #include global-scripts.inc
 
-<script type="application/javascript" src="chrome://browser/content/nonbrowser-mac.js"></script>
+<script src="chrome://browser/content/nonbrowser-mac.js"></script>
 
 # All sets except for popupsets (commands, keys, and stringbundles)
 # *must* go into the browser-sets.inc file so that they can be shared with
 # browser.xul
 #include browser-sets.inc
 
 # The entire main menubar is placed into browser-menubar.inc, so that it can be
 # shared with browser.xul.
--- a/browser/base/content/newInstallPage.html
+++ b/browser/base/content/newInstallPage.html
@@ -10,17 +10,17 @@
   <meta name="referrer" content="no-referrer">
   <link rel="stylesheet" type="text/css" href="chrome://global/skin/in-content/common.css">
   <link rel="stylesheet" type="text/css" href="chrome://browser/skin/newInstallPage.css">
   <link rel="localization" href="branding/brand.ftl">
   <link rel="localization" href="browser/branding/sync-brand.ftl">
   <link rel="localization" href="browser/newInstallPage.ftl">
   <link rel="icon" type="image/png" href="chrome://branding/content/icon32.png">
   <title data-l10n-id="title"></title>
-  <script type="text/javascript" src="chrome://browser/content/newInstallPage.js"></script>
+  <script src="chrome://browser/content/newInstallPage.js"></script>
 </head>
 <body>
   <div id="main">
     <div id="header">
       <img role="presentation" src="chrome://branding/content/horizontal-lockup.svg">
     </div>
     <div id="content">
       <div id="info">
--- a/browser/base/content/pageinfo/pageInfo.xul
+++ b/browser/base/content/pageinfo/pageInfo.xul
@@ -26,23 +26,23 @@
 
 #ifdef XP_MACOSX
 #include ../macWindow.inc.xul
 #endif
 
   <linkset>
     <html:link rel="localization" href="browser/pageInfo.ftl"/>
   </linkset>
-  <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/treeUtils.js"/>
-  <script type="application/javascript" src="chrome://browser/content/pageinfo/pageInfo.js"/>
-  <script type="application/javascript" src="chrome://browser/content/pageinfo/permissions.js"/>
-  <script type="application/javascript" src="chrome://browser/content/pageinfo/security.js"/>
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/treeUtils.js"/>
+  <script src="chrome://browser/content/pageinfo/pageInfo.js"/>
+  <script src="chrome://browser/content/pageinfo/permissions.js"/>
+  <script src="chrome://browser/content/pageinfo/security.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
 
   <stringbundleset id="pageinfobundleset">
     <stringbundle id="pkiBundle" src="chrome://pippki/locale/pippki.properties"/>
     <stringbundle id="browserBundle" src="chrome://browser/locale/browser.properties"/>
   </stringbundleset>
 
   <commandset id="pageInfoCommandSet">
     <command id="cmd_close"     oncommand="window.close();"/>
--- a/browser/base/content/safeMode.xul
+++ b/browser/base/content/safeMode.xul
@@ -17,17 +17,17 @@
             buttonidextra1="refresh-profile"
             onload="onLoad()">
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="browser/safeMode.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/safeMode.js"/>
+  <script src="chrome://browser/content/safeMode.js"/>
 
 
   <vbox id="autoSafeMode" hidden="true">
     <description data-l10n-id="auto-safe-mode-description"/>
   </vbox>
 
   <vbox id="safeMode">
     <label data-l10n-id="safe-mode-description" />
--- a/browser/base/content/sanitize.xul
+++ b/browser/base/content/sanitize.xul
@@ -23,20 +23,18 @@
         data-l10n-id="dialog-title"
         data-l10n-attrs="style"
         onload="gSanitizePromptDialog.init();">
 
   <linkset>
     <html:link rel="localization" href="browser/sanitize.ftl"/>
   </linkset>
 
-  <script type="application/javascript"
-          src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/sanitizeDialog.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/sanitizeDialog.js"/>
 
   <hbox id="SanitizeDurationBox" align="center">
     <label data-l10n-id="clear-time-duration-prefix"
            control="sanitizeDurationChoice"
            id="sanitizeDurationLabel"/>
     <menulist id="sanitizeDurationChoice"
               preference="privacy.sanitize.timeSpan"
               onselect="gSanitizePromptDialog.selectByTimespan();"
--- a/browser/base/content/webext-panels.xul
+++ b/browser/base/content/webext-panels.xul
@@ -14,23 +14,23 @@
 %browserDTD;
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd">
 %textcontextDTD;
 ]>
 
 <page id="webextpanels-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript" src="chrome://browser/content/browser.js"/>
-  <script type="application/javascript" src="chrome://browser/content/browser-places.js"/>
-  <script type="application/javascript" src="chrome://browser/content/webext-panels.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://browser/content/browser.js"/>
+  <script src="chrome://browser/content/browser-places.js"/>
+  <script src="chrome://browser/content/webext-panels.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <commandset id="mainCommandset">
     <command id="Browser:Back"
              oncommand="getPanelBrowser().webNavigation.goBack();"
              disabled="true"/>
     <command id="Browser:Forward"
              oncommand="getPanelBrowser().webNavigation.goForward();"
              disabled="true"/>
--- a/browser/base/content/webrtcIndicator.xul
+++ b/browser/base/content/webrtcIndicator.xul
@@ -17,17 +17,17 @@
         onload="init(event);"
 #ifdef XP_MACOSX
         inwindowmenu="false"
 #endif
         sizemode="normal"
         hidechrome="true"
         orient="horizontal"
         >
-  <script type="application/javascript" src="chrome://browser/content/webrtcIndicator.js"/>
+  <script src="chrome://browser/content/webrtcIndicator.js"/>
 
   <button id="firefoxButton"/>
   <button id="audioVideoButton" type="menu">
     <menupopup id="audioVideoPopup" type="Devices"/>
   </button>
   <separator id="shareSeparator"/>
   <button id="screenShareButton" type="menu">
     <menupopup id="screenSharePopup" type="Screen"/>
--- a/browser/components/aboutconfig/content/aboutconfig.html
+++ b/browser/components/aboutconfig/content/aboutconfig.html
@@ -8,18 +8,17 @@
     <meta charset="utf-8">
     <link rel="stylesheet" media="screen, projection" type="text/css"
           href="chrome://global/skin/in-content/common.css">
     <link rel="stylesheet" media="screen, projection" type="text/css"
           href="chrome://global/skin/in-content/info-pages.css" title="infop">
     <link rel="stylesheet" type="text/css"
           href="chrome://browser/content/aboutconfig/aboutconfig.css">
     <link rel="localization" href="browser/aboutConfig.ftl">
-    <script type="application/javascript"
-            src="chrome://browser/content/aboutconfig/aboutconfig.js"></script>
+    <script src="chrome://browser/content/aboutconfig/aboutconfig.js"></script>
     <title data-l10n-id="about-config2-title"></title>
   </head>
   <body>
     <div class="container" role="alertdialog" aria-labelledby="warningTitle"
          aria-describedby="warningDescription">
 
       <div class="title">
         <h1 id="warningTitle" class="title-text"
--- a/browser/components/downloads/content/contentAreaDownloadsView.xul
+++ b/browser/components/downloads/content/contentAreaDownloadsView.xul
@@ -17,26 +17,21 @@
 %editMenuDTD;
 ]>
 
 <window id="contentAreaDownloadsView"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&downloads.title;"
         onload="ContentAreaDownloadsView.init();">
 
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/downloads/contentAreaDownloadsView.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/downloads/allDownloadsView.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/downloads/contentAreaDownloadsView.js"/>
+  <script src="chrome://browser/content/downloads/allDownloadsView.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
 #include ../../../../toolkit/content/editMenuKeys.inc.xul
 #ifdef XP_MACOSX
   <keyset id="editMenuKeysExtra">
     <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
   </keyset>
 #endif
 
--- a/browser/components/enterprisepolicies/content/aboutPolicies.xhtml
+++ b/browser/components/enterprisepolicies/content/aboutPolicies.xhtml
@@ -9,17 +9,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title data-l10n-id="about-policies-title"/>
         <link rel="stylesheet" href="chrome://browser/content/policies/aboutPolicies.css" type="text/css" />
         <link rel="localization" href="branding/brand.ftl"/>
         <link rel="localization" href="browser/branding/sync-brand.ftl"/>
         <link rel="localization" href="browser/aboutPolicies.ftl"/>
         <link rel="localization" href="browser/policies/policies-descriptions.ftl"/>
-        <script type="application/javascript" src="chrome://browser/content/policies/aboutPolicies.js" />
+        <script src="chrome://browser/content/policies/aboutPolicies.js" />
     </head>
     <body id="body" onload="init()">
         <div id="categories">
             <div class="category" selected="true" id="category-active">
                 <img class="category-icon" src="chrome://browser/content/policies/policies-active.svg"></img>
                 <label class="category-name" data-l10n-id="active-policies-tab"></label>
             </div>
             <div class="category" id="category-documentation">
--- a/browser/components/migration/content/aboutWelcomeBack.xhtml
+++ b/browser/components/migration/content/aboutWelcomeBack.xhtml
@@ -12,17 +12,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title data-l10n-id="welcome-back-tab-title"></title>
     <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/aboutWelcomeBack.css" type="text/css" media="all"/>
     <link rel="icon" type="image/png" href="chrome://browser/skin/info.svg"/>
     <link rel="localization" href="browser/aboutSessionRestore.ftl"/>
     <link rel="localization" href="branding/brand.ftl"/>
-    <script type="application/javascript" src="chrome://browser/content/aboutSessionRestore.js"/>
+    <script src="chrome://browser/content/aboutSessionRestore.js"/>
   </head>
 
   <body>
 
     <div class="container">
 
       <div class="title">
         <h1 class="title-text" data-l10n-id="welcome-back-page-title"></h1>
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
@@ -12,18 +12,18 @@
         windowtype="Browser:MigrationWizard"
         title="&migrationWizard.title;"
         onload="MigrationWizard.init()"
         onunload="MigrationWizard.uninit()"
         style="width: 40em;"
         buttons="accept,cancel"
         branded="true">
 
-  <script type="application/javascript" src="chrome://global/content/customElements.js"/>
-  <script type="application/javascript" src="chrome://browser/content/migration/migration.js"/>
+  <script src="chrome://global/content/customElements.js"/>
+  <script src="chrome://browser/content/migration/migration.js"/>
 
   <wizardpage id="importSource" pageid="importSource" next="selectProfile"
               label="&importSource.title;">
 #ifdef XP_WIN
     <description id="importAll" control="importSourceGroup">&importFrom.label;</description>
 #else
     <description id="importAll" control="importSourceGroup">&importFromUnix.label;</description>
 #endif
--- a/browser/components/places/content/bookmarkProperties.xul
+++ b/browser/components/places/content/bookmarkProperties.xul
@@ -23,22 +23,17 @@
         style="min-width: 30em;"
         persist="screenX screenY width">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="stringBundle"
                   src="chrome://browser/locale/places/bookmarkProperties.properties"/>
   </stringbundleset>
 
-  <script type="application/javascript"
-          src="chrome://browser/content/places/editBookmark.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/places/bookmarkProperties.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://browser/content/places/editBookmark.js"/>
+  <script src="chrome://browser/content/places/bookmarkProperties.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://browser/content/places/places-tree.js"/>
 
 #include editBookmarkPanel.inc.xul
 
 </dialog>
--- a/browser/components/places/content/bookmarksSidebar.xul
+++ b/browser/components/places/content/bookmarksSidebar.xul
@@ -20,28 +20,22 @@
 <page id="bookmarksPanel"
       class="sidebar-panel"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="init();"
       onunload="PlacesUIUtils.setMouseoverURL('', window);"
       aria-label="&bookmarksButton.label;">
 
-  <script type="application/javascript"
-          src="chrome://browser/content/places/bookmarksSidebar.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/contentTheme.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/places/places-tree.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://browser/content/places/bookmarksSidebar.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://browser/content/contentTheme.js"/>
+  <script src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
 #include placesCommands.inc.xul
 #include placesContextMenu.inc.xul
 #include bookmarksHistoryTooltip.inc.xul
 
   <hbox id="sidebar-search-container" align="center">
     <textbox id="search-box" flex="1" type="search"
              placeholder="&bookmarksSearch.placeholder;"
--- a/browser/components/places/content/historySidebar.xul
+++ b/browser/components/places/content/historySidebar.xul
@@ -20,28 +20,22 @@
 <page id="history-panel"
       class="sidebar-panel"
       orient="vertical"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="HistorySidebarInit();"
       onunload="PlacesUIUtils.setMouseoverURL('', window);"
       aria-label="&historyButton.label;">
 
-  <script type="application/javascript"
-          src="chrome://browser/content/places/historySidebar.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/contentTheme.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/places/places-tree.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://browser/content/places/historySidebar.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://browser/content/contentTheme.js"/>
+  <script src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
 #include placesCommands.inc.xul
 
 #include ../../../../toolkit/content/editMenuKeys.inc.xul
 #ifdef XP_MACOSX
   <keyset id="editMenuKeysExtra">
     <key id="key_delete2" keycode="VK_BACK" command="cmd_delete"/>
   </keyset>
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -37,48 +37,40 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="PlacesOrganizer.init();"
         onunload="PlacesOrganizer.destroy();"
         width="&places.library.width;" height="&places.library.height;"
         screenX="10" screenY="10"
         toggletoolbar="true"
         persist="width height screenX screenY sizemode">
 
-  <script type="application/javascript"
-          src="chrome://browser/content/places/places.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://browser/content/places/places.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 #ifndef XP_MACOSX
   <!-- On Mac, this is included via macWindow.inc.xul -> global-scripts.inc -> browser.js -> defineLazyScriptGetter -->
-  <script type="application/javascript"
-          src="chrome://browser/content/places/editBookmark.js"/>
+  <script src="chrome://browser/content/places/editBookmark.js"/>
   <!-- On Mac, thes are included via macWindow.inc.xul -> global-scripts.inc -->
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
 #endif
 
   <stringbundleset id="placesStringSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
 #ifdef XP_MACOSX
 #include ../../../base/content/macWindow.inc.xul
 #else
 #include placesCommands.inc.xul
 #endif
 
   <!-- This must be included after macWindow.inc.xul to override DownloadsView -->
-  <script type="application/javascript"
-          src="chrome://browser/content/downloads/allDownloadsView.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://browser/content/downloads/allDownloadsView.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://browser/content/places/places-tree.js"/>
 
   <commandset id="organizerCommandSet">
     <command id="OrganizerCommand_find:all"
              oncommand="PlacesSearchBox.findAll();"/>
     <command id="OrganizerCommand_export"
              oncommand="PlacesOrganizer.exportBookmarks();"/>
     <command id="OrganizerCommand_import"
              oncommand="PlacesOrganizer.importFromFile();"/>
--- a/browser/components/pocket/content/panels/saved.html
+++ b/browser/components/pocket/content/panels/saved.html
@@ -5,17 +5,17 @@
         <meta http-equiv="Content-Security-Policy" content="default-src chrome:" />
         <base href="chrome://pocket/content/panels/">
         <title>Pocket: Page Saved</title>
         <link rel="stylesheet" href="css/normalize.css">
         <link rel="stylesheet" href="css/saved.css">
         <link rel="stylesheet" href="css/sendtomobile.css">
     </head>
     <body class="pkt_ext_containersaved" aria-live="polite">
-        <script type="text/javascript" src="js/vendor/jquery-2.1.1.min.js"></script>
-        <script type="text/javascript" src="js/vendor/handlebars.runtime.js"></script>
-        <script type="text/javascript" src="js/vendor/jquery.tokeninput.min.js"></script>
-        <script type="text/javascript" src="js/tmpl.js"></script>
-        <script type="text/javascript" src="js/messages.js"></script>
-        <script type="text/javascript" src="js/sendtomobile.js"></script>
-        <script type="text/javascript" src="js/saved.js"></script>
+        <script src="js/vendor/jquery-2.1.1.min.js"></script>
+        <script src="js/vendor/handlebars.runtime.js"></script>
+        <script src="js/vendor/jquery.tokeninput.min.js"></script>
+        <script src="js/tmpl.js"></script>
+        <script src="js/messages.js"></script>
+        <script src="js/sendtomobile.js"></script>
+        <script src="js/saved.js"></script>
     </body>
 </html>
--- a/browser/components/pocket/content/panels/signup.html
+++ b/browser/components/pocket/content/panels/signup.html
@@ -4,15 +4,15 @@
         <meta charset="utf-8">
         <meta http-equiv="Content-Security-Policy" content="default-src chrome:" />
         <base href="chrome://pocket/content/panels/">
         <title>Pocket: Sign Up</title>
         <link rel="stylesheet" href="css/normalize.css">
         <link rel="stylesheet" href="css/signup.css">
     </head>
     <body class="pkt_ext_containersignup" aria-live="polite">
-        <script type="text/javascript" src="js/vendor/jquery-2.1.1.min.js"></script>
-        <script type="text/javascript" src="js/vendor/handlebars.runtime.js"></script>
-        <script type="text/javascript" src="js/tmpl.js"></script>
-        <script type="text/javascript" src="js/messages.js"></script>
-        <script type="text/javascript" src="js/signup.js"></script>
+        <script src="js/vendor/jquery-2.1.1.min.js"></script>
+        <script src="js/vendor/handlebars.runtime.js"></script>
+        <script src="js/tmpl.js"></script>
+        <script src="js/messages.js"></script>
+        <script src="js/signup.js"></script>
     </body>
 </html>
--- a/browser/components/preferences/applicationManager.xul
+++ b/browser/components/preferences/applicationManager.xul
@@ -14,22 +14,19 @@
         data-l10n-id="app-manager-window"
         data-l10n-attrs="title, style"
         persist="screenX screenY">
 
   <linkset>
     <html:link rel="localization" href="browser/preferences/applicationManager.ftl"/>
   </linkset>
 
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/preferences/applicationManager.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/preferences/applicationManager.js"/>
 
   <commandset id="appManagerCommandSet">
     <command id="cmd_remove"
              oncommand="gAppManagerDialog.remove();"
              disabled="true"/>
   </commandset>
 
   <keyset id="appManagerKeyset">
--- a/browser/components/preferences/browserLanguages.xul
+++ b/browser/components/preferences/browserLanguages.xul
@@ -19,19 +19,19 @@
         onbeforeaccept="return gBrowserLanguagesDialog.beforeAccept();"
         helpTopic="change-language">
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="browser/preferences/languages.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://browser/content/preferences/browserLanguages.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/preferences/browserLanguages.js"/>
 
   <description data-l10n-id="browser-languages-description"/>
 
   <grid flex="1">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
--- a/browser/components/preferences/colors.xul
+++ b/browser/components/preferences/colors.xul
@@ -17,18 +17,18 @@
         persist="lastSelected screenX screenY"
         role="dialog"
         helpTopic="prefs-fonts-and-colors">
 
   <linkset>
     <html:link rel="localization" href="browser/preferences/colors.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
 
   <keyset>
     <key data-l10n-id="colors-close-key" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <hbox>
     <groupbox flex="1">
       <label><html:h2 data-l10n-id="colors-text-and-background"/></label>
@@ -83,10 +83,10 @@
                   value="0" id="documentColorAutomatic"/>
         <menuitem data-l10n-id="colors-page-override-option-never"
                   value="1" id="documentColorNever"/>
       </menupopup>
     </menulist>
   </hbox>
 
   <!-- Load the script after the elements for layout issues (bug 1501755). -->
-  <script type="application/javascript" src="chrome://browser/content/preferences/colors.js"/>
+  <script src="chrome://browser/content/preferences/colors.js"/>
 </dialog>
--- a/browser/components/preferences/connection.xul
+++ b/browser/components/preferences/connection.xul
@@ -21,25 +21,25 @@
 
   <!-- Used for extension-controlled lockdown message -->
   <linkset>
     <html:link rel="localization" href="browser/preferences/connection.ftl"/>
     <html:link rel="localization" href="browser/preferences/preferences.ftl"/>
     <html:link rel="localization" href="branding/brand.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
 
   <keyset>
     <key data-l10n-id="connection-close-key" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
-  <script type="application/javascript" src="chrome://browser/content/preferences/connection.js"/>
+  <script src="chrome://browser/content/preferences/connection.js"/>
 
   <hbox id="proxyExtensionContent"
         align="top" hidden="true" class="extension-controlled">
     <description control="disableProxyExtension" flex="1" />
     <button id="disableProxyExtension"
             class="extension-controlled-button accessory-button"
             data-l10n-id="connection-disable-extension" />
   </hbox>
--- a/browser/components/preferences/fonts.xul
+++ b/browser/components/preferences/fonts.xul
@@ -17,18 +17,18 @@
         persist="lastSelected screenX screenY"
         role="dialog"
         helpTopic="prefs-fonts-and-colors">
 
   <linkset>
     <html:link rel="localization" href="browser/preferences/fonts.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
 
   <keyset>
     <key data-l10n-id="fonts-window-close" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <!-- Fonts for: [ Language ] -->
   <groupbox>
     <hbox align="center">
@@ -279,11 +279,11 @@
             <menuitem data-l10n-id="fonts-languages-fallback-name-other"       value="windows-1252"/>
           </menupopup>
         </menulist>
       </hbox>
     </hbox>
   </groupbox>
 
   <!-- Load the script after the elements for layout issues (bug 1501755). -->
-  <script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
-  <script type="application/javascript" src="chrome://browser/content/preferences/fonts.js"/>
+  <script src="chrome://mozapps/content/preferences/fontbuilder.js"/>
+  <script src="chrome://browser/content/preferences/fonts.js"/>
 </dialog>
--- a/browser/components/preferences/in-content/containers.xul
+++ b/browser/components/preferences/in-content/containers.xul
@@ -1,16 +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/.
 
 <!-- Containers panel -->
 
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/containers.js"/>
+<script src="chrome://browser/content/preferences/in-content/containers.js"/>
 
 <hbox hidden="true"
       class="container-header-links"
       data-category="paneContainers">
   <label is="text-link" id="backContainersLink" data-l10n-id="containers-back-link"/>
 </hbox>
 
 <hbox id="header-containers"
--- a/browser/components/preferences/in-content/home.xul
+++ b/browser/components/preferences/in-content/home.xul
@@ -1,16 +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/.
 
 <!-- Home panel -->
 
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/home.js"/>
+<script src="chrome://browser/content/preferences/in-content/home.js"/>
 <html:template id="template-paneHome">
 <hbox id="firefoxHomeCategory"
       class="subcategory"
       hidden="true"
       data-category="paneHome">
   <html:h1 style="-moz-box-flex: 1;" data-l10n-id="pane-home-title"/>
   <button id="restoreDefaultHomePageBtn"
           class="homepage-button check-home-page-controlled"
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -1,23 +1,21 @@
 # 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/.
 
 <!-- General panel -->
 
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/main.js"/>
+<script src="chrome://browser/content/preferences/in-content/main.js"/>
 
 #ifdef MOZ_UPDATER
-  <script type="application/javascript" src="chrome://browser/content/aboutDialog-appUpdater.js"/>
+  <script src="chrome://browser/content/aboutDialog-appUpdater.js"/>
 #endif
 
-<script type="application/javascript"
-        src="chrome://mozapps/content/preferences/fontbuilder.js"/>
+<script src="chrome://mozapps/content/preferences/fontbuilder.js"/>
 
 <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences.properties"/>
 
 <html:template id="template-paneGeneral">
 <hbox id="generalCategory"
       class="subcategory"
       hidden="true"
       data-category="paneGeneral">
--- a/browser/components/preferences/in-content/preferences.xul
+++ b/browser/components/preferences/in-content/preferences.xul
@@ -45,24 +45,20 @@
     <html:link rel="localization" href="toolkit/updates/history.ftl"/>
     <html:link rel="localization" href="security/certificates/deviceManager.ftl"/>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
   <html:link rel="shortcut icon"
               href="chrome://browser/skin/settings.svg"/>
 
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/preferences/in-content/preferences.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/preferences/in-content/preferences.js"/>
+  <script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
   <script src="chrome://browser/content/preferences/in-content/findInPage.js"/>
   <script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
 
   <stringbundle id="bundleBrand"
                 src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundlePreferences"
                 src="chrome://browser/locale/preferences/preferences.properties"/>
   <stringbundle id="pkiBundle"
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -1,16 +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/.
 
 <!-- Privacy panel -->
 
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/privacy.js"/>
+<script src="chrome://browser/content/preferences/in-content/privacy.js"/>
 <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
 <stringbundle id="signonBundle" src="chrome://passwordmgr/locale/passwordmgr.properties"/>
 <html:template id="template-panePrivacy">
 <hbox id="browserPrivacyCategory"
       class="subcategory"
       hidden="true"
       data-category="panePrivacy">
   <html:h1 data-l10n-id="privacy-header"/>
--- a/browser/components/preferences/in-content/search.xul
+++ b/browser/components/preferences/in-content/search.xul
@@ -1,10 +1,9 @@
-    <script type="application/javascript"
-            src="chrome://browser/content/preferences/in-content/search.js"/>
+    <script src="chrome://browser/content/preferences/in-content/search.js"/>
     <html:template id="template-paneSearch">
     <hbox id="searchCategory"
           class="subcategory"
           hidden="true"
           data-category="paneSearch">
       <html:h1 data-l10n-id="pane-search-title"/>
     </hbox>
 
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -1,16 +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/.
 
 <!-- Sync panel -->
 
-<script type="application/javascript"
-        src="chrome://browser/content/preferences/in-content/sync.js"/>
+<script src="chrome://browser/content/preferences/in-content/sync.js"/>
 <html:template id="template-paneSync">
 <hbox id="firefoxAccountCategory"
       class="subcategory"
       hidden="true"
       data-category="paneSync">
   <html:h1 data-l10n-id="pane-sync-title2"/>
 </hbox>
 
--- a/browser/components/preferences/languages.xul
+++ b/browser/components/preferences/languages.xul
@@ -17,19 +17,19 @@
         role="dialog"
         onload="gLanguagesDialog.onLoad();"
         helpTopic="prefs-languages">
 
   <linkset>
     <html:link rel="localization" href="browser/preferences/languages.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
-  <script type="application/javascript" src="chrome://browser/content/preferences/languages.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/preferences/languages.js"/>
 
   <keyset>
     <key data-l10n-id="languages-close-key" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <stringbundleset id="languageSet">
     <stringbundle id="bundleAccepted"     src="resource://gre/res/language.properties"/>
   </stringbundleset>
--- a/browser/components/preferences/sanitize.xul
+++ b/browser/components/preferences/sanitize.xul
@@ -21,24 +21,24 @@
         helpTopic="prefs-clear-private-data"
         onload="gSanitizeDialog.init();">
 
   <linkset>
     <html:link rel="localization" href="browser/sanitize.ftl"/>
     <html:link rel="localization" href="branding/brand.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/preferencesBindings.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/preferencesBindings.js"/>
 
   <keyset>
     <key data-l10n-id="window-close" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
-  <script type="application/javascript" src="chrome://browser/content/preferences/sanitize.js"/>
+  <script src="chrome://browser/content/preferences/sanitize.js"/>
 
   <description data-l10n-id="clear-data-settings-label"></description>
 
   <groupbox>
     <label><html:h2 data-l10n-id="history-section-label"/></label>
     <hbox>
       <vbox data-l10n-id="sanitize-prefs-style" data-l10n-attrs="style">
         <checkbox data-l10n-id="item-history-and-downloads"
--- a/browser/components/preferences/selectBookmark.xul
+++ b/browser/components/preferences/selectBookmark.xul
@@ -16,24 +16,20 @@
         data-l10n-attrs="title, style"
         persist="screenX screenY width height" screenX="24" screenY="24"
         onload="SelectBookmarkDialog.init();">
 
   <linkset>
     <html:link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
   </linkset>
 
-  <script type="application/javascript"
-          src="chrome://browser/content/preferences/selectBookmark.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://browser/content/preferences/selectBookmark.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://browser/content/places/places-tree.js"/>
 
   <description data-l10n-id="select-bookmark-desc"/>
 
   <separator class="thin"/>
 
   <tree id="bookmarks" flex="1" is="places-tree"
         style="height: 15em;"
         hidecolumnpicker="true"
--- a/browser/components/preferences/sitePermissions.xul
+++ b/browser/components/preferences/sitePermissions.xul
@@ -20,17 +20,17 @@
         onkeypress="gSitePermissionsManager.onWindowKeyPress(event);">
 
   <linkset>
     <html:link rel="localization" href="browser/preferences/preferences.ftl"/>
     <html:link rel="localization" href="browser/preferences/permissions.ftl"/>
   </linkset>
 
   <script src="chrome://browser/content/preferences/sitePermissions.js"/>
-  <script type="application/javascript" src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
+  <script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
 
   <keyset>
     <key data-l10n-id="permissions-close-key" modifiers="accel" oncommand="window.close();"/>
   </keyset>
 
   <vbox class="contentPane">
     <description id="permissionsText" control="url"/>
     <separator class="thin"/>
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -9,18 +9,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml" class="private no-search-ui">
   <head>
     <meta http-equiv="Content-Security-Policy" content="default-src chrome: blob:"/>
     <link rel="icon" type="image/png" href="chrome://browser/skin/privatebrowsing/favicon.svg"/>
     <link rel="stylesheet" href="chrome://browser/content/aboutPrivateBrowsing.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/privatebrowsing/aboutPrivateBrowsing.css" type="text/css" media="all"/>
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="browser/aboutPrivateBrowsing.ftl"/>
-    <script type="application/javascript" src="chrome://browser/content/aboutPrivateBrowsing.js"></script>
-    <script type="application/javascript" src="chrome://browser/content/contentSearchUI.js"></script>
+    <script src="chrome://browser/content/aboutPrivateBrowsing.js"></script>
+    <script src="chrome://browser/content/contentSearchUI.js"></script>
   </head>
 
   <body>
     <p class="showNormal" data-l10n-id="about-private-browsing-not-private"></p>
     <button id="startPrivateBrowsing"
             class="showNormal" data-l10n-id="privatebrowsingpage-open-private-window-label"></button>
     <div class="showPrivate dontShowSearch container">
       <h1 class="title">
--- a/browser/components/sessionstore/content/aboutSessionRestore.xhtml
+++ b/browser/components/sessionstore/content/aboutSessionRestore.xhtml
@@ -12,17 +12,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title data-l10n-id="restore-page-tab-title"></title>
     <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css" media="all"/>
     <link rel="stylesheet" href="chrome://browser/skin/aboutSessionRestore.css" type="text/css" media="all"/>
     <link rel="icon" href="chrome://global/skin/icons/warning.svg"/>
     <link rel="localization" href="browser/aboutSessionRestore.ftl"/>
     <link rel="localization" href="branding/brand.ftl"/>
-    <script type="application/javascript" src="chrome://browser/content/aboutSessionRestore.js"/>
+    <script src="chrome://browser/content/aboutSessionRestore.js"/>
   </head>
 
   <body class="illustrated">
 
     <div class="container restore-chosen">
       <div class="description-wrapper">
         <div class="title">
           <h1 class="title-text" data-l10n-id="restore-page-error-title"></h1>
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/browser/components/shell/content/setDesktopBackground.xul
@@ -30,19 +30,19 @@
         style="width: 30em;">
 
 #ifdef XP_MACOSX
 #include ../../../base/content/macWindow.inc.xul
 #endif
 
     <stringbundle id="backgroundBundle"
                   src="chrome://browser/locale/shellservice.properties"/>
-    <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-    <script type="application/javascript" src="chrome://browser/content/setDesktopBackground.js"/>
-    <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+    <script src="chrome://browser/content/utilityOverlay.js"/>
+    <script src="chrome://browser/content/setDesktopBackground.js"/>
+    <script src="chrome://global/content/contentAreaUtils.js"/>
 
 #ifndef XP_MACOSX
     <hbox align="center">
       <label value="&position.label;"/>
       <menulist id="menuPosition"
                 label="&position.label;"
                 oncommand="gSetBackground.updatePosition();">
         <menupopup>
--- a/browser/components/syncedtabs/sidebar.xhtml
+++ b/browser/components/syncedtabs/sidebar.xhtml
@@ -4,18 +4,18 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" [
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
-    <script src="chrome://browser/content/syncedtabs/sidebar.js" type="application/javascript"></script>
-    <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
+    <script src="chrome://browser/content/syncedtabs/sidebar.js"></script>
+    <script src="chrome://browser/content/utilityOverlay.js"/>
     <script src="chrome://browser/content/contentTheme.js"></script>
 
     <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/skin/syncedtabs/sidebar.css"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://global/skin/textbox.css"/>
     <link rel="stylesheet" type="text/css" media="all" href="chrome://browser/content/browser.css"/>
     <link rel="localization" href="browser/branding/sync-brand.ftl"/>
     <link rel="localization" href="browser/syncedTabs.ftl"/>
--- a/browser/extensions/formautofill/content/editAddress.xhtml
+++ b/browser/extensions/formautofill/content/editAddress.xhtml
@@ -78,17 +78,17 @@
       <span data-localization="email" class="label-text"/>
     </label>
   </form>
   <div id="controls-container">
     <button id="cancel" data-localization="cancelBtnLabel"/>
     <button id="save" data-localization="saveBtnLabel"/>
     <span id="country-warning-message" data-localization="countryWarningMessage2"/>
   </div>
-  <script type="application/javascript"><![CDATA[
+  <script><![CDATA[
     "use strict";
 
     /* import-globals-from l10n.js */
 
     let {
       DEFAULT_REGION,
       countries,
     } = FormAutofill;
--- a/browser/extensions/formautofill/content/editCreditCard.xhtml
+++ b/browser/extensions/formautofill/content/editCreditCard.xhtml
@@ -56,17 +56,17 @@
       </select>
       <label for="billingAddressGUID" data-localization="billingAddress" class="label-text"/>
     </div>
   </form>
   <div id="controls-container">
     <button id="cancel" data-localization="cancelBtnLabel"/>
     <button id="save" data-localization="saveBtnLabel"/>
   </div>
-  <script type="application/javascript"><![CDATA[
+  <script><![CDATA[
     "use strict";
 
     /* import-globals-from l10n.js */
 
     (async () => {
       let {
         getAddressLabel,
         isCCNumber,
--- a/browser/extensions/formautofill/content/manageAddresses.xhtml
+++ b/browser/extensions/formautofill/content/manageAddresses.xhtml
@@ -21,17 +21,17 @@
   <div id="controls-container">
     <button id="remove" disabled="disabled" data-localization="removeBtnLabel"/>
     <!-- Wrapper is used to properly compute the search tooltip position -->
     <div>
       <button id="add" data-localization="addBtnLabel"/>
     </div>
     <button id="edit" disabled="disabled" data-localization="editBtnLabel"/>
   </div>
-  <script type="application/javascript">
+  <script>
     "use strict";
     /* global ManageAddresses */
     new ManageAddresses({
       records: document.getElementById("addresses"),
       controlsContainer: document.getElementById("controls-container"),
       remove: document.getElementById("remove"),
       add: document.getElementById("add"),
       edit: document.getElementById("edit"),
--- a/browser/extensions/formautofill/content/manageCreditCards.xhtml
+++ b/browser/extensions/formautofill/content/manageCreditCards.xhtml
@@ -21,17 +21,17 @@
   <div id="controls-container">
     <button id="remove" disabled="disabled" data-localization="removeBtnLabel"/>
     <!-- Wrapper is used to properly compute the search tooltip position -->
     <div>
       <button id="add" data-localization="addBtnLabel"/>
     </div>
     <button id="edit" disabled="disabled" data-localization="editBtnLabel"/>
   </div>
-  <script type="application/javascript">
+  <script>
     "use strict";
     /* global ManageCreditCards */
     new ManageCreditCards({
       records: document.getElementById("credit-cards"),
       controlsContainer: document.getElementById("controls-container"),
       remove: document.getElementById("remove"),
       add: document.getElementById("add"),
       edit: document.getElementById("edit"),
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html
@@ -14,17 +14,17 @@
   <button id="web-notifications" onclick="Notification.requestPermission()">web-notifications</button>
   <a id="addons" href="borderify.xpi">Install Add-On</a>
   <form>
     <input type="email" id="email" value="email@example.com" />
     <input type="password" id="password" value="123456" />
     <button type="submit" id="login-capture">Login</button>
   </form>
 
-  <script type="application/javascript">
+  <script>
     // Share device used in onclick calls above.
     /* exported shareDevice */
     function shareDevice(config) {
       navigator.mediaDevices.getUserMedia(config);
     }
   </script>
 
 </body>
--- a/devtools/client/aboutdebugging-new/index.html
+++ b/devtools/client/aboutdebugging-new/index.html
@@ -2,14 +2,14 @@
    - 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 html>
 <html>
   <head>
     <meta charset="utf-8" />
     <title>Debugging</title>
     <link rel="stylesheet" href="chrome://devtools/content/aboutdebugging-new/aboutdebugging.css"/>
-    <script type="application/javascript" src="resource://devtools/client/aboutdebugging-new/initializer.js"></script>
+    <script src="resource://devtools/client/aboutdebugging-new/initializer.js"></script>
   </head>
   <body>
     <div id="mount"></div>
   </body>
 </html>
--- a/devtools/client/aboutdebugging/aboutdebugging.xhtml
+++ b/devtools/client/aboutdebugging/aboutdebugging.xhtml
@@ -9,14 +9,14 @@
 <!ENTITY % aboutdebuggingDTD SYSTEM "chrome://devtools/locale/aboutdebugging.dtd"> %aboutdebuggingDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&aboutDebugging.fullTitle;</title>
     <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/content/aboutdebugging/aboutdebugging.css"  type="text/css"/>
-    <script type="application/javascript" src="resource://devtools/client/aboutdebugging/initializer.js"></script>
+    <script src="resource://devtools/client/aboutdebugging/initializer.js"></script>
   </head>
   <body id="body" dir="&locale.dir;">
     <div id="root"></div>
   </body>
 </html>
--- a/devtools/client/accessibility/index.html
+++ b/devtools/client/accessibility/index.html
@@ -8,16 +8,15 @@
   <meta charset="utf-8"/>
 
   <link href="resource://devtools/client/accessibility/accessibility.css" rel="stylesheet"/>
   <link href="resource://devtools/client/shared/components/splitter/SplitBox.css" rel="stylesheet" />
   <link href="resource://devtools/client/shared/components/Accordion.css" rel="stylesheet" />
   <link href="resource://devtools/client/shared/components/List.css" rel="stylesheet" />
   <link href="resource://devtools/client/shared/components/tree/TreeView.css" rel="stylesheet" />
 
-  <script type="application/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"></script>
+  <script src="chrome://devtools/content/shared/theme-switching.js"></script>
 </head>
 <body class="theme-body devtools-monospace" role="application">
   <div id="content" role="presentation"></div>
-  <script type="text/javascript" src="./main.js"></script>
+  <script src="./main.js"></script>
 </body>
 </html>
--- a/devtools/client/debugger/index.html
+++ b/devtools/client/debugger/index.html
@@ -33,21 +33,20 @@
       rel="stylesheet"
       type="text/css"
       href="resource://devtools/client/debugger/src/debugger.css"
     />
   </head>
 
   <body>
     <div id="mount"></div>
-    <script
-      type="application/javascript"
+    <script     
       src="chrome://devtools/content/shared/theme-switching.js"
     ></script>
-    <script type="text/javascript">
+    <script>
       try {
         const { BrowserLoader } = ChromeUtils.import(
           "resource://devtools/client/shared/browser-loader.js"
         );
         const { require } = BrowserLoader({
           baseURI: "resource://devtools/client/debugger",
           window
         });
--- a/devtools/client/dom/index.html
+++ b/devtools/client/dom/index.html
@@ -6,16 +6,15 @@
 <html dir="">
 <head>
   <meta charset="utf-8"/>
 
   <link href="resource://devtools/client/dom/content/dom-view.css" rel="stylesheet" />
   <link href="resource://devtools/client/jsonview/css/toolbar.css" rel="stylesheet" />
   <link href="resource://devtools/client/shared/components/tree/TreeView.css" rel="stylesheet" />
 
-  <script type="text/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"></script>
+  <script src="chrome://devtools/content/shared/theme-switching.js"></script>
 </head>
 <body class="theme-body devtools-monospace" role="application">
   <div id="content"></div>
-  <script type="text/javascript" src="./main.js"></script>
+  <script src="./main.js"></script>
 </body>
 </html>
--- a/devtools/client/framework/connect/connect.xhtml
+++ b/devtools/client/framework/connect/connect.xhtml
@@ -11,17 +11,17 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <head>
     <title>&title;</title>
     <link rel="stylesheet" href="chrome://devtools/skin/dark-theme.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/connect/connect.css" type="text/css"/>
-    <script type="application/javascript" src="connect.js"></script>
+    <script src="connect.js"></script>
   </head>
   <body>
     <h1>&header;</h1>
     <section id="connection-form">
       <form validate="validate" action="#">
         <label>
           <span>&host;</span>
           <input required="required" class="devtools-textinput" id="host" type="text"></input>
--- a/devtools/client/framework/toolbox-options.xhtml
+++ b/devtools/client/framework/toolbox-options.xhtml
@@ -6,17 +6,17 @@
 <!ENTITY % toolboxDTD SYSTEM "chrome://devtools/locale/toolbox.dtd" >
  %toolboxDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml" dir="">
   <head>
     <title>Toolbox option</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/options-panel.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"/>
+    <script src="chrome://devtools/content/shared/theme-switching.js"/>
   </head>
   <body role="application" class="theme-body">
   <form id="options-panel">
     <div id="tools-box" class="options-vertical-pane">
       <fieldset id="default-tools-box" class="options-groupbox">
         <legend>&options.selectDefaultTools.label2;</legend>
         <span id="tools-not-supported-label"
               class="options-citation-label theme-comment">
--- a/devtools/client/framework/toolbox-process-window.html
+++ b/devtools/client/framework/toolbox-process-window.html
@@ -5,20 +5,20 @@
 <html id="devtools-toolbox-window"
       windowtype="devtools:toolbox"
       width="900" height="350"
       persist="screenX screenY width height sizemode">
   <head>
     <link rel="stylesheet" href="chrome://global/skin/"/>
     <link rel="stylesheet" href="resource://devtools/client/themes/common.css"/>
     <link rel="stylesheet" href="chrome://devtools/content/framework/toolbox-process-window.css"/>
-    <script type="text/javascript" src="chrome://global/content/globalOverlay.js"></script>
-    <script type="text/javascript" src="toolbox-process-window.js"></script>
-    <script type="text/javascript" src="chrome://global/content/viewSourceUtils.js"></script>
-    <script type="text/javascript" src="chrome://browser/content/utilityOverlay.js"></script>
+    <script src="chrome://global/content/globalOverlay.js"></script>
+    <script src="toolbox-process-window.js"></script>
+    <script src="chrome://global/content/viewSourceUtils.js"></script>
+    <script src="chrome://browser/content/utilityOverlay.js"></script>
   </head>
   <body>
     <div id="status-message-container" hidden="true">
       <div id="status-message-title"></div>
       <pre id="status-message"></pre>
     </div>
     <iframe id="toolbox-iframe"></iframe>
   </body>
--- a/devtools/client/framework/toolbox.xul
+++ b/devtools/client/framework/toolbox.xul
@@ -12,25 +12,21 @@
 %toolboxDTD;
 <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd">
 %globalKeysDTD;
 ]>
 
 <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://devtools/content/shared/theme-switching.js"/>
-  <script type="application/javascript"
-          src="chrome://global/content/viewSourceUtils.js"/>
+  <script src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script src="chrome://global/content/viewSourceUtils.js"/>
 
-  <script type="application/javascript"
-          src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://devtools/content/framework/toolbox-init.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://devtools/content/framework/toolbox-init.js"/>
 
   <vbox id="toolbox-container" flex="1">
     <div xmlns="http://www.w3.org/1999/xhtml" id="toolbox-error-mount"/>
     <div xmlns="http://www.w3.org/1999/xhtml" id="toolbox-notificationbox"/>
     <div xmlns="http://www.w3.org/1999/xhtml" id="toolbox-toolbar-mount"
          role="toolbar" />
     <vbox flex="1" class="theme-body">
       <!-- Set large flex to allow the toolbox-panel-webconsole to have a
--- a/devtools/client/inspector/index.xhtml
+++ b/devtools/client/inspector/index.xhtml
@@ -21,29 +21,28 @@
   <link rel="stylesheet" href="resource://devtools/client/shared/components/tabs/Tabs.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/SidebarToggle.css"/>
   <link rel="stylesheet" href="resource://devtools/client/inspector/components/InspectorTabPanel.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/splitter/SplitBox.css"/>
   <link rel="stylesheet" href="resource://devtools/client/inspector/layout/components/Accordion.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/reps/reps.css"/>
   <link rel="stylesheet" href="resource://devtools/client/shared/components/tree/TreeView.css"/>
 
-  <script type="application/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"></script>
-  <script type="text/javascript">
+  <script src="chrome://devtools/content/shared/theme-switching.js"></script>
+  <script>
     /* eslint-disable */
     var isInChrome = window.location.href.includes("chrome:");
     if (isInChrome) {
       var exports = {};
       var { require, loader } = Cu.import("resource://devtools/shared/Loader.jsm", {});
       var { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {});
     }
   </script>
 
-  <script type="application/javascript" src="resource://devtools/client/inspector/inspector.js" defer="true"></script>
+  <script src="resource://devtools/client/inspector/inspector.js" defer="true"></script>
 </head>
 <body class="theme-body" role="application">
   <div class="inspector-responsive-container theme-body inspector"
        data-localization-bundle="devtools/client/locales/inspector.properties">
 
     <!-- Main Panel Content -->
     <div id="inspector-main-content" class="devtools-main-content" style="visibility: hidden;">
       <!-- Toolbar -->
--- a/devtools/client/inspector/markup/markup.xhtml
+++ b/devtools/client/inspector/markup/markup.xhtml
@@ -8,17 +8,16 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://devtools/skin/badge.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/skin/markup.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/sourceeditor/codemirror/lib/codemirror.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/sourceeditor/codemirror/addon/dialog/dialog.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools/content/shared/sourceeditor/codemirror/mozilla.css" type="text/css"/>
 
-  <script type="application/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"></script>
+  <script src="chrome://devtools/content/shared/theme-switching.js"></script>
 </head>
 <body class="theme-body devtools-monospace" role="application">
   <div id="root-wrapper" role="presentation">
     <div id="root" role="presentation"></div>
   </div>
 </body>
 </html>
--- a/devtools/client/memory/index.xhtml
+++ b/devtools/client/memory/index.xhtml
@@ -14,24 +14,21 @@
     <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/memory.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/components-frame.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/components-h-split-box.css" type="text/css"/>
   </head>
   <body class="theme-body">
     <div id="app"></div>
 
-    <script type="application/javascript"
-            src="chrome://devtools/content/shared/theme-switching.js"
+    <script src="chrome://devtools/content/shared/theme-switching.js"
             defer="true">
     </script>
 
-    <script type="application/javascript"
-            src="chrome://devtools/content/shared/vendor/d3.js"
+    <script src="chrome://devtools/content/shared/vendor/d3.js"
             defer="true">
     </script>
 
-    <script type="application/javascript"
-            src="chrome://devtools/content/shared/vendor/dagre-d3.js"
+    <script src="chrome://devtools/content/shared/vendor/dagre-d3.js"
             defer="true">
     </script>
   </body>
 </html>
--- a/devtools/client/performance-new/index.xhtml
+++ b/devtools/client/performance-new/index.xhtml
@@ -11,15 +11,14 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <html xmlns="http://www.w3.org/1999/xhtml" dir="">
   <head>
     <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://devtools/skin/perf.css" type="text/css"/>
   </head>
   <body class="theme-body">
     <div id="root"></div>
-    <script type="application/javascript" src="resource://devtools/client/performance-new/initializer.js"></script>
-    <script type="application/javascript"
-            src="chrome://devtools/content/shared/theme-switching.js"
+    <script src="resource://devtools/client/performance-new/initializer.js"></script>
+    <script src="chrome://devtools/content/shared/theme-switching.js"
             defer="true">
     </script>
   </body>
 </html>
--- a/devtools/client/performance/index.xul
+++ b/devtools/client/performance/index.xul
@@ -11,17 +11,17 @@
 <!DOCTYPE window [
   <!ENTITY % performanceDTD SYSTEM "chrome://devtools/locale/performance.dtd">
   %performanceDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml">
   <script src="chrome://devtools/content/shared/theme-switching.js"/>
-  <script type="application/javascript" src="resource://devtools/client/performance/initializer.js"/>
+  <script src="resource://devtools/client/performance/initializer.js"/>
 
   <popupset id="performance-options-popupset">
     <menupopup id="performance-filter-menupopup" position="before_start"/>
     <menupopup id="performance-options-menupopup" position="before_end">
       <menuitem id="option-show-platform-data"
                 type="checkbox"
                 data-pref="show-platform-data"
                 label="&performanceUI.showPlatformData;"
--- a/devtools/client/responsive.html/index.xhtml
+++ b/devtools/client/responsive.html/index.xhtml
@@ -3,17 +3,15 @@
    - 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 html>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link rel="stylesheet" type="text/css"
           href="resource://devtools/client/responsive.html/index.css"/>
-    <script type="application/javascript"
-            src="chrome://devtools/content/shared/theme-switching.js"></script>
-    <script type="application/javascript"
-            src="resource://devtools/client/responsive.html/index.js"></script>
+    <script src="chrome://devtools/content/shared/theme-switching.js"></script>
+    <script src="resource://devtools/client/responsive.html/index.js"></script>
   </head>
   <body class="theme-toolbar" role="application">
     <div id="root"/>
   </body>
 </html>
--- a/devtools/client/scratchpad/index.xul
+++ b/devtools/client/scratchpad/index.xul
@@ -21,21 +21,20 @@
         title="&window.title;"
         windowtype="devtools:scratchpad"
         macanimationtype="document"
         fullscreenbutton="true"
         screenX="4" screenY="4"
         width="640" height="480"
         persist="screenX screenY width height sizemode">
 
-<script type="application/javascript"
-        src="chrome://devtools/content/shared/theme-switching.js"/>
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="resource://devtools/client/scratchpad/scratchpad.js"/>
-<script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+<script src="chrome://devtools/content/shared/theme-switching.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="resource://devtools/client/scratchpad/scratchpad.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
 
 <commandset id="sourceEditorCommands">
   <command id="cmd_find" oncommand=";"/>
   <command id="cmd_findAgain" oncommand=";"/>
   <command id="cmd_gotoLine" oncommand=";"/>
 </commandset>
 
 <commandset id="sp-commandset">
--- a/devtools/client/shared/widgets/VariablesView.xul
+++ b/devtools/client/shared/widgets/VariablesView.xul
@@ -7,12 +7,11 @@
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <!DOCTYPE window [
   <!ENTITY % viewDTD SYSTEM "chrome://devtools/locale/VariablesView.dtd">
   %viewDTD;
 ]>
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&PropertiesViewWindowTitle;">
 
-  <script type="application/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script src="chrome://devtools/content/shared/theme-switching.js"/>
   <vbox id="variables" flex="1"/>
 </window>
--- a/devtools/client/shared/widgets/graphs-frame.xhtml
+++ b/devtools/client/shared/widgets/graphs-frame.xhtml
@@ -3,17 +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 html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
   <link rel="stylesheet" href="chrome://devtools/skin/widgets.css" ype="text/css"/>
-  <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script src="chrome://devtools/content/shared/theme-switching.js"/>
   <style>
     body {
       overflow: hidden;
       margin: 0;
       padding: 0;
       font-size: 0;
     }
   </style>
--- a/devtools/client/storage/index.xul
+++ b/devtools/client/storage/index.xul
@@ -10,20 +10,19 @@
 
 <!DOCTYPE window [
   <!ENTITY % storageDTD SYSTEM "chrome://devtools/locale/storage.dtd">
   %storageDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"/>
-  <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <popupset id="storagePopupSet">
     <menupopup id="storage-tree-popup">
       <menuitem id="storage-tree-popup-delete-all"
                 label="&storage.popupMenu.deleteAllLabel;"/>
       <menuitem id="storage-tree-popup-delete-all-session-cookies"
                 label="&storage.popupMenu.deleteAllSessionCookiesLabel;"/>
       <menuitem id="storage-tree-popup-delete"/>
--- a/devtools/client/styleeditor/index.xul
+++ b/devtools/client/styleeditor/index.xul
@@ -18,22 +18,21 @@
 <?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/splitview.css" type="text/css"?>
 <?xml-stylesheet href="chrome://devtools/skin/styleeditor.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         id="style-editor-chrome-window">
 
-  <script type="application/javascript"
-          src="chrome://devtools/content/shared/theme-switching.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
-  <script type="application/javascript">
+  <script src="chrome://devtools/content/shared/theme-switching.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
+  <script>
     function goUpdateSourceEditorMenuItems() {
       goUpdateGlobalEditMenuItems();
 
       ['cmd_undo', 'cmd_redo', 'cmd_cut', 'cmd_paste',
        'cmd_delete', 'cmd_find', 'cmd_findAgain'].forEach(goUpdateCommand);
     }
   </script>
 
--- a/devtools/client/webconsole/index.html
+++ b/devtools/client/webconsole/index.html
@@ -18,16 +18,15 @@
     <link rel="stylesheet" href="resource://devtools/client/shared/components/reps/reps.css"/>
     <link rel="stylesheet" href="resource://devtools/client/shared/components/tabs/Tabs.css"/>
     <link rel="stylesheet" href="resource://devtools/client/shared/components/NotificationBox.css"/>
     <link rel="stylesheet" href="chrome://devtools/content/netmonitor/src/assets/styles/httpi.css"/>
     <link rel="stylesheet" href="resource://devtools/client/webconsole/components/ReverseSearchInput.css"/>
     <link rel="stylesheet" href="chrome://devtools/content/netmonitor/src/assets/styles/StatusCode.css"/>
 
     <script src="chrome://devtools/content/shared/theme-switching.js"></script>
-    <script type="application/javascript"
-            src="resource://devtools/client/webconsole/main.js"></script>
+    <script src="resource://devtools/client/webconsole/main.js"></script>
   </head>
   <body class="theme-sidebar" role="application">
     <main id="app-wrapper" class="theme-body" role="document" aria-live="polite">
     </main>
   </body>
 </html>
--- a/devtools/client/webide/content/addons.xhtml
+++ b/devtools/client/webide/content/addons.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/addons.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/addons.js"></script>
+    <script src="chrome://webide/content/addons.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="aboutaddons">&addons_aboutaddons;</a>
       <a id="close">&deck_close;</a>
     </div>
 
--- a/devtools/client/webide/content/details.xhtml
+++ b/devtools/client/webide/content/details.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/details.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/details.js"></script>
+    <script src="chrome://webide/content/details.js"></script>
   </head>
   <body>
 
     <div id="toolbar">
       <button onclick="removeProject()">&details_removeProject_button;</button>
       <p id="validation_status">
         <span class="valid">&details_valid_header;</span>
         <span class="warning">&details_warning_header;</span>
--- a/devtools/client/webide/content/devicepreferences.xhtml
+++ b/devtools/client/webide/content/devicepreferences.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/config-view.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/devicepreferences.js"></script>
+    <script src="chrome://webide/content/devicepreferences.js"></script>
   </head>
   <body>
     <header>
       <div id="controls">
         <a id="close">&deck_close;</a>
       </div>
       <h1>&devicepreference_title;</h1>
       <div id="search">
--- a/devtools/client/webide/content/logs.xhtml
+++ b/devtools/client/webide/content/logs.xhtml
@@ -10,18 +10,18 @@
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="resource://devtools/client/themes/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/logs.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://devtools/content/shared/theme-switching.js"></script>
-    <script type="application/javascript" src="logs.js"></script>
+    <script src="chrome://devtools/content/shared/theme-switching.js"></script>
+    <script src="logs.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h1>&logs_title;</h1>
--- a/devtools/client/webide/content/newapp.xul
+++ b/devtools/client/webide/content/newapp.xul
@@ -13,17 +13,17 @@
 <?xml-stylesheet href="chrome://webide/skin/newapp.css"?>
 
 <dialog id="webide:newapp" title="&newAppWindowTitle;"
   width="600" height="400"
   buttons="accept,cancel"
   buttondisabledaccept="true"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript" src="newapp.js"></script>
+  <script src="newapp.js"></script>
   <label class="header-name" value="&newAppHeader;"/>
 
   <richlistbox id="templatelist" flex="1">
     <description>&newAppLoadingTemplate;</description>
   </richlistbox>
   <vbox>
     <label class="header-name" control="project-name" value="&newAppProjectName;"/>
     <textbox id="project-name"/>
--- a/devtools/client/webide/content/prefs.xhtml
+++ b/devtools/client/webide/content/prefs.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/prefs.js"></script>
+    <script src="chrome://webide/content/prefs.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="restore">&prefs_restore;</a>
       <a id="manageComponents">&prefs_manage_components;</a>
       <a id="close">&deck_close;</a>
     </div>
--- a/devtools/client/webide/content/project-listing.xhtml
+++ b/devtools/client/webide/content/project-listing.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/panel-listing.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/project-listing.js"></script>
+    <script src="chrome://webide/content/project-listing.js"></script>
   </head>
   <body>
     <div id="project-panel">
       <div id="project-panel-box">
         <button class="panel-item project-panel-item-newapp" id="new-app">&projectMenu_newApp_label;</button>
         <button class="panel-item project-panel-item-openpackaged" id="packaged-app">&projectMenu_importPackagedApp_label;</button>
         <button class="panel-item project-panel-item-openhosted" id="hosted-app">&projectMenu_importHostedApp_label;</button>
         <label class="panel-header">&projectPanel_myProjects;</label>
--- a/devtools/client/webide/content/runtime-listing.xhtml
+++ b/devtools/client/webide/content/runtime-listing.xhtml
@@ -8,17 +8,17 @@
   <!ENTITY % webideDTD SYSTEM "chrome://devtools/locale/webide.dtd" >
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/panel-listing.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/runtime-listing.js"></script>
+    <script src="chrome://webide/content/runtime-listing.js"></script>
   </head>
   <body>
     <div id="runtime-panel">
       <div id="runtime-panel-box">
         <label class="panel-header">&runtimePanel_usb;
           <button class="runtime-panel-item-refreshdevices refresh-icon" id="refresh-devices" title="&runtimePanel_refreshDevices_label;"></button>
         </label>
         <button class="panel-item" id="runtime-panel-nousbdevice">&runtimePanel_nousbdevice;</button>
--- a/devtools/client/webide/content/runtimedetails.xhtml
+++ b/devtools/client/webide/content/runtimedetails.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/runtimedetails.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/runtimedetails.js"></script>
+    <script src="chrome://webide/content/runtimedetails.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h1>&runtimedetails_title;</h1>
--- a/devtools/client/webide/content/webide.xul
+++ b/devtools/client/webide/content/webide.xul
@@ -19,21 +19,21 @@
         title="&windowTitle;"
         windowtype="devtools:webide"
         macanimationtype="document"
         fullscreenbutton="true"
         screenX="4" screenY="4"
         width="800" height="600"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"></script>
-  <script type="application/javascript" src="project-panel.js"></script>
-  <script type="application/javascript" src="runtime-panel.js"></script>
-  <script type="application/javascript" src="webide.js"></script>
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://global/content/globalOverlay.js"></script>
+  <script src="project-panel.js"></script>
+  <script src="runtime-panel.js"></script>
+  <script src="webide.js"></script>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
   <commandset id="mainCommandSet">
     <commandset id="webideCommands">
       <command id="cmd_quit" oncommand="Cmds.quit()"/>
       <command id="cmd_newApp" oncommand="Cmds.newApp()" label="&projectMenu_newApp_label;"/>
       <command id="cmd_importPackagedApp" oncommand="Cmds.importPackagedApp()" label="&projectMenu_importPackagedApp_label;"/>
       <command id="cmd_importHostedApp" oncommand="Cmds.importHostedApp()" label="&projectMenu_importHostedApp_label;"/>
       <command id="cmd_showDevicePrefs" label="&runtimeMenu_showDevicePrefs_label;" oncommand="Cmds.showDevicePrefs()"/>
--- a/devtools/client/webide/content/wifi-auth.xhtml
+++ b/devtools/client/webide/content/wifi-auth.xhtml
@@ -9,17 +9,17 @@
   %webideDTD;
 ]>
 
 <html id="devtools:wifi-auth" xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta charset="utf8"/>
     <link rel="stylesheet" href="chrome://webide/skin/deck.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://webide/skin/wifi-auth.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://webide/content/wifi-auth.js"></script>
+    <script src="chrome://webide/content/wifi-auth.js"></script>
   </head>
   <body>
 
     <div id="controls">
       <a id="close">&deck_close;</a>
     </div>
 
     <h3 id="header">&wifi_auth_header;</h3>
--- a/devtools/startup/aboutdevtools/aboutdevtools.xhtml
+++ b/devtools/startup/aboutdevtools/aboutdevtools.xhtml
@@ -9,18 +9,18 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;">
 <head>
   <title data-l10n-id="head-title"></title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>a
   <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools-startup/content/aboutdevtools/aboutdevtools.css"  type="text/css"/>
   <link rel="stylesheet" href="chrome://devtools-startup/content/aboutdevtools/subscribe.css"  type="text/css"/>
-  <script type="application/javascript" src="chrome://devtools-startup/content/aboutdevtools/aboutdevtools.js"></script>
-  <script type="application/javascript" src="chrome://devtools-startup/content/aboutdevtools/subscribe.js"></script>
+  <script src="chrome://devtools-startup/content/aboutdevtools/aboutdevtools.js"></script>
+  <script src="chrome://devtools-startup/content/aboutdevtools/subscribe.js"></script>
   <link rel="localization" href="startup/aboutDevTools.ftl" />
 </head>
 <body>
   <div id="install-page" class="wrapper" hidden="true">
     <div class="box">
       <div class="left-pane" />
       <div class="right-pane">
         <h1 class="title" id="common-title" hidden="true" data-l10n-id="enable-title"></h1>
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -120,11 +120,11 @@
           <div id="securityOverrideContent">&securityOverride.warningContent;</div>
         </div>
       </div>
 
       <!-- Retry Button -->
       <button id="errorTryAgain" autocomplete="off">&retry.label;</button>
     </div>
 
-    <script type="application/javascript" src="chrome://global/content/netError.js"/>
+    <script src="chrome://global/content/netError.js"/>
   </body>
 </html>
--- a/layout/tools/recording/recording.xul
+++ b/layout/tools/recording/recording.xul
@@ -3,11 +3,11 @@
    - 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/. -->
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="recording-window"
         hidechrome="true"
         onload="OnRecordingLoad();"
         style="background:white; overflow:hidden; width:800px; height:600px;"
         >
-    <script type="application/ecmascript" src="recording.js" />
+    <script src="recording.js" />
   <browser id="browser" type="content" primary="true" style="min-width: 1024px; min-height: 768px; max-width: 1024px; max-height: 768px"/>
 </window>
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/security/manager/pki/resources/content/certManager.xul
@@ -16,18 +16,18 @@
         buttons="accept"
         style="width: 40em; height: 32em;"
         persist="screenX screenY width height">
 
   <linkset>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/javascript" src="chrome://pippki/content/certManager.js"/>
+  <script src="chrome://pippki/content/pippki.js"/>
+  <script src="chrome://pippki/content/certManager.js"/>
 
   <vbox flex="1">
     <tabbox id="certmanagertabs" flex="1" style="margin:5px" persist="selectedIndex">
       <tabs id="certMgrTabbox">
         <tab id="mine_tab" data-l10n-id="certmgr-tab-mine"/>
         <tab id="others_tab" data-l10n-id="certmgr-tab-people"/>
         <tab id="websites_tab" data-l10n-id="certmgr-tab-servers"/>
         <tab id="ca_tab" data-l10n-id="certmgr-tab-ca" selected="true"/>
--- a/security/manager/pki/resources/content/certViewer.xul
+++ b/security/manager/pki/resources/content/certViewer.xul
@@ -16,21 +16,20 @@
   buttons="accept"
   onload="setWindowName();">
 
 
 <linkset>
   <html:link rel="localization" href="security/certificates/certManager.ftl"/>
 </linkset>
 
-<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
-<script type="application/javascript"
-        src="chrome://pippki/content/certViewer.js"/>
+<script src="chrome://pippki/content/pippki.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
+<script src="chrome://pippki/content/certViewer.js"/>
 <html:style>
   table {
     border-spacing: 0.5ch 2px;
   }
   td > textbox {
     width: 100%;
   }
   th {
--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/security/manager/pki/resources/content/changepassword.xul
@@ -10,18 +10,17 @@
 <dialog id="set_password" title="&setPassword.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
   buttons="accept,cancel"
   onload="onLoad();">
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/javascript"
-        src="chrome://pippki/content/changepassword.js"/>
+<script src="chrome://pippki/content/changepassword.js"/>
 
 <hbox align="center">
   <label value="&setPassword.tokenName.label;: "/>
   <label id="tokenName" />
 </hbox>
 
 <separator/>
 
--- a/security/manager/pki/resources/content/choosetoken.xul
+++ b/security/manager/pki/resources/content/choosetoken.xul
@@ -14,17 +14,17 @@
 <dialog id="ssl_warning" title="&chooseToken.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 40em;"
   buttons="accept,cancel"
   onload="onLoad();">
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/javascript" src="chrome://pippki/content/choosetoken.js"/>
+<script src="chrome://pippki/content/pippki.js"/>
+<script src="chrome://pippki/content/choosetoken.js"/>
 
 <description>&chooseToken.message1;</description>
 <menulist id="tokens">
   <menupopup/>
 </menulist>
 
 </dialog>
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/security/manager/pki/resources/content/clientauthask.xul
@@ -16,20 +16,20 @@
   xmlns:html="http://www.w3.org/1999/xhtml"
   buttons="accept,cancel"
   onload="onLoad();">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 </stringbundleset>
 
-<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/javascript" src="chrome://pippki/content/clientauthask.js"/>
-<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-<script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+<script src="chrome://pippki/content/pippki.js"/>
+<script src="chrome://pippki/content/clientauthask.js"/>
+<script src="chrome://global/content/globalOverlay.js"/>
+<script src="chrome://global/content/editMenuOverlay.js"/>
 
 <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
 <description id="hostname"/>
 <description id="organization"/>
 <description id="issuer"/>
 
 <description style="font-weight: bold;">&clientAuthAsk.message2;</description>
 <!-- The items in this menulist must never be sorted,
--- a/security/manager/pki/resources/content/createCertInfo.xul
+++ b/security/manager/pki/resources/content/createCertInfo.xul
@@ -11,18 +11,18 @@
   id="domainMismatch" title="&createCertInfo.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
   onclose="onClose();"
 >
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/javascript" src="pippki.js" />
-<script type="application/javascript" src="createCertInfo.js" />
+<script src="pippki.js" />
+<script src="createCertInfo.js" />
 
 <vbox style="margin: 5px; max-width: 50em;">
 
   <description>&createCertInfo.msg1;</description>
   <separator/>
   <description style="font-weight: bold; text-align: center;">&createCertInfo.msg2;</description>
   <separator/>
 
--- a/security/manager/pki/resources/content/deletecert.xul
+++ b/security/manager/pki/resources/content/deletecert.xul
@@ -14,17 +14,17 @@
   xmlns:html="http://www.w3.org/1999/xhtml"
   onload="onLoad();"
   buttons="accept,cancel">
 
   <linkset>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="pippki.js" />
-  <script type="application/javascript" src="chrome://pippki/content/deletecert.js"/>
+  <script src="pippki.js" />
+  <script src="chrome://pippki/content/deletecert.js"/>
 
   <description id="confirm" style="width: 400px;"/>
   <richlistbox id="certlist" class="box-padded" flex="1"
                style="min-height: 8em; height: 8em; min-width: 35em;"/>
   <description id="impact" style="width: 400px;"/>
 
 </dialog>
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@@ -16,17 +16,17 @@
         persist="screenX screenY width height"
         onload="LoadModules();"
         buttons="accept">
 
 <linkset>
   <html:link rel="localization" href="security/certificates/deviceManager.ftl"/>
 </linkset>
 
-<script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
+<script src="chrome://pippki/content/device_manager.js"/>
 
 <hbox flex="1" style="margin:5px">
   <!-- List of devices -->
   <tree id="device_tree" seltype="single"
         onselect="enableButtons();" hidecolumnpicker="true"
         flex="1" style="min-width: 15em">
     <treecols>
       <treecol id="deviceCol" flex="1" primary="true" data-l10n-id="devmgr-devlist"/>
--- a/security/manager/pki/resources/content/downloadcert.xul
+++ b/security/manager/pki/resources/content/downloadcert.xul
@@ -11,18 +11,18 @@
         title="&downloadCert.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width: 46em;"
         buttons="accept,cancel"
         onload="onLoad();">
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/javascript" src="chrome://pippki/content/downloadcert.js"/>
+<script src="chrome://pippki/content/pippki.js"/>
+<script src="chrome://pippki/content/downloadcert.js"/>
 
 
   <!--  Let 'em know what they're doing -->
   <vbox>
     <description>&downloadCert.message1;</description>
   </vbox>
 
   <separator/>
--- a/security/manager/pki/resources/content/editcacert.xul
+++ b/security/manager/pki/resources/content/editcacert.xul
@@ -14,19 +14,18 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         buttons="accept,cancel"
         onload="onLoad();">
 
   <linkset>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/javascript"
-          src="chrome://pippki/content/editcacert.js"/>
+  <script src="chrome://pippki/content/pippki.js"/>
+  <script src="chrome://pippki/content/editcacert.js"/>
 
   <description id="certmsg"/>
   <separator/>
   <description data-l10n-id="certmgr-edit-cert-edit-trust"></description>
   <vbox align="start">
     <checkbox data-l10n-id="certmgr-edit-cert-trust-ssl"
               id="trustSSL"/>
     <checkbox data-l10n-id="certmgr-edit-cert-trust-email"
--- a/security/manager/pki/resources/content/exceptionDialog.xul
+++ b/security/manager/pki/resources/content/exceptionDialog.xul
@@ -18,20 +18,18 @@
         onload="initExceptionDialog();"
         defaultButton="extra2">
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="security/certificates/certManager.ftl"/>
   </linkset>
 
-  <script type="application/javascript"
-          src="chrome://pippki/content/pippki.js"/>
-  <script type="application/javascript"
-          src="chrome://pippki/content/exceptionDialog.js"/>
+  <script src="chrome://pippki/content/pippki.js"/>
+  <script src="chrome://pippki/content/exceptionDialog.js"/>
 
   <hbox>
     <vbox>
 #ifdef MOZ_WIDGET_GTK
       <image src="moz-icon://stock/gtk-dialog-warning?size=dialog"/>
 #else
       <image src="chrome://global/skin/icons/warning-large.png"/>
 #endif
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@@ -12,19 +12,18 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         data-l10n-id="load-device"
         buttons="accept,cancel">
 
   <linkset>
     <html:link rel="localization" href="security/certificates/deviceManager.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/javascript"
-          src="chrome://pippki/content/load_device.js"/>
+  <script src="chrome://pippki/content/pippki.js"/>
+  <script src="chrome://pippki/content/load_device.js"/>
 
   <description data-l10n-id="load-device-info"></description>
   <hbox align="center">
     <label data-l10n-id="load-device-modname"
            control="device_name"/>
     <textbox id="device_name" flex="1"
              data-l10n-id="load-device-modname-default"
              data-l10n-attrs="value"
--- a/security/manager/pki/resources/content/protectedAuth.xul
+++ b/security/manager/pki/resources/content/protectedAuth.xul
@@ -11,19 +11,19 @@
   id="protectedAuth" title="&protectedAuth.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   onload="onLoad();"
   onclose="onClose();"
 >
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/javascript" src="pippki.js" />
-<script type="application/javascript" src="protectedAuth.js" />
-<script type="application/javascript" src="chrome://help/content/help.js" />
+<script src="pippki.js" />
+<script src="protectedAuth.js" />
+<script src="chrome://help/content/help.js" />
 
 <vbox style="margin: 5px; max-width: 50em;">
 
   <description>&protectedAuth.msg;</description>
 
   <hbox>
          <description>&protectedAuth.tokenName.label;</description>
          <description id="tokenName"></description>
--- a/security/manager/pki/resources/content/resetpassword.xul
+++ b/security/manager/pki/resources/content/resetpassword.xul
@@ -11,18 +11,18 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   buttons="accept,cancel"
   buttonlabelaccept="&resetPasswordButtonLabel;"
   defaultButton="cancel"
   style="width: 40em;">
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/javascript" src="chrome://pippki/content/resetpassword.js"/>
+  <script src="chrome://pippki/content/pippki.js"/>
+  <script src="chrome://pippki/content/resetpassword.js"/>
 
   <hbox flex="1">
     <vbox>
       <image class="alert-icon" style="margin: 5px;"/>
     </vbox>
     <vbox style="margin: 5px;" flex="1">
       <hbox flex="1">
         <vbox flex="1">
--- a/security/manager/pki/resources/content/setp12password.xul
+++ b/security/manager/pki/resources/content/setp12password.xul
@@ -10,18 +10,17 @@
 <dialog id="setp12password"
         title="&pkcs12.setpassword.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="width: 48em;"
         buttons="accept,cancel"
         onload="onLoad();">
 
-  <script type="application/javascript"
-          src="chrome://pippki/content/setp12password.js"/>
+  <script src="chrome://pippki/content/setp12password.js"/>
 
   <description>&pkcs12.setpassword.message;</description>
   <separator />
   <vbox>
     <hbox>
       <label flex="1" value="&pkcs12.setpassword.label1;"/>
       <textbox id="pw1" type="password" oninput="onPasswordInput(true);"/>
     </hbox>
--- a/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.xhtml
+++ b/toolkit/components/aboutcheckerboard/content/aboutCheckerboard.xhtml
@@ -48,10 +48,10 @@
   <div id="raw">
    Raw log:<br/>
    <textarea id="trace" rows="10"></textarea>
    <div>
     <input type="checkbox" id="excludePageFromZoom"/><label for="excludePageFromZoom">Exclude page coordinates from zoom calculations</label><br/>
    </div>
   </div>
  </body>
- <script type="text/javascript" src="chrome://global/content/aboutCheckerboard.js"></script>
+ <script src="chrome://global/content/aboutCheckerboard.js"></script>
 </html>
--- a/toolkit/components/aboutmemory/content/aboutMemory.xhtml
+++ b/toolkit/components/aboutmemory/content/aboutMemory.xhtml
@@ -4,13 +4,13 @@
    - 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 xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta name="viewport" content="width=device-width"/>
     <title>Memory Analyzer</title>
     <link rel="stylesheet" href="chrome://global/skin/aboutMemory.css" type="text/css"/>
-    <script type="text/javascript" src="chrome://global/content/aboutMemory.js"/>
+    <script src="chrome://global/content/aboutMemory.js"/>
   </head>
 
   <body onload="onLoad()" onunload="onUnload()"></body>
 </html>
--- a/toolkit/components/aboutperformance/content/aboutPerformance.xhtml
+++ b/toolkit/components/aboutperformance/content/aboutPerformance.xhtml
@@ -7,17 +7,17 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title data-l10n-id="about-performance-title"/>
     <link rel="icon" type="image/svg+xml" id="favicon"
           href="chrome://global/skin/icons/performance.svg"/>
     <link rel="stylesheet" href="chrome://global/skin/in-content/common.css"
           type="text/css"/>
     <link rel="localization" href="toolkit/about/aboutPerformance.ftl"/>
-    <script type="text/javascript" src="chrome://global/content/aboutPerformance.js"></script>
+    <script src="chrome://global/content/aboutPerformance.js"></script>
     <style>
       @import url("chrome://global/skin/in-content/common.css");
 
       html {
         background-color: var(--in-content-page-background);
       }
       body {
         overflow-x: hidden;
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -16,17 +16,17 @@
         windowtype="alert:alert"
         xmlns:xhtml="http://www.w3.org/1999/xhtml"
         role="alert"
         pack="start"
         onload="onAlertLoad();"
         onclick="onAlertClick();"
         onbeforeunload="onAlertBeforeUnload();">
 
-  <script type="application/javascript" src="chrome://global/content/alerts/alert.js"/>
+  <script src="chrome://global/content/alerts/alert.js"/>
 
   <vbox id="alertBox">
     <box id="alertTitleBox">
       <image id="alertIcon"/>
       <label id="alertTitleLabel" class="alertTitle plain" crop="end"/>
       <vbox>
         <toolbarbutton class="close-icon"
                        tooltiptext="&closeAlert.tooltip;"
@@ -57,11 +57,11 @@
           </button>
         </box>
       </vbox>
     </box>
   </vbox>
 
   <!-- This method is called inline because we want to make sure we establish the width
        and height of the alert before we fire the onload handler. -->
-  <script type="application/javascript">prefillAlertInfo();</script>
+  <script>prefillAlertInfo();</script>
 </window>
 
--- a/toolkit/components/apppicker/content/appPicker.xul
+++ b/toolkit/components/apppicker/content/appPicker.xul
@@ -13,17 +13,17 @@
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="g_dialog.appPickerLoad();"
     buttons="accept,cancel,extra2"
     buttonlabelextra2="&BrowseButton.label;"
     defaultButton="cancel"
     aria-describedby="content-description suggested-filename"
     persist="screenX screenY">
 
-    <script type="application/javascript" src="chrome://global/content/appPicker.js"/>
+    <script src="chrome://global/content/appPicker.js"/>
 
     <hbox id="file-info" align="center">
       <image id="content-icon" src=""/>
       <vbox flex="1">
         <label id="content-description" crop="center" value=""/>
         <label id="suggested-filename" crop="center" value=""/>
       </vbox>
     </hbox>
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -15,19 +15,19 @@
         data-l10n-id="saved-logins"
         style="width: 45em;"
         persist="width height screenX screenY">
 
   <linkset>
     <html:link rel="localization" href="toolkit/passwordmgr/passwordManagerList.ftl"/>
   </linkset>
 #if defined(MOZ_BUILD_APP_IS_BROWSER)
-  <script type="application/javascript" src="chrome://browser/content/utilityOverlay.js"/>
+  <script src="chrome://browser/content/utilityOverlay.js"/>
 #endif
-  <script type="application/javascript" src="chrome://passwordmgr/content/passwordManager.js"/>
+  <script src="chrome://passwordmgr/content/passwordManager.js"/>
 
   <keyset>
     <key keycode="VK_ESCAPE" oncommand="escapeKeyHandler();"/>
     <key data-l10n-id="window-close" modifiers="accel" oncommand="escapeKeyHandler();"/>
     <key data-l10n-id="focus-search-shortcut" modifiers="accel" oncommand="FocusFilterBox();"/>
     <key data-l10n-id="focus-search-altshortcut" modifiers="accel" oncommand="FocusFilterBox();"/>
   </keyset>
 
--- a/toolkit/components/perf/test_pm.xul
+++ b/toolkit/components/perf/test_pm.xul
@@ -5,17 +5,17 @@
 
 <window title="Performance measurement tests"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="test()">
 
   <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
   <script src="chrome://mochikit/content/tests/SimpleTest/EventUtils.js"/>
 
-  <script type="application/javascript"><![CDATA[
+  <script><![CDATA[
 function test()
 {
   SimpleTest.waitForExplicitFinish();
 
   const {PerfMeasurement} = ChromeUtils.import("resource://gre/modules/PerfMeasurement.jsm");
   let pm = new PerfMeasurement(PerfMeasurement.ALL);
   if (pm.eventsMeasured == 0) {
     todo(false, "stub, skipping test");
--- a/toolkit/components/pictureinpicture/content/player.xhtml
+++ b/toolkit/components/pictureinpicture/content/player.xhtml
@@ -8,18 +8,17 @@
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       windowtype="Toolkit:PictureInPicture">
   <head>
     <meta charset="utf-8"/>
     <link rel="stylesheet" type="text/css"
           href="chrome://global/skin/pictureinpicture/player.css"/>
-    <script type="application/javascript"
-            src="chrome://global/content/pictureinpicture/player.js"></script>
+    <script src="chrome://global/content/pictureinpicture/player.js"></script>
   </head>
 
   <body>
     <div class="player-holder">
       <xul:browser type="content" primary="true" remote="true" remoteType="web" id="browser"></xul:browser>
     </div>
     <div id="controls">
       <div id="close" class="control-item"></div>
--- a/toolkit/components/printing/content/printPageSetup.xul
+++ b/toolkit/components/printing/content/printPageSetup.xul
@@ -15,17 +15,17 @@
   data-l10n-id="print-setup"
   persist="screenX screenY"
   screenX="24" screenY="24">
 
   <linkset>
     <html:link rel="localization" href="toolkit/printing/printDialogs.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://global/content/printPageSetup.js"/>
+  <script src="chrome://global/content/printPageSetup.js"/>
 
   <tabbox flex="1">
     <tabs>
       <tab data-l10n-id="basic-tab"/>
       <tab data-l10n-id="advanced-tab"/>
     </tabs>
     <tabpanels flex="1">
       <vbox>
--- a/toolkit/components/printing/content/printPreviewProgress.xul
+++ b/toolkit/components/printing/content/printPreviewProgress.xul
@@ -14,17 +14,17 @@
         oncancel="onCancel()"
         onload="onLoad()"
         onunload="onUnload()">
 
   <linkset>
     <html:link rel="localization" href="toolkit/printing/printDialogs.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://global/content/printPreviewProgress.js"/>
+  <script src="chrome://global/content/printPreviewProgress.js"/>
 
     <grid flex="1">
       <columns>
         <column/>
         <column/>
       </columns>
 
       <rows>
--- a/toolkit/components/printing/content/printProgress.xul
+++ b/toolkit/components/printing/content/printProgress.xul
@@ -13,17 +13,17 @@
         style="width: 36em;"
         onload="onLoad()"
         onunload="onUnload()">
 
   <linkset>
     <html:link rel="localization" href="toolkit/printing/printDialogs.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://global/content/printProgress.js"/>
+  <script src="chrome://global/content/printProgress.js"/>
 
     <grid flex="1">
       <columns>
         <column/>
         <column/>
         <column/>
       </columns>
 
--- a/toolkit/components/prompts/content/commonDialog.xul
+++ b/toolkit/components/prompts/content/commonDialog.xul
@@ -11,19 +11,19 @@
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog id="commonDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         aria-describedby="infoBody"
         onunload="commonDialogOnUnload();"
         buttonpack="center">
 
-  <script type="application/javascript" src="chrome://global/content/commonDialog.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript">
+  <script src="chrome://global/content/commonDialog.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script>
     document.addEventListener("DOMContentLoaded", function() {
       commonDialogOnLoad();
     });
   </script>
 
   <commandset id="selectEditMenuItems">
     <command id="cmd_copy" oncommand="goDoCommand('cmd_copy')" disabled="true"/>
     <command id="cmd_selectAll" oncommand="goDoCommand('cmd_selectAll')"/>
--- a/toolkit/components/prompts/content/selectDialog.xul
+++ b/toolkit/components/prompts/content/selectDialog.xul
@@ -5,17 +5,17 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="dialogOnLoad()">
 
-  <script type="application/javascript" src="chrome://global/content/selectDialog.js" />
+  <script src="chrome://global/content/selectDialog.js" />
   <keyset id="dialogKeys"/>
   <vbox style="width: 24em;margin: 5px;">
     <label id="info.txt"/>
     <vbox>
       <richlistbox id="list" class="theme-listbox" style="height: 8em;"/>
     </vbox>
   </vbox>
 </dialog>
--- a/toolkit/components/reader/content/aboutReader.html
+++ b/toolkit/components/reader/content/aboutReader.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <html>
 
 <head>
   <meta http-equiv="Content-Security-Policy" content="default-src chrome:; img-src data: *; media-src *" />
   <meta content="text/html; charset=UTF-8" http-equiv="content-type" />
   <meta name="viewport" content="width=device-width; user-scalable=0" />
   <link rel="stylesheet" href="chrome://global/skin/aboutReader.css" type="text/css"/>
-  <script type="text/javascript" src="chrome://global/content/reader/aboutReader.js"></script>
+  <script src="chrome://global/content/reader/aboutReader.js"></script>
 </head>
 
 <body>
   <div class="container">
     <div class="header reader-header">
       <a class="domain reader-domain"></a>
       <div class="domain-border"></div>
       <h1 class="reader-title"></h1>
--- a/toolkit/content/aboutAbout.xhtml
+++ b/toolkit/content/aboutAbout.xhtml
@@ -5,17 +5,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/. -->
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title data-l10n-id="about-about-title"></title>
   <link rel="stylesheet" href="chrome://global/skin/in-content/info-pages.css" type="text/css"/>
   <link rel="localization" href="toolkit/about/aboutAbout.ftl"/>
-  <script type="application/javascript" src="chrome://global/content/aboutAbout.js"></script>
+  <script src="chrome://global/content/aboutAbout.js"></script>
 
 </head>
 
 <body>
   <div class="container">
     <h1 data-l10n-id="about-about-title"></h1>
     <p><em data-l10n-id="about-about-note"></em></p>
     <ul id="abouts" class="columns"></ul>
--- a/toolkit/content/aboutNetworking.xhtml
+++ b/toolkit/content/aboutNetworking.xhtml
@@ -5,17 +5,17 @@
 
 
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title data-l10n-id="title"/>
         <link rel="stylesheet" href="chrome://mozapps/skin/aboutNetworking.css" type="text/css" />
-        <script type="application/javascript" src="chrome://global/content/aboutNetworking.js" />
+        <script src="chrome://global/content/aboutNetworking.js" />
         <link rel="localization"  href="toolkit/about/aboutNetworking.ftl"/>
     </head>
     <body id="body">
         <div id="warning_message" class="warningBackground" hidden="true">
             <div class="container">
                 <h1 class="title" data-l10n-id="warning"/>
                 <div class="toggle-container-with-text">
                     <input id="warncheck" type="checkbox" checked="yes" role="checkbox" />
--- a/toolkit/content/aboutProfiles.xhtml
+++ b/toolkit/content/aboutProfiles.xhtml
@@ -6,17 +6,17 @@
 
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <title data-l10n-id="profiles-title"></title>
     <link rel="icon" type="image/png" id="favicon" href="chrome://branding/content/icon32.png" />
     <link rel="stylesheet" href="chrome://mozapps/skin/aboutProfiles.css" type="text/css" />
-    <script type="application/javascript" src="chrome://global/content/aboutProfiles.js" />
+    <script src="chrome://global/content/aboutProfiles.js" />
     <link rel="localization" href="branding/brand.ftl" />
     <link rel="localization" href="toolkit/about/aboutProfiles.ftl" />
 </head>
   <body id="body" class="wide-container">
     <div id="action-box" class="notice-box">
       <h3 data-l10n-id="profiles-restart-title"></h3>
       <button id="restart-in-safe-mode-button" data-l10n-id="profiles-restart-in-safe-mode"></button>
       <button id="restart-button" data-l10n-id="profiles-restart-normal"></button>
--- a/toolkit/content/aboutRights-unbranded.xhtml
+++ b/toolkit/content/aboutRights-unbranded.xhtml
@@ -42,10 +42,10 @@
     <ol>
   <!-- Terms only apply to official builds, unbranded builds get a placeholder. -->
       <li data-l10n-id="rights-webservices-term-unbranded"></li>
     </ol>
   </div>
 </div>
 
 </body>
-<script type="application/javascript" src="chrome://global/content/aboutRights.js"/>
+<script src="chrome://global/content/aboutRights.js"/>
 </html>
--- a/toolkit/content/aboutRights.xhtml
+++ b/toolkit/content/aboutRights.xhtml
@@ -75,10 +75,10 @@
       <li data-l10n-id="rights-webservices-term-5"></li>
       <li data-l10n-id="rights-webservices-term-6"></li>
       <li data-l10n-id="rights-webservices-term-7"></li>
     </ol>
   </div>
 </div>
 
 </body>
-<script type="application/javascript" src="chrome://global/content/aboutRights.js"/>
+<script src="chrome://global/content/aboutRights.js"/>
 </html>
--- a/toolkit/content/aboutServiceWorkers.xhtml
+++ b/toolkit/content/aboutServiceWorkers.xhtml
@@ -10,17 +10,17 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title data-l10n-id="about-service-workers-title"></title>
         <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css" />
         <link rel="stylesheet" href="chrome://mozapps/skin/aboutServiceWorkers.css" type="text/css" />
         <link rel="localization" href="toolkit/about/aboutServiceWorkers.ftl"/>
         <link rel="localization" href="branding/brand.ftl"/>
-        <script type="application/javascript" src="chrome://global/content/aboutServiceWorkers.js" />
+        <script src="chrome://global/content/aboutServiceWorkers.js" />
     </head>
     <body id="body">
         <div id="warning_not_enabled" class="warningBackground">
             <div class="warningMessage" data-l10n-id="about-service-workers-warning-not-enabled"></div>
         </div>
 
         <div id="warning_no_serviceworkers" class="warningBackground">
             <div class="warningMessage" data-l10n-id="about-service-workers-warning-no-service-workers"></div>
--- a/toolkit/content/aboutSupport.xhtml
+++ b/toolkit/content/aboutSupport.xhtml
@@ -13,18 +13,17 @@
   <head>
     <title data-l10n-id="page-title"/>
 
     <link rel="icon" type="image/png" id="favicon"
           href="chrome://branding/content/icon32.png"/>
     <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css"
           type="text/css"/>
 
-    <script type="application/javascript"
-            src="chrome://global/content/aboutSupport.js"/>
+    <script src="chrome://global/content/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"/>
   </head>
 
   <body class="wide-container">
 
--- a/toolkit/content/aboutTelemetry.xhtml
+++ b/toolkit/content/aboutTelemetry.xhtml
@@ -7,18 +7,17 @@
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title data-l10n-id="about-telemetry-page-title"></title>
     <link rel="stylesheet" href="chrome://global/content/aboutTelemetry.css"
           type="text/css"/>
 
-    <script type="application/javascript"
-            src="chrome://global/content/aboutTelemetry.js"/>
+    <script src="chrome://global/content/aboutTelemetry.js"/>
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="toolkit/about/aboutTelemetry.ftl"/>
   </head>
 
   <body id="body">
 
     <div id="categories">
       <div class="heading">
--- a/toolkit/content/aboutUrlClassifier.xhtml
+++ b/toolkit/content/aboutUrlClassifier.xhtml
@@ -8,17 +8,17 @@
 <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <title data-l10n-id="url-classifier-title"></title>
   <link rel="stylesheet" href="chrome://global/content/aboutUrlClassifier.css" type="text/css"/>
   <link rel="localization" href="toolkit/about/url-classifier.ftl"/>
-  <script type="text/javascript" src="chrome://global/content/aboutUrlClassifier.js"></script>
+  <script src="chrome://global/content/aboutUrlClassifier.js"></script>
 </head>
 
 <body onload="onLoad()" class="wide-container">
   <h1 data-l10n-id="url-classifier-title"></h1>
   <div id="search">
     <h2 class="major-section" data-l10n-id="url-classifier-search-title"></h2>
     <div class="options">
       <table id="search-table">
--- a/toolkit/content/aboutwebrtc/aboutWebrtc.html
+++ b/toolkit/content/aboutwebrtc/aboutWebrtc.html
@@ -5,17 +5,16 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <html>
 <head>
   <meta charset="utf-8" />
   <title>about:webrtc</title>
   <link rel="stylesheet" type="text/css" media="all"
     href="chrome://global/content/aboutwebrtc/aboutWebrtc.css"/>
-  <script type="text/javascript"
-          src="chrome://global/content/aboutwebrtc/aboutWebrtc.js"
+  <script src="chrome://global/content/aboutwebrtc/aboutWebrtc.js"
           defer="defer"></script>
 </head>
 <body id="body" onload="onLoad()">
   <div id="controls" class="no-print"></div>
   <div id="content"></div>
 </body>
 </html>
--- a/toolkit/content/datepicker.xhtml
+++ b/toolkit/content/datepicker.xhtml
@@ -2,20 +2,20 @@
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <head>
   <title>Date Picker</title>
   <link rel="stylesheet" href="chrome://global/skin/datetimeinputpickers.css"/>
-  <script type="application/javascript" src="chrome://global/content/bindings/datekeeper.js"></script>
-  <script type="application/javascript" src="chrome://global/content/bindings/spinner.js"></script>
-  <script type="application/javascript" src="chrome://global/content/bindings/calendar.js"></script>
-  <script type="application/javascript" src="chrome://global/content/bindings/datepicker.js"></script>
+  <script src="chrome://global/content/bindings/datekeeper.js"></script>
+  <script src="chrome://global/content/bindings/spinner.js"></script>
+  <script src="chrome://global/content/bindings/calendar.js"></script>
+  <script src="chrome://global/content/bindings/datepicker.js"></script>
 </head>
 <body>
   <div id="date-picker">
     <div class="calendar-container">
       <div class="nav">
         <button class="prev"/>
         <button class="next"/>
       </div>
@@ -31,17 +31,17 @@
   </div>
   <template id="spinner-template">
     <div class="spinner-container">
       <button class="up"/>
       <div class="spinner"></div>
       <button class="down"/>
     </div>
   </template>
-  <script type="application/javascript">
+  <script>
   /* import-globals-from widgets/datepicker.js */
   // We need to hide the scroll bar but maintain its scrolling
   // capability, so using |overflow: hidden| is not an option.
   // Instead, we are inserting a user agent stylesheet that is
   // capable of selecting scrollbars, and do |display: none|.
   var domWinUtls = window.windowUtils;
   domWinUtls.loadSheetUsingURIString('data:text/css,@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); scrollbar { display: none; }', domWinUtls.AGENT_SHEET);
   // Create a DatePicker instance and prepare to be
--- a/toolkit/content/plugins.html
+++ b/toolkit/content/plugins.html
@@ -2,27 +2,27 @@
 
 <!-- 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>
 <head>
 <title data-l10n-id="title-label"></title>
-<script type="application/javascript">
+<script>
   "use strict";
   const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 </script>
 <link rel="stylesheet" type="text/css" href="chrome://global/content/plugins.css">
 <link rel="stylesheet" type="text/css" href="chrome://global/skin/plugins.css">
 <link rel="localization" href="toolkit/about/aboutPlugins.ftl"/>
 </head>
 <body>
 <div id="outside">
-<script type="application/javascript">
+<script>
   /* eslint-env mozilla/frame-script */
 
   "use strict";
 
   function setDirection() {
     var frame = document.getElementById("directionDetector");
     var direction = frame.contentDocument
                          .defaultView
--- a/toolkit/content/resetProfile.xul
+++ b/toolkit/content/resetProfile.xul
@@ -17,17 +17,17 @@
             onload="">
 	<!-- The empty onload event handler is a hack to get the accept button text applied by Fluent. -->
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="toolkit/global/resetProfile.ftl"/>
   </linkset>
 
-  <script type="application/javascript" src="chrome://global/content/resetProfile.js"/>
+  <script src="chrome://global/content/resetProfile.js"/>
 
   <description data-l10n-id="refresh-profile-description"/>
   <label data-l10n-id="refresh-profile-description-details"/>
 
   <vbox id="migratedItems">
     <label class="migratedLabel" data-l10n-id="refresh-profile-remove"/>
     <label class="migratedLabel" data-l10n-id="refresh-profile-restore"/>
   </vbox>
--- a/toolkit/content/timepicker.xhtml
+++ b/toolkit/content/timepicker.xhtml
@@ -2,30 +2,30 @@
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
 ]>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <head>
   <title>Time Picker</title>
   <link rel="stylesheet" href="chrome://global/skin/datetimeinputpickers.css"/>
-  <script type="application/javascript" src="chrome://global/content/bindings/timekeeper.js"></script>
-  <script type="application/javascript" src="chrome://global/content/bindings/spinner.js"></script>
-  <script type="application/javascript" src="chrome://global/content/bindings/timepicker.js"></script>
+  <script src="chrome://global/content/bindings/timekeeper.js"></script>
+  <script src="chrome://global/content/bindings/spinner.js"></script>
+  <script src="chrome://global/content/bindings/timepicker.js"></script>
 </head>
 <body>
   <div id="time-picker"></div>
   <template id="spinner-template">
     <div class="spinner-container">
       <button class="up"/>
       <div class="spinner"></div>
       <button class="down"/>
     </div>
   </template>
-  <script type="application/javascript">
+  <script>
   /* import-globals-from widgets/timepicker.js */
   // We need to hide the scroll bar but maintain its scrolling
   // capability, so using |overflow: hidden| is not an option.
   // Instead, we are inserting a user agent stylesheet that is
   // capable of selecting scrollbars, and do |display: none|.
   var domWinUtls = window.windowUtils;
   domWinUtls.loadSheetUsingURIString('data:text/css,@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); scrollbar { display: none; }', domWinUtls.AGENT_SHEET);
   // Create a TimePicker instance and prepare to be
--- a/toolkit/crashreporter/content/crashes.xhtml
+++ b/toolkit/crashreporter/content/crashes.xhtml
@@ -5,17 +5,17 @@
 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <link rel="localization" href="crashreporter/aboutcrashes.ftl"/>
     <link rel="stylesheet" type="text/css" href="chrome://global/content/crashes.css"/>
     <link rel="stylesheet" media="screen, projection" type="text/css"
           href="chrome://global/skin/in-content/common.css"/>
-    <script type="application/javascript" src="chrome://global/content/crashes.js"/>
+    <script src="chrome://global/content/crashes.js"/>
     <title data-l10n-id="crash-reports-title"></title>
   </head>
 
   <body>
     <p id="noConfig" class="hidden" data-l10n-id="no-config-label"></p>
     <p id="noSubmittedReports" class="hidden" data-l10n-id="no-reports-label"></p>
 
     <div id="reportListUnsubmitted" class="hidden">
--- a/toolkit/mozapps/extensions/content/blocklist.xul
+++ b/toolkit/mozapps/extensions/content/blocklist.xul
@@ -16,18 +16,18 @@
 
 <dialog windowtype="Addons:Blocklist" title="&blocklist.title;" align="stretch"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="init();"
         buttons="accept,cancel" style="&blocklist.style;"
         buttonlabelaccept="&blocklist.accept.label;"
         buttonaccesskeyaccept="&blocklist.accept.accesskey;">
 
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://mozapps/content/extensions/blocklist.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://mozapps/content/extensions/blocklist.js"/>
 
   <hbox align="stretch" flex="1">
     <vbox pack="start">
       <image class="error-icon"/>
     </vbox>
     <vbox flex="1">
       <label>&blocklist.summary;</label>
       <separator class="thin"/>
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -21,20 +21,18 @@
 
   <xhtml:link rel="shortcut icon"
               href="chrome://mozapps/skin/extensions/extensionGeneric-16.svg"/>
   <linkset>
     <xhtml:link rel="localization" href="branding/brand.ftl"/>
     <xhtml:link rel="localization" href="toolkit/about/aboutAddons.ftl"/>
   </linkset>
 
-  <script type="application/javascript"
-          src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript"
-          src="chrome://mozapps/content/extensions/extensions.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://mozapps/content/extensions/extensions.js"/>
 
   <popupset>
     <!-- menu for an addon item -->
     <menupopup id="addonitem-popup">
       <menuitem id="menuitem_showDetails" command="cmd_showItemDetails"
                 default="true" data-l10n-id="cmd-show-details"/>
       <menuitem id="menuitem_enableItem" command="cmd_enableItem"
                 label="&cmd.enableAddon.label;"
--- a/toolkit/mozapps/extensions/content/pluginPrefs.xul
+++ b/toolkit/mozapps/extensions/content/pluginPrefs.xul
@@ -14,18 +14,17 @@
 <!ENTITY % pluginsDTD SYSTEM "chrome://pluginproblem/locale/pluginproblem.dtd">
 %pluginsDTD;
 <!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
 %extensionsDTD;
 ]>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/javascript"
-          src="chrome://mozapps/content/extensions/pluginPrefs.js"/>
+  <script src="chrome://mozapps/content/extensions/pluginPrefs.js"/>
 
   <vbox class="detail-view-container">
     <grid id="detail-grid">
       <columns>
           <column flex="1"/>
           <column flex="2"/>
       </columns>
       <rows id="detail-rows">
--- a/toolkit/mozapps/extensions/content/shortcuts.html
+++ b/toolkit/mozapps/extensions/content/shortcuts.html
@@ -6,17 +6,17 @@
 <html>
   <head>
     <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://mozapps/content/extensions/shortcuts.css"  type="text/css"/>
 
     <link rel="localization" href="branding/brand.ftl"/>
     <link rel="localization" href="toolkit/about/aboutAddons.ftl"/>
 
-    <script type="application/javascript" src="chrome://mozapps/content/extensions/shortcuts.js"></script>
+    <script src="chrome://mozapps/content/extensions/shortcuts.js"></script>
   </head>
   <body id="body">
     <div class="body">
       <div class="error-message">
         <img class="error-message-icon" src="chrome://global/skin/arrow/panelarrow-vertical.svg"/>
         <div class="error-message-label"></div>
       </div>
 
--- a/toolkit/mozapps/preferences/changemp.xul
+++ b/toolkit/mozapps/preferences/changemp.xul
@@ -8,17 +8,17 @@
 
 <dialog id="changemp"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="width: 40em;"
         onload="init()"
         data-l10n-id="set-password">
 
-  <script type="application/javascript" src="chrome://mozapps/content/preferences/changemp.js"/>
+  <script src="chrome://mozapps/content/preferences/changemp.js"/>
 
   <linkset>
     <html:link rel="localization" href="branding/brand.ftl"/>
     <html:link rel="localization" href="toolkit/preferences/preferences.ftl"/>
   </linkset>
 
   <description control="pw1" data-l10n-id="master-password-description"></description>
 
--- a/toolkit/mozapps/preferences/removemp.xul
+++ b/toolkit/mozapps/preferences/removemp.xul
@@ -8,17 +8,17 @@
 
 <dialog id="removemp"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         style="width: 35em;"
         onload="gRemovePasswordDialog.init()"
         data-l10n-id="remove-password">
 
-  <script type="application/javascript" src="chrome://mozapps/content/preferences/removemp.js"/>
+  <script src="chrome://mozapps/content/preferences/removemp.js"/>
 
   <linkset>
     <html:link rel="localization" href="toolkit/preferences/preferences.ftl"/>
   </linkset>
 
   <vbox id="warnings">
     <description data-l10n-id="remove-warning1"></description>
     <description class="header" data-l10n-id="remove-warning2"></description>
--- a/toolkit/mozapps/update/content/history.xul
+++ b/toolkit/mozapps/update/content/history.xul
@@ -19,18 +19,17 @@
         data-l10n-id="close-button-label"
         data-l10n-attrs="buttonlabelcancel"
         onload="gUpdateHistory.onLoad();">
 
   <linkset>
     <html:link rel="localization" href="toolkit/updates/history.ftl"/>
   </linkset>
 
-  <script type="application/javascript"
-          src="chrome://mozapps/content/update/history.js"/>
+  <script src="chrome://mozapps/content/update/history.js"/>
 
   <label data-l10n-id="history-intro"></label>
   <separator class="thin"/>
   <richlistbox id="historyItems" flex="1">
     <label data-l10n-id="no-updates-label"></label>
   </richlistbox>
   <separator class="thin"/>
 </dialog>
--- a/toolkit/mozapps/update/content/updates.xul
+++ b/toolkit/mozapps/update/content/updates.xul
@@ -22,20 +22,20 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         title="&updateWizard.title;"
         windowtype="Update:Wizard"
         style="width: auto; height: auto"
         onload="gUpdates.onLoad();"
         onunload="gUpdates.onUnload();">
 
-  <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
-  <script type="application/javascript" src="chrome://mozapps/content/update/updates.js"/>
-  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
+  <script src="chrome://global/content/contentAreaUtils.js"/>
+  <script src="chrome://mozapps/content/update/updates.js"/>
+  <script src="chrome://global/content/globalOverlay.js"/>
+  <script src="chrome://global/content/editMenuOverlay.js"/>
 
 #if defined(XP_MACOSX) && MOZ_BUILD_APP == browser
 #include ../../../../browser/base/content/macWindow.inc.xul
 #endif
 
   <stringbundleset id="updateSet">
     <stringbundle id="brandStrings" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="updateStrings" src="chrome://mozapps/locale/update/updates.properties"/>
--- a/toolkit/profile/content/createProfileWizard.xul
+++ b/toolkit/profile/content/createProfileWizard.xul
@@ -14,23 +14,22 @@
 
 <wizard id="createProfileWizard"
         title="&newprofile.title;"
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="initWizard();"
         style="&window.size;">
-  <script type="application/javascript"
-          src="chrome://global/content/customElements.js"/>
+  <script src="chrome://global/content/customElements.js"/>
 
   <stringbundle id="bundle_profileManager"
                 src="chrome://mozapps/locale/profile/profileSelection.properties"/>
 
-  <script type="application/javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/>
+  <script src="chrome://mozapps/content/profile/createProfileWizard.js"/>
 
   <wizardpage id="explanation">
     <description>&profileCreationExplanation_1.text;</description>
     <description>&profileCreationExplanation_2.text;</description>
     <description>&profileCreationExplanation_3.text;</description>
     <spacer flex="1"/>
 #ifdef XP_MACOSX
     <description>&profileCreationExplanation_4Mac.text;</description>
--- a/toolkit/profile/content/profileDowngrade.xul
+++ b/toolkit/profile/content/profileDowngrade.xul
@@ -22,17 +22,17 @@
         buttonlabelextra1="&window.create;"
 #ifdef XP_WIN
         buttonlabelaccept="&window.quit-win;"
 #else
         buttonlabelaccept="&window.quit-nonwin;"
 #endif
         buttons="accept,extra1" buttonpack="end">
 
-  <script type="application/javascript" src="profileDowngrade.js"/>
+  <script src="profileDowngrade.js"/>
 
   <hbox flex="1" align="start">
     <image id="info" role="presentation"/>
     <vbox flex="1">
       <description id="nosync">&window.nosync;</description>
 #ifdef MOZ_SERVICES_SYNC
       <description id="sync">&window.sync;</description>
 #endif
--- a/toolkit/profile/content/profileSelection.xul
+++ b/toolkit/profile/content/profileSelection.xul
@@ -22,25 +22,24 @@
   title="&windowtitle.label;"
   orient="vertical"
   buttons="accept,cancel"
   style="width: 30em;"
   onload="startup();"
   buttonlabelaccept="&start.label;"
   buttonlabelcancel="&exit.label;">
 
-  <script type="application/javascript"
-          src="chrome://global/content/customElements.js"/>
+  <script src="chrome://global/content/customElements.js"/>
 
   <stringbundle id="bundle_profileManager"
                 src="chrome://mozapps/locale/profile/profileSelection.properties"/>
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
 
-  <script type="application/javascript" src="chrome://mozapps/content/profile/profileSelection.js"/>
+  <script src="chrome://mozapps/content/profile/profileSelection.js"/>
 
   <description class="label">&pmDescription.label;</description>
 
   <separator class="thin"/>
 
   <hbox class="profile-box indent" flex="1">
 
     <vbox id="managebuttons">
--- a/tools/leak-gauge/leak-gauge.html
+++ b/tools/leak-gauge/leak-gauge.html
@@ -10,17 +10,17 @@
 <head>
 <meta charset="UTF-8" />
 <title>Leak Gauge</title>
 
 <style type="text/css">
 pre { margin: 0; }
 pre.output { border: medium solid; padding: 1em; margin: 1em; }
 </style>
-<script type="text/javascript">
+<script>
 
 function runfile(file) {
   var result = "Results of processing log " + file.fileName + " :\n";
 
   var fileReader = new FileReader();
   fileReader.onload = function(e) {
     runContents(result, e.target.result);
   };