From 0095222e960b34d2ae24825c03051159849fe39d Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com" <hyatt%netscape.com>
Date: Fri, 1 Sep 2000 08:05:16 +0000
Subject: [PATCH] More XBL syntax changes. r=ben

---
 .../global/resources/content/htmlBindings.xml |  60 +++++-----
 .../content/mac/platformHTMLBindings.xml      |  76 ++++++-------
 .../content/os2/platformHTMLBindings.xml      | 104 +++++++++---------
 .../global/resources/content/treeBindings.xml |  66 ++++-------
 .../content/unix/platformHTMLBindings.xml     | 104 +++++++++---------
 .../content/win/platformHTMLBindings.xml      |  56 +++++-----
 6 files changed, 222 insertions(+), 244 deletions(-)

diff --git a/xpfe/global/resources/content/htmlBindings.xml b/xpfe/global/resources/content/htmlBindings.xml
index 28d3006aaa4..89f32be40c5 100644
--- a/xpfe/global/resources/content/htmlBindings.xml
+++ b/xpfe/global/resources/content/htmlBindings.xml
@@ -7,38 +7,38 @@
   <binding id="inputFieldsBase">
     <handlers>
      
-    <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_home" keycode="VK_HOME"
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_end" keycode="VK_END"
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_left" keycode="VK_LEFT"
         command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_right" keycode="VK_RIGHT"
         command="cmd_charNext"/>
-    <handler event="keypress" id="key_pageup" keycode="VK_PAGE_UP" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_pageup" keycode="VK_PAGE_UP"
         command="cmd_scrollPageUp"/>
-    <handler event="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN"
         command="cmd_scrollPageDown"/>
 
-    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-    <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-    <handler event="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_leftshift" keycode="VK_LEFT" modifiers="shift"
         command="cmd_selectCharPrevious"/>
-    <handler event="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_rightshift" keycode="VK_RIGHT" modifiers="shift"
         command="cmd_selectCharNext"/>
-    <handler event="keypress" id="key_undo" key="z" primary="true" 
+    <handler event="keypress" id="key_undo" key="z" modifiers="primary"
         command="cmd_undo"/>
 
     <!-- Cut/copy/paste/undo -->
-    <handler event="keypress" id="key_copy" key="c" primary="true"
+    <handler event="keypress" id="key_copy" key="c" modifiers="primary"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_cut" key="x" primary="true"
+    <handler event="keypress" id="key_cut" key="x" modifiers="primary"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_paste" key="v" primary="true"
+    <handler event="keypress" id="key_paste" key="v" modifiers="primary"
         command="cmd_paste"/>
-    <handler event="keypress" id="key_undo" key="z" primary="true" 
+    <handler event="keypress" id="key_undo" key="z" modifiers="primary" 
         command="cmd_undo"/>
 
     </handlers>
@@ -47,37 +47,37 @@
   <binding id="textAreasBase">
     <handlers>
 
-    <handler event="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_left" keycode="VK_LEFT"
         command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_right" keycode="VK_RIGHT"
         command="cmd_charNext"/>
-    <handler event="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_leftshift" keycode="VK_LEFT" modifiers="shift"
         command="cmd_selectCharPrevious"/>
-    <handler event="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_rightshift" keycode="VK_RIGHT" modifiers="shift"
         command="cmd_selectCharNext"/>
-    <handler event="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_up" keycode="VK_UP"
         command="cmd_linePrevious"/>
-    <handler event="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_down" keycode="VK_DOWN"
         command="cmd_lineNext"/>
-    <handler event="keypress" id="key_up_shift" keycode="VK_UP" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_up_shift" keycode="VK_UP" modifiers="shift"
         command="cmd_selectLinePrevious"/>
-    <handler event="keypress" id="key_down_shift" keycode="VK_DOWN" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_down_shift" keycode="VK_DOWN" modifiers="shift"
         command="cmd_selectLineNext"/>
