Index: apps/action.h
===================================================================
--- apps/action.h	(revision 23497)
+++ apps/action.h	(working copy)
@@ -236,6 +236,8 @@
     ACTION_KBD_DOWN,
     ACTION_KBD_MORSE_INPUT,
     ACTION_KBD_MORSE_SELECT,
+    ACTION_KBD_SCROLL_FWD,
+    ACTION_KBD_SCROLL_BACK,
     
 #ifdef HAVE_TOUCHSCREEN
     /* the following are helper actions for touchscreen targets,
Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c	(revision 23497)
+++ apps/keymaps/keymap-e200.c	(working copy)
@@ -255,10 +255,10 @@
     { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK,                 BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD,               BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_SCROLL_BACK,  BUTTON_SCROLL_BACK,               BUTTON_NONE },
+    { ACTION_KBD_SCROLL_BACK,  BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_SCROLL_FWD,   BUTTON_SCROLL_FWD,                BUTTON_NONE },
+    { ACTION_KBD_SCROLL_FWD,   BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_KBD_PAGE_FLIP,    BUTTON_REC|BUTTON_SELECT,         BUTTON_REC },
     { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                      BUTTON_NONE },
     { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
Index: apps/keymaps/keymap-ipod.c
===================================================================
--- apps/keymaps/keymap-ipod.c	(revision 23497)
+++ apps/keymaps/keymap-ipod.c	(working copy)
@@ -163,10 +163,10 @@
     { ACTION_KBD_SELECT,       BUTTON_SELECT,                         BUTTON_NONE },
     { ACTION_KBD_DONE,         BUTTON_PLAY,                           BUTTON_NONE },
     { ACTION_KBD_ABORT,        BUTTON_MENU|BUTTON_REL,                BUTTON_MENU },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK,                    BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD,                     BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_KBD_SCROLL_BACK,  BUTTON_SCROLL_BACK,                    BUTTON_NONE },
+    { ACTION_KBD_SCROLL_BACK,  BUTTON_SCROLL_BACK|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_SCROLL_FWD,   BUTTON_SCROLL_FWD,                     BUTTON_NONE },
+    { ACTION_KBD_SCROLL_FWD,   BUTTON_SCROLL_FWD|BUTTON_REPEAT,       BUTTON_NONE },
     { ACTION_KBD_MORSE_INPUT,  BUTTON_MENU|BUTTON_REPEAT,             BUTTON_MENU },
     { ACTION_KBD_MORSE_SELECT, BUTTON_SELECT|BUTTON_REL,              BUTTON_NONE },
     LAST_ITEM_IN_LIST
Index: apps/keymaps/keymap-fuze.c
===================================================================
--- apps/keymaps/keymap-fuze.c	(revision 23497)
+++ apps/keymaps/keymap-fuze.c	(working copy)
@@ -255,11 +255,10 @@
     { ACTION_KBD_CURSOR_LEFT,  BUTTON_HOME|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_KBD_CURSOR_RIGHT, BUTTON_HOME|BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_KBD_CURSOR_RIGHT, BUTTON_HOME|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK,               BUTTON_NONE },
-    { ACTION_KBD_UP,           BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD,                BUTTON_NONE },
-    { ACTION_KBD_DOWN,         BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_KBD_SCROLL_BACK,  BUTTON_SCROLL_BACK,               BUTTON_NONE },
+    { ACTION_KBD_SCROLL_BACK,  BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_SCROLL_FWD,   BUTTON_SCROLL_FWD,                BUTTON_NONE },
+    { ACTION_KBD_SCROLL_FWD,   BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_KBD_PAGE_FLIP,    BUTTON_HOME|BUTTON_SELECT,        BUTTON_HOME },
     { ACTION_KBD_BACKSPACE,    BUTTON_DOWN,                      BUTTON_NONE },
     { ACTION_KBD_BACKSPACE,    BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },