diff --git a/suite/common/pref/pref-colors.xul b/suite/common/pref/pref-colors.xul
index a9fbab697468..788f9b807c76 100644
--- a/suite/common/pref/pref-colors.xul
+++ b/suite/common/pref/pref-colors.xul
@@ -19,34 +19,37 @@
 <!ENTITY  alwaysOverCheck.label "Always use my colors, overriding documents.">
 ]> 
 
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
+<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="return StartUp('Colors');"  title="&window.label;">
+        onload="StartUp('Colors')"  title="&window.title;">
 
-<html:script language="javascript" src="PrefsWindow.js"/>
+<html:script language="JavaScript" src="PrefsWindow.js"/>
 
-	<html:div ID="top"><html:span ID="lefttext">
-		&colorsHeader;
+	<html:div ID="top">
+		<html:span ID="lefttext">
+			&colorsHeader;
 		</html:span>
 	</html:div>
 
    <html:table>
-			<html:tr><html:td>&text;</html:td><html:td>&text;</html:td></html:tr>
-			<html:tr><html:td>&background;</html:td><html:td>&colorPick;</html:td></html:tr>
-			<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.wfe.use_windows_colors" val="checked" />&useWinColorsCheck.label;</html:label></html:td></html:tr>
+		<html:tr><html:td>&text;</html:td><html:td>&text;</html:td></html:tr>
+		<html:tr><html:td>&background;</html:td><html:td>&colorPick;</html:td></html:tr>
+		<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.wfe.use_windows_colors" val="checked" />&useWinColorsCheck.label;</html:label></html:td></html:tr>
    </html:table>
 
 <html:table>
 &links;
-
-			<html:tr><html:td>&unvisit;</html:td><html:td>&colorPick;</html:td></html:tr>
-			<html:tr><html:td>&visit;</html:td><html:td>&colorPick;</html:td></html:tr>
-			<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.underline_anchors" val="checked" />&underLinksCheck.label;</html:label></html:td></html:tr>
+		<html:tr><html:td>&unvisit;</html:td><html:td>&colorPick;</html:td></html:tr>
+		<html:tr><html:td>&visit;</html:td><html:td>&colorPick;</html:td></html:tr>
+		<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.underline_anchors" val="checked" />&underLinksCheck.label;</html:label></html:td></html:tr>
 </html:table>
-<html:br />
+
+<html:br/>
 
 <html:table>
    <html:tr><html:td>&someProvColors;</html:td></html:tr>
-   <html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.use_document_" />&alwaysOverCheck.label;</html:label></html:td></html:tr>
-   </html:table>
-</window>
\ No newline at end of file
+   <html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:browser.use_document_" />&alwaysOverCheck.label;</html:label></html:td></html:tr>
+</html:table>
+
+
+</xul:window>
diff --git a/suite/common/pref/pref-download.xul b/suite/common/pref/pref-download.xul
index b1e904ed2b50..b42cb1685abe 100644
--- a/suite/common/pref/pref-download.xul
+++ b/suite/common/pref/pref-download.xul
@@ -27,11 +27,11 @@
 ]>
 
 
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
+<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="return StartUp('Download');"  title="&title.label;">
 
-<html:script language="javascript" src="PrefsWindow.js"/>
+<html:script language="JavaScript" src="PrefsWindow.js"/>
 
 <html:DIV ID="top">
 		<html:SPAN ID="lefttext">&download;</html:SPAN>
@@ -39,32 +39,30 @@
 
 &newmes;
 <html:table>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />&downOnlyCheck;</html:label></html:td></html:tr>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />&downDateCheck;</html:label></html:td></html:tr>
-			<html:tr><html:td>
-			    <html:label>
-				<html:input  type="radio" name="offline" id="pref:0:int:offline.news.download.use_days" val="checked" />&fromRadio.label;
-				
-				<html:select  id="pref:0:">
-								   <html:OPTION />&one.select;
-				                   <html:OPTION />&two.select;
-				                   <html:OPTION />&oneM.select;
-				                   <html:OPTION />&sixM.select;
-				                   <html:OPTION />&oneY.select;
-				</html:select></html:label></html:td></html:tr>
-
-			<html:tr><html:td><html:label>
-			<html:input type="radio" name="offline" id="pref:1:int:offline.news.download.use_days" />&sinceRadio.label;
-			<html:input type="text" size="5" id="pref:2:browser.use_document_fonts" />&daysAgo;
-			</html:label></html:td></html:tr>
+	<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />&downOnlyCheck;</html:label></html:td></html:tr>
+	<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />&downDateCheck;</html:label></html:td></html:tr>
+	<html:tr><html:td>
+	    <html:label>
+		<html:input  type="radio" name="offline" id="pref:0:int:offline.news.download.use_days" val="checked" />&fromRadio.label;
+		<html:select  id="pref:0:">
+						   <html:OPTION />&one.select;
+		                   <html:OPTION />&two.select;
+		                   <html:OPTION />&oneM.select;
+		                   <html:OPTION />&sixM.select;
+		                   <html:OPTION />&oneY.select;
+		</html:select></html:label></html:td></html:tr>
 
