diff --git a/xpfe/global/resources/content/about.xul b/xpfe/global/resources/content/about.xul
index 34fff367a7d..70d9553b6cb 100644
--- a/xpfe/global/resources/content/about.xul
+++ b/xpfe/global/resources/content/about.xul
@@ -26,7 +26,6 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
 <!DOCTYPE window SYSTEM "chrome://global/locale/about.dtd"> 
 
 <window
-        xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         align="vertical"
         class="dialog"
@@ -41,14 +40,14 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
   </tabbox>
 
   <tabpanel align="vertical" flex="100%">
-    <html:iframe style="border: 1px inset gray;" src="about:"/>
-    <html:iframe style="border: 1px inset gray;" src="credits.html"/>
+    <iframe style="border: 1px inset gray;" src="about:"/>
+    <iframe style="border: 1px inset gray;" src="credits.html"/>
   </tabpanel>
 </tabcontrol>
 
 <box align="horizontal" style="margin-top: 1em;">
   <spring flex="100%"/>
-  <titledbutton id="ok" class="dialog push" value="&okButton.label;" default="true" align="right" onclick="doOKButton()"/>
+  <button id="ok" value="&okButton.label;" default="true" align="right" onclick="doOKButton()"/>
 </box>
 
 </box>
diff --git a/xpfe/global/resources/content/browserBindings.xul b/xpfe/global/resources/content/browserBindings.xul
index cd049086556..aafd1572c34 100644
--- a/xpfe/global/resources/content/browserBindings.xul
+++ b/xpfe/global/resources/content/browserBindings.xul
@@ -2,7 +2,6 @@
 <?xul-overlay href="chrome://global/content/platformGlobalOverlay.xul"?>
 
 <window id="browserBindings"
-   xmlns:html="http://www.w3.org/TR/REC-html40"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <keyset id="browserKeySet">
diff --git a/xpfe/global/resources/content/charsetDetectorsOverlay.xul b/xpfe/global/resources/content/charsetDetectorsOverlay.xul
index 589b2f8750d..6c72f830f09 100644
--- a/xpfe/global/resources/content/charsetDetectorsOverlay.xul
+++ b/xpfe/global/resources/content/charsetDetectorsOverlay.xul
@@ -23,11 +23,10 @@ Contributor(s): ______________________________________. -->
 <!DOCTYPE window SYSTEM "chrome://global/locale/charsetDetectorsOverlay.dtd" >
 
 <overlay id="charsetDetectorsOverlay"
-         xmlns:html="http://www.w3.org/TR/REC-html40"
 		 xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          >
-<html:script src="chrome://global/content/charsetDetectorsOverlay.js" />
+<script src="chrome://global/content/charsetDetectorsOverlay.js" />
 
  
       <menu value="&charsetDetectorsMenu.label;"
diff --git a/xpfe/global/resources/content/charsetOverlay.xul b/xpfe/global/resources/content/charsetOverlay.xul
index f515fee4a13..25a59c2fd23 100644
--- a/xpfe/global/resources/content/charsetOverlay.xul
+++ b/xpfe/global/resources/content/charsetOverlay.xul
@@ -4,11 +4,10 @@
 <!DOCTYPE  window SYSTEM "chrome://global/locale/charsetOverlay.dtd">
 
 <overlay id="charsetOverlay"
-    xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <html:script language="JavaScript" src="chrome://global/content/charsetOverlay.js"/>
+    <script language="JavaScript" src="chrome://global/content/charsetOverlay.js"/>
 
     <!-- Mail Edit Charset Menu -->
     <menu id="maileditCharsetMenu" value="&charsetMenu.label;" datasources="rdf:charset-menu" ref="NC:MaileditCharsetMenuRoot"  oncommand="SetDocumentCharacterSet(event);" oncreate="InitCharsetMenuCheckMark();">
diff --git a/xpfe/global/resources/content/commonDialog.js b/xpfe/global/resources/content/commonDialog.js
index 0fef938b302..e92fb87e983 100644
--- a/xpfe/global/resources/content/commonDialog.js
+++ b/xpfe/global/resources/content/commonDialog.js
@@ -8,14 +8,14 @@ function commonDialogOnLoad()
 		dump( " error getting param block interface\n" );
 	
 	var messageText = param.GetString( 0 );
