diff --git a/security/manager/pki/resources/content/certManager.xul b/security/manager/pki/resources/content/certManager.xul
index 61b57bb43d5..28acbf93bc9 100644
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/security/manager/pki/resources/content/certManager.xul
@@ -56,9 +56,9 @@
         style="width: 48em; height: 32em;"
         persist="screenX screenY width height">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/certManager.js"/>
 
   <vbox flex="1">
     <tabbox id="certmanagertabs" flex="1" style="margin:5px" persist="selectedIndex">
diff --git a/security/manager/pki/resources/content/certViewer.xul b/security/manager/pki/resources/content/certViewer.xul
index 4898a7e2905..76727f46d4c 100644
--- a/security/manager/pki/resources/content/certViewer.xul
+++ b/security/manager/pki/resources/content/certViewer.xul
@@ -54,9 +54,9 @@
   buttonaccesskeyaccept="&certmgr.close.accesskey;"
   onload="setWindowName();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/viewCertDetails.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 
   <tabbox>
     <tabs>
diff --git a/security/manager/pki/resources/content/certerror.xul b/security/manager/pki/resources/content/certerror.xul
index 41b87d17d51..991a95d4c4a 100644
--- a/security/manager/pki/resources/content/certerror.xul
+++ b/security/manager/pki/resources/content/certerror.xul
@@ -54,9 +54,9 @@
   buttonaccesskeyextra1="&examineCert.accesskey;"
   ondialogextra1="viewCert();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/certerror.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/certerror.js"/>
 
 <hbox>
   <vbox>
diff --git a/security/manager/pki/resources/content/certpicker.xul b/security/manager/pki/resources/content/certpicker.xul
index 255e9474d3c..388dba24679 100644
--- a/security/manager/pki/resources/content/certpicker.xul
+++ b/security/manager/pki/resources/content/certpicker.xul
@@ -50,8 +50,8 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/certpicker.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/certpicker.js"/>
 
   <hbox align="center">
     <broadcaster id="certSelected" oncommand="onCertSelected();"/>
diff --git a/security/manager/pki/resources/content/changepassword.xul b/security/manager/pki/resources/content/changepassword.xul
index f3ee768a114..d53fe283164 100644
--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/security/manager/pki/resources/content/changepassword.xul
@@ -47,8 +47,8 @@
   ondialogaccept="return setPassword();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/password.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
 
 <hbox align="center">
   <label value="&setPassword.tokenName.label;: "/>
diff --git a/security/manager/pki/resources/content/choosetoken.xul b/security/manager/pki/resources/content/choosetoken.xul
index c336bd282de..6ae70f33ae5 100644
--- a/security/manager/pki/resources/content/choosetoken.xul
+++ b/security/manager/pki/resources/content/choosetoken.xul
@@ -52,9 +52,9 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/choosetoken.js"/>
 
   <groupbox>
     <description>&chooseToken.message1;</description>
diff --git a/security/manager/pki/resources/content/clientauthask.xul b/security/manager/pki/resources/content/clientauthask.xul
index 66b0bf2799d..7f00a8ea90d 100644
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/security/manager/pki/resources/content/clientauthask.xul
@@ -51,9 +51,9 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/clientauthask.js"/>
 
   <groupbox>
     <description style="font-weight: bold;">&clientAuthAsk.message1;</description>
diff --git a/security/manager/pki/resources/content/createCertInfo.xul b/security/manager/pki/resources/content/createCertInfo.xul
index 9b183d16677..0b9d92b0e57 100644
--- a/security/manager/pki/resources/content/createCertInfo.xul
+++ b/security/manager/pki/resources/content/createCertInfo.xul
@@ -45,9 +45,9 @@
   onload="onLoad();"
   onclose="onClose();"
 >
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="createCertInfo.js" />
+<script type="application/javascript" src="chrome://global/content/strres.js" />
+<script type="application/javascript" src="pippki.js" />
+<script type="application/javascript" src="createCertInfo.js" />
 
 <vbox style="margin: 5px; max-width: 50em;">
 
diff --git a/security/manager/pki/resources/content/crlImportDialog.xul b/security/manager/pki/resources/content/crlImportDialog.xul
index d89b1d53043..ec1af770632 100644
--- a/security/manager/pki/resources/content/crlImportDialog.xul
+++ b/security/manager/pki/resources/content/crlImportDialog.xul
@@ -48,9 +48,9 @@
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();">
   
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="chrome://pippki/content/crlImportDialog.js" />
-  <script type="application/x-javascript" src="pippki.js" />
+  <script type="application/javascript" src="chrome://global/content/strres.js" />
+  <script type="application/javascript" src="chrome://pippki/content/crlImportDialog.js" />
+  <script type="application/javascript" src="pippki.js" />
 
   <vbox style="margin: 5px;" flex="1">
 
diff --git a/security/manager/pki/resources/content/crlManager.xul b/security/manager/pki/resources/content/crlManager.xul
index 1ce8b4113a9..dba8e1ee7a4 100644
--- a/security/manager/pki/resources/content/crlManager.xul
+++ b/security/manager/pki/resources/content/crlManager.xul
@@ -57,8 +57,8 @@
         persist="screenX screenY width height">
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/crlManager.js"/>
 
   <description value="&validation.crlmanager.description;"/>
   <separator class="thin"/>