+	<html:tr><html:td><html:label>
+	<html:input type="radio" name="offline" id="pref:1:int:offline.news.download.use_days" />&sinceRadio.label;
+	<html:input type="text" size="5" id="pref:2:browser.use_document_fonts" />&daysAgo;
+	</html:label></html:td></html:tr>
 </html:table>
+
 &Allmsg;
+
 <html:table>
-   <html:tr><html:td>&offlineMsgs;
-   </html:td></html:tr>
-			<html:tr><html:td><html:input  type="button" value="&select;" id="pref:2:offline" /></html:td></html:tr>
-			</html:table>
- 
+	<html:tr><html:td>&offlineMsgs;</html:td></html:tr>
+	<html:tr><html:td><html:input  type="button" value="&select;" id="pref:2:offline" /></html:td></html:tr>
 </html:table>
-</window>
\ No newline at end of file
+ 
+</xul:window>
\ No newline at end of file
diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index a9fbab697468..788f9b807c76 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -19,34 +19,37 @@
 <!ENTITY  alwaysOverCheck.label "Always use my colors, overriding documents.">
 ]> 
 
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
+<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="return StartUp('Colors');"  title="&window.label;">
+        onload="StartUp('Colors')"  title="&window.title;">
 
-<html:script language="javascript" src="PrefsWindow.js"/>
+<html:script language="JavaScript" src="PrefsWindow.js"/>
 
-	<html:div ID="top"><html:span ID="lefttext">
-		&colorsHeader;
+	<html:div ID="top">
+		<html:span ID="lefttext">
+			&colorsHeader;
 		</html:span>
 	</html:div>
 
    <html:table>
-			<html:tr><html:td>&text;</html:td><html:td>&text;</html:td></html:tr>
-			<html:tr><html:td>&background;</html:td><html:td>&colorPick;</html:td></html:tr>
-			<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.wfe.use_windows_colors" val="checked" />&useWinColorsCheck.label;</html:label></html:td></html:tr>
+		<html:tr><html:td>&text;</html:td><html:td>&text;</html:td></html:tr>
+		<html:tr><html:td>&background;</html:td><html:td>&colorPick;</html:td></html:tr>
+		<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.wfe.use_windows_colors" val="checked" />&useWinColorsCheck.label;</html:label></html:td></html:tr>
    </html:table>
 
 <html:table>
 &links;
-
-			<html:tr><html:td>&unvisit;</html:td><html:td>&colorPick;</html:td></html:tr>
-			<html:tr><html:td>&visit;</html:td><html:td>&colorPick;</html:td></html:tr>
-			<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.underline_anchors" val="checked" />&underLinksCheck.label;</html:label></html:td></html:tr>
+		<html:tr><html:td>&unvisit;</html:td><html:td>&colorPick;</html:td></html:tr>
+		<html:tr><html:td>&visit;</html:td><html:td>&colorPick;</html:td></html:tr>
+		<html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.underline_anchors" val="checked" />&underLinksCheck.label;</html:label></html:td></html:tr>
 </html:table>
-<html:br />
+
+<html:br/>
 
 <html:table>
    <html:tr><html:td>&someProvColors;</html:td></html:tr>
-   <html:tr><html:td><html:label><html:input  type="checkbox" id="pref:0:bool:browser.use_document_" />&alwaysOverCheck.label;</html:label></html:td></html:tr>
-   </html:table>
-</window>
\ No newline at end of file
+   <html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:browser.use_document_" />&alwaysOverCheck.label;</html:label></html:td></html:tr>
+</html:table>
+
+
+</xul:window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-download.xul b/xpfe/components/prefwindow/resources/content/pref-download.xul
index b1e904ed2b50..b42cb1685abe 100644
--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -27,11 +27,11 @@
 ]>
 
 
-<window xmlns:html="http://www.w3.org/TR/REC-html40"
+<xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="return StartUp('Download');"  title="&title.label;">
 
-<html:script language="javascript" src="PrefsWindow.js"/>
+<html:script language="JavaScript" src="PrefsWindow.js"/>
 
 <html:DIV ID="top">
 		<html:SPAN ID="lefttext">&download;</html:SPAN>
@@ -39,32 +39,30 @@
 
 &newmes;
 <html:table>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />&downOnlyCheck;</html:label></html:td></html:tr>