-//	dump("message: "+ msg +"\n");
+	//dump("message: "+ msg +"\n");
 	//SetElementText("info.txt", msg ); 
 	{
 		 var messageFragment;
 
     	// Let the caller use "\n" to cause breaks
     	// Translate these into <br> tags
-		 var messageParent = (document.getElementById("info.txt"));
+		 var messageParent = (document.getElementById("info.box"));
 	   	 done = false;
 	   	 while (!done) {
 	      breakIndex =   messageText.indexOf('\n');
@@ -35,14 +35,9 @@ function commonDialogOnLoad()
 	        done = true;
 	        messageFragment = messageText;
 	      }
-	      messageNode = document.createTextNode(messageFragment);
-	      if (messageNode)
-	        messageParent.appendChild(messageNode);
-
-	      // This is needed when the default namespace of the document is XUL
-	      breakNode = document.createElementWithNameSpace("BR", "http://www.w3.org/TR/REC-html40");
-	      if (breakNode)
-	        messageParent.appendChild(breakNode);
+                var textnode = document.createElement("text");
+                textnode.setAttribute("value", messageFragment);
+                messageParent.appendChild(textnode);
 	    }
 	}
 	var msg = param.GetString( 3 );
@@ -55,7 +50,7 @@ function commonDialogOnLoad()
 	var iconURL = param.GetString(2 ); 
 	var element = document.getElementById("info.icon");
 	if( element )
-		element.src = iconURL;
+		element.setAttribute("src",iconURL);
 	else
 		dump("couldn't find icon element \n");
 	// Set button names
@@ -88,14 +83,14 @@ function commonDialogOnLoad()
 		case 4:
 			{
 				var button = document.getElementById("Button3");
-				button.setAttribute("style", "display:inline;");
+				button.removeAttribute("hidden");
 				var buttonText = param.GetString( 11 );
 				button.setAttribute( "value",buttonText);
 			}
 		case 3:
 			{
 				var button = document.getElementById("Button2");
-				button.setAttribute("style", "display:inline;");
+				button.removeAttribute("hidden");
 				var buttonText = param.GetString( 10 );
 				button.setAttribute( "value",buttonText);
 			}
@@ -105,7 +100,7 @@ function commonDialogOnLoad()
 			if ( element )
 			{
 	//			dump( "hide button \n" );
-				element.setAttribute("style", "display:none;"  );
+				element.setAttribute("hidden", "true"  );
 			}
 			else
 			{
@@ -122,11 +117,10 @@ function commonDialogOnLoad()
 //	dump("check box msg is "+ checkMsg +"\n");
 	if ( checkMsg != "" )
 	{	
-		var prompt = (document.getElementById("checkboxLabel"));
+		var prompt = (document.getElementById("checkbox"));
     	if ( prompt )
-    	{
- //   		dump(" setting message \n" );
-    		prompt.childNodes[1].nodeValue = checkMsg;
+   	{
+    		prompt.setAttribute("value",checkMsg);
     	}
 		var checkValue = param.GetInt( 1 );
 		var element=document.getElementById("checkbox" );
@@ -135,9 +129,8 @@ function commonDialogOnLoad()
 	}
 	else
 	{
-//		dump("not visibile \n");
-		var element = document.getElementById("checkboxLabel");
-		element.setAttribute("style","display: none;" );
+		var element = document.getElementById("checkbox");
+		element.setAttribute("hidden","true" );
 	}
 
 	// handle the edit fields
@@ -166,7 +159,7 @@ function commonDialogOnLoad()
 				}
 //		 	 	dump("hiding loginEditField");
 		 		var element = document.getElementById("loginEditField");
-				element.setAttribute("style","visibility: collapse;" );
+				element.setAttribute("hidden", "true");
 				var element = document.getElementById("dialog.password1");
 				element.focus();
 			 }
@@ -181,7 +174,7 @@ function commonDialogOnLoad()
 				}
 //		 	 	dump("hiding password1EditField");
 		 		var element = document.getElementById("password1EditField");
-				element.setAttribute("style","visibility: collapse;" );
+				element.setAttribute("hidden", "true");
 				var element = document.getElementById("dialog.loginname");
 				element.focus();
 			 }
@@ -199,12 +192,12 @@ function commonDialogOnLoad()
 //				}
 				// Now hide the meaningless text
 				var element = document.getElementById("password1.text");
-				element.setAttribute("style", "visibility: collapse;"  );
+				element.setAttribute("hidden", "true");
 //		 	 	dump("hiding loginEditField and password2EditField");
 		 		var element = document.getElementById("loginEditField");
