diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c
index 5af08c1308..31abce5bb2 100644
--- a/apps/keymaps/keymap-gigabeat.c
+++ b/apps/keymaps/keymap-gigabeat.c
@@ -68,8 +68,8 @@ static const struct button_mapping button_context_standard[]  = {
 
 
 static const struct button_mapping button_context_wps[]  = {
-    { ACTION_WPS_PLAY,          BUTTON_A|BUTTON_REL,           BUTTON_A },
-    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,          BUTTON_POWER },
+    { ACTION_WPS_PLAY,          BUTTON_A|BUTTON_REL,            BUTTON_A },
+    { ACTION_WPS_STOP,          BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
 
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
     { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
@@ -79,39 +79,39 @@ static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_STOPSEEK,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
 
-    { ACTION_WPS_ABSETB_NEXTDIR,       BUTTON_A|BUTTON_RIGHT,         BUTTON_NONE },
-    { ACTION_WPS_ABSETA_PREVDIR,       BUTTON_A|BUTTON_LEFT,          BUTTON_NONE },
-    { ACTION_WPS_ABRESET,       BUTTON_A|BUTTON_SELECT,        BUTTON_NONE },
+    { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_A|BUTTON_RIGHT,          BUTTON_NONE },
+    { ACTION_WPS_ABSETA_PREVDIR,BUTTON_A|BUTTON_LEFT,           BUTTON_NONE },
+    { ACTION_WPS_ABRESET,       BUTTON_A|BUTTON_SELECT,         BUTTON_NONE },
 
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN,                    BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN,                BUTTON_NONE },
-    { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,       BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP,                      BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_WPS_VOLUP,         BUTTON_VOL_UP,                  BUTTON_NONE },
 
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_UP,            BUTTON_A },
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_DOWN,          BUTTON_A },
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_UP,             BUTTON_A },
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_A|BUTTON_DOWN,           BUTTON_A },
 
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MENU|BUTTON_REPEAT,      BUTTON_MENU },
     { ACTION_WPS_MENU,          BUTTON_MENU|BUTTON_REL,         BUTTON_MENU },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
 
-    { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,          BUTTON_NONE },
+    { ACTION_WPS_ID3SCREEN,     BUTTON_A|BUTTON_MENU,           BUTTON_NONE },
     { ACTION_WPS_BROWSE,        BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT },
 
     LAST_ITEM_IN_LIST
 }; /* button_context_wps */
 
 static const struct button_mapping button_context_list[]  = {
-    { ACTION_LISTTREE_PGUP,         BUTTON_A|BUTTON_UP,                    BUTTON_A },
-    { ACTION_LISTTREE_PGUP,         BUTTON_UP|BUTTON_REL,                   BUTTON_A|BUTTON_UP },
-    { ACTION_LISTTREE_PGUP,         BUTTON_A|BUTTON_UP|BUTTON_REPEAT,      BUTTON_NONE },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_A|BUTTON_DOWN,                  BUTTON_A },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_DOWN|BUTTON_REL,                 BUTTON_A|BUTTON_DOWN },
-    { ACTION_LISTTREE_PGDOWN,       BUTTON_A|BUTTON_DOWN|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,      BUTTON_A|BUTTON_UP,                 BUTTON_A },
+    { ACTION_LISTTREE_PGUP,      BUTTON_UP|BUTTON_REL,               BUTTON_A|BUTTON_UP },
+    { ACTION_LISTTREE_PGUP,      BUTTON_A|BUTTON_UP|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN,    BUTTON_A|BUTTON_DOWN,               BUTTON_A },
+    { ACTION_LISTTREE_PGDOWN,    BUTTON_DOWN|BUTTON_REL,             BUTTON_A|BUTTON_DOWN },
+    { ACTION_LISTTREE_PGDOWN,    BUTTON_A|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
 #ifdef HAVE_VOLUME_IN_LIST
     { ACTION_LIST_VOLUP,         BUTTON_VOL_UP|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_LIST_VOLUP,         BUTTON_VOL_UP,                      BUTTON_NONE },
@@ -123,7 +123,7 @@ static const struct button_mapping button_context_list[]  = {
 }; /* button_context_list */
 
 static const struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_A|BUTTON_REL,         BUTTON_A },
+    { ACTION_TREE_WPS,    BUTTON_A|BUTTON_REL,            BUTTON_A },
     { ACTION_TREE_STOP,   BUTTON_POWER,                   BUTTON_NONE },
     { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REL,        BUTTON_POWER },
     { ACTION_TREE_STOP,   BUTTON_POWER|BUTTON_REPEAT,     BUTTON_NONE },
