diff --git a/mozilla/toolkit/content/widgets/listbox.xml b/mozilla/toolkit/content/widgets/listbox.xml
index a09fe893f0d..64e8b131825 100644
--- a/mozilla/toolkit/content/widgets/listbox.xml
+++ b/mozilla/toolkit/content/widgets/listbox.xml
@@ -707,17 +707,17 @@
     </implementation>
     
     <handlers>
-      <handler event="keypress" keycode="vk_up" modifiers="control shift any"
+      <handler event="keypress" keycode="VK_UP" modifiers="control shift any"
                phase="target" action="moveByOffset(-1, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="vk_down" modifiers="control shift any"
+      <handler event="keypress" keycode="VK_DOWN" modifiers="control shift any"
                phase="target" action="moveByOffset(1, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="vk_home" modifiers="control shift any"
+      <handler event="keypress" keycode="VK_HOME" modifiers="control shift any"
                phase="target" action="moveByOffset(-this.currentIndex, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="vk_end" modifiers="control shift any"
+      <handler event="keypress" keycode="VK_END" modifiers="control shift any"
                phase="target" action="moveByOffset(this.getRowCount() - this.currentIndex - 1, !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="vk_page_up" modifiers="control shift any"
+      <handler event="keypress" keycode="VK_PAGE_UP" modifiers="control shift any"
                phase="target" action="moveByOffset(this.scrollOnePage(-1), !event.ctrlKey, event.shiftKey);"/>
