4 files changed, 24 insertions, 19 deletions

diff --git a/apps/menu.h b/apps/menu.h
index d142d5ae60..579de66aa0 100644
--- a/apps/menu.h
+++ b/apps/menu.h
@@ -28,6 +28,7 @@
 #define MENU_PREV   BUTTON_UP
 #define MENU_EXIT   BUTTON_LEFT
 #define MENU_EXIT2  BUTTON_OFF
+#define MENU_EXIT3  BUTTON_MODE
 #define MENU_ENTER  BUTTON_RIGHT
 #define MENU_ENTER2 BUTTON_SELECT
 
diff --git a/apps/settings.h b/apps/settings.h
index 325009eddb..3e138cfc7e 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -40,6 +40,7 @@
 #define SETTINGS_OK      BUTTON_SELECT
 #define SETTINGS_OK2     BUTTON_LEFT
 #define SETTINGS_CANCEL  BUTTON_OFF
+#define SETTINGS_CANCEL2 BUTTON_MODE
 
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #define SETTINGS_INC     BUTTON_UP
diff --git a/apps/wps.c b/apps/wps.c
index 9848be0965..3934f2483f 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -84,24 +84,6 @@ static bool setvol(void)
     return false;
 }
 
-static void display_keylock_text(bool locked)
-{
-    char* s;
-    lcd_stop_scroll();
-#ifdef HAVE_LCD_CHARCELLS
-    if(locked)
-        s = str(LANG_KEYLOCK_ON_PLAYER);
-    else
-        s = str(LANG_KEYLOCK_OFF_PLAYER);
-#else
-    if(locked)
-        s = str(LANG_KEYLOCK_ON_RECORDER);
-    else
-        s = str(LANG_KEYLOCK_OFF_RECORDER);
-#endif
-    splash(HZ, true, s);
-}
-
 static bool ffwd_rew(int button)
 {
     static const int ff_rew_steps[] = {
@@ -321,12 +303,32 @@ static void fade(bool fade_in)
 }
 
 
+#ifdef WPS_KEYLOCK
+static void display_keylock_text(bool locked)
+{
+    char* s;
+    lcd_stop_scroll();
+#ifdef HAVE_LCD_CHARCELLS
+    if(locked)
+        s = str(LANG_KEYLOCK_ON_PLAYER);
+    else
+        s = str(LANG_KEYLOCK_OFF_PLAYER);
+#else
+    if(locked)
+        s = str(LANG_KEYLOCK_ON_RECORDER);
+    else
+        s = str(LANG_KEYLOCK_OFF_RECORDER);
+#endif
+    splash(HZ, true, s);
+}
+
 static void waitfor_nokey(void)
 {
     /* wait until all keys are released */
     while (button_get(false) != BUTTON_NONE)
         yield();
 }
+#endif
 
 /* demonstrates showing different formats from playtune */
 long wps_show(void)
@@ -624,6 +626,7 @@ long wps_show(void)
                 restore = true;
                 break;
 
+#ifdef WPS_KEYLOCK
             /* key lock */
             case WPS_KEYLOCK:
             case WPS_KEYLOCK | BUTTON_REPEAT:
@@ -632,6 +635,7 @@ long wps_show(void)
                 restore = true;
                 waitfor_nokey();
                 break;
+#endif
 
 #if CONFIG_KEYPAD == RECORDER_PAD
                 /* play settings */
diff --git a/apps/wps.h b/apps/wps.h
index 2a2df85d2e..2a1826aaa8 100644
--- a/apps/wps.h
+++ b/apps/wps.h
@@ -37,7 +37,6 @@
 #define WPS_BROWSE     (BUTTON_SELECT | BUTTON_REL)
 #define WPS_BROWSE_PRE BUTTON_SELECT
 #define WPS_EXIT       BUTTON_OFF
-#define WPS_KEYLOCK    (BUTTON_MODE | BUTTON_DOWN)
 #define WPS_ID3        (BUTTON_MODE | BUTTON_ON)
 
 #define WPS_RC_NEXT    BUTTON_RC_FF