-				element.setAttribute("style","visibility: collapse;" );
+				element.setAttribute("hidden", "true");
 		 		var element = document.getElementById("password2EditField");
-				element.setAttribute("style","visibility: collapse;" );
+				element.setAttribute("hidden", "true");
 				var element = document.getElementById("dialog.password1");
 //				dump("give keyboard focus to password edit field \n");
 				element.focus();
@@ -220,12 +213,12 @@ function commonDialogOnLoad()
 				}
 				// Now hide the meaningless text
 				var element = document.getElementById("login.text");
-				element.setAttribute("style", "visibility: collapse;"  );
+				element.setAttribute("hidden", "true");
 //		 		dump("hiding password1EditField and password2EditField");
 		 		var element = document.getElementById("password1EditField");
-				element.setAttribute("style","visibility: collapse;" );
+				element.setAttribute("hidden", "true");
 		 		var element = document.getElementById("password2EditField");
-				element.setAttribute("style","visibility: collapse;" );
+				element.setAttribute("hidden", "true");
 				var element = document.getElementById("dialog.loginname");
 //				dump("give keyboard focus to password edit field \n");
 				element.focus();
@@ -234,7 +227,7 @@ function commonDialogOnLoad()
 	 	case 0:
 //	 		dump("hiding all editfields \n");
 			var element = document.getElementById("editFields");
-			element.setAttribute("style","visibility: collapse;" );
+			element.setAttribute("hidden", "true");
 			break;
 	}
 	
@@ -256,10 +249,10 @@ function onCheckboxClick()
 
 function SetElementText( elementID, text )
 {
-//	dump("setting "+elementID+" to "+text +"\n");
+	dump("setting "+elementID+" to "+text +"\n");
 	var element = document.getElementById(elementID);
 	if( element )
-		element.childNodes[0].nodeValue = text;
+		element.setAttribute("value", text);
 	else
 		dump("couldn't find element \n");
 }
diff --git a/xpfe/global/resources/content/commonDialog.xul b/xpfe/global/resources/content/commonDialog.xul
index 7b6810ecf04..d9f1cdd60e4 100644
--- a/xpfe/global/resources/content/commonDialog.xul
+++ b/xpfe/global/resources/content/commonDialog.xul
@@ -5,52 +5,49 @@
 <!DOCTYPE window SYSTEM "chrome://global/locale/commonDialog.dtd">
 
  <window
-	xmlns:html="http://www.w3.org/TR/REC-html40"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
 	align="vertical"
 	onload="commonDialogOnLoad()"
 	class="dialog"> 
     
-    <html:script language="JavaScript" src="chrome://global/content/commonDialog.js" />
+    <script language="JavaScript" src="chrome://global/content/commonDialog.js" />
     
 	<keyset id="keyset"/>
 
     <box align="horizontal" flex="100%">
-		<html:div style="margin: 5px;">
-			<html:img id="info.icon" src="chrome://global/skin/message-icon.gif" width="32" height="32" border="0"/>
-		</html:div>
+	<image id="info.icon" src="chrome://global/skin/message-icon.gif" width="32" height="32" border="0" style="margin: 5px"/>
 
-		<box align="vertical" flex="100%">
-				<html:div id="info.header" style="margin-left:2em; margin-right:2em; margin-top:5px; font-size: 110%; font-weight: bold;">
-					&header.label;
-				</html:div>
-				<html:div id="info.txt" style="margin-left:2em; margin-right:2em; margin-top:5px; max-width: 45em;" flex="100%">
-					
-				</html:div>
+	<box align="vertical" flex="100%">
+		<text id="info.header" style="margin-left:2em; margin-right:2em; margin-top:5px; font-size: 110%; font-weight: bold;"
+			value="&header.label;"/>
+				<box orient="vertical" id="info.box" style="margin-left:2em; margin-right:2em; margin-top:5px; max-width: 45em;" flex="100%"/>
 		</box>
 	</box>
 
 	<box id="editFields" align="vertical" >
 		<box align="horizontal" id="loginEditField"  >
-			<html:div id="login.text">&editfield0.label;</html:div>
-			<html:input accesskey="u" tabindex="0" type="text" id="dialog.loginname" flex="100%"/>
+			<text id="login.text" value="&editfield0.label;"/>
+			<textfield accesskey="u" tabindex="0" type="text" id="dialog.loginname" flex="100%"/>
 		</box>
 
 		<box align="horizontal"  id ="password1EditField">
