155 files changed, 14838 insertions, 2310 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index a101097004..8e16ff1c21 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -124,6 +124,10 @@
 
 #include "talk.h"
 
+#if defined(HAVE_DEVICEDATA)// && !defined(SIMULATOR)
+#include "devicedata.h"
+#endif
+
 #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
 #include "bootdata.h"
 #include "multiboot.h"
@@ -2625,6 +2629,33 @@ static bool dbg_boot_data(void)
 }
 #endif /* defined(HAVE_BOOTDATA) && !defined(SIMULATOR) */
 
+#if defined(HAVE_DEVICEDATA)// && !defined(SIMULATOR)
+static bool dbg_device_data(void)
+{
+    struct simplelist_info info;
+    info.scroll_all = true;
+    simplelist_info_init(&info, "Device data", 1, NULL);
+    simplelist_set_line_count(0);
+
+    simplelist_addline("Device data");
+
+#if defined(EROS_QN)
+    simplelist_addline("Lcd Version: %d", (int)device_data.lcd_version);
+#endif
+
+    simplelist_addline("Device data RAW:");
+    for (size_t i = 0; i < device_data.length; i += 4)
+    {
+        simplelist_addline("%02x: %02x %02x %02x %02x", i,
+                           device_data.payload[i + 0], device_data.payload[i + 1],
+                           device_data.payload[i + 2], device_data.payload[i + 3]);
+    }
+
+    return simplelist_show_list(&info);
+}
+#endif /* defined(HAVE_DEVICEDATA)*/
+
+
 #if defined(IPOD_6G) && !defined(SIMULATOR)
 #define SYSCFG_MAX_ENTRIES 9 // 9 on iPod Classic/6G
 
@@ -2823,6 +2854,11 @@ static const struct {
 #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
         {"Boot data", dbg_boot_data },
 #endif
+
+#if defined(HAVE_DEVICEDATA)// && !defined(SIMULATOR)
+        {"Device data", dbg_device_data },
+#endif
+
 #if defined(IPOD_6G) && !defined(SIMULATOR)
         {"View SysCfg", dbg_syscfg },
 #endif
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 082619432f..4bd1ffea31 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -556,20 +556,29 @@ static struct mp3entry* get_mp3entry_from_offset(int offset, char **filename)
         pid3 = state->nid3;
     else
     {
-        static char filename_buf[MAX_PATH + 1];
-        fname = playlist_peek(offset, filename_buf, sizeof(filename_buf));
+        static struct mp3entry tempid3; /* Note: path gets passed to outside fns */
+        memset(&tempid3, 0, sizeof(struct mp3entry));
+        /*static char filename_buf[MAX_PATH + 1];removed g#5926 */
+        fname = playlist_peek(offset, tempid3.path, sizeof(tempid3.path));
         *filename = (char*)fname;
-        static struct mp3entry tempid3;
+
         if (
 #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE)
-            tagcache_fill_tags(&tempid3, fname) ||
+            tagcache_fill_tags(&tempid3, NULL) ||
 #endif
             audio_peek_track(&tempid3, offset)
         )
         {
             pid3 = &tempid3;
         }
+        else /* failed */
+        {
+            /* ensure *filename gets the path, audio_peek_track() cleared it */
+            fname = playlist_peek(offset, tempid3.path, sizeof(tempid3.path));
+            *filename = (char*)fname;
+        }
     }
+
     return pid3;
 }
 
@@ -710,8 +719,6 @@ const char *get_token_value(struct gui_wps *gwps,
         return NULL;
 
     id3 = get_mp3entry_from_offset(token->next? 1: offset, &filename);
-    if (id3)
-        filename = id3->path;
 
 #if CONFIG_RTC
     struct tm* tm = NULL;
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 0de805bd02..82b0394a53 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -806,7 +806,7 @@ long gui_wps_show(void)
                     theme_enabled = false;
                     gwps_leave_wps(theme_enabled);
                     onplay(state->id3->path,
-                           FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey);
+                           FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey, ONPLAY_NO_CUSTOMACTION);
                     if (!audio_status())
                     {
                         /* re-enable theme since we're returning to SBS */
@@ -823,7 +823,7 @@ long gui_wps_show(void)
             {
                 gwps_leave_wps(true);
                 int retval = onplay(state->id3->path,
-                       FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey);
+                       FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey, ONPLAY_NO_CUSTOMACTION);
                 /* if music is stopped in the context menu we want to exit the wps */
                 if (retval == ONPLAY_MAINMENU
                     || !audio_status())
diff --git a/apps/lang/arabic.lang b/apps/lang/arabic.lang
index c9b295956b..c3a456b9cf 100644
--- a/apps/lang/arabic.lang
+++ b/apps/lang/arabic.lang
@@ -3613,13 +3613,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<كل المل�ات>"
+    *: "[كل المل�ات]"
   </dest>
   <voice>
     *: "All tracks"
@@ -3999,10 +3999,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<المعلومات غير متو�رة>"
+    *: "[المعلومات غير متو�رة]"
   </dest>
   <voice>
     *: "المعلومات غير متو�رة"
@@ -4863,13 +4863,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<عشوائي>"
+    *: "[عشوائي]"
   </dest>
   <voice>
     *: "Random"
diff --git a/apps/lang/basque.lang b/apps/lang/basque.lang
index 05fae692e8..5eccf03629 100644
--- a/apps/lang/basque.lang
+++ b/apps/lang/basque.lang
@@ -476,10 +476,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Ez Berrekin>"
+    *: "[Ez Berrekin]"
   </dest>
   <voice>
     *: "Ez Berrekin"
@@ -504,10 +504,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Lastermarka Okerra>"
+    *: "[Lastermarka Okerra]"
   </dest>
   <voice>
     *: "Lastermarka Okerra"
@@ -2298,13 +2298,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Abesti guztiak>"
+    *: "[Abesti guztiak]"
   </dest>
   <voice>
     *: "Abesti guztiak"
@@ -7146,10 +7146,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Info Gabe>"
+    *: "[Info Gabe]"
   </dest>
   <voice>
     *: "Info Gabe"
@@ -10172,13 +10172,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Ausazkoa>"
+    *: "[Ausazkoa]"
   </dest>
   <voice>
     *: "Ausazkoa"
@@ -12033,13 +12033,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Etiketatu gabea>"
+    *: "[Etiketatu gabea]"
   </dest>
   <voice>
     *: "Etiketatu gabea"
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 8c050e5f08..adb44b59f8 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -475,10 +475,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<�е поднов�вай>"
+    *: "[�е поднов�вай]"
   </dest>
   <voice>
     *: "�е поднов�вай"
@@ -503,10 +503,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<�евалидна отметка>"
+    *: "[�евалидна отметка]"
   </dest>
   <voice>
     *: "�евалидна отметка"
@@ -2113,13 +2113,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<В�ички запи�и>"
+    *: "[В�ички запи�и]"
   </dest>
   <voice>
     *: "В�ички запи�и"
@@ -6574,10 +6574,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<��ма информаци�>"
+    *: "[��ма информаци�]"
   </dest>
   <voice>
     *: "��ма информаци�"
@@ -9222,13 +9222,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<�лучайно>"
+    *: "[�лучайно]"
   </dest>
   <voice>
     *: "�лучайно"
@@ -11041,13 +11041,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<�е е въведено>"
+    *: "[�е е въведено]"
   </dest>
   <voice>
     *: "�е е въведено"
diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index b0b8520d47..3d79fd62a4 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -478,10 +478,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<No reprendre>"
+    *: "[No reprendre]"
   </dest>
   <voice>
     *: "No reprendre"
@@ -506,10 +506,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Punt de pàgina invàlid>"
+    *: "[Punt de pàgina invàlid]"
   </dest>
   <voice>
     *: "Punt de Pàgina invàlid"
@@ -2298,13 +2298,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Totes les pistes>"
+    *: "[Totes les pistes]"
   </dest>
   <voice>
     *: "Totes les pistes"
@@ -7141,10 +7141,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<sense info>"
+    *: "[sense info]"
   </dest>
   <voice>
     *: "sense info"
@@ -10166,13 +10166,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aleatori>"
+    *: "[Aleatori]"
   </dest>
   <voice>
     *: "Aleatori"
@@ -12027,13 +12027,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Sense etiquetar>"
+    *: "[Sense etiquetar]"
   </dest>
   <voice>
     *: "Sense etiquetar"
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index c7e0e6c9f7..a35eb4bad5 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -936,10 +936,10 @@
     *: "Shuffle"
   </source>
   <dest>
-    *: "乱�播放"
+    *: "�机播放"
   </dest>
   <voice>
-    *: "乱�播放"
+    *: "�机播放"
   </voice>
 </phrase>
 <phrase>
@@ -978,10 +978,10 @@
     *: "A-B"
   </source>
   <dest>
-    *: "A-B��段"
+    *: "A-B��"
   </dest>
   <voice>
-    *: "AB段"
+    *: "区段��"
   </voice>
 </phrase>
 <phrase>
@@ -1382,7 +1382,7 @@
     *: "Supported"
   </source>
   <dest>
-    *: "仅显示Rockbox支�的"
+    *: "仅显示Rockbox支�的文件"
   </dest>
   <voice>
     *: "仅显示Rockbox支�的文件"
@@ -4395,13 +4395,13 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<无信�>"
+    *: "[无信�]"
   </dest>
   <voice>
-    *: "<无信�>"
+    *: "无信�"
   </voice>
 </phrase>
 <phrase>
@@ -6792,13 +6792,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<所有曲目>"
+    *: "[所有曲目]"
   </dest>
   <voice>
     *: "所有曲目"
@@ -8371,10 +8371,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<�从书签处��播放>"
+    *: "[�从书签处��播放]"
   </dest>
   <voice>
     *: "�从书签处��播放"
@@ -8545,10 +8545,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<无效书签>"
+    *: "[无效书签]"
   </dest>
   <voice>
     *: "这个书签无效"
@@ -9195,13 +9195,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<�机>"
+    *: "[�机]"
   </dest>
   <voice>
     *: "�机"
@@ -10923,13 +10923,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<无标签/元数�>"
+    *: "[无标签/元数�]"
   </dest>
   <voice>
     *: "没有标签或者元数�"
@@ -12287,10 +12287,10 @@
     *: "Backlight Exemptions"
   </source>
   <dest>
-    *: "背光��（�电用）"
+    *: "背光开�例外规则"
   </dest>
   <voice>
-    *: "背光��"
+    *: "背光开�例外规则"
   </voice>
 </phrase>
 <phrase>
@@ -15494,10 +15494,10 @@
     *: "Album Art"
   </source>
   <dest>
-    *: "曲绘"
+    *: "专辑����"
   </dest>
   <voice>
-    *: "曲绘"
+    *: "专辑����"
   </voice>
 </phrase>
 <phrase>
@@ -16005,10 +16005,10 @@
     *: "What's Playing Screen"
   </source>
   <dest>
-    *: "What's Playing �幕"
+    *: "正在播放�幕"
   </dest>
   <voice>
-    *: "What's Playing �幕"
+    *: "正在播放�幕"
   </voice>
 </phrase>
 <phrase>
@@ -16445,3 +16445,59 @@
     *: "剩余"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "�用主��滚动"
+  </dest>
+  <voice>
+    *: "�用主��滚动"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "选择了太多，将从中�机选�%d首"
+  </dest>
+  <voice>
+    *: "选择了太多，将从中选择更少曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "ID3 标题&专辑信�"
+  </dest>
+  <voice>
+    *: "I D 3 标题与专辑信�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "ID3标题信�"
+  </dest>
+  <voice>
+    *: "I D 3 标题信�"
+  </voice>
+</phrase>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index 4d8d6b270b..49f4fd824b 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -4502,13 +4502,13 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<無資訊>"
+    *: "[無資訊]"
   </dest>
   <voice>
-    *: "<無資訊>"
+    *: "[無資訊]"
   </voice>
 </phrase>
 <phrase>
@@ -6913,16 +6913,16 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<所有曲目>"
+    *: "[所有曲目]"
   </dest>
   <voice>
-    *: "<所有曲目>"
+    *: "[所有曲目]"
   </voice>
 </phrase>
 <phrase>
@@ -8524,13 +8524,13 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<���復書簽>"
+    *: "[���復書簽]"
   </dest>
   <voice>
-    *: "<���復書簽>"
+    *: "[���復書簽]"
   </voice>
 </phrase>
 <phrase>
@@ -8726,13 +8726,13 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<無效書簽>"
+    *: "[無效書簽]"
   </dest>
   <voice>
-    *: "<無效書簽>"
+    *: "[無效書簽]"
   </voice>
 </phrase>
 <phrase>
@@ -9393,13 +9393,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<隨機>"
+    *: "[隨機]"
   </dest>
   <voice>
     *: "隨機"
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index e3d79c91fa..e71e4dd179 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -482,10 +482,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nepokra�ovat>"
+    *: "[Nepokra�ovat]"
   </dest>
   <voice>
     *: "Nepokra�ovat"
@@ -510,10 +510,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Neplatná záložka>"
+    *: "[Neplatná záložka]"
   </dest>
   <voice>
     *: "Neplatná záložka"
@@ -2303,13 +2303,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Vsechny skladby>"
+    *: "[Vsechny skladby]"
   </dest>
   <voice>
     *: "VÅ¡echny skladby"
@@ -7154,10 +7154,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Bez informace>"
+    *: "[Bez informace]"
   </dest>
   <voice>
     *: "Bez informace"
@@ -10189,13 +10189,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Nahodne>"
+    *: "[Nahodne]"
   </dest>
   <voice>
     *: "Náhodně"
@@ -12050,13 +12050,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Bez popisu>"
+    *: "[Bez popisu]"
   </dest>
   <voice>
     *: "Bez popisu"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 8a01d45efc..c2c6b4f09d 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -4134,10 +4134,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Ingen info>"
+    *: "[Ingen info]"
   </dest>
   <voice>
     *: "Ingen info"
@@ -7333,13 +7333,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alle sange>"
+    *: "[Alle sange]"
   </dest>
   <voice>
     *: "Alle sange"
@@ -9048,10 +9048,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Fortsæt ikke>"
+    *: "[Fortsæt ikke]"
   </dest>
   <voice>
     *: "Fortsæt ikke"
@@ -9135,10 +9135,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Ugyldigt bogmærke>"
+    *: "[Ugyldigt bogmærke]"
   </dest>
   <voice>
     *: "Ugyldigt bogmærke"
@@ -10169,13 +10169,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Tilfældig>"
+    *: "[Tilfældig]"
   </dest>
   <voice>
     *: "Tilfældig"
@@ -11942,13 +11942,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Umærket>"
+    *: "[Umærket]"
   </dest>
   <voice>
     *: "Umærket"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 3ea025b1ac..512bacf1ff 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -490,10 +490,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nicht fortsetzen>"
+    *: "[Nicht fortsetzen]"
   </dest>
   <voice>
     *: "Nicht fortsetzen"
@@ -518,10 +518,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Ungültiges Lesezeichen>"
+    *: "[Ungültiges Lesezeichen]"
   </dest>
   <voice>
     *: "Ungültiges Lesezeichen"
@@ -2112,13 +2112,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alle Titel>"
+    *: "[Alle Titel]"
   </dest>
   <voice>
     *: "Alle Titel"
@@ -6559,10 +6559,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<keine Info>"
+    *: "[keine Info]"
   </dest>
   <voice>
     *: "keine Info"
@@ -9207,13 +9207,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Zufällig>"
+    *: "[Zufällig]"
   </dest>
   <voice>
     *: "Zufällig"
@@ -10907,13 +10907,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Unbekannt>"
+    *: "[Unbekannt]"
   </dest>
   <voice>
     *: "Unbekannt"
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index 5e80121404..2cbd86c199 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -4620,10 +4620,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<No Info>"
+    *: "[No Info]"
   </dest>
   <voice>
     *: "No Info"
@@ -7131,13 +7131,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Kõik lood>"
+    *: "[Kõik lood]"
   </dest>
   <voice>
     *: "All tracks"
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index fe8e461041..b18057f655 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -469,10 +469,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </dest>
   <voice>
     *: "Do not resume"
@@ -497,10 +497,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </dest>
   <voice>
     *: "Invalid Bookmark"
@@ -2121,13 +2121,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </dest>
   <voice>
     *: "All tracks"
@@ -6568,10 +6568,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<No Info>"
+    *: "[No Info]"
   </dest>
   <voice>
     *: "No Info"
@@ -9230,13 +9230,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Random>"
+    *: "[Random]"
   </dest>
   <voice>
     *: "Random"
@@ -11080,13 +11080,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </dest>
   <voice>
     *: "Untagged"
@@ -16434,3 +16434,59 @@
     *: "Remaining"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "Disable main menu scrolling"
+  </dest>
+  <voice>
+    *: "Disable main menu scrolling"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "Selection too big, %d random tracks will be selected"
+  </dest>
+  <voice>
+    *: "Selection too big, fewer random tracks will be selected"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "Title & Album from ID3 tags"
+  </dest>
+  <voice>
+    *: "Title and Album from tags"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "Title from ID3 tags"
+  </dest>
+  <voice>
+    *: "Title from tags"
+  </voice>
+</phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index c41c819a7b..fa2b5f62ae 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -546,10 +546,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </dest>
   <voice>
     *: "Do not resume"
@@ -574,10 +574,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </dest>
   <voice>
     *: "Invalid Bookmark"
@@ -2032,6 +2032,34 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "Title & Album from ID3 tags"
+  </dest>
+  <voice>
+    *: "Title and Album from tags"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "Title from ID3 tags"
+  </dest>
+  <voice>
+    *: "Title from tags"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_BUILDING_DATABASE
   desc: splash database building progress
   user: core
@@ -2054,6 +2082,20 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "Selection too big, %d random tracks will be selected"
+  </dest>
+  <voice>
+    *: "Selection too big, fewer random tracks will be selected"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_TAGCACHE_RAM
   desc: in tag cache settings
   user: core
@@ -2198,13 +2240,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </dest>
   <voice>
     *: "All tracks"
@@ -6645,10 +6687,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<No Info>"
+    *: "[No Info]"
   </dest>
   <voice>
     *: "No Info"
@@ -9307,13 +9349,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Random>"
+    *: "[Random]"
   </dest>
   <voice>
     *: "Random"
@@ -11157,13 +11199,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </dest>
   <voice>
     *: "Untagged"
@@ -16498,6 +16540,20 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "Disable main menu scrolling"
+  </dest>
+  <voice>
+    *: "Disable main menu scrolling"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_REMAINING
   desc: Playing Time
   user: core
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index 9863817a52..dd5b1dbe3f 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -3188,10 +3188,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Sin información>"
+    *: "[Sin información]"
   </dest>
   <voice>
     *: "Sin información"
@@ -5681,13 +5681,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Todas las pistas>"
+    *: "[Todas las pistas]"
   </dest>
   <voice>
     *: "Todas las Pistas"
@@ -8935,13 +8935,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aleatorio>"
+    *: "[Aleatorio]"
   </dest>
   <voice>
     *: "Aleatorio"
@@ -9647,10 +9647,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<No continuar>"
+    *: "[No continuar]"
   </dest>
   <voice>
     *: "No continuar"
@@ -9852,10 +9852,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Marcador incorrecto>"
+    *: "[Marcador incorrecto]"
   </dest>
   <voice>
     *: "Marcador incorrecto"
@@ -11864,13 +11864,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Sin etiqueta>"
+    *: "[Sin etiqueta]"
   </dest>
   <voice>
     *: "Sin etiqueta"
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index ac77eca660..9626add951 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -4729,10 +4729,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Sen Informoj>"
+    *: "[Sen Informoj]"
   </dest>
   <voice>
     *: "Sen Informoj"
@@ -7234,13 +7234,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Ĉiuj kantoj>"
+    *: "[Ĉiuj kantoj]"
   </dest>
   <voice>
     *: "Ĉiuj kantoj"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 9ec74591f8..094d122da0 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -4851,10 +4851,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Ei tietoja>"
+    *: "[Ei tietoja]"
   </dest>
   <voice>
     *: "Ei tietoja"
@@ -7390,13 +7390,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Kaikki kappaleet>"
+    *: "[Kaikki kappaleet]"
   </dest>
   <voice>
     *: ""
@@ -8942,10 +8942,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Älä jatka>"
+    *: "[Älä jatka]"
   </dest>
   <voice>
     *: "Älä jatka"
@@ -8970,10 +8970,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Kirjanmerkki ei kelpaa>"
+    *: "[Kirjanmerkki ei kelpaa]"
   </dest>
   <voice>
     *: "Kirjanmerkki ei kelpaa"
@@ -10157,13 +10157,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Satunnainen>"
+    *: "[Satunnainen]"
   </dest>
   <voice>
     *: "Satunnainen"
@@ -11910,13 +11910,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Tunnisteeton>"
+    *: "[Tunnisteeton]"
   </dest>
   <voice>
     *: "Tunnisteeton"
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 55b7ae9f63..0718873a56 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -32,6 +32,7 @@
 # - Clément Pit-Claudel
 # - Michaël Burtin
 # - Olivier Kaloudoff
+# - Jaussoin Timothée
 #
 # Original comments below:
 #
@@ -182,7 +183,7 @@
     *: "Chargement... %d%% fait (%s)"
   </dest>
   <voice>
-    *: ""
+    *: "Chargement... %d%% fait (%s)"
   </voice>
 </phrase>
 <phrase>
@@ -276,18 +277,15 @@
   <source>
     *: "PLAY = Yes"
     cowond2*: "MENU, or top-right = Yes"
-    creativezen*: "SELECT = Yes"
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
+    creativezen*,gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "PLAY = Oui"
-    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU ou en haut à gauche = Oui"
-    creativezen*: "SELECT = Oui"
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Oui"
+    creativezen*,gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Oui"
     iriverh100,iriverh120,iriverh300: "NAVI = Oui"
     mrobe500: "PLAY, POWER, ou en haut à gauche = Oui"
     vibe500: "OK = Oui"
@@ -305,11 +303,9 @@
   </source>
   <dest>
     *: "Autres = Non"
-    archosplayer: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -505,10 +501,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Ne pas reprendre>"
+    *: "[Ne pas reprendre]"
   </dest>
   <voice>
     *: "Ne pas reprendre"
@@ -533,10 +529,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Signet invalide>"
+    *: "[Signet invalide]"
   </dest>
   <voice>
     *: "Signet invalide"
@@ -571,20 +567,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_DELETE
-  desc: bookmark context menu, delete this bookmark
-  user: core
-  <source>
-    *: "Delete"
-  </source>
-  <dest>
-    *: "Supprimer"
-  </dest>
-  <voice>
-    *: "Supprimer"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_AUTO_BOOKMARK_QUERY
   desc: prompt for user to decide to create an bookmark
   user: core
@@ -726,7 +708,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Stereo"
@@ -740,7 +722,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Mono"
@@ -1022,20 +1004,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_EDIT_MODE
-  desc: in the equalizer settings menu
-  user: core
-  <source>
-    *: "Edit mode: %s"
-  </source>
-  <dest>
-    *: "Mode édition : %s"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_EQUALIZER_GAIN_ITEM
   desc: in the equalizer settings menu
   user: core
@@ -1527,7 +1495,7 @@
     *: "ReplayGain"
   </dest>
   <voice>
-    *: "Replaygain"
+    *: "ReplayGain"
   </voice>
 </phrase>
 <phrase>
@@ -1717,16 +1685,16 @@
 </phrase>
 <phrase>
   id: LANG_AUDIOSCROBBLER
-  desc: "Last.fm Log" in the playback menu
+  desc: "Last.fm Logger" in Plugin/apps/scrobbler
   user: core
   <source>
-    *: "Last.fm Log"
+    *: "Last.fm Logger"
   </source>
   <dest>
-    *: "Log Last.fm"
+    *: "Journaux Last.fm"
   </dest>
   <voice>
-    *: "Log Last.fm"
+    *: "Journaux Last.fm"
   </voice>
 </phrase>
 <phrase>
@@ -2005,6 +1973,34 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "Titre & Album depuis les tags ID3"
+  </dest>
+  <voice>
+    *: "Titre et Album depuis les tags"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "Titre depuis les tags ID3"
+  </dest>
+  <voice>
+    *: "Titre depuis les tags"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_BUILDING_DATABASE
   desc: splash database building progress
   user: core
@@ -2017,7 +2013,6 @@
   </source>
   <dest>
     *: "Création base de données... %d trouvés (OFF = retour)"
-    archosplayer: "Création BD %d trouvés"
     gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Création base de données... %d trouvés (LEFT = retour)"
     gogearsa9200: "Création base de données... %d trouvés (REW = retour)"
     ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Création base de données... %d trouvés (PREV = retour)"
@@ -2028,6 +2023,20 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "Selection trop grande, %d pistes seront sélectionnées aléatoirement"
+  </dest>
+  <voice>
+    *: "Selection trop grande, donc des pistes seront sélectionnées aléatoirement"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_TAGCACHE_RAM
   desc: in tag cache settings
   user: core
@@ -2172,13 +2181,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Toutes les pistes>"
+    *: "[Toutes les pistes]"
   </dest>
   <voice>
     *: "Toutes les pistes"
@@ -2293,15 +2302,15 @@
   desc: in lcd settings
   user: core
   <source>
-    *: none
+    *: "Backlight on Lock"
     hold_button: "Backlight on Hold"
   </source>
   <dest>
-    *: none
+    *: "Backlight on Lock"
     hold_button: "Rétro-éclairage quand touches verrouillées"
   </dest>
   <voice>
-    *: none
+    *: "Backlight on Lock"
     hold_button: "Rétro-éclairage quand touches verrouillées"
   </voice>
 </phrase>
@@ -2970,11 +2979,9 @@
   </source>
   <dest>
     *: "Indicateur de niveau des pics"
-    masd: none
   </dest>
   <voice>
     *: "Indicateur de niveau des pics"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2986,11 +2993,9 @@
   </source>
   <dest>
     *: "Persistance marqueur seuil max."
-    masd: none
   </dest>
   <voice>
     *: "Persistance marqueur seuil max."
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3002,11 +3007,9 @@
   </source>
   <dest>
     *: "Temps de persistance du pic"
-    masd: none
   </dest>
   <voice>
     *: "Temps de persistance du pic"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3018,11 +3021,9 @@
   </source>
   <dest>
     *: "Infini"
-    masd: none
   </dest>
   <voice>
     *: "Infini"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3034,11 +3035,9 @@
   </source>
   <dest>
     *: "Taux de baisse de l'indicateur"
-    masd: none
   </dest>
   <voice>
     *: "Taux de baisse de l'indicateur"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3050,11 +3049,9 @@
   </source>
   <dest>
     *: "Echelle"
-    masd: none
   </dest>
   <voice>
     *: "échelle"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3066,11 +3063,9 @@
   </source>
   <dest>
     *: "Logarithmique (dB)"
-    masd: none
   </dest>
   <voice>
     *: "Logarithmique en décibel"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3082,11 +3077,9 @@
   </source>
   <dest>
     *: "Linéaire (%)"
-    masd: none
   </dest>
   <voice>
     *: "Linéaire en pourcentage"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3098,11 +3091,9 @@
   </source>
   <dest>
     *: "Minimum de l'intervalle"
-    masd: none
   </dest>
   <voice>
     *: "Minimum de l'intervalle"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3114,11 +3105,9 @@
   </source>
   <dest>
     *: "Maximum de l'intervalle"
-    masd: none
   </dest>
   <voice>
     *: "Maximum de l'intervalle"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3448,14 +3437,17 @@
   <source>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "Alcaline"
+    xduoox3: "Nouveau (2000 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "Alcaline"
+    xduoox3: "Nouveau 2000 milliampère heure"
   </voice>
 </phrase>
 <phrase>
@@ -3465,14 +3457,17 @@
   <source>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Nouveau (1500 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "Nickel metal hydride"
+    xduoox3: "Nouveau 1500 milliampère heure"
   </voice>
 </phrase>
 <phrase>
@@ -3662,7 +3657,7 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4108,23 +4103,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_SHUTDOWN
-  desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
-  user: core
-  <source>
-    *: none
-    alarm: "Alarm Set"
-  </source>
-  <dest>
-    *: none
-    alarm: "Réveil activé"
-  </dest>
-  <voice>
-    *: none
-    alarm: "Réveil activé"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ALARM_MOD_ERROR
   desc: The text that tells that the time is incorrect (for the RTC alarm mod).
   user: core
@@ -4142,35 +4120,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_KEYS
-  desc: Shown key functions in alarm menu (for the RTC alarm mod).
-  user: core
-  <source>
-    *: none
-    alarm: "PLAY=Set OFF=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    mpiohd300: "ENTER=Set MENU=Cancel"
-    sansafuzeplus: "SELECT=Set  BACK=Cancel"
-    vibe500: "OK=Set C=Cancel"
-  </source>
-  <dest>
-    *: none
-    alarm: "PLAY=Valider OFF=Annuler"
-    gigabeats: "SELECT=Valider POWER=Annuler"
-    ipod*: "SELECT=Valider MENU=Annuler"
-    iriverh10,iriverh10_5gb: "SELECT=Valider PREV=Annuler"
-    mpiohd300: "ENTER=Valider MENU=Annuler"
-    sansafuzeplus: "SELECT=Valider  BACK=Annuler"
-    vibe500: "OK=Valider C=Annuler"
-  </dest>
-  <voice>
-    *: none
-    alarm,ipod*: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ALARM_MOD_DISABLE
   desc: Announce that the RTC alarm has been turned off
   user: core
@@ -5366,40 +5315,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_DIRECTORY
-  desc: in recording settings_menu
-  user: core
-  <source>
-    *: none
-    recording: "Directory"
-  </source>
-  <dest>
-    *: none
-    recording: "Répertoire"
-  </dest>
-  <voice>
-    *: none
-    recording: "Répertoire"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SET_AS_REC_DIR
-  desc: used in the onplay menu to set a recording dir
-  user: core
-  <source>
-    *: none
-    recording: "Set As Recording Directory"
-  </source>
-  <dest>
-    *: none
-    recording: "Choisir comme dossier d'enreg."
-  </dest>
-  <voice>
-    *: none
-    recording: "Choisir comme dossier d'enregistrement"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CLEAR_REC_DIR
   desc:
   user: core
@@ -6023,7 +5938,6 @@
   </source>
   <dest>
     *: "Tampon:"
-    archosplayer: "Tamp.:"
   </dest>
   <voice>
     *: "Tampon"
@@ -6036,12 +5950,10 @@
   <source>
     *: "Battery: %d%% %dh %dm"
     ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
-    iriverifp7xx: "%d%% %dh %dm"
   </source>
   <dest>
     *: "Batterie: %d%% %dh %dm"
     ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
-    iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Niveau de la batterie"
@@ -6081,14 +5993,17 @@
   user: core
   <source>
     *: "Int:"
+    hibylinux: "mSD:"
     xduoox3: "mSD1:"
   </source>
   <dest>
     *: "Int:"
+    hibylinux: "mSD:"
     xduoox3: "mSD1:"
   </dest>
   <voice>
     *: "Interne"
+    hibylinux: "micro S D"
     xduoox3: "micro S D 1"
   </voice>
 </phrase>
@@ -6098,20 +6013,21 @@
   user: core
   <source>
     *: none
-    multivolume: "HD1"
+    hibylinux: "USB:"
+    multivolume: "HD1:"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </source>
   <dest>
     *: none
-    archosondio*: "MMC:"
+    hibylinux: "USB:"
     multivolume: "DD1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </dest>
   <voice>
     *: none
-    archosondio*: "M M C"
+    hibylinux: "U S B"
     multivolume: "D D 1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
     xduoox3: "micro S D 2"
@@ -6202,62 +6118,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
-  user: core
-  <source>
-    *: "Insert"
-  </source>
-  <dest>
-    *: "Insérer"
-  </dest>
-  <voice>
-    *: "Insérer"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INSERT_FIRST
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
-  user: core
-  <source>
-    *: "Insert Next"
-  </source>
-  <dest>
-    *: "Insérer suivant"
-  </dest>
-  <voice>
-    *: "Insérer suivant"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INSERT_LAST
-  desc: in onplay menu.  append a track/playlist into dynamic playlist.
-  user: core
-  <source>
-    *: "Insert Last"
-  </source>
-  <dest>
-    *: "Insérer en dernier"
-  </dest>
-  <voice>
-    *: "Insérer en dernier"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INSERT_SHUFFLED
-  desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
-  user: core
-  <source>
-    *: "Insert Shuffled"
-  </source>
-  <dest>
-    *: "Insérer mélangé"
-  </dest>
-  <voice>
-    *: "Insérer mélangé"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_QUEUE
   desc: The verb/action Queue
   user: core
@@ -6314,20 +6174,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLACE
-  desc: in onplay menu.  Replace the current playlist with a new one.
-  user: core
-  <source>
-    *: "Play Next"
-  </source>
-  <dest>
-    *: "Lire suivant (remplacer)"
-  </dest>
-  <voice>
-    *: "Lire suivant (remplacer)"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PLAYLIST_INSERT_COUNT
   desc: splash number of tracks inserted
   user: core
@@ -6394,7 +6240,7 @@
     *: "Recherche... %d trouvé (%s)"
   </dest>
   <voice>
-    *: ""
+    *: "Recherche... %d trouvé (%s)"
   </voice>
 </phrase>
 <phrase>
@@ -6412,34 +6258,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_VIEW
-  desc: in onplay playlist catalogue submenu
-  user: core
-  <source>
-    *: "View Catalogue"
-  </source>
-  <dest>
-    *: "Afficher le catalogue"
-  </dest>
-  <voice>
-    *: "Afficher le catalogue"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CATALOG_ADD_TO
-  desc: in onplay playlist catalogue submenu
-  user: core
-  <source>
-    *: "Add to Playlist"
-  </source>
-  <dest>
-    *: "Ajouter à la liste de lecture"
-  </dest>
-  <voice>
-    *: "Ajouter à la liste de lecture"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CATALOG_ADD_TO_NEW
   desc: in onplay playlist catalogue submenu
   user: core
@@ -6790,20 +6608,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUM_GAIN
-  desc: in tag viewer
-  user: core
-  <source>
-    *: "Album Gain"
-  </source>
-  <dest>
-    *: "Gain par album"
-  </dest>
-  <voice>
-    *: "Gain par album"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ID3_PATH
   desc: in tag viewer
   user: core
@@ -6822,10 +6626,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Pas d'Info>"
+    *: "[Pas d'Info]"
   </dest>
   <voice>
     *: "Pas d'Info"
@@ -7180,7 +6984,6 @@
   </source>
   <dest>
     *: "Fin de la liste de lecture"
-    archosplayer: "Fin de la liste"
   </dest>
   <voice>
     *: "Fin de la liste de lecture"
@@ -7215,20 +7018,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR
-  desc: Playlist error
-  user: core
-  <source>
-    *: "Error updating playlist control file"
-  </source>
-  <dest>
-    *: "Erreur mise à jour fichier de contrôle de liste de lecture"
-  </dest>
-  <voice>
-    *: "Erreur mise à jour fichier de contrôle de liste de lecture"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PLAYLIST_ACCESS_ERROR
   desc: Playlist error
   user: core
@@ -7309,7 +7098,7 @@
     *: "Mode:"
   </dest>
   <voice>
-    *: "Mode:"
+    *: "Mode"
   </voice>
 </phrase>
 <phrase>
@@ -7410,24 +7199,7 @@
   </dest>
   <voice>
     *: none
-    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,sansac200*,sansae200*: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_DB_INF
-  desc: -inf db for values below measurement
-  user: core
-  <source>
-    *: none
-    recording: "-inf"
-  </source>
-  <dest>
-    *: none
-    recording: "-inf"
-  </dest>
-  <voice>
-    *: none
-    recording: "Inifini négatif"
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: ""
   </voice>
 </phrase>
 <phrase>
@@ -7551,7 +7323,7 @@
     *: "Modèle incompatible"
   </dest>
   <voice>
-    *: ""
+    *: "Modèle incompatible"
   </voice>
 </phrase>
 <phrase>
@@ -7565,7 +7337,7 @@
     *: "Version incompatible"
   </dest>
   <voice>
-    *: ""
+    *: "Version incompatible"
   </voice>
 </phrase>
 <phrase>
@@ -7576,10 +7348,10 @@
     *: "Plugin returned error"
   </source>
   <dest>
-    *: "Erreur Retournée par le module d'extension"
+    *: "Erreur retournée par le module"
   </dest>
   <voice>
-    *: ""
+    *: "Erreur retournée par le module"
   </voice>
 </phrase>
 <phrase>
@@ -7656,23 +7428,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TRICKLE_CHARGE
-  desc: in info display, shows that trickle charge is running
-  user: core
-  <source>
-    *: none
-    charging: "Battery: Trickle Chg"
-  </source>
-  <dest>
-    *: none
-    charging: "Batterie: charge persistante"
-  </dest>
-  <voice>
-    *: none
-    charging: "Charge persistante de la batterie"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_WARNING_BATTERY_LOW
   desc: general warning
   user: core
@@ -9519,13 +9274,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aléatoire>"
+    *: "[Aléatoire]"
   </dest>
   <voice>
     *: "Aléatoire"
@@ -10573,20 +10328,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLLBAR_POSITION
-  desc: in Settings -> General -> Display -> Status-/Scrollbar
-  user: core
-  <source>
-    *: "Scroll Bar Position"
-  </source>
-  <dest>
-    *: "Position barre de défilement"
-  </dest>
-  <voice>
-    *: "Position de la barre de défilement"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_COMPRESSOR
   desc: in sound settings
   user: core
@@ -10848,20 +10589,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STATUSBAR_CUSTOM
-  desc: if this translation is compatible with LANG_CHANNEL_CUSTOM, then please use the same translation. it can be combined later then
-  user: core
-  <source>
-    *: "Custom"
-  </source>
-  <dest>
-    *: "Personnalisé"
-  </dest>
-  <voice>
-    *: "Personnalisé"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_EXT_SBS
   desc: spoken only, for file extension
   user: core
@@ -10910,20 +10637,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_LAST_SHUFFLED
-  desc: in onplay menu.  insert a playlist randomly at end of dynamic playlist
-  user: core
-  <source>
-    *: "Insert Last Shuffled"
-  </source>
-  <dest>
-    *: "Insérer mélangé en fin"
-  </dest>
-  <voice>
-    *: "Insérer mélangé en fin"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_QUEUE_LAST_SHUFFLED
   desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
   user: core
@@ -10982,7 +10695,7 @@
     *: "Titre suivant:"
   </dest>
   <voice>
-    *: "Titre suivant:"
+    *: "Titre suivant"
   </voice>
 </phrase>
 <phrase>
@@ -10996,7 +10709,7 @@
     *: "Suivant:"
   </dest>
   <voice>
-    *: "Suivant:"
+    *: "Suivant"
   </voice>
 </phrase>
 <phrase>
@@ -11380,13 +11093,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Inconnu>"
+    *: "[Inconnu]"
   </dest>
   <voice>
     *: "Inconnu"
@@ -11517,20 +11230,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_START_DIR
-  desc: used in the onplay menu to set a starting browser dir
-  user: core
-  <source>
-    *: "Start File Browser Here"
-  </source>
-  <dest>
-    *: "Démarrer navigation fichiers ici"
-  </dest>
-  <voice>
-    *: "Démarrer navigation des fichiers ici"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RESET_START_DIR
   desc: reset the browser start directory
   user: core
@@ -11663,20 +11362,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_PLAYLISTCAT_DIR
-  desc: used in the onplay menu to set a playlist catalogue dir
-  user: core
-  <source>
-    *: "Set As Playlist Catalogue Directory"
-  </source>
-  <dest>
-    *: "Sélectionner comme répertoire des catalogues de listes de lecture"
-  </dest>
-  <voice>
-    *: "Sélectionner comme répertoire des catalogues de listes de lecture"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_LIST_LINE_PADDING
   desc: list padding, in display settings
   user: core
@@ -11708,20 +11393,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTOMATIC
-  desc: generic automatic
-  user: core
-  <source>
-    *: "Automatic"
-  </source>
-  <dest>
-    *: "Automatique"
-  </dest>
-  <voice>
-    *: "Automatique"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SLEEP_TIMER_CANCEL_CURRENT
   desc: shown instead of sleep timer when it's running
   user: core
@@ -12296,7 +11967,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Seek"
+    *: "Exempt Seek"
   </source>
   <dest>
     *: "Chercher"
@@ -12310,7 +11981,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Play"
+    *: "Exempt Play"
   </source>
   <dest>
     *: "Jouer"
@@ -12352,7 +12023,7 @@
   desc: Softlock behaviour setting
   user: core
   <source>
-    *: "Disable Notify"
+    *: "Disable Locked Reminders"
   </source>
   <dest>
     *: "Désactiver les notifications"
@@ -12422,7 +12093,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Skip"
+    *: "Exempt Skip"
   </source>
   <dest>
     *: "Passer"
@@ -12481,10 +12152,10 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Playlist elapsed: %s / %s %ld%%"
+    *: "Playlist elapsed:"
   </source>
   <dest>
-    *: "Liste de lecture, temps écoulé: %s / %s %ld%%"
+    *: "Liste de lecture, temps écoulé :"
   </dest>
   <voice>
     *: "Liste de lecture, temps écoulé"
@@ -12495,10 +12166,10 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Track remaining: %s"
+    *: "Track remaining:"
   </source>
   <dest>
-    *: "Durée de piste restante: %s"
+    *: "Durée de piste restante :"
   </dest>
   <voice>
     *: "Durée de piste restante"
@@ -12509,10 +12180,10 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Track elapsed: %s / %s %ld%%"
+    *: "Track elapsed:"
   </source>
   <dest>
-    *: "Temps écoulé de la piste: %s / %s %ld%%"
+    *: "Temps écoulé de la piste :"
   </dest>
   <voice>
     *: "Temps écoulé de la piste"
@@ -12735,20 +12406,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PROPERTIES_TITLE
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Title]"
-  </source>
-  <dest>
-    *: "[Titre]"
-  </dest>
-  <voice>
-    *: "Titre"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_PITCH_TIMESTRETCH_MODE
   desc: spoken only
   user: core
@@ -12897,7 +12554,7 @@
     *: "Réflexion en cours..."
   </dest>
   <voice>
-    *: ""
+    *: "Réflexion en cours..."
   </voice>
 </phrase>
 <phrase>
@@ -12933,16 +12590,16 @@
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining: %s"
+    *: ""
   </source>
   <dest>
-    *: "Playlist remaining: %s"
+    *: ""
   </dest>
   <voice>
-    *: "Playlist remaining"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -12995,10 +12652,10 @@
     *: "Display FPS"
   </source>
   <dest>
-    *: "Display FPS"
+    *: "Afficher les FPS"
   </dest>
   <voice>
-    *: "Display FPS"
+    *: "Afficher les FPS"
   </voice>
 </phrase>
 <phrase>
@@ -13009,10 +12666,10 @@
     *: "Remote Control"
   </source>
   <dest>
-    *: "Remote Control"
+    *: "Télécommande"
   </dest>
   <voice>
-    *: "Remote Control"
+    *: "Télécommande"
   </voice>
 </phrase>
 <phrase>
@@ -13141,10 +12798,10 @@
     *: "[Subdirs]"
   </source>
   <dest>
-    *: "[Subdirs]"
+    *: "[Sous-rep]"
   </dest>
   <voice>
-    *: "Subdirs"
+    *: "[Sous-rep]"
   </voice>
 </phrase>
 <phrase>
@@ -13183,10 +12840,10 @@
     *: "Go to WPS"
   </source>
   <dest>
-    *: "Go to WPS"
+    *: "Aller au WPS"
   </dest>
   <voice>
-    *: "Go to WPS"
+    *: "Aller au WPS"
   </voice>
 </phrase>
 <phrase>
@@ -13197,24 +12854,10 @@
     *: "Not a VBR file"
   </source>
   <dest>
-    *: "Not a VBR file"
-  </dest>
-  <voice>
-    *: "Not a VBR file"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_ALBUM
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Album]"
-  </source>
-  <dest>
-    *: "[Album]"
+    *: "Ce n'est pas un fichier VBR"
   </dest>
   <voice>
-    *: "Album"
+    *: "Ce n'est pas un fichier VBR"
   </voice>
 </phrase>
 <phrase>
@@ -13239,10 +12882,10 @@
     *: "Show album title"
   </source>
   <dest>
-    *: "Show album title"
+    *: "Afficher le titre de l'album"
   </dest>
   <voice>
-    *: "Show album title"
+    *: "Afficher le titre de l'album"
   </voice>
 </phrase>
 <phrase>
@@ -13250,13 +12893,13 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Average bitrate: %ld kbps"
+    *: "Average bitrate:"
   </source>
   <dest>
-    *: "Average bitrate: %ld kbps"
+    *: "Débit binaire moyen :"
   </dest>
   <voice>
-    *: "Average bit rate"
+    *: "Débit binaire moyen :"
   </voice>
 </phrase>
 <phrase>
@@ -13322,20 +12965,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_PLAYLIST
-  desc: in the pictureflow main menu
-  user: core
-  <source>
-    *: "Clear playlist"
-  </source>
-  <dest>
-    *: "Effacer la liste de lecture"
-  </dest>
-  <voice>
-    *: "Effacer la liste de lecture"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_CHESSBOX_QUEENSIDE
   desc: spoken only, for announcing chess moves
   user: core
@@ -13371,10 +13000,10 @@
     *: "Playback Control"
   </source>
   <dest>
-    *: "Playback Control"
+    *: "Contrôle de lecture"
   </dest>
   <voice>
-    *: "Playback Control"
+    *: "Contrôle de lecture"
   </voice>
 </phrase>
 <phrase>
@@ -13475,7 +13104,7 @@
     *: "File properties"
   </source>
   <dest>
-    *: "File properties"
+    *: "Propriétés du fichier"
   </dest>
   <voice>
     *: ""
@@ -13562,10 +13191,10 @@
     *: "Move Item Down"
   </source>
   <dest>
-    *: "Move Item Down"
+    *: "Déplacer vers le bas"
   </dest>
   <voice>
-    *: "Move Item Down"
+    *: "Déplacer vers le bas"
   </voice>
 </phrase>
 <phrase>
@@ -13642,20 +13271,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CLEARED
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Playlist Cleared"
-  </source>
-  <dest>
-    *: "Playlist Cleared"
-  </dest>
-  <voice>
-    *: "Playlist Cleared"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_REC_DIR
   desc: used in the info screen to show a recording dir
   user: core
@@ -13680,10 +13295,10 @@
     *: "Shuffle Mode"
   </source>
   <dest>
-    *: "Shuffle Mode"
+    *: "Mode mélangé"
   </dest>
   <voice>
-    *: "Shuffle Mode"
+    *: "Mode mélangé"
   </voice>
 </phrase>
 <phrase>
@@ -13812,7 +13427,7 @@
     *: ""
   </dest>
   <voice>
-    *: "Moving track"
+    *: "Déplacement de la piste"
   </voice>
 </phrase>
 <phrase>
@@ -13920,20 +13535,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ADDED_TO_PLAYLIST
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Added to playlist"
-  </source>
-  <dest>
-    *: "Ajouté à la liste de lecture"
-  </dest>
-  <voice>
-    *: "Ajouté à la liste de lecture"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_PITCH_ABSOLUTE_MODE
   desc: spoken only
   user: core
@@ -14039,7 +13640,7 @@
 </phrase>
 <phrase>
   id: LANG_DIRECT
-  desc: in the pictureflow settings
+  desc: in the pictureflow settings, also a volume adjustment mode
   user: core
   <source>
     *: "Direct"
@@ -14073,10 +13674,10 @@
     *: "Change Repeat Mode"
   </source>
   <dest>
-    *: "Change Repeat Mode"
+    *: "Changer le mode de répétition"
   </dest>
   <voice>
-    *: "Change Repeat Mode"
+    *: "Changer le mode de répétition"
   </voice>
 </phrase>
 <phrase>
@@ -14174,10 +13775,10 @@
     *: "Cache will be rebuilt on next restart"
   </source>
   <dest>
-    *: "Cache will be rebuilt on next restart"
+    *: "Le cache sera reconstruit au prochain redémarrage"
   </dest>
   <voice>
-    *: "Cache will be rebuilt on next restart"
+    *: "Le cache sera reconstruit au prochain redémarrage"
   </voice>
 </phrase>
 <phrase>
@@ -14188,10 +13789,10 @@
     *: "Change Volume"
   </source>
   <dest>
-    *: "Change Volume"
+    *: "Changer le volume"
   </dest>
   <voice>
-    *: "Change Volume"
+    *: "Changer le volume"
   </voice>
 </phrase>
 <phrase>
@@ -14268,20 +13869,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PROPERTIES_ARTIST
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Artist]"
-  </source>
-  <dest>
-    *: "[Interprète]"
-  </dest>
-  <voice>
-    *: "Interprète"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PROPERTIES_SIZE
   desc: in properties plugin
   user: core
@@ -14303,10 +13890,10 @@
     *: "Via Track list"
   </source>
   <dest>
-    *: "Via Track list"
+    *: "Via la liste des pistes"
   </dest>
   <voice>
-    *: "Via Track list"
+    *: "Via la liste des pistes"
   </voice>
 </phrase>
 <phrase>
@@ -14359,10 +13946,10 @@
     *: "Load Default Configuration"
   </source>
   <dest>
-    *: "Load Default Configuration"
+    *: "Charger la configuration par défaut"
   </dest>
   <voice>
-    *: "Load Default Configuration"
+    *: "Charger la configuration par défaut"
   </voice>
 </phrase>
 <phrase>
@@ -14373,10 +13960,10 @@
     *: "Checkmate!"
   </source>
   <dest>
-    *: "Checkmate!"
+    *: "Échec et mat !"
   </dest>
   <voice>
-    *: "Checkmate!"
+    *: "Échec et mat !"
   </voice>
 </phrase>
 <phrase>
@@ -14454,13 +14041,13 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Storage: %s (done %s, remaining %s)"
+    *: "Storage (Done / Remaining):"
   </source>
   <dest>
-    *: "Storage: %s (done %s, remaining %s)"
+    *: "Stockage (Terminé / Restant) :"
   </dest>
   <voice>
-    *: "Storage"
+    *: "Stockage"
   </voice>
 </phrase>
 <phrase>
@@ -14471,10 +14058,10 @@
     *: "Pause / Play"
   </source>
   <dest>
-    *: "Pause / Play"
+    *: "Pause / Lecture"
   </dest>
   <voice>
-    *: "Pause / Play"
+    *: "Pause / Lecture"
   </voice>
 </phrase>
 <phrase>
@@ -14485,10 +14072,10 @@
     *: "Previous Track"
   </source>
   <dest>
-    *: "Previous Track"
+    *: "Piste précédente"
   </dest>
   <voice>
-    *: "Previous Track"
+    *: "Piste précédente"
   </voice>
 </phrase>
 <phrase>
@@ -14520,20 +14107,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PROPERTIES_DURATION
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Duration]"
-  </source>
-  <dest>
-    *: "[Durée]"
-  </dest>
-  <voice>
-    *: "Durée"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PROPERTIES_FAIL
   desc: in properties plugin
   user: core
@@ -14541,10 +14114,10 @@
     *: "Failed to gather information"
   </source>
   <dest>
-    *: "Failed to gather information"
+    *: "Échec de la collecte d'informations"
   </dest>
   <voice>
-    *: "Failed to gather information"
+    *: "Échec de la collecte d'informations"
   </voice>
 </phrase>
 <phrase>
@@ -14570,11 +14143,11 @@
     lowmem: none
   </source>
   <dest>
-    *: "Resume automatically"
+    *: "Reprendre automatiquement"
     lowmem: none
   </dest>
   <voice>
-    *: "Resume automatically"
+    *: "Reprendre automatiquement"
     lowmem: none
   </voice>
 </phrase>
@@ -14587,11 +14160,11 @@
     lowmem: none
   </source>
   <dest>
-    *: "Reverberation"
+    *: "Réverbération"
     lowmem: none
   </dest>
   <voice>
-    *: "Reverberation"
+    *: "Réverbération"
     lowmem: none
   </voice>
 </phrase>
@@ -14642,10 +14215,10 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Average track size: %s"
+    *: "Average track size:"
   </source>
   <dest>
-    *: "Taille moyenne des pistes: %s"
+    *: "Taille moyenne des pistes :"
   </dest>
   <voice>
     *: "Taille moyenne des pistes"
@@ -14656,13 +14229,13 @@
   desc: playing time screen
   user: core
   <source>
-    *: "Track %d / %d %d%%"
+    *: "Track:"
   </source>
   <dest>
-    *: "Track %d / %d %d%%"
+    *: "Piste :"
   </dest>
   <voice>
-    *: "Track"
+    *: "Piste :"
   </voice>
 </phrase>
 <phrase>
@@ -14725,20 +14298,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NO_VIEWERS
-  desc: text for splash to indicate that no viewers are available
-  user: core
-  <source>
-    *: "No viewers found"
-  </source>
-  <dest>
-    *: "Aucune visionneuse trouvée"
-  </dest>
-  <voice>
-    *: "Aucune visionneuse trouvée"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_BISHOP
   desc: spoken only, for announcing chess piece names
   user: core
@@ -14959,10 +14518,10 @@
     *: "Hide album title"
   </source>
   <dest>
-    *: "Hide album title"
+    *: "Cacher le titre de l'album"
   </dest>
   <voice>
-    *: "Hide album title"
+    *: "Cacher le titre de l'album"
   </voice>
 </phrase>
 <phrase>
@@ -14974,11 +14533,11 @@
     lowmem: none
   </source>
   <dest>
-    *: "Set resume time (min)"
+    *: "Définir le temps de reprise (min)"
     lowmem: none
   </dest>
   <voice>
-    *: "Set resume time"
+    *: "Définir le temps de reprise (min)"
     lowmem: none
   </voice>
 </phrase>
@@ -15080,3 +14639,1882 @@
     *: "Français"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "Désactiver défilement dans le menu principal"
+  </dest>
+  <voice>
+    *: "Désactiver défilement dans le menu principal"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SINGLE_MODE
+  desc: single mode
+  user: core
+  <source>
+    *: "Single Mode"
+  </source>
+  <dest>
+    *: "Mode lecture seule"
+  </dest>
+  <voice>
+    *: "Mode lecture seule"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TALK_MIXER_LEVEL
+  desc: Relative volume of voice prompts
+  user: core
+  <source>
+    *: "Voice prompt volume"
+  </source>
+  <dest>
+    *: "Volume des messages vocaux"
+  </dest>
+  <voice>
+    *: "Volume des messages vocaux"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SHORT_SHARP
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Short Sharp"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "Short Sharp"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "Short Sharp"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SHORT_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Short Slow"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "Short Slow"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "Short Slow"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SUPER_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Super Slow"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "Super Slow"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "Super Slow"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_LINEAR_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Linear Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "Linear Fast"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Linear Fast"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_LINEAR_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Linear Slow"
+  </source>
+  <dest>
+    *: none
+    es9218: "Linear Slow"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Linear Slow"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_MINIMUM_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Minimum Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "Minimum Fast"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Minimum Fast"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_MINIMUM_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Minimum Slow"
+  </source>
+  <dest>
+    *: none
+    es9218: "Minimum Slow"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Minimum Slow"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_APODIZING_1
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Apodizing type 1"
+  </source>
+  <dest>
+    *: none
+    es9218: "Apodizing type 1"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Apodizing type 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_APODIZING_2
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Apodizing type 2"
+  </source>
+  <dest>
+    *: none
+    es9218: "Apodizing type 2"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Apodizing type 2"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_HYBRID_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Hybrid Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "Hybrid Fast"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Hybrid Fast"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BRICK_WALL
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Brick Wall"
+  </source>
+  <dest>
+    *: none
+    es9218: "Brick Wall"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Brick Wall"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DAC_POWER_MODE
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    dac_power_mode: "DAC power mode"
+    es9218: "DAC output level"
+  </source>
+  <dest>
+    *: none
+    dac_power_mode: "DAC power mode"
+    es9218: "DAC output level"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "DAC power mode"
+    es9218: "DAC output level"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DAC_POWER_HIGH
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    dac_power_mode: "High performance"
+    es9218: "High Gain (2 Vrms)"
+  </source>
+  <dest>
+    *: none
+    dac_power_mode: "High performance"
+    es9218: "High Gain (2 Vrms)"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "High performance"
+    es9218: "High Gain (2 Vrms)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DAC_POWER_LOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    dac_power_mode: "Save battery"
+    es9218: "Low Gain (1 Vrms)"
+  </source>
+  <dest>
+    *: none
+    dac_power_mode: "Save battery"
+    es9218: "Low Gain (1 Vrms)"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "Save battery"
+    es9218: "Low Gain (1 Vrms)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_HQMIXER
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "HQ Mixer"
+    lowmem: none
+  </source>
+  <dest>
+    *: "HQ Mixer"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "High Quality Mixer"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SAMPLERATE
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Sample Rate"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Sample Rate"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Sample Rate"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_STD_CANCEL
+  desc: standard press x to cancel string
+  user: core
+  <source>
+    *: "Press LEFT to cancel."
+    android,hifietma*,zenvision: "Press BACK to cancel."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
+    ihifi760,ihifi960: "Double tap RETURN to cancel."
+    ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
+    iriverh10,samsungyh*: "Double tap LEFT to cancel."
+    mpiohd200: "Double tap REC to cancel."
+    mpiohd300: "Double tap MENU to cancel."
+    rx27generic: "Press VOLUME to cancel."
+    sonynwza860: "Keymaps incomplete."
+    touchscreen: "Press Middle Left to cancel."
+    vibe500: "Press PREV to cancel."
+    xduoox20,xduoox3,xduoox3ii: "Double tap HOME to cancel."
+  </source>
+  <dest>
+    *: "Press LEFT to cancel."
+    android,hifietma*,zenvision: "Press BACK to cancel."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
+    ihifi760,ihifi960: "Double tap RETURN to cancel."
+    ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
+    iriverh10,samsungyh*: "Double tap LEFT to cancel."
+    mpiohd200: "Double tap REC to cancel."
+    mpiohd300: "Double tap MENU to cancel."
+    rx27generic: "Press VOLUME to cancel."
+    sonynwza860: "Keymaps incomplete."
+    touchscreen: "Press Middle Left to cancel."
+    vibe500: "Press PREV to cancel."
+    xduoox20,xduoox3,xduoox3ii: "Double tap HOME to cancel."
+  </dest>
+  <voice>
+    *: "Press LEFT to cancel."
+    android,hifietma*,zenvision: "Press BACK to cancel."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Press POWER to cancel."
+    ihifi760,ihifi960: "Double tap RETURN to cancel."
+    ihifi770,ihifi770c,ihifi800: "Press HOME to cancel."
+    iriverh10,samsungyh*: "Double tap LEFT to cancel."
+    mpiohd200: "Double tap REC to cancel."
+    mpiohd300: "Double tap MENU to cancel."
+    rx27generic: "Press VOLUME to cancel."
+    touchscreen: "Press Middle Left to cancel."
+    vibe500: "Press PREV to cancel."
+    xduoox20,xduoox3,xduoox3ii: "Double tap HOME to cancel."
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DATE
+  desc: for constructing time and date announcements
+  user: core
+  <source>
+    *: "Date"
+  </source>
+  <dest>
+    *: "Tout effacer"
+  </dest>
+  <voice>
+    *: "Tout effacer"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL
+  desc:
+  user: core
+  <source>
+    *: "Clear all"
+  </source>
+  <dest>
+    *: "Clear all"
+  </dest>
+  <voice>
+    *: "Clear all"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CANCEL_0
+  desc: CANCEL.
+  user: core
+  <source>
+    *: "Cancel"
+  </source>
+  <dest>
+    *: "Annuler"
+  </dest>
+  <voice>
+    *: "Annuler"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE
+  desc:
+  user: core
+  <source>
+    *: "Save"
+  </source>
+  <dest>
+    *: "Sauvegarder"
+  </dest>
+  <voice>
+    *: "Sauvegarder"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIMEOUT
+  desc:
+  user: core
+  <source>
+    *: "Timeout"
+  </source>
+  <dest>
+    *: "Temps expiré"
+  </dest>
+  <voice>
+    *: "Temps expiré"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK
+  desc: used in track x of y constructs
+  user: core
+  <source>
+    *: "Track"
+  </source>
+  <dest>
+    *: "Piste"
+  </dest>
+  <voice>
+    *: "Piste"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ELAPSED
+  desc: prefix for elapsed playtime announcement
+  user: core
+  <source>
+    *: "Elapsed"
+  </source>
+  <dest>
+    *: "Écoulé"
+  </dest>
+  <voice>
+    *: "Écoulé"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCEMENT_FMT
+  desc: format for wps hotkey announcement
+  user: core
+  <source>
+    *: none
+    hotkey: "Announcement format"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Format des annonces"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Format des annonces"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMAIN
+  desc: for constructs such as number of tracks remaining etc
+  user: core
+  <source>
+    *: none
+    hotkey: "Remain"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Restant"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Restant"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GROUPING
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Grouping"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Regroupement"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Regroupement"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCE_ON
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Announce on"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Annoncer sur"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Annoncer sur"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_CHANGE
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Track change"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Changement de piste"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Changement de piste"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOLD_FOR_SETTINGS
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Hold for settings"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Maintenir pour accéder aux paramètres"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Maintenir pour accéder aux paramètres"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN
+  desc: onplay open plugin
+  user: core
+  <source>
+    *: "Open Plugin"
+  </source>
+  <dest>
+    *: "Lancer le module"
+  </dest>
+  <voice>
+    *: "Lancer le module"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN_NOT_A_PLUGIN
+  desc: open plugin module
+  user: core
+  <source>
+    *: "Not a plugin: %s"
+  </source>
+  <dest>
+    *: "N'est pas un module: %s"
+  </dest>
+  <voice>
+    *: "N'est pas un module: %s"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
+  desc: open plugin module
+  user: core
+  <source>
+    *: "Set Wps Context Plugin"
+  </source>
+  <dest>
+    *: "Set Wps Context Plugin"
+  </dest>
+  <voice>
+    *: "Set WPS Context Plugin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PARAMETER
+  desc:
+  user: core
+  <source>
+    *: "Parameter"
+  </source>
+  <dest>
+    *: "Paramètre"
+  </dest>
+  <voice>
+    *: "Paramètre"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NAME
+  desc:
+  user: core
+  <source>
+    *: "Name"
+  </source>
+  <dest>
+    *: "Nom"
+  </dest>
+  <voice>
+    *: "Nom"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD
+  desc:
+  user: core
+  <source>
+    *: "Add"
+  </source>
+  <dest>
+    *: "Ajouter"
+  </dest>
+  <voice>
+    *: "Ajouter"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACK
+  desc:
+  user: core
+  <source>
+    *: "Back"
+  </source>
+  <dest>
+    *: "Revenir"
+  </dest>
+  <voice>
+    *: "Éditer"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EDIT
+  desc:
+  user: core
+  <source>
+    *: "Edit"
+  </source>
+  <dest>
+    *: "Éditer"
+  </dest>
+  <voice>
+    *: "Éditer"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RUN
+  desc:
+  user: core
+  <source>
+    *: "Run"
+  </source>
+  <dest>
+    *: "Exécuter"
+  </dest>
+  <voice>
+    *: "Exécuter"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EXPORT
+  desc:
+  user: core
+  <source>
+    *: "Export"
+  </source>
+  <dest>
+    *: "Exporter"
+  </dest>
+  <voice>
+    *: "Exporter"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSE
+  desc:
+  user: core
+  <source>
+    *: "Browse"
+  </source>
+  <dest>
+    *: "Parcourir"
+  </dest>
+  <voice>
+    *: "Parcourir"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ENTER_USB_STORAGE_MODE_QUERY
+  desc: upon plugging in USB
+  user: core
+  <source>
+    *: "Enter USB mass storage mode?"
+  </source>
+  <dest>
+    *: "Passer en mode stockage de masse USB ?"
+  </dest>
+  <voice>
+    *: "Passer en mode stockage de masse USB ?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUEUE_MENU
+  desc: in onplay menu
+  user: core
+  <source>
+    *: "Queue..."
+  </source>
+  <dest>
+    *: "File d'attente"
+  </dest>
+  <voice>
+    *: "File d'attente"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_QUEUE_OPTIONS
+  desc: in Current Playlist settings
+  user: core
+  <source>
+    *: "Show Queue Options"
+  </source>
+  <dest>
+    *: "Afficher les options de la file d'attente"
+  </dest>
+  <voice>
+    *: "Afficher les options de la file d'attente"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUFFLED_ADDING_OPTIONS
+  desc: in Current Playlist settings
+  user: core
+  <source>
+    *: "Show Shuffled Adding Options"
+  </source>
+  <dest>
+    *: "Afficher les options d'ajout aléatoire"
+  </dest>
+  <voice>
+    *: "Afficher les options d'ajout aléatoire"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_IN_SUBMENU
+  desc: in Settings
+  user: core
+  <source>
+    *: "In Submenu"
+  </source>
+  <dest>
+    *: "En sous-menu"
+  </dest>
+  <voice>
+    *: "En sous-menu"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_DISABLE_ALL_NOTIFY
+  desc: disable all softlock notifications
+  user: core
+  <source>
+    *: "Disable All Lock Notifications"
+  </source>
+  <dest>
+    *: "Désactiver toutes les notifications de verrouillage"
+  </dest>
+  <voice>
+    *: "Désactiver toutes les notifications de verrouillage"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_VOLUME
+  desc: exempt volume from softlock
+  user: core
+  <source>
+    *: "Exempt Volume"
+  </source>
+  <dest>
+    *: "À l'exception du volume"
+  </dest>
+  <voice>
+    *: "À l'exception du volume"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_ALWAYSAUTOLOCK
+  desc: always prime autolock
+  user: core
+  <source>
+    *: "Always Autolock"
+  </source>
+  <dest>
+    *: "Always Autolock"
+  </dest>
+  <voice>
+    *: "Always Autolock"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_NUMERIC_TENS_SWAP_SEPARATOR
+  desc: voice only, for speaking numbers in languages that swap the tens and ones fields. Leave blank for languages that do not need it, such as English ("231" => "two hundred thirty one") but other languages may speak it as "two hundred one [AND] thirty"
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICED_DATE_FORMAT
+  desc: format string for how dates will be read back. Y == 4-digit year, A == month name, m == numeric month, d == numeric day. For example, "AdY" will read "January 21 2021"
+  user: core
+  <source>
+    *: "dAY"
+  </source>
+  <dest>
+    *: "dAY"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_WRAPAROUND
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Wraparound"
+  </source>
+  <dest>
+    *: "List Wraparound"
+  </dest>
+  <voice>
+    *: "List Wraparound"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUTDOWN_MESSAGE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show Shutdown Message"
+  </source>
+  <dest>
+    *: "Afficher le message d'arrêt"
+  </dest>
+  <voice>
+    *: "Afficher le message d'arrêt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Order"
+  </source>
+  <dest>
+    *: "Ordre de la liste"
+  </dest>
+  <voice>
+    *: "Ordre de la liste"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ASCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Ascending"
+  </source>
+  <dest>
+    *: "Croissante"
+  </dest>
+  <voice>
+    *: "Croissante"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DESCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Descending"
+  </source>
+  <dest>
+    *: "Décroissante"
+  </dest>
+  <voice>
+    *: "Décroissante"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUM_ART
+  desc: in Settings
+  user: core
+  <source>
+    *: "Album Art"
+  </source>
+  <dest>
+    *: "Pochette d'album"
+  </dest>
+  <voice>
+    *: "Pochette d'album"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_EMBEDDED
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Embedded"
+  </source>
+  <dest>
+    *: "Privilégier les images intégrées"
+  </dest>
+  <voice>
+    *: "Privilégier les images intégrées"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_IMAGE_FILE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Image File"
+  </source>
+  <dest>
+    *: "Privilégier les images en fichier"
+  </dest>
+  <voice>
+    *: "Privilégier les images en fichier"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_SYNC_RDS_TIME
+  desc: in radio screen and Settings
+  user: core
+  <source>
+    *: none
+    rds: "Sync RDS Time"
+  </source>
+  <dest>
+    *: none
+    rds: "Sync RDS Time"
+  </dest>
+  <voice>
+    *: none
+    rds: "Sync RDS Time"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_ALBUMS_BY
+  desc: in Settings
+  user: core
+  <source>
+    *: "Sort albums by"
+  </source>
+  <dest>
+    *: "Trier les albums par"
+  </dest>
+  <voice>
+    *: "Trier les albums par"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTIST_PLUS_NAME
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Name"
+  </source>
+  <dest>
+    *: "Artiste + nom"
+  </dest>
+  <voice>
+    *: "Artiste + nom"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTIST_PLUS_YEAR
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Year"
+  </source>
+  <dest>
+    *: "Artiste + année"
+  </dest>
+  <voice>
+    *: "Artiste + année"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YEAR_SORT_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "Year sort order"
+  </source>
+  <dest>
+    *: "Order du tri par années"
+  </dest>
+  <voice>
+    *: "Order du tri par années"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_YEAR_IN_ALBUM_TITLE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show year in album title"
+  </source>
+  <dest>
+    *: "Afficher l'année avec le titre de l'album"
+  </dest>
+  <voice>
+    *: "Afficher l'année avec le titre de l'album"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WAIT_FOR_CACHE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Cache needs to finish updating first!"
+  </source>
+  <dest>
+    *: "La mise à jour du cache doit finir au préalable !"
+  </dest>
+  <voice>
+    *: "La mise à jour du cache doit finir au préalable !"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_INFO
+  desc: Track Info Title
+  user: core
+  <source>
+    *: "Track Info"
+  </source>
+  <dest>
+    *: "Informations sur la piste"
+  </dest>
+  <voice>
+    *: "Informations sur la piste"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY
+  desc: play selected file/directory, in playlist context menu
+  user: core
+  <source>
+    *: "Play"
+  </source>
+  <dest>
+    *: "Lire"
+  </dest>
+  <voice>
+    *: "Lire"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_SHUFFLED
+  desc: play selected files in shuffled order, in playlist context menu
+  user: core
+  <source>
+    *: "Play Shuffled"
+  </source>
+  <dest>
+    *: "Lire mélangé"
+  </dest>
+  <voice>
+    *: "Lire mélangé"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEEP_CURRENT_TRACK_ON_REPLACE
+  desc: used in the playlist settings menu
+  user: core
+  <source>
+    *: "Keep Current Track When Replacing Playlist"
+  </source>
+  <dest>
+    *: "Garder la piste courante lors du remplacement de la liste de lecture"
+  </dest>
+  <voice>
+    *: "Garder la piste courante lors du remplacement de la liste de lecture"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_SETTINGS_ON_HOLD
+  desc: in the system sub menu
+  user: core
+  <source>
+    *: none
+    clear_settings_on_hold,iriverh10: "Clear settings when reset button is held during startup"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Clear settings when hold switch is on during startup"
+  </source>
+  <dest>
+    *: none
+    clear_settings_on_hold,iriverh10,ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Effacer les paramètres lorsque le bouton de réinitialisation est maintenu enfoncé pendant le démarrage"
+  </dest>
+  <voice>
+    *: none
+    clear_settings_on_hold,iriverh10,ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Effacer les paramètres lorsque le bouton de réinitialisation est maintenu enfoncé pendant le démarrage"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REWIND_ACROSS_TRACKS
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: "Rewind Across Tracks"
+  </source>
+  <dest>
+    *: "Rembobiner entre les pistes"
+  </dest>
+  <voice>
+    *: "Rembobiner entre les pistes"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_AS
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Set As..."
+  </source>
+  <dest>
+    *: "Définir comme..."
+  </dest>
+  <voice>
+    *: "Définir comme"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playlist Directory"
+  </source>
+  <dest>
+    *: "Répertoire des listes de lecture"
+  </dest>
+  <voice>
+    *: "Répertoire des listes de lecture"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_START_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Start Directory"
+  </source>
+  <dest>
+    *: "Répertoire de démarrage"
+  </dest>
+  <voice>
+    *: "Répertoire de démarrage"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: none
+    recording: "Recording Directory"
+  </source>
+  <dest>
+    *: none
+    recording: "Répertoire des enregistrements"
+  </dest>
+  <voice>
+    *: none
+    recording: "Répertoire des enregistrements"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Playlist..."
+  </source>
+  <dest>
+    *: "Ajouter à la liste de lecture"
+  </dest>
+  <voice>
+    *: "Ajouter à la liste de lecture"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_EXISTING_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Existing Playlist"
+  </source>
+  <dest>
+    *: "Ajouter à la liste de lecture existante"
+  </dest>
+  <voice>
+    *: "Ajouter à la liste de lecture existante"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playing Next..."
+  </source>
+  <dest>
+    *: "Ajouter à la suite..."
+  </dest>
+  <voice>
+    *: "Ajouter à la suite"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Next"
+  </source>
+  <dest>
+    *: "Ajouter à la suite"
+  </dest>
+  <voice>
+    *: "Ajouter à la suite"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add Shuffled"
+  </source>
+  <dest>
+    *: "Ajouter mélangé"
+  </dest>
+  <voice>
+    *: "Ajouter mélangé"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last"
+  </source>
+  <dest>
+    *: "Lire en dernier"
+  </dest>
+  <voice>
+    *: "Lire en dernier"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last Shuffled"
+  </source>
+  <dest>
+    *: "Lire en dernier mélangé"
+  </dest>
+  <voice>
+    *: "Lire en dernier mélangé"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOLUME_ADJUST_MODE
+  desc: in system settings
+  user: core
+  <source>
+    *: none
+    perceptual_volume: "Volume Adjustment Mode"
+  </source>
+  <dest>
+    *: none
+    perceptual_volume: "Méthode d'ajustement du volume"
+  </dest>
+  <voice>
+    *: none
+    perceptual_volume: "Méthode d'ajustement du volume"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOLUME_ADJUST_NORM_STEPS
+  desc: in system settings
+  user: core
+  <source>
+    *: none
+    perceptual_volume: "Number of Volume Steps"
+  </source>
+  <dest>
+    *: none
+    perceptual_volume: "Nombre de niveaux de volume"
+  </dest>
+  <voice>
+    *: none
+    perceptual_volume: "Nombre de niveaux de volume"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PERCEPTUAL
+  desc: in system settings -> volume adjustment mode
+  user: core
+  <source>
+    *: none
+    perceptual_volume: "Perceptual"
+  </source>
+  <dest>
+    *: none
+    perceptual_volume: "Perceptual"
+  </dest>
+  <voice>
+    *: none
+    perceptual_volume: "Perceptual"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_TRACKS_WHILE_BROWSING
+  desc: in PictureFlow Main Menu
+  user: core
+  <source>
+    *: "Show Tracks While Browsing"
+  </source>
+  <dest>
+    *: "Afficher les pistes lors de la navigation"
+  </dest>
+  <voice>
+    *: "Afficher les pistes lors de la navigation"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_LAST_ALBUM
+  desc: in PictureFlow Main Menu
+  user: core
+  <source>
+    *: "Go to Last Album"
+  </source>
+  <dest>
+    *: "Aller au dernier album"
+  </dest>
+  <voice>
+    *: "Aller au dernier album"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DATABASE_DIR
+  desc: in database settings menu
+  user: core
+  <source>
+    *: "Database Directory"
+  </source>
+  <dest>
+    *: "Répertoire de la base de données"
+  </dest>
+  <voice>
+    *: "Répertoire de la base de données"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOVE_QUEUED_TRACKS
+  desc: Confirmation dialog
+  user: core
+  <source>
+    *: "Remove Queued Tracks?"
+  </source>
+  <dest>
+    *: "Retirer les pistes en file attente ?"
+  </dest>
+  <voice>
+    *: "Retirer les pistes en file attente ?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUICK_IGNORE_DIRACHE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Quick (Ignore Directory Cache)"
+  </source>
+  <dest>
+    *: "Rapide (Ignorer le cache des répertoires)"
+  </dest>
+  <voice>
+    *: "Rapide (Ignorer le cache des répertoires)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WPS
+  desc: in Settings
+  user: core
+  <source>
+    *: "What's Playing Screen"
+  </source>
+  <dest>
+    *: "Écran En Lecture"
+  </dest>
+  <voice>
+    *: "Écran En Lecture"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEFAULT_BROWSER
+  desc: in Settings
+  user: core
+  <source>
+    *: "Default Browser"
+  </source>
+  <dest>
+    *: "Navigateur par défaut"
+  </dest>
+  <voice>
+    *: "Navigateur par défaut"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AMAZE_MENU
+  desc: Amaze game
+  user: core
+  <source>
+    *: "Amaze Main Menu"
+  </source>
+  <dest>
+    *: "Amaze Main Menu"
+  </dest>
+  <voice>
+    *: "Amaze Main Menu"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_MAZE_SIZE
+  desc: Maze size in Amaze game
+  user: core
+  <source>
+    *: "Set Maze Size"
+  </source>
+  <dest>
+    *: "Set Maze Size"
+  </dest>
+  <voice>
+    *: "Set Maze Size"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIEW_MAP
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "View Map"
+  </source>
+  <dest>
+    *: "View Map"
+  </dest>
+  <voice>
+    *: "View Map"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_COMPASS
+  desc: Compass in Amaze game
+  user: core
+  <source>
+    *: "Show Compass"
+  </source>
+  <dest>
+    *: "Show Compass"
+  </dest>
+  <voice>
+    *: "Show Compass"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_MAP
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Show Map"
+  </source>
+  <dest>
+    *: "Show Map"
+  </dest>
+  <voice>
+    *: "Show Map"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMEMBER_PATH
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Remember Path"
+  </source>
+  <dest>
+    *: "Remember Path"
+  </dest>
+  <voice>
+    *: "Remember Path"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_LARGE_TILES
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Use Large Tiles"
+  </source>
+  <dest>
+    *: "Use Large Tiles"
+  </dest>
+  <voice>
+    *: "Use Large Tiles"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SOLUTION
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Show Solution"
+  </source>
+  <dest>
+    *: "Show Solution"
+  </dest>
+  <voice>
+    *: "Show Solution"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUIT_WITHOUT_SAVING
+  desc:
+  user: core
+  <source>
+    *: "Quit without saving"
+  </source>
+  <dest>
+    *: "Quit without saving"
+  </dest>
+  <voice>
+    *: "Quit without saving"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GENERATING_MAZE
+  desc: Amaze game
+  user: core
+  <source>
+    *: "Generating maze..."
+  </source>
+  <dest>
+    *: "Generating maze..."
+  </dest>
+  <voice>
+    *: "Generating maze"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YOU_WIN
+  desc: Success in game
+  user: core
+  <source>
+    *: "You win!"
+  </source>
+  <dest>
+    *: "You win!"
+  </dest>
+  <voice>
+    *: "You win!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YOU_CHEATED
+  desc: Cheated in game
+  user: core
+  <source>
+    *: "You cheated!"
+  </source>
+  <dest>
+    *: "You cheated!"
+  </dest>
+  <voice>
+    *: "You cheated!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_EASY
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Easy"
+  </source>
+  <dest>
+    *: "Easy"
+  </dest>
+  <voice>
+    *: "Easy"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_MEDIUM
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Medium"
+  </source>
+  <dest>
+    *: "Medium"
+  </dest>
+  <voice>
+    *: "Medium"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_HARD
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Hard"
+  </source>
+  <dest>
+    *: "Hard"
+  </dest>
+  <voice>
+    *: "Hard"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_EXPERT
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Expert"
+  </source>
+  <dest>
+    *: "Expert"
+  </dest>
+  <voice>
+    *: "Expert"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STEREOSW_MODE
+  desc: Stereo Switch Mode
+  user: core
+  <source>
+    *: "Stereo Switch Mode"
+  </source>
+  <dest>
+    *: "Stereo Switch Mode"
+  </dest>
+  <voice>
+    *: "Stereo Switch Mode"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERSE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Reverse"
+  </source>
+  <dest>
+    *: "Inversé"
+  </dest>
+  <voice>
+    *: "Inversé"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ZERO
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Always 0"
+  </source>
+  <dest>
+    *: "Toujours 0"
+  </dest>
+  <voice>
+    *: "Toujours 0"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ONE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Always 1"
+  </source>
+  <dest>
+    *: "Toujours 1"
+  </dest>
+  <voice>
+    *: "Toujours 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEGAL_NOTICES
+  desc: in system menu
+  user: core
+  <source>
+    *: "Legal Notices"
+  </source>
+  <dest>
+    *: "Mentions Légales"
+  </dest>
+  <voice>
+    *: "Mentions Légales"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ERROR_FORMATSTR
+  desc: for general use
+  user: core
+  <source>
+    *: "Error: %s"
+  </source>
+  <dest>
+    *: "Erreur: %s"
+  </dest>
+  <voice>
+    *: "Erreur"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SETTINGS
+  desc: mikmod plugin
+  user: core
+  <source>
+    *: "Mikmod Settings"
+  </source>
+  <dest>
+    *: "Mikmod Settings"
+  </dest>
+  <voice>
+    *: "Mik mod Settings"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_MENU
+  desc: mikmod plugin
+  user: core
+  <source>
+    *: "Mikmod Menu"
+  </source>
+  <dest>
+    *: "Mikmod Menu"
+  </dest>
+  <voice>
+    *: "Mik mod Menu"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU
+  desc: chessbox plugin
+  user: core
+  <source>
+    *: "Chessbox Menu"
+  </source>
+  <dest>
+    *: "Chessbox Menu"
+  </dest>
+  <voice>
+    *: "Chess box Menu"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_INVALID_VOICE_FILE
+  desc: played if the voice file fails to load
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Fichier Voix non valide"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PERCENT_FORMAT
+  desc: percent formatting ( `10%` is default ,  for `10 %` use '%ld %%' , for `%10` use '%%%ld' and so on)
+  user: core
+  <source>
+    *: "%ld%%"
+  </source>
+  <dest>
+    *: "%ld%%"
+  </dest>
+  <voice>
+    *: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHOOSE_FILE
+  desc: file_picker plugin ask user to select a file
+  user: core
+  <source>
+    *: "Choose File"
+  </source>
+  <dest>
+    *: "Choisir un fichier"
+  </dest>
+  <voice>
+    *: "Choisir un fichier"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMAINING
+  desc: Playing Time
+  user: core
+  <source>
+    *: "Remaining"
+  </source>
+  <dest>
+    *: "Restant"
+  </dest>
+  <voice>
+    *: "Restant"
+  </voice>
+</phrase>
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index 958cfd2b2f..197f69aa56 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -3375,10 +3375,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Sen info>"
+    *: "[Sen info]"
   </dest>
   <voice>
     *: "Sen información"
@@ -6166,13 +6166,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Todas as pistas>"
+    *: "[Todas as pistas]"
   </dest>
   <voice>
     *: "Todas as pistas"
@@ -7898,13 +7898,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aleatorio>"
+    *: "[Aleatorio]"
   </dest>
   <voice>
     *: "Aleatorio"
@@ -9033,13 +9033,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Sen datos>"
+    *: "[Sen datos]"
   </dest>
   <voice>
     *: "Sen datos"
@@ -10605,10 +10605,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Non retomar>"
+    *: "[Non retomar]"
   </dest>
   <voice>
     *: "Non retomar"
@@ -11091,10 +11091,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Marcador inválido>"
+    *: "[Marcador inválido]"
   </dest>
   <voice>
     *: "Marcador inválido"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 2006801a47..8ceb26d5c3 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -482,10 +482,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Χω�ίς συνέχιση>"
+    *: "[Χω�ίς συνέχιση]"
   </dest>
   <voice>
     *: "Χω�ίς συνέχιση"
@@ -510,10 +510,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Μη έγκυ�ος σελιδοδείκτης>"
+    *: "[Μη έγκυ�ος σελιδοδείκτης]"
   </dest>
   <voice>
     *: "Μη έγκυ�ος σελιδοδείκτης"
@@ -2286,13 +2286,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Όλα τα κομμάτια>"
+    *: "[Όλα τα κομμάτια]"
   </dest>
   <voice>
     *: "Όλα τα κομμάτια"
@@ -7100,10 +7100,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Χω�ίς πλη�οφο�ίες>"
+    *: "[Χω�ίς πλη�οφο�ίες]"
   </dest>
   <voice>
     *: "Χω�ίς πλη�οφο�ίες"
@@ -10177,13 +10177,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Τυχαία>"
+    *: "[Τυχαία]"
   </dest>
   <voice>
     *: "Τυχαία"
@@ -11478,13 +11478,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Χω�ίς ετικέτα>"
+    *: "[Χω�ίς ετικέτα]"
   </dest>
   <voice>
     *: "Χω�ίς ετικέτα"
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 272676a62e..e5576bea23 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -482,10 +482,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<�ל תמשיך>"
+    *: "[�ל תמשיך]"
   </dest>
   <voice>
     *: "�ל תמשיך"
@@ -510,10 +510,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<סימניה פגומה>"
+    *: "[סימניה פגומה]"
   </dest>
   <voice>
     *: "סימניה פגומה"
@@ -2332,13 +2332,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<כל השירי�>"
+    *: "[כל השירי�]"
   </dest>
   <voice>
     *: "כל השירי�"
@@ -7179,10 +7179,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<�ין מידע>"
+    *: "[�ין מידע]"
   </dest>
   <voice>
     *: "�ין מידע"
@@ -10205,13 +10205,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<�קר�י>"
+    *: "[�קר�י]"
   </dest>
   <voice>
     *: "�קר�י"
@@ -11961,13 +11961,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </dest>
   <voice>
     *: "Untagged"
diff --git a/apps/lang/hindi.lang b/apps/lang/hindi.lang
index 0bd1429ca8..a8a6f76bd5 100644
--- a/apps/lang/hindi.lang
+++ b/apps/lang/hindi.lang
@@ -444,10 +444,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<श�रू मत कर>"
+    *: "[श�रू मत कर]"
   </dest>
   <voice>
     *: "श�रू मत कर"
@@ -472,10 +472,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<गलत बूकमारक>"
+    *: "[गलत बूकमारक]"
   </dest>
   <voice>
     *: "गलत बूकमारक"
@@ -1252,13 +1252,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<सब tracks>"
+    *: "[सब tracks]"
   </dest>
   <voice>
     *: "सब tracks"
@@ -3266,10 +3266,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<कोई इनफो नही है>"
+    *: "[कोई इनफो नही है]"
   </dest>
   <voice>
     *: "कोई इनफो नही है"
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index b4fd23699d..19c7049858 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -476,10 +476,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nemoj nastaviti>"
+    *: "[Nemoj nastaviti]"
   </dest>
   <voice>
     *: "Nemoj nastaviti"
@@ -504,10 +504,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Nevaljala zabilješka>"
+    *: "[Nevaljala zabilješka]"
   </dest>
   <voice>
     *: "Nevaljala zabilješka"
@@ -2296,13 +2296,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Sve pjesme>"
+    *: "[Sve pjesme]"
   </dest>
   <voice>
     *: "Sve pjesme"
@@ -7143,10 +7143,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Nema informacija>"
+    *: "[Nema informacija]"
   </dest>
   <voice>
     *: "Nema informacija"
@@ -10169,13 +10169,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Nasumi�no>"
+    *: "[Nasumi�no]"
   </dest>
   <voice>
     *: "Nasumi�no"
@@ -12026,13 +12026,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<bez oznake>"
+    *: "[bez oznake]"
   </dest>
   <voice>
     *: "Bez oznake"
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 2fb075f278..b4d51d409c 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -3713,10 +3713,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Engar uppl.>"
+    *: "[Engar uppl.]"
   </dest>
   <voice>
     *: "Engar uppl."
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index e0c80b885d..7fc6b09bfa 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -473,10 +473,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Non Riprendere>"
+    *: "[Non Riprendere]"
   </dest>
   <voice>
     *: "Non Riprendere"
@@ -501,10 +501,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Segnalibro non valido>"
+    *: "[Segnalibro non valido]"
   </dest>
   <voice>
     *: "Segnalibro non valido"
@@ -2111,13 +2111,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Tutte le tracce>"
+    *: "[Tutte le tracce]"
   </dest>
   <voice>
     *: "Tutte le tracce"
@@ -6558,10 +6558,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Nessuna0 Info>"
+    *: "[Nessuna0 Info]"
   </dest>
   <voice>
     *: "Nessuna Informazione"
@@ -9206,13 +9206,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Casuale>"
+    *: "[Casuale]"
   </dest>
   <voice>
     *: "Casuale"
@@ -11025,13 +11025,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Nessun Tag>"
+    *: "[Nessun Tag]"
   </dest>
   <voice>
     *: "Nessun Tag"
@@ -16438,3 +16438,59 @@
     *: "Rimanente"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "Selezione troppo grande, verranno prese solamente %d tracce casuali dalla selezione"
+  </dest>
+  <voice>
+    *: "Selezione troppo grande, verranno prese solamente alcune tracce casuali dalla selezione"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "Disabilita lo scorrimento del menu principale"
+  </dest>
+  <voice>
+    *: "Disabilita lo scorrimento del menu principale"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "Titolo e Album da ID3 tag"
+  </dest>
+  <voice>
+    *: "Titolo e Album da tag"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "Titolo da ID3 tag"
+  </dest>
+  <voice>
+    *: "Titolo da tag"
+  </voice>
+</phrase>
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 1d05b8ddf0..a150ef1664 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -484,10 +484,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<レジューム���>"
+    *: "[レジューム���]"
   </dest>
   <voice>
     *: "レジューム���"
@@ -512,10 +512,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<無効�ブックマーク>"
+    *: "[無効�ブックマーク]"
   </dest>
   <voice>
     *: "無効�ブックマーク"
@@ -2306,13 +2306,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<����トラック>"
+    *: "[����トラック]"
   </dest>
   <voice>
     *: "����トラック"
@@ -7154,10 +7154,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<情報無�>"
+    *: "[情報無�]"
   </dest>
   <voice>
     *: "情報無�"
@@ -10180,13 +10180,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<ランダム>"
+    *: "[ランダム]"
   </dest>
   <voice>
     *: "ランダム"
@@ -12041,13 +12041,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<タグ無�>"
+    *: "[タグ無�]"
   </dest>
   <voice>
     *: "タグ無�"
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 022222fd77..baaaf944ca 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -486,10 +486,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<재시작하지 않�>"
+    *: "[재시작하지 않�]"
   </dest>
   <voice>
     *: "재시작하지 않�"
@@ -514,10 +514,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<잘못� �마�>"
+    *: "[잘못� �마�]"
   </dest>
   <voice>
     *: "잘못� �마�"
@@ -2138,13 +2138,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<모든 트랙>"
+    *: "[모든 트랙]"
   </dest>
   <voice>
     *: "모든 트랙"
@@ -6585,10 +6585,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<정보 없�>"
+    *: "[정보 없�]"
   </dest>
   <voice>
     *: "정보 없�"
@@ -9247,13 +9247,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<랜�>"
+    *: "[랜�]"
   </dest>
   <voice>
     *: "랜�"
@@ -11097,13 +11097,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<태그가 지정�지 않�>"
+    *: "[태그가 지정�지 않�]"
   </dest>
   <voice>
     *: "태그가 지정�지 않�"
@@ -16451,3 +16451,59 @@
     *: "남�"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "메� 메뉴 스�롤 비활성화"
+  </dest>
+  <voice>
+    *: "메� 메뉴 스�롤 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "선�� 너무 커서, %d 개� 무작위 트랙� 선��"
+  </dest>
+  <voice>
+    *: "선�� 너무 커서 무작위로 선��는 트랙� 줄어듬"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "ID3 태그 제목 & 앨범"
+  </dest>
+  <voice>
+    *: "태그� 제목 � 앨범"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "ID3 태그 제목"
+  </dest>
+  <voice>
+    *: "태그 제목"
+  </voice>
+</phrase>
diff --git a/apps/lang/latviesu.lang b/apps/lang/latviesu.lang
index d43109eed2..7216993ff9 100644
--- a/apps/lang/latviesu.lang
+++ b/apps/lang/latviesu.lang
@@ -476,10 +476,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Neats�kt>"
+    *: "[Neats�kt]"
   </dest>
   <voice>
     *: "neatsaakt"
@@ -504,10 +504,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Nederīga Gr�matzīme>"
+    *: "[Nederīga Gr�matzīme]"
   </dest>
   <voice>
     *: "nederiiga graamatziime"
@@ -2297,13 +2297,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Visas dziesmas>"
+    *: "[Visas dziesmas]"
   </dest>
   <voice>
     *: "visas dziesmas"
@@ -7145,10 +7145,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Nav Inform�cijas>"
+    *: "[Nav Inform�cijas]"
   </dest>
   <voice>
     *: "Nav Inform�cijas"
@@ -10171,13 +10171,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Daž�di>"
+    *: "[Daž�di]"
   </dest>
   <voice>
     *: "dazhaadi"
@@ -12015,13 +12015,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Neatzīmēts>"
+    *: "[Neatzīmēts]"
   </dest>
   <voice>
     *: "neatziimeets"
diff --git a/apps/lang/lietuviu.lang b/apps/lang/lietuviu.lang
index 51aece5107..41bac94417 100644
--- a/apps/lang/lietuviu.lang
+++ b/apps/lang/lietuviu.lang
@@ -543,10 +543,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nesugrįžti>"
+    *: "[Nesugrįžti]"
   </dest>
   <voice>
     *: "Nesugrįžti"
@@ -571,10 +571,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Klaidinga žymelė>"
+    *: "[Klaidinga žymelė]"
   </dest>
   <voice>
     *: "Klaidinga žymelė"
@@ -2378,13 +2378,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Visi įrašai>"
+    *: "[Visi įrašai]"
   </dest>
   <voice>
     *: "Visi įrašai"
@@ -7221,10 +7221,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<NÄ—ra informacijos>"
+    *: "[NÄ—ra informacijos]"
   </dest>
   <voice>
     *: "NÄ—ra informacijos"
@@ -10247,13 +10247,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Atsitiktinis>"
+    *: "[Atsitiktinis]"
   </dest>
   <voice>
     *: "Atsitiktinis"
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index 96bcd1e4ad..cdad5f3924 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -470,10 +470,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nincs folytatás>"
+    *: "[Nincs folytatás]"
   </dest>
   <voice>
     *: "Do not resume"
@@ -498,10 +498,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Érvénytelen könyvjelző>"
+    *: "[Érvénytelen könyvjelző]"
   </dest>
   <voice>
     *: "Invalid Bookmark"
@@ -2118,13 +2118,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Minden szám>"
+    *: "[Minden szám]"
   </dest>
   <voice>
     *: "All tracks"
@@ -6751,10 +6751,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Nincs adat>"
+    *: "[Nincs adat]"
   </dest>
   <voice>
     *: "Nincs adat"
@@ -9513,13 +9513,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Véletlenszerűen>"
+    *: "[Véletlenszerűen]"
   </dest>
   <voice>
     *: "Random"
@@ -10868,13 +10868,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Ismeretlen>"
+    *: "[Ismeretlen]"
   </dest>
   <voice>
     *: "Ismeretlen"
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 42ed25b897..7b30907261 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -4534,10 +4534,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<geen info>"
+    *: "[geen info]"
   </dest>
   <voice>
     *: "Geen info"
@@ -6945,13 +6945,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alle nummers>"
+    *: "[Alle nummers]"
   </dest>
   <voice>
     *: "Alle nummers"
@@ -8350,10 +8350,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Niet hervatten>"
+    *: "[Niet hervatten]"
   </dest>
   <voice>
     *: "Niet hervatten"
@@ -8437,10 +8437,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Ongeldige bladwijzer>"
+    *: "[Ongeldige bladwijzer]"
   </dest>
   <voice>
     *: "Ongeldige bladwijzer"
@@ -9447,13 +9447,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Willekeurig>"
+    *: "[Willekeurig]"
   </dest>
   <voice>
     *: "Willekeurig"
@@ -11189,13 +11189,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Geen tags>"
+    *: "[Geen tags]"
   </dest>
   <voice>
     *: "Geen tags"
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 165dfeea14..840c5fd922 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -4801,10 +4801,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Ingen info>"
+    *: "[Ingen info]"
   </dest>
   <voice>
     *: "Ingen info"
@@ -7322,13 +7322,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alle spor>"
+    *: "[Alle spor]"
   </dest>
   <voice>
     *: "Alle spor"
@@ -9511,10 +9511,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Ikkje hald fram>"
+    *: "[Ikkje hald fram]"
   </dest>
   <voice>
     *: "Ikkje hald fram"
@@ -9654,10 +9654,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Ugyldig bokmerke>"
+    *: "[Ugyldig bokmerke]"
   </dest>
   <voice>
     *: "Ugyldig bokmerke"
@@ -10202,13 +10202,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Tilfeldig>"
+    *: "[Tilfeldig]"
   </dest>
   <voice>
     *: "Tilfeldig"
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index a3ac67564f..d74a485f0e 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -4122,10 +4122,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Ingen informasjon>"
+    *: "[Ingen informasjon]"
   </dest>
   <voice>
     *: "Ingen informasjon"
@@ -7321,13 +7321,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alle spor>"
+    *: "[Alle spor]"
   </dest>
   <voice>
     *: "Alle spor"
@@ -9709,10 +9709,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Ikke gjenoppta>"
+    *: "[Ikke gjenoppta]"
   </dest>
   <voice>
     *: "Ikke gjenoppta"
@@ -9869,10 +9869,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Ugyldig bokmerke>"
+    *: "[Ugyldig bokmerke]"
   </dest>
   <voice>
     *: "Ugyldig bokmerke"
@@ -10133,13 +10133,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Tilfeldig>"
+    *: "[Tilfeldig]"
   </dest>
   <voice>
     *: "Random"
@@ -11528,13 +11528,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Uten tagg>"
+    *: "[Uten tagg]"
   </dest>
   <voice>
     *: "Uten tagg"
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 03b5c008cd..30b02e4f48 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -479,10 +479,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nie wznawiaj>"
+    *: "[Nie wznawiaj]"
   </dest>
   <voice>
     *: "Nie wznawiaj"
@@ -507,10 +507,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Nieprawidłowa zakładka>"
+    *: "[Nieprawidłowa zakładka]"
   </dest>
   <voice>
     *: "Nieprawidłowa zakładka"
@@ -2117,13 +2117,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Wszystkie utwory>"
+    *: "[Wszystkie utwory]"
   </dest>
   <voice>
     *: "Wszystkie utwory"
@@ -6564,10 +6564,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<brak danych>"
+    *: "[brak danych]"
   </dest>
   <voice>
     *: "brak danych"
@@ -9212,13 +9212,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Losowo>"
+    *: "[Losowo]"
   </dest>
   <voice>
     *: "Losowo"
@@ -10647,13 +10647,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Bez opisu>"
+    *: "[Bez opisu]"
   </dest>
   <voice>
     *: "Bez opisu"
@@ -16444,3 +16444,59 @@
     *: "Pozostały"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "Wyłącz przewijanie menu głównego"
+  </dest>
+  <voice>
+    *: "Wyłącz przewijanie menu głównego"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "Wybór jest zbyt duży, zostanie z niego wybranych %d losowych utworów"
+  </dest>
+  <voice>
+    *: "Wybór jest zbyt duży, zostanie z niego wybrana mniejsza liczba losowych utworów"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "Tytuł i album ze znaczników ID3"
+  </dest>
+  <voice>
+    *: "Tytuł i album ze znaczników i de trzy"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "Tytuł ze znaczników ID3"
+  </dest>
+  <voice>
+    *: "Tytuł ze znaczników i de trzy"
+  </voice>
+</phrase>
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 1100758535..0fca053f95 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -477,10 +477,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Não Retomar>"
+    *: "[Não Retomar]"
   </dest>
   <voice>
     *: "Não Retomar"
@@ -505,10 +505,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Favorito Inválido>"
+    *: "[Favorito Inválido]"
   </dest>
   <voice>
     *: "Favorito Inválido"
@@ -2298,13 +2298,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Todas as Faixas>"
+    *: "[Todas as Faixas]"
   </dest>
   <voice>
     *: "Todas as Faixas"
@@ -7145,10 +7145,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Informação Ausente>"
+    *: "[Informação Ausente]"
   </dest>
   <voice>
     *: "Informação Ausente"
@@ -10171,13 +10171,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aleatório>"
+    *: "[Aleatório]"
   </dest>
   <voice>
     *: "Aleatório"
@@ -12032,13 +12032,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Sem etiqueta>"
+    *: "[Sem etiqueta]"
   </dest>
   <voice>
     *: "Sem etiqueta"
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 69de38544d..a5e79b6275 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -4501,10 +4501,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Sem Informação>"
+    *: "[Sem Informação]"
   </dest>
   <voice>
     *: "Sem Informação"
@@ -7503,13 +7503,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aleatório>"
+    *: "[Aleatório]"
   </dest>
   <voice>
     *: "Aleatório"
@@ -8693,10 +8693,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Não Retomar>"
+    *: "[Não Retomar]"
   </dest>
   <voice>
     *: "Não Retomar"
@@ -8929,10 +8929,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Favorito Inválido>"
+    *: "[Favorito Inválido]"
   </dest>
   <voice>
     *: "Favorito Inválido"
@@ -9446,13 +9446,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Todas as faixas>"
+    *: "[Todas as faixas]"
   </dest>
   <voice>
     *: "Todas as faixas"
@@ -11666,13 +11666,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Sem Etiqueta>"
+    *: "[Sem Etiqueta]"
   </dest>
   <voice>
     *: "Sem etiqueta"
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index e4c867e0b1..82b9be2433 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -1772,10 +1772,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<date lipsă>"
+    *: "[date lipsă]"
   </dest>
   <voice>
     *: "date lipsă"
@@ -2789,13 +2789,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Toate pistele>"
+    *: "[Toate pistele]"
   </dest>
   <voice>
     *: "All tracks"
@@ -4838,13 +4838,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Aleator>"
+    *: "[Aleator]"
   </dest>
   <voice>
     *: "Random"
@@ -8336,10 +8336,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nu continua redarea>"
+    *: "[Nu continua redarea]"
   </dest>
   <voice>
     *: "Do not resume"
@@ -8960,10 +8960,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Semn de carte nevalid>"
+    *: "[Semn de carte nevalid]"
   </dest>
   <voice>
     *: "Invalid Bookmark"
@@ -11894,13 +11894,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<fără taguri>"
+    *: "[fără taguri]"
   </dest>
   <voice>
     *: "fără taguri"
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 857dde6f97..6279da478a 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -4,12 +4,11 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at
+# your option) any later version.
 #
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
@@ -29,6 +28,8 @@
 # - James Hunt
 # - Dmitriy Gamza
 # - Roman Levkin-Taymenev
+# - Igor Poretsky
+# - Dmitry Prozorov
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -317,7 +318,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Stereo"
@@ -331,7 +332,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Mono"
@@ -697,20 +698,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER_EDIT_MODE
-  desc: in the equalizer settings menu
-  user: core
-  <source>
-    *: "Edit mode: %s"
-  </source>
-  <dest>
-    *: "Режим редактировани�: %s"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_EQUALIZER_GAIN_ITEM
   desc: in the equalizer settings menu
   user: core
@@ -1431,15 +1418,12 @@
   user: core
   <source>
     *: "Peak Meter"
-    masd: none
   </source>
   <dest>
     *: "Уровень �игнала"
-    masd: none
   </dest>
   <voice>
     *: "Уровень �игнала"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2036,23 +2020,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_DIRECTORY
-  desc: in recording settings_menu
-  user: core
-  <source>
-    *: none
-    recording: "Directory"
-  </source>
-  <dest>
-    *: none
-    recording: "Папка"
-  </dest>
-  <voice>
-    *: none
-    recording: "Папка"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RECORD_TRIGGER
   desc: in recording settings_menu
   user: core
@@ -2818,15 +2785,12 @@
   user: core
   <source>
     *: "Peak Release"
-    masd: none
   </source>
   <dest>
     *: "Сбро� пиков"
-    masd: none
   </dest>
   <voice>
     *: "Сбро� пиков"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2835,15 +2799,12 @@
   user: core
   <source>
     *: "Peak Hold Time"
-    masd: none
   </source>
   <dest>
     *: "Врем� удержани� пиков"
-    masd: none
   </dest>
   <voice>
     *: "Врем� удержани� пиков"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2852,15 +2813,12 @@
   user: core
   <source>
     *: "Clip Hold Time"
-    masd: none
   </source>
   <dest>
     *: "Врем� удержани� индикатора"
-    masd: none
   </dest>
   <voice>
     *: "Врем� удержани� индикатора"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2869,15 +2827,12 @@
   user: core
   <source>
     *: "Eternal"
-    masd: none
   </source>
   <dest>
     *: "По�то�нно"
-    masd: none
   </dest>
   <voice>
     *: "По�то�нно"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2886,15 +2841,12 @@
   user: core
   <source>
     *: "Scale"
-    masd: none
   </source>
   <dest>
     *: "Шкала"
-    masd: none
   </dest>
   <voice>
     *: "Шкала"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2903,15 +2855,12 @@
   user: core
   <source>
     *: "Logarithmic (dB)"
-    masd: none
   </source>
   <dest>
     *: "Логарифмиче�ка� (дБ)"
-    masd: none
   </dest>
   <voice>
     *: "Логарифмиче�ка� в децибелах"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2920,15 +2869,12 @@
   user: core
   <source>
     *: "Linear (%)"
-    masd: none
   </source>
   <dest>
     *: "Линейна� (%)"
-    masd: none
   </dest>
   <voice>
     *: "Линейна� в процентах"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2937,15 +2883,12 @@
   user: core
   <source>
     *: "Minimum Of Range"
-    masd: none
   </source>
   <dest>
     *: "�ижн�� граница диапазона"
-    masd: none
   </dest>
   <voice>
     *: "�ижн�� граница диапазона"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2954,15 +2897,12 @@
   user: core
   <source>
     *: "Maximum Of Range"
-    masd: none
   </source>
   <dest>
     *: "Верхн�� граница диапазона"
-    masd: none
   </dest>
   <voice>
     *: "Верхн�� граница диапазона"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3354,62 +3294,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
-  user: core
-  <source>
-    *: "Insert"
-  </source>
-  <dest>
-    *: "В�тавить"
-  </dest>
-  <voice>
-    *: "В�тавить"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INSERT_FIRST
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
-  user: core
-  <source>
-    *: "Insert Next"
-  </source>
-  <dest>
-    *: "В�тавить �ледующим"
-  </dest>
-  <voice>
-    *: "В�тавить �ледующим"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INSERT_LAST
-  desc: in onplay menu.  append a track/playlist into dynamic playlist.
-  user: core
-  <source>
-    *: "Insert Last"
-  </source>
-  <dest>
-    *: "В�тавить в конец"
-  </dest>
-  <voice>
-    *: "В�тавить в конец"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_INSERT_SHUFFLED
-  desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
-  user: core
-  <source>
-    *: "Insert Shuffled"
-  </source>
-  <dest>
-    *: "В�тавить в �лучайное ме�то"
-  </dest>
-  <voice>
-    *: "В�тавить в �лучайное ме�то"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_QUEUE
   desc: The verb/action Queue
   user: core
@@ -3521,24 +3405,7 @@
   </dest>
   <voice>
     *: none
-    charging: "�ккумул�тор: Зар�жает��"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TRICKLE_CHARGE
-  desc: in info display, shows that trickle charge is running
-  user: core
-  <source>
-    *: none
-    charging: "Battery: Trickle Chg"
-  </source>
-  <dest>
-    *: none
-    charging: "�ккумул�тор: Импуль�н. зар�д"
-  </dest>
-  <voice>
-    *: none
-    charging: "�ккумул�тор: Импуль�н. зар�д"
+    charging: "�ккумул�тор зар�жен"
   </voice>
 </phrase>
 <phrase>
@@ -3548,11 +3415,10 @@
   <source>
     *: "Battery: %d%% %dh %dm"
     ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
-    iriverifp7xx: "%d%% %dh %dm"
   </source>
   <dest>
     *: "%d%% %dч %dм"
-    ipodmini1g,ipodmini2g,iriverh10,iriverifp7xx: "%d%% %dч %dм"
+    ipodmini1g,ipodmini2g,iriverh10: "%d%% %dч %dм"
   </dest>
   <voice>
     *: "Зар�д аккумул�тора"
@@ -3569,7 +3435,7 @@
     *: "Ди�к:"
   </dest>
   <voice>
-    *: "Ди�к:"
+    *: "Размер ди�ка"
   </voice>
 </phrase>
 <phrase>
@@ -3592,39 +3458,41 @@
   user: core
   <source>
     *: "Int:"
-    xduoox3: "mSD1:"
     hibylinux: "mSD:"
+    xduoox3: "mSD1:"
   </source>
   <dest>
     *: "Внутр:"
-    xduoox3: "mSD1:"
-    hibylinux: "mSD:"
+    hibylinux,xduoox3: "микро Э� Ди:"
   </dest>
   <voice>
     *: "Внутр"
-    xduoox3: "микро Э� Ди 1"
     hibylinux: "микро Э� Ди"
+    xduoox3: "микро Э� Ди 1"
   </voice>
 </phrase>
 <phrase>
   id: LANG_DISK_NAME_MMC
-  desc: in info menu;  name for external disk with multivolume (Ondio; keep short!)
+  desc: in info menu;  name for external disk with multivolume (keep short!)
   user: core
   <source>
     *: none
-    multivolume: "HD1"
+    hibylinux: "USB:"
+    multivolume: "HD1:"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </source>
   <dest>
     *: none
-    multivolume: "HD1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
-    xduoox3: "mSD2:"
+    hibylinux: "ЮСБ:"
+    multivolume: "ХД1"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "микро Э� Ди:"
+    xduoox3: "микро Э� Ди2:"
   </dest>
   <voice>
     *: none
-    multivolume: "Эйч Ди 1"
+    hibylinux: "Ю С Б"
+    multivolume: "Х Д 1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "микро Э� Ди"
     xduoox3: "микро Э� Ди 2"
   </voice>
@@ -3643,7 +3511,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Текущее врем�:"
+    rtc: "Текущее врем�"
   </voice>
 </phrase>
 <phrase>
@@ -3771,7 +3639,7 @@
   <dest>
     *: none
     gigabeatfx,mrobe500,rtc: "ВЫКЛ. = Отмена"
-    gigabeats: "��З�Д = Отмена"
+    gigabeats,sansafuzeplus: "��З�Д = Отмена"
     gogearsa9200: "ЛЕВО = Отмена"
     iaudiom5,iaudiox5: "З�ПИСЬ = Отмена"
     ipod*,mpiohd300,sansac200*: "МЕ�Ю = Отмена"
@@ -3783,6 +3651,7 @@
   </dest>
   <voice>
     *: none
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3840,6 +3709,7 @@
   </dest>
   <voice>
     *: none
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: ""
   </voice>
 </phrase>
 <phrase>
@@ -3911,23 +3781,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DB_INF
-  desc: -inf db for values below measurement
-  user: core
-  <source>
-    *: none
-    recording: "-inf"
-  </source>
-  <dest>
-    *: none
-    recording: "-inf"
-  </dest>
-  <voice>
-    *: none
-    recording: "-inf"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ALARM_MOD_TIME
   desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
   user: core
@@ -3962,23 +3815,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_SHUTDOWN
-  desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod).
-  user: core
-  <source>
-    *: none
-    alarm: "Alarm Set"
-  </source>
-  <dest>
-    *: none
-    alarm: "У�тановить будильник"
-  </dest>
-  <voice>
-    *: none
-    alarm: "У�тановить будильник"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ALARM_MOD_ERROR
   desc: The text that tells that the time is incorrect (for the RTC alarm mod).
   user: core
@@ -3996,35 +3832,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_KEYS
-  desc: Shown key functions in alarm menu (for the RTC alarm mod).
-  user: core
-  <source>
-    *: none
-    alarm: "PLAY=Set OFF=Cancel"
-    gigabeats: "SELECT=Set POWER=Cancel"
-    ipod*: "SELECT=Set MENU=Cancel"
-    iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel"
-    mpiohd300: "ENTER=Set MENU=Cancel"
-    sansafuzeplus: "SELECT=Set  BACK=Cancel"
-    vibe500: "OK=Set C=Cancel"
-  </source>
-  <dest>
-    *: none
-    alarm: "ВОСПР.=У�т., ВЫКЛ.=Отм."
-    gigabeats: "ВЫБОР=У�т., ВЫКЛ.=Отм."
-    ipod*: "ВЫБОР=У�т., МЕ�Ю=Отм."
-    iriverh10,iriverh10_5gb: "ВЫБОР=У�т., ПРЕД.=Отм."
-    mpiohd300: "ENTER=У�т., MENU=Отм."
-    sansafuzeplus: "SELECT=У�т.,  BACK=Отм."
-    vibe500: "OK=У�т., C=Отм."
-  </dest>
-  <voice>
-    *: none
-    alarm,gigabeats,ipod*,iriverh10,iriverh10_5gb: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ALARM_MOD_DISABLE
   desc: Announce that the RTC alarm has been turned off
   user: core
@@ -4196,20 +4003,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUM_GAIN
-  desc: in tag viewer
-  user: core
-  <source>
-    *: "Album Gain"
-  </source>
-  <dest>
-    *: "У�иление альбома"
-  </dest>
-  <voice>
-    *: "У�иление альбома"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ID3_PATH
   desc: in tag viewer
   user: core
@@ -4228,10 +4021,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<�ет информ.>"
+    *: "[�ет информ.]"
   </dest>
   <voice>
     *: "�ет информации"
@@ -5218,7 +5011,7 @@
     *: "."
   </source>
   <dest>
-    *: "."
+    *: "~."
   </dest>
   <voice>
     *: "точка"
@@ -5823,10 +5616,10 @@
     *: "Saved %d tracks (%s)"
   </source>
   <dest>
-    *: "Сохранено %d треков (%d)"
+    *: "Сохранено %d треков (%s)"
   </dest>
   <voice>
-    *: "Тр�ков �охранено"
+    *: "Треков �охранено"
   </voice>
 </phrase>
 <phrase>
@@ -5872,20 +5665,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR
-  desc: Playlist error
-  user: core
-  <source>
-    *: "Error updating playlist control file"
-  </source>
-  <dest>
-    *: "Ошибка при обновлении файла �пи�ка во�произведени�"
-  </dest>
-  <voice>
-    *: "Ошибка при обновлении файла �пи�ка во�произведени�"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PLAYLIST_ACCESS_ERROR
   desc: Playlist error
   user: core
@@ -6044,91 +5823,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONBAR_MENU
-  desc: in button bar
-  user: core
-  <source>
-    *: none
-    radio_screen_button_bar: "Menu"
-  </source>
-  <dest>
-    *: none
-    radio_screen_button_bar: "Меню"
-  </dest>
-  <voice>
-    *: none
-    radio_screen_button_bar: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_BUTTONBAR_EXIT
-  desc: in radio screen
-  user: core
-  <source>
-    *: none
-    radio_screen_button_bar: "Exit"
-  </source>
-  <dest>
-    *: none
-    radio_screen_button_bar: "Выход"
-  </dest>
-  <voice>
-    *: none
-    radio_screen_button_bar: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_BUTTONBAR_ACTION
-  desc: in radio screen
-  user: core
-  <source>
-    *: none
-    radio_screen_button_bar: "Action"
-  </source>
-  <dest>
-    *: none
-    radio_screen_button_bar: "Дей�твие"
-  </dest>
-  <voice>
-    *: none
-    radio_screen_button_bar: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_BUTTONBAR_ADD
-  desc: in radio screen
-  user: core
-  <source>
-    *: none
-    radio_screen_button_bar: "Add"
-  </source>
-  <dest>
-    *: none
-    radio_screen_button_bar: "Добавить"
-  </dest>
-  <voice>
-    *: none
-    radio_screen_button_bar: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_FM_BUTTONBAR_RECORD
-  desc: in radio screen
-  user: core
-  <source>
-    *: none
-    radio_screen_button_bar: "Record"
-  </source>
-  <dest>
-    *: none
-    radio_screen_button_bar: "Запи�ь"
-  </dest>
-  <voice>
-    *: none
-    radio_screen_button_bar: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_FM_MONO_MODE
   desc: in radio screen
   user: core
@@ -6333,7 +6027,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on many models
   user: core
   <source>
     *: "OFF to abort"
@@ -6347,7 +6041,7 @@
   <dest>
     *: "ВЫКЛ. дл� отмены"
     gigabeatfx: "ВЫКЛ. дл� отмены"
-    gigabeats: "��З�Д дл� отмены"
+    gigabeats,sansafuzeplus: "��З�Д дл� отмены"
     iaudiom5,iaudiox5: "ВОСПР. дл� отмены"
     ipod*: "П�УЗ� дл� отмены"
     iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "ПРЕД. дл� отмены"
@@ -6485,7 +6179,7 @@
 </phrase>
 <phrase>
   id: LANG_PLUGIN_WRONG_MODEL
-  desc: The plugin is not compatible with the archos model trying to run it
+  desc: The plugin is not compatible with the player model trying to run it
   user: core
   <source>
     *: "Incompatible model"
@@ -6697,7 +6391,6 @@
   user: core
   <source>
     *: "Building database... %d found (OFF to return)"
-    archosplayer: "Building DB %d found"
     gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
     gogearsa9200: "Building database... %d found (REW to return)"
     ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Building database... %d found (PREV to return)"
@@ -6705,7 +6398,6 @@
   </source>
   <dest>
     *: "По�троение базы... %d найдено (ВЫКЛ. дл� отмены)"
-    archosplayer: "По�троение БД... %d найдено"
     gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "По�троение базы... %d найдено (ВЛЕВО дл� отмены)"
     gogearsa9200: "По�троение базы... %d найдено (РЕВЕРС. дл� отмены)"
     ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "По�троение базы... %d найдено (ПРЕД. дл� отмены)"
@@ -6726,18 +6418,18 @@
     *: "Сканирование ди�ка..."
   </dest>
   <voice>
-    *: "Сканирование ди�ка..."
+    *: "Сканирование ди�ка"
   </voice>
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<В�е треки>"
+    *: "[В�е треки]"
   </dest>
   <voice>
     *: "В�е тр�ки"
@@ -6892,7 +6584,7 @@
     *: "Удаление..."
   </dest>
   <voice>
-    *: "Удаление..."
+    *: "Удаление"
   </voice>
 </phrase>
 <phrase>
@@ -7318,14 +7010,12 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    archosplayer: "Буф:"
   </dest>
   <voice>
-    *: "Буфер:"
+    *: "Размер буфера"
   </voice>
 </phrase>
 <phrase>
@@ -7396,17 +7086,14 @@
   user: core
   <source>
     *: "PLAY = Yes"
-    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU, or top-right = Yes"
-    creativezen*: "SELECT = Yes"
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
+    creativezen*,gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Yes"
     iriverh100,iriverh120,iriverh300: "NAVI = Yes"
     mrobe500: "PLAY, POWER, or top-right = Yes"
     vibe500: "OK = Yes"
   </source>
   <dest>
     *: "ВОСПР. = Да"
-    archosplayer: "(ВОСПР./СТОП)"
     cowond2*: "МЕ�Ю или прав. верх. = Да"
     creativezen*: "Выбрать = Да"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "ВЫБР�ТЬ = Да"
@@ -7434,7 +7121,7 @@
   </source>
   <dest>
     *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "ВЫБОР = У�тановить"
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "ВЫБОР = У�тановить"
     gogearsa9200,samsungyh*: "ВОСПР. = У�тановить"
     iriverh100,iriverh120,iriverh300: "��ВИГ. = У�тановить"
     mpiohd300: "ENTER = У�тановить"
@@ -7444,7 +7131,7 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7453,15 +7140,12 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
   </source>
   <dest>
     *: "Люба� друга� = �ет"
-    archosplayer: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -7556,13 +7240,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Случайный>"
+    *: "[Случайный]"
   </dest>
   <voice>
     *: "Случайный"
@@ -7768,11 +7452,9 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
   </source>
   <dest>
     *: "Конец �пи�ка"
-    archosplayer: "Конец �пи�ка"
   </dest>
   <voice>
     *: "Конец �пи�ка"
@@ -8039,11 +7721,11 @@
   </source>
   <dest>
     *: none
-    remote: "(Vol- : Реактивировать)"
+    remote: "(Громко�ть - : чтобы �нова включить)"
   </dest>
   <voice>
     *: none
-    remote: "(Vol- : Реактивировать)"
+    remote: "(Уменьшите громко�ть, чтобы �нова включить)"
   </voice>
 </phrase>
 <phrase>
@@ -8071,7 +7753,7 @@
     *: "Режим:"
   </dest>
   <voice>
-    *: "Режим:"
+    *: "Режим"
   </voice>
 </phrase>
 <phrase>
@@ -8202,20 +7884,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLACE
-  desc: in onplay menu.  Replace the current playlist with a new one.
-  user: core
-  <source>
-    *: "Play Next"
-  </source>
-  <dest>
-    *: "Играть �ледующий"
-  </dest>
-  <voice>
-    *: "Играть �ледующий"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CATALOG
   desc: in main menu and onplay menu
   user: core
@@ -8720,20 +8388,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_ADD_TO
-  desc: in onplay playlist catalogue submenu
-  user: core
-  <source>
-    *: "Add to Playlist"
-  </source>
-  <dest>
-    *: "Добавить в �пи�ок"
-  </dest>
-  <voice>
-    *: "Добавить в �пи�ок"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_BUTTONLIGHT_BRIGHTNESS
   desc: in settings_menu
   user: core
@@ -8907,30 +8561,16 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<�е продолжать>"
+    *: "[�е продолжать]"
   </dest>
   <voice>
     *: "�е продолжать"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_DELETE
-  desc: bookmark context menu, delete this bookmark
-  user: core
-  <source>
-    *: "Delete"
-  </source>
-  <dest>
-    *: "Удалить"
-  </dest>
-  <voice>
-    *: "Удалить"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
   user: core
@@ -9093,7 +8733,7 @@
     *: "Перемещение..."
   </dest>
   <voice>
-    *: "Перемещение..."
+    *: "Перемещение"
   </voice>
 </phrase>
 <phrase>
@@ -9139,20 +8779,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_VIEW
-  desc: in onplay playlist catalogue submenu
-  user: core
-  <source>
-    *: "View Catalogue"
-  </source>
-  <dest>
-    *: "Каталог"
-  </dest>
-  <voice>
-    *: "Каталог"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_EXT_CUESHEET
   desc:
   user: core
@@ -9202,10 +8828,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<�еверна� закладка>"
+    *: "[�еверна� закладка]"
   </dest>
   <voice>
     *: "�еверна� закладка"
@@ -9269,11 +8895,11 @@
   </source>
   <dest>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "MPEG Слой 3"
   </dest>
   <voice>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "MPEG Слой 3"
   </voice>
 </phrase>
 <phrase>
@@ -9410,10 +9036,10 @@
 </phrase>
 <phrase>
   id: LANG_AUDIOSCROBBLER
-  desc: "Last.fm Log" in the playback menu
+  desc: "Last.fm Logger" in Plugin/apps/scrobbler
   user: core
   <source>
-    *: "Last.fm Log"
+    *: "Last.fm Logger"
   </source>
   <dest>
     *: "Отчёт дл� Last.fm"
@@ -9534,7 +9160,7 @@
     *: "%s не �уще�твует"
   </dest>
   <voice>
-    *: ""
+    *: "Каталог плейли�тов не �уще�твует"
   </voice>
 </phrase>
 <phrase>
@@ -9583,23 +9209,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_REC_DIR
-  desc: used in the onplay menu to set a recording dir
-  user: core
-  <source>
-    *: none
-    recording: "Set As Recording Directory"
-  </source>
-  <dest>
-    *: none
-    recording: "У�тановить как папку запи�и"
-  </dest>
-  <voice>
-    *: none
-    recording: "У�тановить как папку запи�и"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_FM_MENU
   desc: fm menu title
   user: core
@@ -9832,7 +9441,7 @@
     *: ""
   </dest>
   <voice>
-    *: "OK"
+    *: "Oк"
   </voice>
 </phrase>
 <phrase>
@@ -10369,7 +9978,7 @@
     *: "Следующий трек:"
   </dest>
   <voice>
-    *: "Следующий тр�к:"
+    *: "Следующий тр�к"
   </voice>
 </phrase>
 <phrase>
@@ -10383,7 +9992,7 @@
     *: "Следующий:"
   </dest>
   <voice>
-    *: "Следующий:"
+    *: "Следующий"
   </voice>
 </phrase>
 <phrase>
@@ -10438,11 +10047,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "OK"
+    touchscreen: "~OK"
   </dest>
   <voice>
     *: none
-    touchscreen: "OK"
+    touchscreen: "~OK"
   </voice>
 </phrase>
 <phrase>
@@ -10604,20 +10213,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLLBAR_POSITION
-  desc: in Settings -> General -> Display -> Status-/Scrollbar
-  user: core
-  <source>
-    *: "Scroll Bar Position"
-  </source>
-  <dest>
-    *: "Позици� поло�ы прокрутки"
-  </dest>
-  <voice>
-    *: "Позици� поло�ы прокрутки"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_REMOTE_STATUSBAR
   desc: in Settings -> General -> Display -> statusbar
   user: core
@@ -10694,20 +10289,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_LAST_SHUFFLED
-  desc: in onplay menu.  insert a playlist randomly at end of dynamic playlist
-  user: core
-  <source>
-    *: "Insert Last Shuffled"
-  </source>
-  <dest>
-    *: "Добавить �лучайный к концу"
-  </dest>
-  <voice>
-    *: "Добавить �лучайный к концу"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_COMPRESSOR_SOFT_KNEE
   desc: in sound settings
   user: core
@@ -11014,13 +10595,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<�е тегированный>"
+    *: "[�е тегированный]"
   </dest>
   <voice>
     *: "�е тегированный"
@@ -11270,20 +10851,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STATUSBAR_CUSTOM
-  desc: if this translation is compatible with LANG_CHANNEL_CUSTOM, then please use the same translation. it can be combined later then
-  user: core
-  <source>
-    *: "Custom"
-  </source>
-  <dest>
-    *: "Пользователь�кие"
-  </dest>
-  <voice>
-    *: "Пользователь�кие"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SCROLLBAR_WIDTH
   desc: in Settings -> General -> Display -> Status-/Scrollbar
   user: core
@@ -11619,20 +11186,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_START_DIR
-  desc: used in the onplay menu to set a starting browser dir
-  user: core
-  <source>
-    *: "Start File Browser Here"
-  </source>
-  <dest>
-    *: "�ачинать показ файлов зде�ь"
-  </dest>
-  <voice>
-    *: "�ачинать показ файлов зде�ь"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_FM_RSSI
   desc: Signal strength of a received FM station
   user: core
@@ -11729,25 +11282,11 @@
   </source>
   <dest>
     *: none
-    multidrive_usb: "USB: Скрыть внутренний ди�к"
+    multidrive_usb: "Скрыть внутренний ди�к USB"
   </dest>
   <voice>
     *: none
-    multidrive_usb: "USB: Скрыть внутренний ди�к"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SET_AS_PLAYLISTCAT_DIR
-  desc: used in the onplay menu to set a playlist catalogue dir
-  user: core
-  <source>
-    *: "Set As Playlist Catalogue Directory"
-  </source>
-  <dest>
-    *: "У�тановить как папку каталога �пи�ков"
-  </dest>
-  <voice>
-    *: "У�тановить как папку каталога �пи�ков"
+    multidrive_usb: "Скрыть внутренний ди�к USB"
   </voice>
 </phrase>
 <phrase>
@@ -11796,20 +11335,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTOMATIC
-  desc: generic automatic
-  user: core
-  <source>
-    *: "Automatic"
-  </source>
-  <dest>
-    *: "�втоматич."
-  </dest>
-  <voice>
-    *: "�втоматиче�ки"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SLEEP_TIMER_CANCEL_CURRENT
   desc: shown instead of sleep timer when it's running
   user: core
@@ -12342,7 +11867,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Seek"
+    *: "Exempt Seek"
   </source>
   <dest>
     *: "Перемотка"
@@ -12401,7 +11926,7 @@
   desc: Softlock behaviour setting
   user: core
   <source>
-    *: "Disable Notify"
+    *: "Disable Locked Reminders"
   </source>
   <dest>
     *: "Запрет оповещени�"
@@ -12516,7 +12041,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Skip"
+    *: "Exempt Skip"
   </source>
   <dest>
     *: "Смена трека"
@@ -12596,20 +12121,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NO_VIEWERS
-  desc: text for splash to indicate that no viewers are available
-  user: core
-  <source>
-    *: "No viewers found"
-  </source>
-  <dest>
-    *: "Про�мотрщиков не найдено"
-  </dest>
-  <voice>
-    *: "Про�мотрщиков не найдено"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PBE
   desc: in sound settings
   user: core
@@ -12712,7 +12223,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Play"
+    *: "Exempt Play"
   </source>
   <dest>
     *: "Во�произведение или пауза"
@@ -13034,20 +12545,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_PLAYLIST
-  desc: in the pictureflow main menu
-  user: core
-  <source>
-    *: "Clear playlist"
-  </source>
-  <dest>
-    *: "Очи�тить �пи�ок во�произведени�"
-  </dest>
-  <voice>
-    *: "Очи�тить �пи�ок во�произведени�"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_HIDE_ALBUM_TITLE
   desc: in the pictureflow settings
   user: core
@@ -13091,7 +12588,7 @@
 </phrase>
 <phrase>
   id: LANG_DIRECT
-  desc: in the pictureflow settings
+  desc: in the pictureflow settings, also a volume adjustment mode
   user: core
   <source>
     *: "Direct"
@@ -13160,34 +12657,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CLEARED
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Playlist Cleared"
-  </source>
-  <dest>
-    *: "Спи�ок во�произведени� очищен"
-  </dest>
-  <voice>
-    *: "Спи�ок во�произведени� очищен"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ADDED_TO_PLAYLIST
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Added to playlist"
-  </source>
-  <dest>
-    *: "Добавлено к �пи�ку во�произведени�"
-  </dest>
-  <voice>
-    *: "Добавлено к �пи�ку во�произведени�"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
   user: core
@@ -13226,7 +12695,7 @@
     *: "Уровень 8: 1 ход / 15 мин."
   </dest>
   <voice>
-    *: "Уровень 8: 1 ход за 15 минут"
+    *: "Уровень 8, 1 ход за 15 минут"
   </voice>
 </phrase>
 <phrase>
@@ -13338,7 +12807,7 @@
     *: "Уровень 3: 60 ходов / 30 min."
   </dest>
   <voice>
-    *: "Уровень 3: 60 ходов за 30 минут"
+    *: "Уровень 3, 60 ходов за 30 минут"
   </voice>
 </phrase>
 <phrase>
@@ -13380,7 +12849,7 @@
     *: "Уровень 5: 40 ходов / 60 мин."
   </dest>
   <voice>
-    *: "Уровень 5: 40 ходов за 60 минут"
+    *: "Уровень 5, 40 ходов за 60 минут"
   </voice>
 </phrase>
 <phrase>
@@ -13394,7 +12863,7 @@
     *: ""
   </dest>
   <voice>
-    *: "GNU Chess"
+    *: "GNU Шахматы"
   </voice>
 </phrase>
 <phrase>
@@ -13408,7 +12877,7 @@
     *: "Уровень 9: 1 ход / 60 мин."
   </dest>
   <voice>
-    *: "Уровень 9: 1 ход за 60 минут"
+    *: "Уровень 9, 1 ход за 60 минут"
   </voice>
 </phrase>
 <phrase>
@@ -13573,16 +13042,16 @@
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining:"
+    *: ""
   </source>
   <dest>
-    *: "В �пи�ке о�тало�ь:"
+    *: ""
   </dest>
   <voice>
-    *: "В �пи�ке о�тало�ь"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13610,7 +13079,7 @@
     *: "Уровень 4: 40 ходов / 30 мин."
   </dest>
   <voice>
-    *: "Уровень 4: 40 ходов за 30 минут"
+    *: "Уровень 4, 40 ходов за 30 минут"
   </voice>
 </phrase>
 <phrase>
@@ -13784,7 +13253,7 @@
     *: "Думаю..."
   </dest>
   <voice>
-    *: ""
+    *: "Думаю"
   </voice>
 </phrase>
 <phrase>
@@ -13916,7 +13385,7 @@
     *: "Уровень 2: 60 ходов / 15 мин."
   </dest>
   <voice>
-    *: "Уровень 2: 60 ходов за 15 минут"
+    *: "Уровень 2, 60 ходов за 15 минут"
   </voice>
 </phrase>
 <phrase>
@@ -13972,7 +13441,7 @@
     *: "Уровень 1: 60 ходов / 5 мин."
   </dest>
   <voice>
-    *: "Уровень 1: 60 ходов за 5 минут"
+    *: "Уровень 1, 60 ходов за 5 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14365,7 +13834,7 @@
     *: "Уровень 7: 40 ходов / 240 мин."
   </dest>
   <voice>
-    *: "Уровень 7: 40 ходов за 240 минут"
+    *: "Уровень 7, 40 ходов за 240 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14641,7 +14110,7 @@
     *: "Уровень 10: 1 ход / 600 min."
   </dest>
   <voice>
-    *: "Уровень 10: 1 ход за 600 минут"
+    *: "Уровень 10, 1 ход за 600 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14798,7 +14267,7 @@
     *: "Уровень 6: 40 ходов / 120 мин."
   </dest>
   <voice>
-    *: "Уровень 6: 40 ходов за 120 минут"
+    *: "Уровень 6, 40 ходов за 120 минут"
   </voice>
 </phrase>
 <phrase>
@@ -14945,62 +14414,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PROPERTIES_ARTIST
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Artist]"
-  </source>
-  <dest>
-    *: "[И�полнитель]"
-  </dest>
-  <voice>
-    *: "И�полнитель"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_TITLE
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Title]"
-  </source>
-  <dest>
-    *: "[�азвание]"
-  </dest>
-  <voice>
-    *: "�азвание"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_ALBUM
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Album]"
-  </source>
-  <dest>
-    *: "[�льбом]"
-  </dest>
-  <voice>
-    *: "�льбом"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_DURATION
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Duration]"
-  </source>
-  <dest>
-    *: "[Продолжительно�ть]"
-  </dest>
-  <voice>
-    *: "Продолжительно�ть"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_PROPERTIES_SUBDIRS
   desc: in properties plugin
   user: core
@@ -15645,20 +15058,6 @@
     es9218: "�изка� громко�ть"
   </voice>
 </phrase>
- <phrase>
-  id: LANG_CLEAR_LIST_AND_PLAY_NEXT
-  desc: in onplay menu.  Replace current playlist with selected tracks
-  user: core
-  <source>
-    *: "Clear List & Play Next"
-  </source>
-  <dest>
-    *: "Очи�тить �пи�ок и играть �ледующий"
-  </dest>
-  <voice>
-    *: "Очи�тить �пи�ок и играть �ледующий"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_QUEUE_MENU
   desc: in onplay menu
@@ -15670,7 +15069,7 @@
     *: "Очередь..."
   </dest>
   <voice>
-    *: "Очередь..."
+    *: "Очередь"
   </voice>
 </phrase>
 <phrase>
@@ -15716,20 +15115,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_LIST_AND_PLAY_SHUFFLED
-  desc: in onplay menu.  Replace current playlist with selected tracks in random order.
-  user: core
-  <source>
-    *: "Clear List & Play Shuffled"
-  </source>
-  <dest>
-    *: "Очи�тить �пи�ок и играть в �лучайном пор�дке"
-  </dest>
-  <voice>
-    *: "Очи�тить �пи�ок и играть в �лучайном пор�дке"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SOFTLOCK_DISABLE_ALL_NOTIFY
   desc: disable all softlock notifications
   user: core
@@ -15772,20 +15157,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_RELOAD_AFTER_SAVE
-  desc: reload playlist after saving
-  user: core
-  <source>
-    *: "Reload After Saving"
-  </source>
-  <dest>
-    *: "Перезагрузить по�ле �охранени�"
-  </dest>
-  <voice>
-    *: "Перезагрузить по�ле �охранени�"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_FILTER_LINEAR_FAST
   desc: in sound settings
   user: core
@@ -15939,132 +15310,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PROPERTIES_ALBUMARTIST
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Album Artist]"
-  </source>
-  <dest>
-    *: "[И�полнитель альбома]"
-  </dest>
-  <voice>
-    *: "И�полнитель альбома"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_GENRE
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Genre]"
-  </source>
-  <dest>
-    *: "[Жанр]"
-  </dest>
-  <voice>
-    *: "Жанр"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_COMMENT
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Comment]"
-  </source>
-  <dest>
-    *: "[Комментарий]"
-  </dest>
-  <voice>
-    *: "Комментарий"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_COMPOSER
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Composer]"
-  </source>
-  <dest>
-    *: "[Композитор]"
-  </dest>
-  <voice>
-    *: "Композитор"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_YEAR
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Year]"
-  </source>
-  <dest>
-    *: "[Год]"
-  </dest>
-  <voice>
-    *: "Год"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_TRACKNUM
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Tracknum]"
-  </source>
-  <dest>
-    *: "[�омер трека]"
-  </dest>
-  <voice>
-    *: "�омер трека"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_DISCNUM
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Discnum]"
-  </source>
-  <dest>
-    *: "[�омер ди�ка]"
-  </dest>
-  <voice>
-    *: "�омер ди�ка"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_FREQUENCY
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Frequency]"
-  </source>
-  <dest>
-    *: "[Ча�тота]"
-  </dest>
-  <voice>
-    *: "Ча�тота"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_PROPERTIES_BITRATE
-  desc: in properties plugin
-  user: core
-  <source>
-    *: "[Bitrate]"
-  </source>
-  <dest>
-    *: "[Битрейт]"
-  </dest>
-  <voice>
-    *: "Битрейт"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_SINGLE_MODE
   desc: single mode
   user: core
@@ -16353,18 +15598,18 @@
   user: core
   <source>
     *: none
-    ipodcolor,ipodnano1g,ipodvideo,ipod4g,ipodmini1g,ipodmini2g: "Clear settings when hold switch is on during startup"
-    clear_settings_on_hold, iriverh10: "Clear settings when reset button is held during startup"
+    clear_settings_on_hold,iriverh10: "Clear settings when reset button is held during startup"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Clear settings when hold switch is on during startup"
   </source>
   <dest>
     *: none
-    ipodcolor,ipodnano1g,ipodvideo,ipod4g,ipodmini1g,ipodmini2g: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
-    clear_settings_on_hold, iriverh10: "Сбро�ит на�тройки при нажатой кнопке �бро�а во врем� загрузки"
+    clear_settings_on_hold,iriverh10: "Сбро�ит на�тройки при нажатой кнопке �бро�а во врем� загрузки"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
   </dest>
   <voice>
     *: none
-    ipodcolor,ipodnano1g,ipodvideo,ipod4g,ipodmini1g,ipodmini2g: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
-    clear_settings_on_hold, iriverh10: "Сбро�ит на�тройки при нажатой кнопке �бро�а во врем� загрузки"
+    clear_settings_on_hold,iriverh10: "Сбро�ит на�тройки при нажатой кнопке �бро�а во врем� загрузки"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
   </voice>
 </phrase>
 <phrase>
@@ -16392,7 +15637,7 @@
     *: "У�тановить как..."
   </dest>
   <voice>
-    *: "У�тановить как..."
+    *: "У�тановить как"
   </voice>
 </phrase>
 <phrase>
@@ -16448,10 +15693,10 @@
     *: "Add to Playlist..."
   </source>
   <dest>
-    *: "Добавить к �пи�ку проигрывани�..."
+    *: "Добавить к �пи�ку во�произведени�.."
   </dest>
   <voice>
-    *: "Добавить к �пи�ку проигрывани�..."
+    *: "Добавить к �пи�ку во�произведени�"
   </voice>
 </phrase>
 <phrase>
@@ -16476,10 +15721,10 @@
     *: "Playing Next..."
   </source>
   <dest>
-    *: "Дальнейшее проигрывание..."
+    *: "Во�произве�ти далее..."
   </dest>
   <voice>
-    *: "Дальнейшее проигрывание..."
+    *: "Во�произве�ти далее"
   </voice>
 </phrase>
 <phrase>
@@ -16631,3 +15876,631 @@
     *: "Ру��кий"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY
+  desc: a summary splash screen that appear on the database browser when you try to create a playlist from the database browser that exceeds your system limit
+  user: core
+  <source>
+    *: "Selection too big, %d random tracks will be selected"
+  </source>
+  <dest>
+    *: "Выбор �лишком велик, из него будут выбраны %d �лучайных треков"
+  </dest>
+  <voice>
+    *: "Выбор �лишком велик, из него будет выбрано меньше �лучайных треков"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SHORT_SHARP
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Short Sharp"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "Короткий О�трый"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "Короткий О�трый"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SHORT_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Short Slow"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "Короткий Медленный"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "Короткий Медленный"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_HQMIXER
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "HQ Mixer"
+    lowmem: none
+  </source>
+  <dest>
+    *: "HQ Микшер"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "High Quality Микшер"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SAMPLERATE
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Sample Rate"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Ча�тота ди�кретизации"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Ча�тота ди�кретизации"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_NUMERIC_TENS_SWAP_SEPARATOR
+  desc: voice only, for speaking numbers in languages that swap the tens and ones fields. Leave blank for languages that do not need it, such as English ("231" => "two hundred thirty one") but other languages may speak it as "two hundred one [AND] thirty"
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICED_DATE_FORMAT
+  desc: format string for how dates will be read back. Y == 4-digit year, A == month name, m == numeric month, d == numeric day. For example, "AdY" will read "January 21 2021"
+  user: core
+  <source>
+    *: "dAY"
+  </source>
+  <dest>
+    *: "~dAY"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DATABASE_DIR
+  desc: in database settings menu
+  user: core
+  <source>
+    *: "Database Directory"
+  </source>
+  <dest>
+    *: "Каталог базы данных"
+  </dest>
+  <voice>
+    *: "Каталог базы данных"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOVE_QUEUED_TRACKS
+  desc: Confirmation dialog
+  user: core
+  <source>
+    *: "Remove Queued Tracks?"
+  </source>
+  <dest>
+    *: "Удал�ть треки, по�тавленные в очередь?"
+  </dest>
+  <voice>
+    *: "Удал�ть треки, по�тавленные в очередь?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUICK_IGNORE_DIRACHE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Quick (Ignore Directory Cache)"
+  </source>
+  <dest>
+    *: "Quick  (игнорировать к�ш каталогов)"
+  </dest>
+  <voice>
+    *: "Quick (игнорировать к�ш каталогов)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WPS
+  desc: in Settings
+  user: core
+  <source>
+    *: "What's Playing Screen"
+  </source>
+  <dest>
+    *: "Что прои�ходит на �кране во�произведени�"
+  </dest>
+  <voice>
+    *: "Что прои�ходит на �кране во�произведени�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEFAULT_BROWSER
+  desc: in Settings
+  user: core
+  <source>
+    *: "Default Browser"
+  </source>
+  <dest>
+    *: "Браузер по умолчанию"
+  </dest>
+  <voice>
+    *: "Браузер по умолчанию"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AMAZE_MENU
+  desc: Amaze game
+  user: core
+  <source>
+    *: "Amaze Main Menu"
+  </source>
+  <dest>
+    *: "Главное меню Amaze"
+  </dest>
+  <voice>
+    *: "Главное меню Amaze"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_MAZE_SIZE
+  desc: Maze size in Amaze game
+  user: core
+  <source>
+    *: "Set Maze Size"
+  </source>
+  <dest>
+    *: "У�тановить размер  Maze "
+  </dest>
+  <voice>
+    *: "У�тановить размер  Maze "
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIEW_MAP
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "View Map"
+  </source>
+  <dest>
+    *: "По�мотреть карту"
+  </dest>
+  <voice>
+    *: "По�мотреть карту"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_COMPASS
+  desc: Compass in Amaze game
+  user: core
+  <source>
+    *: "Show Compass"
+  </source>
+  <dest>
+    *: "Показать компа�"
+  </dest>
+  <voice>
+    *: "Показать компа�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_MAP
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Show Map"
+  </source>
+  <dest>
+    *: "Показать карту"
+  </dest>
+  <voice>
+    *: "Показать карту"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMEMBER_PATH
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Remember Path"
+  </source>
+  <dest>
+    *: "Запомнить путь"
+  </dest>
+  <voice>
+    *: "Запомнить путь"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_LARGE_TILES
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Use Large Tiles"
+  </source>
+  <dest>
+    *: "И�пользуйте большие  Tiles"
+  </dest>
+  <voice>
+    *: "И�пользуйте большие Tiles"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SOLUTION
+  desc: Map in Amaze game
+  user: core
+  <source>
+    *: "Show Solution"
+  </source>
+  <dest>
+    *: "Показать решение"
+  </dest>
+  <voice>
+    *: "Показать решение"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUIT_WITHOUT_SAVING
+  desc:
+  user: core
+  <source>
+    *: "Quit without saving"
+  </source>
+  <dest>
+    *: "Выйти без �охранени�"
+  </dest>
+  <voice>
+    *: "Выйти без �охранени�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GENERATING_MAZE
+  desc: Amaze game
+  user: core
+  <source>
+    *: "Generating maze..."
+  </source>
+  <dest>
+    *: "Создать лабиринт"
+  </dest>
+  <voice>
+    *: "Создать лабиринт"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YOU_WIN
+  desc: Success in game
+  user: core
+  <source>
+    *: "You win!"
+  </source>
+  <dest>
+    *: "Ты победил"
+  </dest>
+  <voice>
+    *: "Ты победил"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YOU_CHEATED
+  desc: Cheated in game
+  user: core
+  <source>
+    *: "You cheated!"
+  </source>
+  <dest>
+    *: "Ты обманул"
+  </dest>
+  <voice>
+    *: "Ты обманул"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_EASY
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Easy"
+  </source>
+  <dest>
+    *: "Легкий"
+  </dest>
+  <voice>
+    *: "Легкий"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_MEDIUM
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Medium"
+  </source>
+  <dest>
+    *: "Средний"
+  </dest>
+  <voice>
+    *: "Средний"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_HARD
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Hard"
+  </source>
+  <dest>
+    *: "Сложный"
+  </dest>
+  <voice>
+    *: "Сложный"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFICULTY_EXPERT
+  desc: Game difficulty
+  user: core
+  <source>
+    *: "Expert"
+  </source>
+  <dest>
+    *: "Эк�перт"
+  </dest>
+  <voice>
+    *: "Эк�перт"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STEREOSW_MODE
+  desc: Stereo Switch Mode
+  user: core
+  <source>
+    *: "Stereo Switch Mode"
+  </source>
+  <dest>
+    *: "Режим переключени� �терео"
+  </dest>
+  <voice>
+    *: "Режим переключени� �терео"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERSE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Reverse"
+  </source>
+  <dest>
+    *: "Обратный / Обратна� �торона"
+  </dest>
+  <voice>
+    *: "Обратный / Обратна� �торона"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ZERO
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Always 0"
+  </source>
+  <dest>
+    *: "В�егда 0"
+  </dest>
+  <voice>
+    *: "В�егда 0"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ONE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Always 1"
+  </source>
+  <dest>
+    *: "В�егда 1"
+  </dest>
+  <voice>
+    *: "В�егда 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEGAL_NOTICES
+  desc: in system menu
+  user: core
+  <source>
+    *: "Legal Notices"
+  </source>
+  <dest>
+    *: "официальное уведомление"
+  </dest>
+  <voice>
+    *: "официальное уведомление"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ERROR_FORMATSTR
+  desc: for general use
+  user: core
+  <source>
+    *: "Error: %s"
+  </source>
+  <dest>
+    *: "Ошибка: %s"
+  </dest>
+  <voice>
+    *: "Ошибка"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SETTINGS
+  desc: mikmod plugin
+  user: core
+  <source>
+    *: "Mikmod Settings"
+  </source>
+  <dest>
+    *: "Mikmod �а�тройки"
+  </dest>
+  <voice>
+    *: "Mik mod �а�тройки"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_MENU
+  desc: mikmod plugin
+  user: core
+  <source>
+    *: "Mikmod Menu"
+  </source>
+  <dest>
+    *: "Mikmod Меню"
+  </dest>
+  <voice>
+    *: "Mik mod Меню"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU
+  desc: chessbox plugin
+  user: core
+  <source>
+    *: "Chessbox Menu"
+  </source>
+  <dest>
+    *: "Шахматы меню"
+  </dest>
+  <voice>
+    *: "Шахматы меню"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_INVALID_VOICE_FILE
+  desc: played if the voice file fails to load
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�едопу�тимый голо�овой файл"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PERCENT_FORMAT
+  desc: percent formatting ( `10%` is default ,  for `10 %` use '%ld %%' , for `%10` use '%%%ld' and so on)
+  user: core
+  <source>
+    *: "%ld%%"
+  </source>
+  <dest>
+    *: "~%ld%%"
+  </dest>
+  <voice>
+    *: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHOOSE_FILE
+  desc: file_picker plugin ask user to select a file
+  user: core
+  <source>
+    *: "Choose File"
+  </source>
+  <dest>
+    *: "Выберите файл"
+  </dest>
+  <voice>
+    *: "Выберите файл"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
+  user: core
+  <source>
+    *: "Disable main menu scrolling"
+  </source>
+  <dest>
+    *: "Отключить прокрутку главного меню"
+  </dest>
+  <voice>
+    *: "Отключить прокрутку главного меню"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMAINING
+  desc: Playing Time
+  user: core
+  <source>
+    *: "Remaining"
+  </source>
+  <dest>
+    *: "О�тавший��"
+  </dest>
+  <voice>
+    *: "О�тавший��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLEALBUM_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title & Album from ID3 tags"
+  </source>
+  <dest>
+    *: "�азвание и альбом по тегам ID3"
+  </dest>
+  <voice>
+    *: "�азвание и альбом по тегам"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_TITLE_FROMTAGS
+  desc: track display options
+  user: core
+  <source>
+    *: "Title from ID3 tags"
+  </source>
+  <dest>
+    *: "�азвание из ID3-тегов"
+  </dest>
+  <voice>
+    *: "�азвание из тегов"
+  </voice>
+</phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index b01f2a38dc..7f68a0c5f0 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -471,10 +471,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Neobnoviť>"
+    *: "[Neobnoviť]"
   </dest>
   <voice>
     *: "Neobnoviť"
@@ -499,10 +499,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Neplatná Záložka>"
+    *: "[Neplatná Záložka]"
   </dest>
   <voice>
     *: "Neplatná Záložka"
@@ -2137,13 +2137,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<VÅ¡etky stopy>"
+    *: "[VÅ¡etky stopy]"
   </dest>
   <voice>
     *: "VÅ¡etky stopy"
@@ -6758,10 +6758,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Bez Infa>"
+    *: "[Bez Infa]"
   </dest>
   <voice>
     *: "Bez Infa"
@@ -9454,13 +9454,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Náhodne>"
+    *: "[Náhodne]"
   </dest>
   <voice>
     *: "Náhodne"
@@ -11231,13 +11231,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Netagované>"
+    *: "[Netagované]"
   </dest>
   <voice>
     *: "Netagované"
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index bda482762d..4bab9937c1 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -1895,10 +1895,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Ni podatka>"
+    *: "[Ni podatka]"
   </dest>
   <voice>
     *: "Ni podatka"
@@ -3211,13 +3211,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </dest>
   <voice>
     *: "All tracks"
@@ -5525,13 +5525,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Random>"
+    *: "[Random]"
   </dest>
   <voice>
     *: "Random"
@@ -7194,13 +7194,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </dest>
   <voice>
     *: "Untagged"
@@ -9558,10 +9558,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </dest>
   <voice>
     *: "Do not resume"
@@ -10258,10 +10258,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </dest>
   <voice>
     *: "Invalid Bookmark"
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index da940e8311..be75e05ed5 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -471,10 +471,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<�емој да на�тавиш>"
+    *: "[�емој да на�тавиш]"
   </dest>
   <voice>
     *: "�емој да на�тавиш"
@@ -499,10 +499,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<�еи�праван маркер>"
+    *: "[�еи�праван маркер]"
   </dest>
   <voice>
     *: "�еи�праван маркер"
@@ -2120,13 +2120,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Све нумере>"
+    *: "[Све нумере]"
   </dest>
   <voice>
     *: "Све нумере"
@@ -6742,10 +6742,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<�ема инфо>"
+    *: "[�ема инфо]"
   </dest>
   <voice>
     *: "�ема инфо"
@@ -9438,13 +9438,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<�а�умично>"
+    *: "[�а�умично]"
   </dest>
   <voice>
     *: "�а�умично"
@@ -11197,13 +11197,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<�еобележенo>"
+    *: "[�еобележенo]"
   </dest>
   <voice>
     *: "�еобележенo"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 523b363e98..8b28a79815 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -484,10 +484,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Ã…teruppta inte>"
+    *: "[Ã…teruppta inte]"
   </dest>
   <voice>
     *: "Ã…teruppta inte"
@@ -512,10 +512,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Felaktigt bokmärke>"
+    *: "[Felaktigt bokmärke]"
   </dest>
   <voice>
     *: "Felaktigt bokmärke"
@@ -2305,13 +2305,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alla spår>"
+    *: "[Alla spår]"
   </dest>
   <voice>
     *: "Alla spår"
@@ -7153,10 +7153,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Saknas>"
+    *: "[Saknas]"
   </dest>
   <voice>
     *: "Saknas"
@@ -10179,13 +10179,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Slumpvald>"
+    *: "[Slumpvald]"
   </dest>
   <voice>
     *: "Slumpvald"
@@ -12040,13 +12040,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Ej taggad>"
+    *: "[Ej taggad]"
   </dest>
   <voice>
     *: "Ej taggad"
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index b5ccde1ced..a08b3a4d97 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -476,10 +476,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Hindi Tuloy>"
+    *: "[Hindi Tuloy]"
   </dest>
   <voice>
     *: "Hindi Tuloy"
@@ -504,10 +504,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Walang-saysay Bookmark>"
+    *: "[Walang-saysay Bookmark]"
   </dest>
   <voice>
     *: "Walang-saysay Bookmark"
@@ -2296,13 +2296,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Lahat ng landas>"
+    *: "[Lahat ng landas]"
   </dest>
   <voice>
     *: "All tracks"
@@ -6490,10 +6490,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Wala Inpormasyon>"
+    *: "[Wala Inpormasyon]"
   </dest>
   <voice>
     *: "Wala Inpormasyon"
@@ -7194,13 +7194,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Pagkakataon>"
+    *: "[Pagkakataon]"
   </dest>
   <voice>
     *: "Random"
@@ -11701,13 +11701,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </dest>
   <voice>
     *: "Untagged"
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 36aa488496..f37e44dfdb 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -477,10 +477,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<ไม่ต้องเปิดเพลงที่เล่นค้างไว้>"
+    *: "[ไม่ต้องเปิดเพลงที่เล่นค้างไว้]"
   </dest>
   <voice>
     *: "Do not resume"
@@ -505,10 +505,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<บุ๊คมาร์�ไม่ถู�ต้อง>"
+    *: "[บุ๊คมาร์�ไม่ถู�ต้อง]"
   </dest>
   <voice>
     *: "Invalid Bookmark"
@@ -2296,13 +2296,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<เพลงทั้งหมด>"
+    *: "[เพลงทั้งหมด]"
   </dest>
   <voice>
     *: "All tracks"
@@ -7124,10 +7124,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<ไม่มีข้อมูล>"
+    *: "[ไม่มีข้อมูล]"
   </dest>
   <voice>
     *: "ไม่มีข้อมูล"
@@ -10007,13 +10007,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<ทำ�ารสุ่ม>"
+    *: "[ทำ�ารสุ่ม]"
   </dest>
   <voice>
     *: "Random"
@@ -11941,13 +11941,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<ลบป้าย>"
+    *: "[ลบป้าย]"
   </dest>
   <voice>
     *: "Untagged"
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 560c63f5ca..99dea2272f 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -446,10 +446,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Devam etme>"
+    *: "[Devam etme]"
   </dest>
   <voice>
     *: "Devam etme"
@@ -474,10 +474,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Geçersiz Yer imi>"
+    *: "[Geçersiz Yer imi]"
   </dest>
   <voice>
     *: "Geçersiz Yer imi"
@@ -2980,13 +2980,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Rastgele>"
+    *: "[Rastgele]"
   </dest>
   <voice>
     *: "Rastgele"
@@ -8017,16 +8017,16 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<EtiketlenmemiÅŸ>"
+    *: "[EtiketlenmemiÅŸ]"
   </dest>
   <voice>
-    *: "<EtiketlenmemiÅŸ>"
+    *: "[EtiketlenmemiÅŸ]"
   </voice>
 </phrase>
 <phrase>
@@ -8304,10 +8304,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Bilgi Yok>"
+    *: "[Bilgi Yok]"
   </dest>
   <voice>
     *: "Bilgi yok"
@@ -10335,13 +10335,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Tüm parçalar>"
+    *: "[Tüm parçalar]"
   </dest>
   <voice>
     *: "Tüm parçalar"
diff --git a/apps/lang/ukrainian.lang b/apps/lang/ukrainian.lang
index 91603a03c0..595224ac8e 100644
--- a/apps/lang/ukrainian.lang
+++ b/apps/lang/ukrainian.lang
@@ -476,10 +476,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<�е Продовжувати>"
+    *: "[�е Продовжувати]"
   </dest>
   <voice>
     *: "�е Продовжувати"
@@ -504,10 +504,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Помилкова Закладка>"
+    *: "[Помилкова Закладка]"
   </dest>
   <voice>
     *: "Помилкова Закладка"
@@ -2297,13 +2297,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<В�i треки>"
+    *: "[В�i треки]"
   </dest>
   <voice>
     *: "В�i треки"
@@ -7143,10 +7143,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Iнформацi� вiд�утн�>"
+    *: "[Iнформацi� вiд�утн�]"
   </dest>
   <voice>
     *: "Iнформацi� вiд�утн�"
@@ -10169,13 +10169,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Випадково>"
+    *: "[Випадково]"
   </dest>
   <voice>
     *: "Випадково"
@@ -11835,13 +11835,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<�е тегований>"
+    *: "[�е тегований]"
   </dest>
   <voice>
     *: "�е тегований"
diff --git a/apps/lang/vlaams.lang b/apps/lang/vlaams.lang
index de5ea8778e..6b93febd88 100644
--- a/apps/lang/vlaams.lang
+++ b/apps/lang/vlaams.lang
@@ -4866,10 +4866,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<geen info>"
+    *: "[geen info]"
   </dest>
   <voice>
     *: "Geen info"
@@ -7368,13 +7368,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Alle nummers>"
+    *: "[Alle nummers]"
   </dest>
   <voice>
     *: "Alle nummers"
@@ -8962,10 +8962,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Niet hervatten>"
+    *: "[Niet hervatten]"
   </dest>
   <voice>
     *: "Niet hervatten"
@@ -9049,10 +9049,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Ongeldigen bladwijzer>"
+    *: "[Ongeldigen bladwijzer]"
   </dest>
   <voice>
     *: "Ongeldigen bladwijzer"
@@ -10133,13 +10133,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<Willekeurig>"
+    *: "[Willekeurig]"
   </dest>
   <voice>
     *: "Willekeurig"
@@ -11875,13 +11875,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_UNTAGGED
-  desc: "<untagged>" entry in tag browser
+  desc: "[untagged]" entry in tag browser
   user: core
   <source>
-    *: "<Untagged>"
+    *: "[Untagged]"
   </source>
   <dest>
-    *: "<Geen tags>"
+    *: "[Geen tags]"
   </dest>
   <voice>
     *: "Geen tags"
diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index c58e61aafd..6317342ec7 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -2849,10 +2849,10 @@
   desc: ID3 info is missing
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<kei Info>"
+    *: "[kei Info]"
   </dest>
   <voice>
     *: "kei Info"
diff --git a/apps/lang/walon.lang b/apps/lang/walon.lang
index 82ed676828..fcd3477761 100644
--- a/apps/lang/walon.lang
+++ b/apps/lang/walon.lang
@@ -480,10 +480,10 @@
   desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "[Don't Resume]"
   </source>
   <dest>
-    *: "<Nén rataker>"
+    *: "[Nén rataker]"
   </dest>
   <voice>
     *: "Nén rataker"
@@ -508,10 +508,10 @@
   desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "[Invalid Bookmark]"
   </source>
   <dest>
-    *: "<Rimåke nén valåbe>"
+    *: "[Rimåke nén valåbe]"
   </dest>
   <voice>
     *: "Rimåke nén valåbe"
@@ -2316,13 +2316,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  desc: "[All tracks]" entry in tag browser
   user: core
   <source>
-    *: "<All tracks>"
+    *: "[All tracks]"
   </source>
   <dest>
-    *: "<Tos les bokets>"
+    *: "[Tos les bokets]"
   </dest>
   <voice>
     *: "Tos les bokets"
@@ -7162,10 +7162,10 @@
   desc: in tag viewer
   user: core
   <source>
-    *: "<No Info>"
+    *: "[No Info]"
   </source>
   <dest>
-    *: "<Nole infô.>"
+    *: "[Nole infô.]"
   </dest>
   <voice>
     *: "Nole infô."
@@ -10188,13 +10188,13 @@
 </phrase>
 <phrase>
   id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  desc: "[Random]" entry in tag browser
   user: core
   <source>
-    *: "<Random>"
+    *: "[Random]"
   </source>
   <dest>
-    *: "<D'astcheyance>"
+    *: "[D'astcheyance]"
   </dest>
   <voice>
     *: "astcheyance"
diff --git a/apps/main.c b/apps/main.c
index 4c7689ce8c..1e8e872296 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -78,6 +78,10 @@
 #include "bootchart.h"
 #include "logdiskf.h"
 #include "bootdata.h"
+#if defined(HAVE_DEVICEDATA)
+#include "devicedata.h"
+#endif
+
 #if (CONFIG_PLATFORM & PLATFORM_ANDROID)
 #include "notification.h"
 #endif
@@ -176,6 +180,9 @@ int main(void)
     }
     list_init();
     tree_init();
+#if defined(HAVE_DEVICEDATA) && !defined(BOOTLOADER) /* SIMULATOR */
+    verify_device_data();
+#endif
     /* Keep the order of this 3
      * Must be done before any code uses the multi-screen API */
 #ifdef HAVE_USBSTACK
@@ -459,6 +466,10 @@ static void init(void)
     verify_boot_data();
 #endif
 
+#if defined(HAVE_DEVICEDATA) && !defined(BOOTLOADER)
+    verify_device_data();
+#endif
+
     /* early early early! */
     filesystem_init();
 
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index c5c5e6d908..2ce566a888 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -331,6 +331,7 @@ MENUITEM_SETTING(list_accel_start_delay,
 MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL);
 #endif /* HAVE_WHEEL_ACCELERATION */
 MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, NULL);
+MENUITEM_SETTING(disable_mainmenu_scrolling, &global_settings.disable_mainmenu_scrolling, NULL);
 MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL);
 MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL);
 MENUITEM_SETTING(list_wraparound, &global_settings.list_wraparound, NULL);
@@ -343,7 +344,9 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON,
 #ifdef HAVE_REMOTE_LCD
           &remote_scroll_sets,
 #endif
-          &offset_out_of_view, &screen_scroll_step,
+          &offset_out_of_view,
+          &disable_mainmenu_scrolling,
+          &screen_scroll_step,
           &scroll_paginated,
           &list_wraparound,
           &list_order,
diff --git a/apps/onplay.c b/apps/onplay.c
index 4f748204df..ab507f08ac 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -302,7 +302,7 @@ static int add_to_playlist(void* arg)
 
     /* warn if replacing the playlist */
     if (new_playlist && !warn_on_pl_erase())
-        return 0;
+        return 1;
 
     splash(0, ID2P(LANG_WAIT));
 
@@ -340,7 +340,7 @@ static int add_to_playlist(void* arg)
     }
 
     playlist_set_modified(NULL, true);
-    return false;
+    return 0;
 }
 
 static bool view_playlist(void)
@@ -1255,7 +1255,7 @@ static int execute_hotkey(bool is_wps)
 }
 #endif /* HOTKEY */
 
-int onplay(char* file, int attr, int from_context, bool hotkey)
+int onplay(char* file, int attr, int from_context, bool hotkey, int customaction)
 {
     const struct menu_item_ex *menu;
     onplay_result = ONPLAY_OK;
@@ -1294,6 +1294,14 @@ int onplay(char* file, int attr, int from_context, bool hotkey)
 #else
     (void)hotkey;
 #endif
+    if (customaction == ONPLAY_CUSTOMACTION_SHUFFLE_SONGS)
+    {
+        int returnCode = add_to_playlist(&addtopl_replace_shuffled);
+        if (returnCode == 1)
+            // User did not want to erase his current playlist, so let's show again the database main menu
+            return ONPLAY_RELOAD_DIR;
+        return ONPLAY_START_PLAY;
+    }
 
     push_current_activity(ACTIVITY_CONTEXTMENU);
     if (from_context == CONTEXT_WPS)
diff --git a/apps/onplay.h b/apps/onplay.h
index 74dc045db3..03861e9cf6 100644
--- a/apps/onplay.h
+++ b/apps/onplay.h
@@ -25,7 +25,12 @@
 #include "menu.h"
 #endif
 
-int onplay(char* file, int attr, int from_context, bool hotkey);
+enum {
+    ONPLAY_NO_CUSTOMACTION,
+    ONPLAY_CUSTOMACTION_SHUFFLE_SONGS,
+};
+
+int onplay(char* file, int attr, int from_context, bool hotkey, int customaction);
 int get_onplay_context(void);
 
 enum {
diff --git a/apps/playlist.h b/apps/playlist.h
index f7426df9a3..2fb1ce100e 100644
--- a/apps/playlist.h
+++ b/apps/playlist.h
@@ -33,6 +33,8 @@
 #define PLAYLIST_ATTR_QUEUED    0x01
 #define PLAYLIST_ATTR_INSERTED  0x02
 #define PLAYLIST_ATTR_SKIPPED   0x04
+#define PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED   0x08
+#define PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED   0x10
 
 #define PLAYLIST_DISPLAY_COUNT  10
 
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index 70072f59f5..d556f3b557 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -50,6 +50,7 @@
 #include "playlist_menu.h"
 #include "menus/exported_menus.h"
 #include "yesno.h"
+#include "playback.h"
 
 /* Maximum number of tracks we can have loaded at one time */
 #define MAX_PLAYLIST_ENTRIES 200
@@ -142,7 +143,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer,
                                  const char* filename, bool reload,
                                  int *most_recent_selection);
 
-static void format_line(const struct playlist_entry* track, char* str,
+static void format_line(struct playlist_entry* track, char* str,
                         int len);
 
 static bool update_playlist(bool force);
@@ -159,6 +160,27 @@ static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer,
     pb->num_loaded = 0;
 }
 
+static int playlist_buffer_get_index(struct playlist_buffer *pb, int index)
+{
+    int buffer_index;
+    if (pb->direction == FORWARD)
+    {
+        if (index >= pb->first_index)
+            buffer_index = index-pb->first_index;
+        else /* rotation : track0 in buffer + requested track */
+            buffer_index = viewer.num_tracks-pb->first_index+index;
+    }
+    else
+    {
+        if (index <= pb->first_index)
+            buffer_index = pb->first_index-index;
+        else /* rotation : track0 in buffer + dist from the last track
+                to the requested track (num_tracks-requested track) */
+            buffer_index = pb->first_index+viewer.num_tracks-index;
+    }
+    return buffer_index;
+}
+
 /*
  * Loads the entries following 'index' in the playlist buffer
  */
@@ -227,6 +249,25 @@ static void playlist_buffer_load_entries_screen(struct playlist_buffer * pb,
     playlist_buffer_load_entries(pb, start, direction);
 }
 
+static bool retrieve_id3_tags(const int index, const char* name, struct mp3entry *id3, int flags)
+{
+    bool id3_retrieval_successful = false;
+
+    if (!viewer.playlist &&
+        (audio_status() & AUDIO_STATUS_PLAY) &&
+        (playlist_get_resume_info(&viewer.current_playing_track) == index))
+    {
+        copy_mp3entry(id3, audio_current_track()); /* retrieve id3 from RAM */
+        id3_retrieval_successful = true;
+    }
+    else
+    {
+    /* Read from disk, the database, doesn't store frequency, file size or codec (g4470) ChrisS*/
+        id3_retrieval_successful = get_metadata_ex(id3, -1, name, flags);
+    }
+    return id3_retrieval_successful;
+}
+
 static int playlist_entry_load(struct playlist_entry *entry, int index,
                                char* name_buffer, int remaining_size)
 {
@@ -242,6 +283,13 @@ static int playlist_entry_load(struct playlist_entry *entry, int index,
 
     len = strlcpy(name_buffer, info.filename, remaining_size) + 1;
 
+    if (global_settings.playlist_viewer_track_display >
+        PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH && len <= remaining_size)
+    {
+        /* Allocate space for the id3viewc if the option is enabled */
+        len += MAX_PATH + 1;
+    }
+
     if (len <= remaining_size)
     {
         entry->name = name_buffer;
@@ -253,27 +301,6 @@ static int playlist_entry_load(struct playlist_entry *entry, int index,
     return -1;
 }
 
-static int playlist_buffer_get_index(struct playlist_buffer *pb, int index)
-{
-    int buffer_index;
-    if (pb->direction == FORWARD)
-    {
-        if (index >= pb->first_index)
-            buffer_index = index-pb->first_index;
-        else /* rotation : track0 in buffer + requested track */
-            buffer_index = viewer.num_tracks-pb->first_index+index;
-    }
-    else
-    {
-        if (index <= pb->first_index)
-            buffer_index = pb->first_index-index;
-        else /* rotation : track0 in buffer + dist from the last track
-                to the requested track (num_tracks-requested track) */
-            buffer_index = pb->first_index+viewer.num_tracks-index;
-    }
-    return buffer_index;
-}
-
 #define distance(a, b) \
     a>b? (a) - (b) : (b) - (a)
 static bool playlist_buffer_needs_reload(struct playlist_buffer* pb,
@@ -440,7 +467,9 @@ static void format_name(char* dest, const char* src, size_t bufsz)
 {
     switch (global_settings.playlist_viewer_track_display)
     {
-        case 0:
+        case PLAYLIST_VIEWER_ENTRY_SHOW_FILE_NAME:
+        case PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM: /* If loading from tags failed, only display the file name */
+        case PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE: /* If loading from tags failed, only display the file name */
         default:
         {
             /* Only display the filename */
@@ -450,7 +479,7 @@ static void format_name(char* dest, const char* src, size_t bufsz)
             strrsplt(dest, '.');
             break;
         }
-        case 1:
+        case PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH:
             /* Full path */
             strlcpy(dest, src, bufsz);
             break;
@@ -458,22 +487,99 @@ static void format_name(char* dest, const char* src, size_t bufsz)
 }
 
 /* Format display line */
-static void format_line(const struct playlist_entry* track, char* str,
+static void format_line(struct playlist_entry* track, char* str,
                         int len)
 {
-    char name[MAX_PATH];
+    char *id3viewc = NULL;
     char *skipped = "";
-    format_name(name, track->name, sizeof(name));
-
     if (track->attr & PLAYLIST_ATTR_SKIPPED)
         skipped = "(ERR) ";
-
-    if (global_settings.playlist_viewer_indices)
-        /* Display playlist index */
-        snprintf(str, len, "%d. %s%s", track->display_index, skipped, name);
+    if (!(track->attr & PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED) &&
+        (global_settings.playlist_viewer_track_display ==
+            PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM ||
+        global_settings.playlist_viewer_track_display ==
+            PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE
+    ))
+    {
+        track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_ATTEMPTED;
+        struct mp3entry id3;
+        bool retrieve_success = retrieve_id3_tags(track->index, track->name,
+                                            &id3, METADATA_EXCLUDE_ID3_PATH);
+        if (retrieve_success)
+        {
+            if (!id3viewc)
+            {
+                id3viewc = track->name + strlen(track->name) + 1;
+            }
+            struct mp3entry * pid3 = &id3;
+            id3viewc[0] = '\0';
+            if (global_settings.playlist_viewer_track_display ==
+                PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM)
+            {
+                /* Title & Album */
+                if (pid3->title && pid3->title[0] != '\0')
+                {
+                    char* cur_str = id3viewc;
+                    int title_len = strlen(pid3->title);
+                    int rem_space = MAX_PATH;
+                    for (int i = 0; i < title_len && rem_space > 0; i++)
+                    {
+                        cur_str[0] = pid3->title[i];
+                        cur_str++;
+                        rem_space--;
+                    }
+                    if (rem_space > 10)
+                    {
+                        cur_str[0] = (char) ' ';
+                        cur_str[1] = (char) '-';
+                        cur_str[2] = (char) ' ';
+                        cur_str += 3;
+                        rem_space -= 3;
+                        cur_str = strmemccpy(cur_str, pid3->album && pid3->album[0] != '\0' ?
+                            pid3->album : (char*) str(LANG_TAGNAVI_UNTAGGED), rem_space);
+                        if (cur_str)
+                            track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED;
+                    }
+                }
+            }
+            else if (global_settings.playlist_viewer_track_display ==
+                PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE)
+            {
+                /* Just the title */
+                if (pid3->title && pid3->title[0] != '\0' &&
+                    strmemccpy(id3viewc, pid3->title, MAX_PATH)
+                )
+                    track->attr |= PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED;
+            }
+            /* Yield to reduce as much as possible the perceived UI lag, 
+            because retrieving id3 tags is an expensive operation */
+            yield();
+        }
+    }
+    
+    if (!(track->attr & PLAYLIST_ATTR_RETRIEVE_ID3_SUCCEEDED))
+    {
+        /* Simply use a formatted file name */
+        char name[MAX_PATH];
+        format_name(name, track->name, sizeof(name));
+        if (global_settings.playlist_viewer_indices)
+            /* Display playlist index */
+            snprintf(str, len, "%d. %s%s", track->display_index, skipped, name);
+        else
+            snprintf(str, len, "%s%s", skipped, name);
+    }
     else
-        snprintf(str, len, "%s%s", skipped, name);
-
+    {
+        if (!id3viewc)
+        {
+            id3viewc = track->name + strlen(track->name) + 1;
+        }
+        if (global_settings.playlist_viewer_indices)
+            /* Display playlist index */
+            snprintf(str, len, "%d. %s%s", track->display_index, skipped, id3viewc);
+        else
+            snprintf(str, len, "%s%s", skipped, id3viewc);
+    }
 }
 
 /* Update playlist in case something has changed or forced */
@@ -512,20 +618,7 @@ static bool update_playlist(bool force)
 static enum pv_onplay_result show_track_info(const struct playlist_entry *current_track)
 {
     struct mp3entry id3;
-    bool id3_retrieval_successful = false;
-
-    if (!viewer.playlist &&
-        (audio_status() & AUDIO_STATUS_PLAY) &&
-        (playlist_get_resume_info(&viewer.current_playing_track) == current_track->index))
-    {
-        copy_mp3entry(&id3, audio_current_track()); /* retrieve id3 from RAM */
-        id3_retrieval_successful = true;
-    }
-    else
-    {
-    /* Read from disk, the database, doesn't store frequency, file size or codec (g4470) ChrisS*/
-        id3_retrieval_successful = get_metadata(&id3, -1, current_track->name);
-    }
+    bool id3_retrieval_successful = retrieve_id3_tags(current_track->index, current_track->name, &id3, 0);
 
     return id3_retrieval_successful &&
             browse_id3_ex(&id3, viewer.playlist, current_track->display_index,
@@ -790,11 +883,17 @@ static int playlist_callback_voice(int selected_item, void *data)
 
     switch(global_settings.playlist_viewer_track_display)
     {
-        case 1: /*full path*/
+        case PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH:
+            /*full path*/
             talk_fullpath(track->name, true);
             break;
         default:
-        case 0: /*filename only*/
+        case PLAYLIST_VIEWER_ENTRY_SHOW_FILE_NAME:
+            /*filename only*/
+        case PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM:
+            /* If loading from tags failed, only talk the file name */
+        case PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE:
+            /* If loading from tags failed, only talk the file name */
             talk_file_or_spell(NULL, track->name, NULL, true);
             break;
     }
@@ -1107,7 +1206,7 @@ enum playlist_viewer_result playlist_viewer_ex(const char* filename,
                     }
                 }
                 else
-                    onplay(current_track->name, FILE_ATTR_AUDIO, CONTEXT_STD, true);
+                    onplay(current_track->name, FILE_ATTR_AUDIO, CONTEXT_STD, true, ONPLAY_NO_CUSTOMACTION);
                 break;
             }
 #endif /* HAVE_HOTKEY */
@@ -1154,7 +1253,8 @@ static int say_search_item(int selected_item, void *data)
 {
     struct playlist_search_data *s_data = data;
     playlist_get_track_info(viewer.playlist, s_data->found_indicies[selected_item], s_data->track);
-    if(global_settings.playlist_viewer_track_display == 1) /* full path*/
+    if(global_settings.playlist_viewer_track_display == PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH)
+        /* full path*/
         talk_fullpath(s_data->track->filename, false);
     else talk_file_or_spell(NULL, s_data->track->filename, NULL, false);
     return 0;
@@ -1197,7 +1297,8 @@ bool search_playlist(void)
 
         playlist_get_track_info(viewer.playlist, i, &track);
         const char *trackname = track.filename;
-        if (track_display == 0) /* if we only display filename only search filename */
+        if (track_display != PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH)
+            /* if we only display filename only search filename */
             trackname = strrchr(track.filename, '/');
 
         if (trackname && strcasestr(trackname, search_str))
diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make
index c85182880b..a5d1813a8b 100644
--- a/apps/plugins/lua/lua.make
+++ b/apps/plugins/lua/lua.make
@@ -40,7 +40,7 @@ $(LUA_BUILDDIR)/settings.lua: $(LUA_OBJ) $(LUA_SRCDIR)/settings_helper.pl
 
 HOST_INCLUDES := $(filter-out %/libc/include,$(INCLUDES))
 $(LUA_BUILDDIR)/buttons.lua: $(LUA_OBJ) $(LUA_SRCDIR)/button_helper.pl
-        $(SILENT)$(CC) $(INCLUDES) $(TARGET) $(CFLAGS) -dM -E -P -include button-target.h - < /dev/null | $(LUA_SRCDIR)/button_helper.pl | $(HOSTCC) $(TARGET) -fno-builtin $(HOST_INCLUDES) -x c -o $(LUA_BUILDDIR)/button_helper -
+        $(SILENT)$(CC) $(INCLUDES) $(TARGET) $(CFLAGS) -dM -E -P -include button-target.h - < /dev/null | $(LUA_SRCDIR)/button_helper.pl | $(HOSTCC) $(TARGET) -fno-builtin $(HOST_INCLUDES) $(EXTRA_DEFINES) -x c -o $(LUA_BUILDDIR)/button_helper -
         $(call PRINTS,GEN $(@F))$(LUA_BUILDDIR)/button_helper > $(LUA_BUILDDIR)/buttons.lua
 
 $(LUA_BUILDDIR)/rb_defines.lua: $(LUA_OBJ) $(LUA_SRCDIR)/rbdefines_helper.pl
diff --git a/apps/plugins/puzzles/SOURCES b/apps/plugins/puzzles/SOURCES
index f0d2ed27f7..dfbd184ba2 100644
--- a/apps/plugins/puzzles/SOURCES
+++ b/apps/plugins/puzzles/SOURCES
@@ -3,6 +3,7 @@ rockbox.c
 rbwrappers.c
 rbmalloc.c
 lz4tiny.c
+dummy/nullhelp.c
 
 /* puzzles core sources */
 src/combi.c
diff --git a/apps/plugins/puzzles/SOURCES.games b/apps/plugins/puzzles/SOURCES.games
index 190412295b..70f34f3334 100644
--- a/apps/plugins/puzzles/SOURCES.games
+++ b/apps/plugins/puzzles/SOURCES.games
@@ -35,13 +35,8 @@ src/undead.c
 src/unequal.c
 src/unruly.c
 src/untangle.c
-
-/* Disabled for now. Fix puzzles.make and CATEGORIES to accomodate these. */
-/* The help system would also need to be patched to compile these. */
-/*src/unfinished/group.c*/
-/*src/unfinished/separate.c*/
-/*src/unfinished/slide.c*/
-/*src/unfinished/sokoban.c*/
+src/unfinished/slide.c
+src/unfinished/sokoban.c
 
 /* no c200v2 */
 #if PLUGIN_BUFFER_SIZE > 0x14000
diff --git a/apps/plugins/puzzles/SOURCES.rockbox b/apps/plugins/puzzles/SOURCES.rockbox
index c5bbb9af70..61ce4275ff 100644
--- a/apps/plugins/puzzles/SOURCES.rockbox
+++ b/apps/plugins/puzzles/SOURCES.rockbox
@@ -2,3 +2,4 @@ rockbox.c
 rbwrappers.c
 rbmalloc.c
 lz4tiny.c
+dummy/nullhelp.c
diff --git a/apps/plugins/puzzles/compress.c b/apps/plugins/puzzles/compress.c
index 127a02bf0d..d127a9af17 100644
--- a/apps/plugins/puzzles/compress.c
+++ b/apps/plugins/puzzles/compress.c
@@ -158,6 +158,7 @@ int main()
     printf("};\n\n");
     printf("const unsigned short help_text_len = %d;\n", help_text_len);
     printf("const unsigned short help_text_words = %d;\n", word_idx);
+    printf("const bool help_valid = true;\n");
 
     return 0;
 }
diff --git a/apps/plugins/puzzles/dummy/nullhelp.c b/apps/plugins/puzzles/dummy/nullhelp.c
new file mode 100644
index 0000000000..79c36c902b
--- /dev/null
+++ b/apps/plugins/puzzles/dummy/nullhelp.c
@@ -0,0 +1,8 @@
+#include "help.h"
+
+const char help_text[] __attribute__((weak)) = "";
+const char quick_help_text[] __attribute__((weak)) = "";
+const unsigned short help_text_len __attribute__((weak)) = 0, quick_help_text_len __attribute__((weak)) = 0, help_text_words __attribute__((weak)) = 0;
+struct style_text help_text_style[] __attribute__((weak)) = {};
+
+const bool help_valid __attribute__((weak)) = false;
diff --git a/apps/plugins/puzzles/help.h b/apps/plugins/puzzles/help.h
index e9cac9b337..2f870393e8 100644
--- a/apps/plugins/puzzles/help.h
+++ b/apps/plugins/puzzles/help.h
@@ -1,3 +1,5 @@
+#include <stdbool.h>
+
 #ifdef ROCKBOX
 #include "lib/display_text.h"
 #endif
@@ -12,3 +14,5 @@ extern const unsigned short help_text_len, quick_help_text_len, help_text_words;
 #if defined(ROCKBOX)
 extern struct style_text help_text_style[];
 #endif
+
+extern const bool help_valid;
diff --git a/apps/plugins/puzzles/help/blackbox.c b/apps/plugins/puzzles/help/blackbox.c
index c05daf5fd3..90933604c1 100644
--- a/apps/plugins/puzzles/help/blackbox.c
+++ b/apps/plugins/puzzles/help/blackbox.c
@@ -340,4 +340,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 5480;
 const unsigned short help_text_words = 1016;
+const bool help_valid = true;
 const char quick_help_text[] = "Find the hidden balls in the box by bouncing laser beams off them.";
diff --git a/apps/plugins/puzzles/help/bridges.c b/apps/plugins/puzzles/help/bridges.c
index 3e1c91bcc3..4d42314e4b 100644
--- a/apps/plugins/puzzles/help/bridges.c
+++ b/apps/plugins/puzzles/help/bridges.c
@@ -358,4 +358,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 5613;
 const unsigned short help_text_words = 1026;
+const bool help_valid = true;
 const char quick_help_text[] = "Connect all the islands with a network of bridges.";
diff --git a/apps/plugins/puzzles/help/cube.c b/apps/plugins/puzzles/help/cube.c
index fbdd380d57..0e2fc94081 100644
--- a/apps/plugins/puzzles/help/cube.c
+++ b/apps/plugins/puzzles/help/cube.c
@@ -166,4 +166,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2071;
 const unsigned short help_text_words = 386;
+const bool help_valid = true;
 const char quick_help_text[] = "Pick up all the blue squares by rolling the cube over them.";
diff --git a/apps/plugins/puzzles/help/dominosa.c b/apps/plugins/puzzles/help/dominosa.c
index 98947a6ee6..94d876794b 100644
--- a/apps/plugins/puzzles/help/dominosa.c
+++ b/apps/plugins/puzzles/help/dominosa.c
@@ -176,4 +176,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2299;
 const unsigned short help_text_words = 401;
+const bool help_valid = true;
 const char quick_help_text[] = "Tile the rectangle with a full set of dominoes.";
diff --git a/apps/plugins/puzzles/help/fifteen.c b/apps/plugins/puzzles/help/fifteen.c
index 7fc434fc3d..32c8cba399 100644
--- a/apps/plugins/puzzles/help/fifteen.c
+++ b/apps/plugins/puzzles/help/fifteen.c
@@ -152,4 +152,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1927;
 const unsigned short help_text_words = 353;
+const bool help_valid = true;
 const char quick_help_text[] = "Slide the tiles around to arrange them into order.";
diff --git a/apps/plugins/puzzles/help/filling.c b/apps/plugins/puzzles/help/filling.c
index c0fe6f47e1..785cfce815 100644
--- a/apps/plugins/puzzles/help/filling.c
+++ b/apps/plugins/puzzles/help/filling.c
@@ -142,4 +142,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1821;
 const unsigned short help_text_words = 328;
+const bool help_valid = true;
 const char quick_help_text[] = "Mark every square with the area of its containing region.";
diff --git a/apps/plugins/puzzles/help/flip.c b/apps/plugins/puzzles/help/flip.c
index fd287cb37b..4f847069cc 100644
--- a/apps/plugins/puzzles/help/flip.c
+++ b/apps/plugins/puzzles/help/flip.c
@@ -131,4 +131,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1539;
 const unsigned short help_text_words = 299;
+const bool help_valid = true;
 const char quick_help_text[] = "Flip groups of squares to light them all up at once.";
diff --git a/apps/plugins/puzzles/help/flood.c b/apps/plugins/puzzles/help/flood.c
index 28e18a15a9..ad25a5cf34 100644
--- a/apps/plugins/puzzles/help/flood.c
+++ b/apps/plugins/puzzles/help/flood.c
@@ -182,4 +182,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2395;
 const unsigned short help_text_words = 452;
+const bool help_valid = true;
 const char quick_help_text[] = "Turn the grid the same colour in as few flood fills as possible.";
diff --git a/apps/plugins/puzzles/help/galaxies.c b/apps/plugins/puzzles/help/galaxies.c
index 8482abc14e..10bcda7b3b 100644
--- a/apps/plugins/puzzles/help/galaxies.c
+++ b/apps/plugins/puzzles/help/galaxies.c
@@ -208,4 +208,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2766;
 const unsigned short help_text_words = 498;
+const bool help_valid = true;
 const char quick_help_text[] = "Divide the grid into rotationally symmetric regions each centred on a dot.";
diff --git a/apps/plugins/puzzles/help/guess.c b/apps/plugins/puzzles/help/guess.c
index 594f5910cb..3c77344424 100644
--- a/apps/plugins/puzzles/help/guess.c
+++ b/apps/plugins/puzzles/help/guess.c
@@ -238,4 +238,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3506;
 const unsigned short help_text_words = 650;
+const bool help_valid = true;
 const char quick_help_text[] = "Guess the hidden combination of colours.";
diff --git a/apps/plugins/puzzles/help/inertia.c b/apps/plugins/puzzles/help/inertia.c
index 2755cc2eb6..a0f33a9dc3 100644
--- a/apps/plugins/puzzles/help/inertia.c
+++ b/apps/plugins/puzzles/help/inertia.c
@@ -179,4 +179,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2286;
 const unsigned short help_text_words = 431;
+const bool help_valid = true;
 const char quick_help_text[] = "Collect all the gems without running into any of the mines.";
diff --git a/apps/plugins/puzzles/help/keen.c b/apps/plugins/puzzles/help/keen.c
index bcf5b38a1f..0c69aea0d6 100644
--- a/apps/plugins/puzzles/help/keen.c
+++ b/apps/plugins/puzzles/help/keen.c
@@ -260,4 +260,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3969;
 const unsigned short help_text_words = 762;
+const bool help_valid = true;
 const char quick_help_text[] = "Complete the latin square in accordance with the arithmetic clues.";
diff --git a/apps/plugins/puzzles/help/lightup.c b/apps/plugins/puzzles/help/lightup.c
index c3ddd209fa..c109773bf6 100644
--- a/apps/plugins/puzzles/help/lightup.c
+++ b/apps/plugins/puzzles/help/lightup.c
@@ -191,4 +191,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2549;
 const unsigned short help_text_words = 468;
+const bool help_valid = true;
 const char quick_help_text[] = "Place bulbs to light up all the squares.";
diff --git a/apps/plugins/puzzles/help/loopy.c b/apps/plugins/puzzles/help/loopy.c
index f65d2d2793..76c441511c 100644
--- a/apps/plugins/puzzles/help/loopy.c
+++ b/apps/plugins/puzzles/help/loopy.c
@@ -264,4 +264,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3584;
 const unsigned short help_text_words = 660;
+const bool help_valid = true;
 const char quick_help_text[] = "Draw a single closed loop, given clues about number of adjacent edges.";
diff --git a/apps/plugins/puzzles/help/magnets.c b/apps/plugins/puzzles/help/magnets.c
index 9a54586203..aaaa3bcdad 100644
--- a/apps/plugins/puzzles/help/magnets.c
+++ b/apps/plugins/puzzles/help/magnets.c
@@ -190,4 +190,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2522;
 const unsigned short help_text_words = 439;
+const bool help_valid = true;
 const char quick_help_text[] = "Place magnets to satisfy the clues and avoid like poles touching.";
diff --git a/apps/plugins/puzzles/help/map.c b/apps/plugins/puzzles/help/map.c
index 3532ecebbf..05474e3181 100644
--- a/apps/plugins/puzzles/help/map.c
+++ b/apps/plugins/puzzles/help/map.c
@@ -271,4 +271,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3752;
 const unsigned short help_text_words = 686;
+const bool help_valid = true;
 const char quick_help_text[] = "Colour the map so that adjacent regions are never the same colour.";
diff --git a/apps/plugins/puzzles/help/mines.c b/apps/plugins/puzzles/help/mines.c
index 458034ccaa..80cd81ed3f 100644
--- a/apps/plugins/puzzles/help/mines.c
+++ b/apps/plugins/puzzles/help/mines.c
@@ -260,4 +260,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3814;
 const unsigned short help_text_words = 732;
+const bool help_valid = true;
 const char quick_help_text[] = "Find all the mines without treading on any of them.";
diff --git a/apps/plugins/puzzles/help/mosaic.c b/apps/plugins/puzzles/help/mosaic.c
index 9a7d2dd394..eb0c52c0bf 100644
--- a/apps/plugins/puzzles/help/mosaic.c
+++ b/apps/plugins/puzzles/help/mosaic.c
@@ -147,4 +147,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1673;
 const unsigned short help_text_words = 285;
+const bool help_valid = true;
 const char quick_help_text[] = "Fill in the grid given clues about number of nearby black squares.";
diff --git a/apps/plugins/puzzles/help/net.c b/apps/plugins/puzzles/help/net.c
index 83cd785ed2..de528b53bc 100644
--- a/apps/plugins/puzzles/help/net.c
+++ b/apps/plugins/puzzles/help/net.c
@@ -297,4 +297,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3919;
 const unsigned short help_text_words = 689;
+const bool help_valid = true;
 const char quick_help_text[] = "Rotate each tile to reassemble the network.";
diff --git a/apps/plugins/puzzles/help/netslide.c b/apps/plugins/puzzles/help/netslide.c
index f4067a2303..17ec9ec440 100644
--- a/apps/plugins/puzzles/help/netslide.c
+++ b/apps/plugins/puzzles/help/netslide.c
@@ -58,4 +58,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 546;
 const unsigned short help_text_words = 99;
+const bool help_valid = true;
 const char quick_help_text[] = "Slide a row at a time to reassemble the network.";
diff --git a/apps/plugins/puzzles/help/palisade.c b/apps/plugins/puzzles/help/palisade.c
index d1ee5e7354..36d3c65248 100644
--- a/apps/plugins/puzzles/help/palisade.c
+++ b/apps/plugins/puzzles/help/palisade.c
@@ -140,4 +140,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1672;
 const unsigned short help_text_words = 285;
+const bool help_valid = true;
 const char quick_help_text[] = "Divide the grid into equal-sized areas in accordance with the clues.";
diff --git a/apps/plugins/puzzles/help/pattern.c b/apps/plugins/puzzles/help/pattern.c
index a0e4edc579..fae35c0f64 100644
--- a/apps/plugins/puzzles/help/pattern.c
+++ b/apps/plugins/puzzles/help/pattern.c
@@ -168,4 +168,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2167;
 const unsigned short help_text_words = 389;
+const bool help_valid = true;
 const char quick_help_text[] = "Fill in the pattern in the grid, given only the lengths of runs of black squares.";
diff --git a/apps/plugins/puzzles/help/pearl.c b/apps/plugins/puzzles/help/pearl.c
index efb3cd0d5a..033aca17fa 100644
--- a/apps/plugins/puzzles/help/pearl.c
+++ b/apps/plugins/puzzles/help/pearl.c
@@ -249,4 +249,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3598;
 const unsigned short help_text_words = 659;
+const bool help_valid = true;
 const char quick_help_text[] = "Draw a single closed loop, given clues about corner and straight squares.";
diff --git a/apps/plugins/puzzles/help/pegs.c b/apps/plugins/puzzles/help/pegs.c
index 8375f87bcf..32552a87fd 100644
--- a/apps/plugins/puzzles/help/pegs.c
+++ b/apps/plugins/puzzles/help/pegs.c
@@ -148,4 +148,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1734;
 const unsigned short help_text_words = 326;
+const bool help_valid = true;
 const char quick_help_text[] = "Jump pegs over each other to remove all but one.";
diff --git a/apps/plugins/puzzles/help/range.c b/apps/plugins/puzzles/help/range.c
index d5035ef8d2..65495dc3c1 100644
--- a/apps/plugins/puzzles/help/range.c
+++ b/apps/plugins/puzzles/help/range.c
@@ -170,4 +170,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2223;
 const unsigned short help_text_words = 395;
+const bool help_valid = true;
 const char quick_help_text[] = "Place black squares to limit the visible distance from each numbered cell.";
diff --git a/apps/plugins/puzzles/help/rect.c b/apps/plugins/puzzles/help/rect.c
index bf2197aa47..dfd597eb0f 100644
--- a/apps/plugins/puzzles/help/rect.c
+++ b/apps/plugins/puzzles/help/rect.c
@@ -258,4 +258,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3536;
 const unsigned short help_text_words = 603;
+const bool help_valid = true;
 const char quick_help_text[] = "Divide the grid into rectangles with areas equal to the numbers.";
diff --git a/apps/plugins/puzzles/help/samegame.c b/apps/plugins/puzzles/help/samegame.c
index 3c632fca2b..62589b4f11 100644
--- a/apps/plugins/puzzles/help/samegame.c
+++ b/apps/plugins/puzzles/help/samegame.c
@@ -188,4 +188,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2492;
 const unsigned short help_text_words = 445;
+const bool help_valid = true;
 const char quick_help_text[] = "Clear the grid by removing touching groups of the same colour squares.";
diff --git a/apps/plugins/puzzles/help/signpost.c b/apps/plugins/puzzles/help/signpost.c
index 753a202f3e..34e043da57 100644
--- a/apps/plugins/puzzles/help/signpost.c
+++ b/apps/plugins/puzzles/help/signpost.c
@@ -222,4 +222,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3255;
 const unsigned short help_text_words = 595;
+const bool help_valid = true;
 const char quick_help_text[] = "Connect the squares into a path following the arrows.";
diff --git a/apps/plugins/puzzles/help/singles.c b/apps/plugins/puzzles/help/singles.c
index a906addeb6..9a1771e3c7 100644
--- a/apps/plugins/puzzles/help/singles.c
+++ b/apps/plugins/puzzles/help/singles.c
@@ -149,4 +149,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1780;
 const unsigned short help_text_words = 309;
+const bool help_valid = true;
 const char quick_help_text[] = "Black out the right set of duplicate numbers.";
diff --git a/apps/plugins/puzzles/help/sixteen.c b/apps/plugins/puzzles/help/sixteen.c
index 92e64e29bb..1ba92291f3 100644
--- a/apps/plugins/puzzles/help/sixteen.c
+++ b/apps/plugins/puzzles/help/sixteen.c
@@ -197,4 +197,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2553;
 const unsigned short help_text_words = 454;
+const bool help_valid = true;
 const char quick_help_text[] = "Slide a row at a time to arrange the tiles into order.";
diff --git a/apps/plugins/puzzles/help/slant.c b/apps/plugins/puzzles/help/slant.c
index f51b141827..7c24a1bac3 100644
--- a/apps/plugins/puzzles/help/slant.c
+++ b/apps/plugins/puzzles/help/slant.c
@@ -199,4 +199,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2582;
 const unsigned short help_text_words = 474;
+const bool help_valid = true;
 const char quick_help_text[] = "Draw a maze of slanting lines that matches the clues.";
diff --git a/apps/plugins/puzzles/help/solo.c b/apps/plugins/puzzles/help/solo.c
index cc3d96cf84..68927490e6 100644
--- a/apps/plugins/puzzles/help/solo.c
+++ b/apps/plugins/puzzles/help/solo.c
@@ -383,4 +383,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 6259;
 const unsigned short help_text_words = 1153;
+const bool help_valid = true;
 const char quick_help_text[] = "Fill in the grid so that each row, column and square block contains one of every digit.";
diff --git a/apps/plugins/puzzles/help/tents.c b/apps/plugins/puzzles/help/tents.c
index c486960ec2..8b14490a51 100644
--- a/apps/plugins/puzzles/help/tents.c
+++ b/apps/plugins/puzzles/help/tents.c
@@ -163,4 +163,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2158;
 const unsigned short help_text_words = 401;
+const bool help_valid = true;
 const char quick_help_text[] = "Place a tent next to each tree.";
diff --git a/apps/plugins/puzzles/help/towers.c b/apps/plugins/puzzles/help/towers.c
index 43f1cef5ea..ff5a0a495a 100644
--- a/apps/plugins/puzzles/help/towers.c
+++ b/apps/plugins/puzzles/help/towers.c
@@ -263,4 +263,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3906;
 const unsigned short help_text_words = 732;
+const bool help_valid = true;
 const char quick_help_text[] = "Complete the latin square of towers in accordance with the clues.";
diff --git a/apps/plugins/puzzles/help/tracks.c b/apps/plugins/puzzles/help/tracks.c
index c088145a09..f3677352b5 100644
--- a/apps/plugins/puzzles/help/tracks.c
+++ b/apps/plugins/puzzles/help/tracks.c
@@ -150,4 +150,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1881;
 const unsigned short help_text_words = 337;
+const bool help_valid = true;
 const char quick_help_text[] = "Fill in the railway track according to the clues.";
diff --git a/apps/plugins/puzzles/help/twiddle.c b/apps/plugins/puzzles/help/twiddle.c
index bea3e25ab8..a07ba931d4 100644
--- a/apps/plugins/puzzles/help/twiddle.c
+++ b/apps/plugins/puzzles/help/twiddle.c
@@ -205,4 +205,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 2945;
 const unsigned short help_text_words = 549;
+const bool help_valid = true;
 const char quick_help_text[] = "Rotate the tiles around themselves to arrange them into order.";
diff --git a/apps/plugins/puzzles/help/undead.c b/apps/plugins/puzzles/help/undead.c
index 78ecdf386c..dc75e88743 100644
--- a/apps/plugins/puzzles/help/undead.c
+++ b/apps/plugins/puzzles/help/undead.c
@@ -248,4 +248,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3574;
 const unsigned short help_text_words = 660;
+const bool help_valid = true;
 const char quick_help_text[] = "Place ghosts, vampires and zombies so that the right numbers of them can be seen in mirrors.";
diff --git a/apps/plugins/puzzles/help/unequal.c b/apps/plugins/puzzles/help/unequal.c
index 563f9d113b..6bccf6bef3 100644
--- a/apps/plugins/puzzles/help/unequal.c
+++ b/apps/plugins/puzzles/help/unequal.c
@@ -257,4 +257,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 3954;
 const unsigned short help_text_words = 731;
+const bool help_valid = true;
 const char quick_help_text[] = "Complete the latin square in accordance with the > signs.";
diff --git a/apps/plugins/puzzles/help/unruly.c b/apps/plugins/puzzles/help/unruly.c
index dafb3274db..97348e5c26 100644
--- a/apps/plugins/puzzles/help/unruly.c
+++ b/apps/plugins/puzzles/help/unruly.c
@@ -145,4 +145,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 1707;
 const unsigned short help_text_words = 306;
+const bool help_valid = true;
 const char quick_help_text[] = "Fill in the black and white grid to avoid runs of three.";
diff --git a/apps/plugins/puzzles/help/untangle.c b/apps/plugins/puzzles/help/untangle.c
index cdf9b96d25..88b6e39d5a 100644
--- a/apps/plugins/puzzles/help/untangle.c
+++ b/apps/plugins/puzzles/help/untangle.c
@@ -97,4 +97,5 @@ const char help_text[] = {
 
 const unsigned short help_text_len = 974;
 const unsigned short help_text_words = 174;
+const bool help_valid = true;
 const char quick_help_text[] = "Reposition the points so that the lines do not cross.";
diff --git a/apps/plugins/puzzles/puzzles.make b/apps/plugins/puzzles/puzzles.make
index 604208cbdd..8c5bc1de40 100644
--- a/apps/plugins/puzzles/puzzles.make
+++ b/apps/plugins/puzzles/puzzles.make
@@ -25,6 +25,8 @@ PUZZLES_OBJ = $(call c2obj, $(PUZZLES_SRC))
 PUZZLES_ROCKS = $(addprefix $(PUZZLES_OBJDIR)/sgt-, $(notdir $(PUZZLES_GAMES_SRC:.c=.rock)))
 
 OTHER_SRC += $(PUZZLES_SRC)
+OTHER_INC += -I$(PUZZLES_SRCDIR)/src -I $(PUZZLES_SRCDIR)
+
 ROCKS += $(PUZZLES_ROCKS)
 
 PUZZLES_OPTIMIZE = -O2
@@ -49,6 +51,13 @@ $(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/%.o $(PUZZLES_OBJDIR)/help/%
                 -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/src/$*.map
         $(SILENT)$(call objcopy,$(PUZZLES_OBJDIR)/$*.elf,$@)
 
+$(PUZZLES_OBJDIR)/sgt-%.rock: $(PUZZLES_OBJDIR)/src/unfinished/%.o $(PUZZLES_SHARED_OBJ) $(TLSFLIB)
+        $(call PRINTS,LD $(@F))$(CC) $(PLUGINFLAGS) -o $(PUZZLES_OBJDIR)/$*.elf \
+                $(filter %.o, $^) \
+                $(filter %.a, $+) \
+                -lgcc $(filter-out -Wl%.map, $(PLUGINLDFLAGS)) -Wl,-Map,$(PUZZLES_OBJDIR)/src/$*.map
+        $(SILENT)$(call objcopy,$(PUZZLES_OBJDIR)/$*.elf,$@)
+
 $(PUZZLES_SRCDIR)/rbcompat.h:   $(APPSDIR)/plugin.h                     \
                                 $(APPSDIR)/plugins/lib/pluginlib_exit.h \
                                 $(BUILDDIR)/sysfont.h                   \
diff --git a/apps/plugins/puzzles/resync.sh b/apps/plugins/puzzles/resync.sh
index 7c2df45c7e..3431a6f695 100755
--- a/apps/plugins/puzzles/resync.sh
+++ b/apps/plugins/puzzles/resync.sh
@@ -30,8 +30,8 @@ then
     echo "[1/5] Removing current src/ directory"
     rm -rf src
     echo "[2/5] Copying new sources"
-    mkdir src
-    cp -r "$1"/{*.h,puzzles.but,LICENCE,README,CMakeLists.txt} src
+    mkdir -p src/unfinished
+    cp -r "$1"/{*.h,puzzles.but,LICENCE,README,CMakeLists.txt,unfinished} src
 
     # Parse out definitions of core, core_obj, and common from
     # CMakeLists. Extract the .c filenames, except malloc.c, and store
@@ -46,17 +46,12 @@ then
     SRC="$(cat SOURCES.games SOURCES.core | sed 's/src\///' | tr '\n' ' ' | head -c-1) loopy.c pearl.c solo.c"
     echo "Detected sources:" $SRC
     pushd "$1" > /dev/null
-    cp $SRC "$ROOT"/src
+    cp -r $SRC "$ROOT"/src
     popd > /dev/null
 
-    cat <<EOF >> SOURCES.games
+    cat src/unfinished/CMakeLists.txt | awk '/puzzle\(/{p=1} p{print} /\)/{p=0}' | grep -Eo "\(.*$" | tr -dc "a-z\n" | awk '{print "src/unfinished/"$0".c"}' | grep -v "group" | grep -v "separate" >> SOURCES.games
 
-/* Disabled for now. Fix puzzles.make and CATEGORIES to accomodate these. */
-/* The help system would also need to be patched to compile these. */
-/*src/unfinished/group.c*/
-/*src/unfinished/separate.c*/
-/*src/unfinished/slide.c*/
-/*src/unfinished/sokoban.c*/
+    cat <<EOF >> SOURCES.games
 
 /* no c200v2 */
 #if PLUGIN_BUFFER_SIZE > 0x14000
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 27005a447d..27060208fc 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -322,6 +322,7 @@ static struct viewport clip_rect;
 static bool clipped = false, zoom_enabled = false, view_mode = true, mouse_mode = false;
 
 static int mouse_x, mouse_y;
+static bool mouse_dragging = false; /* for sticky mode only */
 
 extern bool audiobuf_available; /* defined in rbmalloc.c */
 
@@ -346,6 +347,7 @@ static struct {
     bool ignore_repeats; /* ignore repeated button events (currently in all games but Untangle) */
     bool rclick_on_hold; /* if in mouse mode, send right-click on long-press of select */
     bool numerical_chooser; /* repurpose select to activate a numerical chooser */
+    bool sticky_mouse; /* if mouse left button should be persistent and toggled on/off */
 } input_settings;
 
 static bool accept_input = true;
@@ -748,7 +750,8 @@ static void rb_color(int n)
         fatal("bad color %d", n);
         return;
     }
-    rb->lcd_set_foreground(colors[n]);
+    if(colors)
+        rb->lcd_set_foreground(colors[n]);
 }
 
 /* clipping is implemented through viewports and offsetting
@@ -1284,7 +1287,8 @@ static void draw_title(bool clear_first)
     rb->lcd_setfont(cur_font = FONT_UI);
     rb->lcd_getstringsize(str, &w, &h);
 
-    rb->lcd_set_foreground(BG_COLOR);
+
+    rb->lcd_set_foreground(colors ? colors[0] : BG_COLOR);
     rb->lcd_fillrect(0, LCD_HEIGHT - h, clear_first ? LCD_WIDTH : w, h);
 
     rb->lcd_set_drawmode(DRMODE_FG);
@@ -1682,9 +1686,17 @@ static int process_input(int tmo, bool do_pausemenu)
                 LOGF("sending left click");
                 send_click(LEFT_BUTTON, true); /* right-click is handled earlier */
             }
-        }
-        else
-        {
+        } else if(input_settings.sticky_mouse) {
+            if(pressed & BTN_FIRE) {
+                send_click(LEFT_BUTTON, false);
+                accept_input = false;
+                mouse_dragging = !mouse_dragging;
+            } else if(mouse_dragging) {
+                send_click(LEFT_DRAG, false);
+            } else {
+                send_click(LEFT_RELEASE, false);
+            }
+        } else {
             if(pressed & BTN_FIRE) {
                 send_click(LEFT_BUTTON, false);
                 accept_input = false;
@@ -2482,6 +2494,7 @@ static bool presets_menu(void)
 
 static void quick_help(void)
 {
+#ifndef NO_HELP_TEXT
 #if defined(FOR_REAL) && defined(DEBUG_MENU)
     if(++help_times >= 5)
     {
@@ -2492,11 +2505,12 @@ static void quick_help(void)
 
     rb->splash(0, quick_help_text);
     rb->button_get(true);
-    return;
+#endif
 }
 
 static void full_help(const char *name)
 {
+#ifndef NO_HELP_TEXT
     unsigned old_bg = rb->lcd_get_background();
 
     bool orig_clipped = clipped;
@@ -2551,6 +2565,7 @@ static void full_help(const char *name)
 
     if(orig_clipped)
         rb_clip(NULL, clip_rect.x, clip_rect.y, clip_rect.width, clip_rect.height);
+#endif
 }
 
 static void init_default_settings(void)
@@ -2701,6 +2716,11 @@ static int pausemenu_cb(int action,
             if(!midend_which_game(me)->can_solve)
                 return ACTION_EXIT_MENUITEM;
             break;
+        case 7:
+        case 8:
+            if(!help_valid)
+                return ACTION_EXIT_MENUITEM;
+            break;
         case 9:
             if(audiobuf_available)
                 break;
@@ -2751,7 +2771,7 @@ static void reset_drawing(void)
     rb->lcd_set_viewport(NULL);
     rb->lcd_set_backdrop(NULL);
     rb->lcd_set_foreground(LCD_BLACK);
-    rb->lcd_set_background(BG_COLOR);
+    rb->lcd_set_background(colors ? colors[0] : BG_COLOR);
 }
 
 /* Make a new game, but tell the user through a splash so they don't
@@ -2876,7 +2896,7 @@ static int pause_menu(void)
             break;
         }
     }
-    rb->lcd_set_background(BG_COLOR);
+    rb->lcd_set_background(colors ? colors[0] : BG_COLOR);
     rb->lcd_clear_display();
     midend_force_redraw(me);
     rb->lcd_update();
@@ -2923,6 +2943,7 @@ static void init_colors(void)
     float *floatcolors = midend_colors(me, &ncolors);
 
     /* convert them to packed RGB */
+    sfree(colors);
     colors = smalloc(ncolors * sizeof(unsigned));
     unsigned *ptr = colors;
     float *floatptr = floatcolors;
@@ -3007,6 +3028,7 @@ static void tune_input(const char *name)
     static const char *no_rclick_on_hold[] = {
         "Map",
         "Signpost",
+        "Slide",
         "Untangle",
         NULL
     };
@@ -3015,11 +3037,21 @@ static void tune_input(const char *name)
 
     static const char *mouse_games[] = {
         "Loopy",
+        "Slide",
         NULL
     };
 
     mouse_mode = string_in_list(name, mouse_games);
 
+    static const char *sticky_mouse_games[] = {
+        "Map",
+        "Signpost",
+        "Slide",
+        "Untangle",
+    };
+
+    input_settings.sticky_mouse = string_in_list(name, sticky_mouse_games);
+
     static const char *number_chooser_games[] = {
         "Filling",
         "Keen",
@@ -3312,8 +3344,11 @@ static int mainmenu_cb(int action,
             if(!load_success)
                 return ACTION_EXIT_MENUITEM;
             break;
+        case 2:
         case 3:
-            break;
+            if(!help_valid)
+                return ACTION_EXIT_MENUITEM;
+            break;
         case 4:
             if(audiobuf_available)
                 break;
@@ -3476,12 +3511,14 @@ static void puzzles_main(void)
                     /* quit without saving */
                     midend_free(me);
                     sfree(colors);
+                    colors = NULL;
                     return;
                 case -3:
                     /* save and quit */
                     save_game();
                     midend_free(me);
                     sfree(colors);
+                    colors = NULL;
                     return;
                 default:
                     break;
@@ -3511,6 +3548,7 @@ static void puzzles_main(void)
             rb->yield();
         }
         sfree(colors);
+        colors = NULL;
     }
 }
 
diff --git a/apps/plugins/puzzles/src/unfinished/CMakeLists.txt b/apps/plugins/puzzles/src/unfinished/CMakeLists.txt
new file mode 100644
index 0000000000..0c1e331f9b
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/CMakeLists.txt
@@ -0,0 +1,31 @@
+puzzle(group
+  DISPLAYNAME "Group"
+  DESCRIPTION "Group theory puzzle"
+  OBJECTIVE "Complete the unfinished Cayley table of a group.")
+solver(group ${CMAKE_SOURCE_DIR}/latin.c)
+
+puzzle(separate
+  DISPLAYNAME "Separate"
+  DESCRIPTION "Rectangle-dividing puzzle"
+  OBJECTIVE "Partition the grid into regions containing one of each letter.")
+
+puzzle(slide
+  DISPLAYNAME "Slide"
+  DESCRIPTION "Sliding block puzzle"
+  OBJECTIVE "Slide the blocks to let the key block out.")
+solver(slide)
+
+puzzle(sokoban
+  DISPLAYNAME "Sokoban"
+  DESCRIPTION "Barrel-pushing puzzle"
+  OBJECTIVE "Push all the barrels into the target squares.")
+
+# These unfinished programs don't even have the structure of a puzzle
+# game yet; they're just command-line programs containing test
+# implementations of some of the needed functionality.
+
+cliprogram(numgame numgame.c)
+
+cliprogram(path path.c COMPILE_DEFINITIONS TEST_GEN)
+
+export_variables_to_parent_scope()
diff --git a/apps/plugins/puzzles/src/unfinished/README b/apps/plugins/puzzles/src/unfinished/README
new file mode 100644
index 0000000000..c96ccc935a
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/README
@@ -0,0 +1,14 @@
+This subdirectory contains puzzle implementations which are
+half-written, fundamentally flawed, or in other ways unready to be
+shipped as part of the polished Puzzles collection.
+
+The CMake build system will _build_ all of the source in this
+directory (to ensure it hasn't become unbuildable), but they won't be
+included in all-in-one puzzle binaries or installed by 'make install'
+targets. If you want to temporarily change that, you can reconfigure
+your build by defining the CMake variable PUZZLES_ENABLE_UNFINISHED.
+For example,
+
+  cmake . -DPUZZLES_ENABLE_UNFINISHED="group;slide"
+
+will build as if both Group and Slide were fully official puzzles.
diff --git a/apps/plugins/puzzles/src/unfinished/group.c b/apps/plugins/puzzles/src/unfinished/group.c
new file mode 100644
index 0000000000..faffa89485
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/group.c
@@ -0,0 +1,2497 @@
+/*
+ * group.c: a Latin-square puzzle, but played with groups' Cayley
+ * tables. That is, you are given a Cayley table of a group with
+ * most elements blank and a few clues, and you must fill it in
+ * so as to preserve the group axioms.
+ *
+ * This is a perfectly playable and fully working puzzle, but I'm
+ * leaving it for the moment in the 'unfinished' directory because
+ * it's just too esoteric (not to mention _hard_) for me to be
+ * comfortable presenting it to the general public as something they
+ * might (implicitly) actually want to play.
+ *
+ * TODO:
+ *
+ *  - more solver techniques?
+ *     * Inverses: once we know that gh = e, we can immediately
+ *       deduce hg = e as well; then for any gx=y we can deduce
+ *       hy=x, and for any xg=y we have yh=x.
+ *     * Hard-mode associativity: we currently deduce based on
+ *       definite numbers in the grid, but we could also winnow
+ *       based on _possible_ numbers.
+ *     * My overambitious original thoughts included wondering if we
+ *       could infer that there must be elements of certain orders
+ *       (e.g. a group of order divisible by 5 must contain an
+ *       element of order 5), but I think in fact this is probably
+ *       silly.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+
+#include "puzzles.h"
+#include "latin.h"
+
+/*
+ * Difficulty levels. I do some macro ickery here to ensure that my
+ * enum and the various forms of my name list always match up.
+ */
+#define DIFFLIST(A) \
+    A(TRIVIAL,Trivial,NULL,t) \
+    A(NORMAL,Normal,solver_normal,n) \
+    A(HARD,Hard,solver_hard,h) \
+    A(EXTREME,Extreme,NULL,x) \
+    A(UNREASONABLE,Unreasonable,NULL,u)
+#define ENUM(upper,title,func,lower) DIFF_ ## upper,
+#define TITLE(upper,title,func,lower) #title,
+#define ENCODE(upper,title,func,lower) #lower
+#define CONFIG(upper,title,func,lower) ":" #title
+enum { DIFFLIST(ENUM) DIFFCOUNT };
+static char const *const group_diffnames[] = { DIFFLIST(TITLE) };
+static char const group_diffchars[] = DIFFLIST(ENCODE);
+#define DIFFCONFIG DIFFLIST(CONFIG)
+
+enum {
+    COL_BACKGROUND,
+    COL_GRID,
+    COL_USER,
+    COL_HIGHLIGHT,
+    COL_ERROR,
+    COL_PENCIL,
+    COL_DIAGONAL,
+    NCOLOURS
+};
+
+/*
+ * In identity mode, we number the elements e,a,b,c,d,f,g,h,...
+ * Otherwise, they're a,b,c,d,e,f,g,h,... in the obvious way.
+ */
+#define E_TO_FRONT(c,id) ( (id) && (c)<=5 ? (c) % 5 + 1 : (c) )
+#define E_FROM_FRONT(c,id) ( (id) && (c)<=5 ? ((c) + 3) % 5 + 1 : (c) )
+
+#define FROMCHAR(c,id) E_TO_FRONT((((c)-('A'-1)) & ~0x20), id)
+#define ISCHAR(c) (((c)>='A'&&(c)<='Z') || ((c)>='a'&&(c)<='z'))
+#define TOCHAR(c,id) (E_FROM_FRONT(c,id) + ('a'-1))
+
+struct game_params {
+    int w, diff;
+    bool id;
+};
+
+typedef struct group_common {
+    int refcount;
+    bool *immutable;
+} group_common;
+
+struct game_state {
+    game_params par;
+    digit *grid;
+    int *pencil;                       /* bitmaps using bits 1<<1..1<<n */
+    group_common *common;
+    bool completed, cheated;
+    digit *sequence;                   /* sequence of group elements shown */
+
+    /*
+     * This array indicates thick lines separating rows and columns
+     * placed and unplaced manually by the user as a visual aid, e.g.
+     * to delineate a subgroup and its cosets.
+     *
+     * When a line is placed, it's deemed to be between the two
+     * particular group elements that are on either side of it at the
+     * time; dragging those two away from each other automatically
+     * gets rid of the line. Hence, for a given element i, dividers[i]
+     * is either -1 (indicating no divider to the right of i), or some
+     * other element (indicating a divider to the right of i iff that
+     * element is the one right of it). These are eagerly cleared
+     * during drags.
+     */
+    int *dividers;                     /* thick lines between rows/cols */
+};
+
+static game_params *default_params(void)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = 6;
+    ret->diff = DIFF_NORMAL;
+    ret->id = true;
+
+    return ret;
+}
+
+static const struct game_params group_presets[] = {
+    {  6, DIFF_NORMAL, true },
+    {  6, DIFF_NORMAL, false },
+    {  8, DIFF_NORMAL, true },
+    {  8, DIFF_NORMAL, false },
+    {  8, DIFF_HARD, true },
+    {  8, DIFF_HARD, false },
+    { 12, DIFF_NORMAL, true },
+};
+
+static bool game_fetch_preset(int i, char **name, game_params **params)
+{
+    game_params *ret;
+    char buf[80];
+
+    if (i < 0 || i >= lenof(group_presets))
+        return false;
+
+    ret = snew(game_params);
+    *ret = group_presets[i]; /* structure copy */
+
+    sprintf(buf, "%dx%d %s%s", ret->w, ret->w, group_diffnames[ret->diff],
+            ret->id ? "" : ", identity hidden");
+
+    *name = dupstr(buf);
+    *params = ret;
+    return true;
+}
+
+static void free_params(game_params *params)
+{
+    sfree(params);
+}
+
+static game_params *dup_params(const game_params *params)
+{
+    game_params *ret = snew(game_params);
+    *ret = *params;                    /* structure copy */
+    return ret;
+}
+
+static void decode_params(game_params *params, char const *string)
+{
+    char const *p = string;
+
+    params->w = atoi(p);
+    while (*p && isdigit((unsigned char)*p)) p++;
+    params->diff = DIFF_NORMAL;
+    params->id = true;
+
+    while (*p) {
+        if (*p == 'd') {
+            int i;
+            p++;
+            params->diff = DIFFCOUNT+1; /* ...which is invalid */
+            if (*p) {
+                for (i = 0; i < DIFFCOUNT; i++) {
+                    if (*p == group_diffchars[i])
+                        params->diff = i;
+                }
+                p++;
+            }
+        } else if (*p == 'i') {
+            params->id = false;
+            p++;
+        } else {
+            /* unrecognised character */
+            p++;
+        }
+    }
+}
+
+static char *encode_params(const game_params *params, bool full)
+{
+    char ret[80];
+
+    sprintf(ret, "%d", params->w);
+    if (full)
+        sprintf(ret + strlen(ret), "d%c", group_diffchars[params->diff]);
+    if (!params->id)
+        sprintf(ret + strlen(ret), "i");
+
+    return dupstr(ret);
+}
+
+static config_item *game_configure(const game_params *params)
+{
+    config_item *ret;
+    char buf[80];
+
+    ret = snewn(4, config_item);
+
+    ret[0].name = "Grid size";
+    ret[0].type = C_STRING;
+    sprintf(buf, "%d", params->w);
+    ret[0].u.string.sval = dupstr(buf);
+
+    ret[1].name = "Difficulty";
+    ret[1].type = C_CHOICES;
+    ret[1].u.choices.choicenames = DIFFCONFIG;
+    ret[1].u.choices.selected = params->diff;
+
+    ret[2].name = "Show identity";
+    ret[2].type = C_BOOLEAN;
+    ret[2].u.boolean.bval = params->id;
+
+    ret[3].name = NULL;
+    ret[3].type = C_END;
+
+    return ret;
+}
+
+static game_params *custom_params(const config_item *cfg)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = atoi(cfg[0].u.string.sval);
+    ret->diff = cfg[1].u.choices.selected;
+    ret->id = cfg[2].u.boolean.bval;
+
+    return ret;
+}
+
+static const char *validate_params(const game_params *params, bool full)
+{
+    if (params->w < 3 || params->w > 26)
+        return "Grid size must be between 3 and 26";
+    if (params->diff >= DIFFCOUNT)
+        return "Unknown difficulty rating";
+    if (!params->id && params->diff == DIFF_TRIVIAL) {
+        /*
+         * We can't have a Trivial-difficulty puzzle (i.e. latin
+         * square deductions only) without a clear identity, because
+         * identityless puzzles always have two rows and two columns
+         * entirely blank, and no latin-square deduction permits the
+         * distinguishing of two such rows.
+         */
+        return "Trivial puzzles must have an identity";
+    }
+    if (!params->id && params->w == 3) {
+        /*
+         * We can't have a 3x3 puzzle without an identity either,
+         * because 3x3 puzzles can't ever be harder than Trivial
+         * (there are no 3x3 latin squares which aren't also valid
+         * group tables, so enabling group-based deductions doesn't
+         * rule out any possible solutions) and - as above - Trivial
+         * puzzles can't not have an identity.
+         */
+        return "3x3 puzzles must have an identity";
+    }
+    return NULL;
+}
+
+/* ----------------------------------------------------------------------
+ * Solver.
+ */
+
+static int find_identity(struct latin_solver *solver)
+{
+    int w = solver->o;
+    digit *grid = solver->grid;
+    int i, j;
+
+    for (i = 0; i < w; i++)
+        for (j = 0; j < w; j++) {
+            if (grid[i*w+j] == i+1)
+                return j+1;
+            if (grid[i*w+j] == j+1)
+                return i+1;
+        }
+
+    return 0;
+}
+
+static int solver_normal(struct latin_solver *solver, void *vctx)
+{
+    int w = solver->o;
+#ifdef STANDALONE_SOLVER
+    char **names = solver->names;
+#endif
+    digit *grid = solver->grid;
+    int i, j, k;
+
+    /*
+     * Deduce using associativity: (ab)c = a(bc).
+     *
+     * So we pick any a,b,c we like; then if we know ab, bc, and
+     * (ab)c we can fill in a(bc).
+     */
+    for (i = 0; i < w; i++)
+        for (j = 0; j < w; j++)
+            for (k = 0; k < w; k++) {
+                if (!grid[i*w+j] || !grid[j*w+k])
+                    continue;
+                if (grid[(grid[i*w+j]-1)*w+k] &&
+                    !grid[i*w+(grid[j*w+k]-1)]) {
+                    int x = grid[j*w+k]-1, y = i;
+                    int n = grid[(grid[i*w+j]-1)*w+k];
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        printf("%*sassociativity on %s,%s,%s: %s*%s = %s*%s\n",
+                               solver_recurse_depth*4, "",
+                               names[i], names[j], names[k],
+                               names[grid[i*w+j]-1], names[k],
+                               names[i], names[grid[j*w+k]-1]);
+                        printf("%*s  placing %s at (%d,%d)\n",
+                               solver_recurse_depth*4, "",
+                               names[n-1], x+1, y+1);
+                    }
+#endif
+                    if (solver->cube[(x*w+y)*w+n-1]) {
+                        latin_solver_place(solver, x, y, n);
+                        return 1;
+                    } else {
+#ifdef STANDALONE_SOLVER
+                        if (solver_show_working)
+                            printf("%*s  contradiction!\n",
+                                   solver_recurse_depth*4, "");
+                        return -1;
+#endif
+                    }
+                }
+                if (!grid[(grid[i*w+j]-1)*w+k] &&
+                    grid[i*w+(grid[j*w+k]-1)]) {
+                    int x = k, y = grid[i*w+j]-1;
+                    int n = grid[i*w+(grid[j*w+k]-1)];
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        printf("%*sassociativity on %s,%s,%s: %s*%s = %s*%s\n",
+                               solver_recurse_depth*4, "",
+                               names[i], names[j], names[k],
+                               names[grid[i*w+j]-1], names[k],
+                               names[i], names[grid[j*w+k]-1]);
+                        printf("%*s  placing %s at (%d,%d)\n",
+                               solver_recurse_depth*4, "",
+                               names[n-1], x+1, y+1);
+                    }
+#endif
+                    if (solver->cube[(x*w+y)*w+n-1]) {
+                        latin_solver_place(solver, x, y, n);
+                        return 1;
+                    } else {
+#ifdef STANDALONE_SOLVER
+                        if (solver_show_working)
+                            printf("%*s  contradiction!\n",
+                                   solver_recurse_depth*4, "");
+                        return -1;
+#endif
+                    }
+                }
+            }
+
+    /*
+     * Fill in the row and column for the group identity, if it's not
+     * already known and if we've just found out what it is.
+     */
+    i = find_identity(solver);
+    if (i) {
+        bool done_something = false;
+        for (j = 1; j <= w; j++) {
+            if (!grid[(i-1)*w+(j-1)] || !grid[(j-1)*w+(i-1)]) {
+                done_something = true;
+            }
+        }
+        if (done_something) {
+#ifdef STANDALONE_SOLVER
+            if (solver_show_working) {
+                printf("%*s%s is the group identity\n",
+                       solver_recurse_depth*4, "", names[i-1]);
+            }
+#endif
+            for (j = 1; j <= w; j++) {
+                if (!grid[(j-1)*w+(i-1)]) {
+                    if (!cube(i-1, j-1, j)) {
+#ifdef STANDALONE_SOLVER
+                        if (solver_show_working) {
+                            printf("%*s  but %s cannot go at (%d,%d) - "
+                                   "contradiction!\n",
+                                   solver_recurse_depth*4, "",
+                                   names[j-1], i, j);
+                        }
+#endif
+                        return -1;
+                    }
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        printf("%*s  placing %s at (%d,%d)\n",
+                               solver_recurse_depth*4, "",
+                               names[j-1], i, j);
+                    }
+#endif
+                    latin_solver_place(solver, i-1, j-1, j);
+                }
+                if (!grid[(i-1)*w+(j-1)]) {
+                    if (!cube(j-1, i-1, j)) {
+#ifdef STANDALONE_SOLVER
+                        if (solver_show_working) {
+                            printf("%*s  but %s cannot go at (%d,%d) - "
+                                   "contradiction!\n",
+                                   solver_recurse_depth*4, "",
+                                   names[j-1], j, i);
+                        }
+#endif
+                        return -1;
+                    }
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        printf("%*s  placing %s at (%d,%d)\n",
+                               solver_recurse_depth*4, "",
+                               names[j-1], j, i);
+                    }
+#endif
+                    latin_solver_place(solver, j-1, i-1, j);
+                }
+            }
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static int solver_hard(struct latin_solver *solver, void *vctx)
+{
+    bool done_something = false;
+    int w = solver->o;
+#ifdef STANDALONE_SOLVER
+    char **names = solver->names;
+#endif
+    int i, j;
+
+    /*
+     * In identity-hidden mode, systematically rule out possibilities
+     * for the group identity.
+     *
+     * In solver_normal, we used the fact that any filled square in
+     * the grid whose contents _does_ match one of the elements it's
+     * the product of - that is, ab=a or ab=b - tells you immediately
+     * that the other element is the identity.
+     *
+     * Here, we use the flip side of that: any filled square in the
+     * grid whose contents does _not_ match either its row or column -
+     * that is, if ab is neither a nor b - tells you immediately that
+     * _neither_ of those elements is the identity. And if that's
+     * true, then we can also immediately rule out the possibility
+     * that it acts as the identity on any element at all.
+     */
+    for (i = 0; i < w; i++) {
+        bool i_can_be_id = true;
+#ifdef STANDALONE_SOLVER
+        char title[80];
+#endif
+
+        for (j = 0; j < w; j++) {
+            if (grid(i,j) && grid(i,j) != j+1) {
+#ifdef STANDALONE_SOLVER
+                if (solver_show_working)
+                    sprintf(title, "%s cannot be the identity: "
+                            "%s%s = %s =/= %s", names[i], names[i], names[j],
+                            names[grid(i,j)-1], names[j]);
+#endif
+                i_can_be_id = false;
+                break;
+            }
+            if (grid(j,i) && grid(j,i) != j+1) {
+#ifdef STANDALONE_SOLVER
+                if (solver_show_working)
+                    sprintf(title, "%s cannot be the identity: "
+                            "%s%s = %s =/= %s", names[i], names[j], names[i],
+                            names[grid(j,i)-1], names[j]);
+#endif
+                i_can_be_id = false;
+                break;
+            }
+        }
+
+        if (!i_can_be_id) {
+            /* Now rule out ij=j or ji=j for all j. */
+            for (j = 0; j < w; j++) {
+                if (cube(i, j, j+1)) {
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        if (title[0]) {
+                            printf("%*s%s\n", solver_recurse_depth*4, "",
+                                   title);
+                            title[0] = '\0';
+                        }
+                        printf("%*s  ruling out %s at (%d,%d)\n",
+                               solver_recurse_depth*4, "", names[j], i, j);
+                    }
+#endif
+                    cube(i, j, j+1) = false;
+                }
+                if (cube(j, i, j+1)) {
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        if (title[0]) {
+                            printf("%*s%s\n", solver_recurse_depth*4, "",
+                                   title);
+                            title[0] = '\0';
+                        }
+                        printf("%*s  ruling out %s at (%d,%d)\n",
+                               solver_recurse_depth*4, "", names[j], j, i);
+                    }
+#endif
+                    cube(j, i, j+1) = false;
+                }
+            }
+        }
+    }
+
+    return done_something;
+}
+
+#define SOLVER(upper,title,func,lower) func,
+static usersolver_t const group_solvers[] = { DIFFLIST(SOLVER) };
+
+static bool group_valid(struct latin_solver *solver, void *ctx)
+{
+    int w = solver->o;
+#ifdef STANDALONE_SOLVER
+    char **names = solver->names;
+#endif
+    int i, j, k;
+
+    for (i = 0; i < w; i++)
+        for (j = 0; j < w; j++)
+            for (k = 0; k < w; k++) {
+                int ij = grid(i, j) - 1;
+                int jk = grid(j, k) - 1;
+                int ij_k = grid(ij, k) - 1;
+                int i_jk = grid(i, jk) - 1;
+                if (ij_k != i_jk) {
+#ifdef STANDALONE_SOLVER
+                    if (solver_show_working) {
+                        printf("%*sfailure of associativity: "
+                               "(%s%s)%s = %s%s = %s but "
+                               "%s(%s%s) = %s%s = %s\n",
+                               solver_recurse_depth*4, "",
+                               names[i], names[j], names[k],
+                               names[ij], names[k], names[ij_k],
+                               names[i], names[j], names[k],
+                               names[i], names[jk], names[i_jk]);
+                    }
+#endif
+                    return false;
+                }
+            }
+
+    return true;
+}
+
+static int solver(const game_params *params, digit *grid, int maxdiff)
+{
+    int w = params->w;
+    int ret;
+    struct latin_solver solver;
+
+#ifdef STANDALONE_SOLVER
+    char *p, text[100], *names[50];
+    int i;
+
+    for (i = 0, p = text; i < w; i++) {
+        names[i] = p;
+        *p++ = TOCHAR(i+1, params->id);
+        *p++ = '\0';
+    }
+    solver.names = names;
+#endif
+
+    if (latin_solver_alloc(&solver, grid, w))
+        ret = latin_solver_main(&solver, maxdiff,
+                                DIFF_TRIVIAL, DIFF_HARD, DIFF_EXTREME,
+                                DIFF_EXTREME, DIFF_UNREASONABLE,
+                                group_solvers, group_valid, NULL, NULL, NULL);
+    else
+        ret = diff_impossible;
+
+    latin_solver_free(&solver);
+
+    return ret;
+}
+
+/* ----------------------------------------------------------------------
+ * Grid generation.
+ */
+
+static char *encode_grid(char *desc, digit *grid, int area)
+{
+    int run, i;
+    char *p = desc;
+
+    run = 0;
+    for (i = 0; i <= area; i++) {
+        int n = (i < area ? grid[i] : -1);
+
+        if (!n)
+            run++;
+        else {
+            if (run) {
+                while (run > 0) {
+                    int c = 'a' - 1 + run;
+                    if (run > 26)
+                        c = 'z';
+                    *p++ = c;
+                    run -= c - ('a' - 1);
+                }
+            } else {
+                /*
+                 * If there's a number in the very top left or
+                 * bottom right, there's no point putting an
+                 * unnecessary _ before or after it.
+                 */
+                if (p > desc && n > 0)
+                    *p++ = '_';
+            }
+            if (n > 0)
+                p += sprintf(p, "%d", n);
+            run = 0;
+        }
+    }
+    return p;
+}
+
+/* ----- data generated by group.gap begins ----- */
+
+struct group {
+    unsigned long autosize;
+    int order, ngens;
+    const char *gens;
+};
+struct groups {
+    int ngroups;
+    const struct group *groups;
+};
+
+static const struct group groupdata[] = {
+    /* order 2 */
+    {1L, 2, 1, "BA"},
+    /* order 3 */
+    {2L, 3, 1, "BCA"},
+    /* order 4 */
+    {2L, 4, 1, "BCDA"},
+    {6L, 4, 2, "BADC" "CDAB"},
+    /* order 5 */
+    {4L, 5, 1, "BCDEA"},
+    /* order 6 */
+    {6L, 6, 2, "CFEBAD" "BADCFE"},
+    {2L, 6, 1, "DCFEBA"},
+    /* order 7 */
+    {6L, 7, 1, "BCDEFGA"},
+    /* order 8 */
+    {4L, 8, 1, "BCEFDGHA"},
+    {8L, 8, 2, "BDEFGAHC" "EGBHDCFA"},
+    {8L, 8, 2, "EGBHDCFA" "BAEFCDHG"},
+    {24L, 8, 2, "BDEFGAHC" "CHDGBEAF"},
+    {168L, 8, 3, "BAEFCDHG" "CEAGBHDF" "DFGAHBCE"},
+    /* order 9 */
+    {6L, 9, 1, "BDECGHFIA"},
+    {48L, 9, 2, "BDEAGHCIF" "CEFGHAIBD"},
+    /* order 10 */
+    {20L, 10, 2, "CJEBGDIFAH" "BADCFEHGJI"},
+    {4L, 10, 1, "DCFEHGJIBA"},
+    /* order 11 */
+    {10L, 11, 1, "BCDEFGHIJKA"},
+    /* order 12 */
+    {12L, 12, 2, "GLDKJEHCBIAF" "BCEFAGIJDKLH"},
+    {4L, 12, 1, "EHIJKCBLDGFA"},
+    {24L, 12, 2, "BEFGAIJKCDLH" "FJBKHLEGDCIA"},
+    {12L, 12, 2, "GLDKJEHCBIAF" "BAEFCDIJGHLK"},
+    {12L, 12, 2, "FDIJGHLBKAEC" "GIDKFLHCJEAB"},
+    /* order 13 */
+    {12L, 13, 1, "BCDEFGHIJKLMA"},
+    /* order 14 */
+    {42L, 14, 2, "ELGNIBKDMFAHCJ" "BADCFEHGJILKNM"},
+    {6L, 14, 1, "FEHGJILKNMBADC"},
+    /* order 15 */
+    {8L, 15, 1, "EGHCJKFMNIOBLDA"},
+    /* order 16 */
+    {8L, 16, 1, "MKNPFOADBGLCIEHJ"},
+    {96L, 16, 2, "ILKCONFPEDJHGMAB" "BDFGHIAKLMNCOEPJ"},
+    {32L, 16, 2, "MIHPFDCONBLAKJGE" "BEFGHJKALMNOCDPI"},
+    {32L, 16, 2, "IFACOGLMDEJBNPKH" "BEFGHJKALMNOCDPI"},
+    {16L, 16, 2, "MOHPFKCINBLADJGE" "BDFGHIEKLMNJOAPC"},
+    {16L, 16, 2, "MIHPFDJONBLEKCGA" "BDFGHIEKLMNJOAPC"},
+    {32L, 16, 2, "MOHPFDCINBLEKJGA" "BAFGHCDELMNIJKPO"},
+    {16L, 16, 2, "MIHPFKJONBLADCGE" "GDPHNOEKFLBCIAMJ"},
+    {32L, 16, 2, "MIBPFDJOGHLEKCNA" "CLEIJGMPKAOHNFDB"},
+    {192L, 16, 3,
+     "MCHPFAIJNBLDEOGK" "BEFGHJKALMNOCDPI" "GKLBNOEDFPHJIAMC"},
+    {64L, 16, 3, "MCHPFAIJNBLDEOGK" "LOGFPKJIBNMEDCHA" "CMAIJHPFDEONBLKG"},
+    {192L, 16, 3,
+     "IPKCOGMLEDJBNFAH" "BEFGHJKALMNOCDPI" "CMEIJBPFKAOGHLDN"},
+    {48L, 16, 3, "IPDJONFLEKCBGMAH" "FJBLMEOCGHPKAIND" "DGIEKLHNJOAMPBCF"},
+    {20160L, 16, 4,
+     "EHJKAMNBOCDPFGIL" "BAFGHCDELMNIJKPO" "CFAIJBLMDEOGHPKN"
+     "DGIAKLBNCOEFPHJM"},
+    /* order 17 */
+    {16L, 17, 1, "EFGHIJKLMNOPQABCD"},
+    /* order 18 */
+    {54L, 18, 2, "MKIQOPNAGLRECDBJHF" "BAEFCDJKLGHIOPMNRQ"},
+    {6L, 18, 1, "ECJKGHFOPDMNLRIQBA"},
+    {12L, 18, 2, "ECJKGHBOPAMNFRDQLI" "KNOPQCFREIGHLJAMBD"},
+    {432L, 18, 3,
+     "IFNAKLQCDOPBGHREMJ" "NOQCFRIGHKLJAMPBDE" "BAEFCDJKLGHIOPMNRQ"},
+    {48L, 18, 2, "ECJKGHBOPAMNFRDQLI" "FDKLHIOPBMNAREQCJG"},
+    /* order 19 */
+    {18L, 19, 1, "EFGHIJKLMNOPQRSABCD"},
+    /* order 20 */
+    {40L, 20, 2, "GTDKREHOBILSFMPCJQAN" "EABICDFMGHJQKLNTOPRS"},
+    {8L, 20, 1, "EHIJLCMNPGQRSKBTDOFA"},
+    {20L, 20, 2, "DJSHQNCLTRGPEBKAIFOM" "EABICDFMGHJQKLNTOPRS"},
+    {40L, 20, 2, "GTDKREHOBILSFMPCJQAN" "ECBIAGFMDKJQHONTLSRP"},
+    {24L, 20, 2, "IGFMDKJQHONTLSREPCBA" "FDIJGHMNKLQROPTBSAEC"},
+    /* order 21 */
+    {42L, 21, 2, "ITLSBOUERDHAGKCJNFMQP" "EJHLMKOPNRSQAUTCDBFGI"},
+    {12L, 21, 1, "EGHCJKFMNIPQLSTOUBRDA"},
+    /* order 22 */
+    {110L, 22, 2, "ETGVIBKDMFOHQJSLUNAPCR" "BADCFEHGJILKNMPORQTSVU"},
+    {10L, 22, 1, "FEHGJILKNMPORQTSVUBADC"},
+    /* order 23 */
+    {22L, 23, 1, "EFGHIJKLMNOPQRSTUVWABCD"},
+    /* order 24 */
+    {24L, 24, 2, "QXEJWPUMKLRIVBFTSACGHNDO" "HRNOPSWCTUVBLDIJXFGAKQME"},
+    {8L, 24, 1, "MQBTUDRWFGHXJELINOPKSAVC"},
+    {24L, 24, 2, "IOQRBEUVFWGHKLAXMNPSCDTJ" "NJXOVGDKSMTFIPQELCURBWAH"},
+    {48L, 24, 2, "QUEJWVXFKLRIPGMNSACBOTDH" "HSNOPWLDTUVBRIAKXFGCQEMJ"},
+    {24L, 24, 2, "QXEJWPUMKLRIVBFTSACGHNDO" "TWHNXLRIOPUMSACQVBFDEJGK"},
+    {48L, 24, 2, "QUEJWVXFKLRIPGMNSACBOTDH" "BAFGHCDEMNOPIJKLTUVQRSXW"},
+    {48L, 24, 3,
+     "QXKJWVUMESRIPGFTLDCBONAH" "JUEQRPXFKLWCVBMNSAIGHTDO"
+     "HSNOPWLDTUVBRIAKXFGCQEMJ"},
+    {24L, 24, 3,
+     "QUKJWPXFESRIVBMNLDCGHTAO" "JXEQRVUMKLWCPGFTSAIBONDH"
+     "TRONXLWCHVUMSAIJPGFDEQBK"},
+    {16L, 24, 2, "MRGTULWIOPFXSDJQBVNEKCHA" "VKXHOQASNTPBCWDEUFGIJLMR"},
+    {16L, 24, 2, "MRGTULWIOPFXSDJQBVNEKCHA" "RMLWIGTUSDJQOPFXEKCBVNAH"},
+    {48L, 24, 2, "IULQRGXMSDCWOPNTEKJBVFAH" "GLMOPRSDTUBVWIEKFXHJQANC"},
+    {24L, 24, 2, "UJPXMRCSNHGTLWIKFVBEDQOA" "NRUFVLWIPXMOJEDQHGTCSABK"},
+    {24L, 24, 2, "MIBTUAQRFGHXCDEWNOPJKLVS" "OKXVFWSCGUTNDRQJBPMALIHE"},
+    {144L, 24, 3,
+     "QXKJWVUMESRIPGFTLDCBONAH" "JUEQRPXFKLWCVBMNSAIGHTDO"
+     "BAFGHCDEMNOPIJKLTUVQRSXW"},
+    {336L, 24, 3,
+     "QTKJWONXESRIHVUMLDCPGFAB" "JNEQRHTUKLWCOPXFSAIVBMDG"
+     "HENOPJKLTUVBQRSAXFGWCDMI"},
+    /* order 25 */
+    {20L, 25, 1, "EHILMNPQRSFTUVBJWXDOYGAKC"},
+    {480L, 25, 2, "EHILMNPQRSCTUVBFWXDJYGOKA" "BDEGHIKLMNAPQRSCTUVFWXJYO"},
+    /* order 26 */
+    {156L, 26, 2,
+     "EXGZIBKDMFOHQJSLUNWPYRATCV" "BADCFEHGJILKNMPORQTSVUXWZY"},
+    {12L, 26, 1, "FEHGJILKNMPORQTSVUXWZYBADC"},
+};
+
+static const struct groups groups[] = {
+    {0, NULL},                  /* trivial case: 0 */
+    {0, NULL},                  /* trivial case: 1 */
+    {1, groupdata + 0},         /* 2 */
+    {1, groupdata + 1},         /* 3 */
+    {2, groupdata + 2},         /* 4 */
+    {1, groupdata + 4},         /* 5 */
+    {2, groupdata + 5},         /* 6 */
+    {1, groupdata + 7},         /* 7 */
+    {5, groupdata + 8},         /* 8 */
+    {2, groupdata + 13},        /* 9 */
+    {2, groupdata + 15},        /* 10 */
+    {1, groupdata + 17},        /* 11 */
+    {5, groupdata + 18},        /* 12 */
+    {1, groupdata + 23},        /* 13 */
+    {2, groupdata + 24},        /* 14 */
+    {1, groupdata + 26},        /* 15 */
+    {14, groupdata + 27},       /* 16 */
+    {1, groupdata + 41},        /* 17 */
+    {5, groupdata + 42},        /* 18 */
+    {1, groupdata + 47},        /* 19 */
+    {5, groupdata + 48},        /* 20 */
+    {2, groupdata + 53},        /* 21 */
+    {2, groupdata + 55},        /* 22 */
+    {1, groupdata + 57},        /* 23 */
+    {15, groupdata + 58},       /* 24 */
+    {2, groupdata + 73},        /* 25 */
+    {2, groupdata + 75},        /* 26 */
+};
+
+/* ----- data generated by group.gap ends ----- */
+
+static char *new_game_desc(const game_params *params, random_state *rs,
+                           char **aux, bool interactive)
+{
+    int w = params->w, a = w*w;
+    digit *grid, *soln, *soln2;
+    int *indices;
+    int i, j, k, qh, qt;
+    int diff = params->diff;
+    const struct group *group;
+    char *desc, *p;
+
+    /*
+     * Difficulty exceptions: some combinations of size and
+     * difficulty cannot be satisfied, because all puzzles of at
+     * most that difficulty are actually even easier.
+     *
+     * Remember to re-test this whenever a change is made to the
+     * solver logic!
+     *
+     * I tested it using the following shell command:
+
+for d in t n h x u; do
+  for id in '' i; do
+    for i in {3..9}; do
+      echo -n "./group --generate 1 ${i}d${d}${id}: "
+      perl -e 'alarm 30; exec @ARGV' \
+        ./group --generate 1 ${i}d${d}${id} >/dev/null && echo ok
+    done
+  done
+done
+
+     * Of course, it's better to do that after taking the exceptions
+     * _out_, so as to detect exceptions that should be removed as
+     * well as those which should be added.
+     */
+    if (w < 5 && diff == DIFF_UNREASONABLE)
+        diff--;
+    if ((w < 5 || ((w == 6 || w == 8) && params->id)) && diff == DIFF_EXTREME)
+        diff--;
+    if ((w < 6 || (w == 6 && params->id)) && diff == DIFF_HARD)
+        diff--;
+    if ((w < 4 || (w == 4 && params->id)) && diff == DIFF_NORMAL)
+        diff--;
+
+    grid = snewn(a, digit);
+    soln = snewn(a, digit);
+    soln2 = snewn(a, digit);
+    indices = snewn(a, int);
+
+    while (1) {
+        /*
+         * Construct a valid group table, by picking a group from
+         * the above data table, decompressing it into a full
+         * representation by BFS, and then randomly permuting its
+         * non-identity elements.
+         *
+         * We build the canonical table in 'soln' (and use 'grid' as
+         * our BFS queue), then transfer the table into 'grid'
+         * having shuffled the rows.
+         */
+        assert(w >= 2);
+        assert(w < lenof(groups));
+        group = groups[w].groups + random_upto(rs, groups[w].ngroups);
+        assert(group->order == w);
+        memset(soln, 0, a);
+        for (i = 0; i < w; i++)
+            soln[i] = i+1;
+        qh = qt = 0;
+        grid[qt++] = 1;
+        while (qh < qt) {
+            digit *row, *newrow;
+
+            i = grid[qh++];
+            row = soln + (i-1)*w;
+
+            for (j = 0; j < group->ngens; j++) {
+                int nri;
+                const char *gen = group->gens + j*w;
+
+                /*
+                 * Apply each group generator to row, constructing a
+                 * new row.
+                 */
+                nri = gen[row[0]-1] - 'A' + 1;   /* which row is it? */
+                newrow = soln + (nri-1)*w;
+                if (!newrow[0]) {   /* not done yet */
+                    for (k = 0; k < w; k++)
+                        newrow[k] = gen[row[k]-1] - 'A' + 1;
+                    grid[qt++] = nri;
+                }
+            }
+        }
+        /* That's got the canonical table. Now shuffle it. */
+        for (i = 0; i < w; i++)
+            soln2[i] = i;
+        if (params->id)                /* do we shuffle in the identity? */
+            shuffle(soln2+1, w-1, sizeof(*soln2), rs);
+        else
+            shuffle(soln2, w, sizeof(*soln2), rs);
+        for (i = 0; i < w; i++)
+            for (j = 0; j < w; j++)
+                grid[(soln2[i])*w+(soln2[j])] = soln2[soln[i*w+j]-1]+1;
+
+        /*
+         * Remove entries one by one while the puzzle is still
+         * soluble at the appropriate difficulty level.
+         */
+        memcpy(soln, grid, a);
+        if (!params->id) {
+            /*
+             * Start by blanking the entire identity row and column,
+             * and also another row and column so that the player
+             * can't trivially determine which element is the
+             * identity.
+             */
+
+            j = 1 + random_upto(rs, w-1);  /* pick a second row/col to blank */
+            for (i = 0; i < w; i++) {
+                grid[(soln2[0])*w+i] = grid[i*w+(soln2[0])] = 0;
+                grid[(soln2[j])*w+i] = grid[i*w+(soln2[j])] = 0;
+            }
+
+            memcpy(soln2, grid, a);
+            if (solver(params, soln2, diff) > diff)
+                continue;              /* go round again if that didn't work */
+        }
+
+        k = 0;
+        for (i = (params->id ? 1 : 0); i < w; i++)
+            for (j = (params->id ? 1 : 0); j < w; j++)
+                if (grid[i*w+j])
+                    indices[k++] = i*w+j;
+        shuffle(indices, k, sizeof(*indices), rs);
+
+        for (i = 0; i < k; i++) {
+            memcpy(soln2, grid, a);
+            soln2[indices[i]] = 0;
+            if (solver(params, soln2, diff) <= diff)
+                grid[indices[i]] = 0;
+        }
+
+        /*
+         * Make sure the puzzle isn't too easy.
+         */
+        if (diff > 0) {
+            memcpy(soln2, grid, a);
+            if (solver(params, soln2, diff-1) < diff)
+                continue;              /* go round and try again */
+        }
+
+        /*
+         * Done.
+         */
+        break;
+    }
+
+    /*
+     * Encode the puzzle description.
+     */
+    desc = snewn(a*20, char);
+    p = encode_grid(desc, grid, a);
+    *p++ = '\0';
+    desc = sresize(desc, p - desc, char);
+
+    /*
+     * Encode the solution.
+     */
+    *aux = snewn(a+2, char);
+    (*aux)[0] = 'S';
+    for (i = 0; i < a; i++)
+        (*aux)[i+1] = TOCHAR(soln[i], params->id);
+    (*aux)[a+1] = '\0';
+
+    sfree(grid);
+    sfree(soln);
+    sfree(soln2);
+    sfree(indices);
+
+    return desc;
+}
+
+/* ----------------------------------------------------------------------
+ * Gameplay.
+ */
+
+static const char *validate_grid_desc(const char **pdesc, int range, int area)
+{
+    const char *desc = *pdesc;
+    int squares = 0;
+    while (*desc && *desc != ',') {
+        int n = *desc++;
+        if (n >= 'a' && n <= 'z') {
+            squares += n - 'a' + 1;
+        } else if (n == '_') {
+            /* do nothing */;
+        } else if (n > '0' && n <= '9') {
+            int val = atoi(desc-1);
+            if (val < 1 || val > range)
+                return "Out-of-range number in game description";
+            squares++;
+            while (*desc >= '0' && *desc <= '9')
+                desc++;
+        } else
+            return "Invalid character in game description";
+    }
+
+    if (squares < area)
+        return "Not enough data to fill grid";
+
+    if (squares > area)
+        return "Too much data to fit in grid";
+    *pdesc = desc;
+    return NULL;
+}
+
+static const char *validate_desc(const game_params *params, const char *desc)
+{
+    int w = params->w, a = w*w;
+    const char *p = desc;
+
+    return validate_grid_desc(&p, w, a);
+}
+
+static const char *spec_to_grid(const char *desc, digit *grid, int area)
+{
+    int i = 0;
+    while (*desc && *desc != ',') {
+        int n = *desc++;
+        if (n >= 'a' && n <= 'z') {
+            int run = n - 'a' + 1;
+            assert(i + run <= area);
+            while (run-- > 0)
+                grid[i++] = 0;
+        } else if (n == '_') {
+            /* do nothing */;
+        } else if (n > '0' && n <= '9') {
+            assert(i < area);
+            grid[i++] = atoi(desc-1);
+            while (*desc >= '0' && *desc <= '9')
+                desc++;
+        } else {
+            assert(!"We can't get here");
+        }
+    }
+    assert(i == area);
+    return desc;
+}
+
+static game_state *new_game(midend *me, const game_params *params,
+                            const char *desc)
+{
+    int w = params->w, a = w*w;
+    game_state *state = snew(game_state);
+    int i;
+
+    state->par = *params;              /* structure copy */
+    state->grid = snewn(a, digit);
+    state->common = snew(group_common);
+    state->common->refcount = 1;
+    state->common->immutable = snewn(a, bool);
+    state->pencil = snewn(a, int);
+    for (i = 0; i < a; i++) {
+        state->grid[i] = 0;
+        state->common->immutable[i] = false;
+        state->pencil[i] = 0;
+    }
+    state->sequence = snewn(w, digit);
+    state->dividers = snewn(w, int);
+    for (i = 0; i < w; i++) {
+        state->sequence[i] = i;
+        state->dividers[i] = -1;
+    }
+
+    desc = spec_to_grid(desc, state->grid, a);
+    for (i = 0; i < a; i++)
+        if (state->grid[i] != 0)
+            state->common->immutable[i] = true;
+
+    state->completed = false;
+    state->cheated = false;
+
+    return state;
+}
+
+static game_state *dup_game(const game_state *state)
+{
+    int w = state->par.w, a = w*w;
+    game_state *ret = snew(game_state);
+
+    ret->par = state->par;             /* structure copy */
+
+    ret->grid = snewn(a, digit);
+    ret->common = state->common;
+    ret->common->refcount++;
+    ret->pencil = snewn(a, int);
+    ret->sequence = snewn(w, digit);
+    ret->dividers = snewn(w, int);
+    memcpy(ret->grid, state->grid, a*sizeof(digit));
+    memcpy(ret->pencil, state->pencil, a*sizeof(int));
+    memcpy(ret->sequence, state->sequence, w*sizeof(digit));
+    memcpy(ret->dividers, state->dividers, w*sizeof(int));
+
+    ret->completed = state->completed;
+    ret->cheated = state->cheated;
+
+    return ret;
+}
+
+static void free_game(game_state *state)
+{
+    sfree(state->grid);
+    if (--state->common->refcount == 0) {
+        sfree(state->common->immutable);
+        sfree(state->common);
+    }
+    sfree(state->pencil);
+    sfree(state->sequence);
+    sfree(state);
+}
+
+static char *solve_game(const game_state *state, const game_state *currstate,
+                        const char *aux, const char **error)
+{
+    int w = state->par.w, a = w*w;
+    int i, ret;
+    digit *soln;
+    char *out;
+
+    if (aux)
+        return dupstr(aux);
+
+    soln = snewn(a, digit);
+    memcpy(soln, state->grid, a*sizeof(digit));
+
+    ret = solver(&state->par, soln, DIFFCOUNT-1);
+
+    if (ret == diff_impossible) {
+        *error = "No solution exists for this puzzle";
+        out = NULL;
+    } else if (ret == diff_ambiguous) {
+        *error = "Multiple solutions exist for this puzzle";
+        out = NULL;
+    } else {
+        out = snewn(a+2, char);
+        out[0] = 'S';
+        for (i = 0; i < a; i++)
+            out[i+1] = TOCHAR(soln[i], state->par.id);
+        out[a+1] = '\0';
+    }
+
+    sfree(soln);
+    return out;
+}
+
+static bool game_can_format_as_text_now(const game_params *params)
+{
+    return true;
+}
+
+static char *game_text_format(const game_state *state)
+{
+    int w = state->par.w;
+    int x, y;
+    char *ret, *p, ch;
+
+    ret = snewn(2*w*w+1, char);        /* leave room for terminating NUL */
+
+    p = ret;
+    for (y = 0; y < w; y++) {
+        for (x = 0; x < w; x++) {
+            digit d = state->grid[y*w+x];
+
+            if (d == 0) {
+                ch = '.';
+            } else {
+                ch = TOCHAR(d, state->par.id);
+            }
+
+            *p++ = ch;
+            if (x == w-1) {
+                *p++ = '\n';
+            } else {
+                *p++ = ' ';
+            }
+        }
+    }
+
+    assert(p - ret == 2*w*w);
+    *p = '\0';
+    return ret;
+}
+
+struct game_ui {
+    /*
+     * These are the coordinates of the primary highlighted square on
+     * the grid, if hshow = 1.
+     */
+    int hx, hy;
+    /*
+     * These are the coordinates hx,hy _before_ they go through
+     * state->sequence.
+     */
+    int ohx, ohy;
+    /*
+     * These variables give the length and displacement of a diagonal
+     * sequence of highlighted squares starting at ohx,ohy (still if
+     * hshow = 1). To find the squares' real coordinates, for 0<=i<dn,
+     * compute ohx+i*odx and ohy+i*ody and then map through
+     * state->sequence.
+     */
+    int odx, ody, odn;
+    /*
+     * This indicates whether the current highlight is a
+     * pencil-mark one or a real one.
+     */
+    bool hpencil;
+    /*
+     * This indicates whether or not we're showing the highlight
+     * (used to be hx = hy = -1); important so that when we're
+     * using the cursor keys it doesn't keep coming back at a
+     * fixed position. When hshow = 1, pressing a valid number
+     * or letter key or Space will enter that number or letter in the grid.
+     */
+    bool hshow;
+    /*
+     * This indicates whether we're using the highlight as a cursor;
+     * it means that it doesn't vanish on a keypress, and that it is
+     * allowed on immutable squares.
+     */
+    bool hcursor;
+    /*
+     * This indicates whether we're dragging a table header to
+     * reposition an entire row or column.
+     */
+    int drag;                          /* 0=none 1=row 2=col */
+    int dragnum;                       /* element being dragged */
+    int dragpos;                       /* its current position */
+    int edgepos;
+
+    /*
+     * User preference option: if the user right-clicks in a square
+     * and presses a letter key to add/remove a pencil mark, do we
+     * hide the mouse highlight again afterwards?
+     *
+     * Historically our answer was yes. The Android port prefers no.
+     * There are advantages both ways, depending how much you dislike
+     * the highlight cluttering your view. So it's a preference.
+     */
+    bool pencil_keep_highlight;
+};
+
+static game_ui *new_ui(const game_state *state)
+{
+    game_ui *ui = snew(game_ui);
+
+    ui->hx = ui->hy = 0;
+    ui->hpencil = false;
+    ui->hshow = false;
+    ui->hcursor = false;
+    ui->drag = 0;
+
+    ui->pencil_keep_highlight = false;
+
+    return ui;
+}
+
+static void free_ui(game_ui *ui)
+{
+    sfree(ui);
+}
+
+static config_item *get_prefs(game_ui *ui)
+{
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Keep mouse highlight after changing a pencil mark";
+    ret[0].kw = "pencil-keep-highlight";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->pencil_keep_highlight;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
+}
+
+static void set_prefs(game_ui *ui, const config_item *cfg)
+{
+    ui->pencil_keep_highlight = cfg[0].u.boolean.bval;
+}
+
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
+{
+    int w = newstate->par.w;
+    /*
+     * We prevent pencil-mode highlighting of a filled square, unless
+     * we're using the cursor keys. So if the user has just filled in
+     * a square which we had a pencil-mode highlight in (by Undo, or
+     * by Redo, or by Solve), then we cancel the highlight.
+     */
+    if (ui->hshow && ui->hpencil && !ui->hcursor &&
+        newstate->grid[ui->hy * w + ui->hx] != 0) {
+        ui->hshow = false;
+    }
+    if (ui->hshow && ui->odn > 1) {
+        /*
+         * Reordering of rows or columns within the range of a
+         * multifill selection cancels the multifill and deselects
+         * everything.
+         */
+        int i;
+        for (i = 0; i < ui->odn; i++) {
+            if (oldstate->sequence[ui->ohx + i*ui->odx] !=
+                newstate->sequence[ui->ohx + i*ui->odx]) {
+                ui->hshow = false;
+                break;
+            }
+            if (oldstate->sequence[ui->ohy + i*ui->ody] !=
+                newstate->sequence[ui->ohy + i*ui->ody]) {
+                ui->hshow = false;
+                break;
+            }
+        }
+    } else if (ui->hshow &&
+               (newstate->sequence[ui->ohx] != ui->hx ||
+                newstate->sequence[ui->ohy] != ui->hy)) {
+        /*
+         * Otherwise, reordering of the row or column containing the
+         * selection causes the selection to move with it.
+         */
+        int i;
+        for (i = 0; i < w; i++) {
+            if (newstate->sequence[i] == ui->hx)
+                ui->ohx = i;
+            if (newstate->sequence[i] == ui->hy)
+                ui->ohy = i;
+        }
+    }
+}
+
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (ui->hshow && button == CURSOR_SELECT)
+        return ui->hpencil ? "Ink" : "Pencil";
+    if (ui->hshow && button == CURSOR_SELECT2) {
+        int w = state->par.w;
+        int i;
+        for (i = 0; i < ui->odn; i++) {
+            int x = state->sequence[ui->ohx + i*ui->odx];
+            int y = state->sequence[ui->ohy + i*ui->ody];
+            int index = y*w+x;
+            if (ui->hpencil && state->grid[index]) return "";
+            if (state->common->immutable[index]) return "";
+        }
+        return "Clear";
+    }
+    return "";
+}
+
+#define PREFERRED_TILESIZE 48
+#define TILESIZE (ds->tilesize)
+#define BORDER (TILESIZE / 2)
+#define LEGEND (TILESIZE)
+#define GRIDEXTRA max((TILESIZE / 32),1)
+#define COORD(x) ((x)*TILESIZE + BORDER + LEGEND)
+#define FROMCOORD(x) (((x)+(TILESIZE-BORDER-LEGEND)) / TILESIZE - 1)
+
+#define FLASH_TIME 0.4F
+
+#define DF_DIVIDER_TOP 0x1000
+#define DF_DIVIDER_BOT 0x2000
+#define DF_DIVIDER_LEFT 0x4000
+#define DF_DIVIDER_RIGHT 0x8000
+#define DF_HIGHLIGHT 0x0400
+#define DF_HIGHLIGHT_PENCIL 0x0200
+#define DF_IMMUTABLE 0x0100
+#define DF_LEGEND 0x0080
+#define DF_DIGIT_MASK 0x001F
+
+#define EF_DIGIT_SHIFT 5
+#define EF_DIGIT_MASK ((1 << EF_DIGIT_SHIFT) - 1)
+#define EF_LEFT_SHIFT 0
+#define EF_RIGHT_SHIFT (3*EF_DIGIT_SHIFT)
+#define EF_LEFT_MASK ((1UL << (3*EF_DIGIT_SHIFT)) - 1UL)
+#define EF_RIGHT_MASK (EF_LEFT_MASK << EF_RIGHT_SHIFT)
+#define EF_LATIN (1UL << (6*EF_DIGIT_SHIFT))
+
+struct game_drawstate {
+    game_params par;
+    int w, tilesize;
+    bool started;
+    long *tiles, *legend, *pencil, *errors;
+    long *errtmp;
+    digit *sequence;
+};
+
+static bool check_errors(const game_state *state, long *errors)
+{
+    int w = state->par.w, a = w*w;
+    digit *grid = state->grid;
+    int i, j, k, x, y;
+    bool errs = false;
+
+    /*
+     * To verify that we have a valid group table, it suffices to
+     * test latin-square-hood and associativity only. All the other
+     * group axioms follow from those two.
+     *
+     * Proof:
+     *
+     * Associativity is given; closure is obvious from latin-
+     * square-hood. We need to show that an identity exists and that
+     * every element has an inverse.
+     *
+     * Identity: take any element a. There will be some element e
+     * such that ea=a (in a latin square, every element occurs in
+     * every row and column, so a must occur somewhere in the a
+     * column, say on row e). For any other element b, there must
+     * exist x such that ax=b (same argument from latin-square-hood
+     * again), and then associativity gives us eb = e(ax) = (ea)x =
+     * ax = b. Hence eb=b for all b, i.e. e is a left-identity. A
+     * similar argument tells us that there must be some f which is
+     * a right-identity, and then we show they are the same element
+     * by observing that ef must simultaneously equal e and equal f.
+     *
+     * Inverses: given any a, by the latin-square argument again,
+     * there must exist p and q such that pa=e and aq=e (i.e. left-
+     * and right-inverses). We can show these are equal by
+     * associativity: p = pe = p(aq) = (pa)q = eq = q. []
+     */
+
+    if (errors)
+        for (i = 0; i < a; i++)
+            errors[i] = 0;
+
+    for (y = 0; y < w; y++) {
+        unsigned long mask = 0, errmask = 0;
+        for (x = 0; x < w; x++) {
+            unsigned long bit = 1UL << grid[y*w+x];
+            errmask |= (mask & bit);
+            mask |= bit;
+        }
+
+        if (mask != (1 << (w+1)) - (1 << 1)) {
+            errs = true;
+            errmask &= ~1UL;
+            if (errors) {
+                for (x = 0; x < w; x++)
+                    if (errmask & (1UL << grid[y*w+x]))
+                        errors[y*w+x] |= EF_LATIN;
+            }
+        }
+    }
+
+    for (x = 0; x < w; x++) {
+        unsigned long mask = 0, errmask = 0;
+        for (y = 0; y < w; y++) {
+            unsigned long bit = 1UL << grid[y*w+x];
+            errmask |= (mask & bit);
+            mask |= bit;
+        }
+
+        if (mask != (1 << (w+1)) - (1 << 1)) {
+            errs = true;
+            errmask &= ~1UL;
+            if (errors) {
+                for (y = 0; y < w; y++)
+                    if (errmask & (1UL << grid[y*w+x]))
+                        errors[y*w+x] |= EF_LATIN;
+            }
+        }
+    }
+
+    for (i = 1; i < w; i++)
+        for (j = 1; j < w; j++)
+            for (k = 1; k < w; k++)
+                if (grid[i*w+j] && grid[j*w+k] &&
+                    grid[(grid[i*w+j]-1)*w+k] &&
+                    grid[i*w+(grid[j*w+k]-1)] &&
+                    grid[(grid[i*w+j]-1)*w+k] != grid[i*w+(grid[j*w+k]-1)]) {
+                    if (errors) {
+                        int a = i+1, b = j+1, c = k+1;
+                        int ab = grid[i*w+j], bc = grid[j*w+k];
+                        int left = (ab-1)*w+(c-1), right = (a-1)*w+(bc-1);
+                        /*
+                         * If the appropriate error slot is already
+                         * used for one of the squares, we don't
+                         * fill either of them.
+                         */
+                        if (!(errors[left] & EF_LEFT_MASK) &&
+                            !(errors[right] & EF_RIGHT_MASK)) {
+                            long err;
+                            err = a;
+                            err = (err << EF_DIGIT_SHIFT) | b;
+                            err = (err << EF_DIGIT_SHIFT) | c;
+                            errors[left] |= err << EF_LEFT_SHIFT;
+                            errors[right] |= err << EF_RIGHT_SHIFT;
+                        }
+                    }
+                    errs = true;
+                }
+
+    return errs;
+}
+
+static int find_in_sequence(digit *seq, int len, digit n)
+{
+    int i;
+
+    for (i = 0; i < len; i++)
+        if (seq[i] == n)
+            return i;
+
+    assert(!"Should never get here");
+    return -1;
+}
+
+static char *interpret_move(const game_state *state, game_ui *ui,
+                            const game_drawstate *ds,
+                            int x, int y, int button)
+{
+    int w = state->par.w;
+    int tx, ty;
+    char buf[80];
+
+    button = STRIP_BUTTON_MODIFIERS(button);
+
+    tx = FROMCOORD(x);
+    ty = FROMCOORD(y);
+
+    if (ui->drag) {
+        if (IS_MOUSE_DRAG(button)) {
+            int tcoord = ((ui->drag &~ 4) == 1 ? ty : tx);
+            ui->drag |= 4;             /* some movement has happened */
+            if (tcoord >= 0 && tcoord < w) {
+                ui->dragpos = tcoord;
+                return MOVE_UI_UPDATE;
+            }
+        } else if (IS_MOUSE_RELEASE(button)) {
+            if (ui->drag & 4) {
+                ui->drag = 0;          /* end drag */
+                if (state->sequence[ui->dragpos] == ui->dragnum)
+                    return MOVE_UI_UPDATE;  /* drag was a no-op overall */
+                sprintf(buf, "D%d,%d", ui->dragnum, ui->dragpos);
+                return dupstr(buf);
+            } else {
+                ui->drag = 0;          /* end 'drag' */
+                if (ui->edgepos > 0 && ui->edgepos < w) {
+                    sprintf(buf, "V%d,%d",
+                            state->sequence[ui->edgepos-1],
+                            state->sequence[ui->edgepos]);
+                    return dupstr(buf);
+                } else
+                    return MOVE_UI_UPDATE;  /* no-op */
+            }
+        }
+    } else if (IS_MOUSE_DOWN(button)) {
+        if (tx >= 0 && tx < w && ty >= 0 && ty < w) {
+            int otx = tx, oty = ty;
+            tx = state->sequence[tx];
+            ty = state->sequence[ty];
+            if (button == LEFT_BUTTON) {
+                if (tx == ui->hx && ty == ui->hy &&
+                    ui->hshow && !ui->hpencil) {
+                    ui->hshow = false;
+                } else {
+                    ui->hx = tx;
+                    ui->hy = ty;
+                    ui->ohx = otx;
+                    ui->ohy = oty;
+                    ui->odx = ui->ody = 0;
+                    ui->odn = 1;
+                    ui->hshow = !state->common->immutable[ty*w+tx];
+                    ui->hpencil = false;
+                }
+                ui->hcursor = false;
+                return MOVE_UI_UPDATE;
+            }
+            if (button == RIGHT_BUTTON) {
+                /*
+                 * Pencil-mode highlighting for non filled squares.
+                 */
+                if (state->grid[ty*w+tx] == 0) {
+                    if (tx == ui->hx && ty == ui->hy &&
+                        ui->hshow && ui->hpencil) {
+                        ui->hshow = false;
+                    } else {
+                        ui->hpencil = true;
+                        ui->hx = tx;
+                        ui->hy = ty;
+                        ui->ohx = otx;
+                        ui->ohy = oty;
+                        ui->odx = ui->ody = 0;
+                        ui->odn = 1;
+                        ui->hshow = true;
+                    }
+                } else {
+                    ui->hshow = false;
+                }
+                ui->hcursor = false;
+                return MOVE_UI_UPDATE;
+            }
+        } else if (tx >= 0 && tx < w && ty == -1) {
+            ui->drag = 2;
+            ui->dragnum = state->sequence[tx];
+            ui->dragpos = tx;
+            ui->edgepos = FROMCOORD(x + TILESIZE/2);
+            return MOVE_UI_UPDATE;
+        } else if (ty >= 0 && ty < w && tx == -1) {
+            ui->drag = 1;
+            ui->dragnum = state->sequence[ty];
+            ui->dragpos = ty;
+            ui->edgepos = FROMCOORD(y + TILESIZE/2);
+            return MOVE_UI_UPDATE;
+        }
+    } else if (IS_MOUSE_DRAG(button)) {
+        if (!ui->hpencil &&
+            tx >= 0 && tx < w && ty >= 0 && ty < w &&
+            abs(tx - ui->ohx) == abs(ty - ui->ohy)) {
+            ui->odn = abs(tx - ui->ohx) + 1;
+            ui->odx = (tx < ui->ohx ? -1 : +1);
+            ui->ody = (ty < ui->ohy ? -1 : +1);
+        } else {
+            ui->odx = ui->ody = 0;
+            ui->odn = 1;
+        }
+        return MOVE_UI_UPDATE;
+    }
+
+    if (IS_CURSOR_MOVE(button)) {
+        int cx = find_in_sequence(state->sequence, w, ui->hx);
+        int cy = find_in_sequence(state->sequence, w, ui->hy);
+        move_cursor(button, &cx, &cy, w, w, false, NULL);
+        ui->hx = state->sequence[cx];
+        ui->hy = state->sequence[cy];
+        ui->hshow = true;
+        ui->hcursor = true;
+        ui->ohx = cx;
+        ui->ohy = cy;
+        ui->odx = ui->ody = 0;
+        ui->odn = 1;
+        return MOVE_UI_UPDATE;
+    }
+    if (ui->hshow &&
+        (button == CURSOR_SELECT)) {
+        ui->hpencil = !ui->hpencil;
+        ui->hcursor = true;
+        return MOVE_UI_UPDATE;
+    }
+
+    if (ui->hshow &&
+        ((ISCHAR(button) && FROMCHAR(button, state->par.id) <= w) ||
+         button == CURSOR_SELECT2 || button == '\b')) {
+        int n = FROMCHAR(button, state->par.id);
+        int i, buflen;
+        char *movebuf;
+
+        if (button == CURSOR_SELECT2 || button == '\b')
+            n = 0;
+
+        for (i = 0; i < ui->odn; i++) {
+            int x = state->sequence[ui->ohx + i*ui->odx];
+            int y = state->sequence[ui->ohy + i*ui->ody];
+            int index = y*w+x;
+
+            /*
+             * Can't make pencil marks in a filled square. This can only
+             * become highlighted if we're using cursor keys.
+             */
+            if (ui->hpencil && state->grid[index])
+                return NULL;
+
+            /*
+             * Can't do anything to an immutable square. Exception:
+             * trying to set it to what it already was is OK (so that
+             * multifilling can set a whole diagonal to a without
+             * having to detour round the one immutable square in the
+             * middle that already said a).
+             */
+            if (!ui->hpencil && state->grid[index] == n)
+                /* OK even if it is immutable */;
+            else if (state->common->immutable[index])
+                return NULL;
+        }
+
+        movebuf = snewn(80 * ui->odn, char);
+        buflen = sprintf(movebuf, "%c%d,%d,%d",
+                         (char)(ui->hpencil && n > 0 ? 'P' : 'R'),
+                         ui->hx, ui->hy, n);
+        for (i = 1; i < ui->odn; i++) {
+            assert(buflen < i*80);
+            buflen += sprintf(movebuf + buflen, "+%d,%d",
+                              state->sequence[ui->ohx + i*ui->odx],
+                              state->sequence[ui->ohy + i*ui->ody]);
+        }
+        movebuf = sresize(movebuf, buflen+1, char);
+
+        /*
+         * Hide the highlight after a keypress, if it was mouse-
+         * generated. Also, don't hide it if this move has changed
+         * pencil marks and the user preference says not to hide the
+         * highlight in that situation.
+         */
+        if (!ui->hcursor && !(ui->hpencil && ui->pencil_keep_highlight))
+            ui->hshow = false;
+
+        return movebuf;
+    }
+
+    if (button == 'M' || button == 'm')
+        return dupstr("M");
+
+    return NULL;
+}
+
+static game_state *execute_move(const game_state *from, const char *move)
+{
+    int w = from->par.w, a = w*w;
+    game_state *ret;
+    int x, y, i, j, n, pos;
+
+    if (move[0] == 'S') {
+        ret = dup_game(from);
+        ret->completed = ret->cheated = true;
+
+        for (i = 0; i < a; i++) {
+            if (!ISCHAR(move[i+1]) || FROMCHAR(move[i+1], from->par.id) > w) {
+                free_game(ret);
+                return NULL;
+            }
+            ret->grid[i] = FROMCHAR(move[i+1], from->par.id);
+            ret->pencil[i] = 0;
+        }
+
+        if (move[a+1] != '\0') {
+            free_game(ret);
+            return NULL;
+        }
+
+        return ret;
+    } else if ((move[0] == 'P' || move[0] == 'R') &&
+               sscanf(move+1, "%d,%d,%d%n", &x, &y, &n, &pos) == 3 &&
+               n >= 0 && n <= w) {
+        const char *mp = move + 1 + pos;
+        bool pencil = (move[0] == 'P');
+        ret = dup_game(from);
+
+        while (1) {
+            if (x < 0 || x >= w || y < 0 || y >= w) {
+                free_game(ret);
+                return NULL;
+            }
+            if (from->common->immutable[y*w+x] &&
+                !(!pencil && from->grid[y*w+x] == n))
+                return NULL;
+
+            if (move[0] == 'P' && n > 0) {
+                ret->pencil[y*w+x] ^= 1 << n;
+            } else {
+                ret->grid[y*w+x] = n;
+                ret->pencil[y*w+x] = 0;
+            }
+
+            if (!*mp)
+                break;
+
+            if (*mp != '+')
+                return NULL;
+            if (sscanf(mp, "+%d,%d%n", &x, &y, &pos) < 2)
+                return NULL;
+            mp += pos;
+        }
+
+        if (!ret->completed && !check_errors(ret, NULL))
+            ret->completed = true;
+
+        return ret;
+    } else if (move[0] == 'M') {
+        /*
+         * Fill in absolutely all pencil marks everywhere. (I
+         * wouldn't use this for actual play, but it's a handy
+         * starting point when following through a set of
+         * diagnostics output by the standalone solver.)
+         */
+        ret = dup_game(from);
+        for (i = 0; i < a; i++) {
+            if (!ret->grid[i])
+                ret->pencil[i] = (1 << (w+1)) - (1 << 1);
+        }
+        return ret;
+    } else if (move[0] == 'D' &&
+               sscanf(move+1, "%d,%d", &x, &y) == 2) {
+        /*
+         * Reorder the rows and columns so that digit x is in position
+         * y.
+         */
+        ret = dup_game(from);
+        for (i = j = 0; i < w; i++) {
+            if (i == y) {
+                ret->sequence[i] = x;
+            } else {
+                if (from->sequence[j] == x)
+                    j++;
+                ret->sequence[i] = from->sequence[j++];
+            }
+        }
+        /*
+         * Eliminate any obsoleted dividers.
+         */
+        for (x = 0; x < w; x++) {
+            int i = ret->sequence[x];
+            int j = (x+1 < w ? ret->sequence[x+1] : -1);
+            if (ret->dividers[i] != j)
+                ret->dividers[i] = -1;
+        }
+        return ret;
+    } else if (move[0] == 'V' &&
+               sscanf(move+1, "%d,%d", &i, &j) == 2) {
+        ret = dup_game(from);
+        if (ret->dividers[i] == j)
+            ret->dividers[i] = -1;
+        else
+            ret->dividers[i] = j;
+        return ret;
+    } else
+        return NULL;                   /* couldn't parse move string */
+}
+
+/* ----------------------------------------------------------------------
+ * Drawing routines.
+ */
+
+#define SIZE(w) ((w) * TILESIZE + 2*BORDER + LEGEND)
+
+static void game_compute_size(const game_params *params, int tilesize,
+                              const game_ui *ui, int *x, int *y)
+{
+    /* Ick: fake up `ds->tilesize' for macro expansion purposes */
+    struct { int tilesize; } ads, *ds = &ads;
+    ads.tilesize = tilesize;
+
+    *x = *y = SIZE(params->w);
+}
+
+static void game_set_size(drawing *dr, game_drawstate *ds,
+                          const game_params *params, int tilesize)
+{
+    ds->tilesize = tilesize;
+}
+
+static float *game_colours(frontend *fe, int *ncolours)
+{
+    float *ret = snewn(3 * NCOLOURS, float);
+
+    frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]);
+
+    ret[COL_GRID * 3 + 0] = 0.0F;
+    ret[COL_GRID * 3 + 1] = 0.0F;
+    ret[COL_GRID * 3 + 2] = 0.0F;
+
+    ret[COL_USER * 3 + 0] = 0.0F;
+    ret[COL_USER * 3 + 1] = 0.6F * ret[COL_BACKGROUND * 3 + 1];
+    ret[COL_USER * 3 + 2] = 0.0F;
+
+    ret[COL_HIGHLIGHT * 3 + 0] = 0.78F * ret[COL_BACKGROUND * 3 + 0];
+    ret[COL_HIGHLIGHT * 3 + 1] = 0.78F * ret[COL_BACKGROUND * 3 + 1];
+    ret[COL_HIGHLIGHT * 3 + 2] = 0.78F * ret[COL_BACKGROUND * 3 + 2];
+
+    ret[COL_ERROR * 3 + 0] = 1.0F;
+    ret[COL_ERROR * 3 + 1] = 0.0F;
+    ret[COL_ERROR * 3 + 2] = 0.0F;
+
+    ret[COL_PENCIL * 3 + 0] = 0.5F * ret[COL_BACKGROUND * 3 + 0];
+    ret[COL_PENCIL * 3 + 1] = 0.5F * ret[COL_BACKGROUND * 3 + 1];
+    ret[COL_PENCIL * 3 + 2] = ret[COL_BACKGROUND * 3 + 2];
+
+    ret[COL_DIAGONAL * 3 + 0] = 0.95F * ret[COL_BACKGROUND * 3 + 0];
+    ret[COL_DIAGONAL * 3 + 1] = 0.95F * ret[COL_BACKGROUND * 3 + 1];
+    ret[COL_DIAGONAL * 3 + 2] = 0.95F * ret[COL_BACKGROUND * 3 + 2];
+
+    *ncolours = NCOLOURS;
+    return ret;
+}
+
+static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
+{
+    int w = state->par.w, a = w*w;
+    struct game_drawstate *ds = snew(struct game_drawstate);
+    int i;
+
+    ds->w = w;
+    ds->par = state->par;              /* structure copy */
+    ds->tilesize = 0;
+    ds->started = false;
+    ds->tiles = snewn(a, long);
+    ds->legend = snewn(w, long);
+    ds->pencil = snewn(a, long);
+    ds->errors = snewn(a, long);
+    ds->sequence = snewn(a, digit);
+    for (i = 0; i < a; i++)
+        ds->tiles[i] = ds->pencil[i] = -1;
+    for (i = 0; i < w; i++)
+        ds->legend[i] = -1;
+    ds->errtmp = snewn(a, long);
+
+    return ds;
+}
+
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
+{
+    sfree(ds->tiles);
+    sfree(ds->pencil);
+    sfree(ds->errors);
+    sfree(ds->errtmp);
+    sfree(ds->sequence);
+    sfree(ds);
+}
+
+static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y, long tile,
+                      long pencil, long error)
+{
+    int w = ds->w /* , a = w*w */;
+    int tx, ty, tw, th;
+    int cx, cy, cw, ch;
+    char str[64];
+
+    tx = BORDER + LEGEND + x * TILESIZE + 1;
+    ty = BORDER + LEGEND + y * TILESIZE + 1;
+
+    cx = tx;
+    cy = ty;
+    cw = tw = TILESIZE-1;
+    ch = th = TILESIZE-1;
+
+    if (tile & DF_LEGEND) {
+        cx += TILESIZE/10;
+        cy += TILESIZE/10;
+        cw -= TILESIZE/5;
+        ch -= TILESIZE/5;
+        tile |= DF_IMMUTABLE;
+    }
+
+    clip(dr, cx, cy, cw, ch);
+
+    /* background needs erasing */
+    draw_rect(dr, cx, cy, cw, ch,
+              (tile & DF_HIGHLIGHT) ? COL_HIGHLIGHT :
+              (x == y) ? COL_DIAGONAL : COL_BACKGROUND);
+
+    /* dividers */
+    if (tile & DF_DIVIDER_TOP)
+        draw_rect(dr, cx, cy, cw, 1, COL_GRID);
+    if (tile & DF_DIVIDER_BOT)
+        draw_rect(dr, cx, cy+ch-1, cw, 1, COL_GRID);
+    if (tile & DF_DIVIDER_LEFT)
+        draw_rect(dr, cx, cy, 1, ch, COL_GRID);
+    if (tile & DF_DIVIDER_RIGHT)
+        draw_rect(dr, cx+cw-1, cy, 1, ch, COL_GRID);
+
+    /* pencil-mode highlight */
+    if (tile & DF_HIGHLIGHT_PENCIL) {
+        int coords[6];
+        coords[0] = cx;
+        coords[1] = cy;
+        coords[2] = cx+cw/2;
+        coords[3] = cy;
+        coords[4] = cx;
+        coords[5] = cy+ch/2;
+        draw_polygon(dr, coords, 3, COL_HIGHLIGHT, COL_HIGHLIGHT);
+    }
+
+    /* new number needs drawing? */
+    if (tile & DF_DIGIT_MASK) {
+        str[1] = '\0';
+        str[0] = TOCHAR(tile & DF_DIGIT_MASK, ds->par.id);
+        draw_text(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                  FONT_VARIABLE, TILESIZE/2, ALIGN_VCENTRE | ALIGN_HCENTRE,
+                  (error & EF_LATIN) ? COL_ERROR :
+                  (tile & DF_IMMUTABLE) ? COL_GRID : COL_USER, str);
+
+        if (error & EF_LEFT_MASK) {
+            int a = (error >> (EF_LEFT_SHIFT+2*EF_DIGIT_SHIFT))&EF_DIGIT_MASK;
+            int b = (error >> (EF_LEFT_SHIFT+1*EF_DIGIT_SHIFT))&EF_DIGIT_MASK;
+            int c = (error >> (EF_LEFT_SHIFT                 ))&EF_DIGIT_MASK;
+            char buf[10];
+            sprintf(buf, "(%c%c)%c", TOCHAR(a, ds->par.id),
+                    TOCHAR(b, ds->par.id), TOCHAR(c, ds->par.id));
+            draw_text(dr, tx + TILESIZE/2, ty + TILESIZE/6,
+                      FONT_VARIABLE, TILESIZE/6, ALIGN_VCENTRE | ALIGN_HCENTRE,
+                      COL_ERROR, buf);
+        }
+        if (error & EF_RIGHT_MASK) {
+            int a = (error >> (EF_RIGHT_SHIFT+2*EF_DIGIT_SHIFT))&EF_DIGIT_MASK;
+            int b = (error >> (EF_RIGHT_SHIFT+1*EF_DIGIT_SHIFT))&EF_DIGIT_MASK;
+            int c = (error >> (EF_RIGHT_SHIFT                 ))&EF_DIGIT_MASK;
+            char buf[10];
+            sprintf(buf, "%c(%c%c)", TOCHAR(a, ds->par.id),
+                    TOCHAR(b, ds->par.id), TOCHAR(c, ds->par.id));
+            draw_text(dr, tx + TILESIZE/2, ty + TILESIZE - TILESIZE/6,
+                      FONT_VARIABLE, TILESIZE/6, ALIGN_VCENTRE | ALIGN_HCENTRE,
+                      COL_ERROR, buf);
+        }
+    } else {
+        int i, j, npencil;
+        int pl, pr, pt, pb;
+        float bestsize;
+        int pw, ph, minph, pbest, fontsize;
+
+        /* Count the pencil marks required. */
+        for (i = 1, npencil = 0; i <= w; i++)
+            if (pencil & (1 << i))
+                npencil++;
+        if (npencil) {
+
+            minph = 2;
+
+            /*
+             * Determine the bounding rectangle within which we're going
+             * to put the pencil marks.
+             */
+            /* Start with the whole square */
+            pl = tx + GRIDEXTRA;
+            pr = pl + TILESIZE - GRIDEXTRA;
+            pt = ty + GRIDEXTRA;
+            pb = pt + TILESIZE - GRIDEXTRA;
+
+            /*
+             * We arrange our pencil marks in a grid layout, with
+             * the number of rows and columns adjusted to allow the
+             * maximum font size.
+             *
+             * So now we work out what the grid size ought to be.
+             */
+            bestsize = 0.0;
+            pbest = 0;
+            /* Minimum */
+            for (pw = 3; pw < max(npencil,4); pw++) {
+                float fw, fh, fs;
+
+                ph = (npencil + pw - 1) / pw;
+                ph = max(ph, minph);
+                fw = (pr - pl) / (float)pw;
+                fh = (pb - pt) / (float)ph;
+                fs = min(fw, fh);
+                if (fs > bestsize) {
+                    bestsize = fs;
+                    pbest = pw;
+                }
+            }
+            assert(pbest > 0);
+            pw = pbest;
+            ph = (npencil + pw - 1) / pw;
+            ph = max(ph, minph);
+
+            /*
+             * Now we've got our grid dimensions, work out the pixel
+             * size of a grid element, and round it to the nearest
+             * pixel. (We don't want rounding errors to make the
+             * grid look uneven at low pixel sizes.)
+             */
+            fontsize = min((pr - pl) / pw, (pb - pt) / ph);
+
+            /*
+             * Centre the resulting figure in the square.
+             */
+            pl = tx + (TILESIZE - fontsize * pw) / 2;
+            pt = ty + (TILESIZE - fontsize * ph) / 2;
+
+            /*
+             * Now actually draw the pencil marks.
+             */
+            for (i = 1, j = 0; i <= w; i++)
+                if (pencil & (1 << i)) {
+                    int dx = j % pw, dy = j / pw;
+
+                    str[1] = '\0';
+                    str[0] = TOCHAR(i, ds->par.id);
+                    draw_text(dr, pl + fontsize * (2*dx+1) / 2,
+                              pt + fontsize * (2*dy+1) / 2,
+                              FONT_VARIABLE, fontsize,
+                              ALIGN_VCENTRE | ALIGN_HCENTRE, COL_PENCIL, str);
+                    j++;
+                }
+        }
+    }
+
+    unclip(dr);
+
+    draw_update(dr, cx, cy, cw, ch);
+}
+
+static void game_redraw(drawing *dr, game_drawstate *ds,
+                        const game_state *oldstate, const game_state *state,
+                        int dir, const game_ui *ui,
+                        float animtime, float flashtime)
+{
+    int w = state->par.w /*, a = w*w */;
+    int x, y, i, j;
+
+    if (!ds->started) {
+        /*
+         * Big containing rectangle.
+         */
+        draw_rect(dr, COORD(0) - GRIDEXTRA, COORD(0) - GRIDEXTRA,
+                  w*TILESIZE+1+GRIDEXTRA*2, w*TILESIZE+1+GRIDEXTRA*2,
+                  COL_GRID);
+
+        draw_update(dr, 0, 0, SIZE(w), SIZE(w));
+
+        ds->started = true;
+    }
+
+    check_errors(state, ds->errtmp);
+
+    /*
+     * Construct a modified version of state->sequence which takes
+     * into account an unfinished drag operation.
+     */
+    if (ui->drag) {
+        x = ui->dragnum;
+        y = ui->dragpos;
+    } else {
+        x = y = -1;
+    }
+    for (i = j = 0; i < w; i++) {
+        if (i == y) {
+            ds->sequence[i] = x;
+        } else {
+            if (state->sequence[j] == x)
+                j++;
+            ds->sequence[i] = state->sequence[j++];
+        }
+    }
+
+    /*
+     * Draw the table legend.
+     */
+    for (x = 0; x < w; x++) {
+        int sx = ds->sequence[x];
+        long tile = (sx+1) | DF_LEGEND;
+        if (ds->legend[x] != tile) {
+            ds->legend[x] = tile;
+            draw_tile(dr, ds, -1, x, tile, 0, 0);
+            draw_tile(dr, ds, x, -1, tile, 0, 0);
+        }
+    }
+
+    for (y = 0; y < w; y++) {
+        int sy = ds->sequence[y];
+        for (x = 0; x < w; x++) {
+            long tile = 0L, pencil = 0L, error;
+            int sx = ds->sequence[x];
+
+            if (state->grid[sy*w+sx])
+                tile = state->grid[sy*w+sx];
+            else
+                pencil = (long)state->pencil[sy*w+sx];
+
+            if (state->common->immutable[sy*w+sx])
+                tile |= DF_IMMUTABLE;
+
+            if ((ui->drag == 5 && ui->dragnum == sy) ||
+                (ui->drag == 6 && ui->dragnum == sx)) {
+                tile |= DF_HIGHLIGHT;
+            } else if (ui->hshow) {
+                int i = abs(x - ui->ohx);
+                bool highlight = false;
+                if (ui->odn > 1) {
+                    /*
+                     * When a diagonal multifill selection is shown,
+                     * we show it in its original grid position
+                     * regardless of in-progress row/col drags. Moving
+                     * every square about would be horrible.
+                     */
+                    if (i >= 0 && i < ui->odn &&
+                        x == ui->ohx + i*ui->odx &&
+                        y == ui->ohy + i*ui->ody)
+                        highlight = true;
+                } else {
+                    /*
+                     * For a single square, we move its highlight
+                     * around with the drag.
+                     */
+                    highlight = (ui->hx == sx && ui->hy == sy);
+                }
+                if (highlight)
+                    tile |= (ui->hpencil ? DF_HIGHLIGHT_PENCIL : DF_HIGHLIGHT);
+            }
+
+            if (flashtime > 0 &&
+                (flashtime <= FLASH_TIME/3 ||
+                 flashtime >= FLASH_TIME*2/3))
+                tile |= DF_HIGHLIGHT;  /* completion flash */
+
+            if (y <= 0 || state->dividers[ds->sequence[y-1]] == sy)
+                tile |= DF_DIVIDER_TOP;
+            if (y+1 >= w || state->dividers[sy] == ds->sequence[y+1])
+                tile |= DF_DIVIDER_BOT;
+            if (x <= 0 || state->dividers[ds->sequence[x-1]] == sx)
+                tile |= DF_DIVIDER_LEFT;
+            if (x+1 >= w || state->dividers[sx] == ds->sequence[x+1])
+                tile |= DF_DIVIDER_RIGHT;
+
+            error = ds->errtmp[sy*w+sx];
+
+            if (ds->tiles[y*w+x] != tile ||
+                ds->pencil[y*w+x] != pencil ||
+                ds->errors[y*w+x] != error) {
+                ds->tiles[y*w+x] = tile;
+                ds->pencil[y*w+x] = pencil;
+                ds->errors[y*w+x] = error;
+                draw_tile(dr, ds, x, y, tile, pencil, error);
+            }
+        }
+    }
+}
+
+static float game_anim_length(const game_state *oldstate,
+                              const game_state *newstate, int dir, game_ui *ui)
+{
+    return 0.0F;
+}
+
+static float game_flash_length(const game_state *oldstate,
+                               const game_state *newstate, int dir, game_ui *ui)
+{
+    if (!oldstate->completed && newstate->completed &&
+        !oldstate->cheated && !newstate->cheated)
+        return FLASH_TIME;
+    return 0.0F;
+}
+
+static void game_get_cursor_location(const game_ui *ui,
+                                     const game_drawstate *ds,
+                                     const game_state *state,
+                                     const game_params *params,
+                                     int *x, int *y, int *w, int *h)
+{
+}
+
+static int game_status(const game_state *state)
+{
+    return state->completed ? +1 : 0;
+}
+
+static bool game_timing_state(const game_state *state, game_ui *ui)
+{
+    if (state->completed)
+        return false;
+    return true;
+}
+
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
+{
+    int pw, ph;
+
+    /*
+     * We use 9mm squares by default, like Solo.
+     */
+    game_compute_size(params, 900, ui, &pw, &ph);
+    *x = pw / 100.0F;
+    *y = ph / 100.0F;
+}
+
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
+{
+    int w = state->par.w;
+    int ink = print_mono_colour(dr, 0);
+    int x, y;
+
+    /* Ick: fake up `ds->tilesize' for macro expansion purposes */
+    game_drawstate ads, *ds = &ads;
+    game_set_size(dr, ds, NULL, tilesize);
+
+    /*
+     * Border.
+     */
+    print_line_width(dr, 3 * TILESIZE / 40);
+    draw_rect_outline(dr, BORDER + LEGEND, BORDER + LEGEND,
+                      w*TILESIZE, w*TILESIZE, ink);
+
+    /*
+     * Legend on table.
+     */
+    for (x = 0; x < w; x++) {
+        char str[2];
+        str[1] = '\0';
+        str[0] = TOCHAR(x+1, state->par.id);
+        draw_text(dr, BORDER+LEGEND + x*TILESIZE + TILESIZE/2,
+                  BORDER + TILESIZE/2,
+                  FONT_VARIABLE, TILESIZE/2,
+                  ALIGN_VCENTRE | ALIGN_HCENTRE, ink, str);
+        draw_text(dr, BORDER + TILESIZE/2,
+                  BORDER+LEGEND + x*TILESIZE + TILESIZE/2,
+                  FONT_VARIABLE, TILESIZE/2,
+                  ALIGN_VCENTRE | ALIGN_HCENTRE, ink, str);
+    }
+
+    /*
+     * Main grid.
+     */
+    for (x = 1; x < w; x++) {
+        print_line_width(dr, TILESIZE / 40);
+        draw_line(dr, BORDER+LEGEND+x*TILESIZE, BORDER+LEGEND,
+                  BORDER+LEGEND+x*TILESIZE, BORDER+LEGEND+w*TILESIZE, ink);
+    }
+    for (y = 1; y < w; y++) {
+        print_line_width(dr, TILESIZE / 40);
+        draw_line(dr, BORDER+LEGEND, BORDER+LEGEND+y*TILESIZE,
+                  BORDER+LEGEND+w*TILESIZE, BORDER+LEGEND+y*TILESIZE, ink);
+    }
+
+    /*
+     * Numbers.
+     */
+    for (y = 0; y < w; y++)
+        for (x = 0; x < w; x++)
+            if (state->grid[y*w+x]) {
+                char str[2];
+                str[1] = '\0';
+                str[0] = TOCHAR(state->grid[y*w+x], state->par.id);
+                draw_text(dr, BORDER+LEGEND + x*TILESIZE + TILESIZE/2,
+                          BORDER+LEGEND + y*TILESIZE + TILESIZE/2,
+                          FONT_VARIABLE, TILESIZE/2,
+                          ALIGN_VCENTRE | ALIGN_HCENTRE, ink, str);
+            }
+}
+
+#ifdef COMBINED
+#define thegame group
+#endif
+
+const struct game thegame = {
+    "Group", NULL, NULL,
+    default_params,
+    game_fetch_preset, NULL,
+    decode_params,
+    encode_params,
+    free_params,
+    dup_params,
+    true, game_configure, custom_params,
+    validate_params,
+    new_game_desc,
+    validate_desc,
+    new_game,
+    dup_game,
+    free_game,
+    true, solve_game,
+    true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
+    new_ui,
+    free_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
+    NULL, /* game_request_keys */
+    game_changed_state,
+    current_key_label,
+    interpret_move,
+    execute_move,
+    PREFERRED_TILESIZE, game_compute_size, game_set_size,
+    game_colours,
+    game_new_drawstate,
+    game_free_drawstate,
+    game_redraw,
+    game_anim_length,
+    game_flash_length,
+    game_get_cursor_location,
+    game_status,
+    true, false, game_print_size, game_print,
+    false,                             /* wants_statusbar */
+    false, game_timing_state,
+    REQUIRE_RBUTTON | REQUIRE_NUMPAD,  /* flags */
+};
+
+#ifdef STANDALONE_SOLVER
+
+#include <stdarg.h>
+
+int main(int argc, char **argv)
+{
+    game_params *p;
+    game_state *s;
+    char *id = NULL, *desc;
+    const char *err;
+    digit *grid;
+    bool grade = false;
+    int ret, diff;
+    bool really_show_working = false;
+
+    while (--argc > 0) {
+        char *p = *++argv;
+        if (!strcmp(p, "-v")) {
+            really_show_working = true;
+        } else if (!strcmp(p, "-g")) {
+            grade = true;
+        } else if (*p == '-') {
+            fprintf(stderr, "%s: unrecognised option `%s'\n", argv[0], p);
+            return 1;
+        } else {
+            id = p;
+        }
+    }
+
+    if (!id) {
+        fprintf(stderr, "usage: %s [-g | -v] <game_id>\n", argv[0]);
+        return 1;
+    }
+
+    desc = strchr(id, ':');
+    if (!desc) {
+        fprintf(stderr, "%s: game id expects a colon in it\n", argv[0]);
+        return 1;
+    }
+    *desc++ = '\0';
+
+    p = default_params();
+    decode_params(p, id);
+    err = validate_desc(p, desc);
+    if (err) {
+        fprintf(stderr, "%s: %s\n", argv[0], err);
+        return 1;
+    }
+    s = new_game(NULL, p, desc);
+
+    grid = snewn(p->w * p->w, digit);
+
+    /*
+     * When solving a Normal puzzle, we don't want to bother the
+     * user with Hard-level deductions. For this reason, we grade
+     * the puzzle internally before doing anything else.
+     */
+    ret = -1;                          /* placate optimiser */
+    solver_show_working = 0;
+    for (diff = 0; diff < DIFFCOUNT; diff++) {
+        memcpy(grid, s->grid, p->w * p->w);
+        ret = solver(&s->par, grid, diff);
+        if (ret <= diff)
+            break;
+    }
+
+    if (diff == DIFFCOUNT) {
+        if (really_show_working) {
+            solver_show_working = true;
+            memcpy(grid, s->grid, p->w * p->w);
+            ret = solver(&s->par, grid, DIFFCOUNT - 1);
+        }
+        if (grade)
+            printf("Difficulty rating: ambiguous\n");
+        else
+            printf("Unable to find a unique solution\n");
+    } else {
+        if (grade) {
+            if (ret == diff_impossible)
+                printf("Difficulty rating: impossible (no solution exists)\n");
+            else
+                printf("Difficulty rating: %s\n", group_diffnames[ret]);
+        } else {
+            solver_show_working = really_show_working;
+            memcpy(grid, s->grid, p->w * p->w);
+            ret = solver(&s->par, grid, diff);
+            if (ret != diff)
+                printf("Puzzle is inconsistent\n");
+            else {
+                memcpy(s->grid, grid, p->w * p->w);
+                fputs(game_text_format(s), stdout);
+            }
+        }
+    }
+
+    return 0;
+}
+
+#endif
+
+/* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/puzzles/src/unfinished/group.gap b/apps/plugins/puzzles/src/unfinished/group.gap
new file mode 100644
index 0000000000..280adf4664
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/group.gap
@@ -0,0 +1,97 @@
+# run this file with
+#   gap -b -q < /dev/null group.gap | perl -pe 's/\\\n//s' | indent -kr
+
+Print("/* ----- data generated by group.gap begins ----- */\n\n");
+Print("struct group {\n    unsigned long autosize;\n");
+Print("    int order, ngens;\n    const char *gens;\n};\n");
+Print("struct groups {\n    int ngroups;\n");
+Print("    const struct group *groups;\n};\n\n");
+Print("static const struct group groupdata[] = {\n");
+offsets := [0];
+offset := 0;
+for n in [2..26] do
+  Print("    /* order ", n, " */\n");
+  for G in AllSmallGroups(n) do
+
+    # Construct a representation of the group G as a subgroup
+    # of a permutation group, and find its generators in that
+    # group.
+
+    # GAP has the 'IsomorphismPermGroup' function, but I don't want
+    # to use it because it doesn't guarantee that the permutation
+    # representation of the group forms a Cayley table. For example,
+    # C_4 could be represented as a subgroup of S_4 in many ways,
+    # and not all of them work: the group generated by (12) and (34)
+    # is clearly isomorphic to C_4 but its four elements do not form
+    # a Cayley table. The group generated by (12)(34) and (13)(24)
+    # is OK, though.
+    #
+    # Hence I construct the permutation representation _as_ the
+    # Cayley table, and then pick generators of that. This
+    # guarantees that when we rebuild the full group by BFS in
+    # group.c, we will end up with the right thing.
+
+    ge := Elements(G);
+    gi := [];
+    for g in ge do
+      gr := [];
+      for h in ge do
+        k := g*h;
+        for i in [1..n] do
+          if k = ge[i] then
+            Add(gr, i);
+          fi;
+        od;
+      od;
+      Add(gi, PermList(gr));
+    od;
+
+    # GAP has the 'GeneratorsOfGroup' function, but we don't want to
+    # use it because it's bad at picking generators - it thinks the
+    # generators of C_4 are [ (1,2)(3,4), (1,3,2,4) ] and that those
+    # of C_6 are [ (1,2,3)(4,5,6), (1,4)(2,5)(3,6) ] !
+
+    gl := ShallowCopy(Elements(gi));
+    Sort(gl, function(v,w) return Order(v) > Order(w); end);
+
+    gens := [];
+    for x in gl do
+      if gens = [] or not (x in gp) then
+        Add(gens, x);
+        gp := GroupWithGenerators(gens);
+      fi;
+    od;
+
+    # Construct the C representation of the group generators.
+    s := [];
+    for x in gens do
+      if Size(s) > 0 then
+        Add(s, '"');
+        Add(s, ' ');
+        Add(s, '"');
+      fi;
+      sep := "\\0";
+      for i in ListPerm(x) do
+        chars := "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        Add(s, chars[i]);
+      od;
+    od;
+    s := JoinStringsWithSeparator(["    {", String(Size(AutomorphismGroup(G))),
+                                   "L, ", String(Size(G)),
+                                   ", ", String(Size(gens)),
+                                   ", \"", s, "\"},\n"],"");
+    Print(s);
+    offset := offset + 1;
+  od;
+  Add(offsets, offset);
+od;
+Print("};\n\nstatic const struct groups groups[] = {\n");
+Print("    {0, NULL}, /* trivial case: 0 */\n");
+Print("    {0, NULL}, /* trivial case: 1 */\n");
+n := 2;
+for i in [1..Size(offsets)-1] do
+  Print("    {", offsets[i+1] - offsets[i], ", groupdata+",
+        offsets[i], "}, /* ", i+1, " */\n");
+od;
+Print("};\n\n/* ----- data generated by group.gap ends ----- */\n");
+quit;
diff --git a/apps/plugins/puzzles/src/unfinished/numgame.c b/apps/plugins/puzzles/src/unfinished/numgame.c
new file mode 100644
index 0000000000..cf919922e7
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/numgame.c
@@ -0,0 +1,1294 @@
+/*
+ * This program implements a breadth-first search which
+ * exhaustively solves the Countdown numbers game, and related
+ * games with slightly different rule sets such as `Flippo'.
+ * 
+ * Currently it is simply a standalone command-line utility to
+ * which you provide a set of numbers and it tells you everything
+ * it can make together with how many different ways it can be
+ * made. I would like ultimately to turn it into the generator for
+ * a Puzzles puzzle, but I haven't even started on writing a
+ * Puzzles user interface yet.
+ */
+
+/*
+ * TODO:
+ * 
+ *  - start thinking about difficulty ratings
+ *     + anything involving associative operations will be flagged
+ *       as many-paths because of the associative options (e.g.
+ *       2*3*4 can be (2*3)*4 or 2*(3*4), or indeed (2*4)*3). This
+ *       is probably a _good_ thing, since those are unusually
+ *       easy.
+ *     + tree-structured calculations ((a*b)/(c+d)) have multiple
+ *       paths because the independent branches of the tree can be
+ *       evaluated in either order, whereas straight-line
+ *       calculations with no branches will be considered easier.
+ *       Can we do anything about this? It's certainly not clear to
+ *       me that tree-structure calculations are _easier_, although
+ *       I'm also not convinced they're harder.
+ *     + I think for a realistic difficulty assessment we must also
+ *       consider the `obviousness' of the arithmetic operations in
+ *       some heuristic sense, and also (in Countdown) how many
+ *       numbers ended up being used.
+ *  - actually try some generations
+ *  - at this point we're probably ready to start on the Puzzles
+ *    integration.
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <limits.h>
+#include <assert.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+
+#include "puzzles.h"
+#include "tree234.h"
+
+/*
+ * To search for numbers we can make, we employ a breadth-first
+ * search across the space of sets of input numbers. That is, for
+ * example, we start with the set (3,6,25,50,75,100); we apply
+ * moves which involve combining two numbers (e.g. adding the 50
+ * and the 75 takes us to the set (3,6,25,100,125); and then we see
+ * if we ever end up with a set containing (say) 952.
+ * 
+ * If the rules are changed so that all the numbers must be used,
+ * this is easy to adjust to: we simply see if we end up with a set
+ * containing _only_ (say) 952.
+ * 
+ * Obviously, we can vary the rules about permitted arithmetic
+ * operations simply by altering the set of valid moves in the bfs.
+ * However, there's one common rule in this sort of puzzle which
+ * takes a little more thought, and that's _concatenation_. For
+ * example, if you are given (say) four 4s and required to make 10,
+ * you are permitted to combine two of the 4s into a 44 to begin
+ * with, making (44-4)/4 = 10. However, you are generally not
+ * allowed to concatenate two numbers that _weren't_ both in the
+ * original input set (you couldn't multiply two 4s to get 16 and
+ * then concatenate a 4 on to it to make 164), so concatenation is
+ * not an operation which is valid in all situations.
+ * 
+ * We could enforce this restriction by storing a flag alongside
+ * each number indicating whether or not it's an original number;
+ * the rules being that concatenation of two numbers is only valid
+ * if they both have the original flag, and that its output _also_
+ * has the original flag (so that you can concatenate three 4s into
+ * a 444), but that applying any other arithmetic operation clears
+ * the original flag on the output. However, we can get marginally
+ * simpler than that by observing that since concatenation has to
+ * happen to a number before any other operation, we can simply
+ * place all the concatenations at the start of the search. In
+ * other words, we have a global flag on an entire number _set_
+ * which indicates whether we are still permitted to perform
+ * concatenations; if so, we can concatenate any of the numbers in
+ * that set. Performing any other operation clears the flag.
+ */
+
+#define SETFLAG_CONCAT 1               /* we can do concatenation */
+
+struct sets;
+
+struct ancestor {
+    struct set *prev;                  /* index of ancestor set in set list */
+    unsigned char pa, pb, po, pr;      /* operation that got here from prev */
+};
+
+struct set {
+    int *numbers;                      /* rationals stored as n,d pairs */
+    short nnumbers;                    /* # of rationals, so half # of ints */
+    short flags;                       /* SETFLAG_CONCAT only, at present */
+    int npaths;                        /* number of ways to reach this set */
+    struct ancestor a;                 /* primary ancestor */
+    struct ancestor *as;               /* further ancestors, if we care */
+    int nas, assize;
+};
+
+struct output {
+    int number;
+    struct set *set;
+    int index;                         /* which number in the set is it? */
+    int npaths;                        /* number of ways to reach this */
+};
+
+#define SETLISTLEN 1024
+#define NUMBERLISTLEN 32768
+#define OUTPUTLISTLEN 1024
+struct operation;
+struct sets {
+    struct set **setlists;
+    int nsets, nsetlists, setlistsize;
+    tree234 *settree;
+    int **numberlists;
+    int nnumbers, nnumberlists, numberlistsize;
+    struct output **outputlists;
+    int noutputs, noutputlists, outputlistsize;
+    tree234 *outputtree;
+    const struct operation *const *ops;
+};
+
+#define OPFLAG_NEEDS_CONCAT 1
+#define OPFLAG_KEEPS_CONCAT 2
+#define OPFLAG_UNARY        4
+#define OPFLAG_UNARYPREFIX  8
+#define OPFLAG_FN           16
+
+struct operation {
+    /*
+     * Most operations should be shown in the output working, but
+     * concatenation should not; we just take the result of the
+     * concatenation and assume that it's obvious how it was
+     * derived.
+     */
+    int display;
+
+    /*
+     * Text display of the operator, in expressions and for
+     * debugging respectively.
+     */
+    const char *text, *dbgtext;
+
+    /*
+     * Flags dictating when the operator can be applied.
+     */
+    int flags;
+
+    /*
+     * Priority of the operator (for avoiding unnecessary
+     * parentheses when formatting it into a string).
+     */
+    int priority;
+
+    /*
+     * Associativity of the operator. Bit 0 means we need parens
+     * when the left operand of one of these operators is another
+     * instance of it, e.g. (2^3)^4. Bit 1 means we need parens
+     * when the right operand is another instance of the same
+     * operator, e.g. 2-(3-4). Thus:
+     * 
+     *  - this field is 0 for a fully associative operator, since
+     *    we never need parens.
+     *  - it's 1 for a right-associative operator.
+     *  - it's 2 for a left-associative operator.
+     *  - it's 3 for a _non_-associative operator (which always
+     *    uses parens just to be sure).
+     */
+    int assoc;
+
+    /*
+     * Whether the operator is commutative. Saves time in the
+     * search if we don't have to try it both ways round.
+     */
+    int commutes;
+
+    /*
+     * Function which implements the operator. Returns true on
+     * success, false on failure. Takes two rationals and writes
+     * out a third.
+     */
+    int (*perform)(int *a, int *b, int *output);
+};
+
+struct rules {
+    const struct operation *const *ops;
+    int use_all;
+};
+
+#define MUL(r, a, b) do { \
+    (r) = (a) * (b); \
+    if ((b) && (a) && (r) / (b) != (a)) return false; \
+} while (0)
+
+#define ADD(r, a, b) do { \
+    (r) = (a) + (b); \
+    if ((a) > 0 && (b) > 0 && (r) < 0) return false; \
+    if ((a) < 0 && (b) < 0 && (r) > 0) return false; \
+} while (0)
+
+#define OUT(output, n, d) do { \
+    int g = gcd((n),(d)); \
+    if (g < 0) g = -g; \
+    if ((d) < 0) g = -g; \
+    if (g == -1 && (n) < -INT_MAX) return false; \
+    if (g == -1 && (d) < -INT_MAX) return false; \
+    (output)[0] = (n)/g; \
+    (output)[1] = (d)/g; \
+    assert((output)[1] > 0); \
+} while (0)
+
+static int gcd(int x, int y)
+{
+    while (x != 0 && y != 0) {
+        int t = x;
+        x = y;
+        y = t % y;
+    }
+
+    return abs(x + y);                 /* i.e. whichever one isn't zero */
+}
+
+static int perform_add(int *a, int *b, int *output)
+{
+    int at, bt, tn, bn;
+    /*
+     * a0/a1 + b0/b1 = (a0*b1 + b0*a1) / (a1*b1)
+     */
+    MUL(at, a[0], b[1]);
+    MUL(bt, b[0], a[1]);
+    ADD(tn, at, bt);
+    MUL(bn, a[1], b[1]);
+    OUT(output, tn, bn);
+    return true;
+}
+
+static int perform_sub(int *a, int *b, int *output)
+{
+    int at, bt, tn, bn;
+    /*
+     * a0/a1 - b0/b1 = (a0*b1 - b0*a1) / (a1*b1)
+     */
+    MUL(at, a[0], b[1]);
+    MUL(bt, b[0], a[1]);
+    ADD(tn, at, -bt);
+    MUL(bn, a[1], b[1]);
+    OUT(output, tn, bn);
+    return true;
+}
+
+static int perform_mul(int *a, int *b, int *output)
+{
+    int tn, bn;
+    /*
+     * a0/a1 * b0/b1 = (a0*b0) / (a1*b1)
+     */
+    MUL(tn, a[0], b[0]);
+    MUL(bn, a[1], b[1]);
+    OUT(output, tn, bn);
+    return true;
+}
+
+static int perform_div(int *a, int *b, int *output)
+{
+    int tn, bn;
+
+    /*
+     * Division by zero is outlawed.
+     */
+    if (b[0] == 0)
+        return false;
+
+    /*
+     * a0/a1 / b0/b1 = (a0*b1) / (a1*b0)
+     */
+    MUL(tn, a[0], b[1]);
+    MUL(bn, a[1], b[0]);
+    OUT(output, tn, bn);
+    return true;
+}
+
+static int perform_exact_div(int *a, int *b, int *output)
+{
+    int tn, bn;
+
+    /*
+     * Division by zero is outlawed.
+     */
+    if (b[0] == 0)
+        return false;
+
+    /*
+     * a0/a1 / b0/b1 = (a0*b1) / (a1*b0)
+     */
+    MUL(tn, a[0], b[1]);
+    MUL(bn, a[1], b[0]);
+    OUT(output, tn, bn);
+
+    /*
+     * Exact division means we require the result to be an integer.
+     */
+    return (output[1] == 1);
+}
+
+static int max_p10(int n, int *p10_r)
+{
+    /*
+     * Find the smallest power of ten strictly greater than n.
+     *
+     * Special case: we must return at least 10, even if n is
+     * zero. (This is because this function is used for finding
+     * the power of ten by which to multiply a number being
+     * concatenated to the front of n, and concatenating 1 to 0
+     * should yield 10 and not 1.)
+     */
+    int p10 = 10;
+    while (p10 <= (INT_MAX/10) && p10 <= n)
+        p10 *= 10;
+    if (p10 > INT_MAX/10)
+        return false;                  /* integer overflow */
+    *p10_r = p10;
+    return true;
+}
+
+static int perform_concat(int *a, int *b, int *output)
+{
+    int t1, t2, p10;
+
+    /*
+     * We can't concatenate anything which isn't a non-negative
+     * integer.
+     */
+    if (a[1] != 1 || b[1] != 1 || a[0] < 0 || b[0] < 0)
+        return false;
+
+    /*
+     * For concatenation, we can safely assume leading zeroes
+     * aren't an issue. It isn't clear whether they `should' be
+     * allowed, but it turns out not to matter: concatenating a
+     * leading zero on to a number in order to harmlessly get rid
+     * of the zero is never necessary because unwanted zeroes can
+     * be disposed of by adding them to something instead. So we
+     * disallow them always.
+     *
+     * The only other possibility is that you might want to
+     * concatenate a leading zero on to something and then
+     * concatenate another non-zero digit on to _that_ (to make,
+     * for example, 106); but that's also unnecessary, because you
+     * can make 106 just as easily by concatenating the 0 on to the
+     * _end_ of the 1 first.
+     */
+    if (a[0] == 0)
+        return false;
+
+    if (!max_p10(b[0], &p10)) return false;
+
+    MUL(t1, p10, a[0]);
+    ADD(t2, t1, b[0]);
+    OUT(output, t2, 1);
+    return true;
+}
+
+#define IPOW(ret, x, y) do { \
+    int ipow_limit = (y); \
+    if ((x) == 1 || (x) == 0) ipow_limit = 1; \
+    else if ((x) == -1) ipow_limit &= 1; \
+    (ret) = 1; \
+    while (ipow_limit-- > 0) { \
+        int tmp; \
+        MUL(tmp, ret, x); \
+        ret = tmp; \
+    } \
+} while (0)
+
+static int perform_exp(int *a, int *b, int *output)
+{
+    int an, ad, xn, xd;
+
+    /*
+     * Exponentiation is permitted if the result is rational. This
+     * means that:
+     * 
+     *  - first we see whether we can take the (denominator-of-b)th
+     *    root of a and get a rational; if not, we give up.
+     * 
+     *  - then we do take that root of a
+     * 
+     *  - then we multiply by itself (numerator-of-b) times.
+     */
+    if (b[1] > 1) {
+        an = (int)(0.5 + pow(a[0], 1.0/b[1]));
+        ad = (int)(0.5 + pow(a[1], 1.0/b[1]));
+        IPOW(xn, an, b[1]);
+        IPOW(xd, ad, b[1]);
+        if (xn != a[0] || xd != a[1])
+            return false;
+    } else {
+        an = a[0];
+        ad = a[1];
+    }
+    if (b[0] >= 0) {
+        IPOW(xn, an, b[0]);
+        IPOW(xd, ad, b[0]);
+    } else {
+        IPOW(xd, an, -b[0]);
+        IPOW(xn, ad, -b[0]);
+    }
+    if (xd == 0)
+        return false;
+
+    OUT(output, xn, xd);
+    return true;
+}
+
+static int perform_factorial(int *a, int *b, int *output)
+{
+    int ret, t, i;
+
+    /*
+     * Factorials of non-negative integers are permitted.
+     */
+    if (a[1] != 1 || a[0] < 0)
+        return false;
+
+    /*
+     * However, a special case: we don't take a factorial of
+     * anything which would thereby remain the same.
+     */
+    if (a[0] == 1 || a[0] == 2)
+        return false;
+
+    ret = 1;
+    for (i = 1; i <= a[0]; i++) {
+        MUL(t, ret, i);
+        ret = t;
+    }
+
+    OUT(output, ret, 1);
+    return true;
+}
+
+static int perform_decimal(int *a, int *b, int *output)
+{
+    int p10;
+
+    /*
+     * Add a decimal digit to the front of a number;
+     * fail if it's not an integer.
+     * So, 1 --> 0.1, 15 --> 0.15,
+     * or, rather, 1 --> 1/10, 15 --> 15/100,
+     * x --> x / (smallest power of 10 > than x)
+     *
+     */
+    if (a[1] != 1) return false;
+
+    if (!max_p10(a[0], &p10)) return false;
+
+    OUT(output, a[0], p10);
+    return true;
+}
+
+static int perform_recur(int *a, int *b, int *output)
+{
+    int p10, tn, bn;
+
+    /*
+     * This converts a number like .4 to .44444..., or .45 to .45454...
+     * The input number must be -1 < a < 1.
+     *
+     * Calculate the smallest power of 10 that divides the denominator exactly,
+     * returning if no such power of 10 exists. Then multiply the numerator
+     * up accordingly, and the new denominator becomes that power of 10 - 1.
+     */
+    if (abs(a[0]) >= abs(a[1])) return false; /* -1 < a < 1 */
+
+    p10 = 10;
+    while (p10 <= (INT_MAX/10)) {
+        if ((a[1] <= p10) && (p10 % a[1]) == 0) goto found;
+        p10 *= 10;
+    }
+    return false;
+found:
+    tn = a[0] * (p10 / a[1]);
+    bn = p10 - 1;
+
+    OUT(output, tn, bn);
+    return true;
+}
+
+static int perform_root(int *a, int *b, int *output)
+{
+    /*
+     * A root B is: 1           iff a == 0
+     *              B ^ (1/A)   otherwise
+     */
+    int ainv[2], res;
+
+    if (a[0] == 0) {
+        OUT(output, 1, 1);
+        return true;
+    }
+
+    OUT(ainv, a[1], a[0]);
+    res = perform_exp(b, ainv, output);
+    return res;
+}
+
+static int perform_perc(int *a, int *b, int *output)
+{
+    if (a[0] == 0) return false; /* 0% = 0, uninteresting. */
+    if (a[1] > (INT_MAX/100)) return false;
+
+    OUT(output, a[0], a[1]*100);
+    return true;
+}
+
+static int perform_gamma(int *a, int *b, int *output)
+{
+    int asub1[2];
+
+    /*
+     * gamma(a) = (a-1)!
+     *
+     * special case not caught by perform_fact: gamma(1) is 1 so
+     * don't bother.
+     */
+    if (a[0] == 1 && a[1] == 1) return false;
+
+    OUT(asub1, a[0]-a[1], a[1]);
+    return perform_factorial(asub1, b, output);
+}
+
+static int perform_sqrt(int *a, int *b, int *output)
+{
+    int half[2] = { 1, 2 };
+
+    /*
+     * sqrt(0) == 0, sqrt(1) == 1: don't perform unary noops.
+     */
+    if (a[0] == 0 || (a[0] == 1 && a[1] == 1)) return false;
+
+    return perform_exp(a, half, output);
+}
+
+static const struct operation op_add = {
+    true, "+", "+", 0, 10, 0, true, perform_add
+};
+static const struct operation op_sub = {
+    true, "-", "-", 0, 10, 2, false, perform_sub
+};
+static const struct operation op_mul = {
+    true, "*", "*", 0, 20, 0, true, perform_mul
+};
+static const struct operation op_div = {
+    true, "/", "/", 0, 20, 2, false, perform_div
+};
+static const struct operation op_xdiv = {
+    true, "/", "/", 0, 20, 2, false, perform_exact_div
+};
+static const struct operation op_concat = {
+    false, "", "concat", OPFLAG_NEEDS_CONCAT | OPFLAG_KEEPS_CONCAT,
+        1000, 0, false, perform_concat
+};
+static const struct operation op_exp = {
+    true, "^", "^", 0, 30, 1, false, perform_exp
+};
+static const struct operation op_factorial = {
+    true, "!", "!", OPFLAG_UNARY, 40, 0, false, perform_factorial
+};
+static const struct operation op_decimal = {
+    true, ".", ".", OPFLAG_UNARY | OPFLAG_UNARYPREFIX | OPFLAG_NEEDS_CONCAT | OPFLAG_KEEPS_CONCAT, 50, 0, false, perform_decimal
+};
+static const struct operation op_recur = {
+    true, "...", "recur", OPFLAG_UNARY | OPFLAG_NEEDS_CONCAT, 45, 2, false, perform_recur
+};
+static const struct operation op_root = {
+    true, "v~", "root", 0, 30, 1, false, perform_root
+};
+static const struct operation op_perc = {
+    true, "%", "%", OPFLAG_UNARY | OPFLAG_NEEDS_CONCAT, 45, 1, false, perform_perc
+};
+static const struct operation op_gamma = {
+    true, "gamma", "gamma", OPFLAG_UNARY | OPFLAG_UNARYPREFIX | OPFLAG_FN, 1, 3, false, perform_gamma
+};
+static const struct operation op_sqrt = {
+    true, "v~", "sqrt", OPFLAG_UNARY | OPFLAG_UNARYPREFIX, 30, 1, false, perform_sqrt
+};
+
+/*
+ * In Countdown, divisions resulting in fractions are disallowed.
+ * http://www.askoxford.com/wordgames/countdown/rules/
+ */
+static const struct operation *const ops_countdown[] = {
+    &op_add, &op_mul, &op_sub, &op_xdiv, NULL
+};
+static const struct rules rules_countdown = {
+    ops_countdown, false
+};
+
+/*
+ * A slightly different rule set which handles the reasonably well
+ * known puzzle of making 24 using two 3s and two 8s. For this we
+ * need rational rather than integer division.
+ */
+static const struct operation *const ops_3388[] = {
+    &op_add, &op_mul, &op_sub, &op_div, NULL
+};
+static const struct rules rules_3388 = {
+    ops_3388, true
+};
+
+/*
+ * A still more permissive rule set usable for the four-4s problem
+ * and similar things. Permits concatenation.
+ */
+static const struct operation *const ops_four4s[] = {
+    &op_add, &op_mul, &op_sub, &op_div, &op_concat, NULL
+};
+static const struct rules rules_four4s = {
+    ops_four4s, true
+};
+
+/*
+ * The most permissive ruleset I can think of. Permits
+ * exponentiation, and also silly unary operators like factorials.
+ */
+static const struct operation *const ops_anythinggoes[] = {
+    &op_add, &op_mul, &op_sub, &op_div, &op_concat, &op_exp, &op_factorial, 
+    &op_decimal, &op_recur, &op_root, &op_perc, &op_gamma, &op_sqrt, NULL
+};
+static const struct rules rules_anythinggoes = {
+    ops_anythinggoes, true
+};
+
+#define ratcmp(a,op,b) ( (long long)(a)[0] * (b)[1] op \
+                         (long long)(b)[0] * (a)[1] )
+
+static int addtoset(struct set *set, int newnumber[2])
+{
+    int i, j;
+
+    /* Find where we want to insert the new number */
+    for (i = 0; i < set->nnumbers &&
+         ratcmp(set->numbers+2*i, <, newnumber); i++);
+
+    /* Move everything else up */
+    for (j = set->nnumbers; j > i; j--) {
+        set->numbers[2*j] = set->numbers[2*j-2];
+        set->numbers[2*j+1] = set->numbers[2*j-1];
+    }
+
+    /* Insert the new number */
+    set->numbers[2*i] = newnumber[0];
+    set->numbers[2*i+1] = newnumber[1];
+
+    set->nnumbers++;
+
+    return i;
+}
+
+#define ensure(array, size, newlen, type) do { \
+    if ((newlen) > (size)) { \
+        (size) = (newlen) + 512; \
+        (array) = sresize((array), (size), type); \
+    } \
+} while (0)
+
+static int setcmp(void *av, void *bv)
+{
+    struct set *a = (struct set *)av;
+    struct set *b = (struct set *)bv;
+    int i;
+
+    if (a->nnumbers < b->nnumbers)
+        return -1;
+    else if (a->nnumbers > b->nnumbers)
+        return +1;
+
+    if (a->flags < b->flags)
+        return -1;
+    else if (a->flags > b->flags)
+        return +1;
+
+    for (i = 0; i < a->nnumbers; i++) {
+        if (ratcmp(a->numbers+2*i, <, b->numbers+2*i))
+            return -1;
+        else if (ratcmp(a->numbers+2*i, >, b->numbers+2*i))
+            return +1;
+    }
+
+    return 0;
+}
+
+static int outputcmp(void *av, void *bv)
+{
+    struct output *a = (struct output *)av;
+    struct output *b = (struct output *)bv;
+
+    if (a->number < b->number)
+        return -1;
+    else if (a->number > b->number)
+        return +1;
+
+    return 0;
+}
+
+static int outputfindcmp(void *av, void *bv)
+{
+    int *a = (int *)av;
+    struct output *b = (struct output *)bv;
+
+    if (*a < b->number)
+        return -1;
+    else if (*a > b->number)
+        return +1;
+
+    return 0;
+}
+
+static void addset(struct sets *s, struct set *set, int multiple,
+                   struct set *prev, int pa, int po, int pb, int pr)
+{
+    struct set *s2;
+    int npaths = (prev ? prev->npaths : 1);
+
+    assert(set == s->setlists[s->nsets / SETLISTLEN] + s->nsets % SETLISTLEN);
+    s2 = add234(s->settree, set);
+    if (s2 == set) {
+        /*
+         * New set added to the tree.
+         */
+        set->a.prev = prev;
+        set->a.pa = pa;
+        set->a.po = po;
+        set->a.pb = pb;
+        set->a.pr = pr;
+        set->npaths = npaths;
+        s->nsets++;
+        s->nnumbers += 2 * set->nnumbers;
+        set->as = NULL;
+        set->nas = set->assize = 0;
+    } else {
+        /*
+         * Rediscovered an existing set. Update its npaths.
+         */
+        s2->npaths += npaths;
+        /*
+         * And optionally enter it as an additional ancestor.
+         */
+        if (multiple) {
+            if (s2->nas >= s2->assize) {
+                s2->assize = s2->nas * 3 / 2 + 4;
+                s2->as = sresize(s2->as, s2->assize, struct ancestor);
+            }
+            s2->as[s2->nas].prev = prev;
+            s2->as[s2->nas].pa = pa;
+            s2->as[s2->nas].po = po;
+            s2->as[s2->nas].pb = pb;
+            s2->as[s2->nas].pr = pr;
+            s2->nas++;
+        }
+    }
+}
+
+static struct set *newset(struct sets *s, int nnumbers, int flags)
+{
+    struct set *sn;
+
+    ensure(s->setlists, s->setlistsize, s->nsets/SETLISTLEN+1, struct set *);
+    while (s->nsetlists <= s->nsets / SETLISTLEN)
+        s->setlists[s->nsetlists++] = snewn(SETLISTLEN, struct set);
+    sn = s->setlists[s->nsets / SETLISTLEN] + s->nsets % SETLISTLEN;
+
+    if (s->nnumbers + nnumbers * 2 > s->nnumberlists * NUMBERLISTLEN)
+        s->nnumbers = s->nnumberlists * NUMBERLISTLEN;
+    ensure(s->numberlists, s->numberlistsize,
+           s->nnumbers/NUMBERLISTLEN+1, int *);
+    while (s->nnumberlists <= s->nnumbers / NUMBERLISTLEN)
+        s->numberlists[s->nnumberlists++] = snewn(NUMBERLISTLEN, int);
+    sn->numbers = s->numberlists[s->nnumbers / NUMBERLISTLEN] +
+        s->nnumbers % NUMBERLISTLEN;
+
+    /*
+     * Start the set off empty.
+     */
+    sn->nnumbers = 0;
+
+    sn->flags = flags;
+
+    return sn;
+}
+
+static int addoutput(struct sets *s, struct set *ss, int index, int *n)
+{
+    struct output *o, *o2;
+
+    /*
+     * Target numbers are always integers.
+     */
+    if (ss->numbers[2*index+1] != 1)
+        return false;
+
+    ensure(s->outputlists, s->outputlistsize, s->noutputs/OUTPUTLISTLEN+1,
+           struct output *);
+    while (s->noutputlists <= s->noutputs / OUTPUTLISTLEN)
+        s->outputlists[s->noutputlists++] = snewn(OUTPUTLISTLEN,
+                                                  struct output);
+    o = s->outputlists[s->noutputs / OUTPUTLISTLEN] +
+        s->noutputs % OUTPUTLISTLEN;
+
+    o->number = ss->numbers[2*index];
+    o->set = ss;
+    o->index = index;
+    o->npaths = ss->npaths;
+    o2 = add234(s->outputtree, o);
+    if (o2 != o) {
+        o2->npaths += o->npaths;
+    } else {
+        s->noutputs++;
+    }
+    *n = o->number;
+    return true;
+}
+
+static struct sets *do_search(int ninputs, int *inputs,
+                              const struct rules *rules, int *target,
+                              int debug, int multiple)
+{
+    struct sets *s;
+    struct set *sn;
+    int qpos, i;
+    const struct operation *const *ops = rules->ops;
+
+    s = snew(struct sets);
+    s->setlists = NULL;
+    s->nsets = s->nsetlists = s->setlistsize = 0;
+    s->numberlists = NULL;
+    s->nnumbers = s->nnumberlists = s->numberlistsize = 0;
+    s->outputlists = NULL;
+    s->noutputs = s->noutputlists = s->outputlistsize = 0;
+    s->settree = newtree234(setcmp);
+    s->outputtree = newtree234(outputcmp);
+    s->ops = ops;
+
+    /*
+     * Start with the input set.
+     */
+    sn = newset(s, ninputs, SETFLAG_CONCAT);
+    for (i = 0; i < ninputs; i++) {
+        int newnumber[2];
+        newnumber[0] = inputs[i];
+        newnumber[1] = 1;
+        addtoset(sn, newnumber);
+    }
+    addset(s, sn, multiple, NULL, 0, 0, 0, 0);
+
+    /*
+     * Now perform the breadth-first search: keep looping over sets
+     * until we run out of steam.
+     */
+    qpos = 0;
+    while (qpos < s->nsets) {
+        struct set *ss = s->setlists[qpos / SETLISTLEN] + qpos % SETLISTLEN;
+        struct set *sn;
+        int i, j, k, m;
+
+        if (debug) {
+            int i;
+            printf("processing set:");
+            for (i = 0; i < ss->nnumbers; i++) {
+                printf(" %d", ss->numbers[2*i]);
+                if (ss->numbers[2*i+1] != 1)
+                    printf("/%d", ss->numbers[2*i+1]);
+            }
+            printf("\n");
+        }
+
+        /*
+         * Record all the valid output numbers in this state. We
+         * can always do this if there's only one number in the
+         * state; otherwise, we can only do it if we aren't
+         * required to use all the numbers in coming to our answer.
+         */
+        if (ss->nnumbers == 1 || !rules->use_all) {
+            for (i = 0; i < ss->nnumbers; i++) {
+                int n;
+
+                if (addoutput(s, ss, i, &n) && target && n == *target)
+                    return s;
+            }
+        }
+
+        /*
+         * Try every possible operation from this state.
+         */
+        for (k = 0; ops[k] && ops[k]->perform; k++) {
+            if ((ops[k]->flags & OPFLAG_NEEDS_CONCAT) &&
+                !(ss->flags & SETFLAG_CONCAT))
+                continue;              /* can't use this operation here */
+            for (i = 0; i < ss->nnumbers; i++) {
+                int jlimit = (ops[k]->flags & OPFLAG_UNARY ? 1 : ss->nnumbers);
+                for (j = 0; j < jlimit; j++) {
+                    int n[2], newnn = ss->nnumbers;
+                    int pa, po, pb, pr;
+
+                    if (!(ops[k]->flags & OPFLAG_UNARY)) {
+                        if (i == j)
+                            continue;  /* can't combine a number with itself */
+                        if (i > j && ops[k]->commutes)
+                            continue;  /* no need to do this both ways round */
+                        newnn--;
+                    }
+                    if (!ops[k]->perform(ss->numbers+2*i, ss->numbers+2*j, n))
+                        continue;      /* operation failed */
+
+                    sn = newset(s, newnn, ss->flags);
+
+                    if (!(ops[k]->flags & OPFLAG_KEEPS_CONCAT))
+                        sn->flags &= ~SETFLAG_CONCAT;
+
+                    for (m = 0; m < ss->nnumbers; m++) {
+                        if (m == i || (!(ops[k]->flags & OPFLAG_UNARY) &&
+                                       m == j))
+                            continue;
+                        sn->numbers[2*sn->nnumbers] = ss->numbers[2*m];
+                        sn->numbers[2*sn->nnumbers + 1] = ss->numbers[2*m + 1];
+                        sn->nnumbers++;
+                    }
+                    pa = i;
+                    if (ops[k]->flags & OPFLAG_UNARY)
+                        pb = sn->nnumbers+10;
+                    else
+                        pb = j;
+                    po = k;
+                    pr = addtoset(sn, n);
+                    addset(s, sn, multiple, ss, pa, po, pb, pr);
+                    if (debug) {
+                        int i;
+                        if (ops[k]->flags & OPFLAG_UNARYPREFIX)
+                            printf("  %s %d ->", ops[po]->dbgtext, pa);
+                        else if (ops[k]->flags & OPFLAG_UNARY)
+                            printf("  %d %s ->", pa, ops[po]->dbgtext);
+                        else
+                            printf("  %d %s %d ->", pa, ops[po]->dbgtext, pb);
+                        for (i = 0; i < sn->nnumbers; i++) {
+                            printf(" %d", sn->numbers[2*i]);
+                            if (sn->numbers[2*i+1] != 1)
+                                printf("/%d", sn->numbers[2*i+1]);
+                        }
+                        printf("\n");
+                    }
+                }
+            }
+        }
+
+        qpos++;
+    }
+
+    return s;
+}
+
+static void free_sets(struct sets *s)
+{
+    int i;
+
+    freetree234(s->settree);
+    freetree234(s->outputtree);
+    for (i = 0; i < s->nsetlists; i++)
+        sfree(s->setlists[i]);
+    sfree(s->setlists);
+    for (i = 0; i < s->nnumberlists; i++)
+        sfree(s->numberlists[i]);
+    sfree(s->numberlists);
+    for (i = 0; i < s->noutputlists; i++)
+        sfree(s->outputlists[i]);
+    sfree(s->outputlists);
+    sfree(s);
+}
+
+/*
+ * Print a text formula for producing a given output.
+ */
+static void print_recurse(struct sets *s, struct set *ss, int pathindex,
+                          int index, int priority, int assoc, int child);
+static void print_recurse_inner(struct sets *s, struct set *ss,
+                                struct ancestor *a, int pathindex, int index,
+                                int priority, int assoc, int child)
+{
+    if (a->prev && index != a->pr) {
+        int pi;
+
+        /*
+         * This number was passed straight down from this set's
+         * predecessor. Find its index in the previous set and
+         * recurse to there.
+         */
+        pi = index;
+        assert(pi != a->pr);
+        if (pi > a->pr)
+            pi--;
+        if (pi >= min(a->pa, a->pb)) {
+            pi++;
+            if (pi >= max(a->pa, a->pb))
+                pi++;
+        }
+        print_recurse(s, a->prev, pathindex, pi, priority, assoc, child);
+    } else if (a->prev && index == a->pr &&
+               s->ops[a->po]->display) {
+        /*
+         * This number was created by a displayed operator in the
+         * transition from this set to its predecessor. Hence we
+         * write an open paren, then recurse into the first
+         * operand, then write the operator, then the second
+         * operand, and finally close the paren.
+         */
+        const char *op;
+        int parens, thispri, thisassoc;
+
+        /*
+         * Determine whether we need parentheses.
+         */
+        thispri = s->ops[a->po]->priority;
+        thisassoc = s->ops[a->po]->assoc;
+        parens = (thispri < priority ||
+                  (thispri == priority && (assoc & child)));
+
+        if (parens)
+            putchar('(');
+
+        if (s->ops[a->po]->flags & OPFLAG_UNARYPREFIX)
+            for (op = s->ops[a->po]->text; *op; op++)
+                putchar(*op);
+
+        if (s->ops[a->po]->flags & OPFLAG_FN)
+            putchar('(');
+
+        print_recurse(s, a->prev, pathindex, a->pa, thispri, thisassoc, 1);
+
+        if (s->ops[a->po]->flags & OPFLAG_FN)
+            putchar(')');
+
+        if (!(s->ops[a->po]->flags & OPFLAG_UNARYPREFIX))
+            for (op = s->ops[a->po]->text; *op; op++)
+                putchar(*op);
+
+        if (!(s->ops[a->po]->flags & OPFLAG_UNARY))
+            print_recurse(s, a->prev, pathindex, a->pb, thispri, thisassoc, 2);
+
+        if (parens)
+            putchar(')');
+    } else {
+        /*
+         * This number is either an original, or something formed
+         * by a non-displayed operator (concatenation). Either way,
+         * we display it as is.
+         */
+        printf("%d", ss->numbers[2*index]);
+        if (ss->numbers[2*index+1] != 1)
+            printf("/%d", ss->numbers[2*index+1]);
+    }
+}
+static void print_recurse(struct sets *s, struct set *ss, int pathindex,
+                          int index, int priority, int assoc, int child)
+{
+    if (!ss->a.prev || pathindex < ss->a.prev->npaths) {
+        print_recurse_inner(s, ss, &ss->a, pathindex,
+                            index, priority, assoc, child);
+    } else {
+        int i;
+        pathindex -= ss->a.prev->npaths;
+        for (i = 0; i < ss->nas; i++) {
+            if (pathindex < ss->as[i].prev->npaths) {
+                print_recurse_inner(s, ss, &ss->as[i], pathindex,
+                                    index, priority, assoc, child);
+                break;
+            }
+            pathindex -= ss->as[i].prev->npaths;
+        }
+    }
+}
+static void print(int pathindex, struct sets *s, struct output *o)
+{
+    print_recurse(s, o->set, pathindex, o->index, 0, 0, 0);
+}
+
+/*
+ * gcc -g -O0 -o numgame numgame.c -I.. ../{malloc,tree234,nullfe}.c -lm
+ */
+int main(int argc, char **argv)
+{
+    int doing_opts = true;
+    const struct rules *rules = NULL;
+    char *pname = argv[0];
+    int got_target = false, target = 0;
+    int numbers[10], nnumbers = 0;
+    int verbose = false;
+    int pathcounts = false;
+    int multiple = false;
+    int debug_bfs = false;
+    int got_range = false, rangemin = 0, rangemax = 0;
+
+    struct output *o;
+    struct sets *s;
+    int i, start, limit;
+
+    while (--argc) {
+        char *p = *++argv;
+        int c;
+
+        if (doing_opts && *p == '-') {
+            p++;
+
+            if (!strcmp(p, "-")) {
+                doing_opts = false;
+                continue;
+            } else if (*p == '-') {
+                p++;
+                if (!strcmp(p, "debug-bfs")) {
+                    debug_bfs = true;
+                } else {
+                    fprintf(stderr, "%s: option '--%s' not recognised\n",
+                            pname, p);
+                }
+            } else while (p && *p) switch (c = *p++) {
+              case 'C':
+                rules = &rules_countdown;
+                break;
+              case 'B':
+                rules = &rules_3388;
+                break;
+              case 'D':
+                rules = &rules_four4s;
+                break;
+              case 'A':
+                rules = &rules_anythinggoes;
+                break;
+              case 'v':
+                verbose = true;
+                break;
+              case 'p':
+                pathcounts = true;
+                break;
+              case 'm':
+                multiple = true;
+                break;
+              case 't':
+              case 'r':
+                {
+                    char *v;
+                    if (*p) {
+                        v = p;
+                        p = NULL;
+                    } else if (--argc) {
+                        v = *++argv;
+                    } else {
+                        fprintf(stderr, "%s: option '-%c' expects an"
+                                " argument\n", pname, c);
+                        return 1;
+                    }
+                    switch (c) {
+                      case 't':
+                        got_target = true;
+                        target = atoi(v);
+                        break;
+                      case 'r':
+                        {
+                             char *sep = strchr(v, '-');
+                             got_range = true;
+                             if (sep) {
+                                 rangemin = atoi(v);
+                                 rangemax = atoi(sep+1);
+                             } else {
+                                 rangemin = 0;
+                                 rangemax = atoi(v);
+                             }
+                        }
+                        break;
+                    }
+                }
+                break;
+              default:
+                fprintf(stderr, "%s: option '-%c' not"
+                        " recognised\n", pname, c);
+                return 1;
+            }
+        } else {
+            if (nnumbers >= lenof(numbers)) {
+                fprintf(stderr, "%s: internal limit of %d numbers exceeded\n",
+                        pname, (int)lenof(numbers));
+                return 1;
+            } else {
+                numbers[nnumbers++] = atoi(p);
+            }
+        }
+    }
+
+    if (!rules) {
+        fprintf(stderr, "%s: no rule set specified; use -C,-B,-D,-A\n", pname);
+        return 1;
+    }
+
+    if (!nnumbers) {
+        fprintf(stderr, "%s: no input numbers specified\n", pname);
+        return 1;
+    }
+
+    if (got_range) {
+        if (got_target) {
+            fprintf(stderr, "%s: only one of -t and -r may be specified\n", pname);
+            return 1;
+        }
+        if (rangemin >= rangemax) {
+            fprintf(stderr, "%s: range not sensible (%d - %d)\n", pname, rangemin, rangemax);
+            return 1;
+        }
+    }
+
+    s = do_search(nnumbers, numbers, rules, (got_target ? &target : NULL),
+                  debug_bfs, multiple);
+
+    if (got_target) {
+        o = findrelpos234(s->outputtree, &target, outputfindcmp,
+                          REL234_LE, &start);
+        if (!o)
+            start = -1;
+        o = findrelpos234(s->outputtree, &target, outputfindcmp,
+                          REL234_GE, &limit);
+        if (!o)
+            limit = -1;
+        assert(start != -1 || limit != -1);
+        if (start == -1)
+            start = limit;
+        else if (limit == -1)
+            limit = start;
+        limit++;
+    } else if (got_range) {
+        if (!findrelpos234(s->outputtree, &rangemin, outputfindcmp,
+                           REL234_GE, &start) ||
+            !findrelpos234(s->outputtree, &rangemax, outputfindcmp,
+                           REL234_LE, &limit)) {
+            printf("No solutions available in specified range %d-%d\n", rangemin, rangemax);
+            return 1;
+        }
+        limit++;
+    } else {
+        start = 0;
+        limit = count234(s->outputtree);
+    }
+
+    for (i = start; i < limit; i++) {
+        char buf[256];
+
+        o = index234(s->outputtree, i);
+
+        sprintf(buf, "%d", o->number);
+
+        if (pathcounts)
+            sprintf(buf + strlen(buf), " [%d]", o->npaths);
+
+        if (got_target || verbose) {
+            int j, npaths;
+
+            if (multiple)
+                npaths = o->npaths;
+            else
+                npaths = 1;
+
+            for (j = 0; j < npaths; j++) {
+                printf("%s = ", buf);
+                print(j, s, o);
+                putchar('\n');
+            }
+        } else {
+            printf("%s\n", buf);
+        }
+    }
+
+    free_sets(s);
+
+    return 0;
+}
+
+/* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/puzzles/src/unfinished/path.c b/apps/plugins/puzzles/src/unfinished/path.c
new file mode 100644
index 0000000000..2515ed0b71
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/path.c
@@ -0,0 +1,866 @@
+/*
+ * Experimental grid generator for Nikoli's `Number Link' puzzle.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "puzzles.h"
+
+/*
+ * 2005-07-08: This is currently a Path grid generator which will
+ * construct valid grids at a plausible speed. However, the grids
+ * are not of suitable quality to be used directly as puzzles.
+ * 
+ * The basic strategy is to start with an empty grid, and
+ * repeatedly either (a) add a new path to it, or (b) extend one
+ * end of a path by one square in some direction and push other
+ * paths into new shapes in the process. The effect of this is that
+ * we are able to construct a set of paths which between them fill
+ * the entire grid.
+ * 
+ * Quality issues: if we set the main loop to do (a) where possible
+ * and (b) only where necessary, we end up with a grid containing a
+ * few too many small paths, which therefore doesn't make for an
+ * interesting puzzle. If we reverse the priority so that we do (b)
+ * where possible and (a) only where necessary, we end up with some
+ * staggeringly interwoven grids with very very few separate paths,
+ * but the result of this is that there's invariably a solution
+ * other than the intended one which leaves many grid squares
+ * unfilled. There's also a separate problem which is that many
+ * grids have really boring and obvious paths in them, such as the
+ * entire bottom row of the grid being taken up by a single path.
+ * 
+ * It's not impossible that a few tweaks might eliminate or reduce
+ * the incidence of boring paths, and might also find a happy
+ * medium between too many and too few. There remains the question
+ * of unique solutions, however. I fear there is no alternative but
+ * to write - somehow! - a solver.
+ * 
+ * While I'm here, some notes on UI strategy for the parts of the
+ * puzzle implementation that _aren't_ the generator:
+ * 
+ *  - data model is to track connections between adjacent squares,
+ *    so that you aren't limited to extending a path out from each
+ *    number but can also mark sections of path which you know
+ *    _will_ come in handy later.
+ * 
+ *  - user interface is to click in one square and drag to an
+ *    adjacent one, thus creating a link between them. We can
+ *    probably tolerate rapid mouse motion causing a drag directly
+ *    to a square which is a rook move away, but any other rapid
+ *    motion is ambiguous and probably the best option is to wait
+ *    until the mouse returns to a square we know how to reach.
+ * 
+ *  - a drag causing the current path to backtrack has the effect
+ *    of removing bits of it.
+ * 
+ *  - the UI should enforce at all times the constraint that at
+ *    most two links can come into any square.
+ * 
+ *  - my Cunning Plan for actually implementing this: the game_ui
+ *    contains a grid-sized array, which is copied from the current
+ *    game_state on starting a drag. While a drag is active, the
+ *    contents of the game_ui is adjusted with every mouse motion,
+ *    and is displayed _in place_ of the game_state itself. On
+ *    termination of a drag, the game_ui array is copied back into
+ *    the new game_state (or rather, a string move is encoded which
+ *    has precisely the set of link changes to cause that effect).
+ */
+
+/*
+ * 2020-05-11: some thoughts on a solver.
+ *
+ * Consider this example puzzle, from Wikipedia:
+ *
+ *     ---4---
+ *     -3--25-
+ *     ---31--
+ *     ---5---
+ *     -------
+ *     --1----
+ *     2---4--
+ *
+ * The kind of deduction that a human wants to make here is: which way
+ * does the path between the 4s go? In particular, does it go round
+ * the left of the W-shaped cluster of endpoints, or round the right
+ * of it? It's clear at a glance that it must go to the right, because
+ * _any_ path between the 4s that goes to the left of that cluster, no
+ * matter what detailed direction it takes, will disconnect the
+ * remaining grid squares into two components, with the two 2s not in
+ * the same component. So we immediately know that the path between
+ * the 4s _must_ go round the right-hand side of the grid.
+ *
+ * How do you model that global and topological reasoning in a
+ * computer?
+ *
+ * The most plausible idea I've seen so far is to use fundamental
+ * groups. The fundamental group of loops based at a given point in a
+ * space is a free group, under loop concatenation and up to homotopy,
+ * generated by the loops that go in each direction around each hole
+ * in the space. In this case, the 'holes' are clues, or connected
+ * groups of clues.
+ *
+ * So you might be able to enumerate all the homotopy classes of paths
+ * between (say) the two 4s as follows. Start with any old path
+ * between them (say, find the first one that breadth-first search
+ * will give you). Choose one of the 4s to regard as the base point
+ * (arbitrarily). Then breadth-first search among the space of _paths_
+ * by the following procedure. Given a candidate path, append to it
+ * each of the possible loops that starts from the base point,
+ * circumnavigates one clue cluster, and returns to the base point.
+ * The result will typically be a path that retraces its steps and
+ * self-intersects. Now adjust it homotopically so that it doesn't. If
+ * that can't be done, then we haven't generated a fresh candidate
+ * path; if it can, then we've got a new path that is not homotopic to
+ * any path we already had, so add it to our list and queue it up to
+ * become the starting point of this search later.
+ *
+ * The idea is that this should exhaustively enumerate, up to
+ * homotopy, the different ways in which the two 4s can connect to
+ * each other within the constraint that you have to actually fit the
+ * path non-self-intersectingly into this grid. Then you can keep a
+ * list of those homotopy classes in mind, and start ruling them out
+ * by techniques like the connectivity approach described above.
+ * Hopefully you end up narrowing down to few enough homotopy classes
+ * that you can deduce something concrete about actual squares of the
+ * grid - for example, here, that if the path between 4s has to go
+ * round the right, then we know some specific squares it must go
+ * through, so we can fill those in. And then, having filled in a
+ * piece of the middle of a path, you can now regard connecting the
+ * ultimate endpoints to that mid-section as two separate subproblems,
+ * so you've reduced to a simpler instance of the same puzzle.
+ *
+ * But I don't know whether all of this actually works. I more or less
+ * believe the process for enumerating elements of the free group; but
+ * I'm not as confident that when you find a group element that won't
+ * fit in the grid, you'll never have to consider its descendants in
+ * the BFS either. And I'm assuming that 'unwind the self-intersection
+ * homotopically' is a thing that can actually be turned into a
+ * sensible algorithm.
+ *
+ * --------
+ *
+ * Another thing that might be needed is to characterise _which_
+ * homotopy class a given path is in.
+ *
+ * For this I think it's sufficient to choose a collection of paths
+ * along the _edges_ of the square grid, each of which connects two of
+ * the holes in the grid (including the grid exterior, which counts as
+ * a huge hole), such that they form a spanning tree between the
+ * holes. Then assign each of those paths an orientation, so that
+ * crossing it in one direction counts as 'positive' and the other
+ * 'negative'. Now analyse a candidate path from one square to another
+ * by following it and noting down which of those paths it crosses in
+ * which direction, then simplifying the result like a free group word
+ * (i.e. adjacent + and - crossings of the same path cancel out).
+ *
+ * --------
+ *
+ * If we choose those paths to be of minimal length, then we can get
+ * an upper bound on the number of homotopy classes by observing that
+ * you can't traverse any of those barriers more times than will fit
+ * non-self-intersectingly in the grid. That might be an alternative
+ * method of bounding the search through the fundamental group to only
+ * finitely many possibilities.
+ */
+
+/*
+ * Standard notation for directions.
+ */
+#define L 0
+#define U 1
+#define R 2
+#define D 3
+#define DX(dir) ( (dir)==L ? -1 : (dir)==R ? +1 : 0)
+#define DY(dir) ( (dir)==U ? -1 : (dir)==D ? +1 : 0)
+
+/*
+ * Perform a breadth-first search over a grid of squares with the
+ * colour of square (X,Y) given by grid[Y*w+X]. The search begins
+ * at (x,y), and finds all squares which are the same colour as
+ * (x,y) and reachable from it by orthogonal moves. On return:
+ *  - dist[Y*w+X] gives the distance of (X,Y) from (x,y), or -1 if
+ *    unreachable or a different colour
+ *  - the returned value is the number of reachable squares,
+ *    including (x,y) itself
+ *  - list[0] up to list[returned value - 1] list those squares, in
+ *    increasing order of distance from (x,y) (and in arbitrary
+ *    order within that).
+ */
+static int bfs(int w, int h, int *grid, int x, int y, int *dist, int *list)
+{
+    int i, j, c, listsize, listdone;
+
+    /*
+     * Start by clearing the output arrays.
+     */
+    for (i = 0; i < w*h; i++)
+        dist[i] = list[i] = -1;
+
+    /*
+     * Set up the initial list.
+     */
+    listsize = 1;
+    listdone = 0;
+    list[0] = y*w+x;
+    dist[y*w+x] = 0;
+    c = grid[y*w+x];
+
+    /*
+     * Repeatedly process a square and add any extra squares to the
+     * end of list.
+     */
+    while (listdone < listsize) {
+        i = list[listdone++];
+        y = i / w;
+        x = i % w;
+        for (j = 0; j < 4; j++) {
+            int xx, yy, ii;
+
+            xx = x + DX(j);
+            yy = y + DY(j);
+            ii = yy*w+xx;
+
+            if (xx >= 0 && xx < w && yy >= 0 && yy < h &&
+                grid[ii] == c && dist[ii] == -1) {
+                dist[ii] = dist[i] + 1;
+                assert(listsize < w*h);
+                list[listsize++] = ii;
+            }
+        }
+    }
+
+    return listsize;
+}
+
+struct genctx {
+    int w, h;
+    int *grid, *sparegrid, *sparegrid2, *sparegrid3;
+    int *dist, *list;
+
+    int npaths, pathsize;
+    int *pathends, *sparepathends;     /* 2*npaths entries */
+    int *pathspare;                    /* npaths entries */
+    int *extends;                      /* 8*npaths entries */
+};
+
+static struct genctx *new_genctx(int w, int h)
+{
+    struct genctx *ctx = snew(struct genctx);
+    ctx->w = w;
+    ctx->h = h;
+    ctx->grid = snewn(w * h, int);
+    ctx->sparegrid = snewn(w * h, int);
+    ctx->sparegrid2 = snewn(w * h, int);
+    ctx->sparegrid3 = snewn(w * h, int);
+    ctx->dist = snewn(w * h, int);
+    ctx->list = snewn(w * h, int);
+    ctx->npaths = ctx->pathsize = 0;
+    ctx->pathends = ctx->sparepathends = ctx->pathspare = ctx->extends = NULL;
+    return ctx;
+}
+
+static void free_genctx(struct genctx *ctx)
+{
+    sfree(ctx->grid);
+    sfree(ctx->sparegrid);
+    sfree(ctx->sparegrid2);
+    sfree(ctx->sparegrid3);
+    sfree(ctx->dist);
+    sfree(ctx->list);
+    sfree(ctx->pathends);
+    sfree(ctx->sparepathends);
+    sfree(ctx->pathspare);
+    sfree(ctx->extends);
+}
+
+static int newpath(struct genctx *ctx)
+{
+    int n;
+
+    n = ctx->npaths++;
+    if (ctx->npaths > ctx->pathsize) {
+        ctx->pathsize += 16;
+        ctx->pathends = sresize(ctx->pathends, ctx->pathsize*2, int);
+        ctx->sparepathends = sresize(ctx->sparepathends, ctx->pathsize*2, int);
+        ctx->pathspare = sresize(ctx->pathspare, ctx->pathsize, int);
+        ctx->extends = sresize(ctx->extends, ctx->pathsize*8, int);
+    }
+    return n;
+}
+
+static int is_endpoint(struct genctx *ctx, int x, int y)
+{
+    int w = ctx->w, h = ctx->h, c;
+
+    assert(x >= 0 && x < w && y >= 0 && y < h);
+
+    c = ctx->grid[y*w+x];
+    if (c < 0)
+        return false;                  /* empty square is not an endpoint! */
+    assert(c >= 0 && c < ctx->npaths);
+    if (ctx->pathends[c*2] == y*w+x || ctx->pathends[c*2+1] == y*w+x)
+        return true;
+    return false;
+}
+
+/*
+ * Tries to extend a path by one square in the given direction,
+ * pushing other paths around if necessary. Returns true on success
+ * or false on failure.
+ */
+static int extend_path(struct genctx *ctx, int path, int end, int direction)
+{
+    int w = ctx->w, h = ctx->h;
+    int x, y, xe, ye, cut;
+    int i, j, jp, n, first, last;
+
+    assert(path >= 0 && path < ctx->npaths);
+    assert(end == 0 || end == 1);
+
+    /*
+     * Find the endpoint of the path and the point we plan to
+     * extend it into.
+     */
+    y = ctx->pathends[path * 2 + end] / w;
+    x = ctx->pathends[path * 2 + end] % w;
+    assert(x >= 0 && x < w && y >= 0 && y < h);
+
+    xe = x + DX(direction);
+    ye = y + DY(direction);
+    if (xe < 0 || xe >= w || ye < 0 || ye >= h)
+        return false;                  /* could not extend in this direction */
+
+    /*
+     * We don't extend paths _directly_ into endpoints of other
+     * paths, although we don't mind too much if a knock-on effect
+     * of an extension is to push part of another path into a third
+     * path's endpoint.
+     */
+    if (is_endpoint(ctx, xe, ye))
+        return false;
+
+    /*
+     * We can't extend a path back the way it came.
+     */
+    if (ctx->grid[ye*w+xe] == path)
+        return false;
+
+    /*
+     * Paths may not double back on themselves. Check if the new
+     * point is adjacent to any point of this path other than (x,y).
+     */
+    for (j = 0; j < 4; j++) {
+        int xf, yf;
+
+        xf = xe + DX(j);
+        yf = ye + DY(j);
+
+        if (xf >= 0 && xf < w && yf >= 0 && yf < h &&
+            (xf != x || yf != y) && ctx->grid[yf*w+xf] == path)
+            return false;
+    }
+
+    /*
+     * Now we're convinced it's valid to _attempt_ the extension.
+     * It may still fail if we run out of space to push other paths
+     * into.
+     *
+     * So now we can set up our temporary data structures. We will
+     * need:
+     * 
+     *  - a spare copy of the grid on which to gradually move paths
+     *    around (sparegrid)
+     * 
+     *  - a second spare copy with which to remember how paths
+     *    looked just before being cut (sparegrid2). FIXME: is
+     *    sparegrid2 necessary? right now it's never different from
+     *    grid itself
+     * 
+     *  - a third spare copy with which to do the internal
+     *    calculations involved in reconstituting a cut path
+     *    (sparegrid3)
+     * 
+     *  - something to track which paths currently need
+     *    reconstituting after being cut, and which have already
+     *    been cut (pathspare)
+     * 
+     *  - a spare copy of pathends to store the altered states in
+     *    (sparepathends)
+     */
+    memcpy(ctx->sparegrid, ctx->grid, w*h*sizeof(int));
+    memcpy(ctx->sparegrid2, ctx->grid, w*h*sizeof(int));
+    memcpy(ctx->sparepathends, ctx->pathends, ctx->npaths*2*sizeof(int));
+    for (i = 0; i < ctx->npaths; i++)
+        ctx->pathspare[i] = 0;         /* 0=untouched, 1=broken, 2=fixed */
+
+    /*
+     * Working in sparegrid, actually extend the path. If it cuts
+     * another, begin a loop in which we restore any cut path by
+     * moving it out of the way.
+     */
+    cut = ctx->sparegrid[ye*w+xe];
+    ctx->sparegrid[ye*w+xe] = path;
+    ctx->sparepathends[path*2+end] = ye*w+xe;
+    ctx->pathspare[path] = 2;          /* this one is sacrosanct */
+    if (cut >= 0) {
+        assert(cut >= 0 && cut < ctx->npaths);
+        ctx->pathspare[cut] = 1;       /* broken */
+
+        while (1) {
+            for (i = 0; i < ctx->npaths; i++)
+                if (ctx->pathspare[i] == 1)
+                    break;
+            if (i == ctx->npaths)
+                break;                 /* we're done */
+
+            /*
+             * Path i needs restoring. So walk along its original
+             * track (as given in sparegrid2) and see where it's
+             * been cut. Where it has, surround the cut points in
+             * the same colour, without overwriting already-fixed
+             * paths.
+             */
+            memcpy(ctx->sparegrid3, ctx->sparegrid, w*h*sizeof(int));
+            n = bfs(w, h, ctx->sparegrid2,
+                    ctx->pathends[i*2] % w, ctx->pathends[i*2] / w,
+                    ctx->dist, ctx->list);
+            first = last = -1;
+if (ctx->sparegrid3[ctx->pathends[i*2]] != i ||
+    ctx->sparegrid3[ctx->pathends[i*2+1]] != i) return false;/* FIXME */
+            for (j = 0; j < n; j++) {
+                jp = ctx->list[j];
+                assert(ctx->dist[jp] == j);
+                assert(ctx->sparegrid2[jp] == i);
+
+                /*
+                 * Wipe out the original path in sparegrid.
+                 */
+                if (ctx->sparegrid[jp] == i)
+                    ctx->sparegrid[jp] = -1;
+
+                /*
+                 * Be prepared to shorten the path at either end if
+                 * the endpoints have been stomped on.
+                 */
+                if (ctx->sparegrid3[jp] == i) {
+                    if (first < 0)
+                        first = jp;
+                    last = jp;
+                }
+
+                if (ctx->sparegrid3[jp] != i) {
+                    int jx = jp % w, jy = jp / w;
+                    int dx, dy;
+                    for (dy = -1; dy <= +1; dy++)
+                        for (dx = -1; dx <= +1; dx++) {
+                            int newp, newv;
+                            if (!dy && !dx)
+                                continue;   /* central square */
+                            if (jx+dx < 0 || jx+dx >= w ||
+                                jy+dy < 0 || jy+dy >= h)
+                                continue;   /* out of range */
+                            newp = (jy+dy)*w+(jx+dx);
+                            newv = ctx->sparegrid3[newp];
+                            if (newv >= 0 && (newv == i ||
+                                              ctx->pathspare[newv] == 2))
+                                continue;   /* can't use this square */
+                            ctx->sparegrid3[newp] = i;
+                        }
+                }
+            }
+
+            if (first < 0 || last < 0)
+                return false;          /* path is completely wiped out! */
+
+            /*
+             * Now we've covered sparegrid3 in possible squares for
+             * the new layout of path i. Find the actual layout
+             * we're going to use by bfs: we want the shortest path
+             * from one endpoint to the other.
+             */
+            n = bfs(w, h, ctx->sparegrid3, first % w, first / w,
+                    ctx->dist, ctx->list);
+            if (ctx->dist[last] < 2) {
+                /*
+                 * Either there is no way to get between the path's
+                 * endpoints, or the remaining endpoints simply
+                 * aren't far enough apart to make the path viable
+                 * any more. This means the entire push operation
+                 * has failed.
+                 */
+                return false;
+            }
+
+            /*
+             * Write the new path into sparegrid. Also save the new
+             * endpoint locations, in case they've changed.
+             */
+            jp = last;
+            j = ctx->dist[jp];
+            while (1) {
+                int d;
+
+                if (ctx->sparegrid[jp] >= 0) {
+                    if (ctx->pathspare[ctx->sparegrid[jp]] == 2)
+                        return false;  /* somehow we've hit a fixed path */
+                    ctx->pathspare[ctx->sparegrid[jp]] = 1;   /* broken */
+                }
+                ctx->sparegrid[jp] = i;
+
+                if (j == 0)
+                    break;
+
+                /*
+                 * Now look at the neighbours of jp to find one
+                 * which has dist[] one less.
+                 */
+                for (d = 0; d < 4; d++) {
+                    int jx = (jp % w) + DX(d), jy = (jp / w) + DY(d);
+                    if (jx >= 0 && jx < w && jy >= 0 && jy < w &&
+                        ctx->dist[jy*w+jx] == j-1) {
+                        jp = jy*w+jx;
+                        j--;
+                        break;
+                    }
+                }
+                assert(d < 4);
+            }
+
+            ctx->sparepathends[i*2] = first;
+            ctx->sparepathends[i*2+1] = last;
+/* printf("new ends of path %d: %d,%d\n", i, first, last); */
+            ctx->pathspare[i] = 2;     /* fixed */
+        }
+    }
+
+    /*
+     * If we got here, the extension was successful!
+     */
+    memcpy(ctx->grid, ctx->sparegrid, w*h*sizeof(int));
+    memcpy(ctx->pathends, ctx->sparepathends, ctx->npaths*2*sizeof(int));
+    return true;
+}
+
+/*
+ * Tries to add a new path to the grid.
+ */
+static int add_path(struct genctx *ctx, random_state *rs)
+{
+    int w = ctx->w, h = ctx->h;
+    int i, ii, n;
+
+    /*
+     * Our strategy is:
+     *  - randomly choose an empty square in the grid
+     *  - do a BFS from that point to find a long path starting
+     *    from it
+     *  - if we run out of viable empty squares, return failure.
+     */
+
+    /*
+     * Use `sparegrid' to collect a list of empty squares.
+     */
+    n = 0;
+    for (i = 0; i < w*h; i++)
+        if (ctx->grid[i] == -1)
+            ctx->sparegrid[n++] = i;
+
+    /*
+     * Shuffle the grid.
+     */
+    for (i = n; i-- > 1 ;) {
+        int k = random_upto(rs, i+1);
+        if (k != i) {
+            int t = ctx->sparegrid[i];
+            ctx->sparegrid[i] = ctx->sparegrid[k];
+            ctx->sparegrid[k] = t;
+        }
+    }
+
+    /*
+     * Loop over it trying to add paths. This looks like a
+     * horrifying N^4 algorithm (that is, (w*h)^2), but I predict
+     * that in fact the worst case will very rarely arise because
+     * when there's lots of grid space an attempt will succeed very
+     * quickly.
+     */
+    for (ii = 0; ii < n; ii++) {
+        int i = ctx->sparegrid[ii];
+        int y = i / w, x = i % w, nsq;
+        int r, c, j;
+
+        /*
+         * BFS from here to find long paths.
+         */
+        nsq = bfs(w, h, ctx->grid, x, y, ctx->dist, ctx->list);
+
+        /*
+         * If there aren't any long enough, give up immediately.
+         */
+        assert(nsq > 0);               /* must be the start square at least! */
+        if (ctx->dist[ctx->list[nsq-1]] < 3)
+            continue;
+
+        /*
+         * Find the first viable endpoint in ctx->list (i.e. the
+         * first point with distance at least three). I could
+         * binary-search for this, but that would be O(log N)
+         * whereas in fact I can get a constant time bound by just
+         * searching up from the start - after all, there can be at
+         * most 13 points at _less_ than distance 3 from the
+         * starting one!
+         */
+        for (j = 0; j < nsq; j++)
+            if (ctx->dist[ctx->list[j]] >= 3)
+                break;
+        assert(j < nsq);               /* we tested above that there was one */
+
+        /*
+         * Now we know that any element of `list' between j and nsq
+         * would be valid in principle. However, we want a few long
+         * paths rather than many small ones, so select only those
+         * elements which are either the maximum length or one
+         * below it.
+         */
+        while (ctx->dist[ctx->list[j]] + 1 < ctx->dist[ctx->list[nsq-1]])
+            j++;
+        r = j + random_upto(rs, nsq - j);
+        j = ctx->list[r];
+
+        /*
+         * And that's our endpoint. Mark the new path on the grid.
+         */
+        c = newpath(ctx);
+        ctx->pathends[c*2] = i;
+        ctx->pathends[c*2+1] = j;
+        ctx->grid[j] = c;
+        while (j != i) {
+            int d, np, index, pts[4];
+            np = 0;
+            for (d = 0; d < 4; d++) {
+                int xn = (j % w) + DX(d), yn = (j / w) + DY(d);
+                if (xn >= 0 && xn < w && yn >= 0 && yn < w &&
+                    ctx->dist[yn*w+xn] == ctx->dist[j] - 1)
+                    pts[np++] = yn*w+xn;
+            }
+            if (np > 1)
+                index = random_upto(rs, np);
+            else
+                index = 0;
+            j = pts[index];
+            ctx->grid[j] = c;
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+/*
+ * The main grid generation loop.
+ */
+static void gridgen_mainloop(struct genctx *ctx, random_state *rs)
+{
+    int w = ctx->w, h = ctx->h;
+    int i, n;
+
+    /*
+     * The generation algorithm doesn't always converge. Loop round
+     * until it does.
+     */
+    while (1) {
+        for (i = 0; i < w*h; i++)
+            ctx->grid[i] = -1;
+        ctx->npaths = 0;
+
+        while (1) {
+            /*
+             * See if the grid is full.
+             */
+            for (i = 0; i < w*h; i++)
+                if (ctx->grid[i] < 0)
+                    break;
+            if (i == w*h)
+                return;
+
+#ifdef GENERATION_DIAGNOSTICS
+            {
+                int x, y;
+                for (y = 0; y < h; y++) {
+                    printf("|");
+                    for (x = 0; x < w; x++) {
+                        if (ctx->grid[y*w+x] >= 0)
+                            printf("%2d", ctx->grid[y*w+x]);
+                        else
+                            printf(" .");
+                    }
+                    printf(" |\n");
+                }
+            }
+#endif
+            /*
+             * Try adding a path.
+             */
+            if (add_path(ctx, rs)) {
+#ifdef GENERATION_DIAGNOSTICS
+                printf("added path\n");
+#endif
+                continue;
+            }
+
+            /*
+             * Try extending a path. First list all the possible
+             * extensions.
+             */
+            for (i = 0; i < ctx->npaths * 8; i++)
+                ctx->extends[i] = i;
+            n = i;
+
+            /*
+             * Then shuffle the list.
+             */
+            for (i = n; i-- > 1 ;) {
+                int k = random_upto(rs, i+1);
+                if (k != i) {
+                    int t = ctx->extends[i];
+                    ctx->extends[i] = ctx->extends[k];
+                    ctx->extends[k] = t;
+                }
+            }
+
+            /*
+             * Now try each one in turn until one works.
+             */
+            for (i = 0; i < n; i++) {
+                int p, d, e;
+                p = ctx->extends[i];
+                d = p % 4;
+                p /= 4;
+                e = p % 2;
+                p /= 2;
+
+#ifdef GENERATION_DIAGNOSTICS
+                printf("trying to extend path %d end %d (%d,%d) in dir %d\n", p, e,
+                       ctx->pathends[p*2+e] % w,
+                       ctx->pathends[p*2+e] / w, d);
+#endif
+                if (extend_path(ctx, p, e, d)) {
+#ifdef GENERATION_DIAGNOSTICS
+                    printf("extended path %d end %d (%d,%d) in dir %d\n", p, e,
+                           ctx->pathends[p*2+e] % w,
+                           ctx->pathends[p*2+e] / w, d);
+#endif
+                    break;
+                }
+            }
+
+            if (i < n)
+                continue;
+
+            break;
+        }
+    }
+}
+
+/*
+ * Wrapper function which deals with the boring bits such as
+ * removing the solution from the generated grid, shuffling the
+ * numeric labels and creating/disposing of the context structure.
+ */
+static int *gridgen(int w, int h, random_state *rs)
+{
+    struct genctx *ctx;
+    int *ret;
+    int i;
+
+    ctx = new_genctx(w, h);
+
+    gridgen_mainloop(ctx, rs);
+
+    /*
+     * There is likely to be an ordering bias in the numbers
+     * (longer paths on lower numbers due to there having been more
+     * grid space when laying them down). So we must shuffle the
+     * numbers. We use ctx->pathspare for this.
+     * 
+     * This is also as good a time as any to shift to numbering
+     * from 1, for display to the user.
+     */
+    for (i = 0; i < ctx->npaths; i++)
+        ctx->pathspare[i] = i+1;
+    for (i = ctx->npaths; i-- > 1 ;) {
+        int k = random_upto(rs, i+1);
+        if (k != i) {
+            int t = ctx->pathspare[i];
+            ctx->pathspare[i] = ctx->pathspare[k];
+            ctx->pathspare[k] = t;
+        }
+    }
+
+    /* FIXME: remove this at some point! */
+    {
+        int y, x;
+        for (y = 0; y < h; y++) {
+            printf("|");
+            for (x = 0; x < w; x++) {
+                assert(ctx->grid[y*w+x] >= 0);
+                printf("%2d", ctx->pathspare[ctx->grid[y*w+x]]);
+            }
+            printf(" |\n");
+        }
+        printf("\n");
+    }
+
+    /*
+     * Clear the grid, and write in just the endpoints.
+     */
+    for (i = 0; i < w*h; i++)
+        ctx->grid[i] = 0;
+    for (i = 0; i < ctx->npaths; i++) {
+        ctx->grid[ctx->pathends[i*2]] =
+            ctx->grid[ctx->pathends[i*2+1]] = ctx->pathspare[i];
+    }
+
+    ret = ctx->grid;
+    ctx->grid = NULL;
+
+    free_genctx(ctx);
+
+    return ret;
+}
+
+#ifdef TEST_GEN
+
+#define TEST_GENERAL
+
+int main(void)
+{
+    int w = 10, h = 8;
+    random_state *rs = random_new("12345", 5);
+    int x, y, i, *grid;
+
+    for (i = 0; i < 10; i++) {
+        grid = gridgen(w, h, rs);
+
+        for (y = 0; y < h; y++) {
+            printf("|");
+            for (x = 0; x < w; x++) {
+                if (grid[y*w+x] > 0)
+                    printf("%2d", grid[y*w+x]);
+                else
+                    printf(" .");
+            }
+            printf(" |\n");
+        }
+        printf("\n");
+
+        sfree(grid);
+    }
+
+    return 0;
+}
+#endif
diff --git a/apps/plugins/puzzles/src/unfinished/separate.c b/apps/plugins/puzzles/src/unfinished/separate.c
new file mode 100644
index 0000000000..6ca07252ad
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/separate.c
@@ -0,0 +1,861 @@
+/*
+ * separate.c: Implementation of `Block Puzzle', a Japanese-only
+ * Nikoli puzzle seen at
+ *   http://www.nikoli.co.jp/ja/puzzles/block_puzzle/
+ * 
+ * It's difficult to be absolutely sure of the rules since online
+ * Japanese translators are so bad, but looking at the sample
+ * puzzle it seems fairly clear that the rules of this one are
+ * very simple. You have an mxn grid in which every square
+ * contains a letter, there are k distinct letters with k dividing
+ * mn, and every letter occurs the same number of times; your aim
+ * is to find a partition of the grid into disjoint k-ominoes such
+ * that each k-omino contains exactly one of each letter.
+ * 
+ * (It may be that Nikoli always have m,n,k equal to one another.
+ * However, I don't see that that's critical to the puzzle; k|mn
+ * is the only really important constraint, and even that could
+ * probably be dispensed with if some squares were marked as
+ * unused.)
+ */
+
+/*
+ * Current status: only the solver/generator is yet written, and
+ * although working in principle it's _very_ slow. It generates
+ * 5x5n5 or 6x6n4 readily enough, 6x6n6 with a bit of effort, and
+ * 7x7n7 only with a serious strain. I haven't dared try it higher
+ * than that yet.
+ * 
+ * One idea to speed it up is to implement more of the solver.
+ * Ideas I've so far had include:
+ * 
+ *  - Generalise the deduction currently expressed as `an
+ *    undersized chain with only one direction to extend must take
+ *    it'. More generally, the deduction should say `if all the
+ *    possible k-ominoes containing a given chain also contain
+ *    square x, then mark square x as part of that k-omino'.
+ *     + For example, consider this case:
+ * 
+ *         a ? b    This represents the top left of a board; the letters
+ *         ? ? ?    a,b,c do not represent the letters used in the puzzle,
+ *         c ? ?    but indicate that those three squares are known to be
+ *                  of different ominoes. Now if k >= 4, we can immediately
+ *         deduce that the square midway between b and c belongs to the
+ *         same omino as a, because there is no way we can make a 4-or-
+ *         more-omino containing a which does not also contain that square.
+ *         (Most easily seen by imagining cutting that square out of the 
+ *         grid; then, clearly, the omino containing a has only two
+ *         squares to expand into, and needs at least three.)
+ * 
+ *    The key difficulty with this mode of reasoning is
+ *    identifying such squares. I can't immediately think of a
+ *    simple algorithm for finding them on a wholesale basis.
+ * 
+ *  - Bfs out from a chain looking for the letters it lacks. For
+ *    example, in this situation (top three rows of a 7x7n7 grid):
+ * 
+ *        +-----------+-+
+ *        |E-A-F-B-C D|D|
+ *        +-------     ||
+ *        |E-C-G-D G|G E|
+ *        +-+---        |
+ *        |E|E G A B F A|
+ *
+ *    In this situation we can be sure that the top left chain
+ *    E-A-F-B-C does extend rightwards to the D, because there is
+ *    no other D within reach of that chain. Note also that the
+ *    bfs can skip squares which are known to belong to other
+ *    ominoes than this one.
+ * 
+ *    (This deduction, I fear, should only be used in an
+ *    emergency, because it relies on _all_ squares within range
+ *    of the bfs having particular values and so using it during
+ *    incremental generation rather nails down a lot of the grid.)
+ * 
+ * It's conceivable that another thing we could do would be to
+ * increase the flexibility in the grid generator: instead of
+ * nailing down the _value_ of any square depended on, merely nail
+ * down its equivalence to other squares. Unfortunately this turns
+ * the letter-selection phase of generation into a general graph
+ * colouring problem (we must draw a graph with equivalence
+ * classes of squares as the vertices, and an edge between any two
+ * vertices representing equivalence classes which contain squares
+ * that share an omino, and then k-colour the result) and hence
+ * requires recursion, which bodes ill for something we're doing
+ * that many times per generation.
+ * 
+ * I suppose a simple thing I could try would be tuning the retry
+ * count, just in case it's set too high or too low for efficient
+ * generation.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+
+#include "puzzles.h"
+
+enum {
+    COL_BACKGROUND,
+    NCOLOURS
+};
+
+struct game_params {
+    int w, h, k;
+};
+
+struct game_state {
+    int FIXME;
+};
+
+static game_params *default_params(void)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = ret->h = ret->k = 5;      /* FIXME: a bit bigger? */
+
+    return ret;
+}
+
+static bool game_fetch_preset(int i, char **name, game_params **params)
+{
+    return false;
+}
+
+static void free_params(game_params *params)
+{
+    sfree(params);
+}
+
+static game_params *dup_params(const game_params *params)
+{
+    game_params *ret = snew(game_params);
+    *ret = *params;                    /* structure copy */
+    return ret;
+}
+
+static void decode_params(game_params *params, char const *string)
+{
+    params->w = params->h = params->k = atoi(string);
+    while (*string && isdigit((unsigned char)*string)) string++;
+    if (*string == 'x') {
+        string++;
+        params->h = atoi(string);
+        while (*string && isdigit((unsigned char)*string)) string++;
+    }
+    if (*string == 'n') {
+        string++;
+        params->k = atoi(string);
+        while (*string && isdigit((unsigned char)*string)) string++;
+    }
+}
+
+static char *encode_params(const game_params *params, bool full)
+{
+    char buf[256];
+    sprintf(buf, "%dx%dn%d", params->w, params->h, params->k);
+    return dupstr(buf);
+}
+
+static config_item *game_configure(const game_params *params)
+{
+    return NULL;
+}
+
+static game_params *custom_params(const config_item *cfg)
+{
+    return NULL;
+}
+
+static const char *validate_params(const game_params *params, bool full)
+{
+    return NULL;
+}
+
+/* ----------------------------------------------------------------------
+ * Solver and generator.
+ */
+
+struct solver_scratch {
+    int w, h, k;
+
+    /*
+     * Tracks connectedness between squares.
+     */
+    DSF *dsf;
+
+    /*
+     * size[dsf_canonify(dsf, yx)] tracks the size of the
+     * connected component containing yx.
+     */
+    int *size;
+
+    /*
+     * contents[dsf_canonify(dsf, yx)*k+i] tracks whether or not
+     * the connected component containing yx includes letter i. If
+     * the value is -1, it doesn't; otherwise its value is the
+     * index in the main grid of the square which contributes that
+     * letter to the component.
+     */
+    int *contents;
+
+    /*
+     * disconnect[dsf_canonify(dsf, yx1)*w*h + dsf_canonify(dsf, yx2)]
+     * tracks whether or not the connected components containing
+     * yx1 and yx2 are known to be distinct.
+     */
+    bool *disconnect;
+
+    /*
+     * Temporary space used only inside particular solver loops.
+     */
+    int *tmp;
+};
+
+static struct solver_scratch *solver_scratch_new(int w, int h, int k)
+{
+    int wh = w*h;
+    struct solver_scratch *sc = snew(struct solver_scratch);
+
+    sc->w = w;
+    sc->h = h;
+    sc->k = k;
+
+    sc->dsf = dsf_new(wh);
+    sc->size = snewn(wh, int);
+    sc->contents = snewn(wh * k, int);
+    sc->disconnect = snewn(wh*wh, bool);
+    sc->tmp = snewn(wh, int);
+
+    return sc;
+}
+
+static void solver_scratch_free(struct solver_scratch *sc)
+{
+    dsf_free(sc->dsf);
+    sfree(sc->size);
+    sfree(sc->contents);
+    sfree(sc->disconnect);
+    sfree(sc->tmp);
+    sfree(sc);
+}
+
+static void solver_connect(struct solver_scratch *sc, int yx1, int yx2)
+{
+    int w = sc->w, h = sc->h, k = sc->k;
+    int wh = w*h;
+    int i, yxnew;
+
+    yx1 = dsf_canonify(sc->dsf, yx1);
+    yx2 = dsf_canonify(sc->dsf, yx2);
+    assert(yx1 != yx2);
+
+    /*
+     * To connect two components together into a bigger one, we
+     * start by merging them in the dsf itself.
+     */
+    dsf_merge(sc->dsf, yx1, yx2);
+    yxnew = dsf_canonify(sc->dsf, yx2);
+
+    /*
+     * The size of the new component is the sum of the sizes of the
+     * old ones.
+     */
+    sc->size[yxnew] = sc->size[yx1] + sc->size[yx2];
+
+    /*
+     * The contents bitmap of the new component is the union of the
+     * contents of the old ones.
+     * 
+     * Given two numbers at most one of which is not -1, we can
+     * find the other one by adding the two and adding 1; this
+     * will yield -1 if both were -1 to begin with, otherwise the
+     * other.
+     * 
+     * (A neater approach would be to take their bitwise AND, but
+     * this is unfortunately not well-defined standard C when done
+     * to signed integers.)
+     */
+    for (i = 0; i < k; i++) {
+        assert(sc->contents[yx1*k+i] < 0 || sc->contents[yx2*k+i] < 0);
+        sc->contents[yxnew*k+i] = (sc->contents[yx1*k+i] +
+                                   sc->contents[yx2*k+i] + 1);
+    }
+
+    /*
+     * We must combine the rows _and_ the columns in the disconnect
+     * matrix.
+     */
+    for (i = 0; i < wh; i++)
+        sc->disconnect[yxnew*wh+i] = (sc->disconnect[yx1*wh+i] ||
+                                      sc->disconnect[yx2*wh+i]);
+    for (i = 0; i < wh; i++)
+        sc->disconnect[i*wh+yxnew] = (sc->disconnect[i*wh+yx1] ||
+                                      sc->disconnect[i*wh+yx2]);
+}
+
+static void solver_disconnect(struct solver_scratch *sc, int yx1, int yx2)
+{
+    int w = sc->w, h = sc->h;
+    int wh = w*h;
+
+    yx1 = dsf_canonify(sc->dsf, yx1);
+    yx2 = dsf_canonify(sc->dsf, yx2);
+    assert(yx1 != yx2);
+    assert(!sc->disconnect[yx1*wh+yx2]);
+    assert(!sc->disconnect[yx2*wh+yx1]);
+
+    /*
+     * Mark the components as disconnected from each other in the
+     * disconnect matrix.
+     */
+    sc->disconnect[yx1*wh+yx2] = true;
+    sc->disconnect[yx2*wh+yx1] = true;
+}
+
+static void solver_init(struct solver_scratch *sc)
+{
+    int w = sc->w, h = sc->h;
+    int wh = w*h;
+    int i;
+
+    /*
+     * Set up most of the scratch space. We don't set up the
+     * contents array, however, because this will change if we
+     * adjust the letter arrangement and re-run the solver.
+     */
+    dsf_reinit(sc->dsf);
+    for (i = 0; i < wh; i++) sc->size[i] = 1;
+    memset(sc->disconnect, 0, wh*wh * sizeof(bool));
+}
+
+static int solver_attempt(struct solver_scratch *sc, const unsigned char *grid,
+                          bool *gen_lock)
+{
+    int w = sc->w, h = sc->h, k = sc->k;
+    int wh = w*h;
+    int i, x, y;
+    bool done_something_overall = false;
+
+    /*
+     * Set up the contents array from the grid.
+     */
+    for (i = 0; i < wh*k; i++)
+        sc->contents[i] = -1;
+    for (i = 0; i < wh; i++)
+        sc->contents[dsf_canonify(sc->dsf, i)*k+grid[i]] = i;
+
+    while (1) {
+        bool done_something = false;
+
+        /*
+         * Go over the grid looking for reasons to add to the
+         * disconnect matrix. We're after pairs of squares which:
+         * 
+         *  - are adjacent in the grid
+         *  - belong to distinct dsf components
+         *  - their components are not already marked as
+         *    disconnected
+         *  - their components share a letter in common.
+         */
+        for (y = 0; y < h; y++) {
+            for (x = 0; x < w; x++) {
+                int dir;
+                for (dir = 0; dir < 2; dir++) {
+                    int x2 = x + dir, y2 = y + 1 - dir;
+                    int yx = y*w+x, yx2 = y2*w+x2;
+
+                    if (x2 >= w || y2 >= h)
+                        continue;      /* one square is outside the grid */
+
+                    yx = dsf_canonify(sc->dsf, yx);
+                    yx2 = dsf_canonify(sc->dsf, yx2);
+                    if (yx == yx2)
+                        continue;      /* same dsf component */
+
+                    if (sc->disconnect[yx*wh+yx2])
+                        continue;      /* already known disconnected */
+
+                    for (i = 0; i < k; i++)
+                        if (sc->contents[yx*k+i] >= 0 &&
+                            sc->contents[yx2*k+i] >= 0)
+                            break;
+                    if (i == k)
+                        continue;      /* no letter in common */
+
+                    /*
+                     * We've found one. Mark yx and yx2 as
+                     * disconnected from each other.
+                     */
+#ifdef SOLVER_DIAGNOSTICS
+                    printf("Disconnecting %d and %d (%c)\n", yx, yx2, 'A'+i);
+#endif
+                    solver_disconnect(sc, yx, yx2);
+                    done_something = done_something_overall = true;
+
+                    /*
+                     * We have just made a deduction which hinges
+                     * on two particular grid squares being the
+                     * same. If we are feeding back to a generator
+                     * loop, we must therefore mark those squares
+                     * as fixed in the generator, so that future
+                     * rearrangement of the grid will not break
+                     * the information on which we have already
+                     * based deductions.
+                     */
+                    if (gen_lock) {
+                        gen_lock[sc->contents[yx*k+i]] = true;
+                        gen_lock[sc->contents[yx2*k+i]] = true;
+                    }
+                }
+            }
+        }
+
+        /*
+         * Now go over the grid looking for dsf components which
+         * are below maximum size and only have one way to extend,
+         * and extending them.
+         */
+        for (i = 0; i < wh; i++)
+            sc->tmp[i] = -1;
+        for (y = 0; y < h; y++) {
+            for (x = 0; x < w; x++) {
+                int yx = dsf_canonify(sc->dsf, y*w+x);
+                int dir;
+
+                if (sc->size[yx] == k)
+                    continue;
+
+                for (dir = 0; dir < 4; dir++) {
+                    int x2 = x + (dir==0 ? -1 : dir==2 ? 1 : 0);
+                    int y2 = y + (dir==1 ? -1 : dir==3 ? 1 : 0);
+                    int yx2, yx2c;
+
+                    if (y2 < 0 || y2 >= h || x2 < 0 || x2 >= w)
+                        continue;
+                    yx2 = y2*w+x2;
+                    yx2c = dsf_canonify(sc->dsf, yx2);
+
+                    if (yx2c != yx && !sc->disconnect[yx2c*wh+yx]) {
+                        /*
+                         * Component yx can be extended into square
+                         * yx2.
+                         */
+                        if (sc->tmp[yx] == -1)
+                            sc->tmp[yx] = yx2;
+                        else if (sc->tmp[yx] != yx2)
+                            sc->tmp[yx] = -2;   /* multiple choices found */
+                    }
+                }
+            }
+        }
+        for (i = 0; i < wh; i++) {
+            if (sc->tmp[i] >= 0) {
+                /*
+                 * Make sure we haven't connected the two already
+                 * during this loop (which could happen if for
+                 * _both_ components this was the only way to
+                 * extend them).
+                 */
+                if (dsf_canonify(sc->dsf, i) ==
+                    dsf_canonify(sc->dsf, sc->tmp[i]))
+                    continue;
+
+#ifdef SOLVER_DIAGNOSTICS
+                printf("Connecting %d and %d\n", i, sc->tmp[i]);
+#endif
+                solver_connect(sc, i, sc->tmp[i]);
+                done_something = done_something_overall = true;
+                break;
+            }
+        }
+
+        if (!done_something)
+            break;
+    }
+
+    /*
+     * Return 0 if we haven't made any progress; 1 if we've done
+     * something but not solved it completely; 2 if we've solved
+     * it completely.
+     */
+    for (i = 0; i < wh; i++)
+        if (sc->size[dsf_canonify(sc->dsf, i)] != k)
+            break;
+    if (i == wh)
+        return 2;
+    if (done_something_overall)
+        return 1;
+    return 0;
+}
+
+static unsigned char *generate(int w, int h, int k, random_state *rs)
+{
+    int wh = w*h;
+    int n = wh/k;
+    struct solver_scratch *sc;
+    unsigned char *grid;
+    unsigned char *shuffled;
+    int i, j, m, retries;
+    int *permutation;
+    bool *gen_lock;
+
+    sc = solver_scratch_new(w, h, k);
+    grid = snewn(wh, unsigned char);
+    shuffled = snewn(k, unsigned char);
+    permutation = snewn(wh, int);
+    gen_lock = snewn(wh, bool);
+
+    do {
+        DSF *dsf = divvy_rectangle(w, h, k, rs);
+
+        /*
+         * Go through the dsf and find the indices of all the
+         * squares involved in each omino, in a manner conducive
+         * to per-omino indexing. We set permutation[i*k+j] to be
+         * the index of the jth square (ordered arbitrarily) in
+         * omino i.
+         */
+        for (i = j = 0; i < wh; i++)
+            if (dsf_canonify(dsf, i) == i) {
+                sc->tmp[i] = j;
+                /*
+                 * During this loop and the following one, we use
+                 * the last element of each row of permutation[]
+                 * as a counter of the number of indices so far
+                 * placed in it. When we place the final index of
+                 * an omino, that counter is overwritten, but that
+                 * doesn't matter because we'll never use it
+                 * again. Of course this depends critically on
+                 * divvy_rectangle() having returned correct
+                 * results, or else chaos would ensue.
+                 */
+                permutation[j*k+k-1] = 0;
+                j++;
+            }
+        for (i = 0; i < wh; i++) {
+            j = sc->tmp[dsf_canonify(dsf, i)];
+            m = permutation[j*k+k-1]++;
+            permutation[j*k+m] = i;
+        }
+
+        /*
+         * Track which squares' letters we have already depended
+         * on for deductions. This is gradually updated by
+         * solver_attempt().
+         */
+        memset(gen_lock, 0, wh * sizeof(bool));
+
+        /*
+         * Now repeatedly fill the grid with letters, and attempt
+         * to solve it. If the solver makes progress but does not
+         * fail completely, then gen_lock will have been updated
+         * and we try again. On a complete failure, though, we
+         * have no option but to give up and abandon this set of
+         * ominoes.
+         */
+        solver_init(sc);
+        retries = k*k;
+        while (1) {
+            /*
+             * Fill the grid with letters. We can safely use
+             * sc->tmp to hold the set of letters required at each
+             * stage, since it's at least size k and is currently
+             * unused.
+             */
+            for (i = 0; i < n; i++) {
+                /*
+                 * First, determine the set of letters already
+                 * placed in this omino by gen_lock.
+                 */
+                for (j = 0; j < k; j++)
+                    sc->tmp[j] = j;
+                for (j = 0; j < k; j++) {
+                    int index = permutation[i*k+j];
+                    int letter = grid[index];
+                    if (gen_lock[index])
+                        sc->tmp[letter] = -1;
+                }
+                /*
+                 * Now collect together all the remaining letters
+                 * and randomly shuffle them.
+                 */
+                for (j = m = 0; j < k; j++)
+                    if (sc->tmp[j] >= 0)
+                        sc->tmp[m++] = sc->tmp[j];
+                shuffle(sc->tmp, m, sizeof(*sc->tmp), rs);
+                /*
+                 * Finally, write the shuffled letters into the
+                 * grid.
+                 */
+                for (j = 0; j < k; j++) {
+                    int index = permutation[i*k+j];
+                    if (!gen_lock[index])
+                        grid[index] = sc->tmp[--m];
+                }
+                assert(m == 0);
+            }
+
+            /*
+             * Now we have a candidate grid. Attempt to progress
+             * the solution.
+             */
+            m = solver_attempt(sc, grid, gen_lock);
+            if (m == 2 ||              /* success */
+                (m == 0 && retries-- <= 0))   /* failure */
+                break;
+            if (m == 1)
+                retries = k*k;         /* reset this counter, and continue */
+        }
+
+        dsf_free(dsf);
+    } while (m == 0);
+
+    sfree(gen_lock);
+    sfree(permutation);
+    sfree(shuffled);
+    solver_scratch_free(sc);
+
+    return grid;
+}
+
+/* ----------------------------------------------------------------------
+ * End of solver/generator code.
+ */
+
+static char *new_game_desc(const game_params *params, random_state *rs,
+                           char **aux, bool interactive)
+{
+    int w = params->w, h = params->h, wh = w*h, k = params->k;
+    unsigned char *grid;
+    char *desc;
+    int i;
+
+    grid = generate(w, h, k, rs);
+
+    desc = snewn(wh+1, char);
+    for (i = 0; i < wh; i++)
+        desc[i] = 'A' + grid[i];
+    desc[wh] = '\0';
+
+    sfree(grid);
+
+    return desc;
+}
+
+static const char *validate_desc(const game_params *params, const char *desc)
+{
+    return NULL;
+}
+
+static game_state *new_game(midend *me, const game_params *params,
+                            const char *desc)
+{
+    game_state *state = snew(game_state);
+
+    state->FIXME = 0;
+
+    return state;
+}
+
+static game_state *dup_game(const game_state *state)
+{
+    game_state *ret = snew(game_state);
+
+    ret->FIXME = state->FIXME;
+
+    return ret;
+}
+
+static void free_game(game_state *state)
+{
+    sfree(state);
+}
+
+static char *solve_game(const game_state *state, const game_state *currstate,
+                        const char *aux, const char **error)
+{
+    return NULL;
+}
+
+static bool game_can_format_as_text_now(const game_params *params)
+{
+    return true;
+}
+
+static char *game_text_format(const game_state *state)
+{
+    return NULL;
+}
+
+static game_ui *new_ui(const game_state *state)
+{
+    return NULL;
+}
+
+static void free_ui(game_ui *ui)
+{
+}
+
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
+{
+}
+
+struct game_drawstate {
+    int tilesize;
+    int FIXME;
+};
+
+static char *interpret_move(const game_state *state, game_ui *ui,
+                            const game_drawstate *ds,
+                            int x, int y, int button)
+{
+    return NULL;
+}
+
+static game_state *execute_move(const game_state *state, const char *move)
+{
+    return NULL;
+}
+
+/* ----------------------------------------------------------------------
+ * Drawing routines.
+ */
+
+static void game_compute_size(const game_params *params, int tilesize,
+                              const game_ui *ui, int *x, int *y)
+{
+    *x = *y = 10 * tilesize;           /* FIXME */
+}
+
+static void game_set_size(drawing *dr, game_drawstate *ds,
+                          const game_params *params, int tilesize)
+{
+    ds->tilesize = tilesize;
+}
+
+static float *game_colours(frontend *fe, int *ncolours)
+{
+    float *ret = snewn(3 * NCOLOURS, float);
+
+    frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]);
+
+    *ncolours = NCOLOURS;
+    return ret;
+}
+
+static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
+{
+    struct game_drawstate *ds = snew(struct game_drawstate);
+
+    ds->tilesize = 0;
+    ds->FIXME = 0;
+
+    return ds;
+}
+
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
+{
+    sfree(ds);
+}
+
+static void game_redraw(drawing *dr, game_drawstate *ds,
+                        const game_state *oldstate, const game_state *state,
+                        int dir, const game_ui *ui,
+                        float animtime, float flashtime)
+{
+}
+
+static float game_anim_length(const game_state *oldstate,
+                              const game_state *newstate, int dir, game_ui *ui)
+{
+    return 0.0F;
+}
+
+static float game_flash_length(const game_state *oldstate,
+                               const game_state *newstate, int dir, game_ui *ui)
+{
+    return 0.0F;
+}
+
+static void game_get_cursor_location(const game_ui *ui,
+                                     const game_drawstate *ds,
+                                     const game_state *state,
+                                     const game_params *params,
+                                     int *x, int *y, int *w, int *h)
+{
+}
+
+static int game_status(const game_state *state)
+{
+    return 0;
+}
+
+static bool game_timing_state(const game_state *state, game_ui *ui)
+{
+    return true;
+}
+
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
+{
+}
+
+#ifdef COMBINED
+#define thegame separate
+#endif
+
+const struct game thegame = {
+    "Separate", NULL, NULL,
+    default_params,
+    game_fetch_preset, NULL,
+    decode_params,
+    encode_params,
+    free_params,
+    dup_params,
+    false, game_configure, custom_params,
+    validate_params,
+    new_game_desc,
+    validate_desc,
+    new_game,
+    dup_game,
+    free_game,
+    false, solve_game,
+    false, game_can_format_as_text_now, game_text_format,
+    NULL, NULL, /* get_prefs, set_prefs */
+    new_ui,
+    free_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
+    NULL, /* game_request_keys */
+    game_changed_state,
+    NULL, /* current_key_label */
+    interpret_move,
+    execute_move,
+    20 /* FIXME */, game_compute_size, game_set_size,
+    game_colours,
+    game_new_drawstate,
+    game_free_drawstate,
+    game_redraw,
+    game_anim_length,
+    game_flash_length,
+    game_get_cursor_location,
+    game_status,
+    false, false, game_print_size, game_print,
+    false,                             /* wants_statusbar */
+    false, game_timing_state,
+    0,                                 /* flags */
+};
diff --git a/apps/plugins/puzzles/src/unfinished/slide.c b/apps/plugins/puzzles/src/unfinished/slide.c
new file mode 100644
index 0000000000..4c4d98943e
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/slide.c
@@ -0,0 +1,2444 @@
+/*
+ * slide.c: Implementation of the block-sliding puzzle `Klotski'.
+ */
+
+/*
+ * TODO:
+ * 
+ *  - Improve the generator.
+ *     * actually, we seem to be mostly sensible already now. I
+ *       want more choice over the type of main block and location
+ *       of the exit/target, and I think I probably ought to give
+ *       up on compactness and just bite the bullet and have the
+ *       target area right outside the main wall, but mostly I
+ *       think it's OK.
+ *     * the move limit tends to make the game _slower_ to
+ *       generate, which is odd. Perhaps investigate why.
+ * 
+ *  - Improve the graphics.
+ *     * All the colours are a bit wishy-washy. _Some_ dark
+ *       colours would surely not be excessive? Probably darken
+ *       the tiles, the walls and the main block, and leave the
+ *       target marker pale.
+ *     * The cattle grid effect is still disgusting. Think of
+ *       something completely different.
+ *     * The highlight for next-piece-to-move in the solver is
+ *       excessive, and the shadow blends in too well with the
+ *       piece lowlights. Adjust both.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+
+#include "puzzles.h"
+#include "tree234.h"
+
+/*
+ * The implementation of this game revolves around the insight
+ * which makes an exhaustive-search solver feasible: although
+ * there are many blocks which can be rearranged in many ways, any
+ * two blocks of the same shape are _indistinguishable_ and hence
+ * the number of _distinct_ board layouts is generally much
+ * smaller. So we adopt a representation for board layouts which
+ * is inherently canonical, i.e. there are no two distinct
+ * representations which encode indistinguishable layouts.
+ *
+ * The way we do this is to encode each square of the board, in
+ * the normal left-to-right top-to-bottom order, as being one of
+ * the following things:
+ *  - the first square (in the given order) of a block (`anchor')
+ *  - special case of the above: the anchor for the _main_ block
+ *    (i.e. the one which the aim of the game is to get to the
+ *    target position)
+ *  - a subsequent square of a block whose previous square was N
+ *    squares ago
+ *  - an impassable wall
+ * 
+ * (We also separately store data about which board positions are
+ * forcefields only passable by the main block. We can't encode
+ * that in the main board data, because then the main block would
+ * destroy forcefields as it went over them.)
+ *
+ * Hence, for example, a 2x2 square block would be encoded as
+ * ANCHOR, followed by DIST(1), and w-2 squares later on there
+ * would be DIST(w-1) followed by DIST(1). So if you start at the
+ * last of those squares, the DIST numbers give you a linked list
+ * pointing back through all the other squares in the same block.
+ *
+ * So the solver simply does a bfs over all reachable positions,
+ * encoding them in this format and storing them in a tree234 to
+ * ensure it doesn't ever revisit an already-analysed position.
+ */
+
+enum {
+    /*
+     * The colours are arranged here so that every base colour is
+     * directly followed by its highlight colour and then its
+     * lowlight colour. Do not break this, or draw_tile() will get
+     * confused.
+     */
+    COL_BACKGROUND,
+    COL_HIGHLIGHT,
+    COL_LOWLIGHT,
+    COL_DRAGGING,
+    COL_DRAGGING_HIGHLIGHT,
+    COL_DRAGGING_LOWLIGHT,
+    COL_MAIN,
+    COL_MAIN_HIGHLIGHT,
+    COL_MAIN_LOWLIGHT,
+    COL_MAIN_DRAGGING,
+    COL_MAIN_DRAGGING_HIGHLIGHT,
+    COL_MAIN_DRAGGING_LOWLIGHT,
+    COL_TARGET,
+    COL_TARGET_HIGHLIGHT,
+    COL_TARGET_LOWLIGHT,
+    NCOLOURS
+};
+
+/*
+ * Board layout is a simple array of bytes. Each byte holds:
+ */
+#define ANCHOR      255                /* top-left-most square of some piece */
+#define MAINANCHOR  254                /* anchor of _main_ piece */
+#define EMPTY       253                /* empty square */
+#define WALL        252                /* immovable wall */
+#define MAXDIST     251
+/* all other values indicate distance back to previous square of same block */
+#define ISDIST(x) ( (unsigned char)((x)-1) <= MAXDIST-1 )
+#define DIST(x) (x)
+#define ISANCHOR(x) ( (x)==ANCHOR || (x)==MAINANCHOR )
+#define ISBLOCK(x) ( ISANCHOR(x) || ISDIST(x) )
+
+/*
+ * MAXDIST is the largest DIST value we can encode. This must
+ * therefore also be the maximum puzzle width in theory (although
+ * solver running time will dictate a much smaller limit in
+ * practice).
+ */
+#define MAXWID MAXDIST
+
+struct game_params {
+    int w, h;
+    int maxmoves;
+};
+
+struct game_immutable_state {
+    int refcount;
+    bool *forcefield;
+};
+
+struct game_solution {
+    int nmoves;
+    int *moves;                        /* just like from solve_board() */
+    int refcount;
+};
+
+struct game_state {
+    int w, h;
+    unsigned char *board;
+    int tx, ty;                        /* target coords for MAINANCHOR */
+    int minmoves;                      /* for display only */
+    int lastmoved, lastmoved_pos;      /* for move counting */
+    int movecount;
+    int completed;
+    bool cheated;
+    struct game_immutable_state *imm;
+    struct game_solution *soln;
+    int soln_index;
+};
+
+static game_params *default_params(void)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = 7;
+    ret->h = 6;
+    ret->maxmoves = 40;
+
+    return ret;
+}
+
+static const struct game_params slide_presets[] = {
+    {7, 6, 25},
+    {7, 6, -1},
+    {8, 6, -1},
+};
+
+static bool game_fetch_preset(int i, char **name, game_params **params)
+{
+    game_params *ret;
+    char str[80];
+
+    if (i < 0 || i >= lenof(slide_presets))
+        return false;
+
+    ret = snew(game_params);
+    *ret = slide_presets[i];
+
+    sprintf(str, "%dx%d", ret->w, ret->h);
+    if (ret->maxmoves >= 0)
+        sprintf(str + strlen(str), ", max %d moves", ret->maxmoves);
+    else
+        sprintf(str + strlen(str), ", no move limit");
+
+    *name = dupstr(str);
+    *params = ret;
+    return true;
+}
+
+static void free_params(game_params *params)
+{
+    sfree(params);
+}
+
+static game_params *dup_params(const game_params *params)
+{
+    game_params *ret = snew(game_params);
+    *ret = *params;                    /* structure copy */
+    return ret;
+}
+
+static void decode_params(game_params *params, char const *string)
+{
+    params->w = params->h = atoi(string);
+    while (*string && isdigit((unsigned char)*string)) string++;
+    if (*string == 'x') {
+        string++;
+        params->h = atoi(string);
+        while (*string && isdigit((unsigned char)*string)) string++;
+    }
+    if (*string == 'm') {
+        string++;
+        params->maxmoves = atoi(string);
+        while (*string && isdigit((unsigned char)*string)) string++;
+    } else if (*string == 'u') {
+        string++;
+        params->maxmoves = -1;
+    }
+}
+
+static char *encode_params(const game_params *params, bool full)
+{
+    char data[256];
+
+    sprintf(data, "%dx%d", params->w, params->h);
+    if (params->maxmoves >= 0)
+        sprintf(data + strlen(data), "m%d", params->maxmoves);
+    else
+        sprintf(data + strlen(data), "u");
+
+    return dupstr(data);
+}
+
+static config_item *game_configure(const game_params *params)
+{
+    config_item *ret;
+    char buf[80];
+
+    ret = snewn(4, config_item);
+
+    ret[0].name = "Width";
+    ret[0].type = C_STRING;
+    sprintf(buf, "%d", params->w);
+    ret[0].u.string.sval = dupstr(buf);
+
+    ret[1].name = "Height";
+    ret[1].type = C_STRING;
+    sprintf(buf, "%d", params->h);
+    ret[1].u.string.sval = dupstr(buf);
+
+    ret[2].name = "Solution length limit";
+    ret[2].type = C_STRING;
+    sprintf(buf, "%d", params->maxmoves);
+    ret[2].u.string.sval = dupstr(buf);
+
+    ret[3].name = NULL;
+    ret[3].type = C_END;
+
+    return ret;
+}
+
+static game_params *custom_params(const config_item *cfg)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = atoi(cfg[0].u.string.sval);
+    ret->h = atoi(cfg[1].u.string.sval);
+    ret->maxmoves = atoi(cfg[2].u.string.sval);
+
+    return ret;
+}
+
+static const char *validate_params(const game_params *params, bool full)
+{
+    if (params->w > MAXWID)
+        return "Width must be at most " STR(MAXWID);
+
+    if (params->w < 5)
+        return "Width must be at least 5";
+    if (params->h < 4)
+        return "Height must be at least 4";
+
+    return NULL;
+}
+
+static char *board_text_format(int w, int h, unsigned char *data,
+                               bool *forcefield)
+{
+    int wh = w*h;
+    DSF *dsf = dsf_new(wh);
+    int i, x, y;
+    int retpos, retlen = (w*2+2)*(h*2+1)+1;
+    char *ret = snewn(retlen, char);
+
+    for (i = 0; i < wh; i++)
+        if (ISDIST(data[i]))
+            dsf_merge(dsf, i - data[i], i);
+    retpos = 0;
+    for (y = 0; y < 2*h+1; y++) {
+        for (x = 0; x < 2*w+1; x++) {
+            int v;
+            int i = (y/2)*w+(x/2);
+
+#define dtype(i) (ISBLOCK(data[i]) ? \
+                  dsf_canonify(dsf, i) : data[i])
+#define dchar(t) ((t)==EMPTY ? ' ' : (t)==WALL ? '#' : \
+                  data[t] == MAINANCHOR ? '*' : '%')
+
+            if (y % 2 && x % 2) {
+                int j = dtype(i);
+                v = dchar(j);
+            } else if (y % 2 && !(x % 2)) {
+                int j1 = (x > 0 ? dtype(i-1) : -1);
+                int j2 = (x < 2*w ? dtype(i) : -1);
+                if (j1 != j2)
+                    v = '|';
+                else
+                    v = dchar(j1);
+            } else if (!(y % 2) && (x % 2)) {
+                int j1 = (y > 0 ? dtype(i-w) : -1);
+                int j2 = (y < 2*h ? dtype(i) : -1);
+                if (j1 != j2)
+                    v = '-';
+                else
+                    v = dchar(j1);
+            } else {
+                int j1 = (x > 0 && y > 0 ? dtype(i-w-1) : -1);
+                int j2 = (x > 0 && y < 2*h ? dtype(i-1) : -1);
+                int j3 = (x < 2*w && y > 0 ? dtype(i-w) : -1);
+                int j4 = (x < 2*w && y < 2*h ? dtype(i) : -1);
+                if (j1 == j2 && j2 == j3 && j3 == j4)
+                    v = dchar(j1);
+                else if (j1 == j2 && j3 == j4)
+                    v = '|';
+                else if (j1 == j3 && j2 == j4)
+                    v = '-';
+                else
+                    v = '+';
+            }
+
+            assert(retpos < retlen);
+            ret[retpos++] = v;
+        }
+        assert(retpos < retlen);
+        ret[retpos++] = '\n';
+    }
+    assert(retpos < retlen);
+    ret[retpos++] = '\0';
+    assert(retpos == retlen);
+
+    return ret;
+}
+
+/* ----------------------------------------------------------------------
+ * Solver.
+ */
+
+/*
+ * During solver execution, the set of visited board positions is
+ * stored as a tree234 of the following structures. `w', `h' and
+ * `data' are obvious in meaning; `dist' represents the minimum
+ * distance to reach this position from the starting point.
+ * 
+ * `prev' links each board to the board position from which it was
+ * most efficiently derived.
+ */
+struct board {
+    int w, h;
+    int dist;
+    struct board *prev;
+    unsigned char *data;
+};
+
+static int boardcmp(void *av, void *bv)
+{
+    struct board *a = (struct board *)av;
+    struct board *b = (struct board *)bv;
+    return memcmp(a->data, b->data, a->w * a->h);
+}
+
+static struct board *newboard(int w, int h, unsigned char *data)
+{
+    struct board *b = malloc(sizeof(struct board) + w*h);
+    b->data = (unsigned char *)b + sizeof(struct board);
+    memcpy(b->data, data, w*h);
+    b->w = w;
+    b->h = h;
+    b->dist = -1;
+    b->prev = NULL;
+    return b;
+}
+
+/*
+ * The actual solver. Given a board, attempt to find the minimum
+ * length of move sequence which moves MAINANCHOR to (tx,ty), or
+ * -1 if no solution exists. Returns that minimum length.
+ * 
+ * Also, if `moveout' is provided, writes out the moves in the
+ * form of a sequence of pairs of integers indicating the source
+ * and destination points of the anchor of the moved piece in each
+ * move. Exactly twice as many integers are written as the number
+ * returned from solve_board(), and `moveout' receives an int *
+ * which is a pointer to a dynamically allocated array.
+ */
+static int solve_board(int w, int h, unsigned char *board,
+                       bool *forcefield, int tx, int ty,
+                       int movelimit, int **moveout)
+{
+    int wh = w*h;
+    struct board *b, *b2, *b3;
+    int *next, *which;
+    bool *anchors, *movereached;
+    int *movequeue, mqhead, mqtail;
+    tree234 *sorted, *queue;
+    int i, j, dir;
+    int qlen, lastdist;
+    int ret;
+
+#ifdef SOLVER_DIAGNOSTICS
+    {
+        char *t = board_text_format(w, h, board);
+        for (i = 0; i < h; i++) {
+            for (j = 0; j < w; j++) {
+                int c = board[i*w+j];
+                if (ISDIST(c))
+                    printf("D%-3d", c);
+                else if (c == MAINANCHOR)
+                    printf("M   ");
+                else if (c == ANCHOR)
+                    printf("A   ");
+                else if (c == WALL)
+                    printf("W   ");
+                else if (c == EMPTY)
+                    printf("E   ");
+            }
+            printf("\n");
+        }
+        
+        printf("Starting solver for:\n%s\n", t);
+        sfree(t);
+    }
+#endif
+
+    sorted = newtree234(boardcmp);
+    queue = newtree234(NULL);
+
+    b = newboard(w, h, board);
+    b->dist = 0;
+    add234(sorted, b);
+    addpos234(queue, b, 0);
+    qlen = 1;
+
+    next = snewn(wh, int);
+    anchors = snewn(wh, bool);
+    which = snewn(wh, int);
+    movereached = snewn(wh, bool);
+    movequeue = snewn(wh, int);
+    lastdist = -1;
+
+    while ((b = delpos234(queue, 0)) != NULL) {
+        qlen--;
+        if (movelimit >= 0 && b->dist >= movelimit) {
+            /*
+             * The problem is not soluble in under `movelimit'
+             * moves, so we can quit right now.
+             */
+            b2 = NULL;
+            goto done;
+        }
+        if (b->dist != lastdist) {
+#ifdef SOLVER_DIAGNOSTICS
+            printf("dist %d (%d)\n", b->dist, count234(sorted));
+#endif
+            lastdist = b->dist;
+        }
+        /*
+         * Find all the anchors and form a linked list of the
+         * squares within each block.
+         */
+        for (i = 0; i < wh; i++) {
+            next[i] = -1;
+            anchors[i] = false;
+            which[i] = -1;
+            if (ISANCHOR(b->data[i])) {
+                anchors[i] = true;
+                which[i] = i;
+            } else if (ISDIST(b->data[i])) {
+                j = i - b->data[i];
+                next[j] = i;
+                which[i] = which[j];
+            }
+        }
+
+        /*
+         * For each anchor, do an array-based BFS to find all the
+         * places we can slide it to.
+         */
+        for (i = 0; i < wh; i++) {
+            if (!anchors[i])
+                continue;
+
+            mqhead = mqtail = 0;
+            for (j = 0; j < wh; j++)
+                movereached[j] = false;
+            movequeue[mqtail++] = i;
+            while (mqhead < mqtail) {
+                int pos = movequeue[mqhead++];
+
+                /*
+                 * Try to move in each direction from here.
+                 */
+                for (dir = 0; dir < 4; dir++) {
+                    int dx = (dir == 0 ? -1 : dir == 1 ? +1 : 0);
+                    int dy = (dir == 2 ? -1 : dir == 3 ? +1 : 0);
+                    int offset = dy*w + dx;
+                    int newpos = pos + offset;
+                    int d = newpos - i;
+
+                    /*
+                     * For each square involved in this block,
+                     * check to see if the square d spaces away
+                     * from it is either empty or part of the same
+                     * block.
+                     */
+                    for (j = i; j >= 0; j = next[j]) {
+                        int jy = (pos+j-i) / w + dy, jx = (pos+j-i) % w + dx;
+                        if (jy >= 0 && jy < h && jx >= 0 && jx < w &&
+                            ((b->data[j+d] == EMPTY || which[j+d] == i) &&
+                             (b->data[i] == MAINANCHOR || !forcefield[j+d])))
+                            /* ok */;
+                        else
+                            break;
+                    }
+                    if (j >= 0)
+                        continue;              /* this direction wasn't feasible */
+
+                    /*
+                     * If we've already tried moving this piece
+                     * here, leave it.
+                     */
+                    if (movereached[newpos])
+                        continue;
+                    movereached[newpos] = true;
+                    movequeue[mqtail++] = newpos;
+
+                    /*
+                     * We have a viable move. Make it.
+                     */
+                    b2 = newboard(w, h, b->data);
+                    for (j = i; j >= 0; j = next[j])
+                        b2->data[j] = EMPTY;
+                    for (j = i; j >= 0; j = next[j])
+                        b2->data[j+d] = b->data[j];
+
+                    b3 = add234(sorted, b2);
+                    if (b3 != b2) {
+                        sfree(b2);             /* we already got one */
+                    } else {
+                        b2->dist = b->dist + 1;
+                        b2->prev = b;
+                        addpos234(queue, b2, qlen++);
+                        if (b2->data[ty*w+tx] == MAINANCHOR)
+                            goto done;     /* search completed! */
+                    }
+                }
+            }
+        }
+    }
+    b2 = NULL;
+
+    done:
+
+    if (b2) {
+        ret = b2->dist;
+        if (moveout) {
+            /*
+             * Now b2 represents the solved position. Backtrack to
+             * output the solution.
+             */
+            *moveout = snewn(ret * 2, int);
+            j = ret * 2;
+
+            while (b2->prev) {
+                int from = -1, to = -1;
+
+                b = b2->prev;
+
+                /*
+                 * Scan b and b2 to find out which piece has
+                 * moved.
+                 */
+                for (i = 0; i < wh; i++) {
+                    if (ISANCHOR(b->data[i]) && !ISANCHOR(b2->data[i])) {
+                        assert(from == -1);
+                        from = i;
+                    } else if (!ISANCHOR(b->data[i]) && ISANCHOR(b2->data[i])){
+                        assert(to == -1);
+                        to = i;
+                    }
+                }
+
+                assert(from >= 0 && to >= 0);
+                assert(j >= 2);
+                (*moveout)[--j] = to;
+                (*moveout)[--j] = from;
+
+                b2 = b;
+            }
+            assert(j == 0);
+        }
+    } else {
+        ret = -1;                      /* no solution */
+        if (moveout)
+            *moveout = NULL;
+    }
+
+    freetree234(queue);
+
+    while ((b = delpos234(sorted, 0)) != NULL)
+        sfree(b);
+    freetree234(sorted);
+
+    sfree(next);
+    sfree(anchors);
+    sfree(movereached);
+    sfree(movequeue);
+    sfree(which);
+
+    return ret;
+}
+
+/* ----------------------------------------------------------------------
+ * Random board generation.
+ */
+
+static void generate_board(int w, int h, int *rtx, int *rty, int *minmoves,
+                           random_state *rs, unsigned char **rboard,
+                           bool **rforcefield, int movelimit)
+{
+    int wh = w*h;
+    unsigned char *board, *board2;
+    bool *forcefield;
+    bool *tried_merge;
+    DSF *dsf;
+    int *list, nlist, pos;
+    int tx, ty;
+    int i, j;
+    int moves = 0;                     /* placate optimiser */
+
+    /*
+     * Set up a board and fill it with singletons, except for a
+     * border of walls.
+     */
+    board = snewn(wh, unsigned char);
+    forcefield = snewn(wh, bool);
+    board2 = snewn(wh, unsigned char);
+    memset(board, ANCHOR, wh);
+    memset(forcefield, 0, wh * sizeof(bool));
+    for (i = 0; i < w; i++)
+        board[i] = board[i+w*(h-1)] = WALL;
+    for (i = 0; i < h; i++)
+        board[i*w] = board[i*w+(w-1)] = WALL;
+
+    tried_merge = snewn(wh * wh, bool);
+    memset(tried_merge, 0, wh*wh * sizeof(bool));
+    dsf = dsf_new(wh);
+
+    /*
+     * Invent a main piece at one extreme. (FIXME: vary the
+     * extreme, and the piece.)
+     */
+    board[w+1] = MAINANCHOR;
+    board[w+2] = DIST(1);
+    board[w*2+1] = DIST(w-1);
+    board[w*2+2] = DIST(1);
+
+    /*
+     * Invent a target position. (FIXME: vary this too.)
+     */
+    tx = w-2;
+    ty = h-3;
+    forcefield[ty*w+tx+1] = true;
+    forcefield[(ty+1)*w+tx+1] = true;
+    board[ty*w+tx+1] = board[(ty+1)*w+tx+1] = EMPTY;
+
+    /*
+     * Gradually remove singletons until the game becomes soluble.
+     */
+    for (j = w; j-- > 0 ;)
+        for (i = h; i-- > 0 ;)
+            if (board[i*w+j] == ANCHOR) {
+                /*
+                 * See if the board is already soluble.
+                 */
+                if ((moves = solve_board(w, h, board, forcefield,
+                                         tx, ty, movelimit, NULL)) >= 0)
+                    goto soluble;
+
+                /*
+                 * Otherwise, remove this piece.
+                 */
+                board[i*w+j] = EMPTY;
+            }
+    assert(!"We shouldn't get here");
+    soluble:
+
+    /*
+     * Make a list of all the inter-block edges on the board.
+     */
+    list = snewn(wh*2, int);
+    nlist = 0;
+    for (i = 0; i+1 < w; i++)
+        for (j = 0; j < h; j++)
+            list[nlist++] = (j*w+i) * 2 + 0;   /* edge to the right of j*w+i */
+    for (j = 0; j+1 < h; j++)
+        for (i = 0; i < w; i++)
+            list[nlist++] = (j*w+i) * 2 + 1;   /* edge below j*w+i */
+
+    /*
+     * Now go through that list in random order, trying to merge
+     * the blocks on each side of each edge.
+     */
+    shuffle(list, nlist, sizeof(*list), rs);
+    while (nlist > 0) {
+        int x1, y1, p1, c1;
+        int x2, y2, p2, c2;
+
+        pos = list[--nlist];
+        y1 = y2 = pos / (w*2);
+        x1 = x2 = (pos / 2) % w;
+        if (pos % 2)
+            y2++;
+        else
+            x2++;
+        p1 = y1*w+x1;
+        p2 = y2*w+x2;
+
+        /*
+         * Immediately abandon the attempt if we've already tried
+         * to merge the same pair of blocks along a different
+         * edge.
+         */
+        c1 = dsf_canonify(dsf, p1);
+        c2 = dsf_canonify(dsf, p2);
+        if (tried_merge[c1 * wh + c2])
+            continue;
+
+        /*
+         * In order to be mergeable, these two squares must each
+         * either be, or belong to, a non-main anchor, and their
+         * anchors must also be distinct.
+         */
+        if (!ISBLOCK(board[p1]) || !ISBLOCK(board[p2]))
+            continue;
+        while (ISDIST(board[p1]))
+            p1 -= board[p1];
+        while (ISDIST(board[p2]))
+            p2 -= board[p2];
+        if (board[p1] == MAINANCHOR || board[p2] == MAINANCHOR || p1 == p2)
+            continue;
+
+        /*
+         * We can merge these blocks. Try it, and see if the
+         * puzzle remains soluble.
+         */
+        memcpy(board2, board, wh);
+        j = -1;
+        while (p1 < wh || p2 < wh) {
+            /*
+             * p1 and p2 are the squares at the head of each block
+             * list. Pick the smaller one and put it on the output
+             * block list.
+             */
+            i = min(p1, p2);
+            if (j < 0) {
+                board[i] = ANCHOR;
+            } else {
+                assert(i - j <= MAXDIST);
+                board[i] = DIST(i - j);
+            }
+            j = i;
+
+            /*
+             * Now advance whichever list that came from.
+             */
+            if (i == p1) {
+                do {
+                    p1++;
+                } while (p1 < wh && board[p1] != DIST(p1-i));
+            } else {
+                do {
+                    p2++;
+                } while (p2 < wh && board[p2] != DIST(p2-i));
+            }
+        }
+        j = solve_board(w, h, board, forcefield, tx, ty, movelimit, NULL);
+        if (j < 0) {
+            /*
+             * Didn't work. Revert the merge.
+             */
+            memcpy(board, board2, wh);
+            tried_merge[c1 * wh + c2] = true;
+            tried_merge[c2 * wh + c1] = true;
+        } else {
+            int c;
+
+            moves = j;
+
+            dsf_merge(dsf, c1, c2);
+            c = dsf_canonify(dsf, c1);
+            for (i = 0; i < wh; i++)
+                tried_merge[c*wh+i] = (tried_merge[c1*wh+i] ||
+                                       tried_merge[c2*wh+i]);
+            for (i = 0; i < wh; i++)
+                tried_merge[i*wh+c] = (tried_merge[i*wh+c1] ||
+                                       tried_merge[i*wh+c2]);
+        }
+    }
+
+    dsf_free(dsf);
+    sfree(list);
+    sfree(tried_merge);
+    sfree(board2);
+
+    *rtx = tx;
+    *rty = ty;
+    *rboard = board;
+    *rforcefield = forcefield;
+    *minmoves = moves;
+}
+
+/* ----------------------------------------------------------------------
+ * End of solver/generator code.
+ */
+
+static char *new_game_desc(const game_params *params, random_state *rs,
+                           char **aux, bool interactive)
+{
+    int w = params->w, h = params->h, wh = w*h;
+    int tx, ty, minmoves;
+    unsigned char *board;
+    bool *forcefield;
+    char *ret, *p;
+    int i;
+
+    generate_board(params->w, params->h, &tx, &ty, &minmoves, rs,
+                   &board, &forcefield, params->maxmoves);
+#ifdef GENERATOR_DIAGNOSTICS
+    {
+        char *t = board_text_format(params->w, params->h, board);
+        printf("%s\n", t);
+        sfree(t);
+    }
+#endif
+
+    /*
+     * Encode as a game ID.
+     */
+    ret = snewn(wh * 6 + 40, char);
+    p = ret;
+    i = 0;
+    while (i < wh) {
+        if (ISDIST(board[i])) {
+            p += sprintf(p, "d%d", board[i]);
+            i++;
+        } else {
+            int count = 1;
+            int b = board[i];
+            bool f = forcefield[i];
+            int c = (b == ANCHOR ? 'a' :
+                     b == MAINANCHOR ? 'm' :
+                     b == EMPTY ? 'e' :
+                     /* b == WALL ? */ 'w');
+            if (f) *p++ = 'f';
+            *p++ = c;
+            i++;
+            while (i < wh && board[i] == b && forcefield[i] == f)
+                i++, count++;
+            if (count > 1)
+                p += sprintf(p, "%d", count);
+        }
+    }
+    p += sprintf(p, ",%d,%d,%d", tx, ty, minmoves);
+    ret = sresize(ret, p+1 - ret, char);
+
+    sfree(board);
+    sfree(forcefield);
+
+    return ret;
+}
+
+static const char *validate_desc(const game_params *params, const char *desc)
+{
+    int w = params->w, h = params->h, wh = w*h;
+    bool *active;
+    int *link;
+    int mains = 0;
+    int i, tx, ty, minmoves;
+    const char *ret;
+
+    active = snewn(wh, bool);
+    link = snewn(wh, int);
+    i = 0;
+
+    while (*desc && *desc != ',') {
+        if (i >= wh) {
+            ret = "Too much data in game description";
+            goto done;
+        }
+        link[i] = -1;
+        active[i] = false;
+        if (*desc == 'f' || *desc == 'F') {
+            desc++;
+            if (!*desc) {
+                ret = "Expected another character after 'f' in game "
+                    "description";
+                goto done;
+            }
+        }
+
+        if (*desc == 'd' || *desc == 'D') {
+            int dist;
+
+            desc++;
+            if (!isdigit((unsigned char)*desc)) {
+                ret = "Expected a number after 'd' in game description";
+                goto done;
+            }
+            dist = atoi(desc);
+            while (*desc && isdigit((unsigned char)*desc)) desc++;
+
+            if (dist <= 0 || dist > i) {
+                ret = "Out-of-range number after 'd' in game description";
+                goto done;
+            }
+
+            if (!active[i - dist]) {
+                ret = "Invalid back-reference in game description";
+                goto done;
+            }
+
+            link[i] = i - dist;
+
+            active[i] = true;
+            active[link[i]] = false;
+            i++;
+        } else {
+            int c = *desc++;
+            int count = 1;
+
+            if (!strchr("aAmMeEwW", c)) {
+                ret = "Invalid character in game description";
+                goto done;
+            }
+            if (isdigit((unsigned char)*desc)) {
+                count = atoi(desc);
+                while (*desc && isdigit((unsigned char)*desc)) desc++;
+            }
+            if (i + count > wh) {
+                ret = "Too much data in game description";
+                goto done;
+            }
+            while (count-- > 0) {
+                active[i] = (strchr("aAmM", c) != NULL);
+                link[i] = -1;
+                if (strchr("mM", c) != NULL) {
+                    mains++;
+                }
+                i++;
+            }
+        }
+    }
+    if (mains != 1) {
+        ret = (mains == 0 ? "No main piece specified in game description" :
+               "More than one main piece specified in game description");
+        goto done;
+    }
+    if (i < wh) {
+        ret = "Not enough data in game description";
+        goto done;
+    }
+
+    /*
+     * Now read the target coordinates.
+     */
+    i = sscanf(desc, ",%d,%d,%d", &tx, &ty, &minmoves);
+    if (i < 2) {
+        ret = "No target coordinates specified";
+        goto done;
+        /*
+         * (but minmoves is optional)
+         */
+    }
+
+    ret = NULL;
+
+    done:
+    sfree(active);
+    sfree(link);
+    return ret;
+}
+
+static game_state *new_game(midend *me, const game_params *params,
+                            const char *desc)
+{
+    int w = params->w, h = params->h, wh = w*h;
+    game_state *state;
+    int i;
+
+    state = snew(game_state);
+    state->w = w;
+    state->h = h;
+    state->board = snewn(wh, unsigned char);
+    state->lastmoved = state->lastmoved_pos = -1;
+    state->movecount = 0;
+    state->imm = snew(struct game_immutable_state);
+    state->imm->refcount = 1;
+    state->imm->forcefield = snewn(wh, bool);
+
+    i = 0;
+
+    while (*desc && *desc != ',') {
+        bool f = false;
+
+        assert(i < wh);
+
+        if (*desc == 'f') {
+            f = true;
+            desc++;
+            assert(*desc);
+        }
+
+        if (*desc == 'd' || *desc == 'D') {
+            int dist;
+
+            desc++;
+            dist = atoi(desc);
+            while (*desc && isdigit((unsigned char)*desc)) desc++;
+
+            state->board[i] = DIST(dist);
+            state->imm->forcefield[i] = f;
+
+            i++;
+        } else {
+            int c = *desc++;
+            int count = 1;
+
+            if (isdigit((unsigned char)*desc)) {
+                count = atoi(desc);
+                while (*desc && isdigit((unsigned char)*desc)) desc++;
+            }
+            assert(i + count <= wh);
+
+            c = (c == 'a' || c == 'A' ? ANCHOR :
+                 c == 'm' || c == 'M' ? MAINANCHOR :
+                 c == 'e' || c == 'E' ? EMPTY :
+                 /* c == 'w' || c == 'W' ? */ WALL);             
+
+            while (count-- > 0) {
+                state->board[i] = c;
+                state->imm->forcefield[i] = f;
+                i++;
+            }
+        }
+    }
+
+    /*
+     * Now read the target coordinates.
+     */
+    state->tx = state->ty = 0;
+    state->minmoves = -1;
+    i = sscanf(desc, ",%d,%d,%d", &state->tx, &state->ty, &state->minmoves);
+
+    if (state->board[state->ty*w+state->tx] == MAINANCHOR)
+        state->completed = 0;          /* already complete! */
+    else
+        state->completed = -1;
+
+    state->cheated = false;
+    state->soln = NULL;
+    state->soln_index = -1;
+
+    return state;
+}
+
+static game_state *dup_game(const game_state *state)
+{
+    int w = state->w, h = state->h, wh = w*h;
+    game_state *ret = snew(game_state);
+
+    ret->w = state->w;
+    ret->h = state->h;
+    ret->board = snewn(wh, unsigned char);
+    memcpy(ret->board, state->board, wh);
+    ret->tx = state->tx;
+    ret->ty = state->ty;
+    ret->minmoves = state->minmoves;
+    ret->lastmoved = state->lastmoved;
+    ret->lastmoved_pos = state->lastmoved_pos;
+    ret->movecount = state->movecount;
+    ret->completed = state->completed;
+    ret->cheated = state->cheated;
+    ret->imm = state->imm;
+    ret->imm->refcount++;
+    ret->soln = state->soln;
+    ret->soln_index = state->soln_index;
+    if (ret->soln)
+        ret->soln->refcount++;
+
+    return ret;
+}
+
+static void free_game(game_state *state)
+{
+    if (--state->imm->refcount <= 0) {
+        sfree(state->imm->forcefield);
+        sfree(state->imm);
+    }
+    if (state->soln && --state->soln->refcount <= 0) {
+        sfree(state->soln->moves);
+        sfree(state->soln);
+    }
+    sfree(state->board);
+    sfree(state);
+}
+
+static char *solve_game(const game_state *state, const game_state *currstate,
+                        const char *aux, const char **error)
+{
+    int *moves;
+    int nmoves;
+    int i;
+    char *ret, *p, sep;
+
+    /*
+     * Run the solver and attempt to find the shortest solution
+     * from the current position.
+     */
+    nmoves = solve_board(state->w, state->h, state->board,
+                         state->imm->forcefield, state->tx, state->ty,
+                         -1, &moves);
+
+    if (nmoves < 0) {
+        *error = "Unable to find a solution to this puzzle";
+        return NULL;
+    }
+    if (nmoves == 0) {
+        *error = "Puzzle is already solved";
+        return NULL;
+    }
+
+    /*
+     * Encode the resulting solution as a move string.
+     */
+    ret = snewn(nmoves * 40, char);
+    p = ret;
+    sep = 'S';
+
+    for (i = 0; i < nmoves; i++) {
+        p += sprintf(p, "%c%d-%d", sep, moves[i*2], moves[i*2+1]);
+        sep = ',';
+    }
+
+    sfree(moves);
+    assert(p - ret < nmoves * 40);
+    ret = sresize(ret, p+1 - ret, char);
+
+    return ret;
+}
+
+static bool game_can_format_as_text_now(const game_params *params)
+{
+    return true;
+}
+
+static char *game_text_format(const game_state *state)
+{
+    return board_text_format(state->w, state->h, state->board,
+                             state->imm->forcefield);
+}
+
+struct game_ui {
+    bool dragging;
+    int drag_anchor;
+    int drag_offset_x, drag_offset_y;
+    int drag_currpos;
+    bool *reachable;
+    int *bfs_queue;                    /* used as scratch in interpret_move */
+};
+
+static game_ui *new_ui(const game_state *state)
+{
+    int w = state->w, h = state->h, wh = w*h;
+    game_ui *ui = snew(game_ui);
+
+    ui->dragging = false;
+    ui->drag_anchor = ui->drag_currpos = -1;
+    ui->drag_offset_x = ui->drag_offset_y = -1;
+    ui->reachable = snewn(wh, bool);
+    memset(ui->reachable, 0, wh * sizeof(bool));
+    ui->bfs_queue = snewn(wh, int);
+
+    return ui;
+}
+
+static void free_ui(game_ui *ui)
+{
+    sfree(ui->bfs_queue);
+    sfree(ui->reachable);
+    sfree(ui);
+}
+
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
+{
+}
+
+#define PREFERRED_TILESIZE 32
+#define TILESIZE (ds->tilesize)
+#define BORDER (TILESIZE/2)
+#define COORD(x)  ( (x) * TILESIZE + BORDER )
+#define FROMCOORD(x)  ( ((x) - BORDER + TILESIZE) / TILESIZE - 1 )
+#define BORDER_WIDTH (1 + TILESIZE/20)
+#define HIGHLIGHT_WIDTH (1 + TILESIZE/16)
+
+#define FLASH_INTERVAL 0.10F
+#define FLASH_TIME 3*FLASH_INTERVAL
+
+struct game_drawstate {
+    int tilesize;
+    int w, h;
+    unsigned long *grid;               /* what's currently displayed */
+};
+
+static char *interpret_move(const game_state *state, game_ui *ui,
+                            const game_drawstate *ds,
+                            int x, int y, int button)
+{
+    int w = state->w, h = state->h, wh = w*h;
+    int tx, ty, i, j;
+    int qhead, qtail;
+
+    if (button == LEFT_BUTTON) {
+        tx = FROMCOORD(x);
+        ty = FROMCOORD(y);
+
+        if (tx < 0 || tx >= w || ty < 0 || ty >= h ||
+            !ISBLOCK(state->board[ty*w+tx]))
+            return NULL;               /* this click has no effect */
+
+        /*
+         * User has clicked on a block. Find the block's anchor
+         * and register that we've started dragging it.
+         */
+        i = ty*w+tx;
+        while (ISDIST(state->board[i]))
+            i -= state->board[i];
+        assert(i >= 0 && i < wh);
+
+        ui->dragging = true;
+        ui->drag_anchor = i;
+        ui->drag_offset_x = tx - (i % w);
+        ui->drag_offset_y = ty - (i / w);
+        ui->drag_currpos = i;
+
+        /*
+         * Now we immediately bfs out from the current location of
+         * the anchor, to find all the places to which this block
+         * can be dragged.
+         */
+        memset(ui->reachable, 0, wh * sizeof(bool));
+        qhead = qtail = 0;
+        ui->reachable[i] = true;
+        ui->bfs_queue[qtail++] = i;
+        for (j = i; j < wh; j++)
+            if (state->board[j] == DIST(j - i))
+                i = j;
+        while (qhead < qtail) {
+            int pos = ui->bfs_queue[qhead++];
+            int x = pos % w, y = pos / w;
+            int dir;
+
+            for (dir = 0; dir < 4; dir++) {
+                int dx = (dir == 0 ? -1 : dir == 1 ? +1 : 0);
+                int dy = (dir == 2 ? -1 : dir == 3 ? +1 : 0);
+                int newpos;
+
+                if (x + dx < 0 || x + dx >= w ||
+                    y + dy < 0 || y + dy >= h)
+                    continue;
+
+                newpos = pos + dy*w + dx;
+                if (ui->reachable[newpos])
+                    continue;          /* already done this one */
+
+                /*
+                 * Now search the grid to see if the block we're
+                 * dragging could fit into this space.
+                 */
+                for (j = i; j >= 0; j = (ISDIST(state->board[j]) ?
+                                         j - state->board[j] : -1)) {
+                    int jx = (j+pos-ui->drag_anchor) % w;
+                    int jy = (j+pos-ui->drag_anchor) / w;
+                    int j2;
+
+                    if (jx + dx < 0 || jx + dx >= w ||
+                        jy + dy < 0 || jy + dy >= h)
+                        break;         /* this position isn't valid at all */
+
+                    j2 = (j+pos-ui->drag_anchor) + dy*w + dx;
+
+                    if (state->board[j2] == EMPTY &&
+                        (!state->imm->forcefield[j2] ||
+                         state->board[ui->drag_anchor] == MAINANCHOR))
+                        continue;
+                    while (ISDIST(state->board[j2]))
+                        j2 -= state->board[j2];
+                    assert(j2 >= 0 && j2 < wh);
+                    if (j2 == ui->drag_anchor)
+                        continue;
+                    else
+                        break;
+                }
+
+                if (j < 0) {
+                    /*
+                     * If we got to the end of that loop without
+                     * disqualifying this position, mark it as
+                     * reachable for this drag.
+                     */
+                    ui->reachable[newpos] = true;
+                    ui->bfs_queue[qtail++] = newpos;
+                }
+            }
+        }
+
+        /*
+         * And that's it. Update the display to reflect the start
+         * of a drag.
+         */
+        return MOVE_UI_UPDATE;
+    } else if (button == LEFT_DRAG && ui->dragging) {
+        int dist, distlimit, dx, dy, s, px, py;
+
+        tx = FROMCOORD(x);
+        ty = FROMCOORD(y);
+
+        tx -= ui->drag_offset_x;
+        ty -= ui->drag_offset_y;
+
+        /*
+         * Now search outwards from (tx,ty), in order of Manhattan
+         * distance, until we find a reachable square.
+         */
+        distlimit = w+tx;
+        distlimit = max(distlimit, h+ty);
+        distlimit = max(distlimit, tx);
+        distlimit = max(distlimit, ty);
+        for (dist = 0; dist <= distlimit; dist++) {
+            for (dx = -dist; dx <= dist; dx++)
+                for (s = -1; s <= +1; s += 2) {
+                    dy = s * (dist - abs(dx));
+                    px = tx + dx;
+                    py = ty + dy;
+                    if (px >= 0 && px < w && py >= 0 && py < h &&
+                        ui->reachable[py*w+px]) {
+                        ui->drag_currpos = py*w+px;
+                        return MOVE_UI_UPDATE;
+                    }
+                }
+        }
+        return NULL;                   /* give up - this drag has no effect */
+    } else if (button == LEFT_RELEASE && ui->dragging) {
+        char data[256], *str;
+
+        /*
+         * Terminate the drag, and if the piece has actually moved
+         * then return a move string quoting the old and new
+         * locations of the piece's anchor.
+         */
+        if (ui->drag_anchor != ui->drag_currpos) {
+            sprintf(data, "M%d-%d", ui->drag_anchor, ui->drag_currpos);
+            str = dupstr(data);
+        } else
+            str = MOVE_UI_UPDATE;
+        
+        ui->dragging = false;
+        ui->drag_anchor = ui->drag_currpos = -1;
+        ui->drag_offset_x = ui->drag_offset_y = -1;
+        memset(ui->reachable, 0, wh * sizeof(bool));
+
+        return str;
+    } else if (button == ' ' && state->soln) {
+        /*
+         * Make the next move in the stored solution.
+         */
+        char data[256];
+        int a1, a2;
+
+        a1 = state->soln->moves[state->soln_index*2];
+        a2 = state->soln->moves[state->soln_index*2+1];
+        if (a1 == state->lastmoved_pos)
+            a1 = state->lastmoved;
+
+        sprintf(data, "M%d-%d", a1, a2);
+        return dupstr(data);
+    }
+
+    return NULL;
+}
+
+static bool move_piece(int w, int h, const unsigned char *src,
+                       unsigned char *dst, bool *ff, int from, int to)
+{
+    int wh = w*h;
+    int i, j;
+
+    if (!ISANCHOR(dst[from]))
+        return false;
+
+    /*
+     * Scan to the far end of the piece's linked list.
+     */
+    for (i = j = from; j < wh; j++)
+        if (src[j] == DIST(j - i))
+            i = j;
+
+    /*
+     * Remove the piece from its old location in the new
+     * game state.
+     */
+    for (j = i; j >= 0; j = (ISDIST(src[j]) ? j - src[j] : -1))
+        dst[j] = EMPTY;
+
+    /*
+     * And put it back in at the new location.
+     */
+    for (j = i; j >= 0; j = (ISDIST(src[j]) ? j - src[j] : -1)) {
+        int jn = j + to - from;
+        if (jn < 0 || jn >= wh)
+            return false;
+        if (dst[jn] == EMPTY && (!ff[jn] || src[from] == MAINANCHOR)) {
+            dst[jn] = src[j];
+        } else {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static game_state *execute_move(const game_state *state, const char *move)
+{
+    int w = state->w, h = state->h /* , wh = w*h */;
+    char c;
+    int a1, a2, n, movesize;
+    game_state *ret = dup_game(state);
+
+    while (*move) {
+        c = *move;
+        if (c == 'S') {
+            /*
+             * This is a solve move, so we just set up a stored
+             * solution path.
+             */
+            if (ret->soln && --ret->soln->refcount <= 0) {
+                sfree(ret->soln->moves);
+                sfree(ret->soln);
+            }
+            ret->soln = snew(struct game_solution);
+            ret->soln->nmoves = 0;
+            ret->soln->moves = NULL;
+            ret->soln->refcount = 1;
+            ret->soln_index = 0;
+            ret->cheated = true;
+
+            movesize = 0;
+            move++;
+            while (1) {
+                if (sscanf(move, "%d-%d%n", &a1, &a2, &n) != 2) {
+                    free_game(ret);
+                    return NULL;
+                }
+
+                /*
+                 * Special case: if the first move in the solution
+                 * involves the piece for which we already have a
+                 * partial stored move, adjust the source point to
+                 * the original starting point of that piece.
+                 */
+                if (ret->soln->nmoves == 0 && a1 == ret->lastmoved)
+                    a1 = ret->lastmoved_pos;
+
+                if (ret->soln->nmoves >= movesize) {
+                    movesize = (ret->soln->nmoves + 48) * 4 / 3;
+                    ret->soln->moves = sresize(ret->soln->moves,
+                                               2*movesize, int);
+                }
+
+                ret->soln->moves[2*ret->soln->nmoves] = a1;
+                ret->soln->moves[2*ret->soln->nmoves+1] = a2;
+                ret->soln->nmoves++;
+                move += n;
+                if (*move != ',')
+                    break;
+                move++;                /* eat comma */
+            }
+        } else if (c == 'M') {
+            move++;
+            if (sscanf(move, "%d-%d%n", &a1, &a2, &n) != 2 ||
+                !move_piece(w, h, state->board, ret->board,
+                            state->imm->forcefield, a1, a2)) {
+                free_game(ret);
+                return NULL;
+            }
+            if (a1 == ret->lastmoved) {
+                /*
+                 * If the player has moved the same piece as they
+                 * moved last time, don't increment the move
+                 * count. In fact, if they've put the piece back
+                 * where it started from, _decrement_ the move
+                 * count.
+                 */
+                if (a2 == ret->lastmoved_pos) {
+                    ret->movecount--;  /* reverted last move */
+                    ret->lastmoved = ret->lastmoved_pos = -1;
+                } else {
+                    ret->lastmoved = a2;
+                    /* don't change lastmoved_pos */
+                }
+            } else {
+                ret->lastmoved = a2;
+                ret->lastmoved_pos = a1;
+                ret->movecount++;
+            }
+
+            /*
+             * If we have a stored solution path, see if we've
+             * strayed from it or successfully made the next move
+             * along it.
+             */
+            if (ret->soln && ret->lastmoved_pos >= 0) {
+                if (ret->lastmoved_pos !=
+                    ret->soln->moves[ret->soln_index*2]) {
+                    /* strayed from the path */
+                    ret->soln->refcount--;
+                    assert(ret->soln->refcount > 0);
+                                       /* `state' at least still exists */
+                    ret->soln = NULL;
+                    ret->soln_index = -1;
+                } else if (ret->lastmoved ==
+                           ret->soln->moves[ret->soln_index*2+1]) {
+                    /* advanced along the path */
+                    ret->soln_index++;
+                    if (ret->soln_index >= ret->soln->nmoves) {
+                        /* finished the path! */
+                        ret->soln->refcount--;
+                        assert(ret->soln->refcount > 0);
+                                       /* `state' at least still exists */
+                        ret->soln = NULL;
+                        ret->soln_index = -1;
+                    }
+                }
+            }
+
+            if (ret->board[a2] == MAINANCHOR &&
+                a2 == ret->ty * w + ret->tx && ret->completed < 0)
+                ret->completed = ret->movecount;
+            move += n;
+        } else {
+            free_game(ret);
+            return NULL;
+        }
+        if (*move == ';')
+            move++;
+        else if (*move) {
+            free_game(ret);
+            return NULL;
+        }
+    }
+
+    return ret;
+}
+
+/* ----------------------------------------------------------------------
+ * Drawing routines.
+ */
+
+static void game_compute_size(const game_params *params, int tilesize,
+                              const game_ui *ui, int *x, int *y)
+{
+    /* fool the macros */
+    struct dummy { int tilesize; } dummy, *ds = &dummy;
+    dummy.tilesize = tilesize;
+
+    *x = params->w * TILESIZE + 2*BORDER;
+    *y = params->h * TILESIZE + 2*BORDER;
+}
+
+static void game_set_size(drawing *dr, game_drawstate *ds,
+                          const game_params *params, int tilesize)
+{
+    ds->tilesize = tilesize;
+}
+
+static void raise_colour(float *target, float *src, float *limit)
+{
+    int i;
+    for (i = 0; i < 3; i++)
+        target[i] = (2*src[i] + limit[i]) / 3;
+}
+
+static float *game_colours(frontend *fe, int *ncolours)
+{
+    float *ret = snewn(3 * NCOLOURS, float);
+
+    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_HIGHLIGHT, COL_LOWLIGHT);
+
+    /*
+     * When dragging a tile, we light it up a bit.
+     */
+    raise_colour(ret+3*COL_DRAGGING,
+                 ret+3*COL_BACKGROUND, ret+3*COL_HIGHLIGHT);
+    raise_colour(ret+3*COL_DRAGGING_HIGHLIGHT,
+                 ret+3*COL_HIGHLIGHT, ret+3*COL_HIGHLIGHT);
+    raise_colour(ret+3*COL_DRAGGING_LOWLIGHT,
+                 ret+3*COL_LOWLIGHT, ret+3*COL_HIGHLIGHT);
+
+    /*
+     * The main tile is tinted blue.
+     */
+    ret[COL_MAIN * 3 + 0] = ret[COL_BACKGROUND * 3 + 0];
+    ret[COL_MAIN * 3 + 1] = ret[COL_BACKGROUND * 3 + 1];
+    ret[COL_MAIN * 3 + 2] = ret[COL_HIGHLIGHT * 3 + 2];
+    game_mkhighlight_specific(fe, ret, COL_MAIN,
+                              COL_MAIN_HIGHLIGHT, COL_MAIN_LOWLIGHT);
+
+    /*
+     * And we light that up a bit too when dragging.
+     */
+    raise_colour(ret+3*COL_MAIN_DRAGGING,
+                 ret+3*COL_MAIN, ret+3*COL_MAIN_HIGHLIGHT);
+    raise_colour(ret+3*COL_MAIN_DRAGGING_HIGHLIGHT,
+                 ret+3*COL_MAIN_HIGHLIGHT, ret+3*COL_MAIN_HIGHLIGHT);
+    raise_colour(ret+3*COL_MAIN_DRAGGING_LOWLIGHT,
+                 ret+3*COL_MAIN_LOWLIGHT, ret+3*COL_MAIN_HIGHLIGHT);
+
+    /*
+     * The target area on the floor is tinted green.
+     */
+    ret[COL_TARGET * 3 + 0] = ret[COL_BACKGROUND * 3 + 0];
+    ret[COL_TARGET * 3 + 1] = ret[COL_HIGHLIGHT * 3 + 1];
+    ret[COL_TARGET * 3 + 2] = ret[COL_BACKGROUND * 3 + 2];
+    game_mkhighlight_specific(fe, ret, COL_TARGET,
+                              COL_TARGET_HIGHLIGHT, COL_TARGET_LOWLIGHT);
+
+    *ncolours = NCOLOURS;
+    return ret;
+}
+
+static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
+{
+    int w = state->w, h = state->h, wh = w*h;
+    struct game_drawstate *ds = snew(struct game_drawstate);
+    int i;
+
+    ds->tilesize = 0;
+    ds->w = w;
+    ds->h = h;
+    ds->grid = snewn(wh, unsigned long);
+    for (i = 0; i < wh; i++)
+        ds->grid[i] = ~(unsigned long)0;
+
+    return ds;
+}
+
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
+{
+    sfree(ds->grid);
+    sfree(ds);
+}
+
+#define BG_NORMAL       0x00000001UL
+#define BG_TARGET       0x00000002UL
+#define BG_FORCEFIELD   0x00000004UL
+#define FLASH_LOW       0x00000008UL
+#define FLASH_HIGH      0x00000010UL
+#define FG_WALL         0x00000020UL
+#define FG_MAIN         0x00000040UL
+#define FG_NORMAL       0x00000080UL
+#define FG_DRAGGING     0x00000100UL
+#define FG_SHADOW       0x00000200UL
+#define FG_SOLVEPIECE   0x00000400UL
+#define FG_MAINPIECESH  11
+#define FG_SHADOWSH     19
+
+#define PIECE_LBORDER   0x00000001UL
+#define PIECE_TBORDER   0x00000002UL
+#define PIECE_RBORDER   0x00000004UL
+#define PIECE_BBORDER   0x00000008UL
+#define PIECE_TLCORNER  0x00000010UL
+#define PIECE_TRCORNER  0x00000020UL
+#define PIECE_BLCORNER  0x00000040UL
+#define PIECE_BRCORNER  0x00000080UL
+#define PIECE_MASK      0x000000FFUL
+
+/*
+ * Utility function.
+ */
+#define TYPE_MASK 0xF000
+#define COL_MASK 0x0FFF
+#define TYPE_RECT 0x0000
+#define TYPE_TLCIRC 0x4000
+#define TYPE_TRCIRC 0x5000
+#define TYPE_BLCIRC 0x6000
+#define TYPE_BRCIRC 0x7000
+static void maybe_rect(drawing *dr, int x, int y, int w, int h,
+                       int coltype, int col2)
+{
+    int colour = coltype & COL_MASK, type = coltype & TYPE_MASK;
+
+    if (colour > NCOLOURS)
+        return;
+    if (type == TYPE_RECT) {
+        draw_rect(dr, x, y, w, h, colour);
+    } else {
+        int cx, cy, r;
+
+        clip(dr, x, y, w, h);
+
+        cx = x;
+        cy = y;
+        r = w-1;
+        if (type & 0x1000)
+            cx += r;
+        if (type & 0x2000)
+            cy += r;
+
+        if (col2 == -1 || col2 == coltype) {
+            assert(w == h);
+            draw_circle(dr, cx, cy, r, colour, colour);
+        } else {
+            /*
+             * We aim to draw a quadrant of a circle in two
+             * different colours. We do this using Bresenham's
+             * algorithm directly, because the Puzzles drawing API
+             * doesn't have a draw-sector primitive.
+             */
+            int bx, by, bd, bd2;
+            int xm = (type & 0x1000 ? -1 : +1);
+            int ym = (type & 0x2000 ? -1 : +1);
+
+            by = r;
+            bx = 0;
+            bd = 0;
+            while (by >= bx) {
+                /*
+                 * Plot the point.
+                 */
+                {
+                    int x1 = cx+xm*bx, y1 = cy+ym*bx;
+                    int x2, y2;
+
+                    x2 = cx+xm*by; y2 = y1;
+                    draw_rect(dr, min(x1,x2), min(y1,y2),
+                              abs(x1-x2)+1, abs(y1-y2)+1, colour);
+                    x2 = x1; y2 = cy+ym*by;
+                    draw_rect(dr, min(x1,x2), min(y1,y2),
+                              abs(x1-x2)+1, abs(y1-y2)+1, col2);
+                }
+
+                bd += 2*bx + 1;
+                bd2 = bd - (2*by - 1);
+                if (abs(bd2) < abs(bd)) {
+                    bd = bd2;
+                    by--;
+                }
+                bx++;
+            }
+        }
+
+        unclip(dr);
+    }
+}
+
+static void draw_wallpart(drawing *dr, game_drawstate *ds,
+                          int tx, int ty, unsigned long val,
+                          int cl, int cc, int ch)
+{
+    int coords[6];
+
+    draw_rect(dr, tx, ty, TILESIZE, TILESIZE, cc);
+    if (val & PIECE_LBORDER)
+        draw_rect(dr, tx, ty, HIGHLIGHT_WIDTH, TILESIZE,
+                  ch);
+    if (val & PIECE_RBORDER)
+        draw_rect(dr, tx+TILESIZE-HIGHLIGHT_WIDTH, ty,
+                  HIGHLIGHT_WIDTH, TILESIZE, cl);
+    if (val & PIECE_TBORDER)
+        draw_rect(dr, tx, ty, TILESIZE, HIGHLIGHT_WIDTH, ch);
+    if (val & PIECE_BBORDER)
+        draw_rect(dr, tx, ty+TILESIZE-HIGHLIGHT_WIDTH,
+                  TILESIZE, HIGHLIGHT_WIDTH, cl);
+    if (!((PIECE_BBORDER | PIECE_LBORDER) &~ val)) {
+        draw_rect(dr, tx, ty+TILESIZE-HIGHLIGHT_WIDTH,
+                  HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH, cl);
+        clip(dr, tx, ty+TILESIZE-HIGHLIGHT_WIDTH,
+             HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH);
+        coords[0] = tx - 1;
+        coords[1] = ty + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[2] = tx + HIGHLIGHT_WIDTH;
+        coords[3] = ty + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[4] = tx - 1;
+        coords[5] = ty + TILESIZE;
+        draw_polygon(dr, coords, 3, ch, ch);
+        unclip(dr);
+    } else if (val & PIECE_BLCORNER) {
+        draw_rect(dr, tx, ty+TILESIZE-HIGHLIGHT_WIDTH,
+                  HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH, ch);
+        clip(dr, tx, ty+TILESIZE-HIGHLIGHT_WIDTH,
+             HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH);
+        coords[0] = tx - 1;
+        coords[1] = ty + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[2] = tx + HIGHLIGHT_WIDTH;
+        coords[3] = ty + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[4] = tx - 1;
+        coords[5] = ty + TILESIZE;
+        draw_polygon(dr, coords, 3, cl, cl);
+        unclip(dr);
+    }
+    if (!((PIECE_TBORDER | PIECE_RBORDER) &~ val)) {
+        draw_rect(dr, tx+TILESIZE-HIGHLIGHT_WIDTH, ty,
+                  HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH, cl);
+        clip(dr, tx+TILESIZE-HIGHLIGHT_WIDTH, ty,
+             HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH);
+        coords[0] = tx + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[1] = ty - 1;
+        coords[2] = tx + TILESIZE;
+        coords[3] = ty - 1;
+        coords[4] = tx + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[5] = ty + HIGHLIGHT_WIDTH;
+        draw_polygon(dr, coords, 3, ch, ch);
+        unclip(dr);
+    } else if (val & PIECE_TRCORNER) {
+        draw_rect(dr, tx+TILESIZE-HIGHLIGHT_WIDTH, ty,
+                  HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH, ch);
+        clip(dr, tx+TILESIZE-HIGHLIGHT_WIDTH, ty,
+             HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH);
+        coords[0] = tx + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[1] = ty - 1;
+        coords[2] = tx + TILESIZE;
+        coords[3] = ty - 1;
+        coords[4] = tx + TILESIZE - HIGHLIGHT_WIDTH - 1;
+        coords[5] = ty + HIGHLIGHT_WIDTH;
+        draw_polygon(dr, coords, 3, cl, cl);
+        unclip(dr);
+    }
+    if (val & PIECE_TLCORNER)
+        draw_rect(dr, tx, ty, HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH, ch);
+    if (val & PIECE_BRCORNER)
+        draw_rect(dr, tx+TILESIZE-HIGHLIGHT_WIDTH,
+                  ty+TILESIZE-HIGHLIGHT_WIDTH,
+                  HIGHLIGHT_WIDTH, HIGHLIGHT_WIDTH, cl);
+}
+
+static void draw_piecepart(drawing *dr, game_drawstate *ds,
+                           int tx, int ty, unsigned long val,
+                           int cl, int cc, int ch)
+{
+    int x[6], y[6];
+
+    /*
+     * Drawing the blocks is hellishly fiddly. The blocks don't
+     * stretch to the full size of the tile; there's a border
+     * around them of size BORDER_WIDTH. Then they have bevelled
+     * borders of size HIGHLIGHT_WIDTH, and also rounded corners.
+     *
+     * I tried for some time to find a clean and clever way to
+     * figure out what needed drawing from the corner and border
+     * flags, but in the end the cleanest way I could find was the
+     * following. We divide the grid square into 25 parts by
+     * ruling four horizontal and four vertical lines across it;
+     * those lines are at BORDER_WIDTH and BORDER_WIDTH +
+     * HIGHLIGHT_WIDTH from the top, from the bottom, from the
+     * left and from the right. Then we carefully consider each of
+     * the resulting 25 sections of square, and decide separately
+     * what needs to go in it based on the flags. In complicated
+     * cases there can be up to five possibilities affecting any
+     * given section (no corner or border flags, just the corner
+     * flag, one border flag, the other border flag, both border
+     * flags). So there's a lot of very fiddly logic here and all
+     * I could really think to do was give it my best shot and
+     * then test it and correct all the typos. Not fun to write,
+     * and I'm sure it isn't fun to read either, but it seems to
+     * work.
+     */
+
+    x[0] = tx;
+    x[1] = x[0] + BORDER_WIDTH;
+    x[2] = x[1] + HIGHLIGHT_WIDTH;
+    x[5] = tx + TILESIZE;
+    x[4] = x[5] - BORDER_WIDTH;
+    x[3] = x[4] - HIGHLIGHT_WIDTH;
+
+    y[0] = ty;
+    y[1] = y[0] + BORDER_WIDTH;
+    y[2] = y[1] + HIGHLIGHT_WIDTH;
+    y[5] = ty + TILESIZE;
+    y[4] = y[5] - BORDER_WIDTH;
+    y[3] = y[4] - HIGHLIGHT_WIDTH;
+
+#define RECT(p,q) x[p], y[q], x[(p)+1]-x[p], y[(q)+1]-y[q]
+
+    maybe_rect(dr, RECT(0,0),
+               (val & (PIECE_TLCORNER | PIECE_TBORDER |
+                       PIECE_LBORDER)) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(1,0),
+               (val & PIECE_TLCORNER) ? ch : (val & PIECE_TBORDER) ? -1 :
+               (val & PIECE_LBORDER) ? ch : cc, -1);
+    maybe_rect(dr, RECT(2,0),
+               (val & PIECE_TBORDER) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(3,0),
+               (val & PIECE_TRCORNER) ? cl : (val & PIECE_TBORDER) ? -1 :
+               (val & PIECE_RBORDER) ? cl : cc, -1);
+    maybe_rect(dr, RECT(4,0),
+               (val & (PIECE_TRCORNER | PIECE_TBORDER |
+                       PIECE_RBORDER)) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(0,1),
+               (val & PIECE_TLCORNER) ? ch : (val & PIECE_LBORDER) ? -1 :
+               (val & PIECE_TBORDER) ? ch : cc, -1);
+    maybe_rect(dr, RECT(1,1),
+               (val & PIECE_TLCORNER) ? cc : -1, -1);
+    maybe_rect(dr, RECT(1,1),
+               (val & PIECE_TLCORNER) ? ch | TYPE_TLCIRC :
+               !((PIECE_TBORDER | PIECE_LBORDER) &~ val) ? ch | TYPE_BRCIRC :
+               (val & (PIECE_TBORDER | PIECE_LBORDER)) ? ch : cc, -1);
+    maybe_rect(dr, RECT(2,1),
+               (val & PIECE_TBORDER) ? ch : cc, -1);
+    maybe_rect(dr, RECT(3,1),
+               (val & PIECE_TRCORNER) ? cc : -1, -1);
+    maybe_rect(dr, RECT(3,1),
+               (val & (PIECE_TBORDER | PIECE_RBORDER)) == PIECE_TBORDER ? ch :
+               (val & (PIECE_TBORDER | PIECE_RBORDER)) == PIECE_RBORDER ? cl :
+               !((PIECE_TBORDER|PIECE_RBORDER) &~ val) ? cl | TYPE_BLCIRC :
+               (val & PIECE_TRCORNER) ? cl | TYPE_TRCIRC :
+               cc, ch);
+    maybe_rect(dr, RECT(4,1),
+               (val & PIECE_TRCORNER) ? ch : (val & PIECE_RBORDER) ? -1 :
+               (val & PIECE_TBORDER) ? ch : cc, -1);
+    maybe_rect(dr, RECT(0,2),
+               (val & PIECE_LBORDER) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(1,2),
+               (val & PIECE_LBORDER) ? ch : cc, -1);
+    maybe_rect(dr, RECT(2,2),
+               cc, -1);
+    maybe_rect(dr, RECT(3,2),
+               (val & PIECE_RBORDER) ? cl : cc, -1);
+    maybe_rect(dr, RECT(4,2),
+               (val & PIECE_RBORDER) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(0,3),
+               (val & PIECE_BLCORNER) ? cl : (val & PIECE_LBORDER) ? -1 :
+               (val & PIECE_BBORDER) ? cl : cc, -1);
+    maybe_rect(dr, RECT(1,3),
+               (val & PIECE_BLCORNER) ? cc : -1, -1);
+    maybe_rect(dr, RECT(1,3),
+               (val & (PIECE_BBORDER | PIECE_LBORDER)) == PIECE_BBORDER ? cl :
+               (val & (PIECE_BBORDER | PIECE_LBORDER)) == PIECE_LBORDER ? ch :
+               !((PIECE_BBORDER|PIECE_LBORDER) &~ val) ? ch | TYPE_TRCIRC :
+               (val & PIECE_BLCORNER) ? ch | TYPE_BLCIRC :
+               cc, cl);
+    maybe_rect(dr, RECT(2,3),
+               (val & PIECE_BBORDER) ? cl : cc, -1);
+    maybe_rect(dr, RECT(3,3),
+               (val & PIECE_BRCORNER) ? cc : -1, -1);
+    maybe_rect(dr, RECT(3,3),
+               (val & PIECE_BRCORNER) ? cl | TYPE_BRCIRC :
+               !((PIECE_BBORDER | PIECE_RBORDER) &~ val) ? cl | TYPE_TLCIRC :
+               (val & (PIECE_BBORDER | PIECE_RBORDER)) ? cl : cc, -1);
+    maybe_rect(dr, RECT(4,3),
+               (val & PIECE_BRCORNER) ? cl : (val & PIECE_RBORDER) ? -1 :
+               (val & PIECE_BBORDER) ? cl : cc, -1);
+    maybe_rect(dr, RECT(0,4),
+               (val & (PIECE_BLCORNER | PIECE_BBORDER |
+                       PIECE_LBORDER)) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(1,4),
+               (val & PIECE_BLCORNER) ? ch : (val & PIECE_BBORDER) ? -1 :
+               (val & PIECE_LBORDER) ? ch : cc, -1);
+    maybe_rect(dr, RECT(2,4),
+               (val & PIECE_BBORDER) ? -1 : cc, -1);
+    maybe_rect(dr, RECT(3,4),
+               (val & PIECE_BRCORNER) ? cl : (val & PIECE_BBORDER) ? -1 :
+               (val & PIECE_RBORDER) ? cl : cc, -1);
+    maybe_rect(dr, RECT(4,4),
+               (val & (PIECE_BRCORNER | PIECE_BBORDER |
+                       PIECE_RBORDER)) ? -1 : cc, -1);
+
+#undef RECT
+}
+
+static void draw_tile(drawing *dr, game_drawstate *ds,
+                      int x, int y, unsigned long val)
+{
+    int tx = COORD(x), ty = COORD(y);
+    int cc, ch, cl;
+
+    /*
+     * Draw the tile background.
+     */
+    if (val & BG_TARGET)
+        cc = COL_TARGET;
+    else
+        cc = COL_BACKGROUND;
+    ch = cc+1;
+    cl = cc+2;
+    if (val & FLASH_LOW)
+        cc = cl;
+    else if (val & FLASH_HIGH)
+        cc = ch;
+
+    draw_rect(dr, tx, ty, TILESIZE, TILESIZE, cc);
+    if (val & BG_FORCEFIELD) {
+        /*
+         * Cattle-grid effect to indicate that nothing but the
+         * main block can slide over this square.
+         */
+        int n = 3 * (TILESIZE / (3*HIGHLIGHT_WIDTH));
+        int i;
+
+        for (i = 1; i < n; i += 3) {
+            draw_rect(dr, tx,ty+(TILESIZE*i/n), TILESIZE,HIGHLIGHT_WIDTH, cl);
+            draw_rect(dr, tx+(TILESIZE*i/n),ty, HIGHLIGHT_WIDTH,TILESIZE, cl);
+        }
+    }
+
+    /*
+     * Draw the tile midground: a shadow of a block, for
+     * displaying partial solutions.
+     */
+    if (val & FG_SHADOW) {
+        draw_piecepart(dr, ds, tx, ty, (val >> FG_SHADOWSH) & PIECE_MASK,
+                       cl, cl, cl);
+    }
+
+    /*
+     * Draw the tile foreground, i.e. some section of a block or
+     * wall.
+     */
+    if (val & FG_WALL) {
+        cc = COL_BACKGROUND;
+        ch = cc+1;
+        cl = cc+2;
+        if (val & FLASH_LOW)
+            cc = cl;
+        else if (val & FLASH_HIGH)
+            cc = ch;
+
+        draw_wallpart(dr, ds, tx, ty, (val >> FG_MAINPIECESH) & PIECE_MASK,
+                      cl, cc, ch);
+    } else if (val & (FG_MAIN | FG_NORMAL)) {
+        if (val & FG_DRAGGING)
+            cc = (val & FG_MAIN ? COL_MAIN_DRAGGING : COL_DRAGGING);
+        else
+            cc = (val & FG_MAIN ? COL_MAIN : COL_BACKGROUND);
+        ch = cc+1;
+        cl = cc+2;
+
+        if (val & FLASH_LOW)
+            cc = cl;
+        else if (val & (FLASH_HIGH | FG_SOLVEPIECE))
+            cc = ch;
+
+        draw_piecepart(dr, ds, tx, ty, (val >> FG_MAINPIECESH) & PIECE_MASK,
+                       cl, cc, ch);
+    }
+
+    draw_update(dr, tx, ty, TILESIZE, TILESIZE);
+}
+
+static unsigned long find_piecepart(int w, int h, DSF *dsf, int x, int y)
+{
+    int i = y*w+x;
+    int canon = dsf_canonify(dsf, i);
+    unsigned long val = 0;
+
+    if (x == 0 || canon != dsf_canonify(dsf, i-1))
+        val |= PIECE_LBORDER;
+    if (y== 0 || canon != dsf_canonify(dsf, i-w))
+        val |= PIECE_TBORDER;
+    if (x == w-1 || canon != dsf_canonify(dsf, i+1))
+        val |= PIECE_RBORDER;
+    if (y == h-1 || canon != dsf_canonify(dsf, i+w))
+        val |= PIECE_BBORDER;
+    if (!(val & (PIECE_TBORDER | PIECE_LBORDER)) &&
+        canon != dsf_canonify(dsf, i-1-w))
+        val |= PIECE_TLCORNER;
+    if (!(val & (PIECE_TBORDER | PIECE_RBORDER)) &&
+        canon != dsf_canonify(dsf, i+1-w))
+        val |= PIECE_TRCORNER;
+    if (!(val & (PIECE_BBORDER | PIECE_LBORDER)) &&
+        canon != dsf_canonify(dsf, i-1+w))
+        val |= PIECE_BLCORNER;
+    if (!(val & (PIECE_BBORDER | PIECE_RBORDER)) &&
+        canon != dsf_canonify(dsf, i+1+w))
+        val |= PIECE_BRCORNER;
+    return val;
+}
+
+static void game_redraw(drawing *dr, game_drawstate *ds,
+                        const game_state *oldstate, const game_state *state,
+                        int dir, const game_ui *ui,
+                        float animtime, float flashtime)
+{
+    int w = state->w, h = state->h, wh = w*h;
+    unsigned char *board;
+    DSF *dsf;
+    int x, y, mainanchor, mainpos, dragpos, solvepos, solvesrc, solvedst;
+
+    /*
+     * Construct the board we'll be displaying (which may be
+     * different from the one in state if ui describes a drag in
+     * progress).
+     */
+    board = snewn(wh, unsigned char);
+    memcpy(board, state->board, wh);
+    if (ui->dragging) {
+        bool mpret = move_piece(w, h, state->board, board,
+                                state->imm->forcefield,
+                                ui->drag_anchor, ui->drag_currpos);
+        assert(mpret);
+    }
+
+    if (state->soln) {
+        solvesrc = state->soln->moves[state->soln_index*2];
+        solvedst = state->soln->moves[state->soln_index*2+1];
+        if (solvesrc == state->lastmoved_pos)
+            solvesrc = state->lastmoved;
+        if (solvesrc == ui->drag_anchor)
+            solvesrc = ui->drag_currpos;
+    } else
+        solvesrc = solvedst = -1;
+
+    /*
+     * Build a dsf out of that board, so we can conveniently tell
+     * which edges are connected and which aren't.
+     */
+    dsf = dsf_new(wh);
+    mainanchor = -1;
+    for (y = 0; y < h; y++)
+        for (x = 0; x < w; x++) {
+            int i = y*w+x;
+
+            if (ISDIST(board[i]))
+                dsf_merge(dsf, i, i - board[i]);
+            if (board[i] == MAINANCHOR)
+                mainanchor = i;
+            if (board[i] == WALL) {
+                if (x > 0 && board[i-1] == WALL)
+                    dsf_merge(dsf, i, i-1);
+                if (y > 0 && board[i-w] == WALL)
+                    dsf_merge(dsf, i, i-w);
+            }
+        }
+    assert(mainanchor >= 0);
+    mainpos = dsf_canonify(dsf, mainanchor);
+    dragpos = ui->drag_currpos > 0 ? dsf_canonify(dsf, ui->drag_currpos) : -1;
+    solvepos = solvesrc >= 0 ? dsf_canonify(dsf, solvesrc) : -1;
+
+    /*
+     * Now we can construct the data about what we want to draw.
+     */
+    for (y = 0; y < h; y++)
+        for (x = 0; x < w; x++) {
+            int i = y*w+x;
+            int j;
+            unsigned long val;
+            int canon;
+
+            /*
+             * See if this square is part of the target area.
+             */
+            j = i + mainanchor - (state->ty * w + state->tx);
+            while (j >= 0 && j < wh && ISDIST(board[j]))
+                j -= board[j];
+            if (j == mainanchor)
+                val = BG_TARGET;
+            else
+                val = BG_NORMAL;
+
+            if (state->imm->forcefield[i])
+                val |= BG_FORCEFIELD;
+
+            if (flashtime > 0) {
+                int flashtype = (int)(flashtime / FLASH_INTERVAL) & 1;
+                val |= (flashtype ? FLASH_LOW : FLASH_HIGH);
+            }
+
+            if (board[i] != EMPTY) {
+                canon = dsf_canonify(dsf, i);
+
+                if (board[i] == WALL)
+                    val |= FG_WALL;
+                else if (canon == mainpos)
+                    val |= FG_MAIN;
+                else
+                    val |= FG_NORMAL;
+                if (canon == dragpos)
+                    val |= FG_DRAGGING;
+                if (canon == solvepos)
+                    val |= FG_SOLVEPIECE;
+
+                /*
+                 * Now look around to see if other squares
+                 * belonging to the same block are adjacent to us.
+                 */
+                val |= find_piecepart(w, h, dsf, x, y) << FG_MAINPIECESH;
+            }
+
+            /*
+             * If we're in the middle of showing a solution,
+             * display a shadow piece for the target of the
+             * current move.
+             */
+            if (solvepos >= 0) {
+                int si = i - solvedst + solvesrc;
+                if (si >= 0 && si < wh && dsf_canonify(dsf, si) == solvepos) {
+                    val |= find_piecepart(w, h, dsf,
+                                          si % w, si / w) << FG_SHADOWSH;
+                    val |= FG_SHADOW;
+                }
+            }
+
+            if (val != ds->grid[i]) {
+                draw_tile(dr, ds, x, y, val);
+                ds->grid[i] = val;
+            }
+        }
+
+    /*
+     * Update the status bar.
+     */
+    {
+        char statusbuf[256];
+
+        sprintf(statusbuf, "%sMoves: %d",
+                (state->completed >= 0 ?
+                 (state->cheated ? "Auto-solved. " : "COMPLETED! ") :
+                 (state->cheated ? "Auto-solver used. " : "")),
+                (state->completed >= 0 ? state->completed : state->movecount));
+        if (state->minmoves >= 0)
+            sprintf(statusbuf+strlen(statusbuf), " (min %d)",
+                    state->minmoves);
+
+        status_bar(dr, statusbuf);
+    }
+
+    dsf_free(dsf);
+    sfree(board);
+}
+
+static float game_anim_length(const game_state *oldstate,
+                              const game_state *newstate, int dir, game_ui *ui)
+{
+    return 0.0F;
+}
+
+static float game_flash_length(const game_state *oldstate,
+                               const game_state *newstate, int dir, game_ui *ui)
+{
+    if (oldstate->completed < 0 && newstate->completed >= 0)
+        return FLASH_TIME;
+
+    return 0.0F;
+}
+
+static void game_get_cursor_location(const game_ui *ui,
+                                     const game_drawstate *ds,
+                                     const game_state *state,
+                                     const game_params *params,
+                                     int *x, int *y, int *w, int *h)
+{
+}
+
+static int game_status(const game_state *state)
+{
+    return state->completed ? +1 : 0;
+}
+
+static bool game_timing_state(const game_state *state, game_ui *ui)
+{
+    return true;
+}
+
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
+{
+}
+
+#ifdef COMBINED
+#define thegame slide
+#endif
+
+const struct game thegame = {
+    "Slide", NULL, NULL,
+    default_params,
+    game_fetch_preset, NULL,
+    decode_params,
+    encode_params,
+    free_params,
+    dup_params,
+    true, game_configure, custom_params,
+    validate_params,
+    new_game_desc,
+    validate_desc,
+    new_game,
+    dup_game,
+    free_game,
+    true, solve_game,
+    true, game_can_format_as_text_now, game_text_format,
+    NULL, NULL, /* get_prefs, set_prefs */
+    new_ui,
+    free_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
+    NULL, /* game_request_keys */
+    game_changed_state,
+    NULL, /* current_key_label */
+    interpret_move,
+    execute_move,
+    PREFERRED_TILESIZE, game_compute_size, game_set_size,
+    game_colours,
+    game_new_drawstate,
+    game_free_drawstate,
+    game_redraw,
+    game_anim_length,
+    game_flash_length,
+    game_get_cursor_location,
+    game_status,
+    false, false, game_print_size, game_print,
+    true,                              /* wants_statusbar */
+    false, game_timing_state,
+    0,                                 /* flags */
+};
+
+#ifdef STANDALONE_SOLVER
+
+#include <stdarg.h>
+
+int main(int argc, char **argv)
+{
+    game_params *p;
+    game_state *s;
+    char *id = NULL, *desc;
+    const char *err;
+    bool count = false;
+    int ret;
+    int *moves;
+
+    while (--argc > 0) {
+        char *p = *++argv;
+        /*
+        if (!strcmp(p, "-v")) {
+            verbose = true;
+        } else
+        */
+        if (!strcmp(p, "-c")) {
+            count = true;
+        } else if (*p == '-') {
+            fprintf(stderr, "%s: unrecognised option `%s'\n", argv[0], p);
+            return 1;
+        } else {
+            id = p;
+        }
+    }
+
+    if (!id) {
+        fprintf(stderr, "usage: %s [-c | -v] <game_id>\n", argv[0]);
+        return 1;
+    }
+
+    desc = strchr(id, ':');
+    if (!desc) {
+        fprintf(stderr, "%s: game id expects a colon in it\n", argv[0]);
+        return 1;
+    }
+    *desc++ = '\0';
+
+    p = default_params();
+    decode_params(p, id);
+    err = validate_desc(p, desc);
+    if (err) {
+        fprintf(stderr, "%s: %s\n", argv[0], err);
+        return 1;
+    }
+    s = new_game(NULL, p, desc);
+
+    ret = solve_board(s->w, s->h, s->board, s->imm->forcefield,
+                      s->tx, s->ty, -1, &moves);
+    if (ret < 0) {
+        printf("No solution found\n");
+    } else {
+        int index = 0;
+        if (count) {
+            printf("%d moves required\n", ret);
+            return 0;
+        }
+        while (1) {
+            bool moveret;
+            char *text = board_text_format(s->w, s->h, s->board,
+                                           s->imm->forcefield);
+            game_state *s2;
+
+            printf("position %d:\n%s", index, text);
+
+            if (index >= ret)
+                break;
+
+            s2 = dup_game(s);
+            moveret = move_piece(s->w, s->h, s->board,
+                                 s2->board, s->imm->forcefield,
+                                 moves[index*2], moves[index*2+1]);
+            assert(moveret);
+
+            free_game(s);
+            s = s2;
+            index++;
+        }
+    }
+
+    return 0;
+}
+
+#endif
diff --git a/apps/plugins/puzzles/src/unfinished/sokoban.c b/apps/plugins/puzzles/src/unfinished/sokoban.c
new file mode 100644
index 0000000000..1f3c688af1
--- /dev/null
+++ b/apps/plugins/puzzles/src/unfinished/sokoban.c
@@ -0,0 +1,1476 @@
+/*
+ * sokoban.c: An implementation of the well-known Sokoban barrel-
+ * pushing game. Random generation is too simplistic to be
+ * credible, but the rest of the gameplay works well enough to use
+ * it with hand-written level descriptions.
+ */
+
+/*
+ * TODO:
+ * 
+ *  - I think it would be better to ditch the `prev' array, and
+ *    instead make the `dist' array strictly monotonic (by having
+ *    each distance be something like I*A+S, where A is the grid
+ *    area, I the number of INITIAL squares trampled on, and S the
+ *    number of harmless spaces moved through). This would permit
+ *    the path-tracing when a pull is actually made to choose
+ *    randomly from all the possible shortest routes, which would
+ *    be superior in terms of eliminating directional bias.
+ *     + So when tracing the path back to the current px,py, we
+ *       look at all four adjacent squares, find the minimum
+ *       distance, check that it's _strictly smaller_ than that of
+ *       the current square, and restrict our choice to precisely
+ *       those squares with that minimum distance.
+ *     + The other place `prev' is currently used is in the check
+ *       for consistency of a pull. We would have to replace the
+ *       check for whether prev[ny*w+nx]==oy*w+ox with a check that
+ *       made sure there was at least one adjacent square with a
+ *       smaller distance which _wasn't_ oy*w+ox. Then when we did
+ *       the path-tracing we'd also have to take this special case
+ *       into account.
+ * 
+ *  - More discriminating choice of pull. (Snigger.)
+ *     + favour putting targets in clumps
+ *     + try to shoot for a reasonably consistent number of barrels
+ *       (adjust willingness to generate a new barrel depending on
+ *       how many are already present)
+ *     + adjust willingness to break new ground depending on how
+ *       much is already broken
+ * 
+ *  - generation time parameters:
+ *     + enable NetHack mode (and find a better place for the hole)
+ *     + decide how many of the remaining Is should be walls
+ * 
+ *  - at the end of generation, randomly position the starting
+ *    player coordinates, probably by (somehow) reusing the same
+ *    bfs currently inside the loop.
+ * 
+ *  - possible backtracking?
+ * 
+ *  - IWBNI we could spot completely unreachable bits of level at
+ *    the outside, and not bother drawing grid lines for them. The
+ *    NH levels currently look a bit weird with grid lines on the
+ *    outside of the boundary.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <ctype.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+
+#include "puzzles.h"
+
+/*
+ * Various subsets of these constants are used during game
+ * generation, game play, game IDs and the game_drawstate.
+ */
+#define INITIAL      'i'               /* used only in game generation */
+#define SPACE        's'
+#define WALL         'w'
+#define PIT          'p'
+#define DEEP_PIT     'd'
+#define TARGET       't'
+#define BARREL       'b'
+#define BARRELTARGET 'f'               /* target is 'f'illed */
+#define PLAYER       'u'               /* yo'u'; used in game IDs */
+#define PLAYERTARGET 'v'               /* bad letter: v is to u as t is to s */
+#define INVALID      '!'               /* used in drawstate to force redraw */
+/*
+ * We also support the use of any capital letter as a barrel, which
+ * will be displayed with that letter as a label. (This facilitates
+ * people distributing annotated game IDs for particular Sokoban
+ * levels, so they can accompany them with verbal instructions
+ * about pushing particular barrels in particular ways.) Therefore,
+ * to find out whether something is a barrel, we need a test
+ * function which does a bit more than just comparing to BARREL.
+ * 
+ * When resting on target squares, capital-letter barrels are
+ * replaced with their control-character value (A -> ^A).
+ */
+#define IS_PLAYER(c) ( (c)==PLAYER || (c)==PLAYERTARGET )
+#define IS_BARREL(c) ( (c)==BARREL || (c)==BARRELTARGET || \
+                       ((c)>='A' && (c)<='Z') || ((c)>=1 && (c)<=26) )
+#define IS_ON_TARGET(c) ( (c)==TARGET || (c)==BARRELTARGET || \
+                          (c)==PLAYERTARGET || ((c)>=1 && (c)<=26) )
+#define TARGETISE(b) ( (b)==BARREL ? BARRELTARGET : (b)-('A'-1) )
+#define DETARGETISE(b) ( (b)==BARRELTARGET ? BARREL : (b)+('A'-1) )
+#define BARREL_LABEL(b) ( (b)>='A'&&(b)<='Z' ? (b) : \
+                          (b)>=1 && (b)<=26 ? (b)+('A'-1) : 0 )
+
+#define DX(d) (d == 0 ? -1 : d == 2 ? +1 : 0)
+#define DY(d) (d == 1 ? -1 : d == 3 ? +1 : 0)
+
+#define FLASH_LENGTH 0.3F
+
+enum {
+    COL_BACKGROUND,
+    COL_TARGET,
+    COL_PIT,
+    COL_DEEP_PIT,
+    COL_BARREL,
+    COL_PLAYER,
+    COL_TEXT,
+    COL_GRID,
+    COL_OUTLINE,
+    COL_HIGHLIGHT,
+    COL_LOWLIGHT,
+    COL_WALL,
+    NCOLOURS
+};
+
+struct game_params {
+    int w, h;
+    /*
+     * FIXME: a parameter involving degree of filling in?
+     */
+};
+
+struct game_state {
+    game_params p;
+    unsigned char *grid;
+    int px, py;
+    bool completed;
+};
+
+static game_params *default_params(void)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = 12;
+    ret->h = 10;
+
+    return ret;
+}
+
+static void free_params(game_params *params)
+{
+    sfree(params);
+}
+
+static game_params *dup_params(const game_params *params)
+{
+    game_params *ret = snew(game_params);
+    *ret = *params;                    /* structure copy */
+    return ret;
+}
+
+static const struct game_params sokoban_presets[] = {
+    { 12, 10 },
+    { 16, 12 },
+    { 20, 16 },
+};
+
+static bool game_fetch_preset(int i, char **name, game_params **params)
+{
+    game_params p, *ret;
+    char *retname;
+    char namebuf[80];
+
+    if (i < 0 || i >= lenof(sokoban_presets))
+        return false;
+
+    p = sokoban_presets[i];
+    ret = dup_params(&p);
+    sprintf(namebuf, "%dx%d", ret->w, ret->h);
+    retname = dupstr(namebuf);
+
+    *params = ret;
+    *name = retname;
+    return true;
+}
+
+static void decode_params(game_params *params, char const *string)
+{
+    params->w = params->h = atoi(string);
+    while (*string && isdigit((unsigned char)*string)) string++;
+    if (*string == 'x') {
+        string++;
+        params->h = atoi(string);
+    }
+}
+
+static char *encode_params(const game_params *params, bool full)
+{
+    char data[256];
+
+    sprintf(data, "%dx%d", params->w, params->h);
+
+    return dupstr(data);
+}
+
+static config_item *game_configure(const game_params *params)
+{
+    config_item *ret;
+    char buf[80];
+
+    ret = snewn(3, config_item);
+
+    ret[0].name = "Width";
+    ret[0].type = C_STRING;
+    sprintf(buf, "%d", params->w);
+    ret[0].u.string.sval = dupstr(buf);
+
+    ret[1].name = "Height";
+    ret[1].type = C_STRING;
+    sprintf(buf, "%d", params->h);
+    ret[1].u.string.sval = dupstr(buf);
+
+    ret[2].name = NULL;
+    ret[2].type = C_END;
+
+    return ret;
+}
+
+static game_params *custom_params(const config_item *cfg)
+{
+    game_params *ret = snew(game_params);
+
+    ret->w = atoi(cfg[0].u.string.sval);
+    ret->h = atoi(cfg[1].u.string.sval);
+
+    return ret;
+}
+
+static const char *validate_params(const game_params *params, bool full)
+{
+    if (params->w < 4 || params->h < 4)
+        return "Width and height must both be at least 4";
+
+    return NULL;
+}
+
+/* ----------------------------------------------------------------------
+ * Game generation mechanism.
+ * 
+ * To generate a Sokoban level, we begin with a completely blank
+ * grid and make valid inverse moves. Grid squares can be in a
+ * number of states. The states are:
+ * 
+ *  - INITIAL: this square has not as yet been touched by any
+ *    inverse move, which essentially means we haven't decided what
+ *    it is yet.
+ * 
+ *  - SPACE: this square is a space.
+ * 
+ *  - TARGET: this square is a space which is also the target for a
+ *    barrel.
+ * 
+ *  - BARREL: this square contains a barrel.
+ * 
+ *  - BARRELTARGET: this square contains a barrel _on_ a target.
+ * 
+ *  - WALL: this square is a wall.
+ * 
+ *  - PLAYER: this square contains the player.
+ * 
+ *  - PLAYERTARGET: this square contains the player on a target.
+ * 
+ * We begin with every square of the in state INITIAL, apart from a
+ * solid ring of WALLs around the edge. We randomly position the
+ * PLAYER somewhere. Thereafter our valid moves are:
+ * 
+ *  - to move the PLAYER in one direction _pulling_ a barrel after
+ *    us. For this to work, we must have SPACE or INITIAL in the
+ *    direction we're moving, and BARREL or BARRELTARGET in the
+ *    direction we're moving away from. We leave SPACE or TARGET
+ *    respectively in the vacated square.
+ * 
+ *  - to create a new barrel by transforming an INITIAL square into
+ *    BARRELTARGET.
+ * 
+ *  - to move the PLAYER freely through SPACE and TARGET squares,
+ *    leaving SPACE or TARGET where it started.
+ * 
+ *  - to move the player through INITIAL squares, carving a tunnel
+ *    of SPACEs as it goes.
+ * 
+ * We try to avoid destroying INITIAL squares wherever possible (if
+ * there's a path to where we want to be using only SPACE, then we
+ * should always use that). At the end of generation, every square
+ * still in state INITIAL is one which was not required at any
+ * point during generation, which means we can randomly choose
+ * whether to make it SPACE or WALL.
+ * 
+ * It's unclear as yet what the right strategy for wall placement
+ * should be. Too few WALLs will yield many alternative solutions
+ * to the puzzle, whereas too many might rule out so many
+ * possibilities that the intended solution becomes obvious.
+ */
+
+static void sokoban_generate(int w, int h, unsigned char *grid, int moves,
+                             bool nethack, random_state *rs)
+{
+    struct pull {
+        int ox, oy, nx, ny, score;
+    };
+
+    struct pull *pulls;
+    int *dist, *prev, *heap;
+    int x, y, px, py, i, j, d, heapsize, npulls;
+
+    pulls = snewn(w * h * 4, struct pull);
+    dist = snewn(w * h, int);
+    prev = snewn(w * h, int);
+    heap = snewn(w * h, int);
+
+    /*
+     * Configure the initial grid.
+     */
+    for (y = 0; y < h; y++)
+        for (x = 0; x < w; x++)
+            grid[y*w+x] = (x == 0 || y == 0 || x == w-1 || y == h-1 ?
+                           WALL : INITIAL);
+    if (nethack)
+        grid[1] = DEEP_PIT;
+
+    /*
+     * Place the player.
+     */
+    i = random_upto(rs, (w-2) * (h-2));
+    x = 1 + i % (w-2);
+    y = 1 + i / (w-2);
+    grid[y*w+x] = SPACE;
+    px = x;
+    py = y;
+
+    /*
+     * Now loop around making random inverse Sokoban moves. In this
+     * loop we aim to make one actual barrel-pull per iteration,
+     * plus as many free moves as are necessary to get into
+     * position for that pull.
+     */
+    while (moves-- >= 0) {
+        /*
+         * First enumerate all the viable barrel-pulls we can
+         * possibly make, counting two pulls of the same barrel in
+         * different directions as different. We also include pulls
+         * we can perform by creating a new barrel. Each pull is
+         * marked with the amount of violence it would have to do
+         * to the grid.
+         */
+        npulls = 0;
+        for (y = 0; y < h; y++)
+            for (x = 0; x < w; x++)
+                for (d = 0; d < 4; d++) {
+                    int dx = DX(d);
+                    int dy = DY(d);
+                    int nx = x + dx, ny = y + dy;
+                    int npx = nx + dx, npy = ny + dy;
+                    int score = 0;
+
+                    /*
+                     * The candidate move is to put the player at
+                     * (nx,ny), and move him to (npx,npy), pulling
+                     * a barrel at (x,y) to (nx,ny). So first we
+                     * must check that all those squares are within
+                     * the boundaries of the grid. For this it is
+                     * sufficient to check npx,npy.
+                     */
+                    if (npx < 0 || npx >= w || npy < 0 || npy >= h)
+                        continue;
+
+                    /*
+                     * (x,y) must either be a barrel, or a square
+                     * which we can convert into a barrel.
+                     */
+                    switch (grid[y*w+x]) {
+                      case BARREL: case BARRELTARGET:
+                        break;
+                      case INITIAL:
+                        if (nethack)
+                            continue;
+                        score += 10 /* new_barrel_score */;
+                        break;
+                      case DEEP_PIT:
+                        if (!nethack)
+                            continue;
+                        break;
+                      default:
+                        continue;
+                    }
+
+                    /*
+                     * (nx,ny) must either be a space, or a square
+                     * which we can convert into a space.
+                     */
+                    switch (grid[ny*w+nx]) {
+                      case SPACE: case TARGET:
+                        break;
+                      case INITIAL:
+                        score += 3 /* new_space_score */;
+                        break;
+                      default:
+                        continue;
+                    }
+
+                    /*
+                     * (npx,npy) must also either be a space, or a
+                     * square which we can convert into a space.
+                     */
+                    switch (grid[npy*w+npx]) {
+                      case SPACE: case TARGET:
+                        break;
+                      case INITIAL:
+                        score += 3 /* new_space_score */;
+                        break;
+                      default:
+                        continue;
+                    }
+
+                    /*
+                     * That's sufficient to tag this as a possible
+                     * pull right now. We still don't know if we
+                     * can reach the required player position, but
+                     * that's a job for the subsequent BFS phase to
+                     * tell us.
+                     */
+                    pulls[npulls].ox = x;
+                    pulls[npulls].oy = y;
+                    pulls[npulls].nx = nx;
+                    pulls[npulls].ny = ny;
+                    pulls[npulls].score = score;
+#ifdef GENERATION_DIAGNOSTICS
+                    printf("found potential pull: (%d,%d)-(%d,%d) cost %d\n",
+                           pulls[npulls].ox, pulls[npulls].oy,
+                           pulls[npulls].nx, pulls[npulls].ny,
+                           pulls[npulls].score);
+#endif
+                    npulls++;
+                }
+#ifdef GENERATION_DIAGNOSTICS
+        printf("found %d potential pulls\n", npulls);
+#endif
+
+        /*
+         * If there are no pulls available at all, we give up.
+         * 
+         * (FIXME: or perhaps backtrack?)
+         */
+        if (npulls == 0)
+            break;
+
+        /*
+         * Now we do a BFS from our current position, to find all
+         * the squares we can get the player into.
+         * 
+         * This BFS is unusually tricky. We want to give a positive
+         * distance only to squares which we have to carve through
+         * INITIALs to get to, which means we can't just stick
+         * every square we reach on the end of our to-do list.
+         * Instead, we must maintain our list as a proper priority
+         * queue.
+         */
+        for (i = 0; i < w*h; i++)
+            dist[i] = prev[i] = -1;
+
+        heap[0] = py*w+px;
+        heapsize = 1;
+        dist[py*w+px] = 0;
+
+#define PARENT(n) ( ((n)-1)/2 )
+#define LCHILD(n) ( 2*(n)+1 )
+#define RCHILD(n) ( 2*(n)+2 )
+#define SWAP(i,j) do { int swaptmp = (i); (i) = (j); (j) = swaptmp; } while (0)
+
+        while (heapsize > 0) {
+            /*
+             * Pull the smallest element off the heap: it's at
+             * position 0. Move the arbitrary element from the very
+             * end of the heap into position 0.
+             */
+            y = heap[0] / w;
+            x = heap[0] % w;
+
+            heapsize--;
+            heap[0] = heap[heapsize];
+
+            /*
+             * Now repeatedly move that arbitrary element down the
+             * heap by swapping it with the more suitable of its
+             * children.
+             */
+            i = 0;
+            while (1) {
+                int lc, rc;
+
+                lc = LCHILD(i);
+                rc = RCHILD(i);
+
+                if (lc >= heapsize)
+                    break;             /* we've hit bottom */
+
+                if (rc >= heapsize) {
+                    /*
+                     * Special case: there is only one child to
+                     * check.
+                     */
+                    if (dist[heap[i]] > dist[heap[lc]])
+                        SWAP(heap[i], heap[lc]);
+
+                    /* _Now_ we've hit bottom. */
+                    break;
+                } else {
+                    /*
+                     * The common case: there are two children and
+                     * we must check them both.
+                     */
+                    if (dist[heap[i]] > dist[heap[lc]] ||
+                        dist[heap[i]] > dist[heap[rc]]) {
+                        /*
+                         * Pick the more appropriate child to swap with
+                         * (i.e. the one which would want to be the
+                         * parent if one were above the other - as one
+                         * is about to be).
+                         */
+                        if (dist[heap[lc]] > dist[heap[rc]]) {
+                            SWAP(heap[i], heap[rc]);
+                            i = rc;
+                        } else {
+                            SWAP(heap[i], heap[lc]);
+                            i = lc;
+                        }
+                    } else {
+                        /* This element is in the right place; we're done. */
+                        break;
+                    }
+                }
+            }
+
+            /*
+             * OK, that's given us (x,y) for this phase of the
+             * search. Now try all directions from here.
+             */
+
+            for (d = 0; d < 4; d++) {
+                int dx = DX(d);
+                int dy = DY(d);
+                int nx = x + dx, ny = y + dy;
+                if (nx < 0 || nx >= w || ny < 0 || ny >= h)
+                    continue;
+                if (grid[ny*w+nx] != SPACE && grid[ny*w+nx] != TARGET &&
+                    grid[ny*w+nx] != INITIAL)
+                    continue;
+                if (dist[ny*w+nx] == -1) {
+                    dist[ny*w+nx] = dist[y*w+x] + (grid[ny*w+nx] == INITIAL);
+                    prev[ny*w+nx] = y*w+x;
+
+                    /*
+                     * Now insert ny*w+nx at the end of the heap,
+                     * and move it down to its appropriate resting
+                     * place.
+                     */
+                    i = heapsize;
+                    heap[heapsize++] = ny*w+nx;
+
+                    /*
+                     * Swap element n with its parent repeatedly to
+                     * preserve the heap property.
+                     */
+
+                    while (i > 0) {
+                        int p = PARENT(i);
+
+                        if (dist[heap[p]] > dist[heap[i]]) {
+                            SWAP(heap[p], heap[i]);
+                            i = p;
+                        } else
+                            break;
+                    }
+                }
+            }
+        }
+
+#undef PARENT
+#undef LCHILD
+#undef RCHILD
+#undef SWAP
+
+#ifdef GENERATION_DIAGNOSTICS
+        printf("distance map:\n");
+        for (i = 0; i < h; i++) {
+            for (j = 0; j < w; j++) {
+                int d = dist[i*w+j];
+                int c;
+                if (d < 0)
+                    c = '#';
+                else if (d >= 36)
+                    c = '!';
+                else if (d >= 10)
+                    c = 'A' - 10 + d;
+                else
+                    c = '0' + d;
+                putchar(c);
+            }
+            putchar('\n');
+        }
+#endif
+
+        /*
+         * Now we can go back through the `pulls' array, adjusting
+         * the score for each pull depending on how hard it is to
+         * reach its starting point, and also throwing out any
+         * whose starting points are genuinely unreachable even
+         * with the possibility of carving through INITIAL squares.
+         */
+        for (i = j = 0; i < npulls; i++) {
+#ifdef GENERATION_DIAGNOSTICS
+            printf("potential pull (%d,%d)-(%d,%d)",
+                   pulls[i].ox, pulls[i].oy,
+                   pulls[i].nx, pulls[i].ny);
+#endif
+            x = pulls[i].nx;
+            y = pulls[i].ny;
+            if (dist[y*w+x] < 0) {
+#ifdef GENERATION_DIAGNOSTICS
+                printf(" unreachable\n");
+#endif
+                continue;              /* this pull isn't feasible at all */
+            } else {
+                /*
+                 * Another nasty special case we have to check is
+                 * whether the initial barrel location (ox,oy) is
+                 * on the path used to reach the square. This can
+                 * occur if that square is in state INITIAL: the
+                 * pull is initially considered valid on the basis
+                 * that the INITIAL can become BARRELTARGET, and
+                 * it's also considered reachable on the basis that
+                 * INITIAL can be turned into SPACE, but it can't
+                 * be both at once.
+                 * 
+                 * Fortunately, if (ox,oy) is on the path at all,
+                 * it must be only one space from the end, so this
+                 * is easy to spot and rule out.
+                 */
+                if (prev[y*w+x] == pulls[i].oy*w+pulls[i].ox) {
+#ifdef GENERATION_DIAGNOSTICS
+                    printf(" goes through itself\n");
+#endif
+                    continue;          /* this pull isn't feasible at all */
+                }
+                pulls[j] = pulls[i];   /* structure copy */
+                pulls[j].score += dist[y*w+x] * 3 /* new_space_score */;
+#ifdef GENERATION_DIAGNOSTICS
+                printf(" reachable at distance %d (cost now %d)\n",
+                       dist[y*w+x], pulls[j].score);
+#endif
+                j++;
+            }
+        }
+        npulls = j;
+
+        /*
+         * Again, if there are no pulls available at all, we give
+         * up.
+         * 
+         * (FIXME: or perhaps backtrack?)
+         */
+        if (npulls == 0)
+            break;
+
+        /*
+         * Now choose which pull to make. On the one hand we should
+         * prefer pulls which do less damage to the INITIAL squares
+         * (thus, ones for which we can already get into position
+         * via existing SPACEs, and for which the barrel already
+         * exists and doesn't have to be invented); on the other,
+         * we want to avoid _always_ preferring such pulls, on the
+         * grounds that that will lead to levels without very much
+         * stuff in.
+         * 
+         * When creating new barrels, we prefer creations which are
+         * next to existing TARGET squares.
+         * 
+         * FIXME: for the moment I'll make this very simple indeed.
+         */
+        i = random_upto(rs, npulls);
+
+        /*
+         * Actually make the pull, including carving a path to get
+         * to the site if necessary.
+         */
+        x = pulls[i].nx;
+        y = pulls[i].ny;
+        while (prev[y*w+x] >= 0) {
+            int p;
+
+            if (grid[y*w+x] == INITIAL)
+                grid[y*w+x] = SPACE;
+
+            p = prev[y*w+x];
+            y = p / w;
+            x = p % w;
+        }
+        px = 2*pulls[i].nx - pulls[i].ox;
+        py = 2*pulls[i].ny - pulls[i].oy;
+        if (grid[py*w+px] == INITIAL)
+            grid[py*w+px] = SPACE;
+        if (grid[pulls[i].ny*w+pulls[i].nx] == TARGET)
+            grid[pulls[i].ny*w+pulls[i].nx] = BARRELTARGET;
+        else
+            grid[pulls[i].ny*w+pulls[i].nx] = BARREL;
+        if (grid[pulls[i].oy*w+pulls[i].ox] == BARREL)
+            grid[pulls[i].oy*w+pulls[i].ox] = SPACE;
+        else if (grid[pulls[i].oy*w+pulls[i].ox] != DEEP_PIT)
+            grid[pulls[i].oy*w+pulls[i].ox] = TARGET;
+    }
+
+    sfree(heap);
+    sfree(prev);
+    sfree(dist);
+    sfree(pulls);
+
+    if (grid[py*w+px] == TARGET)
+        grid[py*w+px] = PLAYERTARGET;
+    else
+        grid[py*w+px] = PLAYER;
+}
+
+static char *new_game_desc(const game_params *params, random_state *rs,
+                           char **aux, bool interactive)
+{
+    int w = params->w, h = params->h;
+    char *desc;
+    int desclen, descpos, descsize, prev, count;
+    unsigned char *grid;
+    int i, j;
+
+    /*
+     * FIXME: perhaps some more interesting means of choosing how
+     * many moves to try?
+     */
+    grid = snewn(w*h, unsigned char);
+    sokoban_generate(w, h, grid, w*h, false, rs);
+
+    desclen = descpos = descsize = 0;
+    desc = NULL;
+    prev = -1;
+    count = 0;
+    for (i = 0; i < w*h; i++) {
+        if (descsize < desclen + 40) {
+            descsize = desclen + 100;
+            desc = sresize(desc, descsize, char);
+            desc[desclen] = '\0';
+        }
+        switch (grid[i]) {
+          case INITIAL:
+            j = 'w';                   /* FIXME: make some of these 's'? */
+            break;
+          case SPACE:
+            j = 's';
+            break;
+          case WALL:
+            j = 'w';
+            break;
+          case TARGET:
+            j = 't';
+            break;
+          case BARREL:
+            j = 'b';
+            break;
+          case BARRELTARGET:
+            j = 'f';
+            break;
+          case DEEP_PIT:
+            j = 'd';
+            break;
+          case PLAYER:
+            j = 'u';
+            break;
+          case PLAYERTARGET:
+            j = 'v';
+            break;
+          default:
+            j = '?';
+            break;
+        }
+        assert(j != '?');
+        if (j != prev) {
+            desc[desclen++] = j;
+            descpos = desclen;
+            prev = j;
+            count = 1;
+        } else {
+            count++;
+            desclen = descpos + sprintf(desc+descpos, "%d", count);
+        }
+    }
+
+    sfree(grid);
+
+    return desc;
+}
+
+static const char *validate_desc(const game_params *params, const char *desc)
+{
+    int w = params->w, h = params->h;
+    int area = 0;
+    int nplayers = 0;
+
+    while (*desc) {
+        int c = *desc++;
+        int n = 1;
+        if (*desc && isdigit((unsigned char)*desc)) {
+            n = atoi(desc);
+            while (*desc && isdigit((unsigned char)*desc)) desc++;
+        }
+
+        area += n;
+
+        if (c == PLAYER || c == PLAYERTARGET)
+            nplayers += n;
+        else if (c == INITIAL || c == SPACE || c == WALL || c == TARGET ||
+                 c == PIT || c == DEEP_PIT || IS_BARREL(c))
+            /* ok */;
+        else
+            return "Invalid character in game description";
+    }
+
+    if (area > w*h)
+        return "Too much data in game description";
+    if (area < w*h)
+        return "Too little data in game description";
+    if (nplayers < 1)
+        return "No starting player position specified";
+    if (nplayers > 1)
+        return "More than one starting player position specified";
+
+    return NULL;
+}
+
+static game_state *new_game(midend *me, const game_params *params,
+                            const char *desc)
+{
+    int w = params->w, h = params->h;
+    game_state *state = snew(game_state);
+    int i;
+
+    state->p = *params;                /* structure copy */
+    state->grid = snewn(w*h, unsigned char);
+    state->px = state->py = -1;
+    state->completed = false;
+
+    i = 0;
+
+    while (*desc) {
+        int c = *desc++;
+        int n = 1;
+        if (*desc && isdigit((unsigned char)*desc)) {
+            n = atoi(desc);
+            while (*desc && isdigit((unsigned char)*desc)) desc++;
+        }
+
+        if (c == PLAYER || c == PLAYERTARGET) {
+            state->py = i / w;
+            state->px = i % w;
+            c = IS_ON_TARGET(c) ? TARGET : SPACE;
+        }
+
+        while (n-- > 0)
+            state->grid[i++] = c;
+    }
+
+    assert(i == w*h);
+    assert(state->px != -1 && state->py != -1);
+
+    return state;
+}
+
+static game_state *dup_game(const game_state *state)
+{
+    int w = state->p.w, h = state->p.h;
+    game_state *ret = snew(game_state);
+
+    ret->p = state->p;                 /* structure copy */
+    ret->grid = snewn(w*h, unsigned char);
+    memcpy(ret->grid, state->grid, w*h);
+    ret->px = state->px;
+    ret->py = state->py;
+    ret->completed = state->completed;
+
+    return ret;
+}
+
+static void free_game(game_state *state)
+{
+    sfree(state->grid);
+    sfree(state);
+}
+
+static char *solve_game(const game_state *state, const game_state *currstate,
+                        const char *aux, const char **error)
+{
+    return NULL;
+}
+
+static bool game_can_format_as_text_now(const game_params *params)
+{
+    return true;
+}
+
+static char *game_text_format(const game_state *state)
+{
+    return NULL;
+}
+
+static game_ui *new_ui(const game_state *state)
+{
+    return NULL;
+}
+
+static void free_ui(game_ui *ui)
+{
+}
+
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
+{
+}
+
+struct game_drawstate {
+    game_params p;
+    int tilesize;
+    bool started;
+    unsigned short *grid;
+};
+
+#define PREFERRED_TILESIZE 32
+#define TILESIZE (ds->tilesize)
+#define BORDER    (TILESIZE)
+#define HIGHLIGHT_WIDTH (TILESIZE / 10)
+#define COORD(x)  ( (x) * TILESIZE + BORDER )
+#define FROMCOORD(x)  ( ((x) - BORDER + TILESIZE) / TILESIZE - 1 )
+
+/*
+ * I'm going to need to do most of the move-type analysis in both
+ * interpret_move and execute_move, so I'll abstract it out into a
+ * subfunction. move_type() returns -1 for an illegal move, 0 for a
+ * movement, and 1 for a push.
+ */
+static int move_type(const game_state *state, int dx, int dy)
+{
+    int w = state->p.w, h = state->p.h;
+    int px = state->px, py = state->py;
+    int nx, ny, nbx, nby;
+
+    assert(dx >= -1 && dx <= +1);
+    assert(dy >= -1 && dy <= +1);
+    assert(dx || dy);
+
+    nx = px + dx;
+    ny = py + dy;
+
+    /*
+     * Disallow any move that goes off the grid.
+     */
+    if (nx < 0 || nx >= w || ny < 0 || ny >= h)
+        return -1;
+
+    /*
+     * Examine the target square of the move to see whether it's a
+     * space, a barrel, or a wall.
+     */
+
+    if (state->grid[ny*w+nx] == WALL ||
+        state->grid[ny*w+nx] == PIT ||
+        state->grid[ny*w+nx] == DEEP_PIT)
+        return -1;                     /* this one's easy; just disallow it */
+
+    if (IS_BARREL(state->grid[ny*w+nx])) {
+        /*
+         * This is a push move. For a start, that means it must not
+         * be diagonal.
+         */
+        if (dy && dx)
+            return -1;
+
+        /*
+         * Now find the location of the third square involved in
+         * the push, and stop if it's off the edge.
+         */
+        nbx = nx + dx;
+        nby = ny + dy;
+        if (nbx < 0 || nbx >= w || nby < 0 || nby >= h)
+            return -1;
+
+        /*
+         * That third square must be able to accept a barrel.
+         */
+        if (state->grid[nby*w+nbx] == SPACE ||
+            state->grid[nby*w+nbx] == TARGET ||
+            state->grid[nby*w+nbx] == PIT ||
+            state->grid[nby*w+nbx] == DEEP_PIT) {
+            /*
+             * The push is valid.
+             */
+            return 1;
+        } else {
+            return -1;
+        }
+    } else {
+        /*
+         * This is just an ordinary move. We've already checked the
+         * target square, so the only thing left to check is that a
+         * diagonal move has a space on one side to have notionally
+         * gone through.
+         */
+        if (dx && dy &&
+            state->grid[(py+dy)*w+px] != SPACE &&
+            state->grid[(py+dy)*w+px] != TARGET &&
+            state->grid[py*w+(px+dx)] != SPACE &&
+            state->grid[py*w+(px+dx)] != TARGET)
+            return -1;
+
+        /*
+         * Otherwise, the move is valid.
+         */
+        return 0;
+    }
+}
+
+static char *interpret_move(const game_state *state, game_ui *ui,
+                            const game_drawstate *ds,
+                            int x, int y, int button)
+{
+    int dx=0, dy=0;
+    char *move;
+
+    /*
+     * Diagonal movement is supported as it is in NetHack: it's
+     * for movement only (never pushing), and one of the two
+     * squares adjacent to both the source and destination
+     * squares must be free to move through. In other words, it
+     * is only a shorthand for two orthogonal moves and cannot
+     * change the nature of the actual puzzle game.
+     */
+    if (button == CURSOR_UP || button == (MOD_NUM_KEYPAD | '8'))
+        dx = 0, dy = -1;
+    else if (button == CURSOR_DOWN || button == (MOD_NUM_KEYPAD | '2'))
+        dx = 0, dy = +1;
+    else if (button == CURSOR_LEFT || button == (MOD_NUM_KEYPAD | '4'))
+        dx = -1, dy = 0;
+    else if (button == CURSOR_RIGHT || button == (MOD_NUM_KEYPAD | '6'))
+        dx = +1, dy = 0;
+    else if (button == (MOD_NUM_KEYPAD | '7'))
+        dx = -1, dy = -1;
+    else if (button == (MOD_NUM_KEYPAD | '9'))
+        dx = +1, dy = -1;
+    else if (button == (MOD_NUM_KEYPAD | '1'))
+        dx = -1, dy = +1;
+    else if (button == (MOD_NUM_KEYPAD | '3'))
+        dx = +1, dy = +1;
+    else if (button == LEFT_BUTTON)
+    {
+        if(x < COORD(state->px))
+            dx = -1;
+        else if (x > COORD(state->px + 1))
+            dx = 1;
+        if(y < COORD(state->py))
+            dy = -1;
+        else if (y > COORD(state->py + 1))
+            dy = 1;
+    }
+    else
+        return NULL;
+
+    if((dx == 0) && (dy == 0))
+        return(NULL);
+
+    if (move_type(state, dx, dy) < 0)
+        return NULL;
+
+    move = snewn(2, char);
+    move[1] = '\0';
+    move[0] = '5' - 3*dy + dx;
+    return move;
+}
+
+static game_state *execute_move(const game_state *state, const char *move)
+{
+    int w = state->p.w, h = state->p.h;
+    int px = state->px, py = state->py;
+    int dx, dy, nx, ny, nbx, nby, type, m, i;
+    bool freebarrels, freetargets;
+    game_state *ret;
+
+    if (*move < '1' || *move == '5' || *move > '9' || move[1])
+        return NULL;                   /* invalid move string */
+
+    m = *move - '0';
+    dx = (m + 2) % 3 - 1;
+    dy = 2 - (m + 2) / 3;
+    type = move_type(state, dx, dy);
+    if (type < 0)
+        return NULL;
+
+    ret = dup_game(state);
+
+    nx = px + dx;
+    ny = py + dy;
+    nbx = nx + dx;
+    nby = ny + dy;
+
+    if (type) {
+        int b;
+
+        /*
+         * Push.
+         */
+        b = ret->grid[ny*w+nx];
+        if (IS_ON_TARGET(b)) {
+            ret->grid[ny*w+nx] = TARGET;
+            b = DETARGETISE(b);
+        } else
+            ret->grid[ny*w+nx] = SPACE;
+
+        if (ret->grid[nby*w+nbx] == PIT)
+            ret->grid[nby*w+nbx] = SPACE;
+        else if (ret->grid[nby*w+nbx] == DEEP_PIT)
+            /* do nothing - the pit eats the barrel and remains there */;
+        else if (ret->grid[nby*w+nbx] == TARGET)
+            ret->grid[nby*w+nbx] = TARGETISE(b);
+        else
+            ret->grid[nby*w+nbx] = b;
+    }
+
+    ret->px = nx;
+    ret->py = ny;
+
+    /*
+     * Check for completion. This is surprisingly complicated,
+     * given the presence of pits and deep pits, and also the fact
+     * that some Sokoban levels with pits have fewer pits than
+     * barrels (due to providing spares, e.g. NetHack's). I think
+     * the completion condition in fact must be that the game
+     * cannot become any _more_ complete. That is, _either_ there
+     * are no remaining barrels not on targets, _or_ there is a
+     * good reason why any such barrels cannot be placed. The only
+     * available good reason is that there are no remaining pits,
+     * no free target squares, and no deep pits at all.
+     */
+    if (!ret->completed) {
+        freebarrels = false;
+        freetargets = false;
+        for (i = 0; i < w*h; i++) {
+            int v = ret->grid[i];
+
+            if (IS_BARREL(v) && !IS_ON_TARGET(v))
+                freebarrels = true;
+            if (v == DEEP_PIT || v == PIT ||
+                (!IS_BARREL(v) && IS_ON_TARGET(v)))
+                freetargets = true;
+        }
+
+        if (!freebarrels || !freetargets)
+            ret->completed = true;
+    }
+
+    return ret;
+}
+
+/* ----------------------------------------------------------------------
+ * Drawing routines.
+ */
+
+static void game_compute_size(const game_params *params, int tilesize,
+                              const game_ui *ui, int *x, int *y)
+{
+    /* Ick: fake up `ds->tilesize' for macro expansion purposes */
+    struct { int tilesize; } ads, *ds = &ads;
+    ads.tilesize = tilesize;
+
+    *x = 2 * BORDER + 1 + params->w * TILESIZE;
+    *y = 2 * BORDER + 1 + params->h * TILESIZE;
+}
+
+static void game_set_size(drawing *dr, game_drawstate *ds,
+                          const game_params *params, int tilesize)
+{
+    ds->tilesize = tilesize;
+}
+
+static float *game_colours(frontend *fe, int *ncolours)
+{
+    float *ret = snewn(3 * NCOLOURS, float);
+    int i;
+
+    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_HIGHLIGHT, COL_LOWLIGHT);
+
+    ret[COL_OUTLINE * 3 + 0] = 0.0F;
+    ret[COL_OUTLINE * 3 + 1] = 0.0F;
+    ret[COL_OUTLINE * 3 + 2] = 0.0F;
+
+    ret[COL_PLAYER * 3 + 0] = 0.0F;
+    ret[COL_PLAYER * 3 + 1] = 1.0F;
+    ret[COL_PLAYER * 3 + 2] = 0.0F;
+
+    ret[COL_BARREL * 3 + 0] = 0.6F;
+    ret[COL_BARREL * 3 + 1] = 0.3F;
+    ret[COL_BARREL * 3 + 2] = 0.0F;
+
+    ret[COL_TARGET * 3 + 0] = ret[COL_LOWLIGHT * 3 + 0];
+    ret[COL_TARGET * 3 + 1] = ret[COL_LOWLIGHT * 3 + 1];
+    ret[COL_TARGET * 3 + 2] = ret[COL_LOWLIGHT * 3 + 2];
+
+    ret[COL_PIT * 3 + 0] = ret[COL_LOWLIGHT * 3 + 0] / 2;
+    ret[COL_PIT * 3 + 1] = ret[COL_LOWLIGHT * 3 + 1] / 2;
+    ret[COL_PIT * 3 + 2] = ret[COL_LOWLIGHT * 3 + 2] / 2;
+
+    ret[COL_DEEP_PIT * 3 + 0] = 0.0F;
+    ret[COL_DEEP_PIT * 3 + 1] = 0.0F;
+    ret[COL_DEEP_PIT * 3 + 2] = 0.0F;
+
+    ret[COL_TEXT * 3 + 0] = 1.0F;
+    ret[COL_TEXT * 3 + 1] = 1.0F;
+    ret[COL_TEXT * 3 + 2] = 1.0F;
+
+    ret[COL_GRID * 3 + 0] = ret[COL_LOWLIGHT * 3 + 0];
+    ret[COL_GRID * 3 + 1] = ret[COL_LOWLIGHT * 3 + 1];
+    ret[COL_GRID * 3 + 2] = ret[COL_LOWLIGHT * 3 + 2];
+
+    ret[COL_OUTLINE * 3 + 0] = 0.0F;
+    ret[COL_OUTLINE * 3 + 1] = 0.0F;
+    ret[COL_OUTLINE * 3 + 2] = 0.0F;
+
+    for (i = 0; i < 3; i++) {
+        ret[COL_WALL * 3 + i] = (3 * ret[COL_BACKGROUND * 3 + i] +
+                                 1 * ret[COL_HIGHLIGHT * 3 + i]) / 4;
+    }
+
+    *ncolours = NCOLOURS;
+    return ret;
+}
+
+static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
+{
+    int w = state->p.w, h = state->p.h;
+    struct game_drawstate *ds = snew(struct game_drawstate);
+    int i;
+
+    ds->tilesize = 0;
+    ds->p = state->p;                  /* structure copy */
+    ds->grid = snewn(w*h, unsigned short);
+    for (i = 0; i < w*h; i++)
+        ds->grid[i] = INVALID;
+    ds->started = false;
+
+    return ds;
+}
+
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
+{
+    sfree(ds->grid);
+    sfree(ds);
+}
+
+static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y, int v)
+{
+    int tx = COORD(x), ty = COORD(y);
+    int bg = (v & 0x100 ? COL_HIGHLIGHT : COL_BACKGROUND);
+
+    v &= 0xFF;
+
+    clip(dr, tx+1, ty+1, TILESIZE-1, TILESIZE-1);
+    draw_rect(dr, tx+1, ty+1, TILESIZE-1, TILESIZE-1, bg);
+
+    if (v == WALL) {
+        int coords[6];
+
+        coords[0] = tx + TILESIZE;
+        coords[1] = ty + TILESIZE;
+        coords[2] = tx + TILESIZE;
+        coords[3] = ty + 1;
+        coords[4] = tx + 1;
+        coords[5] = ty + TILESIZE;
+        draw_polygon(dr, coords, 3, COL_LOWLIGHT, COL_LOWLIGHT);
+
+        coords[0] = tx + 1;
+        coords[1] = ty + 1;
+        draw_polygon(dr, coords, 3, COL_HIGHLIGHT, COL_HIGHLIGHT);
+
+        draw_rect(dr, tx + 1 + HIGHLIGHT_WIDTH, ty + 1 + HIGHLIGHT_WIDTH,
+                  TILESIZE - 2*HIGHLIGHT_WIDTH,
+                  TILESIZE - 2*HIGHLIGHT_WIDTH, COL_WALL);
+    } else if (v == PIT) {
+        draw_circle(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                    TILESIZE*3/7, COL_PIT, COL_OUTLINE);
+    } else if (v == DEEP_PIT) {
+        draw_circle(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                    TILESIZE*3/7, COL_DEEP_PIT, COL_OUTLINE);
+    } else {
+        if (IS_ON_TARGET(v)) {
+            draw_circle(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                        TILESIZE*3/7, COL_TARGET, COL_OUTLINE);
+        }
+        if (IS_PLAYER(v)) {
+            draw_circle(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                        TILESIZE/3, COL_PLAYER, COL_OUTLINE);
+        } else if (IS_BARREL(v)) {
+            char str[2];
+
+            draw_circle(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                        TILESIZE/3, COL_BARREL, COL_OUTLINE);
+            str[1] = '\0';
+            str[0] = BARREL_LABEL(v);
+            if (str[0]) {
+                draw_text(dr, tx + TILESIZE/2, ty + TILESIZE/2,
+                          FONT_VARIABLE, TILESIZE/2,
+                          ALIGN_VCENTRE | ALIGN_HCENTRE, COL_TEXT, str);
+            }
+        }
+    }
+
+    unclip(dr);
+    draw_update(dr, tx, ty, TILESIZE, TILESIZE);
+}
+
+static void game_redraw(drawing *dr, game_drawstate *ds,
+                        const game_state *oldstate, const game_state *state,
+                        int dir, const game_ui *ui,
+                        float animtime, float flashtime)
+{
+    int w = state->p.w, h = state->p.h /*, wh = w*h */;
+    int x, y;
+    int flashtype;
+
+    if (flashtime &&
+        !((int)(flashtime * 3 / FLASH_LENGTH) % 2))
+        flashtype = 0x100;
+    else
+        flashtype = 0;
+
+    /*
+     * Initialise a fresh drawstate.
+     */
+    if (!ds->started) {
+        /*
+         * Draw the grid lines.
+         */
+        for (y = 0; y <= h; y++)
+            draw_line(dr, COORD(0), COORD(y), COORD(w), COORD(y),
+                      COL_LOWLIGHT);
+        for (x = 0; x <= w; x++)
+            draw_line(dr, COORD(x), COORD(0), COORD(x), COORD(h),
+                      COL_LOWLIGHT);
+
+        ds->started = true;
+    }
+
+    /*
+     * Draw the grid contents.
+     */
+    for (y = 0; y < h; y++)
+        for (x = 0; x < w; x++) {
+            int v = state->grid[y*w+x];
+            if (y == state->py && x == state->px) {
+                if (v == TARGET)
+                    v = PLAYERTARGET;
+                else {
+                    assert(v == SPACE);
+                    v = PLAYER;
+                }
+            }
+
+            v |= flashtype;
+
+            if (ds->grid[y*w+x] != v) {
+                draw_tile(dr, ds, x, y, v);
+                ds->grid[y*w+x] = v;
+            }
+        }
+
+}
+
+static float game_anim_length(const game_state *oldstate,
+                              const game_state *newstate, int dir, game_ui *ui)
+{
+    return 0.0F;
+}
+
+static float game_flash_length(const game_state *oldstate,
+                               const game_state *newstate, int dir, game_ui *ui)
+{
+    if (!oldstate->completed && newstate->completed)
+        return FLASH_LENGTH;
+    else
+        return 0.0F;
+}
+
+static void game_get_cursor_location(const game_ui *ui,
+                                     const game_drawstate *ds,
+                                     const game_state *state,
+                                     const game_params *params,
+                                     int *x, int *y, int *w, int *h)
+{
+}
+
+static int game_status(const game_state *state)
+{
+    return state->completed ? +1 : 0;
+}
+
+static bool game_timing_state(const game_state *state, game_ui *ui)
+{
+    return true;
+}
+
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
+{
+}
+
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
+{
+}
+
+#ifdef COMBINED
+#define thegame sokoban
+#endif
+
+const struct game thegame = {
+    "Sokoban", NULL, NULL,
+    default_params,
+    game_fetch_preset, NULL,
+    decode_params,
+    encode_params,
+    free_params,
+    dup_params,
+    true, game_configure, custom_params,
+    validate_params,
+    new_game_desc,
+    validate_desc,
+    new_game,
+    dup_game,
+    free_game,
+    false, solve_game,
+    false, game_can_format_as_text_now, game_text_format,
+    NULL, NULL, /* get_prefs, set_prefs */
+    new_ui,
+    free_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
+    NULL, /* game_request_keys */
+    game_changed_state,
+    NULL, /* current_key_label */
+    interpret_move,
+    execute_move,
+    PREFERRED_TILESIZE, game_compute_size, game_set_size,
+    game_colours,
+    game_new_drawstate,
+    game_free_drawstate,
+    game_redraw,
+    game_anim_length,
+    game_flash_length,
+    game_get_cursor_location,
+    game_status,
+    false, false, game_print_size, game_print,
+    false,                             /* wants_statusbar */
+    false, game_timing_state,
+    0,                                 /* flags */
+};
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index 736e9738c8..26ac6c1ae7 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -951,8 +951,8 @@ static void kbd_draw_picker(struct keyboard_parameters *pm,
 #ifdef HAVE_MORSE_INPUT
     if (state->morse_mode)
     {
-        const int w = 6, h = 8; /* sysfixed font width, height */
-        int i, j, x, y;
+        const int w = 6, h = 9; /* sysfixed font width, height */
+        int i, iNext, j, x, y;
         int sc_w = vp->width, sc_h = vp->height;//pm->main_y - pm->keyboard_margin - 1;
 
         /* Draw morse code screen with sysfont */
@@ -960,37 +960,47 @@ static void kbd_draw_picker(struct keyboard_parameters *pm,
         x = 0;
         y = 0;
         outline[1] = '\0';
-
+        
         /* Draw morse code table with code descriptions. */
-        for (i = 0; morse_alphabets[i] != '\0'; i++)
-        {
+        for (i = 0; morse_alphabets[i] != '\0'; i++) {
             int morse_code;
-
             outline[0] = morse_alphabets[i];
             sc->putsxy(x, y, outline);
-
             morse_code = morse_codes[i];
-            for (j = 0; morse_code > 0x01; morse_code >>= 1)
+            for (j = 0; morse_code > 0x01; morse_code >>= 1) {
                 j++;
-
-            x += w + 3 + j*4;
+            }
+            x += w + 3 + j * 4;
             morse_code = morse_codes[i];
-            for (; morse_code > 0x01; morse_code >>= 1)
-            {
+            for (; morse_code > 0x01; morse_code >>= 1) {
                 x -= 4;
-                if (morse_code & 0x01)
+                if (morse_code & 0x01) {
                     sc->fillrect(x, y + 2, 3, 4);
-                else
+                } else {
                     sc->fillrect(x, y + 3, 1, 2);
+                }
             }
-
-            x += w*5 - 3;
-            if (x + w*6 >= sc_w)
-            {
+            x += j * 4;
+            iNext = i + 1;
+            if (morse_alphabets[iNext] == '\0') {
+                break;
+            }
+            morse_code = morse_codes[iNext];
+            for (j = 0; morse_code > 0x01; morse_code >>= 1) {
+                j++;
+            }
+            // If the next one will go out of line
+            bool needNewLine = x + w + 3 + j * 4 + w >= sc_w;
+            if (needNewLine) {
+                if (y + h >= sc_h) {
+                    // No more height space
+                    break;
+                }
                 x = 0;
                 y += h;
-                if (y + h >= sc_h)
-                    break;
+            } else {
+                // Some pixels for spacing in the same line
+                x += w;
             }
         }
     }
diff --git a/apps/settings.h b/apps/settings.h
index 056f40df6a..a9a9f647e3 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -78,6 +78,13 @@ enum
     TRIG_TYPE_NEW_FILE
 };
 
+enum {
+    PLAYLIST_VIEWER_ENTRY_SHOW_FILE_NAME = 0,
+    PLAYLIST_VIEWER_ENTRY_SHOW_FULL_PATH = 1,
+    PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE_AND_ALBUM = 2,
+    PLAYLIST_VIEWER_ENTRY_SHOW_ID3_TITLE = 3
+};
+
 #ifdef HAVE_CROSSFADE
 enum {
     CROSSFADE_ENABLE_OFF = 0,
@@ -686,6 +693,7 @@ struct user_settings
     int  screen_scroll_step;
     int  show_path_in_browser; /* 0=off, 1=current directory, 2=full path */
     bool offset_out_of_view;
+    bool disable_mainmenu_scrolling;
     unsigned char icon_file[MAX_FILENAME+1];
     unsigned char viewers_icon_file[MAX_FILENAME+1];
     unsigned char font_file[MAX_FILENAME+1]; /* last font */
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 98e8dec5a8..a9f627bfa6 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1120,7 +1120,11 @@ const struct settings_list settings[] = {
     SYSTEM_SETTING(NVRAM(4), topruntime, 0),
     INT_SETTING(F_BANFROMQS, max_files_in_playlist,
                 LANG_MAX_FILES_IN_PLAYLIST,
-#if MEMORYSIZE > 1
+#if CONFIG_CPU == PP5002 || CONFIG_CPU == PP5020 || CONFIG_CPU == PP5022
+                  /** Slow CPU benefits greatly from building smaller playlists 
+                  On the iPod Mini 2nd gen, creating a playlist of 2000 entries takes around 10 seconds */
+                  2000,
+#elif MEMORYSIZE > 1
                   10000,
 #else
                   400,
@@ -1319,6 +1323,8 @@ const struct settings_list settings[] = {
 #endif
     OFFON_SETTING(0, offset_out_of_view, LANG_SCREEN_SCROLL_VIEW,
                   false, "Screen Scrolls Out Of View", NULL),
+    OFFON_SETTING(0, disable_mainmenu_scrolling, LANG_DISABLE_MAINMENU_SCROLLING,
+                  false, "Disable main menu scrolling", NULL),
     INT_SETTING(F_PADTITLE, scroll_step, LANG_SCROLL_STEP, 6, "scroll step",
                 UNIT_PIXEL, 1, LCD_WIDTH, 1, NULL, NULL, lcd_scroll_step),
     INT_SETTING(F_PADTITLE, screen_scroll_step, LANG_SCREEN_SCROLL_STEP, 16,
@@ -1415,9 +1421,11 @@ const struct settings_list settings[] = {
     OFFON_SETTING(0,playlist_viewer_indices,LANG_SHOW_INDICES,true,
                   "playlist viewer indices",NULL),
     CHOICE_SETTING(0, playlist_viewer_track_display, LANG_TRACK_DISPLAY, 0,
-                   "playlist viewer track display","track name,full path",
-                   NULL, 2, ID2P(LANG_DISPLAY_TRACK_NAME_ONLY),
-                   ID2P(LANG_DISPLAY_FULL_PATH)),
+                   "playlist viewer track display",
+                   "track name,full path,title and album from tags,title from tags",
+                   NULL, 4, ID2P(LANG_DISPLAY_TRACK_NAME_ONLY),
+                   ID2P(LANG_DISPLAY_FULL_PATH),ID2P(LANG_DISPLAY_TITLEALBUM_FROMTAGS),
+                   ID2P(LANG_DISPLAY_TITLE_FROMTAGS)),
     CHOICE_SETTING(0, recursive_dir_insert, LANG_RECURSE_DIRECTORY , RECURSE_ON,
                    "recursive directory insert", off_on_ask, NULL , 3 ,
                    ID2P(LANG_OFF), ID2P(LANG_ON), ID2P(LANG_ASK)),
@@ -1852,7 +1860,7 @@ const struct settings_list settings[] = {
                   true, "warn when erasing dynamic playlist",NULL),
     OFFON_SETTING(0, keep_current_track_on_replace_playlist, LANG_KEEP_CURRENT_TRACK_ON_REPLACE,
                   true, "keep current track when replacing playlist",NULL),
-    OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, false,
+    OFFON_SETTING(0, show_shuffled_adding_options, LANG_SHOW_SHUFFLED_ADDING_OPTIONS, true,
                       "show shuffled adding options", NULL),
     CHOICE_SETTING(0, show_queue_options, LANG_SHOW_QUEUE_OPTIONS, 0,
                       "show queue options", "off,on,in submenu",
diff --git a/apps/shortcuts.c b/apps/shortcuts.c
index 5453422b43..adac5e3327 100644
--- a/apps/shortcuts.c
+++ b/apps/shortcuts.c
@@ -482,15 +482,15 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
             {
             case SHORTCUT_BROWSER:
                 {
-                    static char path[MAX_PATH];
                     DIR* dir;
                     struct dirent* entry;
-                    char* filename = strrchr(sc->u.path, PATH_SEPCH) + 1;
-                    if (*filename != '\0')
+                    char* slash = strrchr(sc->u.path, PATH_SEPCH);
+                    char* filename = slash + 1;
+                    if (slash && *filename != '\0')
                     {
-                        int dirlen = (filename - sc->u.path);
-                        strmemccpy(path, sc->u.path, dirlen + 1);
-                        dir = opendir(path);
+                        *slash = '\0'; /* terminate the path to open the directory */
+                        dir = opendir(sc->u.path);
+                        *slash = PATH_SEPCH; /* restore fullpath */
                         if (dir)
                         {
                             while (0 != (entry = readdir(dir)))
@@ -498,9 +498,12 @@ static int shortcut_menu_speak_item(int selected_item, void * data)
                                 if (!strcmp(entry->d_name, filename))
                                 {
                                     struct dirinfo info = dir_get_info(dir, entry);
+
                                     if (info.attribute & ATTR_DIRECTORY)
                                         talk_dir_or_spell(sc->u.path, NULL, false);
-                                    else talk_file_or_spell(path, filename, NULL, false);
+                                    else
+                                        talk_file_or_spell(NULL, sc->u.path, NULL, false);
+
                                     closedir(dir);
                                     return 0;
                                 }
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 1412647368..5bfeb82481 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -2085,13 +2085,18 @@ bool tagcache_fill_tags(struct mp3entry *id3, const char *filename)
         return false;
 
     /* Find the corresponding entry in tagcache. */
+
+    if (filename != NULL)
+        memset(id3, 0, sizeof(struct mp3entry));
+    else /* Note: caller clears id3 prior to call */
+        filename = id3->path;
+
     idx_id = find_entry_ram(filename);
     if (idx_id < 0)
         return false;
 
     entry = &tcramcache.hdr->indices[idx_id];
-
-    memset(id3, 0, sizeof(struct mp3entry));
+   
     char* buf = id3->id3v2buf;
     ssize_t remaining = sizeof(id3->id3v2buf);
 
diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 6eda05ec44..b599f9577c 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -10,7 +10,7 @@
 # is included by this file and will not be overwritten automatically.
 
 # Basic format declarations
-%format "fmt_title"       "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "<Untagged>"
+%format "fmt_title"       "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "[Untagged]"
 %format "fmt_title"       "%d.%02d. %s - %02d:%02d" discnum tracknum title Lm Ls ? discnum > "0"
 %format "fmt_title"       "%02d. %s - %02d:%02d" tracknum title Lm Ls ? tracknum > "0"
 %format "fmt_title"       "%s - %02d:%02d" title Lm Ls
@@ -176,20 +176,21 @@
 
 # Define the title of the main menu
 %menu_start "main" "Database"
-"Artist"   -> canonicalartist   -> album  -> title = "fmt_title"
 "Album Artist" -> albumartist   -> album  -> title = "fmt_title"
+"Artist"   -> canonicalartist   -> album  -> title = "fmt_title"
 "Album"    -> album    -> title = "fmt_title"
 "Genre"    -> genre    -> canonicalartist -> album -> title = "fmt_title"
+"Year"     -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
 "Composer" -> composer -> album -> title = "fmt_title"
+"A to Z" ==> "a2z"
 "Track"   ==> "track"
-"Year"     -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
+"Shuffle Songs" ~> title = "fmt_title"
+"Search" ==> "search"
 "User Rating" -> rating -> title = "fmt_title"
 "Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title"
-"A to Z..." ==> "a2z"
-"History..." ==> "runtime"
-"Same as current..." ==> "same"
-"Search..." ==> "search"
-"Custom view..."  ==> "custom"
+"History" ==> "runtime"
+"Same as current" ==> "same"
+"Custom view"  ==> "custom"
 
 # And finally set main menu as our root menu
 %root_menu "main"
diff --git a/apps/tagtree.c b/apps/tagtree.c
index d2e27a3e58..1a49936f45 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -56,6 +56,8 @@
 #include "playback.h"
 #include "strnatcmp.h"
 #include "panic.h"
+#include "onplay.h"
+#include "plugin.h"
 
 #define str_or_empty(x) (x ? x : "(NULL)")
 
@@ -64,6 +66,10 @@
 
 static int tagtree_play_folder(struct tree_context* c);
 
+/* reuse of tagtree data after tagtree_play_folder() */
+static uint32_t loaded_entries_crc = 0;
+
+
 /* this needs to be same size as struct entry (tree.h) and name needs to be
  * the first; so that they're compatible enough to walk arrays of both
  * derefencing the name member*/
@@ -71,6 +77,7 @@ struct tagentry {
     char* name;
     int newtable;
     int extraseek;
+    int customaction;
 };
 
 static struct tagentry* tagtree_get_entry(struct tree_context *c, int id);
@@ -78,10 +85,10 @@ static struct tagentry* tagtree_get_entry(struct tree_context *c, int id);
 #define SEARCHSTR_SIZE 256
 
 enum table {
-    ROOT = 1,
-    NAVIBROWSE,
-    ALLSUBENTRIES,
-    PLAYTRACK,
+    TABLE_ROOT = 1,
+    TABLE_NAVIBROWSE,
+    TABLE_ALLSUBENTRIES,
+    TABLE_PLAYTRACK,
 };
 
 static const struct id3_to_search_mapping {
@@ -108,6 +115,7 @@ enum variables {
     menu_next,
     menu_load,
     menu_reload,
+    menu_shuffle_songs,
 };
 
 /* Capacity 10 000 entries (for example 10k different artists) */
@@ -276,6 +284,20 @@ static struct buflib_callbacks ops = {
     .shrink_callback = NULL,
 };
 
+static uint32_t tagtree_data_crc(struct tree_context* c)
+{
+    char* buf;
+    uint32_t crc;
+    buf = core_get_data(tagtree_handle); /* data for the search clauses etc */
+    crc = crc_32(buf, tagtree_buf_used, c->dirlength);
+    buf = core_get_data(c->cache.name_buffer_handle); /* names */
+    crc = crc_32(buf, c->cache.name_buffer_size, crc);
+    buf = core_get_data(c->cache.entries_handle); /* tagentries */
+    crc = crc_32(buf, c->cache.max_entries * sizeof(struct tagentry), crc);
+    logf("%s 0x%x", __func__, crc);
+    return crc;
+}
+
 static void* tagtree_alloc(size_t size)
 {
     size = ALIGN_UP(size, sizeof(void*));
@@ -338,6 +360,7 @@ static int get_tag(int *tag)
         TAG_MATCH("Pm", tag_virt_playtime_min),
         TAG_MATCH("Ps", tag_virt_playtime_sec),
         TAG_MATCH("->", menu_next),
+        TAG_MATCH("~>", menu_shuffle_songs),
 
         TAG_MATCH("==>", menu_load),
 
@@ -820,7 +843,7 @@ static bool parse_search(struct menu_entry *entry, const char *str)
         return true;
     }
 
-    if (entry->type != menu_next)
+    if (entry->type != menu_next && entry->type != menu_shuffle_songs)
         return false;
 
     while (inst->tagorder_count < MAX_TAGS)
@@ -847,7 +870,7 @@ static bool parse_search(struct menu_entry *entry, const char *str)
 
         inst->tagorder_count++;
 
-        if (get_tag(&type) <= 0 || type != menu_next)
+        if (get_tag(&type) <= 0 || (type != menu_next && type != menu_shuffle_songs))
             break;
     }
 
@@ -1245,6 +1268,7 @@ static void tagtree_unload(struct tree_context *c)
             dptr->name = NULL;
             dptr->newtable = 0;
             dptr->extraseek = 0;
+            dptr->customaction = ONPLAY_NO_CUSTOMACTION;
             dptr++;
         }
     }
@@ -1454,7 +1478,7 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
 #endif
         , 0, 0, 0);
 
-    if (c->currtable == ALLSUBENTRIES)
+    if (c->currtable == TABLE_ALLSUBENTRIES)
     {
         tag = tag_title;
         level--;
@@ -1544,17 +1568,19 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
     {
         if (offset == 0)
         {
-            dptr->newtable = ALLSUBENTRIES;
+            dptr->newtable = TABLE_ALLSUBENTRIES;
             dptr->name = str(LANG_TAGNAVI_ALL_TRACKS);
+            dptr->customaction = ONPLAY_NO_CUSTOMACTION;
             dptr++;
             current_entry_count++;
             special_entry_count++;
         }
         if (offset <= 1)
         {
-            dptr->newtable = NAVIBROWSE;
+            dptr->newtable = TABLE_NAVIBROWSE;
             dptr->name = str(LANG_TAGNAVI_RANDOM);
             dptr->extraseek = -1;
+            dptr->customaction = ONPLAY_NO_CUSTOMACTION;
             dptr++;
             current_entry_count++;
             special_entry_count++;
@@ -1568,14 +1594,15 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
         if (total_count++ < offset)
             continue;
 
-        dptr->newtable = NAVIBROWSE;
+        dptr->newtable = TABLE_NAVIBROWSE;
         if (tag == tag_title || tag == tag_filename)
         {
-            dptr->newtable = PLAYTRACK;
+            dptr->newtable = TABLE_PLAYTRACK;
             dptr->extraseek = tcs.idx_id;
         }
         else
             dptr->extraseek = tcs.result_seek;
+        dptr->customaction = ONPLAY_NO_CUSTOMACTION;
 
         fmt = NULL;
         /* Check the format */
@@ -1758,7 +1785,7 @@ static int load_root(struct tree_context *c)
     int i;
 
     tc = c;
-    c->currtable = ROOT;
+    c->currtable = TABLE_ROOT;
     if (c->dirlevel == 0)
         c->currextra = rootmenu;
 
@@ -1775,13 +1802,21 @@ static int load_root(struct tree_context *c)
         switch (menu->items[i]->type)
         {
             case menu_next:
-                dptr->newtable = NAVIBROWSE;
+                dptr->newtable = TABLE_NAVIBROWSE;
                 dptr->extraseek = i;
+                dptr->customaction = ONPLAY_NO_CUSTOMACTION;
                 break;
 
             case menu_load:
-                dptr->newtable = ROOT;
+                dptr->newtable = TABLE_ROOT;
                 dptr->extraseek = menu->items[i]->link;
+                dptr->customaction = ONPLAY_NO_CUSTOMACTION;
+                break;
+
+            case menu_shuffle_songs:
+                dptr->newtable = TABLE_NAVIBROWSE;
+                dptr->extraseek = i;
+                dptr->customaction = ONPLAY_CUSTOMACTION_SHUFFLE_SONGS;
                 break;
         }
 
@@ -1796,6 +1831,8 @@ static int load_root(struct tree_context *c)
 
 int tagtree_load(struct tree_context* c)
 {
+    logf( "%s", __func__);
+
     int count;
     int table = c->currtable;
 
@@ -1804,20 +1841,32 @@ int tagtree_load(struct tree_context* c)
     if (!table)
     {
         c->dirfull = false;
-        table = ROOT;
+        table = TABLE_ROOT;
         c->currtable = table;
         c->currextra = rootmenu;
     }
 
     switch (table)
     {
-        case ROOT:
+        case TABLE_ROOT:
+            logf( "root...");
             count = load_root(c);
             break;
 
-        case ALLSUBENTRIES:
-        case NAVIBROWSE:
+        case TABLE_ALLSUBENTRIES:
+        case TABLE_NAVIBROWSE:
             logf("navibrowse...");
+
+            if (loaded_entries_crc != 0)
+            {
+                if (loaded_entries_crc == tagtree_data_crc(c))
+                {
+                    count = c->dirlength;
+                    logf("Reusing %d entries", count);
+                    break;
+                }
+            }
+
             cpu_boost(true);
             count = retrieve_entries(c, 0, true);
             cpu_boost(false);
@@ -1828,6 +1877,8 @@ int tagtree_load(struct tree_context* c)
             return -1;
     }
 
+    loaded_entries_crc = 0;
+
     if (count < 0)
     {
         if (count != RELOAD_TAGTREE)
@@ -1860,6 +1911,8 @@ int tagtree_load(struct tree_context* c)
  */
 int tagtree_enter(struct tree_context* c, bool is_visible)
 {
+    logf( "%s", __func__);
+
     int rc = 0;
     struct tagentry *dptr;
     struct mp3entry *id3;
@@ -1921,16 +1974,16 @@ int tagtree_enter(struct tree_context* c, bool is_visible)
     core_pin(tagtree_handle);
 
     switch (c->currtable) {
-        case ROOT:
+        case TABLE_ROOT:
             c->currextra = newextra;
 
-            if (newextra == ROOT)
+            if (newextra == TABLE_ROOT)
             {
                 menu = menus[seek];
                 c->currextra = seek;
             }
 
-            else if (newextra == NAVIBROWSE)
+            else if (newextra == TABLE_NAVIBROWSE)
             {
                 int i, j;
 
@@ -2005,9 +2058,9 @@ int tagtree_enter(struct tree_context* c, bool is_visible)
 
             break;
 
-        case NAVIBROWSE:
-        case ALLSUBENTRIES:
-            if (newextra == PLAYTRACK)
+        case TABLE_NAVIBROWSE:
+        case TABLE_ALLSUBENTRIES:
+            if (newextra == TABLE_PLAYTRACK)
             {
                 adjust_selection = false;
 
@@ -2059,6 +2112,7 @@ int tagtree_enter(struct tree_context* c, bool is_visible)
 /* Exits current database menu or table */
 void tagtree_exit(struct tree_context* c, bool is_visible)
 {
+    logf( "%s", __func__);
     if (is_visible) /* update selection history only for user-selected items */
     {
         if (c->selected_item != selected_item_history[c->dirlevel])
@@ -2102,15 +2156,54 @@ int tagtree_get_filename(struct tree_context* c, char *buf, int buflen)
     return 0;
 }
 
+int tagtree_get_custom_action(struct tree_context* c)
+{
+    return tagtree_get_entry(c, c->selected_item)->customaction;
+}
+
+static void swap_array_bool(bool *a, bool *b)
+{
+    bool temp = *a;
+    *a = *b;
+    *b = temp;
+}
+
+/**
+ * Randomly shuffle an array using the Fisher-Yates algorithm :
+ *  https://en.wikipedia.org/wiki/Random_permutation
+ *  This algorithm has a linear complexity.
+ *  Don't forget to srand before call to use it with a relevant seed.
+ */
+static bool* fill_random_playlist_indexes(bool *bool_array, size_t arr_sz,
+                                         size_t track_count, size_t max_slots)
+{
+    size_t i;
+    if (track_count * sizeof(bool) > arr_sz || max_slots > track_count)
+        return NULL;
+
+    for (i = 0; i < arr_sz; i++) /* fill max_slots with TRUE */
+        bool_array[i] = i < max_slots;
+
+    /* shuffle bool array */
+    for (i = track_count - 1; i > 0; i--)
+    {
+        int j = rand() % (i + 1);
+        swap_array_bool(&bool_array[i], &bool_array[j]);
+    }
+    return bool_array;
+}
 
 static bool insert_all_playlist(struct tree_context *c,
                                 const char* playlist, bool new_playlist,
                                 int position, bool queue)
 {
     struct tagcache_search tcs;
-    int i, n;
+    int n;
     int fd = -1;
     unsigned long last_tick;
+    int slots_remaining = 0;
+    bool fill_randomly = false;
+    bool *rand_bool_array = NULL;
     char buf[MAX_PATH];
 
     cpu_boost(true);
@@ -2148,40 +2241,114 @@ static bool insert_all_playlist(struct tree_context *c,
     last_tick = current_tick + HZ/2; /* Show splash after 0.5 seconds have passed */
     splash_progress_set_delay(HZ / 2); /* wait 1/2 sec before progress */
     n = c->filesindir;
-    for (i = 0; i < n; i++)
+
+    if (playlist == NULL)
     {
+        int max_playlist_size = playlist_get_current()->max_playlist_size;
+        slots_remaining = max_playlist_size - playlist_get_current()->amount;
+        if (slots_remaining <= 0)
+        {
+            logf("Playlist has no space remaining");
+            cpu_boost(false);
+            return false;
+        }
 
-        splash_progress(i, n, "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT));
+        fill_randomly = n > slots_remaining;
+    
+        if (fill_randomly)
+        {
+            srand(current_tick);
+            size_t bufsize = 0;
+            bool *buffer = (bool *) plugin_get_buffer(&bufsize);
+            rand_bool_array = fill_random_playlist_indexes(buffer, bufsize,
+                                                           n, slots_remaining);
+
+            talk_id(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY, true);
+            splashf(HZ * 2, str(LANG_RANDOM_SHUFFLE_RANDOM_SELECTIVE_SONGS_SUMMARY),
+                    slots_remaining);
+        }
+    }
+
+    bool exit_loop_now = false;
+    for (int i = 0; i < n; i++)
+    {
         if (TIME_AFTER(current_tick, last_tick + HZ/4))
         {
+            splash_progress(i, n, "%s (%s)", str(LANG_WAIT), str(LANG_OFF_ABORT));
             if (action_userabort(TIMEOUT_NOBLOCK))
+            {
+                exit_loop_now = true;
                 break;
+            }
             last_tick = current_tick;
         }
 
-        if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, i)->extraseek,
-                               tcs.type, buf, sizeof buf))
+        if (playlist == NULL)
         {
-            continue;
+            if (fill_randomly)
+            {
+                int remaining_tracks = n - i;
+                if (remaining_tracks > slots_remaining)
+                {
+                    if (rand_bool_array)
+                    {
+                        /* Skip the track if rand_bool_array[i] is FALSE */
+                        if (!rand_bool_array[i])
+                            continue;
+                    }
+                    else
+                    {
+                        /* Generate random value between 0 and remaining_tracks - 1 */
+                        int selrange = RAND_MAX / remaining_tracks; /* Improve distribution */
+                        int random;
+
+                        for (int r = 0; r < 0x0FFF; r++) /* limit loops */
+                        {
+                            random = rand() / selrange;
+                            if (random < remaining_tracks)
+                                break;
+                            else
+                                random = 0;
+                        }
+                        /* Skip the track if random >= slots_remaining */
+                        if (random >= slots_remaining)
+                            continue;
+                    }
+                }
+            }
         }
 
+        if (!tagcache_retrieve(&tcs, tagtree_get_entry(c, i)->extraseek, tcs.type, buf, sizeof buf))
+            continue;
+
         if (playlist == NULL)
         {
-            if (playlist_insert_track(NULL, buf, position, queue, false) < 0)
+            if (fill_randomly)
             {
+                if (--slots_remaining <= 0)
+                {
+                    exit_loop_now = true;
+                    break;
+                }
+            }
+
+            if (playlist_insert_track(NULL, buf, position, queue, false) < 0) {
                 logf("playlist_insert_track failed");
+                exit_loop_now = true;
                 break;
             }
         }
         else if (fdprintf(fd, "%s\n", buf) <= 0)
-                break;
-
+        {
+            exit_loop_now = true;
+            break;
+        }
         yield();
-
         if (playlist == NULL && position == PLAYLIST_INSERT_FIRST)
-        {
             position = PLAYLIST_INSERT;
-        }
+
+        if (exit_loop_now)
+            break;
     }
     if (playlist == NULL)
         playlist_sync(NULL);
@@ -2196,14 +2363,14 @@ static bool insert_all_playlist(struct tree_context *c,
 static bool goto_allsubentries(int newtable)
 {
     int i = 0;
-    while (i < 2 && (newtable == NAVIBROWSE || newtable == ALLSUBENTRIES))
+    while (i < 2 && (newtable == TABLE_NAVIBROWSE || newtable == TABLE_ALLSUBENTRIES))
     {
         tagtree_enter(tc, false);
         tagtree_load(tc);
         newtable = tagtree_get_entry(tc, tc->selected_item)->newtable;
         i++;
     }
-    return (newtable == PLAYTRACK);
+    return (newtable == TABLE_PLAYTRACK);
 }
 
 static void reset_tc_to_prev(int dirlevel, int selected_item)
@@ -2233,7 +2400,7 @@ static bool tagtree_insert_selection(int position, bool queue,
 
     newtable = tagtree_get_entry(tc, tc->selected_item)->newtable;
 
-    if (newtable == PLAYTRACK) /* Insert a single track? */
+    if (newtable == TABLE_PLAYTRACK) /* Insert a single track? */
     {
         if (tagtree_get_filename(tc, buf, sizeof buf) < 0)
             return false;
@@ -2342,6 +2509,7 @@ int tagtree_add_to_playlist(const char* playlist, bool new_playlist)
 
 static int tagtree_play_folder(struct tree_context* c)
 {
+    logf( "%s", __func__);
     int start_index = c->selected_item;
 
     if (playlist_create(NULL, NULL) < 0)
@@ -2353,14 +2521,26 @@ static int tagtree_play_folder(struct tree_context* c)
     if (!insert_all_playlist(c, NULL, false, PLAYLIST_INSERT_LAST, false))
         return -2;
 
+    int n = c->filesindir;
+    bool has_playlist_been_randomized = n > playlist_get_current()->max_playlist_size;
+    if (has_playlist_been_randomized)
+    {
+        /* We need to recalculate the start index based on a percentage to put the user
+        around its desired start position and avoid out of bounds */
+
+        int percentage_start_index = 100 * start_index / n;
+        start_index = percentage_start_index * playlist_get_current()->amount / 100;
+    }
+
     if (global_settings.playlist_shuffle)
     {
-        start_index = playlist_shuffle(current_tick, c->selected_item);
+        start_index = playlist_shuffle(current_tick, start_index);
         if (!global_settings.play_selected)
             start_index = 0;
     }
 
     playlist_start(start_index, 0, 0);
+    loaded_entries_crc = tagtree_data_crc(c); /* save crc in case we return */
     return 0;
 }
 
@@ -2403,11 +2583,11 @@ char *tagtree_get_title(struct tree_context* c)
 {
     switch (c->currtable)
     {
-        case ROOT:
+        case TABLE_ROOT:
             return menu->title;
 
-        case NAVIBROWSE:
-        case ALLSUBENTRIES:
+        case TABLE_NAVIBROWSE:
+        case TABLE_ALLSUBENTRIES:
             return current_title[c->currextra];
     }
 
@@ -2419,7 +2599,7 @@ int tagtree_get_attr(struct tree_context* c)
     int attr = -1;
     switch (c->currtable)
     {
-        case NAVIBROWSE:
+        case TABLE_NAVIBROWSE:
             if (csi->tagorder[c->currextra] == tag_title
                 || csi->tagorder[c->currextra] == tag_virt_basename)
                 attr = FILE_ATTR_AUDIO;
@@ -2427,7 +2607,7 @@ int tagtree_get_attr(struct tree_context* c)
                 attr = ATTR_DIRECTORY;
             break;
 
-        case ALLSUBENTRIES:
+        case TABLE_ALLSUBENTRIES:
             attr = FILE_ATTR_AUDIO;
             break;
 
diff --git a/apps/tagtree.h b/apps/tagtree.h
index 39ab545bd0..a57a5c2f80 100644
--- a/apps/tagtree.h
+++ b/apps/tagtree.h
@@ -45,6 +45,7 @@ char *tagtree_get_title(struct tree_context* c);
 int tagtree_get_attr(struct tree_context* c);
 int tagtree_get_icon(struct tree_context* c);
 int tagtree_get_filename(struct tree_context* c, char *buf, int buflen);
+int tagtree_get_custom_action(struct tree_context* c);
 bool tagtree_get_subentry_filename(char *buf, size_t bufsize);
 bool tagtree_subentries_do_action(bool (*action_cb)(const char *file_name));
 
diff --git a/apps/tree.c b/apps/tree.c
index 71a7ee3f62..721fb8c1ef 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -735,6 +735,20 @@ static int dirbrowse(void)
         oldbutton = button;
         gui_synclist_do_button(&tree_lists, &button);
         tc.selected_item = gui_synclist_get_sel_pos(&tree_lists);
+        int customaction = ONPLAY_NO_CUSTOMACTION;
+        bool do_restore_display = true;
+        #ifdef HAVE_TAGCACHE
+            if (id3db && (button == ACTION_STD_OK || button == ACTION_STD_CONTEXT))
+            {
+                customaction = tagtree_get_custom_action(&tc);
+                if (customaction == ONPLAY_CUSTOMACTION_SHUFFLE_SONGS)
+                {
+                    /* The code to insert shuffled is on the context branch of the switch so we always go here */
+                    button = ACTION_STD_CONTEXT;
+                    do_restore_display = false;
+                }
+            }
+        #endif
         switch ( button ) {
             case ACTION_STD_OK:
                 /* nothing to do if no files to display */
@@ -773,7 +787,7 @@ static int dirbrowse(void)
                     default:
                         break;
                 }
-                restore = true;
+                restore = do_restore_display;
                 break;
 
             case ACTION_STD_CANCEL:
@@ -798,12 +812,12 @@ static int dirbrowse(void)
                     if (ft_exit(&tc) == 3)
                         exit_func = true;
 
-                restore = true;
+                restore = do_restore_display;
                 break;
 
             case ACTION_TREE_STOP:
                 if (list_stop_handler())
-                    restore = true;
+                    restore = do_restore_display;
                 break;
 
             case ACTION_STD_MENU:
@@ -851,7 +865,7 @@ static int dirbrowse(void)
                         skin_update(CUSTOM_STATUSBAR, i, SKIN_REFRESH_ALL);
                 }
 
-                restore = true;
+                restore = do_restore_display;
                 break;
             }
 #endif
@@ -872,7 +886,7 @@ static int dirbrowse(void)
                     break;
 
                 if(!numentries)
-                    onplay_result = onplay(NULL, 0, curr_context, hotkey);
+                    onplay_result = onplay(NULL, 0, curr_context, hotkey, customaction);
                 else {
 #ifdef HAVE_TAGCACHE
                     if (id3db)
@@ -902,7 +916,7 @@ static int dirbrowse(void)
                         ft_assemble_path(buf, sizeof(buf), currdir, entry->name);
 
                     }
-                    onplay_result = onplay(buf, attr, curr_context, hotkey);
+                    onplay_result = onplay(buf, attr, curr_context, hotkey, customaction);
                 }
                 switch (onplay_result)
                 {
@@ -911,7 +925,7 @@ static int dirbrowse(void)
                         break;
 
                     case ONPLAY_OK:
-                        restore = true;
+                        restore = do_restore_display;
                         break;
 
                     case ONPLAY_RELOAD_DIR:
@@ -988,7 +1002,7 @@ static int dirbrowse(void)
 
             lastfilter = *tc.dirfilter;
             lastsortcase = global_settings.sort_case;
-            restore = true;
+            restore = do_restore_display;
         }
 
         if (exit_func)
diff --git a/apps/tree.h b/apps/tree.h
index d13c75d434..e958bbf109 100644
--- a/apps/tree.h
+++ b/apps/tree.h
@@ -33,6 +33,9 @@ struct entry {
     char *name;
     int attr; /* FAT attributes + file type flags */
     unsigned time_write; /* Last write time */
+    #ifdef HAVE_TAGCACHE
+    int customaction; /* db use */
+    #endif
 };
 
 #define BROWSE_SELECTONLY       0x0001  /* exit on selecting a file */
diff --git a/bootloader/x1000/x1000bootloader.h b/bootloader/x1000/x1000bootloader.h
index 7118017a23..0b5b02969d 100644
--- a/bootloader/x1000/x1000bootloader.h
+++ b/bootloader/x1000/x1000bootloader.h
@@ -107,10 +107,9 @@ struct uimage_header;
     " init=/linuxrc ubi.mtd=4 root=ubi0:rootfs ubi.mtd=5 rootfstype=ubifs \
 sn_no=00000000000000000000000000000000 bt_mac=xxxxxxxxxxxx wifi_mac=xxxxxxxxxxxx rw"
 # define OF_PLAYER_BTN      BUTTON_PLAY
-/* Note: OF Recovery boots, but is otherwise untested. */
-//# define OF_RECOVERY_NAME   "Aigo Recovery"
-//# define OF_RECOVERY_ADDR   0x900000
-//# define OF_RECOVERY_LENGTH (7 * 1024 * 1024)
+# define OF_RECOVERY_NAME   "Aigo Recovery"
+# define OF_RECOVERY_ADDR   0x900000
+# define OF_RECOVERY_LENGTH (7 * 1024 * 1024)
 # define OF_RECOVERY_ARGS \
     "console=ttyS2,115200n8 mem=32M@0x0 no_console_suspend lpj=5009408 ip=off"
 #else
diff --git a/docs/CREDITS b/docs/CREDITS
index 577da626f3..a4b23cd412 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -726,6 +726,8 @@ Evan Kenny
 Medu Hedan
 Uwe Schächterle
 Hoseok Seo
+Paul Sauro
+Dmitry Prozorov
 
 The libmad team
 The wavpack team
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 4e6fcbf70c..192cdb711d 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -62,6 +62,10 @@ common/bootdata.c
 #endif
 #endif
 
+#if defined(HAVE_DEVICEDATA)
+common/devicedata.c
+#endif
+
 #ifdef HAVE_SDL
 target/hosted/sdl/button-sdl.c
 target/hosted/sdl/kernel-sdl.c
diff --git a/firmware/common/devicedata.c b/firmware/common/devicedata.c
new file mode 100644
index 0000000000..75fe79d7fa
--- /dev/null
+++ b/firmware/common/devicedata.c
@@ -0,0 +1,88 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2024 by William Wilgus
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "devicedata.h"
+#include "crc32.h"
+#include <stddef.h>
+#include <string.h>
+#include "debug.h"
+
+#ifndef BOOTLOADER
+void verify_device_data(void) INIT_ATTR;
+void verify_device_data(void)
+{
+    DEBUGF("%s", __func__);
+    /* verify payload with checksum */
+    uint32_t crc = crc_32(device_data.payload, device_data.length, 0xffffffff);
+    if (crc == device_data.crc)
+        return; /* return if data is valid */
+
+    /* Write the default if data is invalid */
+    memset(device_data.payload, 0xff, DEVICE_DATA_PAYLOAD_SIZE); /* Invalid data */
+    device_data.length = DEVICE_DATA_PAYLOAD_SIZE;
+    device_data.crc = crc_32(device_data.payload, device_data.length, 0xffffffff);
+
+}
+
+/******************************************************************************/
+#endif /* ndef BOOTLOADER ******************************************************/
+/******************************************************************************/
+
+#if defined(HAVE_DEVICEDATA)
+void  __attribute__((weak)) fill_devicedata(struct device_data_t *data)
+{
+    memset(data->payload, 0xff, data->length);
+}
+#endif
+
+/* Write bootdata into location in FIRMWARE marked by magic header
+ * Assumes buffer is already loaded with the firmware image
+ * We just need to find the location and write data into the
+ * payload region along with the crc for later verification and use.
+ * Returns payload len on success,
+ * On error returns false
+ */
+bool write_devicedata(unsigned char* buf, int len)
+{
+    int search_len = MIN(len, DEVICE_DATA_SEARCH_SIZE) - sizeof(struct device_data_t);
+
+    /* search for decvice data header prior to search_len */
+    for(int i = 0; i < search_len; i++)
+    {
+        struct device_data_t *data = (struct device_data_t *)&buf[i];
+        if (data->magic[0] != DEVICE_DATA_MAGIC0 ||
+            data->magic[1] != DEVICE_DATA_MAGIC1)
+            continue;
+
+        /* Ignore it if the length extends past the end of the buffer. */
+        int data_len = offsetof(struct device_data_t, payload) + data->length;
+        if (i + data_len > len)
+            continue;
+
+        fill_devicedata(data);
+
+        /* Calculate payload CRC */
+        data->crc = crc_32(data->payload, data->length, 0xffffffff);
+        return true;
+    }
+
+    return false;
+}
+
diff --git a/firmware/common/rb-loader.c b/firmware/common/rb-loader.c
index 61d8b1ddd2..2f5e06e165 100644
--- a/firmware/common/rb-loader.c
+++ b/firmware/common/rb-loader.c
@@ -30,6 +30,9 @@
 #include "multiboot.h"
 #endif
 
+#ifdef HAVE_DEVICEDATA
+#include "devicedata.h"
+#endif
 /* loads a firmware file from supplied filename
  * file opened, checks firmware size and checksum
  * if no error, firmware loaded to supplied buffer
@@ -118,7 +121,6 @@ int load_firmware(unsigned char* buf, const char* firmware, int buffer_size)
             /* if ret is valid breaks from loop to continue loading */
         }
 #endif
-
         if (ret < 0) /* Check default volume, no valid firmware file loaded yet */
         {
             /* First check in BOOTDIR */
@@ -141,5 +143,9 @@ int load_firmware(unsigned char* buf, const char* firmware, int buffer_size)
     else /* full path passed ROLO etc.*/
         ret = load_firmware_filename(buf, firmware, buffer_size);
 
+#ifdef HAVE_DEVICEDATA
+        write_devicedata(buf, ret);
+#endif
+
     return ret;
 }
diff --git a/firmware/drivers/lcd-scroll.c b/firmware/drivers/lcd-scroll.c
index 895cf98cba..2a58d6ff21 100644
--- a/firmware/drivers/lcd-scroll.c
+++ b/firmware/drivers/lcd-scroll.c
@@ -195,8 +195,14 @@ static void LCDFN(scroll_worker)(void)
         s = &si->scroll[index];
 
         /* check pause */
-        if (TIME_BEFORE(current_tick, s->start_tick))
+        if (TIME_BEFORE(current_tick, s->start_tick)) {
             continue;
+        }
+
+        if (global_settings.disable_mainmenu_scrolling && get_current_activity() == ACTIVITY_MAINMENU) {
+            // No scrolling on the main menu if disabled (to not break themes with lockscreens)
+            continue;
+        }
 
         s->start_tick = current_tick;
 
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 37ea9a1dd7..ede1825f88 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -893,7 +893,8 @@ Lyre prototype 1 */
 #endif
 
 /* Bootloaders don't need multivolume awareness */
-#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) && !(CONFIG_PLATFORM & PLATFORM_HOSTED)
+#if defined(BOOTLOADER) && defined(HAVE_MULTIVOLUME) \
+    && !(CONFIG_PLATFORM & PLATFORM_HOSTED) && !defined(BOOT_REDIR)
 #undef HAVE_MULTIVOLUME
 #endif
 
diff --git a/firmware/export/config/erosqnative.h b/firmware/export/config/erosqnative.h
index 26073a5f34..adb1b29e01 100644
--- a/firmware/export/config/erosqnative.h
+++ b/firmware/export/config/erosqnative.h
@@ -9,6 +9,19 @@
 #define BOOTFILE     "rockbox." BOOTFILE_EXT
 #define BOOTDIR      "/.rockbox"
 
+/* Define EROSQN_VER as an "extradefine" in the configure script -
+ * v1, v2 players: "1"
+ * v3 players: "3"
+ * Only bootloader will be affected.
+ *
+ * This allows us to fix the LCD init issues with v3 players.
+ */
+#ifdef BOOTLOADER
+#ifndef EROSQN_VER
+#error "Must define EROSQN_VER"
+#endif
+#endif
+
 /* CPU defines */
 #define CONFIG_CPU      X1000
 #define X1000_EXCLK_FREQ   24000000
@@ -106,6 +119,9 @@
 #define HAVE_BOOTDATA
 #define BOOT_REDIR "rockbox_main.aigo_erosqn"
 
+/* DeviceData */
+#define HAVE_DEVICEDATA
+
 /* USB support */
 #ifndef SIMULATOR
 #define CONFIG_USBOTG USBOTG_DESIGNWARE
diff --git a/firmware/export/devicedata.h b/firmware/export/devicedata.h
new file mode 100644
index 0000000000..c19b0ca25d
--- /dev/null
+++ b/firmware/export/devicedata.h
@@ -0,0 +1,94 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2017 by Amaury Pouly
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef __RB_DEVICEDATA__
+#define __RB_DEVICEDATA__
+
+#ifndef __ASSEMBLER__
+#include <stdint.h>
+#include "system.h"
+#endif
+
+/* /!\ This file can be included in assembly files /!\ */
+
+/** The device data will be filled by the bootloader with information that might
+ * be relevant for Rockbox. The bootloader will search for the structure using
+ * the magic header within the first DEVICE_DATA_SEARCH_SIZE bytes of the binary.
+ * Typically, this structure should be as close as possible to the entry point */
+
+/* Search size for the data structure after entry point */
+#define DEVICE_DATA_SEARCH_SIZE   1024
+
+#define DEVICE_DATA_MAGIC0    ('r' | 'b' << 8 | 'd' << 16 | 'e' << 24)
+#define DEVICE_DATA_MAGIC1    ('v' | 'i' << 8 | 'c' << 16 | 'e' << 24)
+
+/* maximum size of payload */
+#define DEVICE_DATA_PAYLOAD_SIZE  4
+
+#ifndef __ASSEMBLER__
+/* This is the C structure */
+struct device_data_t
+{
+    union
+    {
+        uint32_t crc; /* crc of payload data (CRC32 with 0xffffffff for initial value) */
+        uint32_t magic[2]; /* DEVICE_DATA_MAGIC0/1 */
+    };
+
+    uint32_t length; /* length of the payload */
+
+    /* add fields here */
+    union
+    {
+        struct
+        {
+#if defined(EROS_QN)
+            uint8_t lcd_version;
+#endif
+        };
+        uint8_t payload[DEVICE_DATA_PAYLOAD_SIZE];
+    };
+} __attribute__((packed));
+
+
+void fill_devicedata(struct device_data_t *data);
+bool write_devicedata(unsigned char* buf, int len);
+#ifndef BOOTLOADER
+extern struct device_data_t device_data;
+
+void verify_device_data(void) INIT_ATTR;
+
+#endif
+
+#else /* __ASSEMBLER__ */
+
+/* This assembler macro implements an empty device data structure with just the magic
+ * string and payload size */
+.macro put_device_data_here
+.global device_data
+device_data:
+    .word   DEVICE_DATA_MAGIC0
+    .word   DEVICE_DATA_MAGIC1
+    .word   DEVICE_DATA_PAYLOAD_SIZE
+    .space  BOOT_DATA_PAYLOAD_SIZE, 0xff /* payload, initialised with value 0xff */
+.endm
+
+#endif
+
+#endif /* __RB_DEVICEDATA__ */
diff --git a/firmware/rolo.c b/firmware/rolo.c
index f9b0cc9e61..38d350d432 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -56,6 +56,10 @@
 #include "crc32.h"
 #endif
 
+#if defined(HAVE_DEVICEDATA) && !defined(SIMULATOR)
+#include "devicedata.h"
+#endif
+
 #if CONFIG_CPU == AS3525v2
 #include "ascodec.h"
 #endif
@@ -250,9 +254,8 @@ int rolo_load(const char* filename)
 
     err = LOAD_FIRMWARE(filebuf, filename, filebuf_size);
 #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
-    /* write the bootdata as if rolo were the bootloader
-     * FIXME: this won't work for root redirect... */
-    if (!strcmp(filename, BOOTDIR "/" BOOTFILE) && boot_data_valid)
+    // Write bootdata as long as the existing bootdata is valid
+    if (boot_data_valid)
     {
         int volume = 0;
 
@@ -275,6 +278,10 @@ int rolo_load(const char* filename)
     }
 #endif
 
+#if defined(HAVE_DEVICEDATA)
+    write_devicedata(filebuf, filebuf_size);
+#endif
+
     if (err <= 0)
     {
         rolo_error(loader_strerror(err));
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index c32f4632e2..74c08c1da5 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -32,6 +32,10 @@
 #include "usb.h"
 #include "lcd.h"
 #include "font.h"
+#if !defined(BOOTLOADER)
+#include "misc.h"
+#include "settings.h"
+#endif
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
 #endif
diff --git a/firmware/target/mips/ingenic_x1000/crt0.S b/firmware/target/mips/ingenic_x1000/crt0.S
index 6c0942b0db..23daaefb5e 100644
--- a/firmware/target/mips/ingenic_x1000/crt0.S
+++ b/firmware/target/mips/ingenic_x1000/crt0.S
@@ -23,6 +23,10 @@
 #include "mips.h"
 #include "bootdata.h"
 
+#if defined(HAVE_DEVICEDATA) && !defined(BOOTLOADER)
+#include "devicedata.h"
+#endif
+
     .text
     .extern main
     .extern system_early_init
@@ -52,6 +56,9 @@ _header:
 #ifndef BOOTLOADER
     /* Multiboot support header; this is not part of the above header. */
     put_boot_data_here
+#ifdef HAVE_DEVICEDATA
+    put_device_data_here
+#endif
 #endif
 
 _realstart:
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
index 0d43a3f010..bcc30a71bd 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/lcd-erosqnative.c
@@ -25,11 +25,138 @@
 #include "lcd-x1000.h"
 #include "gpio-x1000.h"
 #include "system.h"
+#include "devicedata.h"
 
 /* for reference on these command/data hex values, see the mipi dcs lcd spec.  *
  * Not everything here is there, but all the standard stuff is.                */
 
-static const uint32_t erosqnative_lcd_cmd_enable[] = {
+/* New Display Eroq 2.1 / Hifiwalker 1.7+ / Surfans v3.2, unknown Controller  *
+ * (partially GC9A01 register compatible)                                     *
+ *   https://espruino.microcosm.app/api/v1/files/ \                           *
+ *   9dc1b976d621a2ab3854312cce862c4a9a50dc1b.html#GC9A01 ,                   *
+ *   https://www.buydisplay.com/download/ic/GC9A01A.pdf ,                     *
+ *   https://lcddisplay.co/wp-content/uploads/2023/02/GC9A01.pdf              *
+ * Init sequence From 'EROS Q （c�）_V2.1_20231209固件.zip'                  *
+ * update.upt/.iso -> In 'uboot.bin' at 0x52da0-0x5305f                       *
+ *  http://www.eroshifi.com/download/firmware/122.html                        */
+static const uint32_t erosqnative_lcd_cmd_enable_v3[] = {
+
+    /* Unlock EXTC? */
+    LCD_INSTR_CMD,      0xfe, // Inter Register Enable1
+    LCD_INSTR_CMD,      0xef, // Inter Register Enable2
+
+    LCD_INSTR_CMD,      0x36, // Memory Access Control
+/* Bit7 1:vertical flip   0:no vertical flip
+   Bit6 1:horizontal flip 0:no horizontal flip
+   Bit3 1:BGR 0:RGB */
+    LCD_INSTR_DAT,      0x90,
+    /* Pixel Format Set */
+    LCD_INSTR_CMD,      0x3a,
+    LCD_INSTR_DAT,      0x55, /* Rockbox uses 16pp, OF specified 18 bpp */
+
+    LCD_INSTR_CMD,      0x84, // ?? (undocumented)
+    LCD_INSTR_DAT,      0x04,
+    LCD_INSTR_CMD,      0x86, // ??
+    LCD_INSTR_DAT,      0xfb,
+    LCD_INSTR_CMD,      0x87, // ??
+    LCD_INSTR_DAT,      0x79,
+    LCD_INSTR_CMD,      0x89, // ??
+    LCD_INSTR_DAT,      0x0b,
+    LCD_INSTR_CMD,      0x8a, // ??
+    LCD_INSTR_DAT,      0x20,
+    LCD_INSTR_CMD,      0x8b, // ??
+    LCD_INSTR_DAT,      0x80,
+    LCD_INSTR_CMD,      0x8d, // ??
+    LCD_INSTR_DAT,      0x3b,
+    LCD_INSTR_CMD,      0x8e, // ??
+    LCD_INSTR_DAT,      0xcf,
+
+    LCD_INSTR_CMD,      0xec, // Charge Pump Frequent Control
+    LCD_INSTR_DAT,      0x33,
+    LCD_INSTR_DAT,      0x02,
+    LCD_INSTR_DAT,      0x4c,
+
+    LCD_INSTR_CMD,      0x98, // ?? (undocumented)
+    LCD_INSTR_DAT,      0x3e,
+    LCD_INSTR_CMD,      0x9c, // ??
+    LCD_INSTR_DAT,      0x4b,
+    LCD_INSTR_CMD,      0x99, // ??
+    LCD_INSTR_DAT,      0x3e,
+    LCD_INSTR_CMD,      0x9d, // ??
+    LCD_INSTR_DAT,      0x4b,
+    LCD_INSTR_CMD,      0x9b, // ??
+    LCD_INSTR_DAT,      0x55,
+
+    LCD_INSTR_CMD,      0xe8, // Frame Rate
+    LCD_INSTR_DAT,      0x11,
+    LCD_INSTR_DAT,      0x00,
+
+    LCD_INSTR_CMD,      0xff, // ?? (Adafruit & Co lib.  C:0xFF, D:0x60, D:0x01, D:0x04)
+    LCD_INSTR_DAT,      0x62, // LCD_INSTR_DAT, 0x01, LCD_INSTR_DAT, 0x04,
+    LCD_INSTR_CMD,      0xc3, // Vreg1a voltage Control
+    LCD_INSTR_DAT,      0x20,
+    LCD_INSTR_CMD,      0xc4, // Vreg1b voltage Control
+    LCD_INSTR_DAT,      0x03,
+    LCD_INSTR_CMD,      0xc9, // Vreg2a voltage Control
+    LCD_INSTR_DAT,      0x2a,
+
+    LCD_INSTR_CMD,      0xf0, // SET_GAMMA1
+    LCD_INSTR_DAT,      0x4a,
+    LCD_INSTR_DAT,      0x10,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x26,
+    LCD_INSTR_DAT,      0x39,
+
+    LCD_INSTR_CMD,      0xf2, // SET_GAMMA3
+    LCD_INSTR_DAT,      0x4a,
+    LCD_INSTR_DAT,      0x10,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x0a,
+    LCD_INSTR_DAT,      0x26,
+    LCD_INSTR_DAT,      0x39,
+
+    LCD_INSTR_CMD,      0xf1, // SET_GAMMA2
+    LCD_INSTR_DAT,      0x50,
+    LCD_INSTR_DAT,      0x8f,
+    LCD_INSTR_DAT,      0xaf,
+    LCD_INSTR_DAT,      0x3b,
+    LCD_INSTR_DAT,      0x3f,
+    LCD_INSTR_DAT,      0x7f,
+
+    LCD_INSTR_CMD,      0xf3, // SET_GAMMA4
+    LCD_INSTR_DAT,      0x50,
+    LCD_INSTR_DAT,      0x8f,
+    LCD_INSTR_DAT,      0xaf,
+    LCD_INSTR_DAT,      0x3b,
+    LCD_INSTR_DAT,      0x3f,
+    LCD_INSTR_DAT,      0x7f,
+
+    LCD_INSTR_CMD,      0xba, // TE Control
+    LCD_INSTR_DAT,      0x0a,
+
+#ifdef BOOTLOADER
+    LCD_INSTR_CMD,      0x35, // Tearing Effect Line ON
+    LCD_INSTR_DAT,      0x00,
+#endif
+
+    LCD_INSTR_CMD,      0x21, /* Invert */
+
+    /* Lock EXTC? */
+    LCD_INSTR_CMD,      0xfe, // Inter Register Enable1
+    LCD_INSTR_CMD,      0xee,
+
+    /* Exit Sleep */
+    LCD_INSTR_CMD,      0x11,
+    LCD_INSTR_UDELAY,   120000,
+    /* Display On */
+    LCD_INSTR_CMD,      0x29,
+    LCD_INSTR_UDELAY,   20000,
+    LCD_INSTR_END,
+};
+
+/* Original Display / Hifiwalker -1.5 / Surfans -2.7 */
+static const uint32_t erosqnative_lcd_cmd_enable_v1[] = {
     /* Set EXTC? */
     LCD_INSTR_CMD,      0xc8,
     LCD_INSTR_DAT,      0xff,
@@ -179,7 +306,22 @@ void lcd_tgt_enable(bool enable)
         mdelay(5);
         gpio_set_level(GPIO_LCD_CE, 0);
 
-        lcd_exec_commands(&erosqnative_lcd_cmd_enable[0]);
+#ifdef BOOTLOADER
+# if EROSQN_VER == 3
+        lcd_exec_commands(&erosqnative_lcd_cmd_enable_v3[0]);
+# else
+        lcd_exec_commands(&erosqnative_lcd_cmd_enable_v1[0]);
+# endif
+#else
+        if (device_data.lcd_version == 3)
+        {
+            lcd_exec_commands(&erosqnative_lcd_cmd_enable_v3[0]);
+        }
+        else
+        {
+            lcd_exec_commands(&erosqnative_lcd_cmd_enable_v1[0]);
+        }
+#endif
     } else {
         /* doesn't flash white if we don't do anything... */
 #if 0
diff --git a/firmware/target/mips/ingenic_x1000/system-x1000.c b/firmware/target/mips/ingenic_x1000/system-x1000.c
index 64890a6c3a..1c850736b6 100644
--- a/firmware/target/mips/ingenic_x1000/system-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/system-x1000.c
@@ -20,6 +20,7 @@
  ****************************************************************************/
 
 #include "system.h"
+#include <string.h>
 #include "mips.h"
 #include "panic.h"
 #include "button.h"
@@ -36,6 +37,10 @@
 #include "x1000/msc.h"
 #include "x1000/aic.h"
 
+#if defined(HAVE_DEVICEDATA)
+#include "devicedata.h"
+#endif
+
 #ifdef X1000_CPUIDLE_STATS
 int __cpu_idle_avg = 0;
 int __cpu_idle_cur = 0;
@@ -81,6 +86,20 @@ void system_early_init(void)
     clk_init();
 }
 
+#if defined (HAVE_DEVICEDATA) && defined(EROS_QN)
+void fill_devicedata(struct device_data_t *data)
+{
+#ifdef BOOTLOADER
+    memset(data->payload, 0xff, data->length);
+    data->lcd_version = EROSQN_VER;
+#else
+    uint8_t lcd_version = device_data.lcd_version;
+    memset(data->payload, 0xff, data->length);
+    data->lcd_version = lcd_version;
+#endif
+}
+#endif
+
 /* First thing called from Rockbox main() */
 void system_init(void)
 {
diff --git a/firmware/target/mips/ingenic_x1000/x1000boot.make b/firmware/target/mips/ingenic_x1000/x1000boot.make
index 0bdf5cf7b4..7a861b0a3d 100644
--- a/firmware/target/mips/ingenic_x1000/x1000boot.make
+++ b/firmware/target/mips/ingenic_x1000/x1000boot.make
@@ -12,7 +12,7 @@ include $(ROOTDIR)/lib/microtar/microtar.make
 INCLUDES += -I$(APPSDIR)
 SRC += $(call preprocess, $(APPSDIR)/SOURCES)
 
-LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config/$(MODELNAME).h
+LDSDEP := $(FIRMDIR)/export/cpu.h $(FIRMDIR)/export/config.h
 
 BOOTLDS := $(FIRMDIR)/target/$(CPU)/$(MANUFACTURER)/boot.lds
 BOOTLINK := $(BUILDDIR)/boot.link
diff --git a/lib/rbcodec/codecs/cRSID/host/file.c b/lib/rbcodec/codecs/cRSID/host/file.c
index c87f37ebb4..817cff6c2b 100644
--- a/lib/rbcodec/codecs/cRSID/host/file.c
+++ b/lib/rbcodec/codecs/cRSID/host/file.c
@@ -39,7 +39,7 @@ cRSID_SIDheader* cRSID_processSIDfile(cRSID_C64instance* C64, unsigned char* fil
  for (i=1; i < (int)(sizeof(MagicStringPSID)-1); ++i) { if (SIDheader->MagicString[i] != MagicStringPSID[i]) return NULL; }
  C64->RealSIDmode = ( SIDheader->MagicString[0] == 'R' );
 
- if (SIDheader->LoadAddressH==0 && SIDheader->LoadAddressH==0) { //load-address taken from first 2 bytes of the C64 PRG
+ if (SIDheader->LoadAddressH==0 && SIDheader->LoadAddressL==0) { //load-address taken from first 2 bytes of the C64 PRG
   C64->LoadAddress = (filedata[SIDheader->HeaderSize+1]<<8) + (filedata[SIDheader->HeaderSize+0]);
   SIDdataOffset = SIDheader->HeaderSize+2;
  }
diff --git a/manual/appendix/config_file_options.tex b/manual/appendix/config_file_options.tex
index b3e4363815..cb31068964 100644
--- a/manual/appendix/config_file_options.tex
+++ b/manual/appendix/config_file_options.tex
@@ -58,7 +58,7 @@
     playlist viewer indices
                     & on, off           & N/A\\
     playlist viewer track display
-                    & track name,full path
+                    & track name,full path,title and album from tags,title from tags
                                         & N/A\\
     recursive directory insert
                     & on, off, ask      & N/A\\
@@ -67,6 +67,7 @@
     scroll step     & \fixme{devise a way to get ranges from config-*.h} & pixels\\
     screen scroll step & \fixme{devise a way to get ranges from config-*.h} & pixels\\
     Screen Scrolls Out Of View & on, off & N/A\\
+    Disable main menu scrolling & on, off & N/A\\
     bidir limit     & 0 to 200          & \% screen\\
     scroll paginated & on, off & N/A\\
     list wraparound & on, off & N/A\\
diff --git a/manual/configure_rockbox/display_options.tex b/manual/configure_rockbox/display_options.tex
index e2b5c3eccd..0d42115efe 100755
--- a/manual/configure_rockbox/display_options.tex
+++ b/manual/configure_rockbox/display_options.tex
@@ -198,6 +198,11 @@
       will keep the list entries at their fixed positions and allow them to be
       scrolled out of view, whereas \setting{No} will only scroll those entries
       which surpass the right margin.
+    \item[Disable main menu scrolling]
+      Setting this option to \setting{Yes}
+      will stop all kind of text scrollings while you are laying on the main menu
+      which may greatly help at avoiding visual glitches if you are using a theme
+      that has a lockscreen.
     \item[Screen Scroll Step Size.]
       Defines the number of pixels the horizontal manual screen scroll should move
       for each step.
diff --git a/manual/configure_rockbox/sound_settings.tex b/manual/configure_rockbox/sound_settings.tex
index fd69d63317..0aeada59b2 100644
--- a/manual/configure_rockbox/sound_settings.tex
+++ b/manual/configure_rockbox/sound_settings.tex
@@ -44,10 +44,6 @@ change to customise your listening experience.
   limit, select a volume from the list and the maximum volume will be limited to
   the selected value all over the system.
   \opt{xduoox3}{This setting also applies to the Line Out of the \dap{}, as at full scale the \dap{} overdrives the signal.}
-  \opt{erosqnative}{On the \playertype{}, when using the Line Out without anything connected to the Headphone port,
-      the volume is fixed to the \setting{Volume Limit} value.
-      \note{On the \playertype{}, the Line Out level at -2~dB is approximately +7~dBV, -4~dB is approximately +4~dBu,
-      and -18~dB is approximately -10~dBV.}}
 
 \section{Bass}
   This setting emphasises
@@ -196,8 +192,7 @@ change to customise your listening experience.
 \opt{erosqnative}{
   \section{Stereo Switch Mode}
   The Eros Q and related devices contain a stereo switch in the audio path.
-  This may be connected differently depending on the hardware revision. This
-  setting allows the behavior of the stereo switch to be changed if one of
+  This setting allows the behavior of the stereo switch to be changed if one of
   the two outputs (Headphones or Line Out) is not working. There are four modes:
   \begin{description}
     \item[Normal.]
@@ -209,6 +204,16 @@ change to customise your listening experience.
     \item[Always 1.]
       Both outputs use a value of 1.
   \end{description}
+
+  \section{DAC filter roll-off}
+  Later versions of the Eros Q and related devices contain a DAC with user-selectable
+  filter roll-off modes. This allows switching between the following modes:
+  \begin{itemize}
+    \item "Sharp"
+    \item "Slow"
+    \item "Short"
+    \item "Bypass"
+  \end{itemize}
 }
 
 \opt{dac_power_mode}{
diff --git a/manual/getting_started/hibyos_nativeinstall.tex b/manual/getting_started/hibyos_nativeinstall.tex
new file mode 100644
index 0000000000..a5c4f07fed
--- /dev/null
+++ b/manual/getting_started/hibyos_nativeinstall.tex
@@ -0,0 +1,64 @@
+We will install the bootloader with the original firmware's recovery
+mode. The process is summed up as the following:
+
+\begin{itemize}
+  \item Determine what hardware version your player is and download
+    the correct bootloader update file
+  \item Place the bootloader \fname{update.upt} file on the SD card
+  \item In the original firmware, run the Firmware Update: \\
+    \fname{System Settings --> Firmware Update}
+\end{itemize}
+
+\subsubsection{Determine hardware version}\label{ref:determine_hardware_version}
+Determine what hardware version your player is. Go to \fname{System Settings --> About The Player --> Version} and reference
+the list below. hw1, hw1.5, and hw2 players all use the same update
+file (with one exception), while hw3 players use a different one.
+
+\note{Important: If your player's version is not contained in this list,
+for example if the firmware version is newer than what is listed here,
+we cannot be sure that the hardware is the same. The best thing to do is
+contact the manufacturer and ask them two things: (1) for an update file
+of your version, and (2) if a player with the most recent version listed
+here can be upgraded to the firmware version on your player. If they say
+yes, we can be more certain that the hardware has not changed. These lists
+may not be the most up to date, please see the wiki page at
+\url{https://www.rockbox.org/wiki/AIGOErosQK} for the most up-to-date list.}
+
+\begin{description}
+\item[hw1/hw1.5/hw2 players]
+  \begin{itemize}
+    \item Aigo Eros Q V1.8 - V2.0
+    \item Hifiwalker H2 V1.1 - V1.6
+    \item Surfans F20 V2.2 - V2.7
+  \end{itemize}
+  These players use \fname{erosqnative-hw1hw2-erosq.upt} as the update file.
+  The lone exception is the Hifiwalker H2 V1.3, which uses the update file
+  \fname{erosqnative-hw1hw2-eros\_h2.upt}.
+\item[hw3 players]
+  \begin{itemize}
+    \item Aigo Eros Q V2.1
+    \item Hifiwalker H2 V1.7 - V1.8
+    \item Surfans F20 V3.0 - V3.3
+  \end{itemize}
+
+  These players use \fname{erosqnative-hw3-erosq.upt} as the update file.
+\end{description}
+
+Download the \fname{.upt} file for these players from \download{bootloader/aigo/native/}.
+
+\note{All players use the same Rockbox build, only the bootloader is different.}
+
+\subsubsection{Place update file on SD card}\label{ref:place_on_sd_card}
+Place the appropriate bootloader file on the root of the SD card and name it
+\emph{exactly} \fname{update.upt}.
+
+\note{This is a good time to ensure that your Rockbox installation \fname{.rockbox}
+is present on your SD card.}
+
+Don't forget to safely eject/unmount your player.
+
+\subsubsection{Run Firmware Update}\label{ref:run_firmware_update}
+In the original firmware, run the firmware updater by going to
+\fname{System Settings --> Firmware Update}. At this point, you can delete
+\fname{update.upt} from the SD card if you wish. \emph{Do not delete .rockbox,
+this is your Rockbox installation and needs to stay there!}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 661964dd8a..b59a4e1f38 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -118,6 +118,15 @@ of before installing.
 \begin{description}
   \item[Filesystem support.] Rockbox only supports the FAT32 filesystem. Other
     filesystems such as exFAT or NTFS are not supported.
+    \opt{erosqnative}{
+      \note{Many SD cards come with exFAT on them from the
+            factory. The original firmware can be used to reformat them to FAT
+            by going to: \fname{System Settings --> Reset --> Format TF Card}.}
+      \note{The SD card that sometimes come bundled with these players are usually
+      of substandard quality and are not to be trusted. It is recommended to source
+      a card of a reputable brand, from a reputable source, such as direct from
+      the manufacturer.}
+    }
   \item[USB DAC.] This feature is not supported by Rockbox, but you can
     dual-boot the original firmware if you want to use it.
   \opt{shanlingq1,agptekrocker,xduoox3ii,xduoox20,aigoerosq,erosqnative}{\item[Wireless.] There is no support for Bluetooth\opt{shanlingq1}{ or WiFi}.
@@ -545,7 +554,8 @@ by Rockbox, in the main directory of your \daps{} drive.
         \opt{samsungyh}{\input{getting_started/samsungyh_install.tex}}
         \opt{xduoox3}{\input{getting_started/xduoox3_install.tex}}
         \opt{xduoox3ii,xduoox20,agptekrocker,aigoerosq}{\input{getting_started/hibyos_install.tex}}
-        \opt{fiiom3k,shanlingq1,erosqnative}{\input{getting_started/jztool_install.tex}}
+        \opt{fiiom3k,shanlingq1}{\input{getting_started/jztool_install.tex}}
+        \opt{erosqnative}{\input{getting_started/hibyos_nativeinstall.tex}}
     }
 }
 
@@ -807,9 +817,9 @@ completely follow the manual uninstallation instructions below.}}
     \playerman{} firmware.
 }
 
-\opt{fiiom3k,shanlingq1,erosqnative}{
+\opt{fiiom3k,shanlingq1}{
     If you want to remove the Rockbox bootloader, copy an original firmware
-    update to your microSD card and run the \playerman{} update by 
+    update to your microSD card and run the \playerman{} update by
     \opt{erosqnative}{running it from the Original Firmware's System Settings menu.}
     \nopt{erosqnative}{holding \ActionBootOFRecovery{} while powering on the \dap{}.}
 
@@ -821,6 +831,19 @@ completely follow the manual uninstallation instructions below.}}
     and enter the recovery menu -- see \reference{ref:jztool_load_bootloader}.
 }
 
+\opt{erosqnative}{
+    If you want to remove the Rockbox bootloader, you will need to acquire the correct
+    update file for your brand player and original firmware version number. The
+    uninstallation procedure can then be done as follows:
+
+    \begin{itemize}
+      \item If the update file is unmodified, use \fname{tools/hibyos\_nativepatcher/hibyos\_nativepatcher.sh} to mark the original bootloader for updating
+      \item Place the update file on the SD card and ensure it is named \emph{exactly} \fname{update.upt}
+      \item Boot into the Rockbox bootloader menu: With the player off, hold \ButtonVolUp{} + \ButtonPower{}
+      \item Select "Aigo Recovery"
+    \end{itemize}
+}
+
 \nopt{gigabeats}{
   If you wish to clean up your disk, you may also wish to delete the
   \fname{.rockbox} directory and its contents.
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 3c3e6d2df8..ea34b5ba9e 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -137,6 +137,21 @@ There is no option to turn off database completely. If you do not want
 to use it just do not do the initial build of the database and do not load it
 to RAM.}%
 
+If your total amount of music tracks exceeds the value of the
+\setting{Max Playlist Size} setting (\setting{Settings $\rightarrow$ General
+Settings $\rightarrow$ System $\rightarrow$ Limits}), using the database
+will be your only way to shuffle between all songs from your music library.
+Any view on the database browser that exceeds the maximum value of this option
+will be automatically adjusted and randomized to fit into the available space
+when you will create a dynamic playlist from the view.
+Using the database browser is recommended if you shuffle regularly between a lot of
+songs rather than increasing your limit, so you will get the best possible performance
+on this action.
+
+\note{For your convenience, a shortcut button "Shuffle Songs" is available directly
+from the \setting{Database} menu to create and start a mix with all of your
+existing music tracks.}
+
 \begin{table}
   \begin{rbtabular}{.75\textwidth}{XXX}%
   {\textbf{Tag}   & \textbf{Type}  & \textbf{Origin}}{}{}
diff --git a/tools/builds.pm b/tools/builds.pm
index 8efd22bbdf..0b7c768888 100644
--- a/tools/builds.pm
+++ b/tools/builds.pm
@@ -474,16 +474,17 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'fiiom3k' => {
         name => 'FiiO M3K',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'aigoerosq' => {
         name => 'AIGO EROS Q / K (Hosted)',
-        status => 2,
+        status => 2,  # Do we promote this to stable?
     },
     'erosqnative' => {
         name => 'AIGO EROS Q / K (Native)',
-        status => 2,
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
     'ihifi770' => {
         name => 'Xuelin iHIFI 770',
@@ -499,8 +500,8 @@ $releasenotes="/wiki/ReleaseNotes315";
     },
     'shanlingq1' => {
         name => 'Shanling Q1',
-        status => 2,
-        manualok => 1, # Remove once status moves to 3
+        status => 3,
+        release => '4.0',  # Remove once 4.0 lands
     },
 );
 
diff --git a/tools/configure b/tools/configure
index 8698c6a38d..43f119ae17 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1676,6 +1676,8 @@ cat <<EOF
  ==AIGO==                 244) M3K Linux
  245) Eros Q / K          246) M3K baremetal     ==Shanling==
  247) Eros Q / K native                          260) Q1
+ 248) Eros Q / K native v3 
+      (GC9A01 LCD Controller)
 EOF
 
   buildfor=`input`;
@@ -4190,8 +4192,39 @@ fi
     t_cpu="mips"
     t_manufacturer="ingenic_x1000"
     t_model="erosqnative"
+    # player version, for bootloader usage
+    # versions 1 and 2 both use 1
+    extradefines="$extradefines -DEROSQN_VER=1"
     ;;
 
+    248|erosqnative_v3)
+    target_id=117
+    modelname="erosqnative_v3"
+    target="EROS_QN"
+    memory=32
+    mipsr2elcc
+    appextra="recorder:gui"
+    plugins="yes"
+    tool="$rootdir/tools/scramble -add=erosqnative "
+    boottool="$rootdir/tools/mkspl-x1000 -type=nand -ppb=2 -bpp=2 "
+    output="rockbox.erosq"
+    bootoutput="bootloader.erosq"
+    sysfontbl="16-Terminus"
+    # toolset is the tools within the tools directory that we build for
+    # this particular target.
+    toolset="$x1000tools"
+    bmp2rb_mono="$rootdir/tools/bmp2rb -f 0"
+    bmp2rb_native="$rootdir/tools/bmp2rb -f 4"
+    # architecture, manufacturer and model for the target-tree build
+    t_cpu="mips"
+    t_manufacturer="ingenic_x1000"
+    t_model="erosqnative"
+    # player version, for bootloader usage
+    # version 3
+    extradefines="$extradefines -DEROSQN_VER=3"
+    ;;
+
+
    *)
     echo "Please select a supported target platform!"
     exit 7
diff --git a/tools/hibyos_nativepatcher/hibyos_nativepatcher.sh b/tools/hibyos_nativepatcher/hibyos_nativepatcher.sh
new file mode 100755
index 0000000000..3c6661863f
--- /dev/null
+++ b/tools/hibyos_nativepatcher/hibyos_nativepatcher.sh
@@ -0,0 +1,221 @@
+#!/bin/bash
+# hibyos_nativepatcher.sh
+#
+# NOTE: THIS SCRIPT IS NOT TOLERANT OF WHITESPACE IN FILENAMES OR PATHS
+
+usage="hibyos_nativepatcher.sh
+    
+    USAGE: 
+    
+    hibyos_nativepatcher.sh <mkrbinstall/mkstockuboot> [arguments depend on mode, see below]
+
+    hibyos_nativepatcher.sh mkrbinstall <OFVERNAME (erosq or eros_h2)>
+        <path/to/output> <path/to/bootloader.erosq> <HWVER (hw1hw2 or hw3)> 
+        Output file will be path/to/output/erosqnative_RBVER-HWVER-OFVERNAME.upt.
+        Only the Hifiwalker H2 v1.3 uses "eros_h2", everything else uses "erosq".
+
+    hibyos_nativepatcher.sh mkstockuboot <path/to/OFupdatefile.upt>
+        Output file will be path/to/OFupdatefile-rbuninstall.upt.
+    
+    NOTE: THIS SCRIPT IS NOT TOLERANT OF WHITESPACE IN FILENAMES OR PATHS!"
+
+# check OS type and for any needed tools
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo "$OSTYPE DETECTED"
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    echo "$OSTYPE DETECTED"
+    if !(which 7z > /dev/null); then
+        echo "PLEASE INSTALL 7z (usually part of p7zip-full package)"
+        exit 1
+    fi
+    if !(which genisoimage > /dev/null); then
+        echo "PLEASE INSTALL genisoimage"
+        exit 1
+    fi
+else
+    echo "SCRIPT NOT IMPLEMENTED ON $OSTYPE YET!"
+    exit 1
+fi
+
+# make sure we can find patch_manifest
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+if !(which $SCRIPT_DIR/patch_manifest.pl > /dev/null); then
+    echo "couldn't find patch_manifest.pl!"
+    exit 1
+fi
+
+###########################################################################
+# MKRBINSTALL
+###########################################################################
+if [[ "$1" == "mkrbinstall" ]]; then
+    echo "Creating installation image from bootloader file..."
+
+    # make sure all arguments are accounted for...
+    if [[ -z "$5" ]]; then
+        echo "not all parameters included, please see usage:"
+        echo "$usage"
+        exit 1
+    fi
+
+    # validate arguments
+    outputdir=$(realpath --relative-base=$(pwd) $3)
+    if !(ls $outputdir >& /dev/null); then
+        echo "directory $outputdir doesn't seem to exist. Please make sure it exists, then re-run hibyos_nativepatcher.sh."
+        exit 1
+    fi
+
+    # note, bootloaderfile might still be a valid path, but not a valid bootloader file... check to make sure tar can extract it okay.
+    bootloaderfile=$(realpath --relative-base=$(pwd) $4)
+    if !(ls $bootloaderfile >& /dev/null); then
+        echo "bootloader file $bootloaderfile doesn't seem to exist. Please make sure it exists, then re-run hibyos_nativepatcher.sh."
+        exit 1
+    fi
+
+    # make working directory...
+    mkdir $outputdir/working_dir
+    workingdir=$(realpath $outputdir/working_dir)
+    mkdir $workingdir/bootloader
+
+    # extract bootloader file
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        # macos
+        tar -xvf $bootloaderfile --cd $workingdir/bootloader
+    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        # linux-gnu
+        tar -xvf $bootloaderfile -C $workingdir/bootloader
+    fi
+
+    # make sure we got what we wanted
+    if !(ls $workingdir/bootloader/bootloader.ucl >& /dev/null); then
+        echo "can't find bootloader.ucl! help!"
+        rm -rf $workingdir
+        exit 1
+    elif !(ls $workingdir/bootloader/spl.erosq >& /dev/null); then
+        echo "can't find spl.erosq! help!"
+        rm -rf $workingdir
+        exit 1
+    fi
+
+    bootver=$(cat $workingdir/bootloader/bootloader-info.txt)
+    if [ -z "$bootver" ]; then
+        echo "COULDN'T FIND BOOTLOADER-INFO!"
+        rm -rf $workingdir
+        exit 1
+    fi
+
+    # if uboot.bin already exists, something is weird.
+    if (ls $workingdir/image_contents/uboot.bin >& /dev/null); then
+        echo "$workingdir/image_contents/uboot.bin already exists, something went weird."
+        rm -rf $workingdir
+        exit 1
+    fi
+
+    # everything exists, make the bin
+    mkdir $workingdir/image_contents/
+    touch $workingdir/image_contents/uboot.bin
+    echo "PATCHING!"
+    dd if=$workingdir/bootloader/spl.erosq of=$workingdir/image_contents/uboot.bin obs=1 seek=0 conv=notrunc
+    dd if=$workingdir/bootloader/bootloader.ucl of=$workingdir/image_contents/uboot.bin obs=1 seek=26624 conv=notrunc
+
+    # create update.txt
+    md5=($(md5sum $workingdir/image_contents/uboot.bin))
+    if [ -z "$md5" ]; then
+        echo "COULDN'T MD5SUM UBOOT.BIN!"
+        rm -rf $workingdir
+        exit 1
+    fi
+    echo "Create update manifest with md5sum $md5"
+    echo "" > $workingdir/image_contents/update.txt
+    $SCRIPT_DIR/patch_manifest.pl $md5 $workingdir/image_contents/update.txt
+
+    # create version.txt
+    echo "version={
+        name=$2
+        ver=2024-09-10T14:42:18+08:00
+}" > $workingdir/image_contents/version.txt
+
+    outputfilename="erosqnative_$bootver-$5-$2"
+
+
+###########################################################################
+# MKSTOCKUBOOT
+###########################################################################
+elif [[ "$1" == "mkstockuboot" ]]; then
+    echo "Creating uninstallation image from stock update image..."
+
+    # make sure all arguments are accounted for...
+    if [[ -z "$2" ]]; then
+        echo "not all parameters included, please see usage:"
+        echo "$usage"
+        exit 1
+    fi
+
+    updatefile=$(realpath --relative-base=$(pwd) $2)
+    updatefile_path=$(echo "$updatefile" | perl -ne "s/\/[\w\.\_\-]*$// && print")
+    updatefile_name=$(basename $updatefile)
+    updatefile_name_noext=$(echo "$updatefile_name" | perl -ne "s/\.\w*$// && print")
+    outputdir=$updatefile_path
+    outputfilename="$updatefile_name_noext-rbuninstall"
+
+    mkdir $updatefile_path/working_dir
+    workingdir=$(realpath $updatefile_path/working_dir)
+
+    # copy update.upt to update.iso
+    cp $updatefile $workingdir/$updatefile_name_noext-cpy.iso
+
+    mkdir $workingdir/image_contents
+
+    # extract iso
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        # macos
+        hdiutil attach $workingdir/$updatefile_name_noext-cpy.iso -mountpoint $workingdir/contentsiso
+
+        # copy out iso contents
+        cp $workingdir/contentsiso/* $workingdir/image_contents
+
+        # unmount iso
+        hdiutil detach $workingdir/contentsiso
+    elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+        # linux-gnu
+        7z -o$workingdir/image_contents x $workingdir/$updatefile_name_noext-cpy.iso
+    fi
+
+    chmod 777 $workingdir/image_contents/*
+
+    # modify update.txt
+    md5=($(md5sum $workingdir/image_contents/uboot.bin))
+    if [ -z "$md5" ]; then
+        echo "COULDN'T MD5SUM UBOOT.BIN!"
+        rm -rf $working_dir
+        exit 1
+    fi
+    echo "add to update manifest with md5sum $md5"
+    $SCRIPT_DIR/patch_manifest.pl $md5 $workingdir/image_contents/update.txt
+
+######################################################################
+# PRINT USAGE
+######################################################################
+else
+    echo "$usage"
+    exit 1
+fi
+
+######################################################################
+# Common: make the image
+######################################################################
+# make the image
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    # macos
+    hdiutil makehybrid -iso -joliet -o $outputdir/output.iso $workingdir/image_contents/
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    # linux-gnu
+    genisoimage -o $outputdir/output.iso $workingdir/image_contents/
+fi
+
+# rename
+mv $outputdir/output.iso $outputdir/$outputfilename.upt
+
+# cleaning up
+rm -rf $workingdir
+
+exit 0
diff --git a/tools/hibyos_nativepatcher/patch_manifest.pl b/tools/hibyos_nativepatcher/patch_manifest.pl
new file mode 100755
index 0000000000..82c6378c65
--- /dev/null
+++ b/tools/hibyos_nativepatcher/patch_manifest.pl
@@ -0,0 +1,27 @@
+#!/usr/bin/perl
+# add bootloader info to update manifest
+# usage: ./patch_manifest.pl <md5sum> <path/to/update.txt>
+
+my $md5 = $ARGV[0];
+my $updatefile = $ARGV[1];
+my $bootloader_manif =
+"bootloader={
+        name=uboot
+        file_path=autoupdate/uboot.bin
+        md5=$md5
+}\n";
+
+# read in existing manifest
+open(FH, '<', "$updatefile");
+read(FH, my $manifest, -s FH);
+close(FH);
+
+# delete existing bootloader entry if exists
+$manifest =~ s/bootloader\s*=\s*{[^}]*}//;
+
+# add our own bootloader entry
+$manifest = "$bootloader_manif$manifest";
+
+open(FH, '>', "$updatefile");
+print FH $manifest;
+close(FH);
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh
index 63b1a1f5a1..f8e9ab2140 100755
--- a/tools/rockboxdev.sh
+++ b/tools/rockboxdev.sh
@@ -378,8 +378,14 @@ buildtool() {
             $config_opt
     elif [ "$config_opt" != "NO_CONFIGURE" ]; then
         echo "ROCKBOXDEV: $toolname/configure"
+        cflags='-U_FORTIFY_SOURCE -fgnu89-inline -O2'
+        if [ "$tool" == "glib" ]; then
+            run_cmd "$logfile" sed -i -e 's/m4_copy/m4_copy_force/g' "$cfg_dir/m4macros/glib-gettext.m4"
+            run_cmd "$logfile" autoreconf -fiv "$cfg_dir"
+            cflags="$cflags -Wno-format-nonliteral -Wno-format-overflow"
+        fi
         # NOTE glibc requires to be compiled with optimization
-        CFLAGS='-U_FORTIFY_SOURCE -fgnu89-inline -O2' CXXFLAGS="$CXXFLAGS" run_cmd "$logfile" \
+        CFLAGS="$cflags" CXXFLAGS="$CXXFLAGS" run_cmd "$logfile" \
             "$cfg_dir/configure" "--prefix=$prefix" \
             --disable-docs $config_opt
     fi
diff --git a/tools/updatelang b/tools/updatelang
index 28f259bdbb..1fb594d596 100755
--- a/tools/updatelang
+++ b/tools/updatelang
@@ -402,9 +402,9 @@ foreach my $id (@langorder) {
 
         my $sane = $lang{$id}{'dest'}{$tgt};
         $sane =~ s/^~?(.*)/$1/;  # Strip off leading ~ if it's there as it's not a legal character otherwise
-        if ($sane =~ tr/"~//) {
+        if ($sane =~ tr/"~<>//) {
             # If it has suspicious characters that are not allowed
-            $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has some suspicious characters (eg '~'), please double-check!\n";
+            $lang{$id}{'notes'} .= "### The <dest> section for '$id:$tgt' has some suspicious characters (eg \",~,<,>), please double-check!\n";
 #           print "#!! '$id:$tgt' suspicious characters\n";
         }
     }
@@ -476,9 +476,9 @@ foreach my $id (@langorder) {
         }
         my $sane = $lang{$id}{'voice'}{$tgt};
         $sane =~ s/^~?(.*)/$1/;  # Strip off leading ~ if it's there as it's not a legal character otherwise
-        if ($sane =~ tr/%"~://) {
+        if ($sane =~ tr/%"~:\[\]<>{}//) {
             # Suspicious characters that are not typically voiced..
-            $lang{$id}{'notes'} .= "### The <voice> section for '$id:$tgt' has some suspicious characters (eg '%' or '~' or ':'), please correct!\n";
+            $lang{$id}{'notes'} .= "### The <voice> section for '$id:$tgt' has some suspicious characters (eg %,\",~,:,<,>,[,],{,}), please correct!\n";
 #            print "#!! '$id:$tgt' suspicious characters\n";
         }
         if ($lang{$id}{'voice'}{$tgt} =~ /\.\.\./) {
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index bce7e07227..ba5e2c9908 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -35,6 +35,12 @@
 
 static bool storage_spinning = false;
 
+#if defined(HAVE_DEVICEDATA)
+#include "devicedata.h"
+struct device_data_t device_data =
+    {.length = DEVICE_DATA_PAYLOAD_SIZE};
+#endif /* def HAVE_DEVICEDATA */
+
 int fat_startsector(void)
 {
     return 63;
diff --git a/utils/themeeditor/resources/configkeys b/utils/themeeditor/resources/configkeys
index 67b84b8e68..b4c2d6e105 100644
--- a/utils/themeeditor/resources/configkeys
+++ b/utils/themeeditor/resources/configkeys
@@ -40,6 +40,7 @@ scroll delay
 scroll step
 screen scroll step
 Screen Scrolls Out Of View
+Disable main menu scrolling
 bidir limit
 scroll paginated
 hold_lr_for_scroll_in_list