-      <handler event="keypress" keycode="vk_page_down" modifiers="control shift any"
+      <handler event="keypress" keycode="VK_PAGE_DOWN" modifiers="control shift any"
                phase="target" action="moveByOffset(this.scrollOnePage(1), !event.ctrlKey, event.shiftKey);"/>
       <handler event="keypress" key=" " phase="target">
         <![CDATA[
diff --git a/mozilla/toolkit/content/widgets/tree.xml b/mozilla/toolkit/content/widgets/tree.xml
index c6c4f32d62c..59ca932cc4e 100644
--- a/mozilla/toolkit/content/widgets/tree.xml
+++ b/mozilla/toolkit/content/widgets/tree.xml
@@ -423,7 +423,7 @@
       <handler event="blur" action="this.treeBoxObject.focused = false;"/>
       <handler event="blur" phase="capturing"
                action="if (event.originalTarget == this.inputField.inputField) this.stopEditing(true);"/>
-      <handler event="keypress" keycode="vk_enter">
+      <handler event="keypress" keycode="VK_ENTER">
         <![CDATA[
           if (this._editingColumn) {
             this.stopEditing(true);
@@ -435,7 +435,7 @@
           }
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_return">
+      <handler event="keypress" keycode="VK_RETURN">
         <![CDATA[
           if (this._editingColumn) {
             this.stopEditing(true);
@@ -447,7 +447,7 @@
           }
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_escape">
+      <handler event="keypress" keycode="VK_ESCAPE">
         <![CDATA[
           if (this._editingColumn) {
             this.stopEditing(false);
@@ -456,7 +456,7 @@
           }
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_left">
+      <handler event="keypress" keycode="VK_LEFT">
         <![CDATA[
          if (this._editingColumn)
            return;
@@ -500,7 +500,7 @@
          }
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_right">
+      <handler event="keypress" keycode="VK_RIGHT">
         <![CDATA[
          if (this._editingColumn)
            return;
@@ -552,7 +552,7 @@
           }
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_up"
+      <handler event="keypress" keycode="VK_UP"
                modifiers="accel any">
         <![CDATA[
          if (this._editingColumn)
@@ -586,7 +586,7 @@
          this.treeBoxObject.ensureRowIsVisible(c);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_down"
+      <handler event="keypress" keycode="VK_DOWN"
                modifiers="accel any">
         <![CDATA[
          if (this._editingColumn)
@@ -620,7 +620,7 @@
          this.treeBoxObject.ensureRowIsVisible(c);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_up"
+      <handler event="keypress" keycode="VK_UP"
                modifiers="accel any, shift">
         <![CDATA[
          if (this._editingColumn || this.view.selection.single)
@@ -634,7 +634,7 @@
          this.treeBoxObject.ensureRowIsVisible(c - 1);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_down"
+      <handler event="keypress" keycode="VK_DOWN"
                modifiers="accel any, shift">
         <![CDATA[
          if (this._editingColumn || this.view.selection.single)
@@ -648,7 +648,7 @@
          this.treeBoxObject.ensureRowIsVisible(c + 1);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_page_up"
+      <handler event="keypress" keycode="VK_PAGE_UP"
                modifiers="accel any">
         <![CDATA[
          if (this._editingColumn)
@@ -674,7 +674,7 @@
          this.view.selection.timedSelect(i, this._selectDelay);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_page_down"
+      <handler event="keypress" keycode="VK_PAGE_DOWN"
                modifiers="accel any">
         <![CDATA[
          if (this._editingColumn)
@@ -701,7 +701,7 @@
          this.view.selection.timedSelect(i > l ? l : i, this._selectDelay);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_page_up"
+      <handler event="keypress" keycode="VK_PAGE_UP"
                modifiers="accel any, shift">
         <![CDATA[
          if (this._editingColumn || this.view.selection.single)
@@ -723,7 +723,7 @@
          this.view.selection.rangedSelect(-1, i, this._isAccelPressed(event));
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_page_down"
+      <handler event="keypress" keycode="VK_PAGE_DOWN"
                modifiers="accel any, shift">
         <![CDATA[
          if (this._editingColumn || this.view.selection.single)
@@ -746,7 +746,7 @@
          this.view.selection.rangedSelect(-1, i > l ? l : i, this._isAccelPressed(event));
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_home"
+      <handler event="keypress" keycode="VK_HOME"
                modifiers="accel any">
         <![CDATA[
          if (this._editingColumn || this.view.rowCount == 0)
@@ -760,7 +760,7 @@
          this.treeBoxObject.ensureRowIsVisible(0);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_end"
+      <handler event="keypress" keycode="VK_END"
                modifiers="accel any">
         <![CDATA[
          if (this._editingColumn)
@@ -778,7 +778,7 @@
          this.treeBoxObject.ensureRowIsVisible(l);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_home"
+      <handler event="keypress" keycode="VK_HOME"
                modifiers="accel any, shift">
         <![CDATA[
          if (this._editingColumn || this.view.selection.single)
@@ -788,7 +788,7 @@
          this.treeBoxObject.ensureRowIsVisible(0);
         ]]>
       </handler>
-      <handler event="keypress" keycode="vk_end"
+      <handler event="keypress" keycode="VK_END"
                modifiers="accel any, shift">
         <![CDATA[
          if (this._editingColumn || this.view.selection.single)
diff --git a/mozilla/toolkit/mozapps/downloads/content/download.xml b/mozilla/toolkit/mozapps/downloads/content/download.xml
index 37fa5d5f02b..e4aa88fb334 100644
--- a/mozilla/toolkit/mozapps/downloads/content/download.xml
+++ b/mozilla/toolkit/mozapps/downloads/content/download.xml
@@ -527,17 +527,17 @@
         this.selected = event.target;
       ]]>
       </handler>
-      <handler event="keypress" keycode="vk_enter" action="if (this.selected) this.selected.fireEvent('open');"/>
-      <handler event="keypress" keycode="vk_return" action="if (this.selected) this.selected.fireEvent('open');"/>
-      <handler event="keypress" keycode="vk_up" action="this.selectionBackward(event);"/>
-      <handler event="keypress" keycode="vk_left" action="this.selectionBackward(event);"/>
-      <handler event="keypress" keycode="vk_down" action="this.selectionForward(event);"/>
-      <handler event="keypress" keycode="vk_right" action="this.selectionForward(event);"/>
-      <handler event="keypress" keycode="vk_up" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_down" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_left" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_right" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_delete" action="if (this.selected) this.selected.fireEvent('remove');"/>
+      <handler event="keypress" keycode="VK_ENTER" action="if (this.selected) this.selected.fireEvent('open');"/>
+      <handler event="keypress" keycode="VK_RETURN" action="if (this.selected) this.selected.fireEvent('open');"/>
+      <handler event="keypress" keycode="VK_UP" action="this.selectionBackward(event);"/>
+      <handler event="keypress" keycode="VK_LEFT" action="this.selectionBackward(event);"/>
+      <handler event="keypress" keycode="VK_DOWN" action="this.selectionForward(event);"/>
+      <handler event="keypress" keycode="VK_RIGHT" action="this.selectionForward(event);"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_DELETE" action="if (this.selected) this.selected.fireEvent('remove');"/>
       <handler event="keypress" key=" " action="if (this.selected) { this.selected.pauseResume(); }"/>
     </handlers>
   </binding>
diff --git a/mozilla/toolkit/mozapps/shared/content/richview.xml b/mozilla/toolkit/mozapps/shared/content/richview.xml
index f00b584ce6d..44566a35083 100644
--- a/mozilla/toolkit/mozapps/shared/content/richview.xml
+++ b/mozilla/toolkit/mozapps/shared/content/richview.xml
@@ -187,17 +187,17 @@
       ]]>
       </handler>
       <handler event="dblclick" action="if (this.selected &amp;&amp; event.button == 0) this.selected.fireEvent('open');"/>
-      <handler event="keypress" keycode="vk_enter" action="if (this.selected) this.selected.fireEvent('open');"/>
-      <handler event="keypress" keycode="vk_return" action="if (this.selected) this.selected.fireEvent('open');"/>
-      <handler event="keypress" keycode="vk_up" action="this.selectionBackward(event);"/>
-      <handler event="keypress" keycode="vk_left" action="this.selectionBackward(event);"/>
-      <handler event="keypress" keycode="vk_down" action="this.selectionForward(event);"/>
-      <handler event="keypress" keycode="vk_right" action="this.selectionForward(event);"/>
-      <handler event="keypress" keycode="vk_up" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_down" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_left" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_right" modifiers="meta" action="this.selected = null"/>
-      <handler event="keypress" keycode="vk_delete" action="if (this.selected) this.selected.fireEvent('remove');"/>
+      <handler event="keypress" keycode="VK_ENTER" action="if (this.selected) this.selected.fireEvent('open');"/>
+      <handler event="keypress" keycode="VK_RETURN" action="if (this.selected) this.selected.fireEvent('open');"/>
+      <handler event="keypress" keycode="VK_UP" action="this.selectionBackward(event);"/>
+      <handler event="keypress" keycode="VK_LEFT" action="this.selectionBackward(event);"/>
+      <handler event="keypress" keycode="VK_DOWN" action="this.selectionForward(event);"/>
+      <handler event="keypress" keycode="VK_RIGHT" action="this.selectionForward(event);"/>
+      <handler event="keypress" keycode="VK_UP" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_LEFT" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="meta" action="this.selected = null;"/>
+      <handler event="keypress" keycode="VK_DELETE" action="if (this.selected) this.selected.fireEvent('remove');"/>
     </handlers>
   </binding>