-			<html:div id="password1.text">&editfield1.label;</html:div>
-			<html:input accesskey="p" tabindex="1" type="password" id="dialog.password1" flex="100%"/>
+			<text id="password1.text" value="&editfield1.label;"/>
+			<textfield accesskey="p" tabindex="1" type="password" id="dialog.password1" flex="100%"/>
 		</box>
 
 		<box align="horizontal"  id ="password2EditField">
-			<html:div id="password2.text">&editfield2.label;</html:div>
-			<html:input accesskey="p" tabindex="1" type="password" id="dialog.password2" flex="100%"/>
+			<text id="password2.text" value="&editfield2.label;"/>
+			<textfield accesskey="p" tabindex="1" type="password" id="dialog.password2" flex="100%"/>
 		</box>
 	</box>
 
 
-	<html:label id="checkboxLabel"  onclick="onCheckboxClick()" >
-  		 <html:input type="checkbox" id="checkbox" />
-  		 &checkbox.label;
-    </html:label>		
+        <box id="checkboxContainer">
+  		 <checkbox id="checkbox" oncommand="onCheckboxClick()"/>
+<!--
+                 <text class="label" id="checkboxLabel" for="checkbox"
+                       value="&checkbox.label;"/>
+-->
+        </box>
 	<box id="okCancelButtons"/>
 </window>
diff --git a/xpfe/global/resources/content/dialogOverlay.xul b/xpfe/global/resources/content/dialogOverlay.xul
index ccfa1bfd1ff..1ce3e4c612b 100644
--- a/xpfe/global/resources/content/dialogOverlay.xul
+++ b/xpfe/global/resources/content/dialogOverlay.xul
@@ -7,10 +7,9 @@
 
 
 <overlay id="dialogOverlay"
-		 xmlns:html="http://www.w3.org/TR/REC-html40"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript" src="chrome://global/content/dialogOverlay.js"/>
+<script language="JavaScript" src="chrome://global/content/dialogOverlay.js"/>
 
 	
 </overlay>		
diff --git a/xpfe/global/resources/content/editorBindings.xul b/xpfe/global/resources/content/editorBindings.xul
index aa824813c48..3a135f13ac5 100644
--- a/xpfe/global/resources/content/editorBindings.xul
+++ b/xpfe/global/resources/content/editorBindings.xul
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <window id="editorBindings"
-   xmlns:html="http://www.w3.org/TR/REC-html40"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <keyset id="editorKeySet">
diff --git a/xpfe/global/resources/content/globalOverlay.xul b/xpfe/global/resources/content/globalOverlay.xul
index cc194cf1c7e..b6facd4e2b5 100644
--- a/xpfe/global/resources/content/globalOverlay.xul
+++ b/xpfe/global/resources/content/globalOverlay.xul
@@ -5,11 +5,10 @@
 
 
 <overlay id="globalOverlay"
-		 xmlns:html="http://www.w3.org/TR/REC-html40"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<!-- html:script language="JavaScript" src="chrome://global/content/strres.js"/ -->
-<html:script language="JavaScript" src="chrome://global/content/globalOverlay.js"/>
+<!-- script language="JavaScript" src="chrome://global/content/strres.js"/ -->
+<script language="JavaScript" src="chrome://global/content/globalOverlay.js"/>
 
 	<!-- File Menu -->
 	<menu id="menu_File" value="&fileMenu.label;" accesskey="&fileMenu.accesskey;"/>
diff --git a/xpfe/global/resources/content/hiddenWindow.xul b/xpfe/global/resources/content/hiddenWindow.xul
index 0c95bd8d5f7..b6db4eed51d 100644
--- a/xpfe/global/resources/content/hiddenWindow.xul
+++ b/xpfe/global/resources/content/hiddenWindow.xul
@@ -39,7 +39,6 @@ Contributor(s): ______________________________________. -->
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd"> 
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   title="hidden"
   titlemodifier="&mainWindow.titlemodifier;" 
@@ -47,8 +46,8 @@ Contributor(s): ______________________________________. -->
   onload="hiddenWindowStartup();">
 
   <!-- JS from navigator.xul, to handle the menu commands -->
-  <html:script language="JavaScript" src="chrome://global/content/strres.js"/>
-  <html:script language="javascript" src="chrome://navigator/content/navigator.js"/>
+  <script language="JavaScript" src="chrome://global/content/strres.js"/>
+  <script language="javascript" src="chrome://navigator/content/navigator.js"/>
 
   <!-- keys are appended from the overlay -->
   <keyset id="keyset"/>
