diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c
index 44d172c..fbe6f9c 100644
--- a/apps/plugins/bubbles.c
+++ b/apps/plugins/bubbles.c
@@ -62,44 +62,33 @@ PLUGIN_HEADER
 
 /* keyboard layouts */
 
-#if (CONFIG_KEYPAD != SANSA_E200_PAD) && \
-      (CONFIG_KEYPAD != SANSA_FUZE_PAD)
+#ifdef HAEV_SCROLLWHEEL
 /* sansas use the wheel instead of left/right if available */
+#define BUBBLES_LEFT        PLA_SCROLL_BACK
+#define BUBBLES_LEFT_REP    PLA_SCROLL_BACKL_REPEAT
+#define BUBBLES_RIGHT       PLA_SCROLL_FWD
+#define BUBBLES_RIGHT_REP   PLA_SCROLL_FWD_REPEAT
+#define ANGLE_STEP          4
+#define ANGLE_STEP_REP      4
+#else
 #define BUBBLES_LEFT        PLA_LEFT
 #define BUBBLES_LEFT_REP    PLA_LEFT_REPEAT
 #define BUBBLES_RIGHT       PLA_RIGHT
 #define BUBBLES_RIGHT_REP   PLA_RIGHT_REPEAT
-#define ANGLE_STEP  4
-#define ANGLE_STEP_REP 4
-#else
-#define BUBBLES_LEFT        PLA_UP
-#define BUBBLES_LEFT_REP    PLA_UP_REPEAT
-#define BUBBLES_RIGHT       PLA_DOWN
-#define BUBBLES_RIGHT_REP   PLA_DOWN_REPEAT
-#define ANGLE_STEP  2
-#define ANGLE_STEP_REP 4
+#define ANGLE_STEP          2
+#define ANGLE_STEP_REP      4
 #endif
 
-#define BUBBLES_QUIT        PLA_QUIT
-#define BUBBLES_START       PLA_START
-#define BUBBLES_SELECT      PLA_FIRE
-#define BUBBLES_RESUME      PLA_MENU
+#define BUBBLES_RESUME      PLA_CANCEL
+#define BUBBLES_START       PLA_SELECT_REPEAT
+#define BUBBLES_SELECT      PLA_SELECT
 
-#if CONFIG_KEYPAD != ONDIO_PAD
 
 #define BUBBLES_LVLINC      PLA_UP
 #define BUBBLES_LVLINC_REP  PLA_UP_REPEAT
 #define BUBBLES_LVLDEC      PLA_DOWN
 #define BUBBLES_LVLDEC_REP  PLA_DOWN_REPEAT
 
-#else /* ondio keys */
-
-#define BUBBLES_LVLINC      PLA_RIGHT
-#define BUBBLES_LVLINC_REP  PLA_RIGHT_REPEAT
-#define BUBBLES_LVLDEC      PLA_LEFT
-#define BUBBLES_LVLDEC_REP  PLA_LEFT_REPEAT
-
-#endif
 
 /* external bitmaps */
 #ifdef HAVE_LCD_COLOR 
@@ -2297,12 +2286,7 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
     int buttonres;
     long start;
     const struct button_mapping *plugin_contexts[]
-#if (CONFIG_KEYPAD != SANSA_E200_PAD) && \
-      (CONFIG_KEYPAD != SANSA_FUZE_PAD)
-                     = {generic_left_right_fire,generic_actions};
-#else
-                     = {generic_directions,generic_actions};
-#endif
+                     = {pla_main_ctx};
 
     if (timeout < 0)
         timeout = 0;
@@ -2355,9 +2339,6 @@ static int bubbles_handlebuttons(struct game_context* bb, bool animblock,
                 return BB_END;
             }
             break;
-        case BUBBLES_QUIT:   /* end the game */
-            return BB_END;
-
         case ACTION_UNKNOWN:
         case ACTION_NONE:    /* no button pressed */
             break;
diff --git a/apps/plugins/clock/clock.c b/apps/plugins/clock/clock.c
index f000178..74798af 100644
--- a/apps/plugins/clock/clock.c
+++ b/apps/plugins/clock/clock.c
@@ -34,27 +34,24 @@ PLUGIN_HEADER
 
 /* Keymaps */
 const struct button_mapping* plugin_contexts[]={
-    generic_actions,
-    generic_increase_decrease,
-    generic_directions,
-#if NB_SCREENS == 2
-    remote_directions
+    pla_main_ctx,
+#ifdef HAVE_REMOTE_LCD
+    pla_remote_ctx,
 #endif
 };
 #define PLA_ARRAY_COUNT sizeof(plugin_contexts)/sizeof(plugin_contexts[0])
 
-#define ACTION_COUNTER_TOGGLE PLA_FIRE
-#define ACTION_COUNTER_RESET PLA_FIRE_REPEAT
-#define ACTION_MENU PLA_MENU
-#define ACTION_EXIT PLA_QUIT
-#define ACTION_MODE_NEXT PLA_RIGHT
-#define ACTION_MODE_NEXT_REPEAT PLA_RIGHT_REPEAT
-#define ACTION_MODE_PREV PLA_LEFT
-#define ACTION_MODE_PREV_REPEAT PLA_LEFT_REPEAT
-#define ACTION_SKIN_NEXT PLA_INC
-#define ACTION_SKIN_NEXT_REPEAT PLA_INC_REPEAT
-#define ACTION_SKIN_PREV PLA_DEC
-#define ACTION_SKIN_PREV_REPEAT PLA_DEC_REPEAT
+#define ACTION_COUNTER_TOGGLE           PLA_SELECT
+#define ACTION_COUNTER_RESET            PLA_SELECT_REPEAT
+#define ACTION_MENU                     PLA_CANCEL
+#define ACTION_MODE_NEXT                PLA_RIGHT
+#define ACTION_MODE_NEXT_REPEAT         PLA_RIGHT_REPEAT
+#define ACTION_MODE_PREV                PLA_LEFT
+#define ACTION_MODE_PREV_REPEAT         PLA_LEFT_REPEAT
+#define ACTION_SKIN_NEXT                PLA_UP
+#define ACTION_SKIN_NEXT_REPEAT         PLA_UP_REPEAT
+#define ACTION_SKIN_PREV                PLA_DOWN
+#define ACTION_SKIN_PREV_REPEAT         PLA_DOWN_REPEAT
 
 /**************************
  * Cleanup on plugin return
@@ -176,11 +173,6 @@ enum plugin_status plugin_start(const void* parameter){
                 clock_draw_restore_colors();
                 exit_clock=main_menu();
                 break;
-
-            case ACTION_EXIT:
-                exit_clock=true;
-                break;
-
             default:
                 if(rb->default_event_handler_ex(button, cleanup, NULL)
                    == SYS_USB_CONNECTED)
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c
index 5f44e11..d71eabf 100644
--- a/apps/plugins/demystify.c
+++ b/apps/plugins/demystify.c
@@ -37,22 +37,30 @@ PLUGIN_HEADER
 #define MIN_POLYGONS 1
 
 /* Key assignement */
