Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c	(revision 12961)
+++ apps/keymaps/keymap-gigabeat.c	(working copy)
@@ -98,12 +98,10 @@
 }; /* button_context_wps */
 
 static const struct button_mapping button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,         BUTTON_POWER|BUTTON_UP,                    BUTTON_POWER },
-    { ACTION_LISTTREE_PGUP,         BUTTON_UP|BUTTON_REL,                   BUTTON_POWER|BUTTON_UP },
-    { ACTION_LISTTREE_PGUP,         BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_POWER|BUTTON_DOWN,                  BUTTON_POWER },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_DOWN|BUTTON_REL,                 BUTTON_POWER|BUTTON_DOWN },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,         BUTTON_VOL_UP,                 BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,         BUTTON_VOL_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,       BUTTON_VOL_DOWN,               BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_list */