-    <handler event="keypress" id="key_pageup" keycode="VK_PAGE_UP" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_pageup" keycode="VK_PAGE_UP"
         command="cmd_scrollPageUp"/>
-    <handler event="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN"
         command="cmd_scrollPageDown"/>
-    <handler event="keypress" id="key_undo" key="z" primary="true"
+    <handler event="keypress" id="key_undo" key="z" modifiers="primary"
         command="cmd_undo"/>
 
     <!-- Cut/copy/paste/undo -->
-    <handler event="keypress" id="key_copy" key="c" primary="true"
+    <handler event="keypress" id="key_copy" key="c" modifiers="primary"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_cut" key="x" primary="true"
+    <handler event="keypress" id="key_cut" key="x" modifiers="primary"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_paste" key="v" primary="true"
+    <handler event="keypress" id="key_paste" key="v" modifiers="primary"
         command="cmd_paste"/>
-    <handler event="keypress" id="key_undo" key="z" primary="true" 
+    <handler event="keypress" id="key_undo" key="z" modifiers="primary" 
         command="cmd_undo"/>
 
     </handlers>
diff --git a/xpfe/global/resources/content/mac/platformHTMLBindings.xml b/xpfe/global/resources/content/mac/platformHTMLBindings.xml
index 7a53e54f94c..2b2b2d8b13c 100644
--- a/xpfe/global/resources/content/mac/platformHTMLBindings.xml
+++ b/xpfe/global/resources/content/mac/platformHTMLBindings.xml
@@ -7,52 +7,52 @@
   <binding id="inputFields" extends="chrome://global/content/htmlBindings.xml#inputFieldsBase">
     <handlers>
       
-      <handler event="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_redo" key="z" modifiers="primary"
         command="cmd_redo"/>
 
-      <handler event="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_up" keycode="VK_UP" 
         command="cmd_linePrevious"/>
-      <handler event="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_down" keycode="VK_DOWN" 
         command="cmd_lineNext"/>
-      <handler event="keypress" id="key_up_shift" keycode="VK_UP" alt="false" shift="true" control="false"
+      <handler event="keypress" id="key_up_shift" keycode="VK_UP" modifiers="shift" 
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_down_shift" keycode="VK_DOWN" alt="false" shift="true" control="false"
+      <handler event="keypress" id="key_down_shift" keycode="VK_DOWN" modifiers="shift" 
         command="cmd_selectEndLine"/>
-      <handler event="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_up_meta" keycode="VK_UP" modifiers="meta"
         command="cmd_scrollPageUp"/>
-      <handler event="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_down_meta" keycode="VK_DOWN" modifiers="meta"
         command="cmd_scrollPageDown"/>
 
-      <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" meta="false"
+      <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_beginLine"/>
-      <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" meta="false"
+      <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
-      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" meta="false"
+      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" 
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" meta="false"
+      <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift" 
         command="cmd_selectEndLine"/>
-      <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false" 
+      <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" modifiers="alt" 
         command="cmd_wordPrevious"/>
-      <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false" 
+      <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" modifiers="alt"
         command="cmd_wordNext"/>
-      <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false" 
+      <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" modifiers="alt,shift"
         command="cmd_selectWordPrevious"/>
-      <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false"
+      <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" modifiers="alt,shift"
         command="cmd_selectWordNext"/>
 
-      <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false" 
+      <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" modifiers="meta"
         command="cmd_linePrevious"/>
-      <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false" 
+      <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" modifiers="meta"
         command="cmd_lineNext"/>
-      <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false" 
+      <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" modifiers="meta,shift"
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false"
+      <handler event="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" modifiers="meta,shift"
         command="cmd_selectEndLine"/>
 
       <!-- Emacsish single-line motion and delete keys -->
-      <handler event="keypress" id="key_delback" key="h" control="true"
+      <handler event="keypress" id="key_delback" key="h" modifiers="control"
         command="cmd_deleteCharBackward"/>
