Index: apps/debug_menu.c
===================================================================
--- apps/debug_menu.c	(revision 16822)
+++ apps/debug_menu.c	(working copy)
@@ -975,42 +975,7 @@
 
 #ifndef SIMULATOR
 #ifdef HAVE_LCD_BITMAP
- /* button definitions */
-#if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
-   (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#   define DEBUG_CANCEL  BUTTON_OFF
 
-#elif CONFIG_KEYPAD == RECORDER_PAD
-#   define DEBUG_CANCEL  BUTTON_OFF
-
-#elif CONFIG_KEYPAD == ONDIO_PAD
-#   define DEBUG_CANCEL  BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_4G_PAD)
-#   define DEBUG_CANCEL  BUTTON_MENU
-
-#elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-#   define DEBUG_CANCEL  BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-#   define DEBUG_CANCEL  BUTTON_REC
-
-#elif (CONFIG_KEYPAD == IAUDIO_M3_PAD)
-#   define DEBUG_CANCEL  BUTTON_RC_REC
-
-#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-#   define DEBUG_CANCEL  BUTTON_REW
-
-#elif (CONFIG_KEYPAD == MROBE100_PAD)
-#   define DEBUG_CANCEL  BUTTON_MENU
-
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-      (CONFIG_KEYPAD == SANSA_C200_PAD)
-#   define DEBUG_CANCEL  BUTTON_LEFT
-#endif /* key definitions */
-
 /* Test code!!! */
 bool dbg_ports(void)
 {
@@ -1044,7 +1009,7 @@
         lcd_puts(0, 6, buf);
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (get_action(CONTEXT_STD,HZ/10) == ACTION_STD_CANCEL)
             return false;
     }
 #elif defined(CPU_COLDFIRE)
@@ -1128,7 +1093,7 @@
 #endif
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (get_action(CONTEXT_STD,HZ/10) == ACTION_STD_CANCEL)
             return false;
     }
 
@@ -1220,7 +1185,7 @@
         lcd_puts(0, line++, buf);
 #endif
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (get_action(CONTEXT_STD,HZ/10) == ACTION_STD_CANCEL)
             return false;
     }
 
@@ -1260,7 +1225,7 @@
         lcd_puts(0, line++, buf);
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (get_action(CONTEXT_STD,HZ/10) == ACTION_STD_CANCEL)
             return false;
     }
 #else
@@ -1391,7 +1356,7 @@
         lcd_puts(0, line++, buf);
 
         lcd_update();
-        if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL))
+        if (get_action(CONTEXT_STD,HZ/10) == ACTION_STD_CANCEL)
         {
             return false;
         }
@@ -1684,14 +1649,14 @@
 
         lcd_update();
 
-        switch(get_action(CONTEXT_SETTINGS,HZ/2))
+        switch(get_action(CONTEXT_STD,HZ/2))
         {
-            case ACTION_SETTINGS_DEC:
+            case ACTION_STD_PREV:
                 if (view)
                     view--;
                 break;
 
-            case ACTION_SETTINGS_INC:
+            case ACTION_STD_NEXT:
                 if (view < 3)
                     view++;
                 break;