diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 95cbc4cbbf5..78fe4702acf 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -201,7 +201,8 @@ Contributor(s): ______________________________________. -->
       <menubutton class="button-toolbar bookmark-item" id="bookmarks-button"   
                   persist="hidden" value="&bookmarksButton.label;" hidden="false"
                   datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch rdf:httpindex"
-                  ref="NC:BookmarksRoot" container="true" flags="dont-test-empty">
+                  ref="NC:BookmarksRoot" container="true" flags="dont-test-empty"
+                  oncommand="OpenBookmarkURL(event.target,document.getElementById('BookmarksMenu').database)" >
         <template>
           <rule iscontainer="true">
             <menupopup>
@@ -219,8 +220,7 @@ Contributor(s): ______________________________________. -->
           <rule>
             <menupopup>
               <menuitem class="menuitem-iconic bookmark-item" uri="rdf:*"
-                        value="rdf:http://home.netscape.com/NC-rdf#Name"
-                        oncommand="OpenBookmarkURL(event.target,document.getElementById('BookmarksMenu').database)" />
+                        value="rdf:http://home.netscape.com/NC-rdf#Name" />
             </menupopup>
            </rule>
         </template>
@@ -235,8 +235,9 @@ Contributor(s): ______________________________________. -->
  
       <!-- Personal toolbar items -->
       <hbox id="innermostBox" flex="1" style="min-width: 1px;" context="contextual"
-            datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch rdf:httpindex"
-            ref="NC:PersonalToolbarFolder" flags="dont-test-empty">
+           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch rdf:httpindex"
+           ref="NC:PersonalToolbarFolder" flags="dont-test-empty"
+           oncommand="OpenBookmarkURL(event.target, document.getElementById('innermostBox').database)">
         <template>
           <rule parent="hbox" iscontainer="true">
             <menubutton class="button-toolbar bookmark-item" uri="rdf:*" 
@@ -251,10 +252,9 @@ Contributor(s): ______________________________________. -->
           </rule>
 
           <rule parent="hbox">
-            <button class="button-toolbar bookmark-item" uri="rdf:*"
-                    tooltip="aTooltip" tooltiptext="rdf:http://home.netscape.com/NC-rdf#URL"
-                    value="rdf:http://home.netscape.com/NC-rdf#Name" crop="right"
-                    oncommand="OpenBookmarkURL(event.target, document.getElementById('innermostBox').database);"/>
+            <button class="button-toolbar bookmark-item" uri="rdf:*" 
+              tooltip="aTooltip" tooltiptext="rdf:http://home.netscape.com/NC-rdf#URL"
+              value="rdf:http://home.netscape.com/NC-rdf#Name" crop="right"/>
           </rule>
         
           <rule iscontainer="true">
@@ -273,8 +273,7 @@ Contributor(s): ______________________________________. -->
           <rule>
             <menupopup>
               <menuitem class="menuitem-iconic bookmark-item" uri="rdf:*"
-                        value="rdf:http://home.netscape.com/NC-rdf#Name"
-                        oncommand="OpenBookmarkURL(event.target, document.getElementById('innermostBox').database)"/>
+                        value="rdf:http://home.netscape.com/NC-rdf#Name"/>
             </menupopup>
           </rule>
         </template>
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 747ed0465af..f2dc3d1e8ff 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -224,8 +224,8 @@
             datasources="rdf:chrome" 
             ref="urn:mozilla:locale:root" 
             sortResource="http://www.mozilla.org/rdf/chrome#name"
-            sortDirection="ascending" 
-            >
+            sortDirection="ascending"
+            oncommand="selectLocale(event)">
        <menupopup>
           <menuitem value="&downloadMore.label;" 
                     accesskey="&downloadMore.accesskey;" 
@@ -238,7 +238,7 @@
               <menuitem class="standard" uri="rdf:*" 
                         value="rdf:http://www.mozilla.org/rdf/chrome#displayName"
                         data="rdf:http://www.mozilla.org/rdf/chrome#name" 
-                        oncommand="selectLocale(event)" />
+                        />
             </menupopup>
           </rule>
          </template>
@@ -249,13 +249,13 @@
       <menuseparator/>
       <menu id="menu_Themes" value="&applyTheme.label;"
                          accesskey="&applyTheme.accesskey;">
-                            <menupopup id="applyThemePopup" datasources="rdf:chrome" ref="urn:mozilla:skin:root">                                
+                            <menupopup id="applyThemePopup" datasources="rdf:chrome" ref="urn:mozilla:skin:root" oncommand="applyTheme(event.target)">                                
  <menuitem id="themePrefs"
 oncommand="goPreferences('pref-themes.xul','chrome://communicator/content/pref/pref-themes.xul')" value="&themePreferencesCmd.label;" accesskey="&themePreferencesCmd.accesskey;"/>
 <menuitem id="getNewThemes" oncommand="getNewThemes();" value="&getNewThemesCmd.label;" accesskey="&getNewThemesCmd.accesskey;"/>
 <menuseparator/>
 <template>
-<menuitem uri="..." value="rdf:http://www.mozilla.org/rdf/chrome#displayName" name="rdf:http://www.mozilla.org/rdf/chrome#name" oncommand="applyTheme(event.target)"/>
+<menuitem uri="..." value="rdf:http://www.mozilla.org/rdf/chrome#displayName" name="rdf:http://www.mozilla.org/rdf/chrome#name"/>
 </template>
                            </menupopup>
               </menu>
@@ -289,7 +289,7 @@ oncommand="goPreferences('pref-themes.xul','chrome://communicator/content/pref/p
   </menu>       
 
       <menu accesskey="&bookmarksMenu.accesskey;" value="&bookmarksMenu.label;"
-                           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot" flags="dont-test-empty">
+                           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" id="BookmarksMenu" ref="NC:BookmarksRoot" flags="dont-test-empty" oncommand="OpenBookmarkURL(event.target, document.getElementById('BookmarksMenu').database)">
 		<template>
 			<rule iscontainer="true">
 			  <menupopup>
@@ -305,7 +305,7 @@ oncommand="goPreferences('pref-themes.xul','chrome://communicator/content/pref/p
 			</rule>
 			<rule>
 			  <menupopup>
-				<menuitem class="menuitem-iconic bookmark-item" uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, document.getElementById('BookmarksMenu').database)" />
+				<menuitem class="menuitem-iconic bookmark-item" uri="rdf:*" value="rdf:http://home.netscape.com/NC-rdf#Name"  />
 			  </menupopup>
 			</rule>
 		</template>