-      <handler event="keypress" id="key_delforw" key="d" control="true"
+      <handler event="keypress" id="key_delforw" key="d" modifiers="control"
         command="cmd_deleteCharForward"/>
 
     </handlers>
@@ -61,45 +61,45 @@
   <binding id="textAreas" extends="chrome://global/content/htmlBindings.xml#textAreasBase">
     <handlers>
 
-      <handler event="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_redo" key="z" modifiers="primary,shift"
         command="cmd_redo"/>
 
-      <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_scrollPageUp"/>
-      <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_scrollPageDown"/>
-      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
 
-      <handler event="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_up_meta" keycode="VK_UP" modifiers="meta"
         command="cmd_scrollPageUp"/>
-      <handler event="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_down_meta" keycode="VK_DOWN" modifiers="meta"
         command="cmd_scrollPageDown"/>
 
-      <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false" 
+      <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" modifiers="alt"
         command="cmd_wordPrevious"/>
-      <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false" 
+      <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" modifiers="alt"
         command="cmd_wordNext"/>
-      <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false" 
+      <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" modifiers="alt,shift"
         command="cmd_selectWordPrevious"/>
-      <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false"
+      <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" modifiers="alt,shift"
         command="cmd_selectWordNext"/>
 
-      <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false" 
+      <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" modifiers="meta"
         command="cmd_linePrevious"/>
-      <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false" 
+      <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" modifiers="meta"
         command="cmd_lineNext"/>
-      <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false" 
+      <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" modifiers="meta"
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false"
+      <handler event="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" modifiers="meta,shift"
         command="cmd_selectEndLine"/>
 
       <!-- Emacsish single-line motion and delete keys -->
-      <handler event="keypress" id="key_delback" key="h" control="true"
+      <handler event="keypress" id="key_delback" key="h" modifiers="control"
         command="cmd_deleteCharBackward"/>
-      <handler event="keypress" id="key_delforw" key="d" control="true"
+      <handler event="keypress" id="key_delforw" key="d" modifiers="control"
         command="cmd_deleteCharForward"/>
 
     </handlers>
diff --git a/xpfe/global/resources/content/os2/platformHTMLBindings.xml b/xpfe/global/resources/content/os2/platformHTMLBindings.xml
index 97e44efef27..e2750d74ea8 100644
--- a/xpfe/global/resources/content/os2/platformHTMLBindings.xml
+++ b/xpfe/global/resources/content/os2/platformHTMLBindings.xml
@@ -8,59 +8,59 @@
     <handlers>
 
     <!-- Emacsish single-line motion and delete keys -->
-    <handler event="keypress" id="key_home" key="a" control="true"
+    <handler event="keypress" id="key_home" key="a" modifiers="control"
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" key="e" control="true"
+    <handler event="keypress" id="key_end" key="e" modifiers="control"
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_left" key="b" control="true"
+    <handler event="keypress" id="key_left" key="b" modifiers="control"
         command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" key="f" control="true"
+    <handler event="keypress" id="key_right" key="f" modifiers="control"
         command="cmd_charNext"/>
-    <handler event="keypress" id="key_delback" key="h" control="true"
+    <handler event="keypress" id="key_delback" key="h" modifiers="control"
         command="cmd_deleteCharBackward"/>
-    <handler event="keypress" id="key_delforw" key="d" control="true"
+    <handler event="keypress" id="key_delforw" key="d" modifiers="control"
         command="cmd_deleteCharForward"/>
-    <handler event="keypress" id="key_delwback" key="w" control="true"
+    <handler event="keypress" id="key_delwback" key="w" modifiers="control"
         command="cmd_deleteWordBackward"/>
-    <handler event="keypress" id="key_del_bol" key="u" control="true"
+    <handler event="keypress" id="key_del_bol" key="u" modifiers="control"
         command="cmd_deleteToBeginningOfLine"/>
