diff --git a/security/manager/pki/resources/content/CAOverlay.xul b/security/manager/pki/resources/content/CAOverlay.xul
index fbdf847c828..5e9a5cf3bdd 100644
--- a/security/manager/pki/resources/content/CAOverlay.xul
+++ b/security/manager/pki/resources/content/CAOverlay.xul
@@ -49,19 +49,19 @@
     </outliner>
     <hbox>
       <button id="ca_viewButton" class="normal" 
-              label="&certmgr.view.label;" orient="horizontal" 
-              disabled="true" onclick="viewCerts();"/>
+              label="&certmgr.view.label;"
+              disabled="true" oncommand="viewCerts();"/>
       <button id="ca_editButton" class="normal" 
-              label="&certmgr.edit.label;" orient="horizontal" 
-              disabled="true" onclick="editCerts();"/>
+              label="&certmgr.edit.label;"
+              disabled="true" oncommand="editCerts();"/>
 <!-- future - import a DER cert?
       <button id="ca_addButton" class="normal" 
-              label="&certmgr.add.label;" orient="horizontal" 
-              onclick="addCerts();"/>
+              label="&certmgr.add.label;"
+              oncommand="addCerts();"/>
 -->
       <button id="ca_deleteButton" class="normal" 
-              label="&certmgr.delete.label;" orient="horizontal" 
-              disabled="true" onclick="deleteCerts();"/>
+              label="&certmgr.delete.label;"
+              disabled="true" oncommand="deleteCerts();"/>
     </hbox>
   </vbox>
 </overlay>
diff --git a/security/manager/pki/resources/content/MineOverlay.xul b/security/manager/pki/resources/content/MineOverlay.xul
index e7f7cbf0ddd..084f66da086 100644
--- a/security/manager/pki/resources/content/MineOverlay.xul
+++ b/security/manager/pki/resources/content/MineOverlay.xul
@@ -64,21 +64,21 @@
       <outlinerbody flex="1" ondblclick="viewCerts();"/>
     </outliner>
     <hbox>
-      <button id="mine_viewButton" class="normal" 
-              label="&certmgr.view.label;" orient="horizontal" 
-              disabled="true" onclick="viewCerts();"/>
-      <button id="mine_backupButton" class="normal" 
-              label="&certmgr.backup.label;" orient="horizontal" 
-              disabled="true" oncommand="backupCerts();"/>
-      <button id="mine_backupAllButton" class="normal" 
-              label="&certmgr.backupall.label;" orient="horizontal" 
-              onclick="backupAllCerts();"/>
-      <button id="mine_restoreButton" class="normal" 
-              label="&certmgr.restore.label;" orient="horizontal" 
-              onclick="restoreCerts();"/>
-      <button id="mine_deleteButton" class="normal" 
-              label="&certmgr.delete.label;" orient="horizontal" 
-              disabled="true" onclick="deleteCerts();"/>
+       <button id="mine_viewButton" class="normal" 
+               label="&certmgr.view.label;"
+               disabled="true" oncommand="viewCerts();"/>
+       <button id="mine_backupButton" class="normal" 
+               label="&certmgr.backup.label;"
+               disabled="true" oncommand="backupCerts();"/>
+       <button id="mine_backupAllButton" class="normal" 
+               label="&certmgr.backupall.label;"
+               oncommand="backupAllCerts();"/>
+       <button id="mine_restoreButton" class="normal" 
+               label="&certmgr.restore.label;"
+               oncommand="restoreCerts();"/>
+       <button id="mine_deleteButton" class="normal" 
+               label="&certmgr.delete.label;"
+               disabled="true" oncommand="deleteCerts();"/>
     </hbox>
   </vbox>
 </overlay>
diff --git a/security/manager/pki/resources/content/PageInfoOverlay.xul b/security/manager/pki/resources/content/PageInfoOverlay.xul
index 5aa2866d63b..fa3c876deaa 100644
--- a/security/manager/pki/resources/content/PageInfoOverlay.xul
+++ b/security/manager/pki/resources/content/PageInfoOverlay.xul
@@ -27,8 +27,8 @@
 
 <overlay id="pipPageInfoOverlayID"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script src="chrome://global/content/strres.js" />
-  <script src="chrome://pippki/content/pippki.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
   <script type="application/x-javascript">
   <![CDATA[
     var security = {
@@ -175,22 +175,22 @@
   ]]>
   </script>
   <tabs id="tabs">
-    <tab id="securityTab" label="&pageInfo.securityTab;" />
+    <tab id="securityTab" label="&pageInfo.securityTab;"/>
   </tabs>
   <tabpanels id="tabpanels">
     <vbox id="securityPanel" flex="1">
-      <text id="security-identity" class="header label" />
-      <html id="security-identity-text" flex="1" />
+      <text id="security-identity" class="header label"/>
+      <html id="security-identity-text" flex="1"/>
       <hbox>
         <button id="security-view-cert" class="normal" label="&pageInfo.view.label;" 
-          oncommand="security.viewCert();" />
-        <html id="security-view-text" flex="1" />
+                oncommand="security.viewCert();"/>
+        <html id="security-view-text" flex="1"/>
       </hbox>
-      <separator class="groove" orient="horizontal" />
-      <text id="security-privacy" class="header label" />
-      <vbox flex="1" >
-        <html id="security-privacy-msg1" />
-        <html id="security-privacy-msg2" />
+      <separator class="groove"/>
+      <text id="security-privacy" class="header label"/>
+      <vbox flex="1">
+        <html id="security-privacy-msg1"/>
+        <html id="security-privacy-msg2"/>
       </vbox>
     </vbox>
   </tabpanels>
diff --git a/security/manager/pki/resources/content/PrefOverlay.xul b/security/manager/pki/resources/content/PrefOverlay.xul
index 8df7e32c7d9..00c4d5093fb 100644
--- a/security/manager/pki/resources/content/PrefOverlay.xul
+++ b/security/manager/pki/resources/content/PrefOverlay.xul
@@ -29,28 +29,28 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <treechildren id="securityChildren">
-    <treeitem id="masterpassItem" >
+    <treeitem id="masterpassItem">
       <treerow>
         <treecell class="treecell-indent" url="chrome://pippki/content/pref-masterpass.xul"
-                  label="&masterpass.label;" />
+                  label="&masterpass.label;"/>
       </treerow>
     </treeitem>
-    <treeitem id="sslItem" >
+    <treeitem id="sslItem">
       <treerow>
         <treecell class="treecell-indent" url="chrome://pippki/content/pref-ssl.xul"
-                  label="&ssl.label;" />
+                  label="&ssl.label;"/>
       </treerow>
     </treeitem>
-    <treeitem id="certItem" >
+    <treeitem id="certItem">
       <treerow>
         <treecell class="treecell-indent" url="chrome://pippki/content/pref-certs.xul"
-                  label="&certs.label;" />
+                  label="&certs.label;"/>
       </treerow>
     </treeitem>
-    <treeitem id="validationItem" >
+    <treeitem id="validationItem">
       <treerow>
         <treecell class="treecell-indent" url="chrome://pippki/content/pref-validation.xul"
-                 label="&validation.label;" />
+                 label="&validation.label;"/>
       </treerow>
     </treeitem>
   </treechildren>
diff --git a/security/manager/pki/resources/content/WebSitesOverlay.xul b/security/manager/pki/resources/content/WebSitesOverlay.xul
index 92900afe3df..1aa1efbd904 100644
--- a/security/manager/pki/resources/content/WebSitesOverlay.xul
+++ b/security/manager/pki/resources/content/WebSitesOverlay.xul
@@ -49,19 +49,19 @@
     </outliner>
     <hbox>
       <button id="websites_viewButton" class="normal" 
-              label="&certmgr.view.label;" orient="horizontal" 
-              disabled="true" onclick="viewCerts();"/>
+              label="&certmgr.view.label;"
+              disabled="true" oncommand="viewCerts();"/>
       <button id="websites_editButton" class="normal" 
-              label="&certmgr.edit.label;" orient="horizontal" 
-              disabled="true" onclick="editCerts();"/>
+              label="&certmgr.edit.label;"
+              disabled="true" oncommand="editCerts();"/>
 <!-- future - import a DER cert?
       <button id="websites_addButton" class="normal" 
-              label="&certmgr.add.label;" orient="horizontal" 
-              onclick="addCerts();"/>
+              label="&certmgr.add.label;"
+              oncommand="addCerts();"/>
 -->
       <button id="websites_deleteButton" class="normal" 
-              label="&certmgr.delete.label;" orient="horizontal" 
-              disabled="true" onclick="deleteCerts();"/>
+              label="&certmgr.delete.label;"
+              disabled="true" oncommand="deleteCerts();"/>
     </hbox>
   </vbox>
 </overlay>
diff --git a/security/manager/pki/resources/content/cacertexists.xul b/security/manager/pki/resources/content/cacertexists.xul
index b435dc3105e..0b620dc2b81 100644
--- a/security/manager/pki/resources/content/cacertexists.xul
+++ b/security/manager/pki/resources/content/cacertexists.xul
@@ -25,30 +25,27 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="cacertexists" 
+<window id="cacertexists" 
   title="&caCertExists.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();"
-  debug="false"
->
+  onload="setWindowName();">
 
-  <script src="cacertexists.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
+  <script type="application/x-javascript" src="chrome://pippki/content/cacertexists.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
   <vbox flex="1">
     <html>&caCertExists.message;</html>
     
-    <separator />
+    <separator/>
 
     <hbox align="center">
       <button id="ok-button" class="dialog" label="&ok.label;"
-           style="width: 8ex" oncommand="doOK();"/> 
+              oncommand="doOK();"/> 
     </hbox>
     
-    <separator />
+    <separator/>
 
   </vbox>
 
diff --git a/security/manager/pki/resources/content/certDump.xul b/security/manager/pki/resources/content/certDump.xul
index 805d31836a1..db88432143f 100644
--- a/security/manager/pki/resources/content/certDump.xul
+++ b/security/manager/pki/resources/content/certDump.xul
@@ -32,21 +32,21 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <vbox class="box-padded" id="certPrettyPrint" flex="1">
   <text class="header" value="&certmgr.hierarchy.label;"/>
-  <tree class="inset" id="treesetDump" debug="false" rows="4"
+  <tree class="inset" id="treesetDump" rows="4"
         onselect="updateCertDump();">
     <treecolgroup>
       <treecol flex="1"/>
     </treecolgroup>
-    <treechildren id="chainDump" />
+    <treechildren id="chainDump"/>
   </tree>
   <outliner class="inset" id="prettyDumpOutliner" style="height:150px">
     <outlinercol flex ="1" id="certDataCol" label="&certmgr.details.label;"
-      ignoreincolumnpicker="true" class="header outlinercol-header" primary="true"/>
-    <splitter />
-    <outlinerbody flex="1" onselect="displaySelected();" />
+                 ignoreincolumnpicker="true" class="header outlinercol-header" primary="true"/>
+    <splitter/>
+    <outlinerbody flex="1" onselect="displaySelected();"/>
   </outliner>
-  <text class="header" value="&certmgr.fields.label;" />
+  <text class="header" value="&certmgr.fields.label;"/>
   <textbox class="inset" id="certDumpVal"  multiline="true" rows="8"
-           readonly="true" style="font-family: -moz-fixed;" />
+           readonly="true" style="font-family: -moz-fixed;"/>
 </vbox>
 </overlay>
diff --git a/security/manager/pki/resources/content/certManager.xul b/security/manager/pki/resources/content/certManager.xul
index d2f314fa64d..b4e6e55579a 100644
--- a/security/manager/pki/resources/content/certManager.xul
+++ b/security/manager/pki/resources/content/certManager.xul
@@ -25,9 +25,9 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<?xul-overlay href="MineOverlay.xul"?>
+<?xul-overlay href="chrome://pippki/content/MineOverlay.xul"?>
 <!-- XXX
-<?xul-overlay href="othercertsOverlay.xul"?>
+<?xul-overlay href="chrome://pippki/content/othercertsOverlay.xul"?>
 -->
 <?xul-overlay href="chrome://pippki/content/WebSitesOverlay.xul"?>
 <?xul-overlay href="chrome://pippki/content/CAOverlay.xul"?>
@@ -39,9 +39,9 @@
         title="&certmgr.title;"
         onload="LoadCerts();">
 
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
-  <script src="chrome://global/content/strres.js" />
-  <script src="certManager.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/certManager.js"/>
 
 
 <hbox flex="1">
@@ -51,11 +51,11 @@
       <row flex="1">
         <tabbox flex="1" orient="vertical">
           <tabs id="certMgrTabbox" orient="horizontal">
-            <tab id="mine_tab" label="&certmgr.tab.mine;" />
+            <tab id="mine_tab" label="&certmgr.tab.mine;"/>
 <!--
-            <tab id="others_tab" label="&certmgr.tab.others;" />
+            <tab id="others_tab" label="&certmgr.tab.others;"/>
 -->
-            <tab id="websites_tab" label="&certmgr.tab.websites;" />
+            <tab id="websites_tab" label="&certmgr.tab.websites;"/>
             <tab id="ca_tab" label="&certmgr.tab.ca;" selected="true"/>
           </tabs>
           <tabpanels flex="1">
@@ -72,8 +72,8 @@
         <hbox flex="1">
           <button id="HelpButton" class="normal" 
                   label="&certmgr.help.label;" 
-                  orient="horizontal" accesskey="h" 
-                  oncommand="doHelpButton();" />
+                  accesskey="h" 
+                  oncommand="doHelpButton();"/>
         </hbox>
       </row>
     </rows>
diff --git a/security/manager/pki/resources/content/certViewer.xul b/security/manager/pki/resources/content/certViewer.xul
index 4984c6ecb86..680933dd98e 100644
--- a/security/manager/pki/resources/content/certViewer.xul
+++ b/security/manager/pki/resources/content/certViewer.xul
@@ -27,23 +27,20 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
 
-<?xul-overlay href="viewCertDetails.xul"?>
-<?xul-overlay href="certDump.xul"?>
+<?xul-overlay href="chrome://pippki/content/viewCertDetails.xul"?>
+<?xul-overlay href="chrome://pippki/content/certDump.xul"?>
 
 
-<window
-  id="certDetails" 
+<window id="certDetails" 
   title="&certmgr.certdetail.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  onload="setWindowName();"
-  debug="tru1"
->
+  onload="setWindowName();">
 
-<script src="chrome://global/content/strres.js" />
-<script src="viewCertDetails.js" />
-<script src="pippki.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/viewCertDetails.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <keyset id="keys">
   <key id="esc-key"    keycode="VK_ESCAPE" oncommand="window.close()"/>
@@ -51,12 +48,12 @@
 
   <grid flex="1">
     <column flex="1"/>
-    <rows autostretch="always" >
+    <rows autostretch="always">
       <row flex="1">
         <tabbox flex="1" orient="vertical">
           <tabs orient="horizontal">
-            <tab id="general_tab" label="&certmgr.detail.general_tab.title;" />
-            <tab id="prettyprint_tab" label="&certmgr.detail.prettyprint_tab.title;" />
+            <tab id="general_tab" label="&certmgr.detail.general_tab.title;"/>
+            <tab id="prettyprint_tab" label="&certmgr.detail.prettyprint_tab.title;"/>
           </tabs>
           <tabpanels flex="1">
             <vbox id="general_info" flex="1"/>
@@ -65,19 +62,18 @@
         </tabbox>
       </row>
       <row>
-        <separator class="thin" />
+        <separator class="thin"/>
       </row>
       <row>
         <hbox align="right" flex="1">
           <button id="HelpButton" class="normal" 
                   label="&certmgr.help.label;" 
-                  orient="horizontal" accesskey="h" 
-                  oncommand="openHelp('chrome://help/content/help.xul?cert_details');" />
+                  accesskey="h" 
+                  oncommand="openHelp('chrome://help/content/help.xul?cert_details');"/>
           <button id="closeButton" class="normal" 
                   label="&certmgr.close.label;" 
-                  orient="horizontal" accesskey="c"
-                  onclick="window.close();"
-                  onkeypress="window.close();"/>
+                  accesskey="c"
+                  oncommand="window.close();"/>
         </hbox>
       </row>
     </rows>
diff --git a/security/manager/pki/resources/content/changepassword.xul b/security/manager/pki/resources/content/changepassword.xul
index 9eb35bcf481..b2542ecc6b3 100644
--- a/security/manager/pki/resources/content/changepassword.xul
+++ b/security/manager/pki/resources/content/changepassword.xul
@@ -26,17 +26,14 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="set_password" title="&setPassword.title;"
+<window id="set_password" title="&setPassword.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
-  onload="onLoad();"
->
+  onload="onLoad();">
 
-<script src="password.js"/>
-<script src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
 <vbox style="margin: 5px;" flex="1">
@@ -55,26 +52,26 @@
 -->
 </hbox>
 
-<separator />
+<separator/>
 
 <groupbox orient="vertical">
 <grid>
  <columns>
-   <column />
-   <column /> 
+   <column/>
+   <column/> 
  </columns>
  <rows>
    <row>
-     <text value="&setPassword.oldPassword.label;" /> 
+     <text value="&setPassword.oldPassword.label;"/> 
      <textbox id="oldpw" type="password" maxlength="30"/>
    </row>
    <row>
-     <text value="&setPassword.newPassword.label;" /> 
+     <text value="&setPassword.newPassword.label;"/> 
      <textbox id="pw1" type="password" maxlength="30" 
        onkeypress="setPasswordStrength(); checkPasswords();"/> 
    </row>
    <row>
-     <text value="&setPassword.reenterPassword.label;" /> 
+     <text value="&setPassword.reenterPassword.label;"/> 
      <textbox id="pw2" type="password" maxlength="30" onkeypress="checkPasswords();"/>  
    </row>
  </rows>
@@ -83,17 +80,12 @@
 
 <groupbox orient="vertical">
  <label value="&setPassword.meter.label;"/>
- <progressmeter
-   id="pwmeter"
-   mode="determined"
-   value="0%"
-   align="horizontal"
-   label="&setPassword.meter.loading;"
-   style="forground-color: red;"
- />
+ <progressmeter id="pwmeter" mode="determined" value="0%"
+                align="horizontal" label="&setPassword.meter.loading;"
+                style="forground-color: red;"/>
 </groupbox>
 
-<separator />
+<separator/>
 
 <keyset id="keys">
   <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) setPassword();"/>
@@ -103,11 +95,11 @@
 
 <hbox>
 <button id="ok-button" class="dialog" label="&ok.label;"
-     style="width: 8ex" oncommand="setPassword();" disabled="true" default="true"/> 
+        oncommand="setPassword();" disabled="true" default="true"/>
 <button id="cancel-button" class="dialog" label="&cancel.label;"
-     style="width: 8ex" oncommand="window.close();" /> 
+        oncommand="window.close();"/> 
 <button id="help-button" class="dialog" label="&help.label;"
-     style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?change_pwd');" /> 
+        oncommand="openHelp('chrome://help/content/help.xul?change_pwd');"/> 
 </hbox>
 
 
diff --git a/security/manager/pki/resources/content/choosetoken.xul b/security/manager/pki/resources/content/choosetoken.xul
index b73ed7b6275..653544ce0a6 100644
--- a/security/manager/pki/resources/content/choosetoken.xul
+++ b/security/manager/pki/resources/content/choosetoken.xul
@@ -29,19 +29,17 @@
 ]>
 
 
-<window
-  id="ssl_warning" title="&chooseToken.title;"
+<window id="ssl_warning" title="&chooseToken.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="360"
   width="400"
-  onload="onLoad();"
->
-<script src="chrome://global/content/strres.js" />
-<script src="pippki.js" />
-<script src="choosetoken.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/choosetoken.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <keyset id="keys">
   <key id="enter-key"  keycode="VK_ENTER"  oncommand="if (!document.getElementById('ok-button').disabled) doOK();"/>
@@ -59,11 +57,11 @@
   <separator />
   <hbox>
   <button id="ok-button" class="dialog" label="&ok.label;"
-     style="width: 10ex" onclick="doOK();" disabled="false"/> 
+          oncommand="doOK();" disabled="false"/> 
   <button id="cancel-button" class="dialog" label="&cancel.label;"
-     style="width: 10ex" onclick="doCancel();" /> 
+          oncommand="doCancel();"/> 
   <button id="help-button" class="dialog" label="&help.label;"
-    style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?which_token');" /> 
+          oncommand="openHelp('chrome://help/content/help.xul?which_token');"/> 
   </hbox>
 </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/clientauthask.xul b/security/manager/pki/resources/content/clientauthask.xul
index 79bb0219667..14cb12c4028 100644
--- a/security/manager/pki/resources/content/clientauthask.xul
+++ b/security/manager/pki/resources/content/clientauthask.xul
@@ -23,18 +23,16 @@
 ]>
 
 
-<window
-  id="ssl_warning" title="&clientAuthAsk.title;"
+<window id="ssl_warning" title="&clientAuthAsk.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="360"
   width="400"
-  onload="onLoad();"
->
-<script src="chrome://global/content/strres.js" />
-<script src="pippki.js" />
-<script src="clientauthask.js" />
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/clientauthask.js"/>
 
 <keyset id="keys">
   <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
@@ -45,9 +43,9 @@
 <vbox style="margin: 5px;" flex="1">
     <groupbox orient="vertical">
     <html>&clientAuthAsk.message1;</html>
-    <html id="hostname" />
-    <html id="organization" />
-    <html id="issuer" />
+    <html id="hostname"/>
+    <html id="organization"/>
+    <html id="issuer"/>
     </groupbox>
     <groupbox orient="vertical">
     <html>&clientAuthAsk.message2;</html>
@@ -55,12 +53,12 @@
         <menupopup/>
     </menulist>
     </groupbox>
-  <separator />
+  <separator/>
   <hbox>
   <button id="ok-button" class="dialog" label="&ok.label;"
-     style="width: 10ex" onclick="doOK();" disabled="false"/> 
+          oncommand="doOK();" disabled="false"/> 
   <button id="cancel-button" class="dialog" label="&cancel.label;"
-     style="width: 10ex" onclick="doCancel();" /> 
+          oncommand="doCancel();"/> 
   </hbox>
 </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/crlManager.xul b/security/manager/pki/resources/content/crlManager.xul
index 26637c4bf10..e133f0b8891 100644
--- a/security/manager/pki/resources/content/crlManager.xul
+++ b/security/manager/pki/resources/content/crlManager.xul
@@ -43,13 +43,13 @@
         orient="vertical"
         onload="onLoad();">
 
-  <script src="chrome://global/content/strres.js"/>
-  <script src="crlManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/crlManager.js"/>
 
   <text class="label" value="&validation.crlmanager.label;"/>
   <separator class="thin"/>
   <tree id="crltree" class="inset" style="height: 10em;"
-   multiple="false" onclick="EnableCrlActions()" flex="1">
+   multiple="false" oncommand="EnableCrlActions()" flex="1">
     <treecolgroup>
       <treecol flex="3" width="0"/>
       <splitter class="tree-splitter"/>
@@ -62,27 +62,21 @@
     <treehead>
       <treerow>
         <treecell class="treecell-header sortDirectionIndicator"
-                          label="&certmgr.certdetail.o;"
-                          />
+                  label="&certmgr.certdetail.o;"/>
         <treecell class="treecell-header sortDirectionIndicator"
-                          label="&certmgr.certdetail.ou;"
-                          />
-        <treecell class="treecell-header
-                          sortDirectionIndicator"
-                          label="&validation.crllastupdate.label;"
-                          />
-        <treecell class="treecell-header
-                          sortDirectionIndicator"
-                          label="&validation.crlnextupdate.label;"
-                          />
+                  label="&certmgr.certdetail.ou;"/>
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&validation.crllastupdate.label;"/>
+        <treecell class="treecell-header sortDirectionIndicator"
+                  label="&validation.crlnextupdate.label;"/>
       </treerow>          
     </treehead>
     <treechildren id="crlList" flex="1"/>
   </tree>
   <hbox>
     <button id="deleteCrl" class="dialog push" disabled="true"
-                          label="&validation.deletecrl.label;"
-                          oncommand="DeleteCrlSelected();"/>
+            label="&validation.deletecrl.label;"
+            oncommand="DeleteCrlSelected();"/>
   </hbox>
   <separator class="thin"/>
 </window>
diff --git a/security/manager/pki/resources/content/deletecert.xul b/security/manager/pki/resources/content/deletecert.xul
index a864c9f6504..e67e6291de6 100644
--- a/security/manager/pki/resources/content/deletecert.xul
+++ b/security/manager/pki/resources/content/deletecert.xul
@@ -25,18 +25,15 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/certManager.dtd">
 
-<window
-  id="deleteCert" 
+<window id="deleteCert" 
   title="&certmgr.deletecert.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="setWindowName();"
-  persist="height width screenX screenY"
-  debug="false"
->
+  persist="height width screenX screenY">
 
-  <script src="deletecert.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
+  <script type="application/x-javascript" src="chrome://pippki/content/deletecert.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <keyset id="keys">
     <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK();"/>
@@ -48,14 +45,14 @@
     <html>&certmgr.deletecert.beforename;</html>
     <text id="certname"/>
     <html>&certmgr.deletecert.aftername;</html>
-    <separator />
+    <separator/>
     <hbox align="center">
       <button id="ok-button" class="dialog" label="&certmgr.ok.label;"
-           style="width: 8ex" oncommand="doOK();"/> 
+              oncommand="doOK();"/> 
       <button id="cancel-button" class="dialog" label="&certmgr.cancel.label;"
-           style="width: 8ex" oncommand="window.close();" /> 
+              oncommand="window.close();"/> 
       <button id="help-button" class="dialog" label="&certmgr.help.label;"
-           style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?delete_my_certs');" /> 
+              oncommand="openHelp('chrome://help/content/help.xul?delete_my_certs');"/> 
     </hbox>
   </vbox>
 