-#define DEMYSTIFY_QUIT PLA_QUIT
-
-#define DEMYSTIFY_INCREASE_SPEED PLA_RIGHT
-#define DEMYSTIFY_DECREASE_SPEED PLA_LEFT
-#define DEMYSTIFY_INCREASE_SPEED_REPEAT PLA_RIGHT_REPEAT
-#define DEMYSTIFY_DECREASE_SPEED_REPEAT PLA_LEFT_REPEAT
+#define DEMYSTIFY_QUIT                      PLA_CANCEL
+
+#ifdef HAVE_SCROLLWHEEL
+
+#define DEMYSTIFY_INCREASE_SPEED            PLA_SCROLL_FWD
+#define DEMYSTIFY_DECREASE_SPEED            PLA_SCROLL_BACK
+#define DEMYSTIFY_INCREASE_SPEED_REPEAT     PLA_SCROLL_FWD_REPEAT
+#define DEMYSTIFY_DECREASE_SPEED_REPEAT     PLA_SCROLL_BACK_REPEAT
+#else
+#define DEMYSTIFY_INCREASE_SPEED            PLA_RIGHT
+#define DEMYSTIFY_DECREASE_SPEED            PLA_LEFT
+#define DEMYSTIFY_INCREASE_SPEED_REPEAT     PLA_RIGHT_REPEAT
+#define DEMYSTIFY_DECREASE_SPEED_REPEAT     PLA_LEFT_REPEAT
+#endif
 
-#define DEMYSTIFY_ADD_POLYGON PLA_UP
-#define DEMYSTIFY_REMOVE_POLYGON PLA_DOWN
-#define DEMYSTIFY_ADD_POLYGON_REPEAT PLA_UP_REPEAT
-#define DEMYSTIFY_REMOVE_POLYGON_REPEAT PLA_DOWN_REPEAT
+#define DEMYSTIFY_ADD_POLYGON               PLA_UP
+#define DEMYSTIFY_REMOVE_POLYGON            PLA_DOWN
+#define DEMYSTIFY_ADD_POLYGON_REPEAT        PLA_UP_REPEAT
+#define DEMYSTIFY_REMOVE_POLYGON_REPEAT     PLA_DOWN_REPEAT
 
 const struct button_mapping *plugin_contexts[]