-    <handler event="keypress" id="key_del_eol" key="k" control="true"
+    <handler event="keypress" id="key_del_eol" key="k" modifiers="control"
         command="cmd_deleteToEndOfLine"/>
 
     <!-- Windows copy/paste/undo/redo keys -->
-    <handler event="keypress" id="key_wincopy" key="c" control="true"
+    <handler event="keypress" id="key_wincopy" key="c" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_wincut" key="x" control="true"
+    <handler event="keypress" id="key_wincut" key="x" modifiers="control"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_winundo" key="z" control="true"
+    <handler event="keypress" id="key_winundo" key="z" modifiers="control"
         command="cmd_undo"/>
-    <handler event="keypress" id="key_winredo" key="r" control="true"
+    <handler event="keypress" id="key_winredo" key="r" modifiers="control"
         command="cmd_redo"/>
-    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" modifiers="shift"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
+    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" modifiers="shift"
         command="cmd_paste"/>
 
     <!-- navigating by word keys -->
-    <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-    <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
+    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" modifiers="control"
         command="cmd_wordPrevious"/>
-    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
+    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" modifiers="control"
         command="cmd_wordNext"/>
-    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" 
+    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" modifiers="shift,control"
         command="cmd_selectWordPrevious"/>
-    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" 
+    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" modifiers="shift,control"
         command="cmd_selectWordNext"/>
-    <handler event="keypress" id="key_redo" key="y" primary="true"
+    <handler event="keypress" id="key_redo" key="y" modifiers="primary"
         command="cmd_redo"/>
     </handlers>
   </binding>
@@ -69,65 +69,65 @@
     <handlers>
 
     <!-- Emacsish single-line motion and delete keys -->
-    <handler event="keypress" id="key_home" key="a" control="true"
+    <handler event="keypress" id="key_home" key="a" modifiers="control"
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" key="e" control="true"
+    <handler event="keypress" id="key_end" key="e" modifiers="control"
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_left" key="b" control="true"
+    <handler event="keypress" id="key_left" key="b" modifiers="control"
         command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" key="f" control="true"
+    <handler event="keypress" id="key_right" key="f" modifiers="control"
         command="cmd_charNext"/>
-    <handler event="keypress" id="key_delback" key="h" control="true"
+    <handler event="keypress" id="key_delback" key="h" modifiers="control"
         command="cmd_deleteCharBackward"/>
-    <handler event="keypress" id="key_delforw" key="d" control="true"
+    <handler event="keypress" id="key_delforw" key="d" modifiers="control"
         command="cmd_deleteCharForward"/>
-    <handler event="keypress" id="key_delwback" key="w" control="true"
+    <handler event="keypress" id="key_delwback" key="w" modifiers="control"
         command="cmd_deleteWordBackward"/>
-    <handler event="keypress" id="key_del_bol" key="u" control="true"
+    <handler event="keypress" id="key_del_bol" key="u" modifiers="control"
         command="cmd_deleteToBeginningOfLine"/>
-    <handler event="keypress" id="key_del_eol" key="k" control="true"
+    <handler event="keypress" id="key_del_eol" key="k" modifiers="control"
         command="cmd_deleteToEndOfLine"/>
 
     <!-- Windows copy/paste/undo/redo keys -->
-    <handler event="keypress" id="key_wincopy" key="c" control="true"
+    <handler event="keypress" id="key_wincopy" key="c" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_wincut" key="x" control="true"
+    <handler event="keypress" id="key_wincut" key="x" modifiers="control"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_winundo" key="z" control="true"
+    <handler event="keypress" id="key_winundo" key="z" modifiers="control"
         command="cmd_undo"/>
-    <handler event="keypress" id="key_winredo" key="r" control="true"
+    <handler event="keypress" id="key_winredo" key="r" modifiers="control"
         command="cmd_redo"/>
