1 files changed, 9 insertions, 6 deletions

diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 3752b35f9c..e92baf4dbe 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -29,7 +29,7 @@
 
 /* CONTEXT_CUSTOM's used in this file...
 
-CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
 
 
 */
@@ -104,7 +104,7 @@ const struct button_mapping button_context_tree_scroll_lr[]  = {
     { ACTION_STD_OK,            BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
     { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_TREE_PGRIGHT,      BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
 };
 
 const struct button_mapping button_context_yesno[]  = {
@@ -126,7 +126,7 @@ const struct button_mapping button_context_quickscreen[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
-const struct button_mapping button_context_settingsgraphical[]  = {
+const struct button_mapping button_context_settings_r_is_inc[]  = {
     { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
     { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
@@ -246,8 +246,10 @@ const struct button_mapping* get_context_mapping( int context )
         case CONTEXT_WPS:
             return button_context_wps;
 
-        case CONTEXT_SETTINGSGRAPHICAL:
-            return button_context_settingsgraphical;
+        case CONTEXT_SETTINGS_EQ:
+        case CONTEXT_SETTINGS_COLOURCHOOSER:
+        case CONTEXT_SETTINGS_TIME:
+            return button_context_settings_r_is_inc;
 
         case CONTEXT_SETTINGS:
             return button_context_settings;
@@ -259,7 +261,8 @@ const struct button_mapping* get_context_mapping( int context )
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_tree_scroll_lr;
             /* else fall through to CUSTOM|1 */
-        case CONTEXT_CUSTOM|1:
+        case CONTEXT_CUSTOM|CONTEXT_TREE
+        :
             return button_context_tree;
         case CONTEXT_QUICKSCREEN:
             return button_context_quickscreen;