-= {generic_directions, generic_actions,
+= {pla_main_ctx,
 #if defined(HAVE_REMOTE_LCD)
-    remote_directions
+    pla_remote_ctx,
 #endif
 };
 #define NB_ACTION_CONTEXTS \
diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c
index 5ef5d50..92008b5 100644
--- a/apps/plugins/dice.c
+++ b/apps/plugins/dice.c
@@ -27,13 +27,13 @@
 #define INITIAL_NB_DICES 1
 #define INITIAL_NB_SIDES 2 /* corresponds to 6 sides in the array */
 
-#define DICE_QUIT PLA_QUIT
-#define DICE_ROLL PLA_START
+#define DICE_QUIT PLA_CANCEL
+#define DICE_ROLL PLA_SELECT
 
 
 #define CFG_FILE "dice.cfg"
 
-const struct button_mapping* plugin_contexts[]={generic_actions};
+const struct button_mapping* plugin_contexts[]={pla_main_ctx};
 
 struct dices
 {
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c
index d8b3107..a4683ad 100644
--- a/apps/plugins/fire.c
+++ b/apps/plugins/fire.c
@@ -51,20 +51,28 @@ GREY_INFO_STRUCT
 
 /* Key assignement */
 const struct button_mapping* plugin_contexts[]= {
-    generic_increase_decrease,
-    generic_directions,
+    pla_main_ctx,
 #if defined(HAVE_REMOTE_LCD)
-    remote_directions,
+    pla_remote_ctx,
 #endif
-    generic_actions
 };
 #define PLA_ARRAY_COUNT sizeof(plugin_contexts)/sizeof(plugin_contexts[0])
 
-#define FIRE_QUIT PLA_QUIT
-#define FIRE_SWITCH_FLAMES_TYPE PLA_LEFT
-#define FIRE_SWITCH_FLAMES_MOVING PLA_RIGHT
-#define FIRE_INCREASE_MULT PLA_INC
-#define FIRE_DECREASE_MULT PLA_DEC
+#define FIRE_QUIT                   PLA_CANCEL
+#define FIRE_SWITCH_FLAMES_TYPE     PLA_LEFT
+#define FIRE_SWITCH_FLAMES_MOVING   PLA_RIGHT
+
+#ifdef HAVE_SCROLLWHEEL
+#define FIRE_INCREASE_MULT          PLA_SCROLL_FWD
+#define FIRE_INCREASE_MULT_REP      PLA_SCROLL_FWD_REPEAT
+#define FIRE_DECREASE_MULT          PLA_SCROLL_BACK
+#define FIRE_DECREASE_MULT_REP      PLA_SCROLL_BACK_REPEAT
+#else
+#define FIRE_INCREASE_MULT          PLA_UP
+#define FIRE_INCREASE_MULT_REP      PLA_UP_REPEAT
+#define FIRE_DECREASE_MULT          PLA_DOWN
+#define FIRE_DECREASE_MULT_REP      PLA_DOWN_REPEAT
+#endif
 
 #define MIN_FLAME_VALUE 0
 #define COOL_MAX (440/LCD_HEIGHT+2)
diff --git a/apps/plugins/jackpot.c b/apps/plugins/jackpot.c
index e13dcf8..e326340 100644
--- a/apps/plugins/jackpot.c
+++ b/apps/plugins/jackpot.c
@@ -25,7 +25,7 @@
 
 PLUGIN_HEADER
 
-const struct button_mapping* plugin_contexts[]={generic_actions};
+const struct button_mapping* plugin_contexts[]={pla_main_ctx};
 #define NB_PICTURES 9
 #define NB_SLOTS 3
 
@@ -314,9 +314,9 @@ enum plugin_status plugin_start(const void* parameter)
                                      plugin_contexts, 1);
         switch ( action )
         {
-            case PLA_QUIT:
+            case PLA_CANCEL:
                 return PLUGIN_OK;
-            case PLA_FIRE:
+            case PLA_SELECT:
                 jackpot_play_turn(&game);
                 break;
 
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 776dd2e..f106f78 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -25,7 +25,7 @@
 #include "pluginlib_actions.h"
 
 #if defined(HAVE_REMOTE_LCD)
-const struct button_mapping remote_directions[] =
+const struct button_mapping pla_remote_ctx[] =
 {
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
     (CONFIG_KEYPAD == IRIVER_H300_PAD)
@@ -69,24 +69,31 @@ const struct button_mapping remote_directions[] =
     { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,      BUTTON_NONE},
     { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,       BUTTON_NONE},
 #else
-    #error pluginlib_actions: Unsupported remote keypad
+    #error pluginlib_actions: No remote directions
 #endif
     {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
 };
 #endif /* HAVE_REMOTE_LCD */
 
-const struct button_mapping generic_directions[] =
+/* these were taken from the bubbles plugin, so may need tweaking */
+const struct button_mapping pla_main_ctx[] = 
 {
+    /* Touchscreens */
 #ifdef HAVE_TOUCHSCREEN
-    { PLA_UP,                BUTTON_TOPMIDDLE,                  BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_BOTTOMMIDDLE,               BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_MIDLEFT,                    BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_MIDRIGHT,                   BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_MIDLEFT|BUTTON_REPEAT,      BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_MIDRIGHT|BUTTON_REPEAT,     BUTTON_NONE},
+    { PLA_CANCEL,             BUTTON_BOTTOMRIGHT,                 BUTTON_NONE},
+    { PLA_SELECT,            BUTTON_CENTER,                      BUTTON_NONE},
+    { PLA_SELECT_REPEAT,     BUTTON_CENTER|BUTTON_REPEAT,        BUTTON_CENTER},
+    { PLA_UP,               BUTTON_TOPMIDDLE,                   BUTTON_NONE},
+    { PLA_DOWN,             BUTTON_BOTTOMMIDDLE,                BUTTON_NONE},
+    { PLA_LEFT,             BUTTON_MIDLEFT,                     BUTTON_NONE},
+    { PLA_RIGHT,            BUTTON_MIDRIGHT,                    BUTTON_NONE},
+    { PLA_UP_REPEAT,        BUTTON_TOPMIDDLE|BUTTON_REPEAT,     BUTTON_TOPMIDDLE},
+    { PLA_DOWN_REPEAT,      BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT,  BUTTON_BOTTOMMIDDLE},
+    { PLA_LEFT_REPEAT,      BUTTON_MIDLEFT|BUTTON_REPEAT,       BUTTON_MIDLEFT},
+    { PLA_RIGHT_REPEAT,     BUTTON_MIDRIGHT|BUTTON_REPEAT,      BUTTON_MIDRIGHT},
 #endif
+
+    /* Directions */
 #if    (CONFIG_KEYPAD == IRIVER_H100_PAD)   \
     || (CONFIG_KEYPAD == IRIVER_H300_PAD)   \
     || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)     \
@@ -102,432 +109,158 @@ const struct button_mapping generic_directions[] =
     || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \
     || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \
     || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \
-    || (CONFIG_KEYPAD == SANSA_M200_PAD)
-    { PLA_UP,                BUTTON_UP,                  BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_DOWN,                BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
+    || (CONFIG_KEYPAD == SANSA_M200_PAD)\
+    || (CONFIG_KEYPAD == SANSA_E200_PAD) \
+    || (CONFIG_KEYPAD == SANSA_FUZE_PAD)
+    { PLA_UP,               BUTTON_UP,                  BUTTON_NONE},
+    { PLA_DOWN,             BUTTON_DOWN,                BUTTON_NONE},
+    { PLA_LEFT,             BUTTON_LEFT,                BUTTON_NONE},
+    { PLA_RIGHT,            BUTTON_RIGHT,               BUTTON_NONE},
+    { PLA_UP_REPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP  },
+    { PLA_DOWN_REPEAT,      BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN},
+    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT},
+    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT},
 #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
-   || (CONFIG_KEYPAD == IPOD_3G_PAD) \
-   || (CONFIG_KEYPAD == IPOD_4G_PAD) \
-   || (CONFIG_KEYPAD == SANSA_E200_PAD) \
-   || (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-    { PLA_UP,                BUTTON_SCROLL_BACK,      BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_SCROLL_FWD,     BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_LEFT,            BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,           BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_SCROLL_BACK|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE},
+    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
+    || (CONFIG_LEYPAD == IPOD_4G_PAD)
+    { PLA_UP,               BUTTON_MENU,                BUTTON_NONE },
+    ( PLA_DOWN,             BUTTON_PLAY,                BUTTON_NONE },
+    { PLA_LEFT,             BUTTON_LEFT,                BUTTON_NONE },
+    { PLA_RIGHT,            BUTTON_RIGHT,               BUTTON_NONE },
+    { PLA_UP_REPEAT,        BUTTON_MENU|BUTTON_REPEAT,  BUTTON_MENU },
+    { PLA_DOWN_REPEAT,      BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
+    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
+    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT},
 #elif CONFIG_KEYPAD == PLAYER_PAD
-    {PLA_UP,                BUTTON_STOP,  BUTTON_NONE},
-    {PLA_DOWN,              BUTTON_PLAY,  BUTTON_NONE},
-    {PLA_LEFT,              BUTTON_LEFT,  BUTTON_NONE},
-    {PLA_RIGHT,             BUTTON_RIGHT, BUTTON_NONE},
-    {PLA_UP_REPEAT,         BUTTON_STOP|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_DOWN_REPEAT,       BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
+    {PLA_UP,                BUTTON_PLAY,                BUTTON_NONE},
+    {PLA_DOWN,              BUTTON_STOP,                BUTTON_NONE},
+    {PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
+    {PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
+    {PLA_UP_REPEAT,         BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY},
+    {PLA_DOWN_REPEAT,       BUTTON_STOP|BUTTON_REPEAT,  BUTTON_STOP},
+    {PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT},
+    {PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT},
 #elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-    { PLA_UP,                BUTTON_SCROLL_UP,           BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_SCROLL_DOWN,         BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_SCROLL_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_SCROLL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-#elif (CONFIG_KEYPAD == MROBE500_PAD)
-#elif (CONFIG_KEYPAD == COWOND2_PAD)
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-    { PLA_UP,                BUTTON_RC_VOL_UP,                  BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_RC_VOL_DOWN,                BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_RC_REW,                     BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RC_FF,                      BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE},
+    { PLA_UP,               BUTTON_SCROLL_UP,           BUTTON_NONE},
+    { PLA_DOWN,             BUTTON_SCROLL_DOWN,         BUTTON_NONE},
+    { PLA_LEFT,             BUTTON_LEFT,                BUTTON_NONE},
+    { PLA_RIGHT,            BUTTON_RIGHT,               BUTTON_NONE},
+    { PLA_UP_REPEAT,        BUTTON_SCROLL_UP|BUTTON_REPEAT,    BUTTON_SCROLL_UP},
+    { PLA_DOWN_REPEAT,      BUTTON_SCROLL_DOWN|BUTTON_REPEAT,  BUTTON_SCROLL_DOWN},
+    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REPEAT,         BUTTON_LEFT},
+    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_RIGHT},
 #elif (CONFIG_KEYPAD == IAUDIO67_PAD)
-    { PLA_UP,                BUTTON_STOP,                       BUTTON_NONE},
-    { PLA_DOWN,              BUTTON_PLAY,                       BUTTON_NONE},
-    { PLA_LEFT,              BUTTON_LEFT,                       BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,                      BUTTON_NONE},
-    { PLA_UP_REPEAT,         BUTTON_STOP|BUTTON_REPEAT,         BUTTON_NONE},
-    { PLA_DOWN_REPEAT,       BUTTON_PLAY|BUTTON_REPEAT,         BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,         BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_NONE},
-#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */
+    { PLA_UP,               BUTTON_STOP,                       BUTTON_NONE},
+    { PLA_DOWN,             BUTTON_PLAY,                       BUTTON_NONE},
+    { PLA_LEFT,             BUTTON_LEFT,                       BUTTON_NONE},
+    { PLA_RIGHT,            BUTTON_RIGHT,                      BUTTON_NONE},
+    { PLA_UP_REPEAT,        BUTTON_STOP|BUTTON_REPEAT,         BUTTON_STOP},
+    { PLA_DOWN_REPEAT,      BUTTON_PLAY|BUTTON_REPEAT,         BUTTON_PLAY},
+    { PLA_LEFT_REPEAT,      BUTTON_LEFT|BUTTON_REPEAT,         BUTTON_LEFT},
+    { PLA_RIGHT_REPEAT,     BUTTON_RIGHT|BUTTON_REPEAT,        BUTTON_RIGHT},
 #else
-    #error pluginlib_actions: Unsupported keypad
+#ifndef HAVE_TOUCHSCREEN
+    #error pluginlib_actions: No directions defined
 #endif
-    {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
-};
-
-const struct button_mapping generic_left_right_fire[] =
-{
-#ifdef HAVE_TOUCHSCREEN
-    { PLA_LEFT,              BUTTON_MIDLEFT,                BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_MIDLEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_MIDRIGHT,               BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_CENTER,                 BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_CENTER|BUTTON_REPEAT,   BUTTON_NONE},
 #endif
-#if    (CONFIG_KEYPAD == IRIVER_H100_PAD)   \
-    || (CONFIG_KEYPAD == IRIVER_H300_PAD)   \
-    || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)   \
-    || (CONFIG_KEYPAD == GIGABEAT_PAD)      \
-    || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
-    || (CONFIG_KEYPAD == GIGABEAT_S_PAD)    \
-    || (CONFIG_KEYPAD == MROBE100_PAD)      \
-    || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \
-    || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \
-    || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \
-    || (CONFIG_KEYPAD == SANSA_M200_PAD)
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_SELECT,              BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
-#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
-   || (CONFIG_KEYPAD == IPOD_3G_PAD) \
-   || (CONFIG_KEYPAD == IPOD_4G_PAD)
-    { PLA_LEFT,              BUTTON_SCROLL_BACK,         BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_SCROLL_FWD,          BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_SELECT,              BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
-#elif CONFIG_KEYPAD == ONDIO_PAD
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_UP,                  BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE},
-#elif CONFIG_KEYPAD == PLAYER_PAD
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_ON,                  BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_ON|BUTTON_REPEAT,    BUTTON_NONE},
-#elif CONFIG_KEYPAD == RECORDER_PAD
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_PLAY,                BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == SANSA_C200_PAD) \
-    || (CONFIG_KEYPAD == ARCHOS_AV300_PAD)
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_SELECT,              BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) \
-   || (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_SELECT,              BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_SELECT|BUTTON_REPEAT,BUTTON_NONE},
-#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_REW,                 BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_REW|BUTTON_REPEAT,   BUTTON_NONE},
-#elif (CONFIG_KEYPAD == MROBE500_PAD)
-    { PLA_LEFT,              BUTTON_RC_REW,                     BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RC_FF,                      BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_RC_HEART,                   BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_RC_HEART|BUTTON_REPEAT,     BUTTON_NONE},
-#elif (CONFIG_KEYPAD == COWOND2_PAD)
-    { PLA_LEFT,              BUTTON_MINUS,                  BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_MINUS|BUTTON_REPEAT,    BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_PLUS,                   BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_PLUS|BUTTON_REPEAT,     BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_MENU,                   BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_MENU|BUTTON_REPEAT,     BUTTON_NONE},
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-    { PLA_LEFT,              BUTTON_RC_REW,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RC_FF,                 BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RC_FF|BUTTON_REPEAT,   BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_RC_MODE,               BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE},
-#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_MENU,                BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_MENU|BUTTON_REPEAT,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
-    { PLA_LEFT,              BUTTON_LEFT,                BUTTON_NONE},
-    { PLA_RIGHT,             BUTTON_RIGHT,               BUTTON_NONE},
-    { PLA_LEFT_REPEAT,       BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE},
-    { PLA_RIGHT_REPEAT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
-    { PLA_FIRE,              BUTTON_SELECT,                BUTTON_NONE},
-    { PLA_FIRE_REPEAT,       BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */
-#else
-    #error pluginlib_actions: Unsupported keypad
-#endif
-    {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
-};
 
-/* these were taken from the bubbles plugin, so may need tweaking */
-const struct button_mapping generic_actions[] = 
-{
-#ifdef HAVE_TOUCHSCREEN
-    {PLA_QUIT,          BUTTON_BOTTOMRIGHT,                 BUTTON_NONE},
-    {PLA_START,         BUTTON_CENTER,                      BUTTON_NONE},
-    {PLA_MENU,          BUTTON_TOPLEFT,                     BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_BOTTOMMIDDLE,                BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT,  BUTTON_NONE},
+    /* Scrollwheels */
+#ifdef HAVE_SCROLLWHEEL
+    { PLA_SCROLL_BACK,       BUTTON_SCROLL_BACK,                BUTTON_NONE},
+    { PLA_SCROLL_FWD,        BUTTON_SCROLL_FWD,                 BUTTON_NONE},
+    { PLA_SCROLL_BACK_REPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT,  BUTTON_NONE},
+    { PLA_SCROLL_FWD_REPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT,   BUTTON_NONE},
 #endif
+
+    /* Actions */
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-    {PLA_QUIT,          BUTTON_OFF,                   BUTTON_NONE},
-    {PLA_QUIT,          BUTTON_RC_STOP,               BUTTON_NONE},
-    {PLA_START,         BUTTON_ON,                    BUTTON_NONE},
-    {PLA_START,         BUTTON_RC_ON,                 BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MODE,                  BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,                BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_RC_MENU,               BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_OFF,                   BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_RC_STOP,               BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_ON,                    BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_RC_ON,                 BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_ON|BUTTON_REPEAT,      BUTTON_ON  },
+    {PLA_SELECT_REPEAT,  BUTTON_RC_ON|BUTTON_REPEAT,   BUTTON_RC_ON},
 #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
    || (CONFIG_KEYPAD == IPOD_4G_PAD)
-    {PLA_QUIT,          BUTTON_MENU|BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY},
-    {PLA_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_MENU|BUTTON_SELECT,      BUTTON_MENU},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,                    BUTTON_NONE},
-    {PLA_START,         BUTTON_RC_PLAY,                 BUTTON_NONE},
-    {PLA_MENU,          BUTTON_REC,                     BUTTON_NONE},
-    {PLA_MENU,          BUTTON_RC_MENU,                 BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,                  BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_RC_MODE,                 BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_RC_MODE|BUTTON_REPEAT,   BUTTON_NONE},
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-    {PLA_QUIT,          BUTTON_POWER,       BUTTON_NONE},
-    {PLA_START,         BUTTON_A,           BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_RC_MODE,                 BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
+    {PLA_SELECT_REPEAT,  BUTTON_RC_MODE|BUTTON_REPEAT,   BUTTON_RC_MODE},
+#elif CONFIG_KEYPAD == GIGABEAT_PAD \
+    || CONFIG_KEYPAD == SANSA_E200_PAD \
+    || CONFIG_KEYPAD == SANSA_C200_PAD \
+    || CONFIG_KEYPAD == SANSA_CLIP_PAD \
+    || CONFIG_KEYPAD == SANSA_M200_PAD \
+    || CONFIG_KEYPAD == MROBE100_PAD \
+    || CONFIG_KEYPAD == PHILIPS_SA9200_PAD \
+    || CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
-    {PLA_QUIT,          BUTTON_BACK,        BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,        BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_BACK,                    BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif CONFIG_KEYPAD == RECORDER_PAD
-    {PLA_QUIT,          BUTTON_OFF,         BUTTON_NONE},
-    {PLA_START,         BUTTON_ON,          BUTTON_NONE},
-    {PLA_MENU,          BUTTON_F1,          BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_PLAY,        BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_PLAY|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_OFF,                     BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_PLAY,                    BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY},
 #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD
-    {PLA_QUIT,          BUTTON_OFF,         BUTTON_NONE},
-    {PLA_START,         BUTTON_ON,          BUTTON_NONE},
-    {PLA_MENU,          BUTTON_F1,          BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_OFF,                     BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif CONFIG_KEYPAD == ONDIO_PAD
-    {PLA_QUIT,          BUTTON_OFF,         BUTTON_NONE},
-    {PLA_START,         BUTTON_MENU,        BUTTON_NONE},
-    {PLA_MENU,          BUTTON_DOWN,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_UP,          BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_OFF,                     BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_MENU,                    BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU},
 #elif CONFIG_KEYPAD == PLAYER_PAD
-    {PLA_QUIT,          BUTTON_STOP|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_ON,          BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_ON|BUTTON_REPEAT,    BUTTON_NONE},
-#elif CONFIG_KEYPAD == SANSA_E200_PAD || \
-    CONFIG_KEYPAD == SANSA_C200_PAD || \
-    CONFIG_KEYPAD == SANSA_CLIP_PAD || \
-    CONFIG_KEYPAD == SANSA_M200_PAD
-    {PLA_QUIT,          BUTTON_POWER,       BUTTON_NONE},
-    {PLA_START,         BUTTON_UP,        BUTTON_NONE},
-    {PLA_MENU,          BUTTON_DOWN,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_MENU|BUTTON_REPEAT,      BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_ON,                      BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_ON|BUTTON_REPEAT,        BUTTON_ON},
 #elif CONFIG_KEYPAD == SANSA_FUZE_PAD
-    {PLA_QUIT,          (BUTTON_HOME|BUTTON_REPEAT),       BUTTON_NONE},
-    {PLA_START,         BUTTON_UP,        BUTTON_NONE},
-    {PLA_MENU,          BUTTON_DOWN,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_HOME|BUTTON_REPEAT,      BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
-    {PLA_QUIT,          BUTTON_POWER,       BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,        BUTTON_NONE},
-    {PLA_MENU,          BUTTON_FF,          BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_REW,         BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_REW|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_PLAY,                    BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY},
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
-    {PLA_QUIT,          BUTTON_EQ,       BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,     BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MODE,     BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,   BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_EQ,                      BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif (CONFIG_KEYPAD == MROBE500_PAD)
-    {PLA_QUIT,          BUTTON_POWER,                       BUTTON_NONE},
-    {PLA_START,         BUTTON_RC_PLAY,                     BUTTON_NONE},
-    {PLA_MENU,          BUTTON_RC_MODE,                     BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_RC_HEART,                    BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_RC_HEART|BUTTON_REPEAT,      BUTTON_NONE},
-#elif CONFIG_KEYPAD == MROBE100_PAD
-    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,                    BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,                  BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_RC_HEART,                BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_RC_HEART|BUTTON_REPEAT,  BUTTON_RC_HEARD},
 #elif (CONFIG_KEYPAD == COWOND2_PAD)
-    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_MINUS,                   BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_CENTER,                  BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_CENTER|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_MINUS,                   BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_MINUS|BUTTON_MINUS,      BUTTON_MINUS},
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-    {PLA_QUIT,          BUTTON_RC_REC,                  BUTTON_NONE},
-    {PLA_START,         BUTTON_RC_PLAY,                 BUTTON_NONE},
-    {PLA_MENU,          BUTTON_RC_MENU,                 BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_RC_MODE,                 BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_RC_MODE|BUTTON_REPEAT,   BUTTON_NONE},
-#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
-    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_RIGHT,                    BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,                  BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_RC_REC,                  BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_RC_MODE,                 BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_RC_MODE|BUTTON_REPEAT,   BUTTON_RC_MODE},
 #elif (CONFIG_KEYPAD == IAUDIO67_PAD)
-    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,                    BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_VOLUP,                   BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_VOLUP|BUTTON_REPEAT,     BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_PLAY,                    BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_PLAY|BUTTON_REPEAT       BUTTON_PLAY},
 #elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
-    {PLA_QUIT,          BUTTON_BACK,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_PLAY,                    BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,                   BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,     BUTTON_NONE},
-#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
-    {PLA_QUIT,          BUTTON_POWER,       BUTTON_NONE},
-    {PLA_START,         BUTTON_VIEW,        BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,        BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_SELECT,      BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_BACK,                    BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_SELECT,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
 #elif (CONFIG_KEYPAD == ONDAVX747_PAD)
-    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
-    {PLA_START,         BUTTON_VOL_DOWN,                BUTTON_NONE},
-    {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
-    {PLA_FIRE,          BUTTON_VOL_UP,                  BUTTON_NONE},
-    {PLA_FIRE_REPEAT,   BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
-#else
-    #error pluginlib_actions: Unsupported keypad
-#endif
-    {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
-};
-
-const struct button_mapping generic_increase_decrease[] =
-{
-#ifdef HAVE_TOUCHSCREEN
-    {PLA_INC,             BUTTON_TOPMIDDLE,                  BUTTON_NONE},
-    {PLA_DEC,             BUTTON_BOTTOMMIDDLE,               BUTTON_NONE},
-    {PLA_INC_REPEAT,      BUTTON_TOPMIDDLE|BUTTON_REPEAT,    BUTTON_NONE},
-    {PLA_DEC_REPEAT,      BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE},
-#endif
-#if    (CONFIG_KEYPAD == IRIVER_H100_PAD)   \
-    || (CONFIG_KEYPAD == IRIVER_H300_PAD)   \
-    || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD)   \
-    || (CONFIG_KEYPAD == GIGABEAT_PAD)      \
-    || (CONFIG_KEYPAD == RECORDER_PAD)      \
-    || (CONFIG_KEYPAD == ARCHOS_AV300_PAD)  \
-    || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
-    || (CONFIG_KEYPAD == ONDIO_PAD)         \
-    || (CONFIG_KEYPAD == GIGABEAT_S_PAD)    \
-    || (CONFIG_KEYPAD == MROBE100_PAD)      \
-    || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \
-    || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \
-    || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \
-    || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \
-    || (CONFIG_KEYPAD == SANSA_M200_PAD) 
-    {PLA_INC,              BUTTON_UP,                  BUTTON_NONE},
-    {PLA_DEC,              BUTTON_DOWN,                BUTTON_NONE},
-    {PLA_INC_REPEAT,       BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    {PLA_DEC_REPEAT,       BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == SANSA_C200_PAD)
-    {PLA_INC,              BUTTON_VOL_UP,                  BUTTON_NONE},
-    {PLA_DEC,              BUTTON_VOL_DOWN,                BUTTON_NONE},
-    {PLA_INC_REPEAT,       BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    {PLA_DEC_REPEAT,       BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
-    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
-    || (CONFIG_KEYPAD == IPOD_4G_PAD) \
-    || (CONFIG_KEYPAD == SANSA_E200_PAD) \
-    || (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-    {PLA_INC,              BUTTON_SCROLL_FWD,      BUTTON_NONE},
-    {PLA_DEC,              BUTTON_SCROLL_BACK,     BUTTON_NONE},
-    {PLA_INC_REPEAT,       BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_NONE},
-    {PLA_DEC_REPEAT,       BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE},
-#elif CONFIG_KEYPAD == PLAYER_PAD
-    {PLA_INC,              BUTTON_STOP,  BUTTON_NONE},
-    {PLA_DEC,              BUTTON_PLAY,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == IRIVER_H10_PAD)
-    {PLA_INC,              BUTTON_SCROLL_UP,           BUTTON_NONE},
-    {PLA_DEC,              BUTTON_SCROLL_DOWN,         BUTTON_NONE},
-    {PLA_INC_REPEAT,       BUTTON_SCROLL_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    {PLA_DEC_REPEAT,       BUTTON_SCROLL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-#elif (CONFIG_KEYPAD == MROBE500_PAD)
-    {PLA_INC,             BUTTON_RC_PLAY,                    BUTTON_NONE},
-    {PLA_DEC,             BUTTON_RC_DOWN,                    BUTTON_NONE},
-    {PLA_INC_REPEAT,      BUTTON_RC_PLAY|BUTTON_REPEAT,      BUTTON_NONE},
-    {PLA_DEC_REPEAT,      BUTTON_RC_DOWN|BUTTON_REPEAT,      BUTTON_NONE},
-#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
-    {PLA_INC,             BUTTON_RC_VOL_UP,                  BUTTON_NONE},
-    {PLA_DEC,             BUTTON_RC_VOL_DOWN,                BUTTON_NONE},
-    {PLA_INC_REPEAT,      BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
-    {PLA_DEC_REPEAT,      BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
-#elif CONFIG_KEYPAD == COWOND2_PAD
-    {PLA_INC,             BUTTON_PLUS,                       BUTTON_NONE},
-    {PLA_DEC,             BUTTON_MINUS,                      BUTTON_NONE},
-    {PLA_INC_REPEAT,      BUTTON_PLUS|BUTTON_REPEAT,         BUTTON_NONE},
-    {PLA_DEC_REPEAT,      BUTTON_MINUS|BUTTON_REPEAT,        BUTTON_NONE},
-#elif CONFIG_KEYPAD == IAUDIO67_PAD
-    {PLA_INC,             BUTTON_VOLUP,                       BUTTON_NONE},
-    {PLA_DEC,             BUTTON_VOLDOWN,                     BUTTON_NONE},
-    {PLA_INC_REPEAT,      BUTTON_VOLUP|BUTTON_REPEAT,         BUTTON_NONE},
-    {PLA_DEC_REPEAT,      BUTTON_VOLDOWN|BUTTON_REPEAT,       BUTTON_NONE},
-#elif CONFIG_KEYPAD == ONDAVX747_PAD
-    {PLA_INC,             BUTTON_VOL_UP,                       BUTTON_NONE},
-    {PLA_DEC,             BUTTON_VOL_DOWN,                     BUTTON_NONE},
-    {PLA_INC_REPEAT,      BUTTON_VOL_UP|BUTTON_REPEAT,         BUTTON_NONE},
-    {PLA_DEC_REPEAT,      BUTTON_VOL_DOWN|BUTTON_REPEAT,       BUTTON_NONE},
+    {PLA_CANCEL,          BUTTON_POWER,                   BUTTON_NONE},
+    {PLA_SELECT,         BUTTON_VOL_UP,                  BUTTON_NONE},
+    {PLA_SELECT_REPEAT,  BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_VOL_UP},
 #else
-#error pluginlib_actions: Unsupported keypad
+    #error pluginlib_actions: No actions defined
 #endif
     {CONTEXT_PLUGIN,BUTTON_NONE,BUTTON_NONE}
 };
diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h
index cc5f8b4..6da1ccc 100644
--- a/apps/plugins/lib/pluginlib_actions.h
+++ b/apps/plugins/lib/pluginlib_actions.h
@@ -38,27 +38,24 @@ enum {
     PLA_LEFT_REPEAT,
     PLA_RIGHT_REPEAT,
 
-    PLA_INC,
-    PLA_DEC,
-    PLA_INC_REPEAT,
-    PLA_DEC_REPEAT,
+    PLA_CANCEL,
+    PLA_SELECT,
+    PLA_SELECT_REPEAT,
 
-    PLA_QUIT,
-    PLA_START,
-    PLA_MENU,
-    PLA_FIRE,
-    PLA_FIRE_REPEAT,
+#ifdef HAVE_SCROLLWHEEL
+    PLA_SCROLL_FWD,
+    PLA_SCROLL_FWD_REPEAT,
+    PLA_SCROLL_BACK,
+    PLA_SCROLL_BACK_REPEAT,
+#endif
 
     LAST_PLUGINLIB_ACTION
 };
 
 #if defined(HAVE_REMOTE_LCD)
-extern const struct button_mapping remote_directions[];
+extern const struct button_mapping pla_remote_ctx[];
 #endif
-extern const struct button_mapping generic_directions[];
-extern const struct button_mapping generic_left_right_fire[];
-extern const struct button_mapping generic_actions[];
-extern const struct button_mapping generic_increase_decrease[];
+extern const struct button_mapping pla_main_ctx[];
 
 int pluginlib_getaction(int timeout,
                         const struct button_mapping *plugin_contexts[],
diff --git a/apps/plugins/maze.c b/apps/plugins/maze.c
index 307f14d..be7397c 100644
--- a/apps/plugins/maze.c
+++ b/apps/plugins/maze.c
@@ -37,18 +37,7 @@ PLUGIN_HEADER
 
 /* key assignments */
 
-#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#   define MAZE_NEW      (BUTTON_SELECT | BUTTON_REPEAT)
-#   define MAZE_NEW_PRE  BUTTON_SELECT
-#   define MAZE_QUIT     (BUTTON_SELECT | BUTTON_MENU)
-#   define MAZE_SOLVE    (BUTTON_SELECT | BUTTON_PLAY)
-#   define MAZE_RIGHT    BUTTON_RIGHT
-#   define MAZE_LEFT     BUTTON_LEFT
-#   define MAZE_UP       BUTTON_MENU
-#   define MAZE_DOWN     BUTTON_PLAY
-
-#elif (CONFIG_KEYPAD == IPOD_3G_PAD)
+#if (CONFIG_KEYPAD == IPOD_3G_PAD)
 #   define MAZE_NEW      (BUTTON_SELECT | BUTTON_REPEAT)
 #   define MAZE_NEW_PRE  BUTTON_SELECT
 #   define MAZE_QUIT     BUTTON_MENU
@@ -58,35 +47,17 @@ PLUGIN_HEADER
 #   define MAZE_UP       BUTTON_SCROLL_BACK
 #   define MAZE_DOWN     BUTTON_SCROLL_FWD
 
-#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#   define MAZE_NEW      (BUTTON_SELECT | BUTTON_REPEAT)
-#   define MAZE_QUIT     (BUTTON_HOME | BUTTON_REPEAT)
-#   define MAZE_SOLVE    BUTTON_SELECT
-#   define MAZE_RIGHT    BUTTON_RIGHT
-#   define MAZE_LEFT     BUTTON_LEFT
-#   define MAZE_UP       BUTTON_UP
-#   define MAZE_DOWN     BUTTON_DOWN
-
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
-#   define MAZE_NEW      (BUTTON_SELECT | BUTTON_REPEAT)
-#   define MAZE_QUIT     BUTTON_POWER
-#   define MAZE_SOLVE    BUTTON_SELECT
-#   define MAZE_RIGHT    BUTTON_RIGHT
-#   define MAZE_LEFT     BUTTON_LEFT
-#   define MAZE_UP       BUTTON_UP
-#   define MAZE_DOWN     BUTTON_DOWN
-
 #else
 #   include "lib/pluginlib_actions.h"
-#   define MAZE_NEW      PLA_START
-#   define MAZE_QUIT     PLA_QUIT
-#   define MAZE_SOLVE    PLA_FIRE
+#   define MAZE_NEW      PLA_SELECT_REPEAT
+#   define MAZE_QUIT     PLA_CANCEL
+#   define MAZE_SOLVE    PLA_SELECT
 #   define MAZE_RIGHT    PLA_RIGHT
 #   define MAZE_LEFT     PLA_LEFT
 #   define MAZE_UP       PLA_UP
 #   define MAZE_DOWN     PLA_DOWN
 static const struct button_mapping *plugin_contexts[]
-= {generic_directions, generic_actions};
+= {pla_main_ctx};
 
 #endif
 
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c
index a19c8a0..0e75e5c 100644
--- a/apps/plugins/mazezam.c
+++ b/apps/plugins/mazezam.c
@@ -27,45 +27,22 @@
 /* Include standard plugin macro */
 PLUGIN_HEADER
 
-#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#   define MAZEZAM_MENU     (BUTTON_SELECT | BUTTON_MENU)
-#   define MAZEZAM_RIGHT    BUTTON_RIGHT
-#   define MAZEZAM_LEFT     BUTTON_LEFT
-#   define MAZEZAM_UP       BUTTON_MENU
-#   define MAZEZAM_DOWN     BUTTON_PLAY
-
-#elif (CONFIG_KEYPAD == IPOD_3G_PAD)
+#if (CONFIG_KEYPAD == IPOD_3G_PAD)
 #   define MAZEZAM_MENU    BUTTON_MENU
 #   define MAZEZAM_RIGHT   BUTTON_RIGHT
 #   define MAZEZAM_LEFT    BUTTON_LEFT
 #   define MAZEZAM_UP      BUTTON_SCROLL_BACK
 #   define MAZEZAM_DOWN    BUTTON_SCROLL_FWD
 
-#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#   define MAZEZAM_MENU     (BUTTON_HOME | BUTTON_REPEAT)
-#   define MAZEZAM_RIGHT    BUTTON_RIGHT
-#   define MAZEZAM_LEFT     BUTTON_LEFT
-#   define MAZEZAM_UP       BUTTON_UP
-#   define MAZEZAM_DOWN     BUTTON_DOWN
-
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD)
-#   define MAZEZAM_MENU     BUTTON_POWER
-#   define MAZEZAM_SOLVE    BUTTON_SELECT
-#   define MAZEZAM_RIGHT    BUTTON_RIGHT
-#   define MAZEZAM_LEFT     BUTTON_LEFT
-#   define MAZEZAM_UP       BUTTON_UP
-#   define MAZEZAM_DOWN     BUTTON_DOWN
-
 #else
 #   include "lib/pluginlib_actions.h"
-#   define MAZEZAM_MENU     PLA_QUIT
+#   define MAZEZAM_MENU     PLA_CANCEL
 #   define MAZEZAM_RIGHT    PLA_RIGHT
 #   define MAZEZAM_LEFT     PLA_LEFT
 #   define MAZEZAM_UP       PLA_UP
 #   define MAZEZAM_DOWN     PLA_DOWN
 const struct button_mapping *plugin_contexts[]
-= {generic_directions, generic_actions};
+= { pla_main_ctx };
 #endif
 
 /* All the text is here */
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index 10b9e41..0c37da1 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -608,11 +608,19 @@ static signed short sound[] = {
 };
 #endif
 
-#define METRONOME_QUIT          PLA_QUIT
-#define METRONOME_VOL_UP        PLA_INC
-#define METRONOME_VOL_DOWN      PLA_DEC
-#define METRONOME_VOL_UP_REP    PLA_INC_REPEAT
-#define METRONOME_VOL_DOWN_REP  PLA_DEC_REPEAT
+#define METRONOME_QUIT          PLA_CANCEL
+
+#ifdef HAVE_SCROLLWHEEL
+#define METRONOME_VOL_UP        PLA_SCROLL_FWD
+#define METRONOME_VOL_UP_REP    PLA_SCROLL_FWD_REPEAT
+#define METRONOME_VOL_DOWN      PLA_SCROLL_BACK
+#define METRONOME_VOL_DOWN_REP  PLA_SCROLL_BACK_REPEAT
+#else
+#define METRONOME_VOL_UP        PLA_UP
+#define METRONOME_VOL_DOWN      PLA_DOWN
+#define METRONOME_VOL_UP_REP    PLA_UP_REPEAT
+#define METRONOME_VOL_DOWN_REP  PLA_DOWN_REPEAT
+#endif
 #define METRONOME_LEFT          PLA_LEFT
 #define METRONOME_RIGHT         PLA_RIGHT
 #define METRONOME_LEFT_REP      PLA_LEFT_REPEAT
@@ -629,9 +637,9 @@ enum {
 
 
 #if CONFIG_KEYPAD == ONDIO_PAD
-#define METRONOME_TAP       PLA_START
-#define METRONOME_MSG_START "start: mode"
-#define METRONOME_MSG_STOP "pause: hold mode"
+#define METRONOME_TAP           PLA_SELECT
+#define METRONOME_MSG_START     "start: mode"
+#define METRONOME_MSG_STOP      "pause: hold mode"
 static const struct button_mapping ondio_action[] = 
 {
     {METRONOME_PLAY_TAP, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
@@ -639,10 +647,10 @@ static const struct button_mapping ondio_action[] =
     {CONTEXT_CUSTOM,BUTTON_NONE,BUTTON_NONE}
 };
 #else /* !ONDIO_PAD  */
-#define METRONOME_TAP       PLA_FIRE
-#define METRONOME_PLAYPAUSE PLA_START
-#define METRONOME_MSG_START "press play"
-#define METRONOME_MSG_STOP "press pause"
+#define METRONOME_TAP           PLA_SELECT_REPEAT
+#define METRONOME_PLAYPAUSE     PLA_SELECT
+#define METRONOME_MSG_START     "press play"
+#define METRONOME_MSG_STOP      "press pause"
 
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
 #define MET_SYNC
@@ -656,14 +664,12 @@ static const struct button_mapping iriver_syncaction[] =
 
 const struct button_mapping *plugin_contexts[] =
 {
-    generic_increase_decrease,
-    generic_directions,
+    pla_main_ctx,
 #if CONFIG_KEYPAD == ONDIO_PAD
     ondio_action,
 #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
     iriver_syncaction,
 #endif
-    generic_actions
 };
 #define PLA_ARRAY_COUNT sizeof(plugin_contexts)/sizeof(plugin_contexts[0])
 
diff --git a/apps/plugins/robotfindskitten.c b/apps/plugins/robotfindskitten.c
index 1010531..58e3796 100644
--- a/apps/plugins/robotfindskitten.c
+++ b/apps/plugins/robotfindskitten.c
@@ -468,35 +468,7 @@ static char* messages[] =
 
 #define RFK_VERSION "v1.4142135.406"
 
-/* Button definitions stolen from maze.c */
-#if (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_3G_PAD) || \
-    (CONFIG_KEYPAD == IPOD_1G2G_PAD)
-#   undef __PLUGINLIB_ACTIONS_H__
-#   define RFK_QUIT     (BUTTON_SELECT | BUTTON_MENU)
-#   define RFK_RIGHT    BUTTON_RIGHT
-#   define RFK_LEFT     BUTTON_LEFT
-#   define RFK_UP       BUTTON_MENU
-#   define RFK_DOWN     BUTTON_PLAY
-#   define RFK_RRIGHT   (BUTTON_RIGHT | BUTTON_REPEAT)
-#   define RFK_RLEFT    (BUTTON_LEFT | BUTTON_REPEAT)
-#   define RFK_RUP      (BUTTON_MENU | BUTTON_REPEAT)
-#   define RFK_RDOWN    (BUTTON_PLAY | BUTTON_REPEAT)
-
-#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#   undef __PLUGINLIB_ACTIONS_H__
-#   define RFK_QUIT     (BUTTON_HOME|BUTTON_REPEAT)
-#   define RFK_RIGHT    BUTTON_RIGHT
-#   define RFK_LEFT     BUTTON_LEFT
-#   define RFK_UP       BUTTON_UP
-#   define RFK_DOWN     BUTTON_DOWN
-#   define RFK_RRIGHT   (BUTTON_RIGHT | BUTTON_REPEAT)
-#   define RFK_RLEFT    (BUTTON_LEFT | BUTTON_REPEAT)
-#   define RFK_RUP      (BUTTON_UP | BUTTON_REPEAT)
-#   define RFK_RDOWN    (BUTTON_DOWN | BUTTON_REPEAT)
-
-#else
-#   define RFK_QUIT     PLA_QUIT
+#   define RFK_QUIT     PLA_CANCEL
 #   define RFK_RIGHT    PLA_RIGHT
 #   define RFK_LEFT     PLA_LEFT
 #   define RFK_UP       PLA_UP
@@ -506,7 +478,6 @@ static char* messages[] =
 #   define RFK_RUP      PLA_UP_REPEAT
 #   define RFK_RDOWN    PLA_DOWN_REPEAT
 
-#endif
 /*Constants for our internal representation of the screen.*/
 #define EMPTY -1
 #define ROBOT 0
@@ -664,9 +635,7 @@ static void play_game()
     int old_x = robot.x;
     int old_y = robot.y;
     int input = 0; /* Not sure what a reasonable initial value is */
-#ifdef __PLUGINLIB_ACTIONS_H__
-    const struct button_mapping *plugin_contexts[] = {generic_directions, generic_actions};
-#endif
+    const struct button_mapping *plugin_contexts[] = {pla_main_ctx};
 
     while (input != RFK_QUIT && exit_rfk == false)
     {
diff --git a/apps/plugins/rocklife.c b/apps/plugins/rocklife.c
index 8a1a1b3..0777b2d 100644
--- a/apps/plugins/rocklife.c
+++ b/apps/plugins/rocklife.c
@@ -66,11 +66,11 @@
 
 PLUGIN_HEADER
 
-#define ROCKLIFE_PLAY_PAUSE PLA_FIRE
+#define ROCKLIFE_PLAY_PAUSE PLA_SELECT
 #define ROCKLIFE_INIT       PLA_DOWN
 #define ROCKLIFE_NEXT       PLA_RIGHT
 #define ROCKLIFE_NEXT_REP   PLA_RIGHT_REPEAT
-#define ROCKLIFE_QUIT       PLA_QUIT
+#define ROCKLIFE_QUIT       PLA_CANCEL
 #define ROCKLIFE_STATUS     PLA_LEFT
 
 #define PATTERN_RANDOM     0
@@ -80,7 +80,7 @@ PLUGIN_HEADER
 #define PATTERN_GLIDER_GUN 4 /* not yet implemented */
 
 const struct button_mapping *plugin_contexts[]
-= {generic_directions, generic_actions};
+= {pla_main_ctx};
 
 #define GRID_W LCD_WIDTH
 #define GRID_H LCD_HEIGHT
diff --git a/apps/plugins/test_resize.c b/apps/plugins/test_resize.c
index a6a183a..9eeb130 100644
--- a/apps/plugins/test_resize.c
+++ b/apps/plugins/test_resize.c
@@ -46,8 +46,8 @@ const struct button_mapping *plugin_contexts[]
 #define WIDTH_DECREASE           PLA_LEFT
 #define WIDTH_DECREASE_REPEAT    PLA_LEFT_REPEAT
 
-#define BUTTON_QUIT             PLA_QUIT
-#define CHANGE_MODE             PLA_MENU
+#define BUTTON_QUIT             PLA_CANCEL
+#define CHANGE_MODE             PLA_SELECT
 
 #define MAX_OUTPUT_WIDTH    LCD_WIDTH
 #define MAX_OUTPUT_HEIGHT   LCD_HEIGHT