diff --git a/suite/browser/mac/platformNavigationBindings.xul b/suite/browser/mac/platformNavigationBindings.xul
index 4e09d03fc7f..dbbd0819891 100644
--- a/suite/browser/mac/platformNavigationBindings.xul
+++ b/suite/browser/mac/platformNavigationBindings.xul
@@ -5,11 +5,11 @@
 
   <keyset id="keyset">
     <!-- proper arrow key navigation, 4.xP -->
-    <key id="goBackKb" xulkey="true" keycode="VK_LEFT" observes="Browser:Back"/>
-    <key id="goForwardKb" xulkey="true" keycode="VK_RIGHT" observes="Browser:Forward"/>
-    <key id="goBackKbMac" xulkey="true" key="[" observes="Browser:Back"/>
-    <key id="goForwardKbMac" xulkey="true" key="]" observes="Browser:Forward"/>
-    <key id="stopMac" xulkey="true" key="." onkeypres="BrowserStop();"/>
+    <key id="goBackKb"  keycode="VK_LEFT" observes="Browser:Back" modifiers="accel"/>
+    <key id="goForwardKb"  keycode="VK_RIGHT" observes="Browser:Forward" modifiers="accel"/>
+    <key id="goBackKbMac"  key="[" observes="Browser:Back" modifiers="accel"/>
+    <key id="goForwardKbMac"  key="]" observes="Browser:Forward" modifiers="accel"/>
+    <key id="stopMac"  key="." oncommand="BrowserStop();" modifiers="accel"/>
   </keyset>  
 
 </overlay>
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index d1068f6c64f..ddc7f0a6f86 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -44,10 +44,10 @@
 	<!-- File Menu -->
 	<key id="key_newNavigator"/>
 	<key id="key_newBlankPage"/>
-	<key id="openBrowserKb"     xulkey="true" key="&openCmd.commandkey;" observes="Browser:Open" />
-	<key id="openFileKb"        xulkey="true" key="&openFileCmd.commandkey;" observes="Browser:OpenFile" />
-	<key id="key_savePage"      xulkey="true"  key="&savePageCmd.commandkey;" observes="Browser:SavePage"/>
-	<key id="printKb"           xulkey="true" key="&printCmd.commandkey;" observes="Browser:Print" />
+	<key id="openBrowserKb"      key="&openCmd.commandkey;" observes="Browser:Open"  modifiers="accel"/>
+	<key id="openFileKb"         key="&openFileCmd.commandkey;" observes="Browser:OpenFile"  modifiers="accel"/>
+	<key id="key_savePage"        key="&savePageCmd.commandkey;" observes="Browser:SavePage" modifiers="accel"/>
+	<key id="printKb"            key="&printCmd.commandkey;" observes="Browser:Print"  modifiers="accel"/>
 	<key id="key_close"/>
 	<key id="key_quit"/>
 
@@ -59,36 +59,32 @@
 	<key id="key_paste"/>
 	<key id="key_delete"/>
 	<key id="key_selectAll"/>
-	<key id="key_capture"/>
-	<key id="key_prefill"/>
-	<key id="key_preferences"/>
-
-
+	
     <!-- View Menu -->
-	<key id="key_reload" xulkey="true" key="&reloadCmd.commandkey;" observes="canReload"/>
-	<key id="key_viewsource"  xulkey="true"  key="&pageSourceCmd.commandkey;" observes="View:PageSource"/>
+	<key id="key_reload"  key="&reloadCmd.commandkey;" observes="canReload" modifiers="accel"/>
+	<key id="key_viewsource"    key="&pageSourceCmd.commandkey;" observes="View:PageSource" modifiers="accel"/>
 
-	<key id="key_textZoomReduce"  xulkey="true" key="&textZoomReduceCmd.commandkey;"  observes="cmd_viewTextZoomReduce" />
-	<key id="key_textZoomEnlarge" xulkey="true" key="&textZoomEnlargeCmd.commandkey;" observes="cmd_viewTextZoomEnlarge"/>
+	<key id="key_textZoomReduce"   key="&textZoomReduceCmd.commandkey;"  observes="cmd_viewTextZoomReduce"  modifiers="accel"/>
+	<key id="key_textZoomEnlarge"  key="&textZoomEnlargeCmd.commandkey;" observes="cmd_viewTextZoomEnlarge" modifiers="accel"/>
 
 	<!-- Search Menu -->	
-	<key id="key_find"            xulkey="true"  key="&findOnCmd.commandkey;" observes="Browser:Find"/>
-	<key id="key_findAgain"       xulkey="true"  key="&findAgainCmd.commandkey;" observes="Browser:FindAgain"/>
+	<key id="key_find"              key="&findOnCmd.commandkey;" observes="Browser:Find" modifiers="accel"/>
+	<key id="key_findAgain"         key="&findAgainCmd.commandkey;" observes="Browser:FindAgain" modifiers="accel"/>
 
 	<!-- Go Menu -->		