diff --git a/xpfe/global/resources/content/inputBindings.xul b/xpfe/global/resources/content/inputBindings.xul
index 9fcce800ff4..e69de29bb2d 100644
--- a/xpfe/global/resources/content/inputBindings.xul
+++ b/xpfe/global/resources/content/inputBindings.xul
@@ -1,91 +0,0 @@
-<?xml version="1.0"?>
-<?xul-overlay href="chrome://global/content/platformGlobalOverlay.xul"?>
-
-<window id="inputBindings"
-   xmlns:html="http://www.w3.org/TR/REC-html40"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <keyset id="editorKeySet">
-    <key id="key_home" keycode="VK_HOME" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_beginLine');
-            controller.doCommand('cmd_beginLine');"/>
-    <key id="key_end" keycode="VK_END" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_endLine');
-            controller.doCommand('cmd_endLine');"/>
-    <key id="key_left" keycode="VK_LEFT" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_charPrevious');
-            controller.doCommand('cmd_charPrevious');"/>
-    <key id="key_right" keycode="VK_RIGHT" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_charNext');
-            controller.doCommand('cmd_charNext');"/>
-    <key id="key_homeshift" keycode="VK_HOME" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectBeginLine');
-            controller.doCommand('cmd_selectBeginLine');"/>
-    <key id="key_endshift" keycode="VK_END" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectEndLine');
-            controller.doCommand('cmd_selectEndLine');"/>
-    <key id="key_leftshift" keycode="VK_LEFT" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectCharPrevious');
-            controller.doCommand('cmd_selectCharPrevious');"/>
-    <key id="key_rightshift" keycode="VK_RIGHT" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectCharNext');
-            controller.doCommand('cmd_selectCharNext');"/>
-    <key id="key_leftcontrol" keycode="VK_LEFT" shift="false" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_wordPrevious');
-            controller.doCommand('cmd_wordPrevious');"/>
-    <key id="key_rightcontrol" keycode="VK_RIGHT" shift="false" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_wordNext');
-            controller.doCommand('cmd_wordNext');"/>
-    <key id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectWordPrevious');
-            controller.doCommand('cmd_wordPrevious');"/>
-    <key id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectWordNext');
-            controller.doCommand('cmd_wordNext');"/>
-    <key id="key_pageup" keycode="VK_PAGE_UP" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
-            controller.doCommand('cmd_scrollPageUp');"/>
-    <key id="key_pagedown" keycode="VK_PAGE_DOWN" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
-            controller.doCommand('cmd_scrollPageDown');"/>
-    <key id="key_undo" key="z" xulkey="true" shift="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_undo');
-            controller.doCommand('cmd_undo');"/>
-    <key id="key_redo" key="y" xulkey="true" shift="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_redo');
-            controller.doCommand('cmd_redo');"/>
-	<key id="key_space" key=" " cancel="true"/>
-  </keyset>
-</window>
diff --git a/xpfe/global/resources/content/selectDialog.xul b/xpfe/global/resources/content/selectDialog.xul
index 1b9e78c97dc..ba72d72d671 100644
--- a/xpfe/global/resources/content/selectDialog.xul
+++ b/xpfe/global/resources/content/selectDialog.xul
@@ -10,7 +10,7 @@
 	onload="selectDialogOnLoad()"
 	class="dialog"
 	height ="250"> 
-    <html:script language="JavaScript" src="chrome://global/content/selectDialog.js" />
+    <script language="JavaScript" src="chrome://global/content/selectDialog.js" />
      
 	    <keyset id="keyset"/>
 
diff --git a/xpfe/global/resources/content/taskbarOverlay.xul b/xpfe/global/resources/content/taskbarOverlay.xul
index 6567f284fee..6914d74f8c2 100644
--- a/xpfe/global/resources/content/taskbarOverlay.xul
+++ b/xpfe/global/resources/content/taskbarOverlay.xul
@@ -2,7 +2,6 @@
 <!DOCTYPE  window SYSTEM "chrome://global/locale/taskbarOverlay.dtd">
 
 <overlay id="taskbarOverlay"
-                 xmlns:html="http://www.w3.org/TR/REC-html40"
                  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <box id="taskbarMenuBox" align="horizontal" flex="10"
 	 datasources="chrome://global/locale/taskbar.rdf"