-			<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />&downDateCheck;</html:label></html:td></html:tr>
-			<html:tr><html:td>
-			    <html:label>
-				<html:input  type="radio" name="offline" id="pref:0:int:offline.news.download.use_days" val="checked" />&fromRadio.label;
-				
-				<html:select  id="pref:0:">
-								   <html:OPTION />&one.select;
-				                   <html:OPTION />&two.select;
-				                   <html:OPTION />&oneM.select;
-				                   <html:OPTION />&sixM.select;
-				                   <html:OPTION />&oneY.select;
-				</html:select></html:label></html:td></html:tr>
-
-			<html:tr><html:td><html:label>
-			<html:input type="radio" name="offline" id="pref:1:int:offline.news.download.use_days" />&sinceRadio.label;
-			<html:input type="text" size="5" id="pref:2:browser.use_document_fonts" />&daysAgo;
-			</html:label></html:td></html:tr>
+	<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.unread_only" />&downOnlyCheck;</html:label></html:td></html:tr>
+	<html:tr><html:td><html:label><html:input type="checkbox" id="pref:0:bool:offline.news.download.by_date" />&downDateCheck;</html:label></html:td></html:tr>
+	<html:tr><html:td>
+	    <html:label>
+		<html:input  type="radio" name="offline" id="pref:0:int:offline.news.download.use_days" val="checked" />&fromRadio.label;
+		<html:select  id="pref:0:">
+						   <html:OPTION />&one.select;
+		                   <html:OPTION />&two.select;
+		                   <html:OPTION />&oneM.select;
+		                   <html:OPTION />&sixM.select;
+		                   <html:OPTION />&oneY.select;
+		</html:select></html:label></html:td></html:tr>
 
+	<html:tr><html:td><html:label>
+	<html:input type="radio" name="offline" id="pref:1:int:offline.news.download.use_days" />&sinceRadio.label;
+	<html:input type="text" size="5" id="pref:2:browser.use_document_fonts" />&daysAgo;
+	</html:label></html:td></html:tr>
 </html:table>
+
 &Allmsg;
+
 <html:table>
-   <html:tr><html:td>&offlineMsgs;
-   </html:td></html:tr>
-			<html:tr><html:td><html:input  type="button" value="&select;" id="pref:2:offline" /></html:td></html:tr>
-			</html:table>
- 
+	<html:tr><html:td>&offlineMsgs;</html:td></html:tr>
+	<html:tr><html:td><html:input  type="button" value="&select;" id="pref:2:offline" /></html:td></html:tr>
 </html:table>
-</window>
\ No newline at end of file
+ 
+</xul:window>
\ No newline at end of file
diff --git a/xpfe/components/prefwindow/resources/content/pref-smartupdate.html b/xpfe/components/prefwindow/resources/content/pref-smartupdate.html
index 44590356ff4a..ca19cde713d7 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.html
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.html
@@ -6,35 +6,31 @@
 <script language="JavaScript" src="PrefsWindow.js">
 </script>
 <style TYPE="text/css">
-@import url(pref.css);
+@import url(chrome://pref/skin/pref.css);
 </style>
 
-<body ID=here onload="return StartUp('smart_update')">
+<body ID=here onload="StartUp('smartupdate')">
 
 <DIV ID=top>
 		<SPAN ID=lefttext>Smart Update</SPAN>
 </DIV>
 
 
-<table>
-  <FORM>
-            <tr><td><input type="checkbox" id="pref:0:bool:autoupdate.enabled" checked>Enable SmartUpdate</td></tr>
-            <tr><td><input type="checkbox" id="pref:0:bool:autoupdate.enabled">Require manual confirmation of each install</td></tr>
-</table>
-<table>			
-			<tr><td>
-			To uninstall, select from the following list and click the uninstall button.
-			<br>
-			    <textarea name="textstyle" ROWS="5" COLS="30" id="pref:string:browser.related.disabledForDomains">
-			    
-			    </textarea>
-				<input value="Uninstall" type="button" id="pref:0:bool:smartupdate">
-			</td></tr>
-</table>
-  </FORM>
+<FORM>
+	<table>
+        <tr><td><input type="checkbox" id="pref:0:bool:autoupdate.enabled" checked>Enable SmartUpdate</td></tr>
+        <tr><td><input type="checkbox" id="pref:0:bool:autoupdate.enabled">Require manual confirmation of each install</td></tr>
+	</table>
+	<table>			
+		<tr><td>
+		To uninstall, select from the following list and click the uninstall button.
+		<br>
+		<textarea name="textstyle" ROWS="5" COLS="30" id="pref:string:browser.related.disabledForDomains">
+		</textarea>
+		<input value="Uninstall" type="button" id="pref:0:bool:smartupdate">
+		</td></tr>
+	</table>
+</FORM>
 
-
-
-</table>
 </body>
 </html>