diff --git a/mozilla/suite/common/pref/pref-advanced.xul b/mozilla/suite/common/pref/pref-advanced.xul
index b7b4317fac3..a83e145b790 100644
--- a/mozilla/suite/common/pref/pref-advanced.xul
+++ b/mozilla/suite/common/pref/pref-advanced.xul
@@ -30,7 +30,7 @@
         align="vertical" title="&window.title;"
         onload="parent.initPanel(panel);">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var panel = "chrome://communicator/content/pref/pref-advanced.xul";
     var _elementIDs = ["advancedJavaAllow", "javascriptEnabled", "advancedMailFTP", "advancedMailFTPAddress"];
@@ -49,8 +49,8 @@
     
   ]]>
   </script>
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
         
   <box class="box-smallheader" title="&lHeader;"/>
diff --git a/mozilla/suite/common/pref/pref-appearance.xul b/mozilla/suite/common/pref/pref-appearance.xul
index 734b1cf50af..cb13fce4fb9 100644
--- a/mozilla/suite/common/pref/pref-appearance.xul
+++ b/mozilla/suite/common/pref/pref-appearance.xul
@@ -37,7 +37,7 @@
         orient="vertical"
         onload="parent.initPanel(panel);">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var panel = "chrome://communicator/content/pref/pref-appearance.xul";
     // the first elements in this array will be poked from chromeregistry loaded
diff --git a/mozilla/suite/common/pref/pref-applications-edit.xul b/mozilla/suite/common/pref/pref-applications-edit.xul
index 032f5a52d55..81849b984e9 100644
--- a/mozilla/suite/common/pref/pref-applications-edit.xul
+++ b/mozilla/suite/common/pref/pref-applications-edit.xul
@@ -35,10 +35,10 @@
         title="&editType.label;"
         onload="Startup();">
 
-  <script language="JavaScript" src="chrome://communicator/content/pref/overrideHandler.js"></script>
-  <script language="JavaScript" src="chrome://global/content/strres.js"></script>
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script language="JavaScript">
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript">
   <![CDATA[
     var gExtensionLabel   = null;
     var gMIMEField        = null;
diff --git a/mozilla/suite/common/pref/pref-applications.xul b/mozilla/suite/common/pref/pref-applications.xul
index c7ea4aef1fe..816a7ddb6db 100644
--- a/mozilla/suite/common/pref/pref-applications.xul
+++ b/mozilla/suite/common/pref/pref-applications.xul
@@ -35,10 +35,10 @@
         title="&window.title;" align="vertical"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-applications.xul');">
 
-  <script language="JavaScript" src="chrome://communicator/content/pref/pref-applications.js"></script>
-  <script language="JavaScript" src="chrome://communicator/content/pref/overrideHandler.js"></script>
-  <script language="JavaScript" src="chrome://global/content/strres.js"></script>
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-applications.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/overrideHandler.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
         
   <box class="box-smallheader" title="&lHeader;"/>
 
diff --git a/mozilla/suite/common/pref/pref-cache.xul b/mozilla/suite/common/pref/pref-cache.xul
index 95ca6136145..8c0ad051f91 100644
--- a/mozilla/suite/common/pref/pref-cache.xul
+++ b/mozilla/suite/common/pref/pref-cache.xul
@@ -30,15 +30,15 @@
         orient="vertical" title="&title.label;"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-cache.xul');">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["browserCacheMemoryCache", "browserCacheDiskCache", "browserCacheCheckDocFrequency"];
   ]]>
   </script>
   
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/pref-cache.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-cache.js"/>
 
   <box class="box-smallheader" title="&lHeader;"/>
 
diff --git a/mozilla/suite/common/pref/pref-charset.xul b/mozilla/suite/common/pref/pref-charset.xul
index b74f48ec834..f8bf0da1fc4 100644
--- a/mozilla/suite/common/pref/pref-charset.xul
+++ b/mozilla/suite/common/pref/pref-charset.xul
@@ -36,7 +36,7 @@
   persist="width height"
   width="500" height="394">
 
-  <script type="text/javascript" src="chrome://communicator/content/pref/pref-charset.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-charset.js"/>
 
   <keyset id="keyset"/>
   
diff --git a/mozilla/suite/common/pref/pref-colors.xul b/mozilla/suite/common/pref/pref-colors.xul
index 3d4aaf75933..90a981b0553 100644
--- a/mozilla/suite/common/pref/pref-colors.xul
+++ b/mozilla/suite/common/pref/pref-colors.xul
@@ -35,13 +35,13 @@
         orient="vertical"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors"];
   ]]>
   </script>
   
