diff --git a/mozilla/editor/ui/composer/content/EditorContextMenuOverlay.xul b/mozilla/editor/ui/composer/content/EditorContextMenuOverlay.xul
index 9e428696b52..2a44f535ad2 100644
--- a/mozilla/editor/ui/composer/content/EditorContextMenuOverlay.xul
+++ b/mozilla/editor/ui/composer/content/EditorContextMenuOverlay.xul
@@ -26,7 +26,7 @@
 <overlay id="ComposerContextMenuOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript" src="chrome://editor/content/EditorContextMenu.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
 
 <popupset id="editorContentContextSet">
  <popup id="editorContentContext"   
diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
index 7bc38c4d8c5..aef6855617b 100644
--- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
@@ -46,10 +46,10 @@
         persist="screenX screenY width height"
         >
 
-  <script language="JavaScript" src="chrome://editor/content/editor.js"/>
-  <script language="JavaScript" src="chrome://editor/content/ComposerCommands.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EditorCommandsDebug.js"/>
-  <script language="javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <commands id="commands">
     <commandset id="globalEditMenuItems"/>
diff --git a/mozilla/editor/ui/composer/content/editor.xul b/mozilla/editor/ui/composer/content/editor.xul
index 7696d0af4e1..c2798ce0807 100644
--- a/mozilla/editor/ui/composer/content/editor.xul
+++ b/mozilla/editor/ui/composer/content/editor.xul
@@ -53,20 +53,20 @@
         persist="screenX screenY width height sizemode"
         >
 
-  <script type="text/javascript" src="chrome://editor/content/editor.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
 <!-- 
   Loaded by editorOverlay.js
-  <script type="text/javascript" src="chrome://editor/content/ComposerCommands.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
 -->
-  <script type="text/javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
-  <script type="text/javascript" src="chrome://editor/content/EditorContextMenu.js"/>
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsTransferable.js"/>
-  <script type="text/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <popupset id="aTooltipSet" />
   <popupset id="editorContentContextSet"/>
diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index 37e93b213a5..b486838102d 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -31,8 +31,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript" src="chrome://editor/content/editorOverlay.js"/>
-<script language="JavaScript" src="chrome://editor/content/ComposerCommands.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/editorOverlay.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
 
   <!--keyset id="platformOverlayKeyset" /--> <!-- Don't do that, only one keyset per window! Anyway, this keyset is not defined! -->
 