diff --git a/security/manager/pki/resources/content/device_manager.xul b/security/manager/pki/resources/content/device_manager.xul
index 58ecefd0965..2854f667cd3 100644
--- a/security/manager/pki/resources/content/device_manager.xul
+++ b/security/manager/pki/resources/content/device_manager.xul
@@ -31,16 +31,15 @@
 %pippkiDTD;
 ]>
 
-
 <window id="devicemanager" 
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
         title="&devmgr.title;"
         persist="screenX screenY width height"
         onload="LoadModules();">
 
-<script src="chrome://global/content/strres.js" />
-<script src="device_manager.js"/>
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <grid flex="1">
   <columns>
@@ -52,7 +51,7 @@
     <row>
       <hbox flex="1"> <!-- List of devices -->
         <tree id="device_tree" rows="12" multiple="false"
-              onselect="enableButtons();" debug="false" 
+              onselect="enableButtons();"
               flex="1" style="min-width:15em">
           <treecolgroup> 
             <treecol flex="1"/> 
@@ -68,7 +67,7 @@
         </tree>
       </hbox> <!-- / List of devices -->
       <hbox flex="1"> <!-- Device status -->
-        <tree id="info_tree" debug="false" rows="12" multiple="false" 
+        <tree id="info_tree" rows="12" multiple="false" 
               class="list" flex="1" style="min-width:10em">
           <treecolgroup> 
             <treecol flex="5"/> 
@@ -88,32 +87,32 @@
       <vbox> <!-- Buttons for manipulating devices -->
         <button id="login_button" 
                 label="&devmgr.button.login.label;"
-                onclick="doLogin();" disabled="true"/> 
+                oncommand="doLogin();" disabled="true"/> 
         <button id="logout_button" 
                 label="&devmgr.button.logout.label;"
-                onclick="doLogout();" disabled="true"/> 
+                oncommand="doLogout();" disabled="true"/> 
         <button id="change_pw_button" 
                 label="&devmgr.button.changepw.label;"
-                onclick="changePassword();" disabled="true"/> 
+                oncommand="changePassword();" disabled="true"/> 
         <button id="load_button" 
                 label="&devmgr.button.load.label;"
-                onclick="doLoad();" disabled="false"/> 
+                oncommand="doLoad();" disabled="false"/> 
         <button id="unload_button" 
                 label="&devmgr.button.unload.label;"
-                onclick="doUnload();" disabled="true"/> 
-        <button id="fipsbutton" onclick="toggleFIPS();" />
+                oncommand="doUnload();" disabled="true"/> 
+        <button id="fipsbutton" oncommand="toggleFIPS();"/>
       </vbox> <!-- / Buttons for manipulating devices -->
     </row>
     <row>
       <hbox>
         <button id="help_button" 
                 label="&help.label;" 
-                orient="horizontal" class="normal"
-                oncommand="openHelp('chrome://help/content/help.xul?sec_devices');" /> 
+                class="normal"
+                oncommand="openHelp('chrome://help/content/help.xul?sec_devices');"/> 
         <button id="ok_button" 
                 label="&ok.label;" 
-                orient="horizontal" class="normal" 
-                onclick="window.close();"/> 
+                class="normal" 
+                oncommand="window.close();"/> 
       </hbox>
     </row>
   </rows>
diff --git a/security/manager/pki/resources/content/domainMismatch.xul b/security/manager/pki/resources/content/domainMismatch.xul
index fc28e9b0729..090d292983c 100644
--- a/security/manager/pki/resources/content/domainMismatch.xul
+++ b/security/manager/pki/resources/content/domainMismatch.xul
@@ -20,18 +20,17 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="domainMismatch" title="&domainMismatch.title;"
+<window id="domainMismatch" title="&domainMismatch.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   debug="false"
   width="320"
-  onload="onLoad();"
->
-<script src="chrome://global/content/strres.js" />
-<script src="pippki.js" />
-<script src="domainMismatch.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/domainMismatch.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
 <keyset id="keys">
@@ -42,13 +41,13 @@
 
 <vbox style="margin: 5px;" flex="1">
 
-  <html id="message1" />
+  <html id="message1"/>
   <separator/>
   <html id="message2" flex="100%"/>
 
   <hbox>
   <button id="examineCert-button" class="dialog" label="&examineCert.label;"
-     onclick="viewCert();"/> 
+     oncommand="viewCert();"/> 
   </hbox>
   <separator/>
  
@@ -60,11 +59,11 @@
  
   <hbox>
   <button id="ok-button" class="dialog" label="&ok.label;" primary="true"
-     style="width: 8ex" onclick="doOK();" disabled="false"/> 
+          oncommand="doOK();" disabled="false"/> 
   <button id="cancel-button" class="dialog" label="&cancel.label;"
-     style="width: 8ex" onclick="doCancel();" /> 
+          oncommand="doCancel();"/> 
   <button id="help-button" class="dialog" label="&help.label;"
-    style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?bad_name_web_cert');" /> 
+          oncommand="openHelp('chrome://help/content/help.xul?bad_name_web_cert');"/> 
   </hbox>
 </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/downloadcert.xul b/security/manager/pki/resources/content/downloadcert.xul
index a348aa9c698..3cc58246946 100644
--- a/security/manager/pki/resources/content/downloadcert.xul
+++ b/security/manager/pki/resources/content/downloadcert.xul
@@ -25,20 +25,17 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="download_cert" title="&downloadCert.title;"
+<window id="download_cert" title="&downloadCert.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="320"
   width="460"
-  onload="onLoad();"
->
+  onload="onLoad();">
 
-<script src="chrome://global/content/strres.js" />
-<script src="downloadcert.js"/>
-<script src="pippki.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/downloadcert.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
 <vbox style="margin: 5px;" flex="1">
@@ -48,7 +45,7 @@
     <html>&downloadCert.message1;</html>
   </vbox>
 
-  <separator />
+  <separator/>
 
   <!--  checkboxes for trust bits
      -  "do you want to?"
@@ -59,14 +56,14 @@
   <vbox>
     <html id="message2"/>
     <checkbox label="&downloadCert.trustSSL;" checked="false" 
-     id="trustSSL"/>
+              id="trustSSL"/>
     <checkbox label="&downloadCert.trustEmail;" checked="false" 
-     id="trustEmail"/>
+              id="trustEmail"/>
     <checkbox label="&downloadCert.trustObjSign;" checked="false" 
-     id="trustObjSign"/>
+              id="trustObjSign"/>
   </vbox>
 
-  <separator />
+  <separator/>
 
   <!--  buttons for viewing cert and policies
      -  "suggested you view the following:"
@@ -75,41 +72,41 @@
     -->
   <vbox>
     <html>&downloadCert.message3;</html>
-    <separator />
+    <separator/>
     <grid>
       <columns>
-        <column />
-        <column />
+        <column/>
+        <column/>
       </columns>
       <rows>
         <row>
           <button id="viewC-button" class="dialog" 
                   label="&downloadCert.viewCert.label;"
-                  style="width: 8ex" oncommand="viewCert();"/> 
+                  oncommand="viewCert();"/> 
           <html>&downloadCert.viewCert.text;</html>
         </row>
         <row>
           <button id="viewP-button" class="dialog" 
                   label="&downloadCert.viewPolicy.label;"
-                  style="width: 8ex" oncommand="viewPolicy();" /> 
+                  oncommand="viewPolicy();"/> 
           <html>&downloadCert.viewPolicy.text;</html>
         </row>
       </rows>
     </grid>
   </vbox>
 
-  <separator />
+  <separator/>
 
   <!--  usual runaround
      -  <ok>  <cancel> <help>
     -->
   <hbox align="center">
     <button id="ok-button" class="dialog" label="&ok.label;"
-         style="width: 8ex" oncommand="doOK();"/> 
+            oncommand="doOK();"/> 
     <button id="cancel-button" class="dialog" label="&cancel.label;"
-         style="width: 8ex" oncommand="doCancel();" /> 
+            oncommand="doCancel();"/> 
     <button id="help-button" class="dialog" label="&help.label;"
-         style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?new_ca');" /> 
+            oncommand="openHelp('chrome://help/content/help.xul?new_ca');"/> 
   </hbox>
 
 </vbox>
diff --git a/security/manager/pki/resources/content/editcacert.xul b/security/manager/pki/resources/content/editcacert.xul
index d444b550ade..4f002035271 100644
--- a/security/manager/pki/resources/content/editcacert.xul
+++ b/security/manager/pki/resources/content/editcacert.xul
@@ -31,13 +31,12 @@
         xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="setWindowName();"
-        persist="height width screenX screenY"
-        debug="false">
+        persist="height width screenX screenY">
 
-  <script src="chrome://global/content/strres.js" />
-  <script src="pippki.js" />
-  <script src="editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
   <vbox flex="1">
@@ -46,11 +45,11 @@
     <html>&certmgr.editcert.edittrust;</html>
     <vbox>
       <checkbox label="&certmgr.editcert.trustssl;" checked="false" 
