diff --git a/content/xbl/builtin/mac/platformHTMLBindings.xml b/content/xbl/builtin/mac/platformHTMLBindings.xml
index 8ab7ad872c3..b3c3fdd87f0 100644
--- a/content/xbl/builtin/mac/platformHTMLBindings.xml
+++ b/content/xbl/builtin/mac/platformHTMLBindings.xml
@@ -7,104 +7,54 @@
   <binding id="inputFields" extends="resource:///res/builtin/htmlBindings.xml#inputFieldsBase">
     <handlers>
       
-      <handler event="keypress" key="a" modifiers="accel"
-        command="cmd_selectAll"/>
-      <handler event="keypress" id="key_redo" key="z" modifiers="accel"
-        command="cmd_redo"/>
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
+      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
 
-      <handler event="keypress" id="key_up" keycode="VK_UP" 
-        command="cmd_linePrevious"/>
-      <handler event="keypress" id="key_down" keycode="VK_DOWN" 
-        command="cmd_lineNext"/>
-      <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" modifiers="shift" 
-        command="cmd_selectEndLine"/>
-      <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" modifiers="meta"
-        command="cmd_scrollPageDown"/>
+      <handler event="keypress" keycode="VK_UP"   command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_DOWN" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_UP"   modifiers="shift" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectEndLine"/>
+      <handler event="keypress" keycode="VK_UP"   modifiers="accel" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_endLine"/>
 
-      <handler event="keypress" id="key_home" keycode="VK_HOME" 
-        command="cmd_beginLine"/>
-      <handler event="keypress" id="key_end" keycode="VK_END" 
-        command="cmd_endLine"/>
-      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" 
-        modifiers="shift" command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END"
-        modifiers="shift" command="cmd_selectEndLine"/>
-      <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" modifiers="alt" 
-        command="cmd_wordPrevious"/>
-      <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" modifiers="alt"
-        command="cmd_wordNext"/>
-      <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" modifiers="alt,shift"
-        command="cmd_selectWordPrevious"/>
-      <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" modifiers="alt,shift"
-        command="cmd_selectWordNext"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="alt" command="cmd_wordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_wordNext"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="alt,shift" command="cmd_selectWordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectWordNext"/>
 
-      <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" modifiers="meta"
-        command="cmd_linePrevious"/>
-      <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" modifiers="meta"
-        command="cmd_lineNext"/>
-      <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" modifiers="meta,shift"
-        command="cmd_selectBeginLine"/>
-      <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" modifiers="control"
-        command="cmd_deleteCharBackward"/>
-      <handler event="keypress" id="key_delforw" key="d" modifiers="control"
-        command="cmd_deleteCharForward"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="accel" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="accel,shift" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel,shift" command="cmd_selectEndLine"/>
     </handlers>
   </binding>
 
   <binding id="textAreas" extends="resource:///res/builtin/htmlBindings.xml#textAreasBase">
     <handlers>
+      <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo"/>
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
 
-      <handler event="keypress" key="a" modifiers="accel"
-        command="cmd_selectAll"/>
-      <handler event="keypress" id="key_redo" key="z" modifiers="accel,shift"
-        command="cmd_redo"/>
+      <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop"/>
+      <handler event="keypress" keycode="VK_END"  command="cmd_scrollBottom"/>
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_scrollTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_scrollBottom"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_scrollPageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_scrollPageDown"/>
 
-      <handler event="keypress" id="key_home" keycode="VK_HOME" 
-        command="cmd_scrollPageUp"/>
-      <handler event="keypress" id="key_end" keycode="VK_END" 
-        command="cmd_scrollPageDown"/>
-      <handler event="keypress" id="key_homeshift" keycode="VK_HOME" modifiers="shift"
-        command="cmd_selectBeginLine"/>
-      <handler event="keypress" id="key_endshift" keycode="VK_END" modifiers="shift"
-        command="cmd_selectEndLine"/>
+      <handler event="keypress" keycode="VK_UP"   modifiers="accel" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_UP"   modifiers="accel,shift" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel,shift" command="cmd_selectBottom"/>
 