-  <script language="JavaScript" src="chrome://communicator/content/pref/pref-colors.js"></script>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-colors.js"/>
 
   <box class="box-smallheader" title="&lHeader;"/>
 
diff --git a/mozilla/suite/common/pref/pref-cookies.xul b/mozilla/suite/common/pref/pref-cookies.xul
index 12a270f279d..baf65d677e2 100644
--- a/mozilla/suite/common/pref/pref-cookies.xul
+++ b/mozilla/suite/common/pref/pref-cookies.xul
@@ -37,7 +37,7 @@
         align="vertical"
         onload="init();">
           
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
   
   var _elementIDs = ["networkCookieBehaviour", "networkWarnAboutCookies"];
diff --git a/mozilla/suite/common/pref/pref-debug.xul b/mozilla/suite/common/pref/pref-debug.xul
index 5b4fdb85ec8..5ea449a531f 100644
--- a/mozilla/suite/common/pref/pref-debug.xul
+++ b/mozilla/suite/common/pref/pref-debug.xul
@@ -31,7 +31,7 @@
         orient="vertical"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["nglayoutDebugWindow",
                        "debugXULBoxes", "nglayoutDebugUseXBLForms", "nglayoutDebugDisableXULCache", "browserEnableCache",
diff --git a/mozilla/suite/common/pref/pref-debug1.xul b/mozilla/suite/common/pref/pref-debug1.xul
index 5c9f534b76f..3d7f9484e06 100644
--- a/mozilla/suite/common/pref/pref-debug1.xul
+++ b/mozilla/suite/common/pref/pref-debug1.xul
@@ -31,7 +31,7 @@
         orient="vertical"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');">
 
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["nglayoutDebugPaintFlashing", "nglayoutDebugPaintDumping",
                        "nglayoutDebugInvalidateDumping", "nglayoutDebugEventDumping", 
diff --git a/mozilla/suite/common/pref/pref-debug2.xul b/mozilla/suite/common/pref/pref-debug2.xul
index 4b28a554664..b53b9bc1168 100644
--- a/mozilla/suite/common/pref/pref-debug2.xul
+++ b/mozilla/suite/common/pref/pref-debug2.xul
@@ -31,7 +31,7 @@
         orient="vertical"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["browserEnableKeepAlive", "browserEnablePipelining",
                        "httpVersionString", "acceptEncodingString"];
diff --git a/mozilla/suite/common/pref/pref-download.xul b/mozilla/suite/common/pref/pref-download.xul
index 9164b78fd0b..2fd0e989e07 100644
--- a/mozilla/suite/common/pref/pref-download.xul
+++ b/mozilla/suite/common/pref/pref-download.xul
@@ -32,7 +32,7 @@
         align="vertical" title="&title.label;"
   		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-download' ); else parent.queuedTag = 'pref-download';">
 
-  <html:script language="JavaScript">
+  <script type="application/x-javascript">
   // startup function called by the prefs architecture.
   function Startup()
   {
@@ -65,7 +65,7 @@
       }
     }
   }
-  </html:script>
+  </script>
   
   <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
 	
diff --git a/mozilla/suite/common/pref/pref-fonts.xul b/mozilla/suite/common/pref/pref-fonts.xul
index 1c95b0167d5..afca6ab2c3e 100644
--- a/mozilla/suite/common/pref/pref-fonts.xul
+++ b/mozilla/suite/common/pref/pref-fonts.xul
@@ -32,9 +32,9 @@
         orient="vertical"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');">
 
-  <script type="text/javascript" src="chrome://communicator/content/pref/pref-fonts.js"/>
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-fonts.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
   <box class="box-smallheader" title="&lHeader;"/>
   