diff --git a/security/manager/pki/resources/content/deletecert.xul b/security/manager/pki/resources/content/deletecert.xul
index ebdc333a33f..67d1ba3fcb7 100644
--- a/security/manager/pki/resources/content/deletecert.xul
+++ b/security/manager/pki/resources/content/deletecert.xul
@@ -48,9 +48,9 @@
   ondialogaccept="return doOK();"
   ondialogcancel="return doCancel();">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="pippki.js" />
+  <script type="application/javascript" src="chrome://pippki/content/deletecert.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js" />
+  <script type="application/javascript" src="pippki.js" />
 
   <description id="confirm" style="width: 400px;"/>
   <separator />
diff --git a/security/manager/pki/resources/content/device_manager.xul b/security/manager/pki/resources/content/device_manager.xul
index ec4de0aab29..baa92029c2c 100644
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@@ -55,8 +55,8 @@
         onload="LoadModules();"
         buttons="accept">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
 
 <grid flex="1" style="margin:5px">
   <columns>
diff --git a/security/manager/pki/resources/content/downloadcert.xul b/security/manager/pki/resources/content/downloadcert.xul
index 31d9e52e452..5b50092ffb4 100644
--- a/security/manager/pki/resources/content/downloadcert.xul
+++ b/security/manager/pki/resources/content/downloadcert.xul
@@ -48,9 +48,9 @@
   ondialogcancel="return doCancel();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/downloadcert.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
 
 
   <!--  Let 'em know what they're doing -->
diff --git a/security/manager/pki/resources/content/editcacert.xul b/security/manager/pki/resources/content/editcacert.xul
index b20a9a51023..a821fee37f0 100644
--- a/security/manager/pki/resources/content/editcacert.xul
+++ b/security/manager/pki/resources/content/editcacert.xul
@@ -49,9 +49,9 @@
         onload="setWindowName();"
 >
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/editcerts.js"/>
 
   <description id="certmsg"/>
   <separator/>
diff --git a/security/manager/pki/resources/content/editemailcert.xul b/security/manager/pki/resources/content/editemailcert.xul
index 1b0c66217d6..ba59df08863 100644
--- a/security/manager/pki/resources/content/editemailcert.xul
+++ b/security/manager/pki/resources/content/editemailcert.xul
@@ -49,9 +49,9 @@
         onload="doLoadForEmailCert();"
 >
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/editcerts.js"/>
 
   <description id="certmsg"/>
   <description id="issuer"/>
diff --git a/security/manager/pki/resources/content/editsslcert.xul b/security/manager/pki/resources/content/editsslcert.xul
index c9c090e60ec..21dfcb2786d 100644
--- a/security/manager/pki/resources/content/editsslcert.xul
+++ b/security/manager/pki/resources/content/editsslcert.xul
@@ -49,9 +49,9 @@
         onload="doLoadForSSLCert();"
 >
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/editcerts.js"/>
 
   <description id="certmsg"/>
   <description id="issuer"/>
diff --git a/security/manager/pki/resources/content/escrowWarn.xul b/security/manager/pki/resources/content/escrowWarn.xul
index ac6fff293db..476a1a1cc36 100644
--- a/security/manager/pki/resources/content/escrowWarn.xul
+++ b/security/manager/pki/resources/content/escrowWarn.xul
@@ -52,9 +52,9 @@
   ondialogextra2="viewCert();"
   onload="onLoad();">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/escrowWarn.js"/>
 
   <description>&escrowWarn.message1;</description>
   <separator/>
diff --git a/security/manager/pki/resources/content/exceptionDialog.xul b/security/manager/pki/resources/content/exceptionDialog.xul
index 1eafe3ab1eb..7d58c9560e6 100644
--- a/security/manager/pki/resources/content/exceptionDialog.xul
+++ b/security/manager/pki/resources/content/exceptionDialog.xul
@@ -56,9 +56,9 @@
         persist="screenX screenY width height"
         defaultButton="extra2">
   
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/exceptionDialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/exceptionDialog.js"/>
   
   <hbox>
     <vbox>
diff --git a/security/manager/pki/resources/content/formsigning.xul b/security/manager/pki/resources/content/formsigning.xul
index c8c7333d4cc..bb2bae41685 100644
--- a/security/manager/pki/resources/content/formsigning.xul
+++ b/security/manager/pki/resources/content/formsigning.xul
@@ -51,9 +51,9 @@
 
 <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-<script type="application/x-javascript" src="chrome://pippki/content/formsigning.js"/>
+<script type="application/javascript" src="chrome://global/content/strres.js"/>
+<script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/javascript" src="chrome://pippki/content/formsigning.js"/>
 
   <description id="sign.intro" style="max-width: 50em;"/>
   <textbox readonly="true" id="sign.text" multiline="true"