-       id="trustSSL"/>
+                id="trustSSL"/>
       <checkbox label="&certmgr.editcert.trustemail;" checked="false" 
-       id="trustEmail"/>
+                id="trustEmail"/>
       <checkbox label="&certmgr.editcert.trustobjsign;" checked="false" 
-       id="trustObjSign"/>
+                id="trustObjSign"/>
     </vbox>
 
     <keyset id="keys">
@@ -61,11 +60,11 @@
 
     <hbox align="center">
       <button id="ok-button" class="dialog" label="&certmgr.ok.label;"
-           style="width: 8ex" oncommand="doOK();"/> 
+              oncommand="doOK();"/> 
       <button id="cancel-button" class="dialog" label="&certmgr.cancel.label;"
-           style="width: 8ex" oncommand="window.close();" /> 
+              oncommand="window.close();"/> 
       <button id="help-button" class="dialog" label="&certmgr.help.label;"
-           style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?edit_ca_certs');"/>
+              oncommand="openHelp('chrome://help/content/help.xul?edit_ca_certs');"/>
     </hbox>
   </vbox>
 
diff --git a/security/manager/pki/resources/content/editsslcert.xul b/security/manager/pki/resources/content/editsslcert.xul
index 85131ff87b2..0c8cc30ccfb 100644
--- a/security/manager/pki/resources/content/editsslcert.xul
+++ b/security/manager/pki/resources/content/editsslcert.xul
@@ -30,35 +30,34 @@
         title="&certmgr.editcert.title;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="doLoadForSSLCert();"
-        persist="height width screenX screenY"
-        debug="false">
+        persist="height width screenX screenY">
 
-  <script src="chrome://global/content/strres.js" />
-  <script src="pippki.js" />
-  <script src="editcerts.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/editcerts.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
   <vbox flex="1">
     <html id="certmsg"/>
     <html id="issuer"/>
-    <separator />
+    <separator/>
     <html>&certmgr.editsslcert.edittrust;</html>
     <vbox>
       <radiogroup id="sslTrustGroup" orient="vertical" flex="1">
         <radio label="&certmgr.editsslcert.dotrust;"
-          id="trustSSLCert" group="sslTrustGroup"/>
+               id="trustSSLCert" group="sslTrustGroup"/>
         <radio label="&certmgr.editsslcert.donttrust;"
-          id="dontTrustSSLCert" group="sslTrustGroup"/>
+               id="dontTrustSSLCert" group="sslTrustGroup"/>
       </radiogroup>
     </vbox>
     <hbox align="center">
       <button id="ok-button" class="dialog" label="&certmgr.ok.label;"
-           style="width: 8ex" oncommand="doSSLOK();"/> 
+              oncommand="doSSLOK();"/> 
       <button id="cancel-button" class="dialog" label="&certmgr.cancel.label;"
-           style="width: 8ex" oncommand="window.close();" /> 
+              oncommand="window.close();"/> 
       <button id="help-button" class="dialog" label="&certmgr.help.label;"
-           style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?edit_web_certs');" />
+              oncommand="openHelp('chrome://help/content/help.xul?edit_web_certs');"/>
     </hbox>
   </vbox>
 
diff --git a/security/manager/pki/resources/content/escrowWarn.xul b/security/manager/pki/resources/content/escrowWarn.xul
index aa5bd8e2b56..2bcc29c6a1e 100644
--- a/security/manager/pki/resources/content/escrowWarn.xul
+++ b/security/manager/pki/resources/content/escrowWarn.xul
@@ -20,18 +20,16 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="escrowWarnDialog" title="&escrowWarn.title;"
+<window id="escrowWarnDialog" title="&escrowWarn.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="280"
   width="400"
-  onload="onLoad();"
->
-<script src="chrome://global/content/strres.js" />
-<script src="pippki.js" />
-<script src="escrowWarn.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/escrowWarn.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <keyset id="keys">
   <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
@@ -47,19 +45,19 @@
   <separator/>
   <html>&escrowWarn.message2;</html>
   <separator/>
-  <html id="message1" />
+  <html id="message1"/>
   <hbox>
   <button id="examineCert-button" class="dialog" label="&examineCert.label;"
-     onclick="viewCert();"/> 
+          oncommand="viewCert();"/> 
   </hbox>
   <separator/>
   <hbox>
   <button id="ok-button" class="dialog" label="&ok.label;"
-     style="width: 10ex" onclick="doOK();" disabled="false"/> 
+          oncommand="doOK();" disabled="false"/> 
   <button id="cancel-button" class="dialog" label="&cancel.label;"
-     style="width: 10ex" onclick="doCancel();" /> 
+          oncommand="doCancel();"/> 
   <button id="help-button" class="dialog" label="&help.label;"
-    style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?priv_key_copy');" /> 
+          oncommand="openHelp('chrome://help/content/help.xul?priv_key_copy');"/> 
   </hbox>
 </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/getp12password.xul b/security/manager/pki/resources/content/getp12password.xul
index 6ab3aee1ffa..41509ea3a56 100644
--- a/security/manager/pki/resources/content/getp12password.xul
+++ b/security/manager/pki/resources/content/getp12password.xul
@@ -27,18 +27,15 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="getp12password" title="&pkcs12.getpassword.title;"
+<window id="getp12password" title="&pkcs12.getpassword.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="200"
   width="300"
-  onload="onP12Load();"
->
+  onload="onP12Load();">
 
-  <script src="password.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
+  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <keyset id="keys">
     <key id="enter-key"  keycode="VK_ENTER"  oncommand="getPassword();"/>
@@ -50,22 +47,22 @@
     <html>&pkcs12.getpassword.message;</html>
     <separator />
     <grid>
-      <columns> <column /> <column /> </columns>
+      <columns> <column/> <column/> </columns>
       <rows>
         <row>
-          <text value="&getPassword.password.label;" /> 
-          <textbox id="pw1" type="password" maxlength="30" /> 
+          <text value="&getPassword.password.label;"/> 
+          <textbox id="pw1" type="password" maxlength="30"/> 
         </row>
       </rows>
     </grid>
     <hbox>
       <button id="ok-button" class="dialog" label="&ok.label;"
-              style="width: 8ex" oncommand="getPassword();" 
-              default="true" accesskey="o" /> 
+              oncommand="getPassword();" 
+              default="true" accesskey="o"/> 
       <button id="cancel-button" class="dialog" label="&cancel.label;"
-              style="width: 8ex" oncommand="window.close();" /> 
+              oncommand="window.close();"/> 
       <button id="help-button" class="dialog" label="&help.label;"
-              style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?my_certs');" /> 
+              oncommand="openHelp('chrome://help/content/help.xul?my_certs');"/> 
     </hbox>
   </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/getpassword.xul b/security/manager/pki/resources/content/getpassword.xul
index fbdae91a4a6..1e52ae2545c 100644
--- a/security/manager/pki/resources/content/getpassword.xul
+++ b/security/manager/pki/resources/content/getpassword.xul
@@ -27,31 +27,28 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="getpassword" title="&getPassword.title;"
+<window id="getpassword" title="&getPassword.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="320"
   width="300"
-  onload="onLoad();"
->
+  onload="onLoad();">
 
-  <script src="password.js"/>
-  <script src="chrome://global/content/strres.js" />
+  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <vbox style="margin: 5px;" flex="1">
     <hbox>
       <text value="&getPassword.tokenName.label;:"/>
-      <text id="tokenName" />
+      <text id="tokenName"/>
     </hbox>
-    <separator />
+    <separator/>
     <grid>
-      <columns> <column /> <column /> </columns>
+      <columns> <column/> <column/> </columns>
       <rows>
         <row>
-          <text value="&getPassword.password.label;" /> 
-          <textbox id="pw1" type="password" maxlength="30" /> 
+          <text value="&getPassword.password.label;"/> 
+          <textbox id="pw1" type="password" maxlength="30"/> 
         </row>
       </rows>
     </grid>
@@ -64,12 +61,12 @@
 
     <hbox>
       <button id="ok-button" class="dialog" label="&ok.label;"
-              style="width: 8ex" oncommand="getPassword();" 
-              default="true" accesskey="o" /> 
+              oncommand="getPassword();" 
+              default="true" accesskey="o"/> 
       <button id="cancel-button" class="dialog" label="&cancel.label;"
-              style="width: 8ex" oncommand="window.close();" /> 
+              oncommand="window.close();"/> 
       <button id="help-button" class="dialog" label="&help.label;"
-              style="width: 8ex" oncommand="alert('help goes here');" /> 
+              oncommand="alert('help goes here');"/> 
     </hbox>
   </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/load_device.xul b/security/manager/pki/resources/content/load_device.xul
index 464b3e9dc03..95b9898f179 100644
--- a/security/manager/pki/resources/content/load_device.xul
+++ b/security/manager/pki/resources/content/load_device.xul
@@ -35,8 +35,8 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
         title="&loaddevice.title;">
 