diff --git a/mozilla/suite/common/pref/pref-history.xul b/mozilla/suite/common/pref/pref-history.xul
index 97620b57193..5aee3d48cd7 100644
--- a/mozilla/suite/common/pref/pref-history.xul
+++ b/mozilla/suite/common/pref/pref-history.xul
@@ -32,11 +32,11 @@
         orient="vertical" title="&title.label;"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');">
 
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
-  <script language="javascript" src="chrome://global/content/nsJSComponentManager.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
 
   <![CDATA[
     var _elementIDs = ["histDay", "shistMax"];
diff --git a/mozilla/suite/common/pref/pref-images.xul b/mozilla/suite/common/pref/pref-images.xul
index bf7ebcb13e9..88c1b8e0ffa 100644
--- a/mozilla/suite/common/pref/pref-images.xul
+++ b/mozilla/suite/common/pref/pref-images.xul
@@ -37,7 +37,7 @@
         align="vertical"
         onload="init();">
           
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
   
   var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
diff --git a/mozilla/suite/common/pref/pref-languages-add.xul b/mozilla/suite/common/pref/pref-languages-add.xul
index e1ada761d89..f5167fd7b6c 100644
--- a/mozilla/suite/common/pref/pref-languages-add.xul
+++ b/mozilla/suite/common/pref/pref-languages-add.xul
@@ -35,8 +35,8 @@
   orient="vertical"
   style="width: 25em;height: 25em;">
 
-  <script language="javascript" src="pref-languages.js"></script>
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
+  <script type="application/x-javascript" src="pref-languages.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <keyset id="keyset"/>
   
diff --git a/mozilla/suite/common/pref/pref-languages.xul b/mozilla/suite/common/pref/pref-languages.xul
index 3390263095a..97ab6e6ffeb 100644
--- a/mozilla/suite/common/pref/pref-languages.xul
+++ b/mozilla/suite/common/pref/pref-languages.xul
@@ -30,10 +30,10 @@
   title="&languages.customize.window.title;" 
   onload="Init();" orient="vertical">
 
-  <script type="text/javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
-  <script type="text/javascript">
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-languages.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["intlAcceptLanguages", "DefaultCharsetList"];
   ]]>
diff --git a/mozilla/suite/common/pref/pref-mousewheel.xul b/mozilla/suite/common/pref/pref-mousewheel.xul
index 4fa82a6fe6e..7d4aaacba37 100644
--- a/mozilla/suite/common/pref/pref-mousewheel.xul
+++ b/mozilla/suite/common/pref/pref-mousewheel.xul
@@ -40,7 +40,7 @@
 		onload="parent.initPanel('chrome://communicator/content/pref/pref-mousewheel.xul');"
 		orient="vertical">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
   var _elementIDs = ["mousewheelWithNoKeyAction", "mousewheelWithNoKeyNumlines", "mousewheelWithNoKeySysNumlines", 
                      "mousewheelWithAltKeyAction", "mousewheelWithAltKeyNumlines", "mousewheelWithAltKeySysNumlines", 
@@ -84,8 +84,8 @@
 
   ]]>
   </script>
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
   <box class="box-smallheader" title="&title.label;"/>
 
diff --git a/mozilla/suite/common/pref/pref-navigator.xul b/mozilla/suite/common/pref/pref-navigator.xul
index 66285995aa5..93d1ad4915b 100644
--- a/mozilla/suite/common/pref/pref-navigator.xul
+++ b/mozilla/suite/common/pref/pref-navigator.xul
@@ -33,11 +33,10 @@
         orient="vertical" title="&title.label;"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-navigator.xul');">
 
-  <script language="javascript" src="chrome://global/content/strres.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
-  <script language="javascript" src="chrome://global/content/nsJSComponentManager.js">
-  </script>
-  <script language="JavaScript">
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["startupPage", "browserStartupHomepage",
                        "bookmarksButton", "goButton",
diff --git a/mozilla/suite/common/pref/pref-policies.xul b/mozilla/suite/common/pref/pref-policies.xul
index 663e01fd23f..8d460de42d6 100644
--- a/mozilla/suite/common/pref/pref-policies.xul
+++ b/mozilla/suite/common/pref/pref-policies.xul
@@ -10,7 +10,7 @@
         onload="parent.initPanel('chrome://communicator/content/pref/pref-policies.xul');"
         orient="vertical">
 
-  <script language="javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     
   
diff --git a/mozilla/suite/common/pref/pref-proxies.xul b/mozilla/suite/common/pref/pref-proxies.xul
index 61243b180c4..070373bf111 100644
--- a/mozilla/suite/common/pref/pref-proxies.xul
+++ b/mozilla/suite/common/pref/pref-proxies.xul
@@ -33,15 +33,15 @@
         orient="vertical"
         onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');">
 
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["networkProxyType", "networkProxyFTP", "networkProxyFTP_Port", "networkProxyHTTP",                        "networkProxyHTTP_Port", "networkProxySSL", "networkProxySSL_Port", "networkProxySOCKS",                        "networkProxySOCKS_Port", "networkProxyNone", "networkProxyAutoconfigURL"];
   ]]>
   </script>
         
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-proxies.js"/>
   
   <box class="box-smallheader" title="&lHeader;"/>
 