diff --git a/security/manager/pki/resources/content/getp12password.xul b/security/manager/pki/resources/content/getp12password.xul
index febb4070020..275b45c6785 100644
--- a/security/manager/pki/resources/content/getp12password.xul
+++ b/security/manager/pki/resources/content/getp12password.xul
@@ -49,7 +49,7 @@
   ondialogaccept="return getPassword();"
   onload="onP12Load(false);">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/password.js"/>
 
   <description>&pkcs12.getpassword.message;</description>
   <separator />
diff --git a/security/manager/pki/resources/content/getpassword.xul b/security/manager/pki/resources/content/getpassword.xul
index bb9df082424..a06883115a5 100644
--- a/security/manager/pki/resources/content/getpassword.xul
+++ b/security/manager/pki/resources/content/getpassword.xul
@@ -49,8 +49,8 @@
   ondialogaccept="return getPassword();"
   onload="onLoad();">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
 
   <hbox>
     <label value="&getPassword.tokenName2.label;"/>
diff --git a/security/manager/pki/resources/content/load_device.xul b/security/manager/pki/resources/content/load_device.xul
index 1c74129c70e..408e3edea43 100644
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@@ -52,8 +52,8 @@
         buttons="accept,cancel"
         ondialogaccept="return doLoadDevice();">
 
-  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/device_manager.js"/>
 
   <description>&loaddevice.info;</description>
   <hbox align="center">
diff --git a/security/manager/pki/resources/content/pref-crlupdate.xul b/security/manager/pki/resources/content/pref-crlupdate.xul
index e71e4897b28..b8b1ae2d21a 100644
--- a/security/manager/pki/resources/content/pref-crlupdate.xul
+++ b/security/manager/pki/resources/content/pref-crlupdate.xul
@@ -48,9 +48,9 @@
   ondialogaccept="return onAccept();"
   ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
-  <script type="application/x-javascript" src="chrome://pippki/content/pref-crlupdate.js" />
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://global/content/strres.js" />
+  <script type="application/javascript" src="chrome://pippki/content/pref-crlupdate.js" />
 
   <vbox style="margin: 5px;" flex="1">
     <checkbox label="&validation.crl.autoupdate.enable.label;" 
diff --git a/security/manager/pki/resources/content/protectedAuth.xul b/security/manager/pki/resources/content/protectedAuth.xul
index 4a71cdd53e9..a6c0ba7009f 100644
--- a/security/manager/pki/resources/content/protectedAuth.xul
+++ b/security/manager/pki/resources/content/protectedAuth.xul
@@ -44,10 +44,10 @@
   onload="onLoad();"
   onclose="onClose();"
 >
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="protectedAuth.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/javascript" src="chrome://global/content/strres.js" />
+<script type="application/javascript" src="pippki.js" />
+<script type="application/javascript" src="protectedAuth.js" />
+<script type="application/javascript" src="chrome://help/content/help.js" />
 
 <vbox style="margin: 5px; max-width: 50em;">
 
diff --git a/security/manager/pki/resources/content/resetpassword.xul b/security/manager/pki/resources/content/resetpassword.xul
index a319228f354..fa62a5290be 100644
--- a/security/manager/pki/resources/content/resetpassword.xul
+++ b/security/manager/pki/resources/content/resetpassword.xul
@@ -49,8 +49,8 @@
 
   <stringbundle id="pippki_bundle" src="chrome://pippki/locale/pippki.properties"/>
 
-  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
-  <script type="application/x-javascript" src="chrome://pippki/content/resetpassword.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/resetpassword.js"/>
 
   <hbox flex="1">
     <vbox>
diff --git a/security/manager/pki/resources/content/serverCrlNextupdate.xul b/security/manager/pki/resources/content/serverCrlNextupdate.xul
index b411f9790e6..eecd6bd828f 100644
--- a/security/manager/pki/resources/content/serverCrlNextupdate.xul
+++ b/security/manager/pki/resources/content/serverCrlNextupdate.xul
@@ -53,9 +53,9 @@
   ondialoghelp="openHelp('exp_crl');"
   onload="onLoad();"
 >
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="chrome://pippki/content/pippki.js" />
-<script type="application/x-javascript" src="chrome://pippki/content/serverCrlNextupdate.js" />
+<script type="application/javascript" src="chrome://global/content/strres.js" />
+<script type="application/javascript" src="chrome://pippki/content/pippki.js" />
+<script type="application/javascript" src="chrome://pippki/content/serverCrlNextupdate.js" />
 
   <description id="message1"/>
   <separator/>
diff --git a/security/manager/pki/resources/content/setp12password.xul b/security/manager/pki/resources/content/setp12password.xul
index 85ed6568bb8..c3343f908e2 100644
--- a/security/manager/pki/resources/content/setp12password.xul
+++ b/security/manager/pki/resources/content/setp12password.xul
@@ -49,7 +49,7 @@
   ondialogaccept="return setP12Password();"
   onload="onP12Load(true);">
 
-  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/javascript" src="chrome://pippki/content/password.js"/>
 
   <description>&pkcs12.setpassword.message;</description>
   <separator />