@@ -134,12 +134,12 @@ static const struct button_mapping button_context_tree[]  = {
 static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
     { ACTION_NONE,              BUTTON_A,                              BUTTON_NONE },
     { ACTION_TREE_PGLEFT,       BUTTON_A|BUTTON_LEFT,                  BUTTON_A },
-    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,                 BUTTON_A|BUTTON_LEFT },
+    { ACTION_TREE_PGLEFT,       BUTTON_LEFT|BUTTON_REL,                BUTTON_A|BUTTON_LEFT },
     { ACTION_TREE_PGLEFT,       BUTTON_A|BUTTON_LEFT,                  BUTTON_LEFT|BUTTON_REL },
-    { ACTION_TREE_ROOT_INIT,    BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_A|BUTTON_LEFT },
+    { ACTION_TREE_ROOT_INIT,    BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_A|BUTTON_LEFT },
     { ACTION_TREE_PGLEFT,       BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_TREE_PGRIGHT,      BUTTON_A|BUTTON_RIGHT,                 BUTTON_A },
-    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,                BUTTON_A|BUTTON_RIGHT },
+    { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,               BUTTON_A|BUTTON_RIGHT },
     { ACTION_TREE_PGRIGHT,      BUTTON_A|BUTTON_RIGHT,                 BUTTON_RIGHT|BUTTON_REL },
     { ACTION_TREE_PGRIGHT,      BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
@@ -167,7 +167,7 @@ static const struct button_mapping button_context_settings[]  = {
     { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,        BUTTON_A,                      BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,        BUTTON_A,                       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings */
@@ -181,36 +181,36 @@ static const struct button_mapping button_context_settings_right_is_inc[]  = {
     { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,        BUTTON_A,                  BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,        BUTTON_A,                   BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settingsgraphical */
 
 static const struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,                  BUTTON_NONE },
+    { ACTION_YESNO_ACCEPT,          BUTTON_SELECT,              BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
 
 static const struct button_mapping button_context_colorchooser[]  = {
-    { ACTION_STD_OK,            BUTTON_A|BUTTON_REL,   BUTTON_NONE },
+    { ACTION_STD_OK,                BUTTON_A|BUTTON_REL,        BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_colorchooser */
 
 static const struct button_mapping button_context_eq[]  = {
-    { ACTION_STD_OK,            BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
+    { ACTION_STD_OK,                BUTTON_SELECT|BUTTON_REL,   BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_eq */
 
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_A, BUTTON_NONE },
+    { ACTION_BMS_DELETE,        BUTTON_A,       BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
 static const struct button_mapping button_context_time[]  = {
-    { ACTION_STD_CANCEL,       BUTTON_POWER,  BUTTON_NONE },
-    { ACTION_STD_OK,           BUTTON_A,   BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_POWER,   BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_A,       BUTTON_NONE },
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
 }; /* button_context_time */
 
@@ -238,8 +238,8 @@ static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
     { ACTION_PS_TOGGLE_MODE,    BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_PS_RESET,          BUTTON_A,               BUTTON_NONE },
-    { ACTION_PS_EXIT,           BUTTON_POWER,                   BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_A,                   BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_POWER,               BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_pitchcreen */
@@ -249,14 +249,14 @@ static const struct button_mapping button_context_keyboard[]  = {
     { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,               BUTTON_NONE },
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                            BUTTON_NONE },
     { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,              BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_A|BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_KBD_CURSOR_LEFT,  BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_A|BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_A|BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_A|BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
     { ACTION_KBD_SELECT,       BUTTON_SELECT,                           BUTTON_NONE },
-    { ACTION_KBD_PAGE_FLIP,    BUTTON_A|BUTTON_MENU,                BUTTON_NONE },
-    { ACTION_KBD_DONE,         BUTTON_A|BUTTON_REL,                 BUTTON_A },
-    { ACTION_KBD_ABORT,        BUTTON_POWER|BUTTON_REL,                     BUTTON_POWER },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_A|BUTTON_MENU,                    BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_A|BUTTON_REL,                     BUTTON_A },
+    { ACTION_KBD_ABORT,        BUTTON_POWER|BUTTON_REL,                 BUTTON_POWER },
     { ACTION_KBD_BACKSPACE,    BUTTON_MENU,                             BUTTON_NONE },
     { ACTION_KBD_BACKSPACE,    BUTTON_MENU|BUTTON_REPEAT,               BUTTON_NONE },
     { ACTION_KBD_UP,           BUTTON_UP,                               BUTTON_NONE },