-  <script src="chrome://global/content/strres.js" />
-  <script src="device_manager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/device_manager.js"/>
 
   <vbox>
     <html>&loaddevice.info;</html>
@@ -47,17 +47,17 @@
     <hbox>
       <html>&loaddevice.filename;</html>
       <textbox id="device_path" flex="1"/>
-      <button label="&loaddevice.browse;" flex="1" onclick="doBrowseFiles();"/>
+      <button label="&loaddevice.browse;" flex="1" oncommand="doBrowseFiles();"/>
     </hbox>
     <hbox>
       <button id="ok_button"
               label="&ok.label;" 
-              orient="horizontal" class="normal" 
-              onclick="doLoadDevice();"/> 
+              class="normal" 
+              oncommand="doLoadDevice();"/> 
       <button id="cancel_button" 
               label="&cancel.label;" 
-              orient="horizontal" class="normal" 
-              onclick="window.close();"/> 
+              class="normal" 
+              oncommand="window.close();"/> 
     </hbox>
   </vbox>
 
diff --git a/security/manager/pki/resources/content/newserver.xul b/security/manager/pki/resources/content/newserver.xul
index 8a6ebdec4f4..06844a6f16d 100644
--- a/security/manager/pki/resources/content/newserver.xul
+++ b/security/manager/pki/resources/content/newserver.xul
@@ -36,10 +36,10 @@
   onload="onLoad();"
   orient="vertical">
 
-<script type="application/x-javascript" src="chrome://global/content/strres.js" />
-<script type="application/x-javascript" src="pippki.js" />
-<script type="application/x-javascript" src="newserver.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/newserver.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <keyset id="dialogKeys"/>
 
@@ -56,7 +56,7 @@
 
       <vbox autostretch="never" flex="1" align="right">
         <button id="examineCert-button" label="&examineCert.label;"
-                onclick="viewCert();"/> 
+                oncommand="viewCert();"/> 
       </vbox>
 
       <checkbox checked="false" id="alwaysAccept" label="&alwaysAccept.label;"/>
diff --git a/security/manager/pki/resources/content/pref-certs.xul b/security/manager/pki/resources/content/pref-certs.xul
index 17d1ea7b28d..e4e2c1924d9 100644
--- a/security/manager/pki/resources/content/pref-certs.xul
+++ b/security/manager/pki/resources/content/pref-certs.xul
@@ -37,10 +37,10 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical" title="certs.title;"
-        onload="parent.initPanel('chrome://pippki/content/pref-certs.xul');" >
+        onload="parent.initPanel('chrome://pippki/content/pref-certs.xul');">
 
   <!-- List elements to manage for prefs -->
-  <script type="application/x-javascript" src="pref-security.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pref-security.js"/>
   <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = [ "certSelection" ];
@@ -55,7 +55,7 @@
     <html> &certselect.description; </html>
     <!-- Prefs -->
     <radiogroup id="certSelection" pref="true" preftype="string" 
-	prefstring="security.default_personal_cert" prefattribute="value">
+	        prefstring="security.default_personal_cert" prefattribute="value">
     <radio group="certSelection" label="&certselect.auto;" value="Select Automatically"/>
     <radio group="certSelection" label="&certselect.ask;" value="Ask Every Time"/>
     </radiogroup>
@@ -64,30 +64,26 @@
   <!-- Certificate manager -->
   <groupbox orient="vertical">
     <label value="&managecerts.label;"/>
-    <html>
-      &managecerts.text;
-    </html>
+    <html>&managecerts.text;</html>
     <hbox halign="left" autostretch="never">
       <button class="dialog" label="&managecerts.button;" disabled="false"
-        oncommand="openCertManager();" 
-        id="openCertManagerButton"
-        pref="true" preftype="bool" prefattribute="disabled"
-        prefstring="security.disable_button.openCertManager" />
+              oncommand="openCertManager();" 
+              id="openCertManagerButton"
+              pref="true" preftype="bool" prefattribute="disabled"
+              prefstring="security.disable_button.openCertManager"/>
     </hbox>
   </groupbox>
 
   <!-- Device manager -->
   <groupbox orient="vertical">
     <label value="&managedevices.label;"/>
-    <html>
-      &managedevices.text;
-    </html>
+    <html>&managedevices.text;</html>
     <hbox halign="left" autostretch="never">
       <button class="dialog" label="&managedevices.button;" disabled="false"
-        oncommand="openDeviceManager();"
-        id="openDeviceManagerButton"
-        pref="true" preftype="bool" prefattribute="disabled"
-        prefstring="security.disable_button.openDeviceManager" />
+              oncommand="openDeviceManager();"
+              id="openDeviceManagerButton"
+              pref="true" preftype="bool" prefattribute="disabled"
+              prefstring="security.disable_button.openDeviceManager"/>
     </hbox>
   </groupbox>
 