-	<key id="goHomeKb"            alt="true" keycode="VK_HOME" observes="Browser:Home" />
+	<key id="goHomeKb"             keycode="VK_HOME" observes="Browser:Home"  modifiers="alt"/>
 
     <!-- Tools Menu -->
-	<key id="key_gotoHistory"     xulkey="true" shift="false" key="&history.commandKey;" onkeypress="toHistory();"/>
+	<key id="key_gotoHistory"       key="&history.commandKey;" oncommand="toHistory();" modifiers="accel"/>
 
 	<!-- Bookmarks Menu -->
-	<key id="addBookmarkKb"       xulkey="true" key="&addCurPageCmd.commandkey;" observes="Browser:AddBookmark" />
-	<key id="manBookmarkKb"       xulkey="true" key="&manBookmarksCmd.commandkey;" observes="Browser:ManageBookmark" />
+	<key id="addBookmarkKb"        key="&addCurPageCmd.commandkey;" observes="Browser:AddBookmark"  modifiers="accel"/>
+	<key id="manBookmarkKb"        key="&manBookmarksCmd.commandkey;" observes="Browser:ManageBookmark"  modifiers="accel"/>
 
 	<!-- how to handle return, enter, tab, function keys, arrow keys, others? saari working on solution -->
 
 	<!-- Misc -->
-	<key id="stop" keycode="VK_ESCAPE" onkeypress="BrowserStop();"/>
+	<key id="stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
 	
 </keyset>
 
diff --git a/suite/browser/unix/platformNavigationBindings.xul b/suite/browser/unix/platformNavigationBindings.xul
index b2c87c2a224..abe07c4333f 100644
--- a/suite/browser/unix/platformNavigationBindings.xul
+++ b/suite/browser/unix/platformNavigationBindings.xul
@@ -7,13 +7,13 @@
 
   <keyset id="keyset">
     <!-- proper arrow key navigation, 4.xP -->
-    <key id="goBackKb" alt="true" keycode="VK_LEFT" observes="Browser:Back"/>
-    <key id="goForwardKb" alt="true" keycode="VK_RIGHT" observes="Browser:Forward"/>
+    <key id="goBackKb"  keycode="VK_LEFT" observes="Browser:Back" modifiers="alt"/>
+    <key id="goForwardKb"  keycode="VK_RIGHT" observes="Browser:Forward" modifiers="alt"/>
 
     <!-- Some people apparently use this combination too on Unix...
          we live and learn.  -->
-    <key id="goBackKbWacko" xulkey="true" key="&goBackCmd.commandKey;" observes="Browser:Back"/>
-    <key id="goForwardKbWacko" xulkey="true" key="&goForwardCmd.commandKey;" observes="Browser:Forward"/>
+    <key id="goBackKbWacko"  key="&goBackCmd.commandKey;" observes="Browser:Back" modifiers="accel"/>
+    <key id="goForwardKbWacko"  key="&goForwardCmd.commandKey;" observes="Browser:Forward" modifiers="accel"/>
   </keyset>  
 
 </overlay>
diff --git a/suite/browser/win/platformNavigationBindings.xul b/suite/browser/win/platformNavigationBindings.xul
index 24e581550a5..c6da9b9b14a 100644
--- a/suite/browser/win/platformNavigationBindings.xul
+++ b/suite/browser/win/platformNavigationBindings.xul
@@ -6,13 +6,13 @@
   <keyset id="keyset">
     <!-- back and forward accelerators on Windows, strangely enough, are
          Alt+Left arrow and Alt+Right arrow. -->
-    <key id="goBackKb" alt="true" keycode="VK_LEFT" observes="Browser:Back"/>
-    <key id="goForwardKb" alt="true" keycode="VK_RIGHT" observes="Browser:Forward"/>
+    <key id="goBackKb"  keycode="VK_LEFT" observes="Browser:Back" modifiers="alt"/>
+    <key id="goForwardKb"  keycode="VK_RIGHT" observes="Browser:Forward" modifiers="alt"/>
 
     <!-- Supporting IE forward and back accelerators out of courtesy
          to transitioning IE users -->
-    <key id="goBackKbIE" shift="false" keycode="VK_BACK" observes="Browser:Back"/>
-    <key id="goForwardKbIE" shift="true" keycode="VK_BACK" observes="Browser:Forward"/>
+    <key id="goBackKbIE"  keycode="VK_BACK" observes="Browser:Back"/>
+    <key id="goForwardKbIE"  keycode="VK_BACK" observes="Browser:Forward" modifiers="shift"/>
 
     <!-- Supporting IE 'refresh' shortcut key -->
     <key id="reloadIE" keycode="VK_F5" observes="canReload"/>