diff --git a/mozilla/suite/common/pref/pref-search.xul b/mozilla/suite/common/pref/pref-search.xul
index 6cb13d9fbe4..a72ac8d6b3d 100755
--- a/mozilla/suite/common/pref/pref-search.xul
+++ b/mozilla/suite/common/pref/pref-search.xul
@@ -30,12 +30,12 @@
         onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"  title="&title.label;"
         orient="vertical">
 
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["engineList","openSidebarPanel"];
   ]]>
   </script> 
-  <script type="text/javascript" src="chrome://communicator/content/pref/pref-search.js"/>      
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-search.js"/>      
         
   <box class="box-smallheader" title="&lHeader;"/>
 
diff --git a/mozilla/suite/common/pref/pref-smart_browsing.xul b/mozilla/suite/common/pref/pref-smart_browsing.xul
index 4f84a0ad86d..ae4061db863 100644
--- a/mozilla/suite/common/pref/pref-smart_browsing.xul
+++ b/mozilla/suite/common/pref/pref-smart_browsing.xul
@@ -39,8 +39,8 @@
         orient="vertical"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-smart_browsing.xul');">
 
-  <script language="Javascript" src="chrome://global/content/strres.js" />
-  <script language="JavaScript">
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript">
   <![CDATA[
   
   var _elementIDs = ["browserRelatedDisabledForDomains", "addDomain", "browserGoBrowsingEnabled",                      "browserAutoCompleteEnabled"];
diff --git a/mozilla/suite/common/pref/pref-smartupdate.xul b/mozilla/suite/common/pref/pref-smartupdate.xul
index 974fd6c24ce..e5b8e515b48 100644
--- a/mozilla/suite/common/pref/pref-smartupdate.xul
+++ b/mozilla/suite/common/pref/pref-smartupdate.xul
@@ -11,7 +11,7 @@
         title="&title.label;"
   		  onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul');">
   
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["XPInstallEnabled"];
   ]]>
diff --git a/mozilla/suite/common/pref/pref-themes.xul b/mozilla/suite/common/pref/pref-themes.xul
index 3ed3553222b..ca4bd841bb8 100644
--- a/mozilla/suite/common/pref/pref-themes.xul
+++ b/mozilla/suite/common/pref/pref-themes.xul
@@ -35,9 +35,9 @@
         onload="Startup()"
         orient="vertical">
 
-  <script language="JavaScript" src="chrome://global/content/strres.js"></script>
-  <script language="JavaScript" src="chrome://communicator/content/pref/pref-themes.js"></script>
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/pref-themes.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
         
   <box class="box-smallheader" title="&lHeader;"/>
 
diff --git a/mozilla/suite/common/pref/pref-winhooks.xul b/mozilla/suite/common/pref/pref-winhooks.xul
index cdbb5c0c7cc..b437c41b9e3 100644
--- a/mozilla/suite/common/pref/pref-winhooks.xul
+++ b/mozilla/suite/common/pref/pref-winhooks.xul
@@ -41,7 +41,7 @@
         onload="parent.initPanel('chrome://communicator/content/pref/pref-winhooks.xul');"
         orient="vertical">
 
-<script type="text/javascript" src="chrome://communicator/content/pref/pref-winhooks.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/pref/pref-winhooks.js"/>
     
     <box class="box-smallheader" title="&title.label;"/>
 
diff --git a/mozilla/suite/common/pref/pref.xul b/mozilla/suite/common/pref/pref.xul
index 269d353f4a3..e0f41b5b606 100644
--- a/mozilla/suite/common/pref/pref.xul
+++ b/mozilla/suite/common/pref/pref.xul
@@ -44,8 +44,8 @@
   
   </script>        
         
-  <script language="javascript" src="chrome://global/content/nsWidgetStateManager.js"></script>
-  <script language="javascript" src="chrome://communicator/content/pref/nsPrefWindow.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsWidgetStateManager.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/nsPrefWindow.js"/>
 
   <keyset id="keyset"/>
 
@@ -54,7 +54,7 @@
     <tree class="inset" id="prefsTree" style="width: 0px" flex="3"/>      
 
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
-    <script language="JavaScript">
+    <script type="application/x-javascript">
     <![CDATA[
       if( window.arguments && window.arguments[0] ) {
         document.getElementById("panelFrame").setAttribute("src", window.arguments[0] );