-      <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" modifiers="meta"
-        command="cmd_scrollPageDown"/>
-
-      <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" modifiers="alt"
-        command="cmd_wordPrevious"/>
-      <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" modifiers="alt"
-        command="cmd_wordNext"/>
-      <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" modifiers="alt,shift"
-        command="cmd_selectWordPrevious"/>
-      <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" modifiers="alt,shift"
-        command="cmd_selectWordNext"/>
-
-      <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" modifiers="meta"
-        command="cmd_linePrevious"/>
-      <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" modifiers="meta"
-        command="cmd_lineNext"/>
-      <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" modifiers="meta"
-        command="cmd_selectBeginLine"/>
-      <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" modifiers="control"
-        command="cmd_deleteCharBackward"/>
-      <handler event="keypress" id="key_delforw" key="d" modifiers="control"
-        command="cmd_deleteCharForward"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="alt" command="cmd_wordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_wordNext"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="alt,shift" command="cmd_selectWordPrevious"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectWordNext"/>
 
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="accel" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="accel,shift" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel,shift" command="cmd_selectEndLine"/>
     </handlers>
   </binding>
 
@@ -118,8 +68,6 @@
       <handler event="keypress" keycode="VK_RIGHT" modifiers="alt,shift" command="cmd_selectWordNext" />
       <handler event="keypress" keycode="VK_LEFT" modifiers="shift" command="cmd_selectCharPrevious" />
       <handler event="keypress" keycode="VK_RIGHT" modifiers="shift" command="cmd_selectCharNext" />
-      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_selectBeginLine" />
-      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_selectEndLine" />
       <handler event="keypress" keycode="VK_UP" modifiers="shift" command="cmd_selectLinePrevious" />
       <handler event="keypress" keycode="VK_DOWN" modifiers="shift" command="cmd_selectLineNext" />
 	</handlers>
@@ -127,17 +75,36 @@
 
   <binding id="editor">
     <handlers>
-      <handler event="keypress" key="a" modifiers="accel"
-        command="cmd_selectAll"/>
-      <handler event="keypress" key="y" modifiers="accel" oncommand="event.preventDefault();"/> 
+      <handler event="keypress" key="a" modifiers="accel" command="cmd_selectAll"/>
       <handler event="keypress" key="z" modifiers="accel,shift" command="cmd_redo" /> 
       <handler event="keypress" keycode="VK_HOME" command="cmd_scrollTop" /> 
-      <handler event="keypress" keycode="VK_END" command="cmd_scrollBottom" /> 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="alt" command="cmd_wordPrevious" /> 
+      <handler event="keypress" keycode="VK_END"  command="cmd_scrollBottom" /> 
+      <handler event="keypress" keycode="VK_HOME" modifiers="shift" command="cmd_scrollTop"/>
+      <handler event="keypress" keycode="VK_END" modifiers="shift" command="cmd_scrollBottom"/>
+      <handler event="keypress" keycode="VK_PAGE_UP" command="cmd_scrollPageUp"/>
+      <handler event="keypress" keycode="VK_PAGE_DOWN" command="cmd_scrollPageDown"/>
+
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="alt" command="cmd_wordPrevious" /> 
       <handler event="keypress" keycode="VK_RIGHT" modifiers="alt" command="cmd_wordNext" /> 
-      <handler event="keypress" keycode="VK_LEFT" modifiers="shift,alt" command="cmd_selectWordPrevious" /> 
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="shift,alt" command="cmd_selectWordPrevious" /> 
       <handler event="keypress" keycode="VK_RIGHT" modifiers="shift,alt" command="cmd_selectWordNext" /> 
+
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="accel" command="cmd_beginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel" command="cmd_endLine"/>
+      <handler event="keypress" keycode="VK_LEFT"  modifiers="accel,shift" command="cmd_selectBeginLine"/>
+      <handler event="keypress" keycode="VK_RIGHT" modifiers="accel,shift" command="cmd_selectEndLine"/>
+
       <handler event="keypress" keycode="VK_DELETE" modifiers="shift" command="cmd_deleteCharForward" /> 
+
+      <handler event="keypress" keycode="VK_UP"   modifiers="alt" command="cmd_movePageUp"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt" command="cmd_movePageDown"/>
+      <handler event="keypress" keycode="VK_UP"   modifiers="alt,shift" command="cmd_selectPageUp"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="alt,shift" command="cmd_selectPageDown"/>
+      
+      <handler event="keypress" keycode="VK_UP"   modifiers="accel" command="cmd_moveTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel" command="cmd_moveBottom"/>
+      <handler event="keypress" keycode="VK_UP"   modifiers="accel,shift" command="cmd_selectTop"/>
+      <handler event="keypress" keycode="VK_DOWN" modifiers="accel,shift" command="cmd_selectBottom"/>
     </handlers>
   </binding>