-    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" modifiers="shift"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
+    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" modifiers="shift"
         command="cmd_paste"/>
 
     <!-- Emacsish multi-line motion and delete keys -->
-    <handler event="keypress" id="key_linedown" key="n" control="true"
+    <handler event="keypress" id="key_linedown" key="n" modifiers="control"
         command="cmd_lineNext"/>
-    <handler event="keypress" id="key_lineup" key="p" control="true"
+    <handler event="keypress" id="key_lineup" key="p" modifiers="control"
         command="cmd_linePrevious"/>
 
     <!-- handle home/end/arrow keys and redo -->
-    <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-    <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" 
+    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" modifiers="control"
         command="cmd_wordPrevious"/>
-    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" 
+    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" modifiers="control"
         command="cmd_wordNext"/>
-    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
+    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" modifiers="shift,control"
         command="cmd_selectWordPrevious"/>
-    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
+    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" modifiers="shift,control"
         command="cmd_selectWordNext"/>
-    <handler event="keypress" id="key_redo" key="y" primary="true"
+    <handler event="keypress" id="key_redo" key="y" modifiers="primary"
         command="cmd_redo"/>
     </handlers>
   </binding>
diff --git a/xpfe/global/resources/content/treeBindings.xml b/xpfe/global/resources/content/treeBindings.xml
index dd40ba12dee..9a5c7e8f135 100644
--- a/xpfe/global/resources/content/treeBindings.xml
+++ b/xpfe/global/resources/content/treeBindings.xml
@@ -308,8 +308,7 @@
     <handlers>
       <!-- If there is no modifier key, we select on mousedown, not
            click, so that drags work correctly. -->