diff --git a/mozilla/editor/ui/composer/content/editorPrefsOverlay.xul b/mozilla/editor/ui/composer/content/editorPrefsOverlay.xul
index 97a75346045..3aed888904a 100644
--- a/mozilla/editor/ui/composer/content/editorPrefsOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorPrefsOverlay.xul
@@ -10,7 +10,7 @@
 <overlay id="editorPrefsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var panel;
     if (panel != undefined) {
diff --git a/mozilla/editor/ui/composer/content/pref-composer.xul b/mozilla/editor/ui/composer/content/pref-composer.xul
index 701eafa96ae..14ae5c501e8 100644
--- a/mozilla/editor/ui/composer/content/pref-composer.xul
+++ b/mozilla/editor/ui/composer/content/pref-composer.xul
@@ -35,10 +35,10 @@
   		  onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
 
   <!-- We need these for separator "thin" class -->
-  <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"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <!-- Add "shouldAutoSave", "autoSaveAmount" to _elementIDs when implemented -->
   <![CDATA[
     var _elementIDs = ["maintainTableStructure", "tableDeleteKey", "preserveFormatting", "recentFiles"];
@@ -203,7 +203,4 @@
 
   </titledbox>
   -->
-
-  
 </window>
-
diff --git a/mozilla/editor/ui/composer/content/pref-editing.xul b/mozilla/editor/ui/composer/content/pref-editing.xul
index 61bda6f2274..0460edc3d25 100644
--- a/mozilla/editor/ui/composer/content/pref-editing.xul
+++ b/mozilla/editor/ui/composer/content/pref-editing.xul
@@ -39,10 +39,10 @@
   ]]>
   </script>
 
-  <script language="JavaScript" src="chrome://editor/content/pref-composer.js"></script>
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <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://editor/content/pref-composer.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.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;"/>
 
@@ -165,6 +165,4 @@
     </box>
 
  	</titledbox>
-    
 </window>
-
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
index fc24f780ca1..883cdd6b209 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -44,16 +44,16 @@
   <popupset id="aTooltipSet" />
     
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
   <!-- global dialog functions -->
-  <script language="JavaScript" src="chrome://editor/content/EdAdvancedEdit.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAdvancedEdit.js"/>
   <!-- element page functions -->
-  <script language="JavaScript" src="chrome://editor/content/EdAEHTMLAttributes.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdAECSSAttributes.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdAEJSEAttributes.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAEHTMLAttributes.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAECSSAttributes.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdAEJSEAttributes.js"/>
 
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
-	<script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <broadcaster id="args" value=""/>
 
diff --git a/mozilla/editor/ui/dialogs/content/EdColorPicker.xul b/mozilla/editor/ui/dialogs/content/EdColorPicker.xul
index 132ef403fdf..dc94dca0623 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorPicker.xul
@@ -35,10 +35,10 @@
     orient="vertical"
     >
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdColorPicker.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
-  <script language="javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdColorPicker.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <broadcaster id="args" value=""/>
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdColorProps.xul b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
index 399ddfbc93c..f1f19866f1c 100644
--- a/mozilla/editor/ui/dialogs/content/EdColorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdColorProps.xul
@@ -38,9 +38,9 @@
     onload="Startup()"
     orient="vertical">
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdColorProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdColorProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
index af58b941cc2..568bf847090 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -37,9 +37,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/Ed?????.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/Ed?????.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
index cbd894a1e11..af9e6e6504c 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
@@ -31,8 +31,8 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdDictionary.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDictionary.js"/>
   
   <broadcaster id="args" value=""/>
   <spring id="location" offsetX="10" offsetY="10" persist="offsetX offsetY"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index 957f7b5662c..1dd64f9fa67 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -39,10 +39,10 @@
    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
   <!--- Element-specific methods -->
-  <script language="JavaScript" src="chrome://editor/content/EdHLineProps.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdHLineProps.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMap.xul b/mozilla/editor/ui/dialogs/content/EdImageMap.xul
index d162cc25000..b759a5bef1a 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMap.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMap.xul
@@ -50,12 +50,12 @@
 -->
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js" />
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js" />
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <!-- Methods for Image Map only -->
-  <script language="JavaScript" src="chrome://editor/content/EdImageMap.js" />
-  <script language="JavaScript" src="chrome://editor/content/EdImageMapShapes.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageMap.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageMapShapes.js" />
 
   <broadcaster id="args" value=""/>
 
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 7a2218802e2..fc60973ea14 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -37,10 +37,10 @@
 	>
 
   <!-- Methods common to all editor dialogs -->
-  <script type="text/javascript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script type="text/javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
 
-  <script type="text/javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 0e6720f8f7b..9841aea28c9 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -43,10 +43,10 @@
     id="imagedialog"
     >
   
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdImageProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js"/>
-  <script language="JavaScript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdImageProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
index 6ab9c5d8602..11f6b1ee248 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
@@ -37,9 +37,9 @@
     orient="vertical" flex="1">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdInsSrc.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdInsSrc.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
index 5bcf2b6c4fd..c5b567b14ce 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertChars.xul
@@ -36,9 +36,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdInsertChars.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdInsertChars.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index 2fdc02a3e42..c595321776c 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -40,9 +40,9 @@
     align="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdInsertTable.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdInsertTable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index 917a6afc24c..b02c165771d 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -37,9 +37,9 @@
    onload = "Startup()"
    orient="vertical" >
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdLinkProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdLinkProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <broadcaster id="args" value=""/>
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.xul b/mozilla/editor/ui/dialogs/content/EdListProps.xul
index 837d80b7803..8cafd0c298a 100644
--- a/mozilla/editor/ui/dialogs/content/EdListProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdListProps.xul
@@ -35,9 +35,9 @@
     align="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdListProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdListProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <keyset id="keyset"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 66a754efb39..76972874c32 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -39,9 +39,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdPageProps.xul b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
index 02d9a61fca7..cb014f48836 100644
--- a/mozilla/editor/ui/dialogs/content/EdPageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdPageProps.xul
@@ -37,9 +37,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdPageProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdPageProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index 2f18774e6d0..47ab0cd7364 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -34,9 +34,9 @@
     onclose = "onClose()"
     orient="vertical">
 
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdSpellCheck.js"/>
-  <script language="Javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdSpellCheck.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keys">
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index ce43c405e73..7bf81f7e28f 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -38,9 +38,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EdTableProps.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EdTableProps.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/editor/ui/dialogs/content/EditConflict.xul b/mozilla/editor/ui/dialogs/content/EditConflict.xul
index aeb36a45a07..5ac47def4af 100644
--- a/mozilla/editor/ui/dialogs/content/EditConflict.xul
+++ b/mozilla/editor/ui/dialogs/content/EditConflict.xul
@@ -37,9 +37,9 @@
    orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EditConflict.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditConflict.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keyset"/>
diff --git a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
index ee79281b6df..002a69827d2 100644
--- a/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
+++ b/mozilla/editor/ui/dialogs/content/EditorSaveAsCharset.xul
@@ -39,9 +39,9 @@
     orient="vertical">
 
   <!-- Methods common to all editor dialogs -->
-  <script language="JavaScript" src="chrome://editor/content/EdDialogCommon.js"/>
-  <script language="JavaScript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
-  <script language="JavaScript" src="chrome://global/content/dialogOverlay.js" />
+  <script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
+  <script type="application/x-javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
   <spring id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
diff --git a/mozilla/embedding/browser/chrome/content/mini-nav.xul b/mozilla/embedding/browser/chrome/content/mini-nav.xul
index aa9522ed7ce..005156e1842 100644
--- a/mozilla/embedding/browser/chrome/content/mini-nav.xul
+++ b/mozilla/embedding/browser/chrome/content/mini-nav.xul
@@ -39,7 +39,7 @@ Contributor(s): ______________________________________. -->
   onload="MiniNavStartup()"
   onunload="MiniNavShutdown()">
 
-  <script language="javascript" src="chrome://embed/content/mini-nav.js"/>
+  <script type="application/x-javascript" src="chrome://embed/content/mini-nav.js"/>
 
   <!-- Context menu -->
   <popupset>
diff --git a/mozilla/extensions/cookie/resources/content/cookieContextOverlay.xul b/mozilla/extensions/cookie/resources/content/cookieContextOverlay.xul
index abadd75b623..8e82d2db5df 100644
--- a/mozilla/extensions/cookie/resources/content/cookieContextOverlay.xul
+++ b/mozilla/extensions/cookie/resources/content/cookieContextOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="cookieContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     // Code from nsContextMenu.js. Note that we extend the prototype here, rather 
diff --git a/mozilla/extensions/cookie/resources/content/cookieTasksOverlay.xul b/mozilla/extensions/cookie/resources/content/cookieTasksOverlay.xul
index 33772b4b479..48d0b639185 100644
--- a/mozilla/extensions/cookie/resources/content/cookieTasksOverlay.xul
+++ b/mozilla/extensions/cookie/resources/content/cookieTasksOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="cookieTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     // Remove the image entries from the task menu
diff --git a/mozilla/extensions/cookie/resources/content/pref-cookies.xul b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
index a134783aa17..9b73c1eedaa 100644
--- a/mozilla/extensions/cookie/resources/content/pref-cookies.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-cookies.xul
@@ -35,7 +35,7 @@
         align="vertical"
         onload="parent.initPanel('chrome://cookie/content/pref-cookies.xul');">
           
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
   <script>
   <![CDATA[
diff --git a/mozilla/extensions/cookie/resources/content/pref-images.xul b/mozilla/extensions/cookie/resources/content/pref-images.xul
index d1819c97307..bafc973d3bb 100644
--- a/mozilla/extensions/cookie/resources/content/pref-images.xul
+++ b/mozilla/extensions/cookie/resources/content/pref-images.xul
@@ -35,9 +35,9 @@
         align="vertical"
         onload="imageBlockingEnabled(); parent.initPanel('chrome://cookie/content/pref-images.xul');">
           
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
   
   var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
diff --git a/mozilla/extensions/cview/resources/content/cview.xul b/mozilla/extensions/cview/resources/content/cview.xul
index 282357d7ed9..19cf0f2b8ab 100644
--- a/mozilla/extensions/cview/resources/content/cview.xul
+++ b/mozilla/extensions/cview/resources/content/cview.xul
@@ -60,13 +60,13 @@
     cview-static.js    Non event-handler functions core to cview.
     cview-handlers.js  Event-handlers core to cview.
 -->
-  <html:script>
+  <script>
     var DEBUG = true;
-  </html:script>
-  <html:script src="chrome://cview/content/cview-utils.js"/>
-  <html:script src="chrome://cview/content/cview-rdf.js"/>
-  <html:script src="chrome://cview/content/cview-static.js"/>
-  <html:script src="chrome://cview/content/cview-handlers.js"/>
+  </script>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-utils.js"/>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-rdf.js"/>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-static.js"/>
+  <script type="application/x-javascript" src="chrome://cview/content/cview-handlers.js"/>
 
 <!--
   This popup is the context menu for elements in the interfaces list.
diff --git a/mozilla/extensions/cview/resources/content/cviewOverlay.xul b/mozilla/extensions/cview/resources/content/cviewOverlay.xul
index 894d70164bc..d72137a61ee 100644
--- a/mozilla/extensions/cview/resources/content/cviewOverlay.xul
+++ b/mozilla/extensions/cview/resources/content/cviewOverlay.xul
@@ -36,7 +36,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript"
+<script type="application/x-javascript"
   src="chrome://cview/content/cviewOverlay.js"/>
 
 <!--
diff --git a/mozilla/extensions/help/resources/content/help.xul b/mozilla/extensions/help/resources/content/help.xul
index cc8ca51e52a..7565df16bea 100644
--- a/mozilla/extensions/help/resources/content/help.xul
+++ b/mozilla/extensions/help/resources/content/help.xul
@@ -16,7 +16,7 @@
         persist="width height screenX screenY"
         onload="init();" >
 
-  <script type="text/javascript" src="chrome://help/content/help.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <box orient="vertical" flex="1">
 
diff --git a/mozilla/extensions/inspector/resources/content/inspector.xul b/mozilla/extensions/inspector/resources/content/inspector.xul
index 839d24cb9a2..eb25c7cc804 100644
--- a/mozilla/extensions/inspector/resources/content/inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/inspector.xul
@@ -18,7 +18,7 @@
         width="1024" height="768" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="Javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
 
   <popupset id="psTooltipSet">
     <popup id="ppTooltip" class="tooltip" oncreate="return inspector.fillInTooltip(document.tooltipNode);"> 
@@ -40,4 +40,4 @@
   <box id="bxStatus"/>
 </window>
 
-        
\ No newline at end of file
+        
diff --git a/mozilla/extensions/inspector/resources/content/inspectorOverlay.xul b/mozilla/extensions/inspector/resources/content/inspectorOverlay.xul
index cceeb56d52e..495c922c659 100644
--- a/mozilla/extensions/inspector/resources/content/inspectorOverlay.xul
+++ b/mozilla/extensions/inspector/resources/content/inspectorOverlay.xul
@@ -9,25 +9,25 @@
          xmlns:ins="&INS-rdf;"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://inspector/content/InspectorApp.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerPane.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/Flasher.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/ClipboardUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/file.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchService.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchModule.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inFormManager.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/search/inSearchTreeBuilder.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/InspectorApp.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerPane.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/Flasher.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/ClipboardUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/file.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchService.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchModule.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inFormManager.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/inSearchTreeBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
 
   <box id="bxInspectorMain" orient="vertical">
 
@@ -73,8 +73,5 @@
       <!-- TEMPORARY UNTIL FIX FOR 54237 -->
       <browser id="inSearchServiceLoader" height="1"/>
     </box>
-
   </box>
-  
 </overlay>
-
diff --git a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
index e4d66f30167..655cc1c6d70 100644
--- a/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
+++ b/mozilla/extensions/inspector/resources/content/prefs/pref-inspector.xul
@@ -8,9 +8,9 @@
 <window id="winPref" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/extensions/wsm-colorpicker.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/extensions/wsm-colorpicker.js"/>
 
-  <script language="Javascript"><![CDATA[
+  <script type="application/x-javascript"><![CDATA[
     var _elementIDs = [
       "cprElBorderColor",
       "txfElBorderWidth",
@@ -26,7 +26,7 @@
 
     AddColorPicker(initFunction);
 
-  ]]></script>
+  ]]/>
 
   <box class="box-smallheader" title="&Inspector.label;"/>
 
@@ -80,7 +80,4 @@
       </box>
     </titledbox>
   </box>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/prefs/pref-sidebar.xul b/mozilla/extensions/inspector/resources/content/prefs/pref-sidebar.xul
index f88955f0acb..cea9c3b9d1a 100644
--- a/mozilla/extensions/inspector/resources/content/prefs/pref-sidebar.xul
+++ b/mozilla/extensions/inspector/resources/content/prefs/pref-sidebar.xul
@@ -8,9 +8,9 @@
 <window id="winPrefSidebar" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="Javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="Javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/prefs/pref-sidebar.js"/>
 
   <box class="box-smallheader" title="&Sidebar.label;"/>
 
@@ -23,7 +23,4 @@
       <button value="Install" onclick="gSidebarPrefs.installSidebar()"/>
     </box>
   </box>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/prefs/prefs.xul b/mozilla/extensions/inspector/resources/content/prefs/prefs.xul
index ba46fbbf9d3..9e5413165fb 100644
--- a/mozilla/extensions/inspector/resources/content/prefs/prefs.xul
+++ b/mozilla/extensions/inspector/resources/content/prefs/prefs.xul
@@ -11,7 +11,7 @@
         width="550" height="400" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/prefs/InspectorPrefs.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/prefs/InspectorPrefs.js"/>
 
   <tabcontrol flex="1">
     <tabbox id="tbxPrefs"/>
@@ -19,7 +19,4 @@
   </tabcontrol>
 
   <box id="okCancelButtonsRight"/>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul b/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
index e2d0128816f..afbf2d8954a 100644
--- a/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
+++ b/mozilla/extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
@@ -13,9 +13,9 @@
         orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/search/modules/findFiles/dialog.js"/>
-  <script language="Javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/modules/findFiles/dialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
   
   <box orient="vertical">
     <box autostretch="never">
@@ -33,6 +33,4 @@
   </box>
 
   <box id="okCancelButtonsRight"/>
-
 </window>
-
diff --git a/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul b/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
index b708ec7f7f3..3db8de9e3b3 100644
--- a/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
+++ b/mozilla/extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
@@ -13,9 +13,9 @@
         orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="Javascript" src="chrome://inspector/content/search/modules/junkImgs/dialog.js"/>
-  <script language="Javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/search/modules/junkImgs/dialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/FilePickerUtils.js"/>
 
   <box orient="vertical">
     <html style="width: 400px">&junkImgsDescription;</html>
@@ -36,7 +36,4 @@
   </box>
 
   <box id="okCancelButtonsRight"/>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/sidebar/sidebar.xul b/mozilla/extensions/inspector/resources/content/sidebar/sidebar.xul
index ed2cfcf549f..f5ded2dcd4f 100644
--- a/mozilla/extensions/inspector/resources/content/sidebar/sidebar.xul
+++ b/mozilla/extensions/inspector/resources/content/sidebar/sidebar.xul
@@ -17,15 +17,15 @@
         title="Document Inspector" orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="Javascript" src="chrome://inspector/content/sidebar/InspectorSidebar.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
-  <script language="javascript" src="chrome://inspector/content/ViewerPane.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
-  <script language="javascript" src="chrome://inspector/content/Flasher.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/sidebar/InspectorSidebar.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerRegistry.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/ViewerPane.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFArray.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/FrameExchange.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/Flasher.js"/>
 
 
   <popupset id="psTooltipSet">
@@ -63,5 +63,3 @@
     </tabpanel>
   </tabcontrol>
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/tasksOverlay.xul b/mozilla/extensions/inspector/resources/content/tasksOverlay.xul
index 339834ddd9d..c0d89a259f3 100644
--- a/mozilla/extensions/inspector/resources/content/tasksOverlay.xul
+++ b/mozilla/extensions/inspector/resources/content/tasksOverlay.xul
@@ -5,7 +5,7 @@
 <overlay id="eInspectorTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript">
+  <script type="application/x-javascript">
     
     function launchInspector()
     {
diff --git a/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul b/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
index a90a6be33db..0bc7ee13f76 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/computedStyle/computedStyle.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/computedStyle/computedStyle.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul b/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul
index 369afad6e40..08e64d0d1e2 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/dom/columnsDialog.xul
@@ -9,16 +9,14 @@
         persist="screenX screenY"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/dom/columnsDialog.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/columnsDialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
 
   <box id="bxColumns" flex="1" orient="vertical"
     ondragdrop="dialog.onDragDropIn(event);"
     ondraggesture="dialog.onDragGesture(event);"/>
-    
 </window>
-
diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/dom.xul b/mozilla/extensions/inspector/resources/content/viewers/dom/dom.xul
index c368c403e72..36c29a8a043 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/dom/dom.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/dom/dom.xul
@@ -14,13 +14,13 @@
         xmlns:ins="http://www.mozilla.org/inspector#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/dom/dom.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/dom.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/system/PrefUtils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inTreeTableBuilder.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/DNDUtils.js"/>
 
   <!--============================= COMMANDS ============================== -->
 
@@ -53,7 +53,4 @@
     containment="&INS-rdf;HasChildren" flags="dont-test-empty">
     <template/>
   </tree>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul b/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul
index 956136fa474..07e3bacd899 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/dom/findDialog.xul
@@ -11,9 +11,9 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/dom/FindDialog.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/dom/FindDialog.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
 
   <broadcasterset id="brsBroadcasters">
     <broadcaster id="cmdFind" oncommand="dialog.doFind()" onkeypress="if (event.keyCode == 13) dialog.doFind()"/>
@@ -65,5 +65,3 @@
     <button value="Close" observes="cmdClose"/>
   </box>
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
index 8687aef2309..7094b444780 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/jsObject/jsObject.xul
@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/jsObject/jsObject.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/jsObject/jsObject.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul b/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul
index 5121586c27f..8d60f3f7d18 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul
@@ -15,11 +15,11 @@
   
   <!--============================= SCRIPTS ============================= -->
 
-  <script language="javascript" src="chrome://inspector/content/viewers/nodeElement/nodeElement.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/nodeElement/nodeElement.js"/>
 
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
 
   <!--============================= POPUPS ============================== -->
 
@@ -106,5 +106,3 @@
   </tree>
 
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul b/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul
index 123f9ed4536..5a8bba18dca 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/nodeText/nodeText.xul
@@ -12,9 +12,7 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/nodeText/nodeText.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/nodeText/nodeText.js"/>
 
   <textfield id="txNodeValue" readonly="true" multiline="true" flex="1"/>
-
 </window>
-
diff --git a/mozilla/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul b/mozilla/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
index 4baa379c3a0..2ca30d1bfbf 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
@@ -15,11 +15,11 @@
   
   <!--============================= SCRIPTS ============================= -->
 
-  <script language="javascript" src="chrome://inspector/content/viewers/styleRules/styleRules.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/styleRules/styleRules.js"/>
 
-  <script language="javascript" src="chrome://inspector/content/utils.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/utils.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/rdf/RDFU.js"/>
 
   <!--============================= POPUPS ============================== -->
 
@@ -156,5 +156,3 @@
   </tree>    
 
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul b/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
index 723c79bd558..d43cc75e37a 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/stylesheets/stylesheets.xul
@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/stylesheets/stylesheets.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/stylesheets/stylesheets.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul b/mozilla/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul
index 2d3ee87dced..0388f28af0c 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/xblBindings/xblBindings.xul
@@ -12,11 +12,8 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="javascript" src="chrome://inspector/content/viewers/xblBindings/xblBindings.js"/>
-  <script language="javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/viewers/xblBindings/xblBindings.js"/>
+  <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xpcom/XPCU.js"/>
 
   <text value="Not Yet Implemented"/>
-
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul b/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul
index 69d71c122b0..f40de6c9116 100644
--- a/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul
+++ b/mozilla/extensions/irc/xul/content/chatzillaOverlay.xul
@@ -8,7 +8,7 @@
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript" src="chrome://chatzilla/content/chatzillaOverlay.js"/>
+<script type="application/x-javascript" src="chrome://chatzilla/content/chatzillaOverlay.js"/>
 
 <keyset id="keyset">
   <key id="key_irc"  key="&ircCmd.commandkey;" observes="Tasks:IRC" modifiers="accel"/>
diff --git a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul
index 3b4c364803b..d671e6428c6 100755
--- a/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul
+++ b/mozilla/extensions/transformiix/source/examples/mozilla/Transformiix/content/transformiix.xul
@@ -36,8 +36,8 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         align="vertical" onload="onLoadTransformiix();">
 
-<script language="javascript" src="chrome://Transformiix/content/transformiix.js"/>
-<script language="javascript" src="resource:/res/samples/DumpDOM.js"/>
+<script type="application/x-javascript" src="chrome://Transformiix/content/transformiix.js"/>
+<script type="application/x-javascript" src="resource:/res/samples/DumpDOM.js"/>
 
 <box id="tool-box" flex="1" align="horizontal">
 </box>
diff --git a/mozilla/extensions/vixen/resources/content/vfdCommands.xul b/mozilla/extensions/vixen/resources/content/vfdCommands.xul
index 5d735ca60f8..01fbef97f4b 100644
--- a/mozilla/extensions/vixen/resources/content/vfdCommands.xul
+++ b/mozilla/extensions/vixen/resources/content/vfdCommands.xul
@@ -26,8 +26,8 @@
 <overlay id="vfdCommandsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script language="JavaScript" src="chrome://vixen/content/vfdCommands.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://vixen/content/vfdCommands.js"/>
   
   <commandset id="vfdCommands"
               commandupdate="true"
@@ -90,4 +90,4 @@
   </commandset>
             
           
-</overlay>          
\ No newline at end of file
+</overlay>          
diff --git a/mozilla/extensions/vixen/resources/content/vixen.xul b/mozilla/extensions/vixen/resources/content/vixen.xul
index 9090b1ba8a7..273e3b5f63c 100644
--- a/mozilla/extensions/vixen/resources/content/vixen.xul
+++ b/mozilla/extensions/vixen/resources/content/vixen.xul
@@ -39,12 +39,12 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="vxShell.startup();" onunload="vxShell.shutdown();">
   
-  <script language="JavaScript" src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script language="JavaScript" src="chrome://global/content/globalOverlay.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 
-  <script language="JavaScript" src="chrome://vixen/content/vxKeysetOverlay.js"></script>
-  <script language="JavaScript" src="chrome://vixen/content/vixen.js"></script>
-  <script language="JavaScript" src="chrome://vixen/content/vxUtils.js"></script>
+  <script type="application/x-javascript" src="chrome://vixen/content/vxKeysetOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://vixen/content/vixen.js"/>
+  <script type="application/x-javascript" src="chrome://vixen/content/vxUtils.js"/>
 
   <keyset id="keyset"/>
   
@@ -79,7 +79,4 @@
       <button class="button-toolbar" value="Dump DOM" oncommand="XXX_dumpDOM();"/>
     </toolbar>
   </toolbox>
-          
 </window>
-
-        
\ No newline at end of file
diff --git a/mozilla/extensions/vixen/resources/content/xe_NavOverlay.xul b/mozilla/extensions/vixen/resources/content/xe_NavOverlay.xul
index 80bd34c768c..98b6950a8d2 100644
--- a/mozilla/extensions/vixen/resources/content/xe_NavOverlay.xul
+++ b/mozilla/extensions/vixen/resources/content/xe_NavOverlay.xul
@@ -27,7 +27,7 @@
 <overlay id="dsjlaskjd"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script language="JavaScript">
+<script type="application/x-javascript">
 <![CDATA[
 function loadXULEdit()
 {
diff --git a/mozilla/extensions/wallet/editor/WalletAddress.xul b/mozilla/extensions/wallet/editor/WalletAddress.xul
index 46070a05264..b6f485913b4 100644
--- a/mozilla/extensions/wallet/editor/WalletAddress.xul
+++ b/mozilla/extensions/wallet/editor/WalletAddress.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["street.line1", "street.line2", "street.line3",
                        "city", "state", "postalcode.prefix", "postalcode.suffix", "country",
@@ -44,7 +44,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/WalletBilling.xul b/mozilla/extensions/wallet/editor/WalletBilling.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/WalletBilling.xul
+++ b/mozilla/extensions/wallet/editor/WalletBilling.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/WalletConcatenated.xul b/mozilla/extensions/wallet/editor/WalletConcatenated.xul
index b0be245a483..9bca66c12ab 100644
--- a/mozilla/extensions/wallet/editor/WalletConcatenated.xul
+++ b/mozilla/extensions/wallet/editor/WalletConcatenated.xul
@@ -37,7 +37,7 @@
         style="overflow: auto;"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["name",
                        "home.postalcode",
@@ -59,7 +59,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/WalletCredit.xul b/mozilla/extensions/wallet/editor/WalletCredit.xul
index 8d2cbe2faff..b3529019e8b 100644
--- a/mozilla/extensions/wallet/editor/WalletCredit.xul
+++ b/mozilla/extensions/wallet/editor/WalletCredit.xul
@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["card.type", "card.number",
                        "card.expdate.month", "card.expdate.year", "card.name"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/WalletEditor.xul b/mozilla/extensions/wallet/editor/WalletEditor.xul
index 88188460b25..ebb17bd5dca 100644
--- a/mozilla/extensions/wallet/editor/WalletEditor.xul
+++ b/mozilla/extensions/wallet/editor/WalletEditor.xul
@@ -36,8 +36,8 @@
         orient="vertical"
         onload="Startup()">
 
-  <script src="chrome://communicator/content/wallet/WalletEditor.js"/>
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletEditor.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
   <keyset id="keyset"/>
            
     <box id="system" flex="100%" orient="vertical">
diff --git a/mozilla/extensions/wallet/editor/WalletEmploy.xul b/mozilla/extensions/wallet/editor/WalletEmploy.xul
index 56a272bac09..5f95a7e6f68 100644
--- a/mozilla/extensions/wallet/editor/WalletEmploy.xul
+++ b/mozilla/extensions/wallet/editor/WalletEmploy.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["business.companyname", "business.jobtitle", "business.department"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/WalletMisc.xul b/mozilla/extensions/wallet/editor/WalletMisc.xul
index d208f17051b..4606676e30f 100644
--- a/mozilla/extensions/wallet/editor/WalletMisc.xul
+++ b/mozilla/extensions/wallet/editor/WalletMisc.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["socsec.prefix", "socsec.middle", "socsec.suffix",
                        "license.number", "license.state", "mothersmaidenname",
@@ -45,7 +45,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/WalletName.xul b/mozilla/extensions/wallet/editor/WalletName.xul
index cfb9bbfcc4e..6d729308e99 100644
--- a/mozilla/extensions/wallet/editor/WalletName.xul
+++ b/mozilla/extensions/wallet/editor/WalletName.xul
@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs =
       ["name.prefix", "name.first", "name.middle", "name.last", "name.suffix"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/WalletOther.xul b/mozilla/extensions/wallet/editor/WalletOther.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/WalletOther.xul
+++ b/mozilla/extensions/wallet/editor/WalletOther.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/WalletPhone.xul b/mozilla/extensions/wallet/editor/WalletPhone.xul
index 20b4091b707..437a17b0928 100644
--- a/mozilla/extensions/wallet/editor/WalletPhone.xul
+++ b/mozilla/extensions/wallet/editor/WalletPhone.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["phone.loccode", "phone.number.prefix", "phone.number.suffix", "phone.extension",
                        "altphone.loccode", "altphone.number.prefix", "altphone.number.suffix", "altphone.extension",
@@ -46,7 +46,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/WalletPrimary.xul b/mozilla/extensions/wallet/editor/WalletPrimary.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/WalletPrimary.xul
+++ b/mozilla/extensions/wallet/editor/WalletPrimary.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/WalletShipping.xul b/mozilla/extensions/wallet/editor/WalletShipping.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/WalletShipping.xul
+++ b/mozilla/extensions/wallet/editor/WalletShipping.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/WalletUrlspecific.xul b/mozilla/extensions/wallet/editor/WalletUrlspecific.xul
index 7a0bf830d15..32f5ef590b8 100644
--- a/mozilla/extensions/wallet/editor/WalletUrlspecific.xul
+++ b/mozilla/extensions/wallet/editor/WalletUrlspecific.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="generate();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
 
@@ -81,7 +81,7 @@
 
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never" orient="vertical">
diff --git a/mozilla/extensions/wallet/editor/WalletViewer.xul b/mozilla/extensions/wallet/editor/WalletViewer.xul
index 5649ab4b65f..e703bb3bd05 100644
--- a/mozilla/extensions/wallet/editor/WalletViewer.xul
+++ b/mozilla/extensions/wallet/editor/WalletViewer.xul
@@ -43,8 +43,8 @@
   
   </script>        
         
-  <script language="javascript" src="chrome://communicator/content/wallet/WalletViewer.js"></script>
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <keyset id="keyset"/>
 
@@ -53,7 +53,7 @@
     <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
 
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
-    <script language="JavaScript">
+    <script type="application/x-javascript">
     <![CDATA[
       document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/content/wallet/WalletName.xul");
       document.getElementById("panelFrame").setAttribute("tag", "" );
diff --git a/mozilla/extensions/wallet/editor/privacy.xul b/mozilla/extensions/wallet/editor/privacy.xul
index 6aea4659d21..760ccaaa67b 100644
--- a/mozilla/extensions/wallet/editor/privacy.xul
+++ b/mozilla/extensions/wallet/editor/privacy.xul
@@ -36,7 +36,7 @@
         onload="TutorialURL()" 
         orient="vertical">
 <!-- 
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 -->
 
   <script>
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul b/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul
index 46070a05264..b6f485913b4 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletAddress.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["street.line1", "street.line2", "street.line3",
                        "city", "state", "postalcode.prefix", "postalcode.suffix", "country",
@@ -44,7 +44,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul b/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletBilling.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul b/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul
index b0be245a483..9bca66c12ab 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletConcatenated.xul
@@ -37,7 +37,7 @@
         style="overflow: auto;"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["name",
                        "home.postalcode",
@@ -59,7 +59,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul b/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul
index 8d2cbe2faff..b3529019e8b 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletCredit.xul
@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["card.type", "card.number",
                        "card.expdate.month", "card.expdate.year", "card.name"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul b/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul
index 56a272bac09..5f95a7e6f68 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletEmploy.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["business.companyname", "business.jobtitle", "business.department"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul b/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul
index d208f17051b..4606676e30f 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletMisc.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["socsec.prefix", "socsec.middle", "socsec.suffix",
                        "license.number", "license.state", "mothersmaidenname",
@@ -45,7 +45,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletName.xul b/mozilla/extensions/wallet/editor/resources/content/WalletName.xul
index cfb9bbfcc4e..6d729308e99 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletName.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletName.xul
@@ -36,14 +36,14 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs =
       ["name.prefix", "name.first", "name.middle", "name.last", "name.suffix"];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul b/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletOther.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul b/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul
index 20b4091b707..437a17b0928 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletPhone.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["phone.loccode", "phone.number.prefix", "phone.number.suffix", "phone.extension",
                        "altphone.loccode", "altphone.number.prefix", "altphone.number.suffix", "altphone.extension",
@@ -46,7 +46,7 @@
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul b/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletPrimary.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul b/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul
index 1450f1e122e..abeb00abfa3 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletShipping.xul
@@ -36,13 +36,13 @@
         orient="vertical"
         onload="parent.initPanel();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
   ]]>
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
 
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul b/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
index 7a0bf830d15..32f5ef590b8 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
@@ -36,7 +36,7 @@
         orient="vertical"
         onload="generate();">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [];
 
@@ -81,7 +81,7 @@
 
   </script>
 
-  <script language="JavaScript"
+  <script type="application/x-javascript"
           src="chrome://communicator/content/wallet/WalletViewer.js"/>
   
   <titledbox class="tabpanel" autostretch="never" orient="vertical">
diff --git a/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul b/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul
index 5649ab4b65f..e703bb3bd05 100644
--- a/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul
+++ b/mozilla/extensions/wallet/editor/resources/content/WalletViewer.xul
@@ -43,8 +43,8 @@
   
   </script>        
         
-  <script language="javascript" src="chrome://communicator/content/wallet/WalletViewer.js"></script>
-  <script language="javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletViewer.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
   <keyset id="keyset"/>
 
@@ -53,7 +53,7 @@
     <tree class="inset" id="panelTree" style="width: 0px" flex="3"/>      
 
     <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
-    <script language="JavaScript">
+    <script type="application/x-javascript">
     <![CDATA[
       document.getElementById("panelFrame").setAttribute("src", "chrome://communicator/content/wallet/WalletName.xul");
       document.getElementById("panelFrame").setAttribute("tag", "" );
diff --git a/mozilla/extensions/wallet/resources/content/pref-passwords.xul b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
index e7cb3d1d437..deb6d5a965a 100644
--- a/mozilla/extensions/wallet/resources/content/pref-passwords.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-passwords.xul
@@ -34,13 +34,13 @@
         orient="vertical" title="&window.title;"
         onload="parent.initPanel('chrome://wallet/content/pref-passwords.xul');">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["signonRememberSignons", "encryptEnabled"];
   ]]>
   </script>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     function viewSignons()
     {
diff --git a/mozilla/extensions/wallet/resources/content/pref-wallet.xul b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
index d6ad369258a..bd0692e4e03 100644
--- a/mozilla/extensions/wallet/resources/content/pref-wallet.xul
+++ b/mozilla/extensions/wallet/resources/content/pref-wallet.xul
@@ -34,15 +34,15 @@
         orient="vertical" title="&window.title;"
         onload="parent.initPanel('chrome://wallet/content/pref-wallet.xul');">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["walletCaptureForms"];
   ]]>
   </script>
           
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function viewWalletSites()
diff --git a/mozilla/extensions/wallet/resources/content/walletContextOverlay.xul b/mozilla/extensions/wallet/resources/content/walletContextOverlay.xul
index 4dea4a604cf..3a8a5bdbca9 100644
--- a/mozilla/extensions/wallet/resources/content/walletContextOverlay.xul
+++ b/mozilla/extensions/wallet/resources/content/walletContextOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="walletContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function initContextItems() {
diff --git a/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul b/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
index ea3cc6f0544..c49f9a0febd 100644
--- a/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
+++ b/mozilla/extensions/wallet/resources/content/walletNavigatorOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="walletNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function initEditItems() {
diff --git a/mozilla/extensions/wallet/resources/content/walletTasksOverlay.xul b/mozilla/extensions/wallet/resources/content/walletTasksOverlay.xul
index f404ec80db3..84b0ceb30be 100644
--- a/mozilla/extensions/wallet/resources/content/walletTasksOverlay.xul
+++ b/mozilla/extensions/wallet/resources/content/walletTasksOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="walletTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://wallet/content/walletOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://wallet/content/walletOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     function HideWallet() {
@@ -226,6 +226,4 @@
       </menupopup>
     </menu>
   </menupopup>
-
 </overlay>
-
diff --git a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
index a2cd34ddc0d..a10cc1f9f60 100644
--- a/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/mozilla/extensions/wallet/walletpreview/WalletPreview.xul
@@ -33,8 +33,8 @@
         class="dialog"
         onload="Startup()">
 
-  <html:script src="chrome://global/content/strres.js" />
-  <html:script src="chrome://communicator/content/wallet/WalletPreview.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletPreview.js"/>
 
   <keyset id="keyset"/>
            
diff --git a/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul b/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul
index 0674ae28c8e..13308e7d1eb 100644
--- a/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul
+++ b/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul
@@ -31,7 +31,7 @@
         onload="StartupXMLTerm();"
         title="xmlterm2" align="vertical" width="740" height="484">
   
-  <html:script src="chrome://xmlterm/content/XMLTermChrome.js"></html:script>
+  <script type="application/x-javascript" src="chrome://xmlterm/content/XMLTermChrome.js"/>
 
   <html:iframe id="content-frame2" type="content" html:name="content2"
                html:src="about:blank" flex="100%"/>
diff --git a/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul b/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul
index 403bb0b0742..8866059fb79 100644
--- a/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul
+++ b/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul
@@ -8,7 +8,7 @@
      xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript" src="chrome://xmlterm/content/xmltermOverlay.js"/>
+<script type="application/x-javascript" src="chrome://xmlterm/content/xmltermOverlay.js"/>
 
 <keyset id="keyset">
   <key id="key_xmlterm"  key="&xmltermCmd.commandkey;"
diff --git a/mozilla/netwerk/resources/content/PSMTaskMenu.xul b/mozilla/netwerk/resources/content/PSMTaskMenu.xul
index 2c76128e392..fed327d0759 100644
--- a/mozilla/netwerk/resources/content/PSMTaskMenu.xul
+++ b/mozilla/netwerk/resources/content/PSMTaskMenu.xul
@@ -6,7 +6,7 @@
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
     function displaySecurityAdvisor()
     {
       var psm = Components.classes["@mozilla.org/psm;1"].getService();
diff --git a/mozilla/netwerk/resources/content/securityOverlay.xul b/mozilla/netwerk/resources/content/securityOverlay.xul
index d8820fd46ef..6edcc78fc72 100644
--- a/mozilla/netwerk/resources/content/securityOverlay.xul
+++ b/mozilla/netwerk/resources/content/securityOverlay.xul
@@ -7,7 +7,7 @@
          xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript" src="chrome://communicator/content/securityUI.js" />
+  <script type="application/x-javascript" src="chrome://communicator/content/securityUI.js" />
 
   <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aTooltip" tooltiptext="&lockIcon.label;"/>    
       
diff --git a/mozilla/profile/Acctidl/am.xul b/mozilla/profile/Acctidl/am.xul
index 52adac0dbc8..07aa5ac257f 100644
--- a/mozilla/profile/Acctidl/am.xul
+++ b/mozilla/profile/Acctidl/am.xul
@@ -10,7 +10,7 @@
 
 <html:div flex="100%">
 
-<html:script>
+<script>
 var Account = Components.classes["@mozilla.org/profile/Account-services;1"].createInstance();
 Account = Account.QueryInterface(Components.interfaces.nsIAccountServices);
 dump("Account = " + Account + "\n");
@@ -171,7 +171,7 @@ function addOptions2(oname, iname)
 	dump( "newsel="+newsel+"\n" );
 }
 
-</html:script>
+</script>
 
     
 <html:br/>
diff --git a/mozilla/profile/Acctidl/am2.xul b/mozilla/profile/Acctidl/am2.xul
index fc248433b62..33b145277de 100644
--- a/mozilla/profile/Acctidl/am2.xul
+++ b/mozilla/profile/Acctidl/am2.xul
@@ -10,7 +10,7 @@
 
 <html:div flex="100%">
 
-<html:script>
+<script>
 var Account = Components.classes["@mozilla.org/profile/Account-services;1"].createInstance();
 Account = Account.QueryInterface(Components.interfaces.nsIAccountServices);
 dump("Account = " + Account + "\n");
@@ -128,7 +128,7 @@ function addOptions2(oname, iname)
 }
 
 
-</html:script>
+</script>
 
 <html:br/>
     <html:select id="y">
diff --git a/mozilla/profile/Acctidl/am2a.xul b/mozilla/profile/Acctidl/am2a.xul
index 72f4dfa3c49..65c2bd95c62 100644
--- a/mozilla/profile/Acctidl/am2a.xul
+++ b/mozilla/profile/Acctidl/am2a.xul
@@ -10,7 +10,7 @@
 
 <html:div flex="100%">
 
-<html:script>
+<script>
 var Account = Components.classes["@mozilla.org/profile/Account-services;1"].createInstance();
 Account = Account.QueryInterface(Components.interfaces.nsIAccountServices);
 dump("Account = " + Account + "\n");
@@ -154,7 +154,7 @@ function SelectCity()
 	var filel = document.getElementById("filename");
 	filel.value = opt.label;
 }
-</html:script>
+</script>
 
     <html:select id="x">
         <html:option> </html:option>
diff --git a/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul b/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul
index 57ccd50ec02..20ef8a8adc3 100644
--- a/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul
+++ b/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul
@@ -10,7 +10,7 @@
 	title="&window.title;"
 	class="dialog"> 
 
-  <script language="javascript" src="chrome://communicator/content/profile/profileMigrationProgress.js"/> 
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/profileMigrationProgress.js"/> 
 
   <keyset id="keyset"/>
 
@@ -29,4 +29,3 @@
    </box>
 
 </window>
-
diff --git a/mozilla/profile/resources/content/confirmMigration.xul b/mozilla/profile/resources/content/confirmMigration.xul
index b5edd4b1c76..275ae7f814f 100644
--- a/mozilla/profile/resources/content/confirmMigration.xul
+++ b/mozilla/profile/resources/content/confirmMigration.xul
@@ -21,7 +21,7 @@
   <stringbundle id="bundle_migration"
                 src="chrome://communicator/locale/profile/migration.properties"/>
 
-  <script type="text/javascript" src="chrome://communicator/content/profile/confirmMigration.js"/> 
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/confirmMigration.js"/> 
     
   <keyset id="keyset"/>
   
diff --git a/mozilla/profile/resources/content/createProfileWizard.xul b/mozilla/profile/resources/content/createProfileWizard.xul
index f64df5db3de..cd703dba8bd 100644
--- a/mozilla/profile/resources/content/createProfileWizard.xul
+++ b/mozilla/profile/resources/content/createProfileWizard.xul
@@ -26,12 +26,12 @@
                 src="chrome://communicator/locale/profile/profileManager.properties"/>
 
   <!-- XXX: strres.js is needed so that wizardManager.js will work -->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/profile/createProfileWizard.js"/>
-  <script type="text/javascript" src="chrome://global/content/wizardOverlay.js"/>
-  <script type="text/javascript" src="chrome://global/content/wizardHandlerSet.js"/>
-  <script type="text/javascript" src="chrome://global/content/wizardManager.js"/>
-  <script type="text/javascript" src="chrome://global/content/widgetStateManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/createProfileWizard.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/wizardOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/wizardHandlerSet.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/wizardManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/widgetStateManager.js"/>
 
   <box class="box-header" id="header" title="&window.title.label;" description="&profileWizard.title;"/>
   <box class="wizard-box" flex="1">
diff --git a/mozilla/profile/resources/content/newProfile1_2.xul b/mozilla/profile/resources/content/newProfile1_2.xul
index 162d25e5930..1b9999e1c64 100644
--- a/mozilla/profile/resources/content/newProfile1_2.xul
+++ b/mozilla/profile/resources/content/newProfile1_2.xul
@@ -35,7 +35,7 @@
   <stringbundle id="bundle_newProfile1_2"
                 src="chrome://communicator/locale/profile/newProfile1_2.properties"/>
 
-  <script language="JavaScript" src="chrome://communicator/content/profile/newProfile1_2.js"></script>
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/newProfile1_2.js"/>
 
   <html>&pnl2.intro.text;</html> 
   <html>&pnl2.pname.label;</html> 
@@ -68,4 +68,3 @@
 
   <data id="ProfileLocale" />
 </window>
-
diff --git a/mozilla/profile/resources/content/profileSelection.xul b/mozilla/profile/resources/content/profileSelection.xul
index d507969328f..d64398ad4ff 100644
--- a/mozilla/profile/resources/content/profileSelection.xul
+++ b/mozilla/profile/resources/content/profileSelection.xul
@@ -54,9 +54,9 @@
   <stringbundle id="bundle_brand"
                 src="chrome://global/locale/brand.properties"/>
   
-  <script language="javascript" src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script language="javascript" src="chrome://communicator/content/profile/profileSelection.js"></script>
-  <script language="javascript" src="chrome://communicator/content/profile/profileManager.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/profileManager.js"/>
   
   <keyset id="keyset">
     <key id="fooKey" key="s"   event="keydown" oncommand="foo()" modifiers="accel, shift"/>
diff --git a/mozilla/profile/resources/content/selectLang.xul b/mozilla/profile/resources/content/selectLang.xul
index d60d55766ec..b1b33118126 100644
--- a/mozilla/profile/resources/content/selectLang.xul
+++ b/mozilla/profile/resources/content/selectLang.xul
@@ -11,7 +11,7 @@
         onload="Startup();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="JavaScript" src="chrome://communicator/content/profile/selectLang.js"></script>
+  <script type="application/x-javascript" src="chrome://communicator/content/profile/selectLang.js"/>
 
     <keyset id="keyset"/>
         
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index 496312fc1cf..9b23b1920b4 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -52,7 +52,7 @@
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <!-- XXX - This should SO become an XBL widget -->
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
   
   <!-- Shared Bookmarks Utility Library -->
   <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul
index eda56150c11..2bfe0a31b35 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksPanel.xul
@@ -39,22 +39,22 @@
         onload="Startup();">
 
   <!-- Generic Utilities -->
-  <script type="text/javascript" src="chrome://global/content/nsTreeUtils.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsTreeUtils.js"/>
   <!-- XXX - would like to cut this dependency out -->
-  <script type="text/javascript" src="chrome://global/content/strres.js"></script>
-  <script type="text/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://global/content/nsJSComponentManager.js"/>
 
   <!-- Bookmarks Shell -->
-  <script type="text/javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"></script>
-  <script type="text/javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"></script>
-  <script type="text/javascript" src="chrome://communicator/content/bookmarks/bookmarksPanel.js"></script>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksTree.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksPanel.js"/>
 
   <!-- Drag and Drop -->
-  <script src="chrome://global/content/nsJSComponentManager.js"></script>
-  <script src="chrome://global/content/nsJSSupportsUtils.js"></script>
-  <script src="chrome://global/content/nsDragAndDrop.js"></script>
-  <script src="chrome://global/content/nsTransferable.js"></script>
-  <script type="text/javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"></script>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
 
 
   <!-- context menu, tooltips, etc -->
diff --git a/mozilla/xpfe/components/permissions/content/cookieTasksOverlay.xul b/mozilla/xpfe/components/permissions/content/cookieTasksOverlay.xul
index 33772b4b479..48d0b639185 100644
--- a/mozilla/xpfe/components/permissions/content/cookieTasksOverlay.xul
+++ b/mozilla/xpfe/components/permissions/content/cookieTasksOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="cookieTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     // Remove the image entries from the task menu
diff --git a/mozilla/xpfe/components/permissions/content/imageContextOverlay.xul b/mozilla/xpfe/components/permissions/content/imageContextOverlay.xul
index abadd75b623..8e82d2db5df 100644
--- a/mozilla/xpfe/components/permissions/content/imageContextOverlay.xul
+++ b/mozilla/xpfe/components/permissions/content/imageContextOverlay.xul
@@ -27,9 +27,9 @@
 <overlay id="cookieContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script language="javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
 
-  <script language="JavaScript">
+  <script type="application/x-javascript">
   <![CDATA[
 
     // Code from nsContextMenu.js. Note that we extend the prototype here, rather 
diff --git a/mozilla/xpinstall/res/content/progress.xul b/mozilla/xpinstall/res/content/progress.xul
index cd836caa8ac..878a1222912 100644
--- a/mozilla/xpinstall/res/content/progress.xul
+++ b/mozilla/xpinstall/res/content/progress.xul
@@ -11,7 +11,7 @@
     width="425"
     height="225">
 
-    <html:script language="javascript" src="progress.js"/>
+    <script type="application/x-javascript" src="progress.js"/>
 
     <data>
         <broadcaster id="data.canceled" type="string" value="false"/>
diff --git a/mozilla/xpinstall/res/content/updateNotification.xul b/mozilla/xpinstall/res/content/updateNotification.xul
index f0901f78995..f3664b95b19 100644
--- a/mozilla/xpinstall/res/content/updateNotification.xul
+++ b/mozilla/xpinstall/res/content/updateNotification.xul
@@ -6,7 +6,7 @@
 xmlns:html="http://www.w3.org/1999/xhtml"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript">
+<script type="application/x-javascript">
 
 function ShowUpdateFromResource( node )
 {
@@ -15,7 +15,7 @@ function ShowUpdateFromResource( node )
     //window.open( url );
 }
 
-</html:script>
+</script>
 
 
 <menupopup id="taskPopup">