5 files changed, 19 insertions, 21 deletions

diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 1819e983f7..cfc0f76448 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -171,9 +171,8 @@ PLUGIN_HEADER
 #define CALCULATOR_UP   BUTTON_UP
 #define CALCULATOR_DOWN BUTTON_DOWN
 #define CALCULATOR_QUIT BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU
-#define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL)
-#define CALCULATOR_CALC BUTTON_SELECT
+#define CALCULATOR_INPUT BUTTON_SELECT
+#define CALCULATOR_CALC BUTTON_MENU
 #define CALCULATOR_CLEAR BUTTON_A
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
@@ -211,9 +210,8 @@ PLUGIN_HEADER
 #define CALCULATOR_UP   BUTTON_UP
 #define CALCULATOR_DOWN BUTTON_DOWN
 #define CALCULATOR_QUIT BUTTON_POWER
-#define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU
-#define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL)
-#define CALCULATOR_CALC BUTTON_SELECT
+#define CALCULATOR_INPUT BUTTON_SELECT
+#define CALCULATOR_CALC BUTTON_MENU
 #define CALCULATOR_CLEAR BUTTON_DISPLAY
 
 #else
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c
index 47c46bf3c9..24198e507a 100644
--- a/apps/plugins/chessbox/chessbox.c
+++ b/apps/plugins/chessbox/chessbox.c
@@ -157,9 +157,9 @@ PLUGIN_HEADER
 #define CB_DOWN    BUTTON_DOWN
 #define CB_LEFT    BUTTON_LEFT
 #define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    BUTTON_POWER
+#define CB_PLAY    BUTTON_A
 #define CB_LEVEL   BUTTON_MENU
-#define CB_MENU    BUTTON_A
+#define CB_MENU    BUTTON_POWER
 
 #define CB_SCROLL_UP     (BUTTON_UP|BUTTON_REPEAT)
 #define CB_SCROLL_DOWN   (BUTTON_DOWN|BUTTON_REPEAT)
@@ -232,9 +232,9 @@ PLUGIN_HEADER
 #define CB_DOWN    BUTTON_DOWN
 #define CB_LEFT    BUTTON_LEFT
 #define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    BUTTON_POWER
-#define CB_LEVEL   BUTTON_MENU
-#define CB_MENU    BUTTON_DISPLAY
+#define CB_PLAY    BUTTON_PLAY
+#define CB_LEVEL   BUTTON_DISPLAY
+#define CB_MENU    BUTTON_POWER
 
 #define CB_SCROLL_UP     (BUTTON_UP|BUTTON_REPEAT)
 #define CB_SCROLL_DOWN   (BUTTON_DOWN|BUTTON_REPEAT)
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c
index 7ad43ad4b1..b59d0fc308 100644
--- a/apps/plugins/chessbox/chessbox_pgn.c
+++ b/apps/plugins/chessbox/chessbox_pgn.c
@@ -143,9 +143,9 @@
 #define CB_DOWN    BUTTON_DOWN
 #define CB_LEFT    BUTTON_LEFT
 #define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    BUTTON_POWER
+#define CB_PLAY    BUTTON_A
 #define CB_LEVEL   BUTTON_MENU
-#define CB_MENU    BUTTON_A
+#define CB_MENU    BUTTON_POWER
 
 #define CB_SCROLL_UP     (BUTTON_UP|BUTTON_REPEAT)
 #define CB_SCROLL_DOWN   (BUTTON_DOWN|BUTTON_REPEAT)
@@ -220,9 +220,9 @@
 #define CB_DOWN    BUTTON_DOWN
 #define CB_LEFT    BUTTON_LEFT
 #define CB_RIGHT   BUTTON_RIGHT
-#define CB_PLAY    BUTTON_POWER
-#define CB_LEVEL   BUTTON_MENU
-#define CB_MENU    BUTTON_DISPLAY
+#define CB_PLAY    BUTTON_PLAY
+#define CB_LEVEL   BUTTON_DISPLAY
+#define CB_MENU    BUTTON_POWER
 
 #define CB_SCROLL_UP     (BUTTON_UP|BUTTON_REPEAT)
 #define CB_SCROLL_DOWN   (BUTTON_DOWN|BUTTON_REPEAT)
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 85b65b26e4..a7fbb356e3 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -265,8 +265,8 @@ const struct button_mapping generic_actions[] =
     {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_A,           BUTTON_NONE},
-    {PLA_START,         BUTTON_POWER,       BUTTON_NONE},
+    {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},
@@ -331,7 +331,7 @@ const struct button_mapping generic_actions[] =
     {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_DISPLAY,                 BUTTON_NONE},
+    {PLA_QUIT,          BUTTON_POWER,                   BUTTON_NONE},
     {PLA_START,         BUTTON_PLAY,                    BUTTON_NONE},
     {PLA_MENU,          BUTTON_MENU,                    BUTTON_NONE},
     {PLA_FIRE,          BUTTON_SELECT,                  BUTTON_NONE},
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 47ed3f52a8..84552c8fe1 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -78,7 +78,7 @@
 #define REVERSI_BUTTON_MENU BUTTON_PLAY
 
 #elif (CONFIG_KEYPAD == GIGABEAT_PAD)
-#define REVERSI_BUTTON_QUIT BUTTON_A
+#define REVERSI_BUTTON_QUIT BUTTON_POWER
 #define REVERSI_BUTTON_UP BUTTON_UP
 #define REVERSI_BUTTON_DOWN BUTTON_DOWN
 #define REVERSI_BUTTON_LEFT BUTTON_LEFT
@@ -115,7 +115,7 @@
 #define REVERSI_BUTTON_MENU         (BUTTON_POWER | BUTTON_REL)
 
 #elif (CONFIG_KEYPAD == MROBE100_PAD)
-#define REVERSI_BUTTON_QUIT BUTTON_DISPLAY
+#define REVERSI_BUTTON_QUIT BUTTON_POWER
 #define REVERSI_BUTTON_UP BUTTON_UP
 #define REVERSI_BUTTON_DOWN BUTTON_DOWN
 #define REVERSI_BUTTON_LEFT BUTTON_LEFT