diff --git a/xpfe/global/resources/content/tasksOverlay.xul b/xpfe/global/resources/content/tasksOverlay.xul
index 57e9cd375c4..2ff04623784 100644
--- a/xpfe/global/resources/content/tasksOverlay.xul
+++ b/xpfe/global/resources/content/tasksOverlay.xul
@@ -7,10 +7,9 @@
 <?xul-overlay href="chrome://global/content/taskbarOverlay.xul"?>
 
 <overlay id="tasksOverlay"
-      xmlns:html="http://www.w3.org/TR/REC-html40"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-      <html:script language="JavaScript" src="chrome://global/content/tasksOverlay.js"/>
+      <script language="JavaScript" src="chrome://global/content/tasksOverlay.js"/>
 
       <broadcasterset id="broadcasterset"/>
  
diff --git a/xpfe/global/resources/content/textAreaBindings.xul b/xpfe/global/resources/content/textAreaBindings.xul
index 67f717f2b1d..e69de29bb2d 100644
--- a/xpfe/global/resources/content/textAreaBindings.xul
+++ b/xpfe/global/resources/content/textAreaBindings.xul
@@ -1,111 +0,0 @@
-<?xml version="1.0"?>
-<?xul-overlay href="chrome://global/content/platformGlobalOverlay.xul"?>
-
-<window id="textAreaBindings"
-   xmlns:html="http://www.w3.org/TR/REC-html40"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <keyset id="editorKeySet">
-    <key id="key_home" keycode="VK_HOME" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_beginLine');
-            controller.doCommand('cmd_beginLine');"/>
-    <key id="key_end" keycode="VK_END" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_endLine');
-            controller.doCommand('cmd_endLine');"/>
-    <key id="key_left" keycode="VK_LEFT" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_charPrevious');
-            controller.doCommand('cmd_charPrevious');"/>
-    <key id="key_right" keycode="VK_RIGHT" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_charNext');
-            controller.doCommand('cmd_charNext');"/>
-    <key id="key_homeshift" keycode="VK_HOME" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectBeginLine');
-            controller.doCommand('cmd_selectBeginLine');"/>
-    <key id="key_endshift" keycode="VK_END" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectEndLine');
-            controller.doCommand('cmd_selectEndLine');"/>
-    <key id="key_leftshift" keycode="VK_LEFT" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectCharPrevious');
-            controller.doCommand('cmd_selectCharPrevious');"/>
-    <key id="key_rightshift" keycode="VK_RIGHT" shift="true" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectCharNext');
-            controller.doCommand('cmd_selectCharNext');"/>
-    <key id="key_leftcontrol" keycode="VK_LEFT" shift="false" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_wordPrevious');
-            controller.doCommand('cmd_wordPrevious');"/>
-    <key id="key_rightcontrol" keycode="VK_RIGHT" shift="false" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_wordNext');
-            controller.doCommand('cmd_wordNext');"/>
-    <key id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectWordPrevious');
-            controller.doCommand('cmd_wordPrevious');"/>
-    <key id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectWordNext');
-            controller.doCommand('cmd_wordNext');"/>
-    <key id="key_up" keycode="VK_UP" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_linePrevious');
-            controller.doCommand('cmd_linePrevious');"/>
-    <key id="key_down" keycode="VK_DOWN" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_lineNext');
-            controller.doCommand('cmd_lineNext');"/>
-    <key id="key_up_shift" keycode="VK_UP" shift="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectLinePrevious');
-            controller.doCommand('cmd_selectLinePrevious');"/>
-    <key id="key_down_shift" keycode="VK_DOWN" shift="true" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_selectLineNext');
-            controller.doCommand('cmd_selectLineNext');"/>
-    <key id="key_pageup" keycode="VK_PAGE_UP" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageUp');
-            controller.doCommand('cmd_scrollPageUp');"/>
-    <key id="key_pagedown" keycode="VK_PAGE_DOWN" shift="false" control="false" alt="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_scrollPageDown');
-            controller.doCommand('cmd_scrollPageDown');"/>
-    <key id="key_undo" key="z" xulkey="true" shift="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_undo');
-            controller.doCommand('cmd_undo');"/>
-    <key id="key_redo" key="y" xulkey="true" shift="false"
-        onkeypress="
-            var controller =
-            document.commandDispatcher.getControllerForCommand('cmd_redo');
-            controller.doCommand('cmd_redo');"/>
-	<key id="key_space" key=" " cancel="true"/>
-  </keyset>
-</window>