diff --git a/security/manager/pki/resources/content/pref-ciphers.xul b/security/manager/pki/resources/content/pref-ciphers.xul
index e63234455ff..78f077a46cb 100644
--- a/security/manager/pki/resources/content/pref-ciphers.xul
+++ b/security/manager/pki/resources/content/pref-ciphers.xul
@@ -25,14 +25,13 @@
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
-<?xul-overlay href="chrome://global/content/dialogOverlay.xul" ?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<window
-  id="pref-ciphers" title="&cipher.title;"
+<window id="pref-ciphers" title="&cipher.title;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  onload="onLoad();" orient="vertical"
->
-  <script><![CDATA[
+  onload="onLoad();" orient="vertical">
+
+  <script type="application/x-javascript"><![CDATA[
     var prefs = null;
 
     function onLoad() {
@@ -95,17 +94,17 @@
     <label value="&cipher.ssl2.label;"/>
 
     <checkbox label="&cipher.ssl2.rc4_128;" pref="true"
-         prefstring="security.ssl2.rc4_128"/>
+              prefstring="security.ssl2.rc4_128"/>
     <checkbox label="&cipher.ssl2.rc2_128;" pref="true"
-         prefstring="security.ssl2.rc2_128"/>
+              prefstring="security.ssl2.rc2_128"/>
     <checkbox label="&cipher.ssl2.des_ede3_192;" pref="true"
-         prefstring="security.ssl2.des_ede3_192"/>
+              prefstring="security.ssl2.des_ede3_192"/>
     <checkbox label="&cipher.ssl2.des_64;" pref="true"
-         prefstring="security.ssl2.des_64"/>
+              prefstring="security.ssl2.des_64"/>
     <checkbox label="&cipher.ssl2.rc4_40;" pref="true"
-         prefstring="security.ssl2.rc4_40"/>
+              prefstring="security.ssl2.rc4_40"/>
     <checkbox label="&cipher.ssl2.rc2_40;" pref="true"
-         prefstring="security.ssl2.rc2_40"/>
+              prefstring="security.ssl2.rc2_40"/>
 
   </groupbox>
 
@@ -113,25 +112,25 @@
     <label value="&cipher.ssl3.label;"/>
 
     <checkbox label="&cipher.ssl3.rsa_rc4_128_md5;" pref="true"
-         prefstring="security.ssl3.rsa_rc4_128_md5"/>
+              prefstring="security.ssl3.rsa_rc4_128_md5"/>
     <checkbox label="&cipher.ssl3.rsa_fips_des_ede3_sha;" pref="true"
-         prefstring="security.ssl3.rsa_fips_des_ede3_sha"/>
+              prefstring="security.ssl3.rsa_fips_des_ede3_sha"/>
     <checkbox label="&cipher.ssl3.rsa_des_ede3_sha;" pref="true"
-         prefstring="security.ssl3.rsa_des_ede3_sha"/>
+              prefstring="security.ssl3.rsa_des_ede3_sha"/>
     <checkbox label="&cipher.ssl3.rsa_fips_des_sha;" pref="true"
-         prefstring="security.ssl3.rsa_fips_des_sha"/>
+              prefstring="security.ssl3.rsa_fips_des_sha"/>
     <checkbox label="&cipher.ssl3.rsa_des_sha;" pref="true"
-         prefstring="security.ssl3.rsa_des_sha"/>
+              prefstring="security.ssl3.rsa_des_sha"/>
     <checkbox label="&cipher.ssl3.rsa_1024_rc4_56_sha;" pref="true"
-         prefstring="security.ssl3.rsa_1024_rc4_56_sha"/>
+              prefstring="security.ssl3.rsa_1024_rc4_56_sha"/>
     <checkbox label="&cipher.ssl3.rsa_1024_des_cbc_sha;" pref="true"
-         prefstring="security.ssl3.rsa_1024_des_cbc_sha"/>
+              prefstring="security.ssl3.rsa_1024_des_cbc_sha"/>
     <checkbox label="&cipher.ssl3.rsa_rc4_40_md5;" pref="true"
-         prefstring="security.ssl3.rsa_rc4_40_md5"/>
+              prefstring="security.ssl3.rsa_rc4_40_md5"/>
     <checkbox label="&cipher.ssl3.rsa_rc2_40_md5;" pref="true"
-         prefstring="security.ssl3.rsa_rc2_40_md5"/>
+              prefstring="security.ssl3.rsa_rc2_40_md5"/>
     <checkbox label="&cipher.ssl3.rsa_null_md5;" pref="true"
-         prefstring="security.ssl3.rsa_null_md5"/>
+              prefstring="security.ssl3.rsa_null_md5"/>
   </groupbox>
 
   <separator/>
diff --git a/security/manager/pki/resources/content/pref-masterpass.xul b/security/manager/pki/resources/content/pref-masterpass.xul
index 4bf9c536907..91a2e3e3716 100644
--- a/security/manager/pki/resources/content/pref-masterpass.xul
+++ b/security/manager/pki/resources/content/pref-masterpass.xul
@@ -34,9 +34,9 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical" title="certs.title;"
-        onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();" >
+        onload="parent.initPanel('chrome://pippki/content/pref-masterpass.xul'); onMasterPasswordLoad();">
 
-  <script type="application/x-javascript" src="pref-masterpass.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pref-masterpass.js"/>
 
   <!-- Fancy panel header -->
   <hbox class="box-smallheader" title="&lheader;"/>
@@ -44,24 +44,20 @@
   <!-- Change Password -->
   <groupbox orient="vertical">
     <label value="&changepassword.label;"/>
-    <html>
-      &changepassword.text;
-    </html>
+    <html>&changepassword.text;</html>
     <hbox halign="left" autostretch="never">
       <button class="dialog" label="&changepassword.button;" disabled="false"
-        oncommand="ChangePW();"
-        id="changePasswordButton"
-        pref="true" preftype="bool" prefattribute="disabled"
-        prefstring="security.disable_button.changePassword" />
+              oncommand="ChangePW();"
+              id="changePasswordButton"
+              pref="true" preftype="bool" prefattribute="disabled"
+              prefstring="security.disable_button.changePassword"/>
     </hbox>
   </groupbox>
 
   <!-- Password Prefs -->
   <groupbox orient="vertical">
     <label value="&managepassword.label;"/>
-    <html>
-      &managepassword.text;
-    </html>
+    <html>&managepassword.text;</html>
     <hbox halign="left" autostretch="never">
       <radiogroup id="passwordAskTimes" orient="vertical" 
                   pref="true" preftype="int" 
@@ -73,20 +69,20 @@
           <rows>
             <box>
               <radio value="0" label="" style="margin: 0px; max-width: 2em;"
-                id="askFirstTime" group="passwordAskTimes"
-                oncommand="changePasswordSettings();"/>
+                     id="askFirstTime" group="passwordAskTimes"
+                     oncommand="changePasswordSettings();"/>
               <text value="&managepassword.askfirsttime;" style="margin: 4px;"/>
             </box>
             <box>
               <radio value="1" label="" style="margin: 0px; max-width: 2em;"
-                id="askEveryTime" group="passwordAskTimes"
-                oncommand="changePasswordSettings();"/>
+                     id="askEveryTime" group="passwordAskTimes"
+                     oncommand="changePasswordSettings();"/>
               <text value="&managepassword.askeverytime;" style="margin: 4px;"/>
             </box>
             <box>
               <radio value="2" label="" style="margin: 0px; max-width: 2em;"
-                id="askTimeout" group="passwordAskTimes"
-                oncommand="changePasswordSettings();"/>
+                     id="askTimeout" group="passwordAskTimes"
+                     oncommand="changePasswordSettings();"/>
               <text value="&managepassword.asktimeout;" style="margin: 4px;"/>
               <textbox id="passwordTimeout" size="4"
                        pref="true" preftype="int"
diff --git a/security/manager/pki/resources/content/pref-ssl.xul b/security/manager/pki/resources/content/pref-ssl.xul
index be8e6a9ea0c..46d58541b08 100644
--- a/security/manager/pki/resources/content/pref-ssl.xul
+++ b/security/manager/pki/resources/content/pref-ssl.xul
@@ -35,7 +35,7 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical" title="Security Preferences"
-        onload="parent.initPanel('chrome://pippki/content/pref-ssl.xul');" >
+        onload="parent.initPanel('chrome://pippki/content/pref-ssl.xul');">
 
   <!-- List elements to manage for prefs -->
   <script type="application/x-javascript">
@@ -68,18 +68,18 @@
 
     <vbox halign="right">
       <button class="dialog" label="&edit.sslciphers;"
-        oncommand="window.openDialog('chrome://pippki/content/pref-ciphers.xul', '',
-                       'modal=yes,resizable,chrome');"
-        id="editSSLCiphersButton"
-        pref="true" preftype="bool" prefattribute="disabled"
-        prefstring="security.disable_button.editSSLCiphers" />
+              oncommand="window.openDialog('chrome://pippki/content/pref-ciphers.xul', '',
+                             'modal=yes,resizable,chrome');"
+              id="editSSLCiphersButton"
+              pref="true" preftype="bool" prefattribute="disabled"
+              prefstring="security.disable_button.editSSLCiphers"/>
     </vbox>
 
   </groupbox>
 
-  <groupbox orient="vertical" autostretch="never" >
+  <groupbox orient="vertical" autostretch="never">
     <label value="&SSLWarnings;"/>
-    <html> &warn.description; </html>
+    <html>&warn.description;</html>
     <!-- Prefs -->
     <checkbox id="warnEnteringSecure" label="&warn.enteringsecure;"
               pref="true" preftype="bool" prefstring="security.warn_entering_secure"
diff --git a/security/manager/pki/resources/content/pref-validation.xul b/security/manager/pki/resources/content/pref-validation.xul
index 5862a4c177c..afb78a79275 100644
--- a/security/manager/pki/resources/content/pref-validation.xul
+++ b/security/manager/pki/resources/content/pref-validation.xul
@@ -34,7 +34,7 @@
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         orient="vertical"
-        onload="onLoad();" >
+        onload="onLoad();">
 
   <!-- List elements to manage for prefs -->
   <script type="application/x-javascript">
@@ -43,30 +43,30 @@
   ]]>
   </script>
             
-  <script src="pref-validation.js"/>
+  <script type="application/x-javascript" src="chrome://pippki/content/pref-validation.js"/>
 
   <!-- Fancy panel header -->
   <hbox class="box-smallheader" title="&validation.title;"/>
 
   <groupbox orient="vertical">
     <label value="&validation.crl.label;"/>
-    <html> &validation.crl.description; </html>
+    <html>&validation.crl.description;</html>
     <hbox halign="left" autostretch="never">
       <button class="dialog" label="&validation.managecrls.button;"
-        oncommand="openCrlManager();"
-        id="managecrlbutton"
-        pref="true" preftype="bool" prefattribute="disabled"
-        prefstring="security.OCSP.disable_button.managecrl" />
+              oncommand="openCrlManager();"
+              id="managecrlbutton"
+              pref="true" preftype="bool" prefattribute="disabled"
+              prefstring="security.OCSP.disable_button.managecrl"/>
     </hbox>
   </groupbox>
 
   <groupbox orient="vertical" autostretch="never" >
     <label value="&validation.ocsp.label;"/>
-    <html> &validation.ocsp.description; </html>
+    <html>&validation.ocsp.description;</html>
     <!-- Prefs -->
     <radiogroup id="securityOCSPEnabled" orient="vertical" autostretch="never"
-                 pref="true" preftype="int" prefstring="security.OCSP.enabled"
-                  prefattribute="value">
+                pref="true" preftype="int" prefstring="security.OCSP.enabled"
+                prefattribute="value">
         <radio group="securityOCSPEnabled" value="0" label="&disableOCSP.label;" oncommand="doEnabling();"/>
         <radio group="securityOCSPEnabled" value="1" label="&certOCSP.label;" oncommand="doEnabling();"/>
         <radio group="securityOCSPEnabled" value="2" label="&proxyOCSP.label;" oncommand="doEnabling();"/>
@@ -81,14 +81,14 @@
             <row>
               <text class="label" value="&signingCA.label;" for="signingCA"/>
               <menulist id="signingCA" pref="true" preftype="string" prefstring="security.OCSP.signingCA"
-                           prefattribute="value" flex="1" oncommand="changeURL()">
+                        prefattribute="value" flex="1" oncommand="changeURL()">
                 <menupopup/>
               </menulist>
             </row>
             <row>
               <text class="label" value="&serviceURL.label;" for="serviceURL"/>
               <textbox id="serviceURL" pref="true" preftype="string" prefstring="security.OCSP.URL"
-                           prefattribute="value" flex="1"/>
+                       prefattribute="value" flex="1"/>
             </row>
          </rows>
        </grid>
diff --git a/security/manager/pki/resources/content/serverCertExpired.xul b/security/manager/pki/resources/content/serverCertExpired.xul
index dbc8d0bf651..c57fedeb230 100644
--- a/security/manager/pki/resources/content/serverCertExpired.xul
+++ b/security/manager/pki/resources/content/serverCertExpired.xul
@@ -20,18 +20,16 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="serverCertExpired"
+<window id="serverCertExpired"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   width="300"
-  onload="onLoad();"
->
-<script src="chrome://global/content/strres.js" />
-<script src="pippki.js" />
-<script src="serverCertExpired.js" />
-<script type="application/x-javascript" src="chrome://help/content/help.js" />
+  onload="onLoad();">
+
+<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/pippki.js"/>
+<script type="application/x-javascript" src="chrome://pippki/content/serverCertExpired.js"/>
+<script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 <keyset id="keys">
   <key id="enter-key"  keycode="VK_ENTER"  oncommand="doOK()"    />
@@ -49,16 +47,16 @@
   <separator/>
   <hbox>
   <button id="examineCert-button" class="dialog" label="&examineCert.label;"
-     onclick="viewCert();"/> 
+          oncommand="viewCert();"/> 
   </hbox>
   <separator/>
   <hbox>
   <button id="ok-button" class="dialog" label="&ok.label;" primary="true"
-     style="width: 10ex" onclick="doOK();" disabled="false"/> 
+          oncommand="doOK();" disabled="false"/> 
   <button id="cancel-button" class="dialog" label="&cancel.label;"
-     style="width: 10ex" onclick="doCancel();" /> 
+          oncommand="doCancel();"/> 
   <button id="help-button" class="dialog" label="&help.label;"
-    style="width: 10ex" oncommand="openHelp('chrome://help/content/help.xul?exp_web_cert');" /> 
+          oncommand="openHelp('chrome://help/content/help.xul?exp_web_cert');"/> 
   </hbox>
 </vbox>
 </window>
diff --git a/security/manager/pki/resources/content/setp12password.xul b/security/manager/pki/resources/content/setp12password.xul
index d2246072d51..06e775a4fc3 100644
--- a/security/manager/pki/resources/content/setp12password.xul
+++ b/security/manager/pki/resources/content/setp12password.xul
@@ -27,41 +27,38 @@
 
 <!DOCTYPE window SYSTEM "chrome://pippki/locale/pippki.dtd">
 
-<window
-  id="setp12password" title="&pkcs12.setpassword.title;"
+<window id="setp12password" title="&pkcs12.setpassword.title;"
   xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
-  debug="false"
   height="480"
   width="360"
-  onload="onP12Load();"
->
+  onload="onP12Load();">
 
-  <script src="password.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/help.js" />
+  <script type="application/x-javascript" src="chrome://pippki/content/password.js"/>
+  <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
 
   <vbox style="margin: 5px;" flex="1">
     <html>&pkcs12.setpassword.message;</html>
     <separator />
     <grid>
-      <columns> <column /> <column /> </columns>
+      <columns> <column/> <column/> </columns>
       <rows>
         <row>
-          <text value="&pkcs12.setpassword.label1;" /> 
+          <text value="&pkcs12.setpassword.label1;"/> 
           <textbox id="pw1" type="password" maxlength="30" 
                    onkeypress="setPasswordStrength(); checkPasswords();"/> 
         </row>
         <row>
-          <text value="&pkcs12.setpassword.label2;" /> 
+          <text value="&pkcs12.setpassword.label2;"/> 
           <textbox id="pw2" type="password" maxlength="30" 
                    onkeypress="checkPasswords();"/>  
         </row>
       </rows>
     </grid>
-    <separator />
+    <separator/>
     <html>&pkcs12.setpassword.reminder;</html>
-    <separator />
+    <separator/>
     <text value="&setPassword.meter.label;"/>
     <grid style="margin: 4px;">
       <rows> <row/> </rows>
@@ -69,7 +66,7 @@
         <column style="margin: 5px;">
           <progressmeter flex="1" id="pwmeter" mode="determined" value="0%"
                          orient="horizontal" progresstext="Loading"
-                         width="200" style="foreground-color: red" /> 
+                         width="200" style="foreground-color: red"/> 
         </column>
       </columns>
     </grid>
@@ -80,11 +77,11 @@
     </keyset>
     <hbox>
       <button id="ok-button" class="dialog" label="&ok.label;"
-              style="width: 8ex" oncommand="setP12Password();" disabled="true"/> 
+              oncommand="setP12Password();" disabled="true"/> 
       <button id="cancel-button" class="dialog" label="&cancel.label;"
-              style="width: 8ex" oncommand="window.close();" /> 
+              oncommand="window.close();"/> 
       <button id="help-button" class="dialog" label="&help.label;"
-              style="width: 8ex" oncommand="openHelp('chrome://help/content/help.xul?cert_backup_pwd');" /> 
+              oncommand="openHelp('chrome://help/content/help.xul?cert_backup_pwd');"/> 
     </hbox>
   </vbox>
   
diff --git a/security/manager/pki/resources/content/viewCertDetails.xul b/security/manager/pki/resources/content/viewCertDetails.xul
index caedc044fbb..fb8e0fc1417 100644
--- a/security/manager/pki/resources/content/viewCertDetails.xul
+++ b/security/manager/pki/resources/content/viewCertDetails.xul
@@ -29,89 +29,89 @@
          xmlns:cert="http://netscape.com/rdf-cert#" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <vbox class="box-padded" id="general_info">
-  <vbox id="verify_info_box" >
+  <vbox id="verify_info_box">
     <text class="header" id="verified"/>
   </vbox>
-  <separator class="groove" />
+  <separator class="groove"/>
   <vbox flex="1">
     <grid> 
       <columns>
-        <column />
-        <column />
+        <column/>
+        <column/>
       </columns>
       <rows>
         <row>
-          <text class="header" value="&certmgr.subjectinfo.label;" />
-          <spring />
-          <spring />
+          <text class="header" value="&certmgr.subjectinfo.label;"/>
+          <spring/>
+          <spring/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.cn;" /> 
+          <text class="label" value="&certmgr.certdetail.cn;"/> 
           <text id="commonname"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.o;" /> 
+          <text class="label" value="&certmgr.certdetail.o;"/> 
           <text id="organization"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.ou;" /> 
+          <text class="label" value="&certmgr.certdetail.ou;"/> 
           <text id="orgunit"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.serialnumber;" /> 
-          <text id="serialnumber" />
+          <text class="label" value="&certmgr.certdetail.serialnumber;"/> 
+          <text id="serialnumber"/>
         </row>
         <row>
-          <separator class="thin" />
-          <spring />
+          <separator class="thin"/>
+          <spring/>
         </row>
         <row>
-          <text class="header" value="&certmgr.issuerinfo.label;" />
-          <spring />
+          <text class="header" value="&certmgr.issuerinfo.label;"/>
+          <spring/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.cn;" /> 
+          <text class="label" value="&certmgr.certdetail.cn;"/> 
           <text id="issuercommonname"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.o;" /> 
+          <text class="label" value="&certmgr.certdetail.o;"/> 
           <text id="issuerorganization"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.ou;" /> 
+          <text class="label" value="&certmgr.certdetail.ou;"/> 
           <text id="issuerorgunit"/>
         </row>
         <row>
-          <separator class="thin" />
-          <spring />
+          <separator class="thin"/>
+          <spring/>
         </row>
         <row>
-          <text class = "header" value="&certmgr.validity.label;" />
-          <spring />
+          <text class ="header" value="&certmgr.validity.label;"/>
+          <spring/>
         </row>
         <row>
-          <text class="label" value="&certmgr.issued;" />
-          <text id="validitystart" />
+          <text class="label" value="&certmgr.issued;"/>
+          <text id="validitystart"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.expires;" />
-          <text id="validityend" />
+          <text class="label" value="&certmgr.expires;"/>
+          <text id="validityend"/>
         </row>
         <row>
-          <separator class="thin" />
-          <spring />
+          <separator class="thin"/>
+          <spring/>
         </row>
         <row>
-          <text class="header" value="&certmgr.fingerprints.label;" />
-          <spring />
+          <text class="header" value="&certmgr.fingerprints.label;"/>
+          <spring/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.sha1fingerprint;" /> 
-          <text id="sha1fingerprint" />
+          <text class="label" value="&certmgr.certdetail.sha1fingerprint;"/> 
+          <text id="sha1fingerprint"/>
         </row>
         <row>
-          <text class="label" value="&certmgr.certdetail.md5fingerprint;" /> 
-          <text id="md5fingerprint" />
+          <text class="label" value="&certmgr.certdetail.md5fingerprint;"/> 
+          <text id="md5fingerprint"/>
         </row>
       </rows>
     </grid>