-      <handler event="mousedown" shift="false" control="false"
-           meta="false" alt="false">
+      <handler event="mousedown">
       <![CDATA[
          if (event.target.localName == 'treecell') {
            var isSelected = event.target.parentNode.parentNode.getAttribute("selected");
@@ -323,54 +322,33 @@
 
       <!-- On a click (up+down on the same item), deselect everything
            except this item. -->
-      <handler event="click" shift="false" control="false" meta="false"
-           alt="false">
+      <handler event="click">
       <![CDATA[
          if (event.target.localName == 'treecell') {
-           var selectedItems = parentNode.selectedItems;
-           var i = 0;
-           while (i < selectedItems.length) {
-             if (selectedItems[i] != event.target.parentNode.parentNode)
-               parentNode.removeItemFromSelection(selectedItems[i]);
-             else
-               i++;
-            }
+           if (event.ctrlKey || event.metaKey) {
+             parentNode.toggleItemSelection(event.target.parentNode.parentNode);
+             parentNode.currentItem = event.target.parentNode.parentNode;
+           }
+           else if (event.shiftKey) {
+             parentNode.selectItemRange(null, event.target.parentNode.parentNode);
+             parentNode.currentItem = event.target.parentNode.parentNode;
+           }
+           else {
+             var selectedItems = parentNode.selectedItems;
+             var i = 0;
+             while (i < selectedItems.length) {
+               if (selectedItems[i] != event.target.parentNode.parentNode)
+                 parentNode.removeItemFromSelection(selectedItems[i]);
+               else
+                 i++;
+              }
+           }
          }
       ]]>
       </handler>
 
-      <!-- For discontinuous selection of items -->
-      <handler event="click" shift="false" control="true" alt="false">
-      <![CDATA[
-         if (event.target.localName == 'treecell') {
-           parentNode.toggleItemSelection(event.target.parentNode.parentNode);
-           parentNode.currentItem = event.target.parentNode.parentNode;
-         }
-      ]]>
-      </handler>
-
-      <!-- Same as above, but this one is for the Mac Command key -->
-      <handler event="click" shift="false" meta="true">
-      <![CDATA[
-         if (event.target.localName == 'treecell') {
-           parentNode.toggleItemSelection(event.target.parentNode.parentNode);
-           parentNode.currentItem = event.target.parentNode.parentNode;
-         }
-      ]]>
-      </handler>
-
-      <!-- For continuous selection of items -->
-      <handler event="click" shift="true" control="false" meta="false">
-      <![CDATA[
-         if (event.target.localName == 'treecell') {
-           parentNode.selectItemRange(null, event.target.parentNode.parentNode);
-           parentNode.currentItem = event.target.parentNode.parentNode;
-          }
-      ]]>
-      </handler>
-
       <!-- double-click -->
-      <handler event="click" shift="false" control="false" meta="false" clickcount="2">
+      <handler event="click" clickcount="2">
       <![CDATA[
          if (event.target.localName == 'treecell') {
            var n = event.target.parentNode.parentNode;
@@ -380,7 +358,7 @@
       </handler>
 
       <!-- normal, single click -->
-      <handler event="click" shift="false" control="false" meta="false">
+      <handler event="click">
       <![CDATA[
          if (event.target.getAttribute('twisty') == 'true') {
            var n = event.target.parentNode.parentNode.parentNode;
diff --git a/xpfe/global/resources/content/unix/platformHTMLBindings.xml b/xpfe/global/resources/content/unix/platformHTMLBindings.xml
index 97e44efef27..696e4c2d555 100644
--- a/xpfe/global/resources/content/unix/platformHTMLBindings.xml
+++ b/xpfe/global/resources/content/unix/platformHTMLBindings.xml
@@ -8,59 +8,59 @@
     <handlers>
 
     <!-- Emacsish single-line motion and delete keys -->
-    <handler event="keypress" id="key_home" key="a" control="true"
+    <handler event="keypress" id="key_home" key="a" modifiers="control"
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" key="e" control="true"
+    <handler event="keypress" id="key_end" key="e" modifiers="control"
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_left" key="b" control="true"
+    <handler event="keypress" id="key_left" key="b" modifiers="control"
         command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" key="f" control="true"
+    <handler event="keypress" id="key_right" key="f" modifiers="control"
         command="cmd_charNext"/>
-    <handler event="keypress" id="key_delback" key="h" control="true"
+    <handler event="keypress" id="key_delback" key="h" modifiers="control"
         command="cmd_deleteCharBackward"/>
-    <handler event="keypress" id="key_delforw" key="d" control="true"
+    <handler event="keypress" id="key_delforw" key="d" modifiers="control"
         command="cmd_deleteCharForward"/>
-    <handler event="keypress" id="key_delwback" key="w" control="true"
+    <handler event="keypress" id="key_delwback" key="w" modifiers="control"
         command="cmd_deleteWordBackward"/>
-    <handler event="keypress" id="key_del_bol" key="u" control="true"
+    <handler event="keypress" id="key_del_bol" key="u" modifiers="control"
         command="cmd_deleteToBeginningOfLine"/>
-    <handler event="keypress" id="key_del_eol" key="k" control="true"
+    <handler event="keypress" id="key_del_eol" key="k" modifiers="control"
         command="cmd_deleteToEndOfLine"/>
 
     <!-- Windows copy/paste/undo/redo keys -->
-    <handler event="keypress" id="key_wincopy" key="c" control="true"
+    <handler event="keypress" id="key_wincopy" key="c" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_wincut" key="x" control="true"
+    <handler event="keypress" id="key_wincut" key="x" modifiers="control"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_winundo" key="z" control="true"
+    <handler event="keypress" id="key_winundo" key="z" modifiers="control"
         command="cmd_undo"/>
-    <handler event="keypress" id="key_winredo" key="r" control="true"
+    <handler event="keypress" id="key_winredo" key="r" modifiers="control"
         command="cmd_redo"/>
-    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" modifiers="shift"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
+    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" modifiers="control" 
         command="cmd_copy"/>
-    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" modifiers="shift"
         command="cmd_paste"/>
 
     <!-- navigating by word keys -->
-    <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-    <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
+    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" modifiers="control" 
         command="cmd_wordPrevious"/>
-    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
+    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" modifiers="control"
         command="cmd_wordNext"/>
-    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" 
+    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" modifiers="shift,control" 
         command="cmd_selectWordPrevious"/>
-    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" 
+    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" modifiers="shift,control" 
         command="cmd_selectWordNext"/>
-    <handler event="keypress" id="key_redo" key="y" primary="true"
+    <handler event="keypress" id="key_redo" key="y" modifiers="primary"
         command="cmd_redo"/>
     </handlers>
   </binding>
@@ -69,65 +69,65 @@
     <handlers>
 
     <!-- Emacsish single-line motion and delete keys -->
-    <handler event="keypress" id="key_home" key="a" control="true"
+    <handler event="keypress" id="key_home" key="a" modifiers="control"
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" key="e" control="true"
+    <handler event="keypress" id="key_end" key="e" modifiers="control"
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_left" key="b" control="true"
+    <handler event="keypress" id="key_left" key="b" modifiers="control"
         command="cmd_charPrevious"/>
-    <handler event="keypress" id="key_right" key="f" control="true"
+    <handler event="keypress" id="key_right" key="f" modifiers="control"
         command="cmd_charNext"/>
-    <handler event="keypress" id="key_delback" key="h" control="true"
+    <handler event="keypress" id="key_delback" key="h" modifiers="control"
         command="cmd_deleteCharBackward"/>
-    <handler event="keypress" id="key_delforw" key="d" control="true"
+    <handler event="keypress" id="key_delforw" key="d" modifiers="control"
         command="cmd_deleteCharForward"/>
-    <handler event="keypress" id="key_delwback" key="w" control="true"
+    <handler event="keypress" id="key_delwback" key="w" modifiers="control"
         command="cmd_deleteWordBackward"/>
-    <handler event="keypress" id="key_del_bol" key="u" control="true"
+    <handler event="keypress" id="key_del_bol" key="u" modifiers="control"
         command="cmd_deleteToBeginningOfLine"/>
-    <handler event="keypress" id="key_del_eol" key="k" control="true"
+    <handler event="keypress" id="key_del_eol" key="k" modifiers="control"
         command="cmd_deleteToEndOfLine"/>
 
     <!-- Windows copy/paste/undo/redo keys -->
-    <handler event="keypress" id="key_wincopy" key="c" control="true"
+    <handler event="keypress" id="key_wincopy" key="c" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_wincut" key="x" control="true"
+    <handler event="keypress" id="key_wincut" key="x" modifiers="control"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_winundo" key="z" control="true"
+    <handler event="keypress" id="key_winundo" key="z" modifiers="control"
         command="cmd_undo"/>
-    <handler event="keypress" id="key_winredo" key="r" control="true"
+    <handler event="keypress" id="key_winredo" key="r" modifiers="control"
         command="cmd_redo"/>
-    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" modifiers="shift"
         command="cmd_cut"/>
-    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
+    <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" modifiers="control"
         command="cmd_copy"/>
-    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
+    <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" modifiers="shift"
         command="cmd_paste"/>
 
     <!-- Emacsish multi-line motion and delete keys -->
-    <handler event="keypress" id="key_linedown" key="n" control="true"
+    <handler event="keypress" id="key_linedown" key="n" modifiers="control"
         command="cmd_lineNext"/>
-    <handler event="keypress" id="key_lineup" key="p" control="true"
+    <handler event="keypress" id="key_lineup" key="p" modifiers="control"
         command="cmd_linePrevious"/>
 
     <!-- handle home/end/arrow keys and redo -->
-    <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_beginLine"/>
-    <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+    <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
-    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-    <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+    <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" 
+    <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" modifiers="control" 
         command="cmd_wordPrevious"/>
-    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" 
+    <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" modifiers="control" 
         command="cmd_wordNext"/>
-    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
+    <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" modifiers="shift,control" 
         command="cmd_selectWordPrevious"/>
-    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
+    <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" modifiers="shift,control" 
         command="cmd_selectWordNext"/>
-    <handler event="keypress" id="key_redo" key="y" primary="true"
+    <handler event="keypress" id="key_redo" key="y" modifiers="primary"
         command="cmd_redo"/>
     </handlers>
   </binding>
diff --git a/xpfe/global/resources/content/win/platformHTMLBindings.xml b/xpfe/global/resources/content/win/platformHTMLBindings.xml
index c37ec7f313f..4c2af878d8e 100644
--- a/xpfe/global/resources/content/win/platformHTMLBindings.xml
+++ b/xpfe/global/resources/content/win/platformHTMLBindings.xml
@@ -6,69 +6,69 @@
  
   <binding id="inputFields" extends="chrome://global/content/htmlBindings.xml#inputFieldsBase">
     <handlers>
-      <handler event="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_up" keycode="VK_UP" 
         command="cmd_charPrevious"/>
-      <handler event="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_down" keycode="VK_DOWN"
         command="cmd_charNext"/>
-      <handler event="keypress" id="key_leftshift" keycode="VK_UP" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_leftshift" keycode="VK_UP" modifiers="shift" 
 	      command="cmd_selectCharPrevious"/>
-      <handler event="keypress" id="key_rightshift" keycode="VK_DOWN" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_rightshift" keycode="VK_DOWN" modifiers="shift"
 	      command="cmd_selectCharNext"/>
 
-      <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_home" keycode="VK_HOME"
         command="cmd_beginLine"/>
-      <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_end" keycode="VK_END"
         command="cmd_endLine"/>
-      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-      <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
+      <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" modifiers="control"
         command="cmd_wordPrevious"/>
-      <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
+      <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" modifiers="control"
         command="cmd_wordNext"/>
-      <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" 
+      <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" modifiers="shift,control"
         command="cmd_selectWordPrevious"/>
-      <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" 
+      <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" modifiers="shift,control"
         command="cmd_selectWordNext"/>
-      <handler event="keypress" id="key_redo" key="y" primary="true"
+      <handler event="keypress" id="key_redo" key="y" modifiers="primary"
         command="cmd_redo"/>
 
-      <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
+      <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" modifiers="shift"
         command="cmd_cut"/>
-      <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
+      <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" modifiers="control"
         command="cmd_copy"/>
-      <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
+      <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" modifiers="shift"
         command="cmd_paste"/>
     </handlers>
   </binding>
 
   <binding id="textAreas" extends="chrome://global/content/htmlBindings.xml#textAreasBase">
     <handlers>
-      <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_home" keycode="VK_HOME" 
         command="cmd_beginLine"/>
-      <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
+      <handler event="keypress" id="key_end" keycode="VK_END" 
         command="cmd_endLine"/>
-      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift" 
         command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
+      <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
         command="cmd_selectEndLine"/>
-      <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" 
+      <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" modifiers="control"
         command="cmd_wordPrevious"/>
-      <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" 
+      <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" modifiers="control"
         command="cmd_wordNext"/>
-      <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
+      <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" modifiers="shift,control"
         command="cmd_selectWordPrevious"/>
-      <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
+      <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" modifiers="shift,control"
         command="cmd_selectWordNext"/>
-      <handler event="keypress" id="key_redo" key="y" primary="true"
+      <handler event="keypress" id="key_redo" key="y" modifiers="primary"
         command="cmd_redo"/>
 
-      <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
+      <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" modifiers="shift" 
         command="cmd_cut"/>
-      <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
+      <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" modifiers="control"
         command="cmd_copy"/>
-      <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
+      <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" modifiers="shift" 
         command="cmd_paste"/>
      </handlers>
   </binding>