274 files changed, 59431 insertions, 37616 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 627d7f7bea..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"
@@ -557,14 +561,16 @@ static const char* dbg_partitions_getname(int selected_item, void *data,
     if (!disk_partinfo(partition, &p))
         return buffer;
 
+    // XXX fix this up to use logical sector size
+    // XXX and if mounted, show free info...
     if (selected_item%2)
     {
-        snprintf(buffer, buffer_len, "   T:%x %ld MB", p.type,
-                 p.size / ( 2048 / ( SECTOR_SIZE / 512 )));
+        snprintf(buffer, buffer_len, "   T:%x %llu MB", p.type,
+                 (uint64_t)(p.size / ( 2048 / ( SECTOR_SIZE / 512 ))));
     }
     else
     {
-        snprintf(buffer, buffer_len, "P%d: S:%lx", partition, p.start);
+        snprintf(buffer, buffer_len, "P%d: S:%llx", partition, (uint64_t)p.start);
     }
     return buffer;
 }
@@ -572,7 +578,7 @@ static const char* dbg_partitions_getname(int selected_item, void *data,
 static bool dbg_partitions(void)
 {
     struct simplelist_info info;
-    simplelist_info_init(&info, "Partition Info", NUM_DRIVES * 4, NULL);
+    simplelist_info_init(&info, "Partition Info", NUM_DRIVES * MAX_PARTITIONS_PER_DRIVE, NULL);
     info.selection_size = 2;
     info.scroll_all = true;
     info.get_name = dbg_partitions_getname;
@@ -1343,6 +1349,22 @@ static int disk_callback(int btn, struct gui_synclist *lists)
                     "R2W: *%d", card->r2w_factor);
 #if (CONFIG_STORAGE & STORAGE_SD)
             int csd_structure = card_extract_bits(card->csd, 127, 2);
+            const char *ver;
+            switch(csd_structure) {
+            case 0:
+                    ver = "1 (SD)";
+                    break;
+            case 1:
+                    ver = "2 (SDHC/SDXC)";
+                    break;
+            case 2:
+                    ver = "3 (SDUC)";
+                    break;
+            default:
+                    ver = "Unknown";
+                    break;
+            }
+            simplelist_addline("SDVer: %s\n", ver);
             if (csd_structure == 0) /* CSD version 1.0 */
 #endif
             {
@@ -1407,15 +1429,41 @@ static int disk_callback(int btn, struct gui_synclist *lists)
     buf[8]=0;
     simplelist_addline(
              "Firmware: %s", buf);
-    snprintf(buf, sizeof buf, "%ld MB",
-             ((unsigned long)identify_info[61] << 16 |
-              (unsigned long)identify_info[60]) / 2048 );
+
+    uint64_t total_sectors = identify_info[60] | (identify_info[61] << 16);
+#ifdef HAVE_LBA48
+    if (identify_info[83] & 0x0400
+        && total_sectors == 0x0FFFFFFF)
+        total_sectors = identify_info[100] | (identify_info[101] << 16) | ((uint64_t)identify_info[102] << 32) | ((uint64_t)identify_info[103] << 48);
+#endif
+
+    uint32_t sector_size;
+
+    /* Logical sector size > 512B ? */
+    if ((identify_info[106] & 0xd000) == 0x5000)
+        sector_size = identify_info[117] | (identify_info[118] << 16);
+    else
+        sector_size = SECTOR_SIZE;
+
+    total_sectors *= sector_size;   /* Convert to bytes */
+    total_sectors /= (1024 * 1024); /* Convert to MB */
+
+    simplelist_addline("Size: %llu MB", total_sectors);
+    simplelist_addline("Logical sector size: %u B", sector_size);
+
+    if((identify_info[106] & 0xe000) == 0x6000)
+        sector_size *= BIT_N(identify_info[106] & 0x000f);
     simplelist_addline(
-             "Size: %s", buf);
-    unsigned long free;
+            "Physical sector size: %d B", sector_size);
+
+#ifndef HAVE_MULTIVOLUME
+    // XXX this needs to be fixed for multi-volume setups
+    sector_t free;
     volume_size( IF_MV(0,) NULL, &free );
     simplelist_addline(
-             "Free: %ld MB", free / 1024);
+             "Free: %llu MB", free / 1024);
+#endif
+
     simplelist_addline("SSD detected: %s", ata_disk_isssd() ? "yes" : "no");
     simplelist_addline(
              "Spinup time: %d ms", storage_spinup_time() * (1000/HZ));
@@ -1452,11 +1500,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
         simplelist_addline(
                  "No timing info");
     }
-    int sector_size = 512;
-    if((identify_info[106] & 0xe000) == 0x6000)
-        sector_size *= BIT_N(identify_info[106] & 0x000f);
-    simplelist_addline(
-            "Physical sector size: %d", sector_size);
+
 #ifdef HAVE_ATA_DMA
     if (identify_info[63] & (1<<0)) {
         simplelist_addline(
@@ -1751,8 +1795,8 @@ static int disk_callback(int btn, struct gui_synclist *lists)
     simplelist_addline("Model: %s", info.product);
     simplelist_addline("Firmware: %s", info.revision);
     simplelist_addline(
-             "Size: %ld MB", info.num_sectors*(info.sector_size/512)/2024);
-    unsigned long free;
+            "Size: %lld MB", (uint64_t)(info.num_sectors*(info.sector_size/512)/2048));
+    sector_t free;
     volume_size( IF_MV(0,) NULL, &free );
     simplelist_addline(
              "Free: %ld MB", free / 1024);
@@ -1771,13 +1815,13 @@ static bool dbg_identify_info(void)
         const unsigned short *identify_info = ata_get_identify();
 #ifdef ROCKBOX_LITTLE_ENDIAN
         /* this is a pointer to a driver buffer so we can't modify it */
-        for (int i = 0; i < SECTOR_SIZE/2; ++i)
+        for (int i = 0; i < ATA_IDENTIFY_WORDS; ++i)
         {
             unsigned short word = swap16(identify_info[i]);
             write(fd, &word, 2);
         }
 #else
-        write(fd, identify_info, SECTOR_SIZE);
+        write(fd, identify_info, ATA_IDENTIFY_WORDS*2);
 #endif
         close(fd);
     }
@@ -2585,8 +2629,35 @@ 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 10 // 9 on iPod Classic/6G
+#define SYSCFG_MAX_ENTRIES 9 // 9 on iPod Classic/6G
 
 static bool dbg_syscfg(void) {
     struct simplelist_info info;
@@ -2607,8 +2678,7 @@ static bool dbg_syscfg(void) {
         return simplelist_show_list(&info);
     }
 
-    simplelist_addline("Total size: %u bytes", syscfg_hdr.size);
-    simplelist_addline("Entries: %u", syscfg_hdr.num_entries);
+    simplelist_addline("Total size: %u bytes, %u entries", syscfg_hdr.size, syscfg_hdr.num_entries);
 
     size_t calculated_syscfg_size = syscfg_hdr_size + syscfg_entry_size * syscfg_hdr.num_entries;
 
@@ -2619,7 +2689,7 @@ static bool dbg_syscfg(void) {
     }
 
     if (syscfg_hdr.num_entries > SYSCFG_MAX_ENTRIES) {
-        simplelist_addline("Too many entries, showing first %u", syscfg_hdr.num_entries);
+        simplelist_addline("Too many entries, showing only first %u", SYSCFG_MAX_ENTRIES);
     }
 
     size_t syscfg_num_entries = MIN(syscfg_hdr.num_entries, SYSCFG_MAX_ENTRIES);
@@ -2784,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/fileop.c b/apps/fileop.c
index 35bd9f2241..bcd5202cf4 100644
--- a/apps/fileop.c
+++ b/apps/fileop.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include "string-extra.h"
 #include "debug.h"
+#include "powermgmt.h"
 
 #include "misc.h"
 #include "plugin.h"
@@ -44,10 +45,14 @@
 struct file_op_params
 {
     char   path[MAX_PATH]; /* Buffer for full path */
+    const char*  toplevel_name;
     bool   is_dir;
     int    objects;        /* how many files and subdirectories*/
     int    processed;
+    unsigned long long total_size;
+    unsigned long long processed_size;
     size_t append;         /* Append position in 'path' for stack push */
+    size_t extra_len;      /* Length added by dst path compared to src */
 };
 
 static int prompt_name(char* buf, size_t bufsz)
@@ -61,28 +66,52 @@ static int prompt_name(char* buf, size_t bufsz)
     return FORC_UNKNOWN_FAILURE;
 }
 
-static bool poll_cancel_action(const char *path, int operation, int current, int total)
+static bool poll_cancel_action(int operation, struct file_op_params *param)
 {
-    const char *op_str = "";
+    static unsigned long last_tick;
 
-    clear_screen_buffer(false);
-
-    if (operation == FOC_COPY)
-        op_str = str(LANG_COPYING);
-    else if (operation == FOC_MOVE)
-        op_str = str(LANG_MOVING);
-    else if (operation == FOC_COUNT)
-        op_str = str(LANG_SCANNING_DISK);
-    else if (operation == FOC_DELETE)
-        op_str = str(LANG_DELETING);
-
-    path_basename(path, &path);
-
-    if (total <= 0)
-        splashf(0, "%s (%d) %s", op_str, current, path);
+    if (operation == FOC_COUNT)
+    {
+        if (param->objects <= 1)
+            last_tick = current_tick;
+        else if (TIME_AFTER(current_tick, last_tick + HZ/2))
+        {
+            clear_screen_buffer(false);
+            splashf(0, "%s (%d)", str(LANG_SCANNING_DISK), param->objects);
+            last_tick = current_tick;
+        }
+    }
     else
-        splash_progress(current, total, "%s %s", op_str, path);
+    {
+        const char *op_str = (operation == FOC_DELETE) ? str(LANG_DELETING) :
+                             (operation == FOC_COPY) ? str(LANG_COPYING) :
+                             str(LANG_MOVING); 
 
+        if ((operation == FOC_DELETE || !param->total_size) &&
+            param->objects > 0)
+        {
+            splash_progress(param->processed, param->objects,
+                            "%s %s", op_str, param->toplevel_name);
+        }
+        else if (param->total_size >= 10 * 1024 * 1024)
+        {
+            int total_shft = (int) (param->total_size >> 15);
+            int current_shft = (int) (param->processed_size >> 15);
+            splash_progress(current_shft, total_shft,
+                            "%s %s (%d MiB)\n%d MiB",
+                            op_str, param->toplevel_name,
+                            total_shft >> 5, current_shft >> 5);
+        }
+        else if (param->total_size >= 1024)
+        {
+            int total_kib = (int) (param->total_size >> 10);
+            int current_kib = (int) (param->processed_size >> 10);
+            splash_progress(current_kib, total_kib,
+                            "%s %s (%d KiB)\n%d KiB",
+                            op_str, param->toplevel_name,
+                            total_kib, current_kib);
+        }
+    }
     return ACTION_STD_CANCEL == get_action(CONTEXT_STD, TIMEOUT_NOBLOCK);
 }
 
@@ -94,13 +123,21 @@ static void init_file_op(struct file_op_params *param,
     if (selected_file == NULL)
     {
         param->append = strlcpy(param->path, basename, sizeof (param->path));
+        path_basename(basename, &basename);
+        param->toplevel_name = basename;
     }
     else
+    {
         param->append = path_append(param->path, basename,
                                     selected_file, sizeof (param->path));
+        param->toplevel_name = selected_file;
+    }
     param->is_dir = dir_exists(param->path);
+    param->extra_len = 0;
     param->objects = 0; /* how many files and subdirectories*/
     param->processed = 0;
+    param->total_size = 0;
+    param->processed_size = 0;
 }
 
 /* counts file objects, deletes file objects */
@@ -156,7 +193,7 @@ static int directory_fileop(struct file_op_params *param, enum file_op_current f
                 rc = directory_fileop(param, fileop); /* recursion */
             } else {
                 /* remove a file */
-                if (poll_cancel_action(param->path, FOC_DELETE, param->processed, param->objects))
+                if (poll_cancel_action(FOC_DELETE, param))
                 {
                     rc = FORC_CANCELLED;
                     break;
@@ -167,8 +204,15 @@ static int directory_fileop(struct file_op_params *param, enum file_op_current f
         else /* count objects */
         {
             param->objects++;
+            param->total_size += info.size;
+
+            if (poll_cancel_action(FOC_COUNT, param))
+            {
+                rc = FORC_CANCELLED;
+                break;
+            }
 
-            if (param->append >= sizeof (param->path)) {
+            if (param->append + param->extra_len >= sizeof (param->path)) {
                 rc = FORC_PATH_TOO_LONG;
                 break; /* no space left in buffer */
             }
@@ -176,12 +220,6 @@ static int directory_fileop(struct file_op_params *param, enum file_op_current f
             if (info.attribute & ATTR_DIRECTORY) {
                 /* enter subdirectory */
                 rc = directory_fileop(param, FOC_COUNT); /* recursion */
-            } else {
-                if (poll_cancel_action(param->path, FOC_COUNT, param->objects, 0))
-                {
-                    rc = FORC_CANCELLED;
-                    break;
-                }
             }
         }
         param->append = append; /* other functions may use param, reset append */
@@ -193,7 +231,7 @@ static int directory_fileop(struct file_op_params *param, enum file_op_current f
 
     if (fileop == FOC_DELETE && rc == FORC_SUCCESS) {
         /* remove the now empty directory */
-        if (poll_cancel_action(param->path, FOC_DELETE, param->processed, param->objects))
+        if (poll_cancel_action(FOC_DELETE, param))
         {
             rc = FORC_CANCELLED;
         } else {
@@ -216,28 +254,25 @@ static int check_count_fileobjects(struct file_op_params *param)
 }
 
 /* Attempt to just rename a file or directory */
-static int move_by_rename(const char *src_path,
+static int move_by_rename(struct file_op_params *src,
                           const char *dst_path,
                           unsigned int *pflags)
 {
     unsigned int flags = *pflags;
     int rc = FORC_UNKNOWN_FAILURE;
+    reset_poweroff_timer();
     if (!(flags & (PASTE_COPY | PASTE_EXDEV))) {
         if ((flags & PASTE_OVERWRITE) || !file_exists(dst_path)) {
             /* Just try to move the directory / file */
-            if (poll_cancel_action(src_path, FOC_MOVE, 0 , 0)) {
-                rc = FORC_CANCELLED;
-            } else {
-                rc = rename(src_path, dst_path);
+            rc = rename(src->path, dst_path);
 #ifdef HAVE_MULTIVOLUME
-                if (rc < FORC_SUCCESS && errno == EXDEV) {
-                    /* Failed because cross volume rename doesn't work */
-                    *pflags |= PASTE_EXDEV; /* force a move instead */
-                }
+            if (rc < FORC_SUCCESS && errno == EXDEV) {
+                /* Failed because cross volume rename doesn't work */
+                *pflags |= PASTE_EXDEV; /* force a move instead */
+            }
 #endif /* HAVE_MULTIVOLUME */
              /* if (errno == ENOTEMPTY && (flags & PASTE_OVERWRITE)) {
               * Directory is not empty thus rename() will not do a quick overwrite */
-            }
         }
 
     }
@@ -245,12 +280,16 @@ static int move_by_rename(const char *src_path,
 }
 
 /* Paste a file */
-static int copy_move_file(const char *src_path, const char *dst_path, unsigned int flags)
+static int copy_move_file(struct file_op_params *src, const char *dst_path,
+                          unsigned int flags)
 {
     /* Try renaming first */
-    int rc = move_by_rename(src_path, dst_path, &flags);
+    int rc = move_by_rename(src, dst_path, &flags);
     if (rc == FORC_SUCCESS)
+    {
+        src->total_size = 0; /* switch from counting size to number of items */
         return rc;
+    }
 
     /* See if we can get the plugin buffer for the file copy buffer */
     size_t buffersize;
@@ -268,9 +307,11 @@ static int copy_move_file(const char *src_path, const char *dst_path, unsigned i
 
     buffersize &= ~0x1ff;  /* Round buffer size to multiple of sector size */
 
-    int src_fd = open(src_path, O_RDONLY);
+    int src_fd = open(src->path, O_RDONLY);
     if (src_fd >= 0) {
         off_t src_sz = lseek(src_fd, 0, SEEK_END);
+        if (!src->total_size && !src->processed) /* single file copy */
+            src->total_size = src_sz;
         lseek(src_fd, 0, SEEK_SET);
 
         int oflag = O_WRONLY|O_CREAT;
@@ -289,9 +330,8 @@ static int copy_move_file(const char *src_path, const char *dst_path, unsigned i
             while (rc == FORC_SUCCESS) {
                 if (total_size >= next_cancel_test) {
                     next_cancel_test = total_size + 0x10000;
-                    if (poll_cancel_action(src_path,
-                                        !(flags & PASTE_COPY) ? FOC_MOVE : FOC_COPY,
-                                        total_size, src_sz))
+                    if (poll_cancel_action(!(flags & PASTE_COPY) ?
+                                           FOC_MOVE : FOC_COPY, src))
                     {
                        rc = FORC_CANCELLED;
                        break;
@@ -315,6 +355,7 @@ static int copy_move_file(const char *src_path, const char *dst_path, unsigned i
                 }
 
                 total_size += byteswritten;
+                src->processed_size += byteswritten;
 
                 if (bytesread < (ssize_t)buffersize) {
                     /* EOF with trailing bytes */
@@ -344,7 +385,7 @@ static int copy_move_file(const char *src_path, const char *dst_path, unsigned i
 
     if (rc == FORC_SUCCESS && !(flags & PASTE_COPY)) {
         /* Remove the source file */
-        rc = remove(src_path) * 10;
+        rc = remove(src->path) * 10;
     }
 
     return rc;
@@ -408,9 +449,8 @@ static int copy_move_directory(struct file_op_params *src,
             break;
         }
 
-        if (poll_cancel_action(src->path,
-                                    !(flags & PASTE_COPY) ? FOC_MOVE : FOC_COPY,
-                                    src->processed, src->objects))
+        if (poll_cancel_action(!(flags & PASTE_COPY) ?
+                               FOC_MOVE : FOC_COPY, src))
         {
             rc = FORC_CANCELLED;
             break;
@@ -419,11 +459,12 @@ static int copy_move_directory(struct file_op_params *src,
         DEBUGF("Copy %s to %s\n", src->path, dst->path);
 
         if (info.attribute & ATTR_DIRECTORY) {
+            src->processed_size += info.size;
             /* Copy/move a subdirectory */
             rc = copy_move_directory(src, dst, flags); /* recursion */;
         } else {
             /* Copy/move a file */
-            rc = copy_move_file(src->path, dst->path, flags);
+            rc = copy_move_file(src, dst->path, flags);
         }
 
         /* Remove basenames we added above */
@@ -484,8 +525,12 @@ int copy_move_fileobject(const char *src_path, const char *dst_path, unsigned in
         if (src.is_dir) {
             /* Copy or move a subdirectory */
             /* Try renaming first */
-            rc = move_by_rename(src.path, dst.path, &flags);
+            rc = move_by_rename(&src, dst.path, &flags);
             if (rc < FORC_SUCCESS) {
+                int extra_len = dst.append - src.append;
+                if (extra_len > 0)
+                    src.extra_len = extra_len;
+
                 rc = check_count_fileobjects(&src);
                 if (rc == FORC_SUCCESS) {
                     rc = copy_move_directory(&src, &dst, flags);
@@ -493,7 +538,7 @@ int copy_move_fileobject(const char *src_path, const char *dst_path, unsigned in
             }
         } else {
             /* Copy or move a file */
-            rc = copy_move_file(src_path, dst.path, flags);
+            rc = copy_move_file(&src, dst.path, flags);
         }
 
         cpu_boost(false);
@@ -533,6 +578,12 @@ int delete_fileobject(const char *selected_file)
     if (param.append >= sizeof (param.path))
         return FORC_PATH_TOO_LONG;
 
+    /* Note: delete_fileobject() will happily delete whatever
+     * path is passed (after confirmation) */
+    if (confirm_delete_yesno(param.path) != YESNO_YES) {
+        return FORC_CANCELLED;
+    }
+
     if (param.is_dir) {
         int rc = check_count_fileobjects(&param);
         DEBUGF("%s res: %d, ct: %d, %s", __func__, rc, param.objects, param.path);
@@ -540,15 +591,7 @@ int delete_fileobject(const char *selected_file)
             return rc;
     }
 
-    /* Note: delete_fileobject() will happily delete whatever
-     * path is passed (after confirmation) */
-    if (confirm_delete_yesno(param.path) != YESNO_YES) {
-        return FORC_CANCELLED;
-    }
-
     clear_screen_buffer(true);
-    if (poll_cancel_action(param.path, FOC_DELETE, param.processed, param.objects))
-        return FORC_CANCELLED;
 
     if (param.is_dir) { /* if directory */
         cpu_boost(true);
diff --git a/apps/filetree.c b/apps/filetree.c
index eadb19ea59..6a06fcd5ad 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -348,6 +348,12 @@ int ft_load(struct tree_context* c, const char* tempdir)
             continue;
         }
 
+        if (*c->dirfilter == SHOW_PLUGINS && (dptr->attr & ATTR_DIRECTORY) &&
+            (dptr->attr &
+            (ATTR_HIDDEN | ATTR_SYSTEM | ATTR_VOLUME_ID | ATTR_VOLUME)) != 0) {
+            continue; /* skip non plugin folders */
+        }
+
         /* check for known file types */
         if ( !(dir_attr) )
             dptr->attr |= filetype_get_attr((char *)entry->d_name);
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 85046ead54..c119c4f193 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -51,6 +51,7 @@ void list_draw(struct screen *display, struct gui_synclist *list);
 
 static long last_dirty_tick;
 static struct viewport parent[NB_SCREENS];
+static struct gui_synclist *current_lists;
 
 static bool list_is_dirty(struct gui_synclist *list)
 {
@@ -160,7 +161,6 @@ void gui_synclist_init(struct gui_synclist * gui_list,
     gui_list->nb_items = 0;
     gui_list->selected_item = 0;
     gui_synclist_init_display_settings(gui_list);
-
 #ifdef HAVE_TOUCHSCREEN
     gui_list->y_pos = 0;
 #endif
@@ -586,16 +586,19 @@ bool gui_synclist_keyclick_callback(int action, void* data)
  * loop.
  *
  * The GUI_EVENT_NEED_UI_UPDATE event is registered for in list_do_action_timeout()
- * and unregistered in gui_synclict_do_button(). This is done because
- * if something is using the list UI they *must* be calling those
+ * as a oneshot and current_lists updated. later current_lists is set to NULL
+ * in gui_synclist_do_button() effectively disabling the callback. 
+*  This is done because if something is using the list UI they *must* be calling those
  * two functions in the correct order or the list wont work.
  */
-static struct gui_synclist *current_lists;
-static bool ui_update_event_registered = false;
-static void _lists_uiviewport_update_callback(unsigned short id, void *data)
+
+static void _lists_uiviewport_update_callback(unsigned short id,
+                                              void *data, void *userdata)
 {
     (void)id;
     (void)data;
+    (void)userdata;
+
     if (current_lists)
         gui_synclist_draw(current_lists);
 }
@@ -697,6 +700,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, int *actionptr)
         case ACTION_TREE_PGRIGHT:
             gui_synclist_scroll_right(lists);
             gui_synclist_draw(lists);
+            yield();
             return true;
         case ACTION_TREE_ROOT_INIT:
          /* After this button press ACTION_TREE_PGLEFT is allowed
@@ -724,6 +728,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists, int *actionptr)
             gui_synclist_draw(lists);
             pgleft_allow_cancel = false; /* stop ACTION_TREE_PAGE_LEFT
                                             skipping to root */
+            yield();
             return true;
 /* for pgup / pgdown, we are obliged to have a different behaviour depending
  * on the screen for which the user pressed the key since for example, remote
@@ -769,13 +774,8 @@ int list_do_action_timeout(struct gui_synclist *lists, int timeout)
 /* Returns the lowest of timeout or the delay until a postponed
    scheduled announcement is due (if any). */
 {
-    if (lists != current_lists)
-    {
-        if (!ui_update_event_registered)
-            ui_update_event_registered =
-                    add_event(GUI_EVENT_NEED_UI_UPDATE, _lists_uiviewport_update_callback);
-        current_lists = lists;
-    }
+    add_event_ex(GUI_EVENT_NEED_UI_UPDATE, true, _lists_uiviewport_update_callback, NULL);
+    current_lists = lists;
     if(lists->scheduled_talk_tick)
     {
         long delay = lists->scheduled_talk_tick -current_tick +1;
@@ -944,7 +944,9 @@ bool simplelist_show_list(struct simplelist_info *info)
             old_line_count = simplelist_line_count;
         }
         else if(default_event_handler(action) == SYS_USB_CONNECTED)
+        {
             return true;
+        }
     }
     talk_shutup();
 
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 1ce7fd5026..65f2a0491d 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -219,10 +219,15 @@ static int option_talk(int selected_item, void * data)
 void option_select_next_val(const struct settings_list *setting,
                             bool previous, bool apply)
 {
+    bool repeated = get_action_statuscode(NULL) & ACTION_REPEAT;
+
     int val = 0;
     int *value = setting->setting;
     if (HASFLAG(setting, F_BOOL_SETTING))
     {
+        if (repeated)
+            return;
+
         *(bool*)value = !*(bool*)value;
         if (apply && setting->bool_setting->option_callback)
             setting->bool_setting->option_callback(*(bool*)value);
@@ -236,13 +241,13 @@ void option_select_next_val(const struct settings_list *setting,
         {
             val = *value + info->step;
             if (neg_step ? (val < info->max) : (val > info->max))
-                val = info->min;
+                val = repeated ? *value : info->min;
         }
         else
         {
             val = *value - info->step;
             if (neg_step ? (val > info->min) : (val < info->min))
-                val = info->max;
+                val = repeated ? *value : info->max;
         }
         *value = val;
         if (apply && info->option_callback)
@@ -258,13 +263,13 @@ void option_select_next_val(const struct settings_list *setting,
         {
             val = *value + steps;
             if (val >= max)
-                val = min;
+                val = repeated ? *value :  min;
         }
         else
         {
             val = *value - steps;
             if (val < min)
-                val = max;
+                val = repeated ? *value : max;
         }
         *value = val;
         if (apply)
@@ -277,13 +282,13 @@ void option_select_next_val(const struct settings_list *setting,
         {
             val = *value + 1;
             if (val >= info->count)
-                val = 0;
+                val = repeated ? *value :  0;
         }
         else
         {
             val = *value - 1;
             if (val < 0)
-                val = info->count-1;
+                val = repeated ? *value : info->count-1;
         }
         *value = val;
         if (apply && info->option_callback)
@@ -300,7 +305,11 @@ void option_select_next_val(const struct settings_list *setting,
                   (settings->flags&F_ALLOW_ARBITRARY_VALS &&
                     *value < tbl_info->values[i]))
             {
-                val = tbl_info->values[(i+add)%tbl_info->count];
+                int index = (i+add)%tbl_info->count;
+                if (repeated && ((i == 0 && previous) || (!previous && i == tbl_info->count -1)))
+                    val = *value;
+                else
+                    val = tbl_info->values[index];
                 break;
             }
         }
@@ -504,7 +513,6 @@ bool option_screen(const struct settings_list *setting,
         title = P2STR(option_title);
 
     gui_synclist_set_title(&lists, title, Icon_Questionmark);
-    gui_synclist_set_icon_callback(&lists, NULL);
     if(global_settings.talk_menu)
         gui_synclist_set_voice_callback(&lists, option_talk);
 
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index ba9396ae74..082619432f 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -74,7 +74,7 @@
 static const char* get_codectype(const struct mp3entry* id3)
 {
     if (id3 && id3->codectype < AFMT_NUM_CODECS) {
-        return audio_formats[id3->codectype].label;
+        return get_codec_string(id3->codectype);
     } else {
         return NULL;
     }
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index fb59f820b6..8a3510ea15 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -243,7 +243,13 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
 
 void gui_usb_screen_run(bool early_usb)
 {
-    (void) early_usb;
+#ifdef SIMULATOR /* the sim allows toggling USB fast enough to overflow viewportmanagers stack */
+    static bool in_usb_screen = false;
+    if (in_usb_screen)
+        return;
+    in_usb_screen = true;
+#endif
+
     struct usb_screen_vps_t usb_screen_vps_ar[NB_SCREENS];
 #if defined HAVE_TOUCHSCREEN
     enum touchscreen_mode old_mode = touchscreen_get_mode();
@@ -334,4 +340,7 @@ void gui_usb_screen_run(bool early_usb)
     }
 
     pop_current_activity();
+#ifdef SIMULATOR
+    in_usb_screen = false;
+#endif
 }
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/InvalidVoice_english.talk b/apps/lang/InvalidVoice_english.talk
index e40f227c33..6e54e63129 100644
--- a/apps/lang/InvalidVoice_english.talk
+++ b/apps/lang/InvalidVoice_english.talk
diff --git a/apps/lang/bulgarian.lang b/apps/lang/bulgarian.lang
index 3eb90f5277..8c050e5f08 100644
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
@@ -19,7 +19,7 @@
 # - Nicolay Jordanov
 # - Hristo Kovachev
 # - Vencislav Atanasov
-#- Zahari yurukov <zahari.yurukov@gmail.com>
+# - Zahari Yurukov <zahari.yurukov@gmail.com>
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -143,7 +143,7 @@
     *: "Зареждане..."
   </dest>
   <voice>
-    *: "Зареждане..."
+    *: "Зареждане"
   </voice>
 </phrase>
 <phrase>
@@ -157,7 +157,7 @@
     *: "Зареждане... %d%% готови (%s)"
   </dest>
   <voice>
-    *: ""
+    *: "Зареждане"
   </voice>
 </phrase>
 <phrase>
@@ -171,7 +171,7 @@
     *: "Сканиране на ди�ка..."
   </dest>
   <voice>
-    *: "Сканиране на ди�ка..."
+    *: "Сканиране на ди�ка"
   </voice>
 </phrase>
 <phrase>
@@ -185,7 +185,7 @@
     *: "Изключване..."
   </dest>
   <voice>
-    *: "Изключване..."
+    *: "Изключване"
   </voice>
 </phrase>
 <phrase>
@@ -250,20 +250,16 @@
   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>
     *: "PLAY = Да"
-    archosplayer: "(PLAY/STOP)"
     cowond2*: "MENU или горе л�во = Да"
-    creativezen*: "SELECT = Да"
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Да"
+    creativezen*,gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Да"
     iriverh100,iriverh120,iriverh300: "NAVI = Да"
     mrobe500: "PLAY, POWER или горе д��но = Да"
     vibe500: "OK = Да"
@@ -278,15 +274,12 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
   </source>
   <dest>
     *: "В�еки друг = �е"
-    archosplayer: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -548,20 +541,6 @@
   </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_AUTO_BOOKMARK_QUERY
   desc: prompt for user to decide to create an bookmark
   user: core
@@ -703,7 +682,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Stereo"
@@ -717,7 +696,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Mono"
@@ -999,20 +978,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
@@ -1112,7 +1077,7 @@
 </phrase>
 <phrase>
   id: LANG_DITHERING
-  desc: in the sound settings menu
+  desc: in the sound settings and some other menus
   user: core
   <source>
     *: "Dithering"
@@ -1125,159 +1090,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LOUDNESS
-  desc: in sound_settings
-  user: core
-  <source>
-    *: none
-    masf: "Loudness"
-  </source>
-  <dest>
-    *: none
-    masf: "Сила"
-  </dest>
-  <voice>
-    *: none
-    masf: "Сила"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_AUTOVOL
-  desc: in sound_settings
-  user: core
-  <source>
-    *: none
-    masf: "Auto Volume"
-  </source>
-  <dest>
-    *: none
-    masf: "�втоматична �ила на звука"
-  </dest>
-  <voice>
-    *: none
-    masf: "�втоматична �ила на звука"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_DECAY
-  desc: in sound_settings
-  user: core
-  <source>
-    *: none
-    masf: "AV Decay Time"
-  </source>
-  <dest>
-    *: none
-    masf: "Време на от�лабване на AV"
-  </dest>
-  <voice>
-    *: none
-    masf: "Време на от�лабване на AV"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SUPERBASS
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    masf: "Super Bass"
-  </source>
-  <dest>
-    *: none
-    masf: "Супер ба�"
-  </dest>
-  <voice>
-    *: none
-    masf: "Супер ба�"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MDB_ENABLE
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    masf: "MDB Enable"
-  </source>
-  <dest>
-    *: none
-    masf: "Включване на MDB"
-  </dest>
-  <voice>
-    *: none
-    masf: "Включване на MDB"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MDB_STRENGTH
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    masf: "MDB Strength"
-  </source>
-  <dest>
-    *: none
-    masf: "Сила на MDB"
-  </dest>
-  <voice>
-    *: none
-    masf: "Сила на MDB"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MDB_HARMONICS
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    masf: "MDB Harmonics"
-  </source>
-  <dest>
-    *: none
-    masf: "Хармоници на MDB"
-  </dest>
-  <voice>
-    *: none
-    masf: "Хармоници на MDB"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MDB_CENTER
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    masf: "MDB Centre Frequency"
-  </source>
-  <dest>
-    *: none
-    masf: "Централна че�тота на MDB"
-  </dest>
-  <voice>
-    *: none
-    masf: "Централна че�тота на MDB"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MDB_SHAPE
-  desc: in sound settings
-  user: core
-  <source>
-    *: none
-    masf: "MDB Shape"
-  </source>
-  <dest>
-    *: none
-    masf: "Форма на MDB"
-  </dest>
-  <voice>
-    *: none
-    masf: "Форма на MDB"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_GENERAL_SETTINGS
   desc: in the main menu
   user: core
@@ -1847,10 +1659,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 лог"
@@ -2140,7 +1952,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)"
@@ -2148,14 +1959,13 @@
   </source>
   <dest>
     *: "Изграждане на базата данни...  намерени %d (OFF за връщане)"
-    archosplayer: "Изгр. на БД %d файла"
     gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Изграждане на базата данни...  намерени %d (LEFT за връщане)"
     gogearsa9200: "Изграждане на базата данни...  намерени %d (REW за връщане)"
     ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "Изграждане на базата данни...  намерени %d (PREV за връщане)"
     iriverh100,iriverh120,iriverh300: "Изграждане на базата данни...  намерени %d (STOP за връщане)"
   </dest>
   <voice>
-    *: "Изграждане на базата данни...  намерени запи�и..."
+    *: "намерени запи�и за базата данни"
   </voice>
 </phrase>
 <phrase>
@@ -2424,15 +2234,15 @@
   desc: in lcd settings
   user: core
   <source>
-    *: none
+    *: "Backlight on Lock"
     hold_button: "Backlight on Hold"
   </source>
   <dest>
-    *: none
+    *: "Под�ветка при заключване"
     hold_button: "Под�ветка при закл. клав."
   </dest>
   <voice>
-    *: none
+    *: "Под�ветка при заключване"
     hold_button: "Под�ветка при заключена клавиатура"
   </voice>
 </phrase>
@@ -2520,16 +2330,13 @@
   desc: in lcd settings
   user: core
   <source>
-    *: none
-    lcd_sleep: "Never"
+    *: "Never"
   </source>
   <dest>
-    *: none
-    lcd_sleep: "�икога"
+    *: "�икога"
   </dest>
   <voice>
-    *: none
-    lcd_sleep: "�икога"
+    *: "�икога"
   </voice>
 </phrase>
 <phrase>
@@ -2731,11 +2538,11 @@
   </source>
   <dest>
     *: none
-    lcd_color: "RGB"
+    lcd_color: "ЧЗС"
   </dest>
   <voice>
     *: none
-    lcd_color: "RGB"
+    lcd_color: ""
   </voice>
 </phrase>
 <phrase>
@@ -2769,7 +2576,7 @@
   </dest>
   <voice>
     *: none
-    lcd_color: "�евалиден цв�т"
+    lcd_color: ""
   </voice>
 </phrase>
 <phrase>
@@ -2845,7 +2652,7 @@
     *: "Пример за на�тройката на �коро�тта на �кролиране"
   </dest>
   <voice>
-    *: "Пример за на�тройката на �коро�тта на �кролиране"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2901,7 +2708,7 @@
     *: "Пример за на�тройката на �тъпката на �кролиране"
   </dest>
   <voice>
-    *: "Пример за на�тройката на �тъпката на �кролиране"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -3054,23 +2861,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTON_BAR
-  desc: in settings menu
-  user: core
-  <source>
-    *: none
-    recorder_pad: "Button Bar"
-  </source>
-  <dest>
-    *: none
-    recorder_pad: "Лента � бутони"
-  </dest>
-  <voice>
-    *: none
-    recorder_pad: "Лента � бутони"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_VOLUME_DISPLAY
   desc: Volume type title
   user: core
@@ -3132,15 +2922,12 @@
   user: core
   <source>
     *: "Peak Meter"
-    masd: none
   </source>
   <dest>
     *: "Пик метър"
-    masd: none
   </dest>
   <voice>
     *: "Пик метър"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3149,15 +2936,12 @@
   user: core
   <source>
     *: "Clip Hold Time"
-    masd: none
   </source>
   <dest>
     *: "Задържане на индикатора за �мущени�"
-    masd: none
   </dest>
   <voice>
     *: "Задържане на индикатора за �мущени�"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3166,15 +2950,12 @@
   user: core
   <source>
     *: "Peak Hold Time"
-    masd: none
   </source>
   <dest>
     *: "Задържане на пик индикатора"
-    masd: none
   </dest>
   <voice>
     *: "Задържане на пик индикатора"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3183,15 +2964,12 @@
   user: core
   <source>
     *: "Eternal"
-    masd: none
   </source>
   <dest>
     *: "Вечно"
-    masd: none
   </dest>
   <voice>
     *: "Вечно"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3200,15 +2978,12 @@
   user: core
   <source>
     *: "Peak Release"
-    masd: none
   </source>
   <dest>
     *: "О�вобождаване на пик индикатора"
-    masd: none
   </dest>
   <voice>
     *: "О�вобождаване на пик индикатора"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3217,15 +2992,12 @@
   user: core
   <source>
     *: "Scale"
-    masd: none
   </source>
   <dest>
     *: "Скала"
-    masd: none
   </dest>
   <voice>
     *: "Скала"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3234,15 +3006,12 @@
   user: core
   <source>
     *: "Logarithmic (dB)"
-    masd: none
   </source>
   <dest>
     *: "Логаритмична (dB)"
-    masd: none
   </dest>
   <voice>
     *: "Логаритмична в децибели"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3251,15 +3020,12 @@
   user: core
   <source>
     *: "Linear (%)"
-    masd: none
   </source>
   <dest>
     *: "Линейна (%)"
-    masd: none
   </dest>
   <voice>
     *: "Линейна в проценти"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3268,15 +3034,12 @@
   user: core
   <source>
     *: "Minimum Of Range"
-    masd: none
   </source>
   <dest>
     *: "Минимален обхват"
-    masd: none
   </dest>
   <voice>
     *: "Минимален обхват"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3285,15 +3048,12 @@
   user: core
   <source>
     *: "Maximum Of Range"
-    masd: none
   </source>
   <dest>
     *: "Мак�имален обхват"
-    masd: none
   </dest>
   <voice>
     *: "Мак�имален обхват"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3486,10 +3246,10 @@
     *: "Unicode (UTF-8)"
   </source>
   <dest>
-    *: "Unicode (UTF-8)"
+    *: "Уникод (UTF-8)"
   </dest>
   <voice>
-    *: "Unicode (UTF-8)"
+    *: "Уникод (UTF-8)"
   </voice>
 </phrase>
 <phrase>
@@ -3623,14 +3383,17 @@
   <source>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "�лкална"
+    xduoox3: "�ов модел (2000 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "�лкална"
+    xduoox3: "�ов модел 2000 милиампер ча�а"
   </voice>
 </phrase>
 <phrase>
@@ -3640,14 +3403,17 @@
   <source>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "NiMH "
+    xduoox3: "Стар модел (1500 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "�икел Метал Хидридна"
+    xduoox3: "Стар модел 1500 милиампер ча�а"
   </voice>
 </phrase>
 <phrase>
@@ -3837,7 +3603,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>
@@ -3854,7 +3620,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "�ед"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -3871,7 +3637,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Пон"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -3888,7 +3654,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Ð’Ñ‚"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -3905,7 +3671,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Ср"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -3922,7 +3688,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Чет"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -3939,7 +3705,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Пет"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -3956,7 +3722,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Съб"
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -4262,7 +4028,7 @@
   </dest>
   <voice>
     *: none
-    alarm: "Време на алармата"
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
@@ -4283,23 +4049,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
@@ -4317,35 +4066,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=У�танов�ване OFF=Отказ"
-    gigabeats: "SELECT=У�танов�ване POWER=Отказ"
-    ipod*: "SELECT=У�танов�ване MENU=Отказ"
-    iriverh10,iriverh10_5gb: "SELECT=У�танов�ване PREV=Отказ"
-    mpiohd300: "ENTER=У�танов�ване MENU=Отказ"
-    sansafuzeplus: "SELECT=У�танов�ване  BACK=Отказ"
-    vibe500: "OK=У�танов�ване C=Отказ"
-  </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
@@ -4447,20 +4167,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
-  desc: Save only on bookmark for each playlist in recent bookmarks
-  user: core
-  <source>
-    *: "Unique only"
-  </source>
-  <dest>
-    *: "Само уникални"
-  </dest>
-  <voice>
-    *: "Само уникални"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_LANGUAGE
   desc: in settings_menu
   user: core
@@ -4877,57 +4583,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_PRESET
   desc: in button bar and radio screen / menu
   user: core
@@ -4945,40 +4600,6 @@
   </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
@@ -5009,7 +4630,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Екранът е замразен!"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -5060,7 +4681,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Сканиране"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -5308,11 +4929,11 @@
   </source>
   <dest>
     *: none
-    recording: "PCM Wave"
+    recording: "~PCM Wave"
   </dest>
   <voice>
     *: none
-    recording: "PCM Wave"
+    recording: "~PCM Wave"
   </voice>
 </phrase>
 <phrase>
@@ -5401,23 +5022,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_QUALITY
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording_hwcodec: "Quality"
-  </source>
-  <dest>
-    *: none
-    recording_hwcodec: "Каче�тво"
-  </dest>
-  <voice>
-    *: none
-    recording_hwcodec: "Каче�тво"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_FREQUENCY
   desc: in recording and playback settings
   user: core
@@ -5523,23 +5127,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_EDITABLE
-  desc: Editable recordings setting
-  user: core
-  <source>
-    *: none
-    recording_hwcodec: "Independent Frames"
-  </source>
-  <dest>
-    *: none
-    recording_hwcodec: "�езави�ими кадри"
-  </dest>
-  <voice>
-    *: none
-    recording_hwcodec: "�езави�ими кадри"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RECORD_TIMESPLIT
   desc: Record split menu
   user: core
@@ -5676,40 +5263,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_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_CLEAR_REC_DIR
   desc:
   user: core
@@ -5978,7 +5531,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Предварителен запи�"
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -6097,7 +5650,7 @@
   </dest>
   <voice>
     *: none
-    remote: "(Vol- : активиране отново)"
+    remote: "(Volume minus за активиране отново)"
   </voice>
 </phrase>
 <phrase>
@@ -6311,23 +5864,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUTDOWN
-  desc: in main menu
-  user: core
-  <source>
-    *: none
-    soft_shutdown: "Shut down"
-  </source>
-  <dest>
-    *: none
-    soft_shutdown: "Изключване"
-  </dest>
-  <voice>
-    *: none
-    soft_shutdown: "Изключване"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_ROCKBOX_INFO
   desc: displayed topmost on the info screen and in the info menu
   user: core
@@ -6347,11 +5883,9 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    archosplayer: "Буф:"
   </dest>
   <voice>
     *: "Размер на буфера"
@@ -6364,12 +5898,10 @@
   <source>
     *: "Battery: %d%% %dh %dm"
     ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
-    iriverifp7xx: "%d%% %dh %dm"
   </source>
   <dest>
     *: "Батери�: %d%% %dh %dm"
     ipodmini1g,ipodmini2g,iriverh10: "Бат: %d%% %dh %dm"
-    iriverifp7xx: "%d%% %dh %dm"
   </dest>
   <voice>
     *: "Заредено�т на батери�та"
@@ -6400,7 +5932,7 @@
     *: "Свободно:"
   </dest>
   <voice>
-    *: "Свободно ди�ково про�тран�тво:"
+    *: "Свободно ди�ково про�тран�тво"
   </voice>
 </phrase>
 <phrase>
@@ -6409,41 +5941,44 @@
   user: core
   <source>
     *: "Int:"
+    hibylinux: "mSD:"
     xduoox3: "mSD1:"
   </source>
   <dest>
     *: "вгр:"
-    xduoox3: "MSD1:"
+    hibylinux: "~mSD:"
+    xduoox3: "~mSD1:"
   </dest>
   <voice>
     *: "Вградена памет"
-    xduoox3: "micro S D 1"
+    hibylinux: "микро S D"
+    xduoox3: "микро S D 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
-    archosondio*: "MMC:"
-    multivolume: "HD1"
+    hibylinux: "USB:"
+    multivolume: "HD1:"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </source>
   <dest>
     *: none
-    archosondio*: "MMC:"
-    multivolume: "HD1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "MSD:"
-    xduoox3: "MSD2:"
+    hibylinux: "~USB:"
+    multivolume: "~HD1:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "~mSD:"
+    xduoox3: "~mSD2:"
   </dest>
   <voice>
     *: none
-    archosondio*: "M M C"
-    multivolume: "H D 1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
-    xduoox3: "micro S D 2"
+    hibylinux: "~U S B"
+    multivolume: "~H D 1"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "микро S D"
+    xduoox3: "микро S D 2"
   </voice>
 </phrase>
 <phrase>
@@ -6531,62 +6066,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
@@ -6643,20 +6122,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_PLAYLIST_INSERT_COUNT
   desc: splash number of tracks inserted
   user: core
@@ -6723,7 +6188,7 @@
     *: "Тър�ене... %d намерени (%s)"
   </dest>
   <voice>
-    *: ""
+    *: "�амерени"
   </voice>
 </phrase>
 <phrase>
@@ -6741,34 +6206,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: 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_CATALOG_ADD_TO_NEW
   desc: in onplay playlist catalogue submenu
   user: core
@@ -7119,20 +6556,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
@@ -7432,7 +6855,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "У�илване на ви�очината и �коро�тта"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -7449,7 +6872,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "�амал�ване на ви�очината и �коро�тта"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -7466,7 +6889,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "Полутон нагоре"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -7483,7 +6906,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "Полутон надолу"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -7506,11 +6929,9 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
   </source>
   <dest>
     *: "Край на �пи�ъка � пе�ни"
-    archosplayer: "Край на �пи�ъка"
   </dest>
   <voice>
     *: "Край на �пи�ъка � пе�ни"
@@ -7527,7 +6948,7 @@
     *: "Създаване"
   </dest>
   <voice>
-    *: "Създаване"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7545,20 +6966,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
@@ -7639,7 +7046,7 @@
     *: "Режим:"
   </dest>
   <voice>
-    *: "Режим:"
+    *: "Режим"
   </voice>
 </phrase>
 <phrase>
@@ -7684,7 +7091,7 @@
     *: "Клавиатурата е заключена"
   </dest>
   <voice>
-    *: "Клавиатурата е заключена"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7698,7 +7105,7 @@
     *: "Клавиатурата е отключена"
   </dest>
   <voice>
-    *: "Клавиатурата е отключена"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -7740,58 +7147,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: "-безкр"
-  </dest>
-  <voice>
-    *: none
-    recording: "Мину� безкрайно�т"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CONFIRM_SHUTDOWN
-  desc: in shutdown screen
-  user: core
-  <source>
-    *: none
-    soft_shutdown: "Press OFF to shut down"
-  </source>
-  <dest>
-    *: none
-    soft_shutdown: "�ати�нете Включване за Изключване"
-  </dest>
-  <voice>
-    *: none
-    soft_shutdown: "�ати�нете Включване за Изключване"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REMOVE_MMC
-  desc: before acknowledging usb in case an MMC is inserted (Ondio)
-  user: core
-  <source>
-    *: none
-    archosondio*: "Please remove inserted MMC"
-  </source>
-  <dest>
-    *: none
-    archosondio*: "Мол� извадете MMC"
-  </dest>
-  <voice>
-    *: none
-    archosondio*: "Мол� извадете картата памет"
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: ""
   </voice>
 </phrase>
 <phrase>
@@ -7824,7 +7180,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on many models
   user: core
   <source>
     *: "OFF to abort"
@@ -7906,7 +7262,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"
@@ -7915,7 +7271,7 @@
     *: "�е�ъвме�тим модел"
   </dest>
   <voice>
-    *: ""
+    *: "�е�ъвме�тим модел"
   </voice>
 </phrase>
 <phrase>
@@ -7929,7 +7285,7 @@
     *: "�е�ъвме�тима вер�и�"
   </dest>
   <voice>
-    *: ""
+    *: "�е�ъвме�тима вер�и�"
   </voice>
 </phrase>
 <phrase>
@@ -7943,7 +7299,7 @@
     *: "Плъгинът върна грешка"
   </dest>
   <voice>
-    *: ""
+    *: "Плъгинът върна грешка"
   </voice>
 </phrase>
 <phrase>
@@ -8016,41 +7372,7 @@
   </dest>
   <voice>
     *: none
-    charging: "Батери�: Зареждане"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
-  user: core
-  <source>
-    *: none
-    archosrecorder: "Battery: Top-Off Chg"
-  </source>
-  <dest>
-    *: none
-    archosrecorder: "Батери�: нерегулирано зареждане"
-  </dest>
-  <voice>
-    *: none
-    archosrecorder: "Батери�: нерегулирано зареждане"
-  </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>
@@ -8092,49 +7414,7 @@
     *: "B"
   </dest>
   <voice>
-    *: "байта"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_KILOBYTE
-  desc: a unit postfix, also voiced
-  user: core
-  <source>
-    *: "KB"
-  </source>
-  <dest>
-    *: "KB"
-  </dest>
-  <voice>
-    *: "килобайта"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MEGABYTE
-  desc: a unit postfix, also voiced
-  user: core
-  <source>
-    *: "MB"
-  </source>
-  <dest>
-    *: "MB"
-  </dest>
-  <voice>
-    *: "мегабайта"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_GIGABYTE
-  desc: a unit postfix, also voiced
-  user: core
-  <source>
-    *: "GB"
-  </source>
-  <dest>
-    *: "GB"
-  </dest>
-  <voice>
-    *: "гигабайта"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8145,7 +7425,7 @@
     *: "."
   </source>
   <dest>
-    *: "."
+    *: "~."
   </dest>
   <voice>
     *: "ц�ло и"
@@ -9397,7 +8677,7 @@
     *: ""
   </dest>
   <voice>
-    *: "cuesheet"
+    *: "�пи�ък � маркери"
   </voice>
 </phrase>
 <phrase>
@@ -9428,7 +8708,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Ча�ът е:"
+    rtc: "Ча�ът е"
   </voice>
 </phrase>
 <phrase>
@@ -9474,241 +8754,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_MODE
-  desc: in wps F2 pressed
-  user: core
-  <source>
-    *: "Mode:"
-  </source>
-  <dest>
-    *: "Режим:"
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F1
-  desc: in dir browser, F1 button bar text
-  user: core
-  <source>
-    *: none
-    recorder_pad: "Menu"
-  </source>
-  <dest>
-    *: none
-    recorder_pad: "Меню"
-  </dest>
-  <voice>
-    *: none
-    recorder_pad: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F2
-  desc: in dir browser, F2 button bar text
-  user: core
-  <source>
-    *: none
-    recorder_pad: "Option"
-  </source>
-  <dest>
-    *: none
-    recorder_pad: "Опци�"
-  </dest>
-  <voice>
-    *: none
-    recorder_pad: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F3
-  desc: in dir browser, F3 button bar text
-  user: core
-  <source>
-    *: none
-    recorder_pad: "LCD"
-  </source>
-  <dest>
-    *: none
-    recorder_pad: "LCD"
-  </dest>
-  <voice>
-    *: none
-    recorder_pad: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_CHANNEL_STEREO
-  desc: in sound_settings
-  user: core
-  <source>
-    *: none
-    recording: "Stereo"
-  </source>
-  <dest>
-    *: none
-    recording: "Стерео"
-  </dest>
-  <voice>
-    *: none
-    recording: "Стерео"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_CHANNEL_MONO
-  desc: in sound_settings
-  user: core
-  <source>
-    *: none
-    recording: "Mono"
-  </source>
-  <dest>
-    *: none
-    recording: "Моно"
-  </dest>
-  <voice>
-    *: none
-    recording: "Моно"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_QUALITY
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording_hwcodec: "Quality"
-  </source>
-  <dest>
-    *: none
-    recording_hwcodec: "Каче�тво"
-  </dest>
-  <voice>
-    *: none
-    recording_hwcodec: "Каче�тво"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_FREQUENCY
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording: "Frequency"
-  </source>
-  <dest>
-    *: none
-    recording: "Че�тота"
-  </dest>
-  <voice>
-    *: none
-    recording: "Че�тота"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_SOURCE
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording: "Source"
-  </source>
-  <dest>
-    *: none
-    recording: "Източник"
-  </dest>
-  <voice>
-    *: none
-    recording: "Източник"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_MIC
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording: "Int. Mic"
-  </source>
-  <dest>
-    *: none
-    recording: "Вграден микрофон"
-  </dest>
-  <voice>
-    *: none
-    recording: "Вграден микрофон"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_LINE_IN
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording: "Line In"
-  </source>
-  <dest>
-    *: none
-    recording: "Линеен вход"
-  </dest>
-  <voice>
-    *: none
-    recording: "Линеен вход"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_DIGITAL
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording: "Digital"
-  </source>
-  <dest>
-    *: none
-    recording: "Цифров"
-  </dest>
-  <voice>
-    *: none
-    recording: "Цифров"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_CHANNELS
-  desc: in the recording settings
-  user: core
-  <source>
-    *: none
-    recording: "Channels"
-  </source>
-  <dest>
-    *: none
-    recording: "Канали"
-  </dest>
-  <voice>
-    *: none
-    recording: "Канали"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_RECORD_TRIGGER
-  desc: in recording settings_menu
-  user: core
-  <source>
-    *: none
-    recording: "Trigger"
-  </source>
-  <dest>
-    *: none
-    recording: "Тригер"
-  </dest>
-  <voice>
-    *: none
-    recording: "Тригер"
-  </voice>
-</phrase>
-<phrase>
   id: VOICE_OF
   desc: spoken only, as in 3/8 => 3 of 8
   user: core
@@ -10287,7 +9332,7 @@
     *: ""
   </dest>
   <voice>
-    *: "OK"
+    *: "окей"
   </voice>
 </phrase>
 <phrase>
@@ -10606,7 +9651,7 @@
   </dest>
   <voice>
     *: none
-    agc: "�втоматично регулиране на у�илването: време на �мущени�"
+    agc: "Време на �мущени� при автоматично регулиране на у�илването"
   </voice>
 </phrase>
 <phrase>
@@ -10623,7 +9668,7 @@
   </dest>
   <voice>
     *: none
-    agc: "�втоматично регулиране на у�илването: Мак�имални �мущени�"
+    agc: "Мак�имални �мущени� при автоматично регулиране на у�илването"
   </voice>
 </phrase>
 <phrase>
@@ -11231,20 +10276,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_COMPRESSOR
   desc: in sound settings
   user: core
@@ -11506,20 +10537,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: VOICE_EXT_SBS
   desc: spoken only, for file extension
   user: core
@@ -11568,20 +10585,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_QUEUE_LAST_SHUFFLED
   desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
   user: core
@@ -11640,7 +10643,7 @@
     *: "Следващ запи�:"
   </dest>
   <voice>
-    *: "Следващ запи�:"
+    *: "Следващ запи�"
   </voice>
 </phrase>
 <phrase>
@@ -11654,7 +10657,7 @@
     *: "Следващ:"
   </dest>
   <voice>
-    *: "Следващ:"
+    *: "Следващ"
   </voice>
 </phrase>
 <phrase>
@@ -12119,11 +11122,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "OK"
+    touchscreen: "ОК"
   </dest>
   <voice>
     *: none
-    touchscreen: "OK"
+    touchscreen: "окей"
   </voice>
 </phrase>
 <phrase>
@@ -12136,11 +11139,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "Del"
+    touchscreen: "~Del"
   </dest>
   <voice>
     *: none
-    touchscreen: "Del"
+    touchscreen: "изтриване"
   </voice>
 </phrase>
 <phrase>
@@ -12175,20 +11178,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_RESET_START_DIR
   desc: reset the browser start directory
   user: core
@@ -12216,7 +11205,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Сила на �игнала:"
+    radio: "Сила на �игнала"
   </voice>
 </phrase>
 <phrase>
@@ -12290,20 +11279,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>
-    *: "Задай като папка за каталога на плейли�ти"
-  </dest>
-  <voice>
-    *: "Задай като папка за каталога на плейли�ти"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_RESET_PLAYLISTCAT_DIR
   desc:
   user: core
@@ -12380,20 +11355,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_DURATION
   desc: default sleep timer duration in minutes
   user: core
@@ -12786,10 +11747,10 @@
     *: "Android Debug Bridge"
   </source>
   <dest>
-    *: "Android Debug Bridge"
+    *: "От�тран�ване на грешки в �ндроид"
   </dest>
   <voice>
-    *: "Android Debug Bridge"
+    *: "От�тран�ване на грешки в �ндроид"
   </voice>
 </phrase>
 <phrase>
@@ -12943,9 +11904,4511 @@
     *: "Haas Surround"
   </source>
   <dest>
-    *: "Haas Surround"
+    *: "Хаа� �ъраунд"
   </dest>
   <voice>
-    *: "Haas Surround"
+    *: "Хаа� �ъраунд"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SINGLE_MODE
+  desc: single mode
+  user: core
+  <source>
+    *: "Single Mode"
+  </source>
+  <dest>
+    *: "Единичен режим"
+  </dest>
+  <voice>
+    *: "Единичен режим"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TALK_MIXER_LEVEL
+  desc: Relative volume of voice prompts
+  user: core
+  <source>
+    *: "Voice prompt volume"
+  </source>
+  <dest>
+    *: "Сила на гла�овите �ъобщени�"
+  </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_FILTER_SUPER_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Super Slow"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "Супер бавен"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "Супер бавен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SHORT
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9018: "Short"
+  </source>
+  <dest>
+    *: none
+    es9018: "Къ�"
+  </dest>
+  <voice>
+    *: none
+    es9018: "Къ�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BYPASS
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9018: "Bypass"
+  </source>
+  <dest>
+    *: none
+    es9018: "Пропу�кане"
+  </dest>
+  <voice>
+    *: none
+    es9018: "Пропу�кане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_LINEAR_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Linear Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "Линеен бърз"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Линеен бърз"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_LINEAR_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Linear Slow"
+  </source>
+  <dest>
+    *: none
+    es9218: "Линеен бавен"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Линеен бавен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_MINIMUM_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Minimum Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "Минимален бърз"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Минимален бърз"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_MINIMUM_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Minimum Slow"
+  </source>
+  <dest>
+    *: none
+    es9218: "Минимален бавен"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Минимален бавен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_APODIZING_1
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Apodizing type 1"
+  </source>
+  <dest>
+    *: none
+    es9218: "�подизиращ тип 1"
+  </dest>
+  <voice>
+    *: none
+    es9218: "�подизиращ тип 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: "�подизиращ тип 2"
+  </dest>
+  <voice>
+    *: none
+    es9218: "�подизиращ тип 2"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_HYBRID_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Hybrid Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "Хибриден бърз"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Хибриден бърз"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BRICK_WALL
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Brick Wall"
+  </source>
+  <dest>
+    *: none
+    es9218: "Тухлена �тена"
+  </dest>
+  <voice>
+    *: none
+    es9218: "Тухлена �тена"
+  </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: "Режим на Ц�П"
+    es9218: "Изходно ниво на Ц�П"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "Режим на Ц�П"
+    es9218: "Изходно ниво на Ц�П"
+  </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: "Ви�ока производително�т"
+    es9218: "Гол�мо у�илване (2 Vrms)"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "Ви�ока производително�т"
+    es9218: "Гол�мо у�илване (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: "Пе�тене на батери�"
+    es9218: "Малко у�илване (1 Vrms)"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "Пе�тене на батери�"
+    es9218: "Малко у�илване (1 Vrms)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_ENABLED
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Enabled"
+  </source>
+  <dest>
+    *: "Включено"
+  </dest>
+  <voice>
+    *: "Включено"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_PLAY
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Exempt Play"
+  </source>
+  <dest>
+    *: "С изключение на възпроизвеждане"
+  </dest>
+  <voice>
+    *: "С изключение на възпроизвеждане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_SEEK
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Exempt Seek"
+  </source>
+  <dest>
+    *: "С изключение на превъртане"
+  </dest>
+  <voice>
+    *: "С изключение на превъртане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_SKIP
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Exempt Skip"
+  </source>
+  <dest>
+    *: "С изключение на пропу�кане"
+  </dest>
+  <voice>
+    *: "С изключение на пропу�кане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_SELECTIVE
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Backlight Exemptions"
+  </source>
+  <dest>
+    *: "Изключени� за под�ветка"
+  </dest>
+  <voice>
+    *: "Изключени� за под�ветка"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_EXT_POWER
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Disable on External Power"
+  </source>
+  <dest>
+    *: "Изключи при външно захранване"
+  </dest>
+  <voice>
+    *: "Изключи при външно захранване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_UNMAPPED
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Disable Unmapped Keys"
+  </source>
+  <dest>
+    *: "Изключи непри�воените бутони"
+  </dest>
+  <voice>
+    *: "Изключи непри�воените бутони"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_SELECTIVE
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Advanced Key Lock"
+  </source>
+  <dest>
+    *: "Разширено заключване"
+  </dest>
+  <voice>
+    *: "Разширено заключване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_AUTOLOCK_ON
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Autolock On"
+  </source>
+  <dest>
+    *: "�втоматично заключване активно"
+  </dest>
+  <voice>
+    *: "�втоматично заключване активно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_AUTOLOCK_OFF
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Autolock Off"
+  </source>
+  <dest>
+    *: "�втоматично заключване неактивно"
+  </dest>
+  <voice>
+    *: "�втоматично заключване неактивно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_NOTIFY
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Disable Locked Reminders"
+  </source>
+  <dest>
+    *: "Изключване на напомн�ни�та"
+  </dest>
+  <voice>
+    *: "Изключване на напомн�ни�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_TOUCH
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Disable Touch"
+  </source>
+  <dest>
+    *: "Изключване на тъч"
+  </dest>
+  <voice>
+    *: "Изключване на тъч"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KIBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "KiB"
+  </source>
+  <dest>
+    *: "~KiB"
+  </dest>
+  <voice>
+    *: "кибибайта"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MEBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "MiB"
+  </source>
+  <dest>
+    *: "~MiB"
+  </dest>
+  <voice>
+    *: "мебибайта"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GIBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "GiB"
+  </source>
+  <dest>
+    *: "~GiB"
+  </dest>
+  <voice>
+    *: "гибибайта"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST
+  desc: Save only one bookmark for a playlist in recent bookmarks
+  user: core
+  <source>
+    *: "One per playlist"
+  </source>
+  <dest>
+    *: "По една за плейли�та"
+  </dest>
+  <voice>
+    *: "По една за плейли�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK
+  desc: Save only one bookmark for a combination (playlist,track) in recent bookmarks
+  user: core
+  <source>
+    *: "One per track"
+  </source>
+  <dest>
+    *: "По една за запи�"
+  </dest>
+  <voice>
+    *: "По една за запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_TRACK_TO_MOVE
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Запи� за преме�тване"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUEUED
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�а опашката"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BAD_TRACK
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Повреден запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_MOVING_TRACK
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Преме�тване на запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ELAPSED
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Playlist elapsed:"
+  </source>
+  <dest>
+    *: "Изминало време в плейли�тата:"
+  </dest>
+  <voice>
+    *: "Изминало време в плейли�тата"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRK_ELAPSED
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track elapsed:"
+  </source>
+  <dest>
+    *: "Изминало време в запи�а:"
+  </dest>
+  <voice>
+    *: "Изминало време в запи�а"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_REMAINING
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Playlist remaining:"
+  </source>
+  <dest>
+    *: "О�таващо време в плейли�тата:"
+  </dest>
+  <voice>
+    *: "О�таващо време в плейли�тата"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRK_REMAINING
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track remaining:"
+  </source>
+  <dest>
+    *: "О�таващо време в запи�а:"
+  </dest>
+  <voice>
+    *: "О�таващо време в запи�а"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRACK
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track:"
+  </source>
+  <dest>
+    *: "Запи�:"
+  </dest>
+  <voice>
+    *: "Запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_STORAGE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Storage (Done / Remaining):"
+  </source>
+  <dest>
+    *: "Памет (Завършена / О�таваща):"
+  </dest>
+  <voice>
+    *: "Памет"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYTIME_DONE
+  desc: playing time screen
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Завършено"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_TRACK_SIZE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Average track size:"
+  </source>
+  <dest>
+    *: "Среден размер на запи�а:"
+  </dest>
+  <voice>
+    *: "Среден размер на запи�а"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_BITRATE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Average bitrate:"
+  </source>
+  <dest>
+    *: "Средна побитова �коро�т:"
+  </dest>
+  <voice>
+    *: "Средна побитова �коро�т"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ERROR
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Error while gathering info"
+  </source>
+  <dest>
+    *: "Грешка при �ъбирането на информаци�"
+  </dest>
+  <voice>
+    *: "Грешка при �ъбирането на информаци�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_TIME
+  desc: onplay menu
+  user: core
+  <source>
+    *: "Playing time"
+  </source>
+  <dest>
+    *: "Време на възпроизвеждане"
+  </dest>
+  <voice>
+    *: "Време на възпроизвеждане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CAR_ADAPTER_MODE_DELAY
+  desc: Displayed for setting car adapter mode delay
+  user: core
+  <source>
+    *: none
+    charging: "Delay Before Resume"
+  </source>
+  <dest>
+    *: none
+    charging: "Изчакване преди възобнов�ване"
+  </dest>
+  <voice>
+    *: none
+    charging: "Изчакване преди възобнов�ване"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PITCH_ABSOLUTE_MODE
+  desc: spoken only
+  user: core
+  <source>
+    *: none
+    pitchscreen: ""
+  </source>
+  <dest>
+    *: none
+    pitchscreen: ""
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: "�б�олютен режим"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PITCH_SEMITONE_MODE
+  desc: spoken only
+  user: core
+  <source>
+    *: none
+    pitchscreen: ""
+  </source>
+  <dest>
+    *: none
+    pitchscreen: ""
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: "Полутонен режим"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PITCH_TIMESTRETCH_MODE
+  desc: spoken only
+  user: core
+  <source>
+    *: none
+    pitchscreen: ""
+  </source>
+  <dest>
+    *: none
+    pitchscreen: ""
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: "Сгъ�т�ване на времето"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "Remote Control"
+  </source>
+  <dest>
+    *: "Ди�танционно управление"
+  </dest>
+  <voice>
+    *: "Ди�танционно управление"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NO_REM_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "No Rem. Control"
+  </source>
+  <dest>
+    *: "��ма ди�т. управление"
+  </dest>
+  <voice>
+    *: "��ма ди�танционно управление"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OUT_OF_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "Out of Control"
+  </source>
+  <dest>
+    *: "Без управление"
+  </dest>
+  <voice>
+    *: "Без управление"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_2_KEY_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "2 Key Control"
+  </source>
+  <dest>
+    *: "Управление � 2 бутона"
+  </dest>
+  <voice>
+    *: "Управление � 2 бутона"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_4_KEY_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "4 Key Control"
+  </source>
+  <dest>
+    *: "Управление � 4 бутона"
+  </dest>
+  <voice>
+    *: "Управление � 4 бутона"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_WORMLET
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Play Wormlet!"
+  </source>
+  <dest>
+    *: "Играй Wormlet!"
+  </dest>
+  <voice>
+    *: "Играй Wormlet!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_WORMS
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Number of Worms"
+  </source>
+  <dest>
+    *: "Брой червеи"
+  </dest>
+  <voice>
+    *: "Брой червеи"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WORM_GROWTH_PER_FOOD
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Worm Growth Per Food"
+  </source>
+  <dest>
+    *: "Ра�теж на червеите при хранене"
+  </dest>
+  <voice>
+    *: "Ра�теж на червеите при хранене"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WORM_SPEED
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Worm Speed"
+  </source>
+  <dest>
+    *: "Скоро�т на червеите"
+  </dest>
+  <voice>
+    *: "Скоро�т на червеите"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARGHS_PER_FOOD
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Arghs Per Food"
+  </source>
+  <dest>
+    *: "Argh-ове при хранене"
+  </dest>
+  <voice>
+    *: "Argh-ове при хранене"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARGH_SIZE
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Argh Size"
+  </source>
+  <dest>
+    *: "Размер на Argh"
+  </dest>
+  <voice>
+    *: "Размер на Argh"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FOOD_SIZE
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Food Size"
+  </source>
+  <dest>
+    *: "Размер на храната"
+  </dest>
+  <voice>
+    *: "Размер на храната"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_PLAYERS
+  desc: For game menus
+  user: core
+  <source>
+    *: "Number of Players"
+  </source>
+  <dest>
+    *: "Брой играчи"
+  </dest>
+  <voice>
+    *: "Брой играчи"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONTROL_STYLE
+  desc: In various menus
+  user: core
+  <source>
+    *: "Control Style"
+  </source>
+  <dest>
+    *: "Стил на управление"
+  </dest>
+  <voice>
+    *: "Стил на управление"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERT_TO_DEFAULT_SETTINGS
+  desc: In various menus
+  user: core
+  <source>
+    *: "Revert to Default Settings"
+  </source>
+  <dest>
+    *: "Върни на�тройките по подразбиране"
+  </dest>
+  <voice>
+    *: "Върни на�тройките по подразбиране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_QUIT
+  desc: in various menus
+  user: core
+  <source>
+    *: "Quit"
+  </source>
+  <dest>
+    *: "Изход"
+  </dest>
+  <voice>
+    *: "Изход"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_DISPLAY_OPTIONS
+  desc: in various menus
+  user: core
+  <source>
+    *: "Display Options"
+  </source>
+  <dest>
+    *: "Опции на ди�пле�"
+  </dest>
+  <voice>
+    *: "Опции на ди�пле�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREVTRACK
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Previous Track"
+  </source>
+  <dest>
+    *: "Предишен запи�"
+  </dest>
+  <voice>
+    *: "Предишен запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYPAUSE
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Pause / Play"
+  </source>
+  <dest>
+    *: "Пауза / Възпроизвеждане"
+  </dest>
+  <voice>
+    *: "Пауза / Възпроизвеждане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STOP_PLAYBACK
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Stop Playback"
+  </source>
+  <dest>
+    *: "Спри възпроизвеждането"
+  </dest>
+  <voice>
+    *: "Спри възпроизвеждането"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXTTRACK
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Next Track"
+  </source>
+  <dest>
+    *: "Следващ запи�"
+  </dest>
+  <voice>
+    *: "Следващ запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANGE_VOLUME
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Change Volume"
+  </source>
+  <dest>
+    *: "Пром�на нивото на звука"
+  </dest>
+  <voice>
+    *: "Пром�на нивото на звука"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANGE_SHUFFLE_MODE
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Shuffle Mode"
+  </source>
+  <dest>
+    *: "Режим разбъркване"
+  </dest>
+  <voice>
+    *: "Режим разбъркване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANGE_REPEAT_MODE
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Change Repeat Mode"
+  </source>
+  <dest>
+    *: "Пром�на режима на повторение"
+  </dest>
+  <voice>
+    *: "Пром�на режима на повторение"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYBACK_CONTROL
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Playback Control"
+  </source>
+  <dest>
+    *: "Управление на възпроизвеждането"
+  </dest>
+  <voice>
+    *: "Управление на възпроизвеждането"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_CHECKMATE
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Checkmate!"
+  </source>
+  <dest>
+    *: "Шах и мат!"
+  </dest>
+  <voice>
+    *: "Шах и мат!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_ILLEGAL_MOVE
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Illegal move!"
+  </source>
+  <dest>
+    *: "�евалиден ход!"
+  </dest>
+  <voice>
+    *: "�евалиден ход!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_NEW_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "New Game"
+  </source>
+  <dest>
+    *: "�ова игра"
+  </dest>
+  <voice>
+    *: "�ова игра"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESUME_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Resume Game"
+  </source>
+  <dest>
+    *: "Поднови игра"
+  </dest>
+  <voice>
+    *: "Поднови игра"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_SAVE_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Save Game"
+  </source>
+  <dest>
+    *: "Запиши игра"
+  </dest>
+  <voice>
+    *: "Запиши игра"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESTORE_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Restore Game"
+  </source>
+  <dest>
+    *: "Зареди игра"
+  </dest>
+  <voice>
+    *: "Зареди игра"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESTART_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Restart Game"
+  </source>
+  <dest>
+    *: "Ре�тартирай игра"
+  </dest>
+  <voice>
+    *: "Ре�тартирай игра"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_SELECT_OTHER_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Select Other Game"
+  </source>
+  <dest>
+    *: "Избери друга игра"
+  </dest>
+  <voice>
+    *: "Избери друга игра"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_1
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 1: 60 moves / 5 min"
+  </source>
+  <dest>
+    *: "�иво 1: 60 хода / 5 мин"
+  </dest>
+  <voice>
+    *: "�иво 1, 60 хода за 5 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_2
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 2: 60 moves / 15 min"
+  </source>
+  <dest>
+    *: "�иво 2: 60 хода / 15 мин"
+  </dest>
+  <voice>
+    *: "�иво 2, 60 хода за 15 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_3
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 3: 60 moves / 30 min"
+  </source>
+  <dest>
+    *: "�иво 3: 60 хода / 30 мин"
+  </dest>
+  <voice>
+    *: "�иво 3, 60 хода за 30 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_4
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 4: 40 moves / 30 min"
+  </source>
+  <dest>
+    *: "�иво 4: 40 хода / 30 мин"
+  </dest>
+  <voice>
+    *: "�иво 4, 40 хода за 30 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_5
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 5: 40 moves / 60 min"
+  </source>
+  <dest>
+    *: "�иво 5: 40 хода / 60 мин"
+  </dest>
+  <voice>
+    *: "�иво 5, 40 хода за 60 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_6
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 6: 40 moves / 120 min"
+  </source>
+  <dest>
+    *: "�иво 6: 40 хода / 120 мин"
+  </dest>
+  <voice>
+    *: "�иво 6, 40 хода за 120 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_7
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 7: 40 moves / 240 min"
+  </source>
+  <dest>
+    *: "�иво 7: 40 хода / 240 мин"
+  </dest>
+  <voice>
+    *: "�иво 7, 40 хода за 240 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_8
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 8: 1 move / 15 min"
+  </source>
+  <dest>
+    *: "�иво 8: 1 ход / 15 мин"
+  </dest>
+  <voice>
+    *: "�иво 8, 1 ход за 15 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_9
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 9: 1 move / 60 min"
+  </source>
+  <dest>
+    *: "�иво 9: 1 ход / 60 мин"
+  </dest>
+  <voice>
+    *: "�иво 9, 1 ход за 60 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_10
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 10: 1 move / 600 min"
+  </source>
+  <dest>
+    *: "�иво 10: 1 ход / 600 мин"
+  </dest>
+  <voice>
+    *: "�иво 10, 1 ход за 600 минути"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_PGN_PARSE_ERROR
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "Error parsing game !"
+  </source>
+  <dest>
+    *: "Грешка при разчитане на играта !"
+  </dest>
+  <voice>
+    *: "Грешка при разчитане на играта !"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_NO_GAMES
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "No games found !"
+  </source>
+  <dest>
+    *: "�е �а намерени игри !"
+  </dest>
+  <voice>
+    *: "�е �а намерени игри!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAME_BEGINNING
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "At the beginning of the game"
+  </source>
+  <dest>
+    *: "В началото на играта"
+  </dest>
+  <voice>
+    *: "В началото на играта"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAME_END
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "At the end of the game"
+  </source>
+  <dest>
+    *: "В кра� на играта"
+  </dest>
+  <voice>
+    *: "В кра� на играта"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYER
+  desc: spoken only, for announcing player's id
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Играч"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_GNUCHESS
+  desc: spoken only, for announcing player's id
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Програма GNU Chess"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_MARKED
+  desc: spoken only, for announcing chess piece marking
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Маркирано"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_UNMARKED
+  desc: spoken only, for announcing chess piece unmarking
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�емаркирано"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_WHITE
+  desc: spoken only, for announcing chess piece color
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Б�ло"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BLACK
+  desc: spoken only, for announcing chess piece color
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Черно"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_CHECK
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Шах!"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_CAPTURES
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "взема"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_CASTLE
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "рокада"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_KINGSIDE
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "от �траната на цар�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_QUEENSIDE
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "от �траната на царицата"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PAWN
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Пешка"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_KNIGHT
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Кон"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BISHOP
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Офицер"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_ROOK
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Топ"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUEEN
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Царица"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_KING
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Цар"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAMES
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Games"
+  </source>
+  <dest>
+    *: "Игри"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_SAVING_POSITION
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Saving position"
+  </source>
+  <dest>
+    *: "Запи�ване на позици�та"
+  </dest>
+  <voice>
+    *: "Запи�ване на позици�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LOADING_POSITION
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Loading position"
+  </source>
+  <dest>
+    *: "Зареждане на позици�та"
+  </dest>
+  <voice>
+    *: "Зареждане на позици�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_THINKING
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Thinking..."
+  </source>
+  <dest>
+    *: "Ми�лене..."
+  </dest>
+  <voice>
+    *: "Ми�лене"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BATTERY_BENCH_IS_ALREADY_RUNNING
+  desc: Spoken if battery bench is already running
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Те�та на батери�та вече работи"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BAT_BENCH_KEYS
+  desc: Battery bench start up message
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�ати�нете възпроизвеждане за да започнете те�т на батери�та или �пиране за отказ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CANNOT_RESTART_PLAYBACK
+  desc: cannot restart playback splash in imageviewer
+  user: core
+  <source>
+    *: "Cannot restart playback"
+  </source>
+  <dest>
+    *: "�е може да �е ре�тартира възпроизвеждането"
+  </dest>
+  <voice>
+    *: "�е може да �е ре�тартира възпроизвеждането"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ORDERED
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Ordered"
+  </source>
+  <dest>
+    *: "Подредено"
+  </dest>
+  <voice>
+    *: "Подредено"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFUSION
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Diffusion"
+  </source>
+  <dest>
+    *: "Разпръ�нато"
+  </dest>
+  <voice>
+    *: "Разпръ�нато"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GRAYSCALE
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Grayscale"
+  </source>
+  <dest>
+    *: "Черно-б�ло"
+  </dest>
+  <voice>
+    *: "Черно-б�ло"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLIDESHOW_MODE
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Toggle Slideshow Mode"
+  </source>
+  <dest>
+    *: "Превключи режим галери�"
+  </dest>
+  <voice>
+    *: "Превключи режим галери�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLIDESHOW_TIME
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Slideshow Time"
+  </source>
+  <dest>
+    *: "Време за показване"
+  </dest>
+  <voice>
+    *: "Време за показване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RETURN
+  desc: in various plugin menus
+  user: core
+  <source>
+    *: "Return"
+  </source>
+  <dest>
+    *: "Връщане"
+  </dest>
+  <voice>
+    *: "Връщане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REC_DIR
+  desc: used in the info screen to show a recording dir
+  user: core
+  <source>
+    *: none
+    recording: "Recording Directory"
+  </source>
+  <dest>
+    *: none
+    recording: "Папка за запи�и"
+  </dest>
+  <voice>
+    *: none
+    recording: "Папка за запи�и"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_VIEW_GAMES
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "View Played Games"
+  </source>
+  <dest>
+    *: "Виж изиграните игри"
+  </dest>
+  <voice>
+    *: "Виж изиграните игри"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_AUDIO_OPTIONS
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Audio Options"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�а�тройки на звука"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�а�тройки на звука"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_RESUME_OPTIONS
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Resume Options"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�а�тройки на поднов�ването"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�а�тройки на поднов�ването"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_PLAY_MODE
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Play Mode"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Режим на възпроизвеждане"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Режим на възпроизвеждане"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SINGLE
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Single"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Само един"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Само един"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_SOUND_SETTING
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Use sound setting"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Позлвай на�тройките за звука"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Позлвай на�тройките за звука"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESTART_PLAYBACK
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Play from beginning"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Възпроизвеждане от началото"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Възпроизвеждане от началото"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_RESUME_TIME
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Set resume time (min)"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Продължаване от (минути)"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Избор на време за продължаване"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_FPS
+  desc: in the mpegplayer and pictureflow settings menus
+  user: core
+  <source>
+    *: "Display FPS"
+  </source>
+  <dest>
+    *: "Кадри в �екунда на ди�пле�"
+  </dest>
+  <voice>
+    *: "Кадри в �екунда на ди�пле�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIMIT_FPS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Limit FPS"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Ограничи кадрите в �екунда"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Ограничи кадрите в �екунда"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_FRAMES
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Skip frames"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Пропу�кане на кадри"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Пропу�кане на кадри"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_BRIGHTNESS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Backlight brightness"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Ярко�т на под�ветката"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Ярко�т на под�ветката"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_COMMON_SETTING
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Use common setting"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Ползвай общата на�тройка"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Ползвай общата на�тройка"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TONE_CONTROLS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Tone controls"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�а�тройка на тона"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�а�тройка на тона"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FORCE_START_MENU
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Start menu"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Покажи менюто"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Покажи менюто"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONDITIONAL_START_MENU
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Start menu if not completed"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Покажи менюто ако не е завършено"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Покажи менюто ако не е завършено"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTO_RESUME
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Resume automatically"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Продължавай автоматично"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Продължавай автоматично"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL_RESUMES
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Clear all resumes"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Изчи�ти в�ички недовършени"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Изчи�ти в�ички недовършени"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UNAVAILABLE
+  desc: in mpegplayer settings
+  user: core
+  <source>
+    *: "Unavailable"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�е е налично"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�е е налично"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOGGLE_ITEM
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Toggle Item"
+  </source>
+  <dest>
+    *: "Превключи елемента"
+  </dest>
+  <voice>
+    *: "Превключи елемента"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOVE_ITEM_UP
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Move Item Up"
+  </source>
+  <dest>
+    *: "Преме�ти елемента по-нагоре"
+  </dest>
+  <voice>
+    *: "Преме�ти елемента по-нагоре"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOVE_ITEM_DOWN
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Move Item Down"
+  </source>
+  <dest>
+    *: "Преме�ти елемента по-надолу"
+  </dest>
+  <voice>
+    *: "Преме�ти елемента по-надолу"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LOAD_DEFAULT_CONFIGURATION
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Load Default Configuration"
+  </source>
+  <dest>
+    *: "Зареди конфигураци� по подразбиране"
+  </dest>
+  <voice>
+    *: "Зареди конфигураци� по подразбиране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_EXIT
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Save and Exit"
+  </source>
+  <dest>
+    *: "Запи� и изход"
+  </dest>
+  <voice>
+    *: "Запи� и изход"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_MENU_ORDER
+  desc: main_menu_config plugin title
+  user: core
+  <source>
+    *: "Rockbox Main Menu Order"
+  </source>
+  <dest>
+    *: "Ред на о�новното меню на Rockbox"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_PATH
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Path]"
+  </source>
+  <dest>
+    *: "[Път]"
+  </dest>
+  <voice>
+    *: "Път"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILENAME
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Filename]"
+  </source>
+  <dest>
+    *: "[Име на файл]"
+  </dest>
+  <voice>
+    *: "Име на файл"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_SIZE
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Size]"
+  </source>
+  <dest>
+    *: "[Размер]"
+  </dest>
+  <voice>
+    *: "Размер"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_DATE
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Date]"
+  </source>
+  <dest>
+    *: "[Дата]"
+  </dest>
+  <voice>
+    *: "Дата"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_TIME
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Time]"
+  </source>
+  <dest>
+    *: "[Ча�]"
+  </dest>
+  <voice>
+    *: "Ча�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_SUBDIRS
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Subdirs]"
+  </source>
+  <dest>
+    *: "[Подпапки]"
+  </dest>
+  <voice>
+    *: "Подпапки"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Files]"
+  </source>
+  <dest>
+    *: "[Файлове]"
+  </dest>
+  <voice>
+    *: "Файлове"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_DIRECTORY_PROPERTIES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "Directory properties"
+  </source>
+  <dest>
+    *: "Свой�тва на папката"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILE_PROPERTIES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "File properties"
+  </source>
+  <dest>
+    *: "Свой�тва на файла"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FAIL
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "Failed to gather information"
+  </source>
+  <dest>
+    *: "�еу�пешно �ъбиране на информаци�"
+  </dest>
+  <voice>
+    *: "�еу�пешно �ъбиране на информаци�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SWAP_CHANNELS
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Channels"
+  </source>
+  <dest>
+    *: "Разм�на на каналите"
+  </dest>
+  <voice>
+    *: "Разм�на на каналите"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PANNING_SEPARATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Panning Separation"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Панорамно раздел�не"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Панорамно раздел�не"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERBERATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Reverberation"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Ревербераци�"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Ревербераци�"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INTERPOLATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Interpolation"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Интерполаци�"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Интерполаци�"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SURROUND
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Surround"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Съраунд"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Съраунд"
+    lowmem: none
+  </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>
+    *: "Ви�ококаче�твен мик�ер"
+    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: LANG_CPU_BOOST
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "CPU Boost"
+    lowmem: none
+  </source>
+  <dest>
+    *: "Под�илване на проце�ора"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "Под�илване на проце�ора"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPACING
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Spacing"
+  </source>
+  <dest>
+    *: "Раздалечаване"
+  </dest>
+  <voice>
+    *: "Раздалечаване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CENTRE_MARGIN
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Centre margin"
+  </source>
+  <dest>
+    *: "Централно поле"
+  </dest>
+  <voice>
+    *: "Централно поле"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_SLIDES
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Number of slides"
+  </source>
+  <dest>
+    *: "Брой �лайдове"
+  </dest>
+  <voice>
+    *: "Брой �лайдове"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ZOOM
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Zoom"
+  </source>
+  <dest>
+    *: "Увеличение"
+  </dest>
+  <voice>
+    *: "Увеличение"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALBUM_TITLE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Show album title"
+  </source>
+  <dest>
+    *: "Показване заглавието на албума"
+  </dest>
+  <voice>
+    *: "Показване заглавието на албума"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESIZE_COVERS
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Resize Covers"
+  </source>
+  <dest>
+    *: "Преоразмер�ване на обложките"
+  </dest>
+  <voice>
+    *: "Преоразмер�ване на обложките"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REBUILD_CACHE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Rebuild cache"
+  </source>
+  <dest>
+    *: "Прегенериране на кеша"
+  </dest>
+  <voice>
+    *: "Прегенериране на кеша"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WPS_INTEGRATION
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "WPS Integration"
+  </source>
+  <dest>
+    *: "WPS интеграци�"
+  </dest>
+  <voice>
+    *: "WPS интеграци�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_WPS
+  desc: in the pictureflow main menu
+  user: core
+  <source>
+    *: "Go to WPS"
+  </source>
+  <dest>
+    *: "Отиди към WPS"
+  </dest>
+  <voice>
+    *: "Отиди към WPS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Hide album title"
+  </source>
+  <dest>
+    *: "Скриване заглавието на албума"
+  </dest>
+  <voice>
+    *: "Скриване заглавието на албума"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show at the bottom"
+  </source>
+  <dest>
+    *: "Показване най-отдолу"
+  </dest>
+  <voice>
+    *: "Показване най-отдолу"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show at the top"
+  </source>
+  <dest>
+    *: "Показване най-отгоре"
+  </dest>
+  <voice>
+    *: "Показване най-отгоре"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIRECT
+  desc: in the pictureflow settings, also a volume adjustment mode
+  user: core
+  <source>
+    *: "Direct"
+  </source>
+  <dest>
+    *: "Директно"
+  </dest>
+  <voice>
+    *: "Директно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIA_TRACK_LIST
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Via Track list"
+  </source>
+  <dest>
+    *: "Чрез �пи�ъка �ъ� запи�и"
+  </dest>
+  <voice>
+    *: "Чрез �пи�ъка �ъ� запи�и"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ON
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Always On"
+  </source>
+  <dest>
+    *: "Винаги включено"
+  </dest>
+  <voice>
+    *: "Винаги включено"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NO_ALBUMART_FOUND
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "No album art found"
+  </source>
+  <dest>
+    *: "�е е намерена обложка"
+  </dest>
+  <voice>
+    *: "�е е намерена обложка"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CACHE_REBUILT_NEXT_RESTART
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "Cache will be rebuilt on next restart"
+  </source>
+  <dest>
+    *: "Кешът ще �е прегенерира при �ледващи� ре�тарт"
+  </dest>
+  <voice>
+    *: "Кешът ще �е прегенерира при �ледващи� ре�тарт"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ERROR_WRITING_CONFIG
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "Error writing config"
+  </source>
+  <dest>
+    *: "Грешка при запи�ване на конфигураци�та"
+  </dest>
+  <voice>
+    *: "Грешка при запи�ване на конфигураци�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NOT_A_VBR_FILE
+  desc: in vbrfix plugin
+  user: core
+  <source>
+    *: "Not a VBR file"
+  </source>
+  <dest>
+    *: "Файлът не е VBR"
+  </dest>
+  <voice>
+    *: "Файлът не е VBR"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILE_ERROR
+  desc: in vbrfix plugin
+  user: core
+  <source>
+    *: "File error: %d"
+  </source>
+  <dest>
+    *: "Файлова грешка: %d"
+  </dest>
+  <voice>
+    *: "Файлова грешка"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UPDATE_CACHE
+  desc: in pictureflow
+  user: core
+  <source>
+    *: "Update cache"
+  </source>
+  <dest>
+    *: "Обнов�ване на кеша"
+  </dest>
+  <voice>
+    *: "Обнов�ване на кеша"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Hide information"
+  </source>
+  <dest>
+    *: "Скриване на информаци�та"
+  </dest>
+  <voice>
+    *: "Скриване на информаци�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album at the bottom"
+  </source>
+  <dest>
+    *: "Показване на албума най-долу"
+  </dest>
+  <voice>
+    *: "Показване на албума най-долу"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album at the top"
+  </source>
+  <dest>
+    *: "Показване на албум най-горе"
+  </dest>
+  <voice>
+    *: "Показване на албум най-горе"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALL_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album and artist at the top"
+  </source>
+  <dest>
+    *: "Показване на албум и изпълнител най-горе"
+  </dest>
+  <voice>
+    *: "Показване на албум и изпълнител най-горе"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALL_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album and artist at the bottom"
+  </source>
+  <dest>
+    *: "Показване на албум и изпълнител най-долу"
+  </dest>
+  <voice>
+    *: "Показване на албум и изпълнител най-долу"
+  </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>
+    *: "�ати�нете LEFT за отказ."
+    android,hifietma*,zenvision: "�ати�нете BACK за отказ."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "�ати�нете POWER за отказ."
+    ihifi760,ihifi960: "�ати�нете двукратно RETURN за отказ."
+    ihifi770,ihifi770c,ihifi800: "�ати�нете HOME за отказ."
+    iriverh10,samsungyh*: "�ати�нете двукратно LEFT за отказ."
+    mpiohd200: "�ати�нете двукратно REC за отказ."
+    mpiohd300: "�ати�нете двукратно MENU за отказ."
+    rx27generic: "�ати�нете VOLUME за отказ."
+    sonynwza860: "�а�тройките за клавиши �а непълни."
+    touchscreen: "�ати�нете по �редата отл�во за отказ."
+    vibe500: "�ати�нете PREV за отказ."
+    xduoox20,xduoox3,xduoox3ii: "�ати�нете двукратно HOME за отказ."
+  </dest>
+  <voice>
+    *: "�ати�нете LEFT за отказ."
+    android,hifietma*,zenvision: "�ати�нете BACK за отказ."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "�ати�нете POWER за отказ."
+    ihifi760,ihifi960: "�ати�нете двукратно RETURN за отказ."
+    ihifi770,ihifi770c,ihifi800: "�ати�нете HOME за отказ."
+    iriverh10,samsungyh*: "�ати�нете двукратно LEFT за отказ."
+    mpiohd200: "�ати�нете двукратно REC за отказ."
+    mpiohd300: "�ати�нете двукратно MENU за отказ."
+    rx27generic: "�ати�нете VOLUME за отказ."
+    touchscreen: "�ати�нете по �редата отл�во за отказ."
+    vibe500: "�ати�нете PREV за отказ."
+    xduoox20,xduoox3,xduoox3ii: "�ати�нете двукратно HOME за отказ."
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DATE
+  desc: for constructing time and date announcements
+  user: core
+  <source>
+    *: "Date"
+  </source>
+  <dest>
+    *: "Дата"
+  </dest>
+  <voice>
+    *: "Дата"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL
+  desc:
+  user: core
+  <source>
+    *: "Clear all"
+  </source>
+  <dest>
+    *: "Изчи�ти в�ички"
+  </dest>
+  <voice>
+    *: "Изчи�ти в�ички"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CANCEL_0
+  desc: CANCEL.
+  user: core
+  <source>
+    *: "Cancel"
+  </source>
+  <dest>
+    *: "Отказ"
+  </dest>
+  <voice>
+    *: "Отказ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE
+  desc:
+  user: core
+  <source>
+    *: "Save"
+  </source>
+  <dest>
+    *: "Запи�ване"
+  </dest>
+  <voice>
+    *: "Запи�ване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIMEOUT
+  desc:
+  user: core
+  <source>
+    *: "Timeout"
+  </source>
+  <dest>
+    *: "Таймаут"
+  </dest>
+  <voice>
+    *: "Таймаут"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK
+  desc: used in track x of y constructs
+  user: core
+  <source>
+    *: "Track"
+  </source>
+  <dest>
+    *: "Запи�"
+  </dest>
+  <voice>
+    *: "Запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ELAPSED
+  desc: prefix for elapsed playtime announcement
+  user: core
+  <source>
+    *: "Elapsed"
+  </source>
+  <dest>
+    *: "Изминало"
+  </dest>
+  <voice>
+    *: "Изминало"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCEMENT_FMT
+  desc: format for wps hotkey announcement
+  user: core
+  <source>
+    *: none
+    hotkey: "Announcement format"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Формат на анон�"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Формат на анон�"
+  </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: "О�таващо"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "О�таващо"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GROUPING
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Grouping"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Групиране"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Групиране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCE_ON
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Announce on"
+  </source>
+  <dest>
+    *: none
+    hotkey: "�нон� включен"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "�нон� включен"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_CHANGE
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Track change"
+  </source>
+  <dest>
+    *: none
+    hotkey: "См�на на запи�"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "См�на на запи�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOLD_FOR_SETTINGS
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Hold for settings"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Задръж за на�тройки"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Задръж за на�тройки"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN
+  desc: onplay open plugin
+  user: core
+  <source>
+    *: "Open Plugin"
+  </source>
+  <dest>
+    *: "Отвори плъгин"
+  </dest>
+  <voice>
+    *: "Отвори плъгин"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN_NOT_A_PLUGIN
+  desc: open plugin module
+  user: core
+  <source>
+    *: "Not a plugin: %s"
+  </source>
+  <dest>
+    *: "�е е плъгин: %s"
+  </dest>
+  <voice>
+    *: "�е е плъгин"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
+  desc: open plugin module
+  user: core
+  <source>
+    *: "Set Wps Context Plugin"
+  </source>
+  <dest>
+    *: "Избери плъгин за WPS контек�т"
+  </dest>
+  <voice>
+    *: "Избери плъгин за WPS контек�т"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PARAMETER
+  desc:
+  user: core
+  <source>
+    *: "Parameter"
+  </source>
+  <dest>
+    *: "Параметър"
+  </dest>
+  <voice>
+    *: "Параметър"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NAME
+  desc:
+  user: core
+  <source>
+    *: "Name"
+  </source>
+  <dest>
+    *: "Име"
+  </dest>
+  <voice>
+    *: "Име"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD
+  desc:
+  user: core
+  <source>
+    *: "Add"
+  </source>
+  <dest>
+    *: "Добави"
+  </dest>
+  <voice>
+    *: "Добави"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACK
+  desc:
+  user: core
+  <source>
+    *: "Back"
+  </source>
+  <dest>
+    *: "�азад"
+  </dest>
+  <voice>
+    *: "�азад"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EDIT
+  desc:
+  user: core
+  <source>
+    *: "Edit"
+  </source>
+  <dest>
+    *: "Редактирай"
+  </dest>
+  <voice>
+    *: "Редактирай"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RUN
+  desc:
+  user: core
+  <source>
+    *: "Run"
+  </source>
+  <dest>
+    *: "Изпълни"
+  </dest>
+  <voice>
+    *: "Изпълни"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EXPORT
+  desc:
+  user: core
+  <source>
+    *: "Export"
+  </source>
+  <dest>
+    *: "Ек�портирай"
+  </dest>
+  <voice>
+    *: "Ек�портирай"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSE
+  desc:
+  user: core
+  <source>
+    *: "Browse"
+  </source>
+  <dest>
+    *: "Разгледай"
+  </dest>
+  <voice>
+    *: "Разгледай"
+  </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>
+    *: "Влез в режим USB памет?"
+  </dest>
+  <voice>
+    *: "Влез в режим USB памет?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUEUE_MENU
+  desc: in onplay menu
+  user: core
+  <source>
+    *: "Queue..."
+  </source>
+  <dest>
+    *: "�а опашката..."
+  </dest>
+  <voice>
+    *: "�а опашката"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_QUEUE_OPTIONS
+  desc: in Current Playlist settings
+  user: core
+  <source>
+    *: "Show Queue Options"
+  </source>
+  <dest>
+    *: "Покажи опциите на опашката"
+  </dest>
+  <voice>
+    *: "Покажи опциите на опашката"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUFFLED_ADDING_OPTIONS
+  desc: in Current Playlist settings
+  user: core
+  <source>
+    *: "Show Shuffled Adding Options"
+  </source>
+  <dest>
+    *: "Покажи опциите за разбъркано добав�не"
+  </dest>
+  <voice>
+    *: "Покажи опциите за разбъркано добав�не"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_IN_SUBMENU
+  desc: in Settings
+  user: core
+  <source>
+    *: "In Submenu"
+  </source>
+  <dest>
+    *: "В подменю"
+  </dest>
+  <voice>
+    *: "В подменю"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_DISABLE_ALL_NOTIFY
+  desc: disable all softlock notifications
+  user: core
+  <source>
+    *: "Disable All Lock Notifications"
+  </source>
+  <dest>
+    *: "Спри в�ички изве�ти� за заключване"
+  </dest>
+  <voice>
+    *: "Спри в�ички изве�ти� за заключване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_VOLUME
+  desc: exempt volume from softlock
+  user: core
+  <source>
+    *: "Exempt Volume"
+  </source>
+  <dest>
+    *: "С изключение на нивото на звука"
+  </dest>
+  <voice>
+    *: "С изключение на нивото на звука"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_ALWAYSAUTOLOCK
+  desc: always prime autolock
+  user: core
+  <source>
+    *: "Always Autolock"
+  </source>
+  <dest>
+    *: "Винаги заключвай автоматично"
+  </dest>
+  <voice>
+    *: "Винаги заключвай автоматично"
+  </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>
+    *: "Циркул�рно�т на �пи�ъците"
+  </dest>
+  <voice>
+    *: "Циркул�рно�т на �пи�ъците"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUTDOWN_MESSAGE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show Shutdown Message"
+  </source>
+  <dest>
+    *: "Показване на �ъобщение при изключване"
+  </dest>
+  <voice>
+    *: "Показване на �ъобщение при изключване"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Order"
+  </source>
+  <dest>
+    *: "Ред на �пи�ъците"
+  </dest>
+  <voice>
+    *: "Ред на �пи�ъците"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ASCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Ascending"
+  </source>
+  <dest>
+    *: "Възход�щ"
+  </dest>
+  <voice>
+    *: "Възход�щ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DESCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Descending"
+  </source>
+  <dest>
+    *: "�изход�щ"
+  </dest>
+  <voice>
+    *: "�изход�щ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUM_ART
+  desc: in Settings
+  user: core
+  <source>
+    *: "Album Art"
+  </source>
+  <dest>
+    *: "Обложка"
+  </dest>
+  <voice>
+    *: "Обложка"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_EMBEDDED
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Embedded"
+  </source>
+  <dest>
+    *: "Предпочитай вградените"
+  </dest>
+  <voice>
+    *: "Предпочитай вградените"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_IMAGE_FILE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Image File"
+  </source>
+  <dest>
+    *: "Предпочитай файл � изображение"
+  </dest>
+  <voice>
+    *: "Предпочитай файл � изображение"
+  </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: "Свери ча�овника от RDS"
+  </dest>
+  <voice>
+    *: none
+    rds: "Свери ча�овника от RDS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_ALBUMS_BY
+  desc: in Settings
+  user: core
+  <source>
+    *: "Sort albums by"
+  </source>
+  <dest>
+    *: "Подреди албумите по"
+  </dest>
+  <voice>
+    *: "Подреди албумите по"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTIST_PLUS_NAME
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Name"
+  </source>
+  <dest>
+    *: "Изпълнител + Заглавие"
+  </dest>
+  <voice>
+    *: "Изпълнител и заглавие"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTIST_PLUS_YEAR
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Year"
+  </source>
+  <dest>
+    *: "Изпълнител + Година"
+  </dest>
+  <voice>
+    *: "Изпълнител и година"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YEAR_SORT_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "Year sort order"
+  </source>
+  <dest>
+    *: "Ред на �ортиране на годините"
+  </dest>
+  <voice>
+    *: "Ред на �ортиране на годините"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_YEAR_IN_ALBUM_TITLE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show year in album title"
+  </source>
+  <dest>
+    *: "Покажи година в заглавието на албума"
+  </dest>
+  <voice>
+    *: "Покажи година в заглавието на албума"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WAIT_FOR_CACHE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Cache needs to finish updating first!"
+  </source>
+  <dest>
+    *: "Кешът тр�бва първо да приключи обнов�ване!"
+  </dest>
+  <voice>
+    *: "Кешът тр�бва първо да приключи обнов�ване!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_INFO
+  desc: Track Info Title
+  user: core
+  <source>
+    *: "Track Info"
+  </source>
+  <dest>
+    *: "Информаци� за запи�а"
+  </dest>
+  <voice>
+    *: "Информаци� за запи�а"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY
+  desc: play selected file/directory, in playlist context menu
+  user: core
+  <source>
+    *: "Play"
+  </source>
+  <dest>
+    *: "Възпроизвеждане"
+  </dest>
+  <voice>
+    *: "Възпроизвеждане"
+  </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>
+    *: "Разбъркано възпроизвеждане"
+  </dest>
+  <voice>
+    *: "Разбъркано възпроизвеждане"
+  </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>
+    *: "Запази текущи� запи� при презапи�ване на плейли�та"
+  </dest>
+  <voice>
+    *: "Запази текущи� запи� при презапи�ване на плейли�та"
+  </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: "Изчи�ти на�тройките когато бутонът за заключване е активен при �тартиране"
+  </dest>
+  <voice>
+    *: none
+    clear_settings_on_hold,iriverh10: "Изчи�ти на�тройките когато бутонът за нулиране е задържан при �тартиране"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Изчи�ти на�тройките когато бутонът за заключване е активен при �тартиране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REWIND_ACROSS_TRACKS
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: "Rewind Across Tracks"
+  </source>
+  <dest>
+    *: "Превъртане между запи�ите"
+  </dest>
+  <voice>
+    *: "Превъртане между запи�ите"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_AS
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Set As..."
+  </source>
+  <dest>
+    *: "Задай като..."
+  </dest>
+  <voice>
+    *: "Задай като"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playlist Directory"
+  </source>
+  <dest>
+    *: "Папка за плейли�ти"
+  </dest>
+  <voice>
+    *: "Папка за плейли�ти"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_START_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Start Directory"
+  </source>
+  <dest>
+    *: "�ачална папка"
+  </dest>
+  <voice>
+    *: "�ачална папка"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: none
+    recording: "Recording Directory"
+  </source>
+  <dest>
+    *: none
+    recording: "Папка за запи�и"
+  </dest>
+  <voice>
+    *: none
+    recording: "Папка за запи�и"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Playlist..."
+  </source>
+  <dest>
+    *: "Добави в плейли�та..."
+  </dest>
+  <voice>
+    *: "Добави в плейли�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_EXISTING_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Existing Playlist"
+  </source>
+  <dest>
+    *: "Добави в �ъще�твуваща плейли�та"
+  </dest>
+  <voice>
+    *: "Добави в �ъще�твуваща плейли�та"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playing Next..."
+  </source>
+  <dest>
+    *: "Възпроизвеждане на �ледващ..."
+  </dest>
+  <voice>
+    *: "Възпроизвеждане на �ледващ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Next"
+  </source>
+  <dest>
+    *: "Възпроизведи �ледващ"
+  </dest>
+  <voice>
+    *: "Възпроизведи �ледващ"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add Shuffled"
+  </source>
+  <dest>
+    *: "Добави разбъркано"
+  </dest>
+  <voice>
+    *: "Добави разбъркано"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last"
+  </source>
+  <dest>
+    *: "Възпроизведи по�леден"
+  </dest>
+  <voice>
+    *: "Възпроизведи по�леден"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last Shuffled"
+  </source>
+  <dest>
+    *: "Възпроизведи по�леден разбъркано"
+  </dest>
+  <voice>
+    *: "Възпроизведи по�леден разбъркано"
+  </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: "Режим на на�тройка �илата на звука"
+  </dest>
+  <voice>
+    *: none
+    perceptual_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: "Брой �тъпки на �илата на звука"
+  </dest>
+  <voice>
+    *: none
+    perceptual_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: "По възпри�тие"
+  </dest>
+  <voice>
+    *: none
+    perceptual_volume: "По възпри�тие"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_TRACKS_WHILE_BROWSING
+  desc: in PictureFlow Main Menu
+  user: core
+  <source>
+    *: "Show Tracks While Browsing"
+  </source>
+  <dest>
+    *: "Покажи запи�ите по време на разглеждане"
+  </dest>
+  <voice>
+    *: "Покажи запи�ите по време на разглеждане"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_LAST_ALBUM
+  desc: in PictureFlow Main Menu
+  user: core
+  <source>
+    *: "Go to Last Album"
+  </source>
+  <dest>
+    *: "Отиди към по�ледни�т албум"
+  </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>
+    *: "Бърз (игнориране кеша на папките)"
+  </dest>
+  <voice>
+    *: "Бърз (игнориране кеша на папките)"
+  </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>
+    *: "Размер на лабиринта"
+  </dest>
+  <voice>
+    *: "Размер на лабиринта"
+  </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>
+    *: "Ползвай големи плочки"
+  </dest>
+  <voice>
+    *: "Ползвай големи плочки"
+  </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>
+    *: "Меню на Chessbox"
+  </dest>
+  <voice>
+    *: "Меню на Chess box"
+  </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: VOICE_LANG_NAME
+  desc: Spoken name of the language
+  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>
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 54440c54b6..d018271645 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -21,6 +21,7 @@
 # - Harry Tu
 # - Jun Gu
 # - Purling Nayuki
+# - 王� (Medu Hedan)
 #------
 <phrase>
   id: LANG_LIST_SEPARATOR
@@ -201,7 +202,7 @@
     *: "常规设置"
   </dest>
   <voice>
-    *: "一般设置"
+    *: "常规设置"
   </voice>
 </phrase>
 <phrase>
@@ -338,7 +339,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Stereo"
@@ -352,7 +353,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Mono"
@@ -732,20 +733,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
@@ -756,7 +743,7 @@
     *: "%dHz频段增益"
   </dest>
   <voice>
-    *: "%d赫兹频段增益"
+    *: "赫兹频段增益"
   </voice>
 </phrase>
 <phrase>
@@ -784,7 +771,7 @@
     *: "带通滤波器%d"
   </dest>
   <voice>
-    *: "带通滤波器%d"
+    *: "带通滤波器"
   </voice>
 </phrase>
 <phrase>
@@ -949,10 +936,10 @@
     *: "Shuffle"
   </source>
   <dest>
-    *: "乱�播放"
+    *: "�机播放"
   </dest>
   <voice>
-    *: "乱�播放"
+    *: "�机播放"
   </voice>
 </phrase>
 <phrase>
@@ -991,10 +978,10 @@
     *: "A-B"
   </source>
   <dest>
-    *: "A-B��段"
+    *: "A-B��"
   </dest>
   <voice>
-    *: "AB段"
+    *: "区段��"
   </voice>
 </phrase>
 <phrase>
@@ -1244,7 +1231,7 @@
     *: "��更新中..."
   </dest>
   <voice>
-    *: "��更新中..."
+    *: "��更新中"
   </voice>
 </phrase>
 <phrase>
@@ -1395,7 +1382,7 @@
     *: "Supported"
   </source>
   <dest>
-    *: "仅显示Rockbox支�的"
+    *: "仅显示Rockbox支�的文件"
   </dest>
   <voice>
     *: "仅显示Rockbox支�的文件"
@@ -2155,23 +2142,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
@@ -3105,7 +3075,7 @@
     *: "Linear (%)"
   </source>
   <dest>
-    *: "线性(%)�标"
+    *: "线性 (%)"
   </dest>
   <voice>
     *: "线性�标"
@@ -3177,14 +3147,17 @@
   <source>
     *: none
     battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "碱性"
+    xduoox3: "新电池 (2000 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "碱性"
+    xduoox3: "新电池"
   </voice>
 </phrase>
 <phrase>
@@ -3194,14 +3167,17 @@
   <source>
     *: none
     battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
   </source>
   <dest>
     *: none
     battery_types: "锂�氢"
+    xduoox3: "旧电池 (1500 mAh)"
   </dest>
   <voice>
     *: none
     battery_types: "锂�氢"
+    xduoox3: "旧电池"
   </voice>
 </phrase>
 <phrase>
@@ -3595,62 +3571,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
@@ -3731,7 +3651,7 @@
     *: "�索中...已找到%d个(%s)"
   </dest>
   <voice>
-    *: "�索中...已找到%d个(%s)"
+    *: "�索中"
   </voice>
 </phrase>
 <phrase>
@@ -3794,23 +3714,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: "电池:�压涓�充电"
-  </dest>
-  <voice>
-    *: none
-    charging: "电池 �压涓�充电"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_BATTERY_TIME
   desc: battery level in % and estimated time remaining
   user: core
@@ -3865,12 +3768,12 @@
   </source>
   <dest>
     *: "内部:"
-    hibylinux: "mSD:"
-    xduoox3: "mSD1:"
+    hibylinux: "~mSD:"
+    xduoox3: "~mSD1:"
   </dest>
   <voice>
     *: "内部大�为"
-    hibylinux: "micro S D"
+    hibylinux: "~micro S D"
     xduoox3: "mSD�1"
   </voice>
 </phrase>
@@ -3880,18 +3783,21 @@
   user: core
   <source>
     *: none
-    multivolume: "HD1"
+    hibylinux: "USB:"
+    multivolume: "HD1:"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </source>
   <dest>
     *: none
+    hibylinux: "~USB:"
     multivolume: "�盘1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
-    xduoox3: "mSD2:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "~mSD:"
+    xduoox3: "~mSD2:"
   </dest>
   <voice>
     *: none
+    hibylinux: "~U S B"
     multivolume: "�盘1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD�"
     xduoox3: "mSD�2"
@@ -4052,8 +3958,8 @@
     vibe500: "CANCEL:�消"
   </dest>
   <voice>
-    *: ""
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,samsungyh*,sansac200*,sansae200*: ""
+    *: none
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4184,23 +4090,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: "负无穷大"
-  </dest>
-  <voice>
-    *: none
-    recording: "负无穷大"
-  </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
@@ -4231,24 +4120,7 @@
   </dest>
   <voice>
     *: none
-    alarm: "离闹钟�起还有%d:%02d"
-  </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: "闹铃已设"
+    alarm: "离闹钟�起还有"
   </voice>
 </phrase>
 <phrase>
@@ -4269,35 +4141,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=设置 OFF=�消"
-    gigabeats: "SELECT=设置 POWER=�消"
-    ipod*: "SELECT=设置 MENU=�消"
-    iriverh10,iriverh10_5gb: "SELECT=设置 PREV=�消"
-    mpiohd300: "ENTER=设置 MENU=�消"
-    sansafuzeplus: "SELECT=设置  BACK=�消"
-    vibe500: "OK=设置 C=�消"
-  </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
@@ -4534,20 +4377,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
@@ -5556,7 +5385,7 @@
     *: "."
   </source>
   <dest>
-    *: "."
+    *: "~."
   </dest>
   <voice>
     *: "点"
@@ -6150,7 +5979,7 @@
     *: "�入了%d首曲目(%s)"
   </dest>
   <voice>
-    *: "�入了%d首曲目%s"
+    *: "�入了曲目"
   </voice>
 </phrase>
 <phrase>
@@ -6164,7 +5993,7 @@
     *: "列入了%d首曲目(%s)"
   </dest>
   <voice>
-    *: "列入了%d首曲目%s"
+    *: "列入了曲目"
   </voice>
 </phrase>
 <phrase>
@@ -6178,7 +6007,7 @@
     *: "�存了%d首曲目(%s)"
   </dest>
   <voice>
-    *: "�存了%d首曲目%s"
+    *: "�存了曲目"
   </voice>
 </phrase>
 <phrase>
@@ -6224,20 +6053,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
@@ -6614,12 +6429,11 @@
   <dest>
     *: "按OFF键�消"
     gigabeatfx: "按POWER键�消"
-    gigabeats: "按BACK键�消"
+    gigabeats,sansafuzeplus: "按BACK键�消"
     iaudiom5,iaudiox5: "长按PLAY键�消"
     ipod*: "按PLAY/PAUSE键�消"
     iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "按PREV键�消"
     iriverh100,iriverh120,iriverh300: "按STOP键�消"
-    sansafuzeplus: "按BACK键�消"
   </dest>
   <voice>
     *: ""
@@ -7616,8 +7430,7 @@
   <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"
@@ -7660,7 +7473,7 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,samsungyh*,sansac200*,sansae200*: ""
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -8088,7 +7901,7 @@
     *: "模�:"
   </dest>
   <voice>
-    *: "模�:"
+    *: "模�"
   </voice>
 </phrase>
 <phrase>
@@ -8174,20 +7987,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLACE
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CATALOG
   desc: in main menu and onplay menu
   user: core
@@ -8447,20 +8246,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
@@ -8530,7 +8315,7 @@
     *: "读�中...已读�%d%%(%s)"
   </dest>
   <voice>
-    *: "读�中...已读�%d%%(%s)"
+    *: "读�中"
   </voice>
 </phrase>
 <phrase>
@@ -8596,20 +8381,6 @@
   </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_FM_JAPAN
   desc: fm region japan
   user: core
@@ -8742,20 +8513,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
@@ -8934,10 +8691,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日志"
@@ -8951,15 +8708,15 @@
   desc: in lcd settings
   user: core
   <source>
-    *: none
+    *: "Backlight on Lock"
     hold_button: "Backlight on Hold"
   </source>
   <dest>
-    *: none
+    *: "背光(按键�定时)"
     hold_button: "背光(按键�定时)"
   </dest>
   <voice>
-    *: none
+    *: "按键�定时的背光"
     hold_button: "按键�定时的背光"
   </voice>
 </phrase>
@@ -9002,7 +8759,7 @@
     *: ""
   </dest>
   <voice>
-    *: "of"
+    *: "å…±"
   </voice>
 </phrase>
 <phrase>
@@ -9030,7 +8787,7 @@
     *: "%s�存在"
   </dest>
   <voice>
-    *: "%s�存在"
+    *: "目录�存在"
   </voice>
 </phrase>
 <phrase>
@@ -9079,23 +8836,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
@@ -10322,20 +10062,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
@@ -10366,7 +10092,7 @@
   </dest>
   <voice>
     *: none
-    remote: "remote statusbar skin"
+    remote: "控制器状��皮肤"
   </voice>
 </phrase>
 <phrase>
@@ -10398,20 +10124,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
@@ -10436,7 +10148,7 @@
     *: "下一曲:"
   </dest>
   <voice>
-    *: "下一曲:"
+    *: "下一曲"
   </voice>
 </phrase>
 <phrase>
@@ -10511,11 +10223,11 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Rate"
+    pitchscreen: "速率"
   </dest>
   <voice>
     *: none
-    pitchscreen: "Rate"
+    pitchscreen: "速率"
   </voice>
 </phrase>
 <phrase>
@@ -10574,10 +10286,10 @@
     *: "Right"
   </source>
   <dest>
-    *: "Right"
+    *: "��"
   </dest>
   <voice>
-    *: "Right"
+    *: "��"
   </voice>
 </phrase>
 <phrase>
@@ -10590,11 +10302,11 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Semitone"
+    pitchscreen: "�音"
   </dest>
   <voice>
     *: none
-    pitchscreen: "Semitone"
+    pitchscreen: "�音"
   </voice>
 </phrase>
 <phrase>
@@ -10624,11 +10336,11 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Limit"
+    pitchscreen: "�制"
   </dest>
   <voice>
     *: none
-    pitchscreen: "Limit"
+    pitchscreen: "�制"
   </voice>
 </phrase>
 <phrase>
@@ -10776,20 +10488,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
@@ -10811,10 +10509,10 @@
     *: "Skip to Outro"
   </source>
   <dest>
-    *: "Skip to Outro"
+    *: "跳转至尾声"
   </dest>
   <voice>
-    *: "Skip to Outro"
+    *: "跳转至尾声"
   </voice>
 </phrase>
 <phrase>
@@ -10898,10 +10596,10 @@
     *: "Left"
   </source>
   <dest>
-    *: "Left"
+    *: "左�"
   </dest>
   <voice>
-    *: "Left"
+    *: "左�"
   </voice>
 </phrase>
 <phrase>
@@ -11002,10 +10700,10 @@
     *: "of"
   </source>
   <dest>
-    *: "of"
+    *: "~of"
   </dest>
   <voice>
-    *: "of"
+    *: "å…±"
   </voice>
 </phrase>
 <phrase>
@@ -11107,7 +10805,7 @@
   </dest>
   <voice>
     *: none
-    gigabeats,samsungypr1: "频段 %d 增益"
+    gigabeats,samsungypr1: "频段增益"
   </voice>
 </phrase>
 <phrase>
@@ -11279,10 +10977,10 @@
     *: "Composer"
   </source>
   <dest>
-    *: "Composer"
+    *: "曲师"
   </dest>
   <voice>
-    *: "Composer"
+    *: "曲师"
   </voice>
 </phrase>
 <phrase>
@@ -11299,7 +10997,7 @@
   </dest>
   <voice>
     *: none
-    gigabeats,samsungypr1: "频段 %d 的频率"
+    gigabeats,samsungypr1: "频率"
   </voice>
 </phrase>
 <phrase>
@@ -11316,7 +11014,7 @@
   </dest>
   <voice>
     *: none
-    gigabeats,samsungypr1: "频段 %d 的宽度"
+    gigabeats,samsungypr1: "宽度"
   </voice>
 </phrase>
 <phrase>
@@ -11361,7 +11059,7 @@
     *: "PictureFlow"
   </source>
   <dest>
-    *: "PictureFlow"
+    *: "~PictureFlow"
   </dest>
   <voice>
     *: "�行picture flow"
@@ -11505,7 +11203,7 @@
   </dest>
   <voice>
     *: none
-    radio: "信�强度:"
+    radio: "信�强度"
   </voice>
 </phrase>
 <phrase>
@@ -11554,20 +11252,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_PAUSE_REWIND
   desc: Seconds to rewind when rewind on pause is enabled.
   user: core
@@ -11706,20 +11390,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>
-    *: "设置为播放列表目录�置"
-  </dest>
-  <voice>
-    *: "设置为播放列表目录�置"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CODEPAGE_WESTERN_EUROPEAN
   desc: in codepage setting menu
   user: core
@@ -11765,20 +11435,6 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTOMATIC
-  desc: generic automatic
-  user: core
-  <source>
-    *: "Automatic"
-  </source>
-  <dest>
-    *: "自动"
-  </dest>
-  <voice>
-    *: "自动"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_CROSSFEED_CUSTOM
   desc: in sound settings
   user: core
@@ -12092,10 +11748,10 @@
     *: "SIDE ONLY"
   </source>
   <dest>
-    *: "SIDE ONLY"
+    *: "�侧模�"
   </dest>
   <voice>
-    *: "SIDE ONLY"
+    *: "�侧模�"
   </voice>
 </phrase>
 <phrase>
@@ -12185,3 +11841,4663 @@
     *: "ADB调试"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SINGLE_MODE
+  desc: single mode
+  user: core
+  <source>
+    *: "Single Mode"
+  </source>
+  <dest>
+    *: "�曲模�"
+  </dest>
+  <voice>
+    *: "�曲模�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SYSFONT_EQUALIZER_EDIT_MODE
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Edit mode: %s %s"
+  </source>
+  <dest>
+    *: "~Edit mode: %s %s"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SYSFONT_EQUALIZER_BAND_CUTOFF
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Cutoff"
+  </source>
+  <dest>
+    *: "~Cutoff"
+  </dest>
+  <voice>
+    *: "~Cutoff Frequency"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SYSFONT_GAIN
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Gain"
+  </source>
+  <dest>
+    *: "~Gain"
+  </dest>
+  <voice>
+    *: "~Gain"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TALK_MIXER_LEVEL
+  desc: Relative volume of voice prompts
+  user: core
+  <source>
+    *: "Voice prompt volume"
+  </source>
+  <dest>
+    *: "语音�示音�"
+  </dest>
+  <voice>
+    *: "语音�示音�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEADZONE
+  desc: touchpad deadzone setting
+  user: core
+  <source>
+    *: none
+    sansafuzeplus: "Touchpad Dead Zone"
+  </source>
+  <dest>
+    *: none
+    sansafuzeplus: "触摸�死区"
+  </dest>
+  <voice>
+    *: none
+    sansafuzeplus: "触摸�死区"
+  </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: "短�"
+  </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_FILTER_SUPER_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    filter_roll_off: "Super Slow"
+  </source>
+  <dest>
+    *: none
+    filter_roll_off: "特别慢"
+  </dest>
+  <voice>
+    *: none
+    filter_roll_off: "特别慢"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_SHORT
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9018: "Short"
+  </source>
+  <dest>
+    *: none
+    es9018: "短"
+  </dest>
+  <voice>
+    *: none
+    es9018: "短"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BYPASS
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9018: "Bypass"
+  </source>
+  <dest>
+    *: none
+    es9018: "跳过(Bypass)"
+  </dest>
+  <voice>
+    *: none
+    es9018: "跳过"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_LINEAR_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Linear Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "线性快速"
+  </dest>
+  <voice>
+    *: none
+    es9218: "线性快速"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_LINEAR_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Linear Slow"
+  </source>
+  <dest>
+    *: none
+    es9218: "线性慢速"
+  </dest>
+  <voice>
+    *: none
+    es9218: "线性慢速"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_MINIMUM_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Minimum Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "最�化快速"
+  </dest>
+  <voice>
+    *: none
+    es9218: "最�化快速"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_MINIMUM_SLOW
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Minimum Slow"
+  </source>
+  <dest>
+    *: none
+    es9218: "最�化慢速"
+  </dest>
+  <voice>
+    *: none
+    es9218: "最�化慢速"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_APODIZING_1
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Apodizing type 1"
+  </source>
+  <dest>
+    *: none
+    es9218: "切趾类型1"
+  </dest>
+  <voice>
+    *: none
+    es9218: "切趾类型一"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_APODIZING_2
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Apodizing type 2"
+  </source>
+  <dest>
+    *: none
+    es9218: "切趾类型2"
+  </dest>
+  <voice>
+    *: none
+    es9218: "切趾类型二"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_HYBRID_FAST
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Hybrid Fast"
+  </source>
+  <dest>
+    *: none
+    es9218: "混�快速"
+  </dest>
+  <voice>
+    *: none
+    es9218: "混�快速"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_BRICK_WALL
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    es9218: "Brick Wall"
+  </source>
+  <dest>
+    *: none
+    es9218: "砖墙"
+  </dest>
+  <voice>
+    *: none
+    es9218: "砖墙"
+  </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电�模�"
+    es9218: "DAC输出等级"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "DAC电�模�"
+    es9218: "DAC输出等级"
+  </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: "高�质"
+    es9218: "高增益 （2 Vrms）"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "高�质"
+    es9218: "高增益"
+  </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: "�电"
+    es9218: "低增益 (1 Vrms)"
+  </dest>
+  <voice>
+    *: none
+    dac_power_mode: "�电"
+    es9218: "低增益 (1 Vrms)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SYSFONT_EQUALIZER_BAND_Q
+  desc: in the equalizer settings menu
+  user: core
+  <source>
+    *: "Q"
+  </source>
+  <dest>
+    *: "~Q"
+  </dest>
+  <voice>
+    *: "~Q"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_ENABLED
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Enabled"
+  </source>
+  <dest>
+    *: "�用"
+  </dest>
+  <voice>
+    *: "�用"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_PLAY
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Exempt Play"
+  </source>
+  <dest>
+    *: "播放时��"
+  </dest>
+  <voice>
+    *: "播放时��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_SEEK
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Exempt Seek"
+  </source>
+  <dest>
+    *: "快进/快退时��"
+  </dest>
+  <voice>
+    *: "快进快退时��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_SKIP
+  desc: Selective Actions
+  user: core
+  <source>
+    *: "Exempt Skip"
+  </source>
+  <dest>
+    *: "曲目跳过时��"
+  </dest>
+  <voice>
+    *: "曲目跳过时��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_SELECTIVE
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Backlight Exemptions"
+  </source>
+  <dest>
+    *: "背光开�例外规则"
+  </dest>
+  <voice>
+    *: "背光开�例外规则"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_EXT_POWER
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Disable on External Power"
+  </source>
+  <dest>
+    *: "外接电�时�用"
+  </dest>
+  <voice>
+    *: "外接电�时�用"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_UNMAPPED
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Disable Unmapped Keys"
+  </source>
+  <dest>
+    *: "�用未定�的键"
+  </dest>
+  <voice>
+    *: "�用未定�的键"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_SELECTIVE
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Advanced Key Lock"
+  </source>
+  <dest>
+    *: "高级按键�"
+  </dest>
+  <voice>
+    *: "高级按键�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_AUTOLOCK_ON
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Autolock On"
+  </source>
+  <dest>
+    *: "自动�定�用"
+  </dest>
+  <voice>
+    *: "自动�定�用"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_AUTOLOCK_OFF
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Autolock Off"
+  </source>
+  <dest>
+    *: "自动�定�用"
+  </dest>
+  <voice>
+    *: "自动�定�用"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_NOTIFY
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Disable Locked Reminders"
+  </source>
+  <dest>
+    *: "�用已�定的�醒器"
+  </dest>
+  <voice>
+    *: "�用已�定的�醒器"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_TOUCH
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Disable Touch"
+  </source>
+  <dest>
+    *: "�用触控"
+  </dest>
+  <voice>
+    *: "�用触控"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KIBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "KiB"
+  </source>
+  <dest>
+    *: "KB"
+  </dest>
+  <voice>
+    *: "K B"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MEBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "MiB"
+  </source>
+  <dest>
+    *: "MB"
+  </dest>
+  <voice>
+    *: "M B"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GIBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "GiB"
+  </source>
+  <dest>
+    *: "GB"
+  </dest>
+  <voice>
+    *: "G B"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST
+  desc: Save only one bookmark for a playlist in recent bookmarks
+  user: core
+  <source>
+    *: "One per playlist"
+  </source>
+  <dest>
+    *: "�个播放列表一个"
+  </dest>
+  <voice>
+    *: "�个播放列表一个"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK
+  desc: Save only one bookmark for a combination (playlist,track) in recent bookmarks
+  user: core
+  <source>
+    *: "One per track"
+  </source>
+  <dest>
+    *: "�个曲目一个"
+  </dest>
+  <voice>
+    *: "�个曲目一个"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_TRACK_TO_MOVE
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�移动的曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUEUED
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "已列队"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BAD_TRACK
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "��曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_MOVING_TRACK
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "移动曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ELAPSED
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Playlist elapsed:"
+  </source>
+  <dest>
+    *: "播放列表已播放："
+  </dest>
+  <voice>
+    *: "播放列表已播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRK_ELAPSED
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track elapsed:"
+  </source>
+  <dest>
+    *: "曲目已播放："
+  </dest>
+  <voice>
+    *: "曲目已播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_REMAINING
+  desc: deprecated
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRK_REMAINING
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track remaining:"
+  </source>
+  <dest>
+    *: "曲目剩余："
+  </dest>
+  <voice>
+    *: "曲目剩余"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRACK
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track:"
+  </source>
+  <dest>
+    *: "曲目："
+  </dest>
+  <voice>
+    *: "曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_STORAGE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Storage (Done / Remaining):"
+  </source>
+  <dest>
+    *: "存储 (完� / 剩余)："
+  </dest>
+  <voice>
+    *: "存储"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYTIME_DONE
+  desc: playing time screen
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "完�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_TRACK_SIZE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Average track size:"
+  </source>
+  <dest>
+    *: "平�曲目大�："
+  </dest>
+  <voice>
+    *: "平�曲目大�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_BITRATE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Average bitrate:"
+  </source>
+  <dest>
+    *: "平�比特率："
+  </dest>
+  <voice>
+    *: "平�比特率"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ERROR
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Error while gathering info"
+  </source>
+  <dest>
+    *: "收集信�时出错"
+  </dest>
+  <voice>
+    *: "收集信�时出错"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_TIME
+  desc: onplay menu
+  user: core
+  <source>
+    *: "Playing time"
+  </source>
+  <dest>
+    *: "播放时间"
+  </dest>
+  <voice>
+    *: "播放时间"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CAR_ADAPTER_MODE_DELAY
+  desc: Displayed for setting car adapter mode delay
+  user: core
+  <source>
+    *: none
+    charging: "Delay Before Resume"
+  </source>
+  <dest>
+    *: none
+    charging: "��播放�延迟"
+  </dest>
+  <voice>
+    *: none
+    charging: "��播放�延迟"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PITCH_ABSOLUTE_MODE
+  desc: spoken only
+  user: core
+  <source>
+    *: none
+    pitchscreen: ""
+  </source>
+  <dest>
+    *: none
+    pitchscreen: ""
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: "�对模�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PITCH_SEMITONE_MODE
+  desc: spoken only
+  user: core
+  <source>
+    *: none
+    pitchscreen: ""
+  </source>
+  <dest>
+    *: none
+    pitchscreen: ""
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: "�音模�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PITCH_TIMESTRETCH_MODE
+  desc: spoken only
+  user: core
+  <source>
+    *: none
+    pitchscreen: ""
+  </source>
+  <dest>
+    *: none
+    pitchscreen: ""
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: "时间拉伸"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "Remote Control"
+  </source>
+  <dest>
+    *: "远程控制"
+  </dest>
+  <voice>
+    *: "远程控制"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NO_REM_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "No Rem. Control"
+  </source>
+  <dest>
+    *: "没有远程控制"
+  </dest>
+  <voice>
+    *: "没有远程控制"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OUT_OF_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "Out of Control"
+  </source>
+  <dest>
+    *: "失控"
+  </dest>
+  <voice>
+    *: "失控"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_2_KEY_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "2 Key Control"
+  </source>
+  <dest>
+    *: "�键控制"
+  </dest>
+  <voice>
+    *: "�键控制"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_4_KEY_CONTROL
+  desc: Item for menus
+  user: core
+  <source>
+    *: "4 Key Control"
+  </source>
+  <dest>
+    *: "四键控制"
+  </dest>
+  <voice>
+    *: "四键控制"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_WORMLET
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Play Wormlet!"
+  </source>
+  <dest>
+    *: "播放蠕虫�"
+  </dest>
+  <voice>
+    *: "播放蠕虫"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_WORMS
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Number of Worms"
+  </source>
+  <dest>
+    *: "蠕虫数�"
+  </dest>
+  <voice>
+    *: "蠕虫数�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WORM_GROWTH_PER_FOOD
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Worm Growth Per Food"
+  </source>
+  <dest>
+    *: "�个食物的蠕虫增长速度"
+  </dest>
+  <voice>
+    *: "�个食物的蠕虫增长速度"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WORM_SPEED
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Worm Speed"
+  </source>
+  <dest>
+    *: "蠕虫速度"
+  </dest>
+  <voice>
+    *: "蠕虫速度"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARGHS_PER_FOOD
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Arghs Per Food"
+  </source>
+  <dest>
+    *: "�份食物的 Arghs"
+  </dest>
+  <voice>
+    *: "�份食物的 Arghs"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARGH_SIZE
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Argh Size"
+  </source>
+  <dest>
+    *: "Argh大�"
+  </dest>
+  <voice>
+    *: "大�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FOOD_SIZE
+  desc: For wormlet menu
+  user: core
+  <source>
+    *: "Food Size"
+  </source>
+  <dest>
+    *: "食物大�"
+  </dest>
+  <voice>
+    *: "食物大�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_PLAYERS
+  desc: For game menus
+  user: core
+  <source>
+    *: "Number of Players"
+  </source>
+  <dest>
+    *: "玩家数�"
+  </dest>
+  <voice>
+    *: "玩家数�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONTROL_STYLE
+  desc: In various menus
+  user: core
+  <source>
+    *: "Control Style"
+  </source>
+  <dest>
+    *: "控制风格"
+  </dest>
+  <voice>
+    *: "控制风格"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERT_TO_DEFAULT_SETTINGS
+  desc: In various menus
+  user: core
+  <source>
+    *: "Revert to Default Settings"
+  </source>
+  <dest>
+    *: "��默认设置"
+  </dest>
+  <voice>
+    *: "��默认设置"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_QUIT
+  desc: in various menus
+  user: core
+  <source>
+    *: "Quit"
+  </source>
+  <dest>
+    *: "退出"
+  </dest>
+  <voice>
+    *: "退出"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_DISPLAY_OPTIONS
+  desc: in various menus
+  user: core
+  <source>
+    *: "Display Options"
+  </source>
+  <dest>
+    *: "显示选项"
+  </dest>
+  <voice>
+    *: "显示选项"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREVTRACK
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Previous Track"
+  </source>
+  <dest>
+    *: "上一曲"
+  </dest>
+  <voice>
+    *: "上一曲"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYPAUSE
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Pause / Play"
+  </source>
+  <dest>
+    *: "暂�/播放"
+  </dest>
+  <voice>
+    *: "暂�/播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STOP_PLAYBACK
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Stop Playback"
+  </source>
+  <dest>
+    *: "�止播放"
+  </dest>
+  <voice>
+    *: "�止播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEXTTRACK
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Next Track"
+  </source>
+  <dest>
+    *: "下一曲"
+  </dest>
+  <voice>
+    *: "下一曲"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANGE_VOLUME
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Change Volume"
+  </source>
+  <dest>
+    *: "更改音�"
+  </dest>
+  <voice>
+    *: "更改音�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANGE_SHUFFLE_MODE
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Shuffle Mode"
+  </source>
+  <dest>
+    *: "�机模�"
+  </dest>
+  <voice>
+    *: "�机模�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANGE_REPEAT_MODE
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Change Repeat Mode"
+  </source>
+  <dest>
+    *: "��模�"
+  </dest>
+  <voice>
+    *: "��模�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYBACK_CONTROL
+  desc: in playback control menu
+  user: core
+  <source>
+    *: "Playback Control"
+  </source>
+  <dest>
+    *: "播放器控制"
+  </dest>
+  <voice>
+    *: "播放器控制"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_CHECKMATE
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Checkmate!"
+  </source>
+  <dest>
+    *: "将军��"
+  </dest>
+  <voice>
+    *: "将军"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_ILLEGAL_MOVE
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Illegal move!"
+  </source>
+  <dest>
+    *: "�法移动�"
+  </dest>
+  <voice>
+    *: "�法移动"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_NEW_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "New Game"
+  </source>
+  <dest>
+    *: "新游�"
+  </dest>
+  <voice>
+    *: "新游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESUME_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Resume Game"
+  </source>
+  <dest>
+    *: "继续游�"
+  </dest>
+  <voice>
+    *: "继续游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_SAVE_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Save Game"
+  </source>
+  <dest>
+    *: "�存游�"
+  </dest>
+  <voice>
+    *: "�存游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESTORE_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Restore Game"
+  </source>
+  <dest>
+    *: "��游�"
+  </dest>
+  <voice>
+    *: "��游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESTART_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Restart Game"
+  </source>
+  <dest>
+    *: "�新开始游�"
+  </dest>
+  <voice>
+    *: "�新开始游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_SELECT_OTHER_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Select Other Game"
+  </source>
+  <dest>
+    *: "选择�一个游�"
+  </dest>
+  <voice>
+    *: "选择�一个游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_1
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 1: 60 moves / 5 min"
+  </source>
+  <dest>
+    *: "Level 1: 60 步 / 5 分钟"
+  </dest>
+  <voice>
+    *: "Level 1, 60 步 �5 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_2
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 2: 60 moves / 15 min"
+  </source>
+  <dest>
+    *: "Level 2: 60 步 / 15 分钟"
+  </dest>
+  <voice>
+    *: "Level 2, 60 步 �15 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_3
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 3: 60 moves / 30 min"
+  </source>
+  <dest>
+    *: "Level 3: 60 步 / 30 分钟"
+  </dest>
+  <voice>
+    *: "Level 3, 60 步 �30 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_4
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 4: 40 moves / 30 min"
+  </source>
+  <dest>
+    *: "Level 4: 40 步 / 30 分钟"
+  </dest>
+  <voice>
+    *: "Level 4, 40 步 �30 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_5
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 5: 40 moves / 60 min"
+  </source>
+  <dest>
+    *: "Level 5: 40 步 / 60 分钟"
+  </dest>
+  <voice>
+    *: "Level 5, 40 步 �60 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_6
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 6: 40 moves / 120 min"
+  </source>
+  <dest>
+    *: "Level 6: 40 步 / 120 分钟"
+  </dest>
+  <voice>
+    *: "Level 6, 40 步 �120 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_7
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 7: 40 moves / 240 min"
+  </source>
+  <dest>
+    *: "Level 7: 40 步 / 240 分钟"
+  </dest>
+  <voice>
+    *: "Level 7, 40 步 �240 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_8
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 8: 1 move / 15 min"
+  </source>
+  <dest>
+    *: "Level 8: 1 步 / 15 分钟"
+  </dest>
+  <voice>
+    *: "Level 8, 1 步 �15 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_9
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 9: 1 move / 60 min"
+  </source>
+  <dest>
+    *: "Level 9: 1 步 / 60 分钟"
+  </dest>
+  <voice>
+    *: "Level 9, 1 步 �60 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_10
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 10: 1 move / 600 min"
+  </source>
+  <dest>
+    *: "Level 10: 1 步 / 600 分钟"
+  </dest>
+  <voice>
+    *: "Level 10, 1 步 � 600 分钟"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_PGN_PARSE_ERROR
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "Error parsing game !"
+  </source>
+  <dest>
+    *: "解�游�时出错�"
+  </dest>
+  <voice>
+    *: "解�游�时出错�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_NO_GAMES
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "No games found !"
+  </source>
+  <dest>
+    *: "未找到游��"
+  </dest>
+  <voice>
+    *: "未找到游��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAME_BEGINNING
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "At the beginning of the game"
+  </source>
+  <dest>
+    *: "游�刚开始"
+  </dest>
+  <voice>
+    *: "游�刚开始"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAME_END
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "At the end of the game"
+  </source>
+  <dest>
+    *: "游�结�时"
+  </dest>
+  <voice>
+    *: "游�结�时"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYER
+  desc: spoken only, for announcing player's id
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "玩家"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_GNUCHESS
+  desc: spoken only, for announcing player's id
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "GNU 象棋"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_MARKED
+  desc: spoken only, for announcing chess piece marking
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "已标记"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_UNMARKED
+  desc: spoken only, for announcing chess piece unmarking
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�消标记"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_WHITE
+  desc: spoken only, for announcing chess piece color
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "白"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BLACK
+  desc: spoken only, for announcing chess piece color
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "黑"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_CHECK
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "将军�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_CAPTURES
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_CASTLE
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "城堡"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_KINGSIDE
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "王翼"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHESSBOX_QUEENSIDE
+  desc: spoken only, for announcing chess moves
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�翼"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PAWN
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "å…µ"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_KNIGHT
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "马"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BISHOP
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "象"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_ROOK
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "å±…"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUEEN
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_KING
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "王"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAMES
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Games"
+  </source>
+  <dest>
+    *: "游�"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_SAVING_POSITION
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Saving position"
+  </source>
+  <dest>
+    *: "�存�置"
+  </dest>
+  <voice>
+    *: "�存�置"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LOADING_POSITION
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Loading position"
+  </source>
+  <dest>
+    *: "加载�置"
+  </dest>
+  <voice>
+    *: "加载�置"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_THINKING
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Thinking..."
+  </source>
+  <dest>
+    *: "�考中……"
+  </dest>
+  <voice>
+    *: "�考中"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BATTERY_BENCH_IS_ALREADY_RUNNING
+  desc: Spoken if battery bench is already running
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "电池检测已在�行中"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BAT_BENCH_KEYS
+  desc: Battery bench start up message
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "请按播放键�行电池检测或者按�止键�消"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CANNOT_RESTART_PLAYBACK
+  desc: cannot restart playback splash in imageviewer
+  user: core
+  <source>
+    *: "Cannot restart playback"
+  </source>
+  <dest>
+    *: "无法��播放"
+  </dest>
+  <voice>
+    *: "无法��播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ORDERED
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Ordered"
+  </source>
+  <dest>
+    *: "已排�"
+  </dest>
+  <voice>
+    *: "已排�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFUSION
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Diffusion"
+  </source>
+  <dest>
+    *: "弥散"
+  </dest>
+  <voice>
+    *: "弥散"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GRAYSCALE
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Grayscale"
+  </source>
+  <dest>
+    *: "�度"
+  </dest>
+  <voice>
+    *: "��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLIDESHOW_MODE
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Toggle Slideshow Mode"
+  </source>
+  <dest>
+    *: "切�幻�片放映模�"
+  </dest>
+  <voice>
+    *: "切�幻�片放映模�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLIDESHOW_TIME
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Slideshow Time"
+  </source>
+  <dest>
+    *: "幻�片放映时间"
+  </dest>
+  <voice>
+    *: "幻�片放映时间"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RETURN
+  desc: in various plugin menus
+  user: core
+  <source>
+    *: "Return"
+  </source>
+  <dest>
+    *: "返回"
+  </dest>
+  <voice>
+    *: "返回"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REC_DIR
+  desc: used in the info screen to show a recording dir
+  user: core
+  <source>
+    *: none
+    recording: "Recording Directory"
+  </source>
+  <dest>
+    *: none
+    recording: "录制目录"
+  </dest>
+  <voice>
+    *: none
+    recording: "录制目录"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_VIEW_GAMES
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "View Played Games"
+  </source>
+  <dest>
+    *: "查看已游玩的游�"
+  </dest>
+  <voice>
+    *: "查看已游玩的游�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_AUDIO_OPTIONS
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Audio Options"
+    lowmem: none
+  </source>
+  <dest>
+    *: "音频选项"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "音频选项"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_RESUME_OPTIONS
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Resume Options"
+    lowmem: none
+  </source>
+  <dest>
+    *: "��选项"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "��选项"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_PLAY_MODE
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Play Mode"
+    lowmem: none
+  </source>
+  <dest>
+    *: "播放模�"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "播放模�"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SINGLE
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Single"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�曲播放"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�曲播放"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_SOUND_SETTING
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Use sound setting"
+    lowmem: none
+  </source>
+  <dest>
+    *: "使用声音设置"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "使用声音设置"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESTART_PLAYBACK
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Play from beginning"
+    lowmem: none
+  </source>
+  <dest>
+    *: "从头播放"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "从头播放"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_RESUME_TIME
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Set resume time (min)"
+    lowmem: none
+  </source>
+  <dest>
+    *: "设置��时间（分钟）"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "设置��时间"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_FPS
+  desc: in the mpegplayer and pictureflow settings menus
+  user: core
+  <source>
+    *: "Display FPS"
+  </source>
+  <dest>
+    *: "显示帧率（FPS）"
+  </dest>
+  <voice>
+    *: "显示帧率"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIMIT_FPS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Limit FPS"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�制帧率"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�制帧率"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_FRAMES
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Skip frames"
+    lowmem: none
+  </source>
+  <dest>
+    *: "跳帧"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "跳帧"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_BRIGHTNESS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Backlight brightness"
+    lowmem: none
+  </source>
+  <dest>
+    *: "背光亮度"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "背光亮度"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_COMMON_SETTING
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Use common setting"
+    lowmem: none
+  </source>
+  <dest>
+    *: "使用通常设定"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "使用通常设定"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TONE_CONTROLS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Tone controls"
+    lowmem: none
+  </source>
+  <dest>
+    *: "音调控制"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "音调控制"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FORCE_START_MENU
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Start menu"
+    lowmem: none
+  </source>
+  <dest>
+    *: "显示��"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "显示��"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONDITIONAL_START_MENU
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Start menu if not completed"
+    lowmem: none
+  </source>
+  <dest>
+    *: "显示��（如果未播完）"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "未播完时显示��"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTO_RESUME
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Resume automatically"
+    lowmem: none
+  </source>
+  <dest>
+    *: "自动��播放"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "自动��播放"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL_RESUMES
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Clear all resumes"
+    lowmem: none
+  </source>
+  <dest>
+    *: "清除全部��点"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "清除全部��点"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UNAVAILABLE
+  desc: in mpegplayer settings
+  user: core
+  <source>
+    *: "Unavailable"
+    lowmem: none
+  </source>
+  <dest>
+    *: "��用"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "��用"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOGGLE_ITEM
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Toggle Item"
+  </source>
+  <dest>
+    *: "切�项目"
+  </dest>
+  <voice>
+    *: "切�项目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOVE_ITEM_UP
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Move Item Up"
+  </source>
+  <dest>
+    *: "上移项目"
+  </dest>
+  <voice>
+    *: "上移项目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOVE_ITEM_DOWN
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Move Item Down"
+  </source>
+  <dest>
+    *: "下移项目"
+  </dest>
+  <voice>
+    *: "下移项目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LOAD_DEFAULT_CONFIGURATION
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Load Default Configuration"
+  </source>
+  <dest>
+    *: "加载默认设定"
+  </dest>
+  <voice>
+    *: "加载默认设定"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_EXIT
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Save and Exit"
+  </source>
+  <dest>
+    *: "�存并退出"
+  </dest>
+  <voice>
+    *: "�存并退出"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_MENU_ORDER
+  desc: main_menu_config plugin title
+  user: core
+  <source>
+    *: "Rockbox Main Menu Order"
+  </source>
+  <dest>
+    *: "Rockbox主�幕��定制"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_PATH
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Path]"
+  </source>
+  <dest>
+    *: "[路径]"
+  </dest>
+  <voice>
+    *: "路径"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILENAME
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Filename]"
+  </source>
+  <dest>
+    *: "[文件�]"
+  </dest>
+  <voice>
+    *: "文件�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_SIZE
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Size]"
+  </source>
+  <dest>
+    *: "[大�]"
+  </dest>
+  <voice>
+    *: "大�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_DATE
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Date]"
+  </source>
+  <dest>
+    *: "[日期]"
+  </dest>
+  <voice>
+    *: "日期"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_TIME
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Time]"
+  </source>
+  <dest>
+    *: "[时间]"
+  </dest>
+  <voice>
+    *: "时间"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_SUBDIRS
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Subdirs]"
+  </source>
+  <dest>
+    *: "[�目录数]"
+  </dest>
+  <voice>
+    *: "�目录数"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "[Files]"
+  </source>
+  <dest>
+    *: "[文件数]"
+  </dest>
+  <voice>
+    *: "文件数"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_DIRECTORY_PROPERTIES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "Directory properties"
+  </source>
+  <dest>
+    *: "目录属性"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILE_PROPERTIES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "File properties"
+  </source>
+  <dest>
+    *: "文件属性"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FAIL
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "Failed to gather information"
+  </source>
+  <dest>
+    *: "收集数�失败"
+  </dest>
+  <voice>
+    *: "收集数�失败"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SWAP_CHANNELS
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Swap Channels"
+  </source>
+  <dest>
+    *: "交�频�"
+  </dest>
+  <voice>
+    *: "交�频�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PANNING_SEPARATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Panning Separation"
+    lowmem: none
+  </source>
+  <dest>
+    *: "平移分离"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "平移分离"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REVERBERATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Reverberation"
+    lowmem: none
+  </source>
+  <dest>
+    *: "混�"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "混�"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INTERPOLATION
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Interpolation"
+    lowmem: none
+  </source>
+  <dest>
+    *: "�值"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "�值"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_SURROUND
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "Surround"
+    lowmem: none
+  </source>
+  <dest>
+    *: "环绕"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "环绕"
+    lowmem: none
+  </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>
+    *: "高�混�器"
+    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: LANG_CPU_BOOST
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "CPU Boost"
+    lowmem: none
+  </source>
+  <dest>
+    *: "CPU加速"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "C P U加速"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPACING
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Spacing"
+  </source>
+  <dest>
+    *: "é—´è·�"
+  </dest>
+  <voice>
+    *: "é—´è·�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CENTRE_MARGIN
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Centre margin"
+  </source>
+  <dest>
+    *: "中心边�"
+  </dest>
+  <voice>
+    *: "中心边�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_SLIDES
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Number of slides"
+  </source>
+  <dest>
+    *: "幻�片数�"
+  </dest>
+  <voice>
+    *: "幻�片数�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ZOOM
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Zoom"
+  </source>
+  <dest>
+    *: "缩放"
+  </dest>
+  <voice>
+    *: "缩放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALBUM_TITLE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Show album title"
+  </source>
+  <dest>
+    *: "显示专辑标题"
+  </dest>
+  <voice>
+    *: "显示专辑标题"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESIZE_COVERS
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Resize Covers"
+  </source>
+  <dest>
+    *: "�设��大�"
+  </dest>
+  <voice>
+    *: "�设��大�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REBUILD_CACHE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Rebuild cache"
+  </source>
+  <dest>
+    *: "�建缓存"
+  </dest>
+  <voice>
+    *: "�建缓存"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WPS_INTEGRATION
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "WPS Integration"
+  </source>
+  <dest>
+    *: "播放时�幕集�"
+  </dest>
+  <voice>
+    *: "播放时�幕集�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_WPS
+  desc: in the pictureflow main menu
+  user: core
+  <source>
+    *: "Go to WPS"
+  </source>
+  <dest>
+    *: "去 播放�幕"
+  </dest>
+  <voice>
+    *: "去 播放�幕"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Hide album title"
+  </source>
+  <dest>
+    *: "��专辑标题"
+  </dest>
+  <voice>
+    *: "��专辑标题"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show at the bottom"
+  </source>
+  <dest>
+    *: "在底部显示"
+  </dest>
+  <voice>
+    *: "在底部显示"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show at the top"
+  </source>
+  <dest>
+    *: "在顶部显示"
+  </dest>
+  <voice>
+    *: "在顶部显示"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIRECT
+  desc: in the pictureflow settings, also a volume adjustment mode
+  user: core
+  <source>
+    *: "Direct"
+  </source>
+  <dest>
+    *: "直接"
+  </dest>
+  <voice>
+    *: "直接"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIA_TRACK_LIST
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Via Track list"
+  </source>
+  <dest>
+    *: "通过曲目列表"
+  </dest>
+  <voice>
+    *: "通过曲目列表"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ON
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Always On"
+  </source>
+  <dest>
+    *: "始终开�"
+  </dest>
+  <voice>
+    *: "始终开�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NO_ALBUMART_FOUND
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "No album art found"
+  </source>
+  <dest>
+    *: "未找到专辑艺术"
+  </dest>
+  <voice>
+    *: "未找到专辑艺术"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CACHE_REBUILT_NEXT_RESTART
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "Cache will be rebuilt on next restart"
+  </source>
+  <dest>
+    *: "下次�动时�建缓存"
+  </dest>
+  <voice>
+    *: "下次�动时�建缓存"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ERROR_WRITING_CONFIG
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "Error writing config"
+  </source>
+  <dest>
+    *: "写入�置时出错"
+  </dest>
+  <voice>
+    *: "写入�置时出错"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NOT_A_VBR_FILE
+  desc: in vbrfix plugin
+  user: core
+  <source>
+    *: "Not a VBR file"
+  </source>
+  <dest>
+    *: "�是VBR文件"
+  </dest>
+  <voice>
+    *: "�是VBR文件"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILE_ERROR
+  desc: in vbrfix plugin
+  user: core
+  <source>
+    *: "File error: %d"
+  </source>
+  <dest>
+    *: "文件错误: %d"
+  </dest>
+  <voice>
+    *: "文件错误"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UPDATE_CACHE
+  desc: in pictureflow
+  user: core
+  <source>
+    *: "Update cache"
+  </source>
+  <dest>
+    *: "更新缓存"
+  </dest>
+  <voice>
+    *: "更新缓存"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Hide information"
+  </source>
+  <dest>
+    *: "��信�"
+  </dest>
+  <voice>
+    *: "��信�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album at the bottom"
+  </source>
+  <dest>
+    *: "在底部显示专辑"
+  </dest>
+  <voice>
+    *: "在底部显示专辑"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album at the top"
+  </source>
+  <dest>
+    *: "在顶部显示专辑"
+  </dest>
+  <voice>
+    *: "在顶部显示专辑"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALL_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album and artist at the top"
+  </source>
+  <dest>
+    *: "在顶部显示专辑和艺术家"
+  </dest>
+  <voice>
+    *: "在顶部显示专辑和艺术家"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALL_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album and artist at the bottom"
+  </source>
+  <dest>
+    *: "在底部显示专辑和艺术家"
+  </dest>
+  <voice>
+    *: "在底部显示专辑和艺术家"
+  </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>
+    *: "请按LEFT键�消。"
+    android,hifietma*,zenvision: "请按BACK键�消。"
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "请按POWER键�消。"
+    ihifi760,ihifi960: "�击RETURN键�消。"
+    ihifi770,ihifi770c,ihifi800: "请按HOME键�消。"
+    iriverh10,samsungyh*: "�击LEFT键�消。"
+    mpiohd200: "�击REC键�消。"
+    mpiohd300: "�击MENU键�消。"
+    rx27generic: "请按VOLUME键�消。"
+    sonynwza860: "键盘映射�完整。"
+    touchscreen: "请按Middle Left键�消。"
+    vibe500: "请按PREV键�消。"
+    xduoox20,xduoox3ii: "�击HOME键�消。"
+    xduoox3: "�击 HOME键�消。"
+  </dest>
+  <voice>
+    *: "请按LEFT键�消"
+    android,hifietma*,zenvision: "请按BACK键�消"
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "请按POWER键�消"
+    ihifi760,ihifi960: "�击RETURN键�消"
+    ihifi770,ihifi770c,ihifi800: "请按HOME键�消"
+    iriverh10,samsungyh*: "�击LEFT键�消"
+    mpiohd200: "�击REC键�消。"
+    mpiohd300: "�击MENU键�消。"
+    rx27generic: "请按VOLUME键�消。"
+    touchscreen: "请按Middle Left键�消"
+    vibe500: "请按PREV键�消"
+    xduoox20,xduoox3,xduoox3ii: "�击HOME键�消"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DATE
+  desc: for constructing time and date announcements
+  user: core
+  <source>
+    *: "Date"
+  </source>
+  <dest>
+    *: "日期"
+  </dest>
+  <voice>
+    *: "日期"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL
+  desc:
+  user: core
+  <source>
+    *: "Clear all"
+  </source>
+  <dest>
+    *: "全清除"
+  </dest>
+  <voice>
+    *: "全清除"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CANCEL_0
+  desc: CANCEL.
+  user: core
+  <source>
+    *: "Cancel"
+  </source>
+  <dest>
+    *: "�消"
+  </dest>
+  <voice>
+    *: "�消"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE
+  desc:
+  user: core
+  <source>
+    *: "Save"
+  </source>
+  <dest>
+    *: "�存"
+  </dest>
+  <voice>
+    *: "�存"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIMEOUT
+  desc:
+  user: core
+  <source>
+    *: "Timeout"
+  </source>
+  <dest>
+    *: "超时"
+  </dest>
+  <voice>
+    *: "超时"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK
+  desc: used in track x of y constructs
+  user: core
+  <source>
+    *: "Track"
+  </source>
+  <dest>
+    *: "曲目"
+  </dest>
+  <voice>
+    *: "曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ELAPSED
+  desc: prefix for elapsed playtime announcement
+  user: core
+  <source>
+    *: "Elapsed"
+  </source>
+  <dest>
+    *: "过去了"
+  </dest>
+  <voice>
+    *: "过去了"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCEMENT_FMT
+  desc: format for wps hotkey announcement
+  user: core
+  <source>
+    *: none
+    hotkey: "Announcement format"
+  </source>
+  <dest>
+    *: none
+    hotkey: "通知格�"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "通知格�"
+  </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: "剩余"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "剩余"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GROUPING
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Grouping"
+  </source>
+  <dest>
+    *: none
+    hotkey: "组"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "组"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCE_ON
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Announce on"
+  </source>
+  <dest>
+    *: none
+    hotkey: "通知�用"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "通知�用"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_CHANGE
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Track change"
+  </source>
+  <dest>
+    *: none
+    hotkey: "曲目�更"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "曲目�更"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOLD_FOR_SETTINGS
+  desc:
+  user: core
+  <source>
+    *: none
+    hotkey: "Hold for settings"
+  </source>
+  <dest>
+    *: none
+    hotkey: "按HOLD键设置"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "按HOLD键设置"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN
+  desc: onplay open plugin
+  user: core
+  <source>
+    *: "Open Plugin"
+  </source>
+  <dest>
+    *: "打开�件"
+  </dest>
+  <voice>
+    *: "打开�件"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN_NOT_A_PLUGIN
+  desc: open plugin module
+  user: core
+  <source>
+    *: "Not a plugin: %s"
+  </source>
+  <dest>
+    *: "�是�件: %s"
+  </dest>
+  <voice>
+    *: "�是�件"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
+  desc: open plugin module
+  user: core
+  <source>
+    *: "Set Wps Context Plugin"
+  </source>
+  <dest>
+    *: "设置播放�幕上下文�件"
+  </dest>
+  <voice>
+    *: "设置播放�幕上下文�件"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PARAMETER
+  desc:
+  user: core
+  <source>
+    *: "Parameter"
+  </source>
+  <dest>
+    *: "�数"
+  </dest>
+  <voice>
+    *: "�数"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NAME
+  desc:
+  user: core
+  <source>
+    *: "Name"
+  </source>
+  <dest>
+    *: "�字"
+  </dest>
+  <voice>
+    *: "�字"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD
+  desc:
+  user: core
+  <source>
+    *: "Add"
+  </source>
+  <dest>
+    *: "添加"
+  </dest>
+  <voice>
+    *: "添加"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACK
+  desc:
+  user: core
+  <source>
+    *: "Back"
+  </source>
+  <dest>
+    *: "返回"
+  </dest>
+  <voice>
+    *: "返回"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EDIT
+  desc:
+  user: core
+  <source>
+    *: "Edit"
+  </source>
+  <dest>
+    *: "编辑"
+  </dest>
+  <voice>
+    *: "编辑"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RUN
+  desc:
+  user: core
+  <source>
+    *: "Run"
+  </source>
+  <dest>
+    *: "�行"
+  </dest>
+  <voice>
+    *: "�行"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EXPORT
+  desc:
+  user: core
+  <source>
+    *: "Export"
+  </source>
+  <dest>
+    *: "导出"
+  </dest>
+  <voice>
+    *: "导出"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSE
+  desc:
+  user: core
+  <source>
+    *: "Browse"
+  </source>
+  <dest>
+    *: "�览"
+  </dest>
+  <voice>
+    *: "�览"
+  </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>
+    *: "进入USB大容�存储模��？"
+  </dest>
+  <voice>
+    *: "是�进入USB大容�存储模�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QUEUE_MENU
+  desc: in onplay menu
+  user: core
+  <source>
+    *: "Queue..."
+  </source>
+  <dest>
+    *: "队列..."
+  </dest>
+  <voice>
+    *: "队列"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_QUEUE_OPTIONS
+  desc: in Current Playlist settings
+  user: core
+  <source>
+    *: "Show Queue Options"
+  </source>
+  <dest>
+    *: "显示队列选项"
+  </dest>
+  <voice>
+    *: "显示队列选项"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUFFLED_ADDING_OPTIONS
+  desc: in Current Playlist settings
+  user: core
+  <source>
+    *: "Show Shuffled Adding Options"
+  </source>
+  <dest>
+    *: "显示�机添加选项"
+  </dest>
+  <voice>
+    *: "显示�机添加选项"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_IN_SUBMENU
+  desc: in Settings
+  user: core
+  <source>
+    *: "In Submenu"
+  </source>
+  <dest>
+    *: "�目录中"
+  </dest>
+  <voice>
+    *: "�目录中"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_DISABLE_ALL_NOTIFY
+  desc: disable all softlock notifications
+  user: core
+  <source>
+    *: "Disable All Lock Notifications"
+  </source>
+  <dest>
+    *: "�用所有�定通知"
+  </dest>
+  <voice>
+    *: "�用所有�定通知"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_VOLUME
+  desc: exempt volume from softlock
+  user: core
+  <source>
+    *: "Exempt Volume"
+  </source>
+  <dest>
+    *: "调节音�时��"
+  </dest>
+  <voice>
+    *: "调节音�时��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_ALWAYSAUTOLOCK
+  desc: always prime autolock
+  user: core
+  <source>
+    *: "Always Autolock"
+  </source>
+  <dest>
+    *: "永远自动�定"
+  </dest>
+  <voice>
+    *: "永远自动�定"
+  </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>
+    *: "Ymd"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_WRAPAROUND
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Wraparound"
+  </source>
+  <dest>
+    *: "列表环绕"
+  </dest>
+  <voice>
+    *: "列表环绕"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUTDOWN_MESSAGE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show Shutdown Message"
+  </source>
+  <dest>
+    *: "显示关机信�"
+  </dest>
+  <voice>
+    *: "显示关机信�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Order"
+  </source>
+  <dest>
+    *: "列表顺�"
+  </dest>
+  <voice>
+    *: "列表顺�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ASCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Ascending"
+  </source>
+  <dest>
+    *: "上�"
+  </dest>
+  <voice>
+    *: "上�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DESCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Descending"
+  </source>
+  <dest>
+    *: "下�"
+  </dest>
+  <voice>
+    *: "下�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUM_ART
+  desc: in Settings
+  user: core
+  <source>
+    *: "Album Art"
+  </source>
+  <dest>
+    *: "专辑����"
+  </dest>
+  <voice>
+    *: "专辑����"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_EMBEDDED
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Embedded"
+  </source>
+  <dest>
+    *: "内置优先"
+  </dest>
+  <voice>
+    *: "内置优先"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_IMAGE_FILE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Image File"
+  </source>
+  <dest>
+    *: "图片文件优先"
+  </dest>
+  <voice>
+    *: "图片文件优先"
+  </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: "�步RDS时间"
+  </dest>
+  <voice>
+    *: none
+    rds: "�步RDS时间"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_ALBUMS_BY
+  desc: in Settings
+  user: core
+  <source>
+    *: "Sort albums by"
+  </source>
+  <dest>
+    *: "排�专辑通过…"
+  </dest>
+  <voice>
+    *: "专辑排�方�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTIST_PLUS_NAME
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Name"
+  </source>
+  <dest>
+    *: "艺术家 + 曲�"
+  </dest>
+  <voice>
+    *: "艺术家 + 曲�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTIST_PLUS_YEAR
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Year"
+  </source>
+  <dest>
+    *: "艺术家 + 年份"
+  </dest>
+  <voice>
+    *: "艺术家 + 年份"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YEAR_SORT_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "Year sort order"
+  </source>
+  <dest>
+    *: "年份顺�"
+  </dest>
+  <voice>
+    *: "年份顺�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_YEAR_IN_ALBUM_TITLE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show year in album title"
+  </source>
+  <dest>
+    *: "在专辑标题中显示年份"
+  </dest>
+  <voice>
+    *: "在专辑标题中显示年份"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WAIT_FOR_CACHE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Cache needs to finish updating first!"
+  </source>
+  <dest>
+    *: "缓存需�先完�更新�"
+  </dest>
+  <voice>
+    *: "缓存需�先完�更新�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_INFO
+  desc: Track Info Title
+  user: core
+  <source>
+    *: "Track Info"
+  </source>
+  <dest>
+    *: "曲目信�"
+  </dest>
+  <voice>
+    *: "曲目信�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY
+  desc: play selected file/directory, in playlist context menu
+  user: core
+  <source>
+    *: "Play"
+  </source>
+  <dest>
+    *: "播放"
+  </dest>
+  <voice>
+    *: "播放"
+  </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>
+    *: "�机播放"
+  </dest>
+  <voice>
+    *: "�机播放"
+  </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>
+    *: "替�播放列表时��当�曲目"
+  </dest>
+  <voice>
+    *: "替�播放列表时��当�曲目"
+  </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: "�动时按�RESET按钮清除设置"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "�动时打开HOLD开关清除设置"
+  </dest>
+  <voice>
+    *: none
+    clear_settings_on_hold,iriverh10: "�动时按�RESET按钮清除设置"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "�动时打开HOLD开关清除设置"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REWIND_ACROSS_TRACKS
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: "Rewind Across Tracks"
+  </source>
+  <dest>
+    *: "跨轨�倒带"
+  </dest>
+  <voice>
+    *: "跨轨�倒带"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_AS
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Set As..."
+  </source>
+  <dest>
+    *: "设置为…"
+  </dest>
+  <voice>
+    *: "设置为"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playlist Directory"
+  </source>
+  <dest>
+    *: "播放列表目录"
+  </dest>
+  <voice>
+    *: "播放列表目录"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_START_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Start Directory"
+  </source>
+  <dest>
+    *: "开始目录"
+  </dest>
+  <voice>
+    *: "开始目录"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: none
+    recording: "Recording Directory"
+  </source>
+  <dest>
+    *: none
+    recording: "录制目录"
+  </dest>
+  <voice>
+    *: none
+    recording: "录制目录"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Playlist..."
+  </source>
+  <dest>
+    *: "添加到播放列表…"
+  </dest>
+  <voice>
+    *: "添加到播放列表…"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_EXISTING_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Existing Playlist"
+  </source>
+  <dest>
+    *: "添加到现存播放列表"
+  </dest>
+  <voice>
+    *: "添加到现存播放列表"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playing Next..."
+  </source>
+  <dest>
+    *: "下一首播放…"
+  </dest>
+  <voice>
+    *: "下一首播放…"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Next"
+  </source>
+  <dest>
+    *: "下一首播放"
+  </dest>
+  <voice>
+    *: "下一首播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add Shuffled"
+  </source>
+  <dest>
+    *: "添加�机"
+  </dest>
+  <voice>
+    *: "添加�机"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last"
+  </source>
+  <dest>
+    *: "最�播放"
+  </dest>
+  <voice>
+    *: "最�播放"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last Shuffled"
+  </source>
+  <dest>
+    *: "播放列表�机"
+  </dest>
+  <voice>
+    *: "播放列表�机"
+  </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: "音�调节模�"
+  </dest>
+  <voice>
+    *: none
+    perceptual_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: "音�调节档数"
+  </dest>
+  <voice>
+    *: none
+    perceptual_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: "感性"
+  </dest>
+  <voice>
+    *: none
+    perceptual_volume: "感性"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_TRACKS_WHILE_BROWSING
+  desc: in PictureFlow Main Menu
+  user: core
+  <source>
+    *: "Show Tracks While Browsing"
+  </source>
+  <dest>
+    *: "�览时显示曲目"
+  </dest>
+  <voice>
+    *: "�览时显示曲目"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_LAST_ALBUM
+  desc: in PictureFlow Main Menu
+  user: core
+  <source>
+    *: "Go to Last Album"
+  </source>
+  <dest>
+    *: "去最�一个曲目"
+  </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>
+    *: "快速（忽略目录缓存）"
+  </dest>
+  <voice>
+    *: "快速（忽略目录缓存）"
+  </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>
+    *: "设置迷宫大�"
+  </dest>
+  <voice>
+    *: "设置迷宫大�"
+  </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>
+    *: "使用大瓷砖"
+  </dest>
+  <voice>
+    *: "使用大瓷砖"
+  </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>
+    *: "Mikmod 设置"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_MENU
+  desc: mikmod plugin
+  user: core
+  <source>
+    *: "Mikmod Menu"
+  </source>
+  <dest>
+    *: "Mikmod ��"
+  </dest>
+  <voice>
+    *: "Mikmod ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU
+  desc: chessbox plugin
+  user: core
+  <source>
+    *: "Chessbox Menu"
+  </source>
+  <dest>
+    *: "Chessbox ��"
+  </dest>
+  <voice>
+    *: "Chess box ��"
+  </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: VOICE_LANG_NAME
+  desc: Spoken name of the language
+  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_REMAINING
+  desc: Playing Time
+  user: core
+  <source>
+    *: "Remaining"
+  </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_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/czech.lang b/apps/lang/czech.lang
index 63224db4f3..e3d79c91fa 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -12926,16 +12926,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Uplynulo"
+    *: "Uplynulo"
   </dest>
   <voice>
-    *: none
-    hotkey: "Uplynulo"
+    *: "Uplynulo"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 096a945bd9..3ea025b1ac 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -3271,7 +3271,7 @@
   </dest>
   <voice>
     *: none
-    buttonlight_brightness: "Tastenbeleuchtung: Helligkeit"
+    buttonlight_brightness: "Tastenbeleuchtung Helligkeit"
   </voice>
 </phrase>
 <phrase>
@@ -5917,7 +5917,7 @@
     *: "Frei:"
   </dest>
   <voice>
-    *: "Freier Plattenplatz:"
+    *: "Freier Plattenplatz"
   </voice>
 </phrase>
 <phrase>
@@ -7031,7 +7031,7 @@
     *: "Modus:"
   </dest>
   <voice>
-    *: "Modus:"
+    *: "Modus"
   </voice>
 </phrase>
 <phrase>
@@ -8693,7 +8693,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Uhrzeit:"
+    rtc: "Uhrzeit"
   </voice>
 </phrase>
 <phrase>
@@ -10363,7 +10363,7 @@
     *: "Danach:"
   </dest>
   <voice>
-    *: "Danach:"
+    *: "Danach"
   </voice>
 </phrase>
 <phrase>
@@ -10628,7 +10628,7 @@
     *: "Nächster Titel:"
   </dest>
   <voice>
-    *: "Nächster Titel:"
+    *: "Nächster Titel"
   </voice>
 </phrase>
 <phrase>
@@ -11221,7 +11221,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Signalstärke:"
+    radio: "Signalstärke"
   </voice>
 </phrase>
 <phrase>
@@ -12091,7 +12091,7 @@
     *: "Level 5: 40 Züge/ 60 min"
   </dest>
   <voice>
-    *: "Level 5: 40 Züge pro 60 Minuten"
+    *: "Level 5, 40 Züge pro 60 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -12391,7 +12391,7 @@
     *: "Level 1: 60 Züge/ 5 min"
   </dest>
   <voice>
-    *: "Level 1: 60 Züge pro 5 Minuten"
+    *: "Level 1, 60 Züge pro 5 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -12565,7 +12565,7 @@
     *: "Level 2: 60 Züge / 15 min"
   </dest>
   <voice>
-    *: "Level 2: 60 Züge pro 15 Minuten"
+    *: "Level 2, 60 Züge pro 15 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -12773,7 +12773,7 @@
     *: "Level 7: 40 Züge / 240 min"
   </dest>
   <voice>
-    *: "Level 7: 40 Züge pro 240 Minuten"
+    *: "Level 7, 40 Züge pro 240 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -13068,7 +13068,7 @@
     *: "Level 9: 1 Züge / 60 min"
   </dest>
   <voice>
-    *: "Level 9: 1 Züge pro 60 Minuten"
+    *: "Level 9, 1 Züge pro 60 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -13183,7 +13183,7 @@
     *: "Level 3: 60 Züge / 30 min"
   </dest>
   <voice>
-    *: "Level 3: 60 Züge pro 30 Minuten"
+    *: "Level 3, 60 Züge pro 30 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -13708,7 +13708,7 @@
     *: "Level 4: 40 Züge / 30 min"
   </dest>
   <voice>
-    *: "Level 4: 40 Züge pro 30 Minuten"
+    *: "Level 4, 40 Züge pro 30 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14084,7 +14084,7 @@
     *: "Level 6: 40 Züge / 120 min"
   </dest>
   <voice>
-    *: "Level 6: 40 Züge pro 120 Minuten"
+    *: "Level 6, 40 Züge pro 120 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14334,7 +14334,7 @@
     *: "Level 10: 1 Zug / 600 min"
   </dest>
   <voice>
-    *: "Level 10: 1 Zug pro 600 Minuten"
+    *: "Level 10, 1 Zug pro 600 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -14404,7 +14404,7 @@
     *: "Level 8: 1 Zug / 15 min"
   </dest>
   <voice>
-    *: "Level 8: 1 Zug pro 15 Minuten"
+    *: "Level 8, 1 Zug pro 15 Minuten"
   </voice>
 </phrase>
 <phrase>
@@ -15020,16 +15020,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Vergangen"
+    *: "Vergangen"
   </dest>
   <voice>
-    *: none
-    hotkey: "Vergangen"
+    *: "Vergangen"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/english-us.lang b/apps/lang/english-us.lang
index f3dba7008c..4cc52ede38 100644
--- a/apps/lang/english-us.lang
+++ b/apps/lang/english-us.lang
@@ -5644,7 +5644,7 @@
   </dest>
   <voice>
     *: none
-    remote: "(Vol- : Re-enable)"
+    remote: "(Volume minus to Re-enable)"
   </voice>
 </phrase>
 <phrase>
@@ -5926,7 +5926,7 @@
     *: "Free:"
   </dest>
   <voice>
-    *: "Free diskspace:"
+    *: "Free disk space"
   </voice>
 </phrase>
 <phrase>
@@ -7040,7 +7040,7 @@
     *: "Mode:"
   </dest>
   <voice>
-    *: "Mode:"
+    *: "Mode"
   </voice>
 </phrase>
 <phrase>
@@ -7366,7 +7366,7 @@
   </dest>
   <voice>
     *: none
-    charging: "Battery: Charging"
+    charging: "Battery is Charging"
   </voice>
 </phrase>
 <phrase>
@@ -8702,7 +8702,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -10682,7 +10682,7 @@
     *: "Next Track:"
   </dest>
   <voice>
-    *: "Next Track:"
+    *: "Next Track"
   </voice>
 </phrase>
 <phrase>
@@ -10696,7 +10696,7 @@
     *: "Next:"
   </dest>
   <voice>
-    *: "Next:"
+    *: "Next"
   </voice>
 </phrase>
 <phrase>
@@ -11244,7 +11244,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Signal strength:"
+    radio: "Signal strength"
   </voice>
 </phrase>
 <phrase>
@@ -12537,16 +12537,16 @@
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining:"
+    *: ""
   </source>
   <dest>
-    *: "Playlist remaining:"
+    *: ""
   </dest>
   <voice>
-    *: "Playlist remaining"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13202,7 +13202,7 @@
     *: "Level 1: 60 moves / 5 min"
   </dest>
   <voice>
-    *: "Level 1: 60 moves per 5 minutes"
+    *: "Level 1, 60 moves per 5 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13216,7 +13216,7 @@
     *: "Level 2: 60 moves / 15 min"
   </dest>
   <voice>
-    *: "Level 2: 60 moves per 15 minutes"
+    *: "Level 2, 60 moves per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13230,7 +13230,7 @@
     *: "Level 3: 60 moves / 30 min"
   </dest>
   <voice>
-    *: "Level 3: 60 moves per 30 minutes"
+    *: "Level 3, 60 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13244,7 +13244,7 @@
     *: "Level 4: 40 moves / 30 min"
   </dest>
   <voice>
-    *: "Level 4: 40 moves per 30 minutes"
+    *: "Level 4, 40 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13258,7 +13258,7 @@
     *: "Level 5: 40 moves / 60 min"
   </dest>
   <voice>
-    *: "Level 5: 40 moves per 60 minutes"
+    *: "Level 5, 40 moves per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13272,7 +13272,7 @@
     *: "Level 6: 40 moves / 120 min"
   </dest>
   <voice>
-    *: "Level 6: 40 moves per 120 minutes"
+    *: "Level 6, 40 moves per 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13286,7 +13286,7 @@
     *: "Level 7: 40 moves / 240 min"
   </dest>
   <voice>
-    *: "Level 7: 40 moves per 240 minutes"
+    *: "Level 7, 40 moves per 240 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13300,7 +13300,7 @@
     *: "Level 8: 1 move / 15 min"
   </dest>
   <voice>
-    *: "Level 8: 1 move per 15 minutes"
+    *: "Level 8, 1 move per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13314,7 +13314,7 @@
     *: "Level 9: 1 move / 60 min"
   </dest>
   <voice>
-    *: "Level 9: 1 move per 60 minutes"
+    *: "Level 9, 1 move per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13328,7 +13328,7 @@
     *: "Level 10: 1 move / 600 min"
   </dest>
   <voice>
-    *: "Level 10: 1 move per 600 minutes"
+    *: "Level 10, 1 move per 600 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15000,16 +15000,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </dest>
   <voice>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </voice>
 </phrase>
 <phrase>
@@ -16409,3 +16406,87 @@
     *: 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>
+    *: "Choose File"
+  </dest>
+  <voice>
+    *: "Choose File"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMAINING
+  desc: Playing Time
+  user: core
+  <source>
+    *: "Remaining"
+  </source>
+  <dest>
+    *: "Remaining"
+  </dest>
+  <voice>
+    *: "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 532f05baf7..1ee1ffac0f 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -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
@@ -5721,7 +5763,7 @@
   </dest>
   <voice>
     *: none
-    remote: "(Vol- : Re-enable)"
+    remote: "(Volume minus to Re-enable)"
   </voice>
 </phrase>
 <phrase>
@@ -6003,7 +6045,7 @@
     *: "Free:"
   </dest>
   <voice>
-    *: "Free diskspace:"
+    *: "Free disk space"
   </voice>
 </phrase>
 <phrase>
@@ -7117,7 +7159,7 @@
     *: "Mode:"
   </dest>
   <voice>
-    *: "Mode:"
+    *: "Mode"
   </voice>
 </phrase>
 <phrase>
@@ -7443,7 +7485,7 @@
   </dest>
   <voice>
     *: none
-    charging: "Battery: Charging"
+    charging: "Battery is Charging"
   </voice>
 </phrase>
 <phrase>
@@ -8779,7 +8821,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -10759,7 +10801,7 @@
     *: "Next Track:"
   </dest>
   <voice>
-    *: "Next Track:"
+    *: "Next Track"
   </voice>
 </phrase>
 <phrase>
@@ -10773,7 +10815,7 @@
     *: "Next:"
   </dest>
   <voice>
-    *: "Next:"
+    *: "Next"
   </voice>
 </phrase>
 <phrase>
@@ -11321,7 +11363,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Signal strength:"
+    radio: "Signal strength"
   </voice>
 </phrase>
 <phrase>
@@ -12614,16 +12656,16 @@
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining:"
+    *: ""
   </source>
   <dest>
-    *: "Playlist remaining:"
+    *: ""
   </dest>
   <voice>
-    *: "Playlist remaining"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13279,7 +13321,7 @@
     *: "Level 1: 60 moves / 5 min"
   </dest>
   <voice>
-    *: "Level 1: 60 moves per 5 minutes"
+    *: "Level 1, 60 moves per 5 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13293,7 +13335,7 @@
     *: "Level 2: 60 moves / 15 min"
   </dest>
   <voice>
-    *: "Level 2: 60 moves per 15 minutes"
+    *: "Level 2, 60 moves per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13307,7 +13349,7 @@
     *: "Level 3: 60 moves / 30 min"
   </dest>
   <voice>
-    *: "Level 3: 60 moves per 30 minutes"
+    *: "Level 3, 60 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13321,7 +13363,7 @@
     *: "Level 4: 40 moves / 30 min"
   </dest>
   <voice>
-    *: "Level 4: 40 moves per 30 minutes"
+    *: "Level 4, 40 moves per 30 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13335,7 +13377,7 @@
     *: "Level 5: 40 moves / 60 min"
   </dest>
   <voice>
-    *: "Level 5: 40 moves per 60 minutes"
+    *: "Level 5, 40 moves per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13349,7 +13391,7 @@
     *: "Level 6: 40 moves / 120 min"
   </dest>
   <voice>
-    *: "Level 6: 40 moves per 120 minutes"
+    *: "Level 6, 40 moves per 120 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13363,7 +13405,7 @@
     *: "Level 7: 40 moves / 240 min"
   </dest>
   <voice>
-    *: "Level 7: 40 moves per 240 minutes"
+    *: "Level 7, 40 moves per 240 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13377,7 +13419,7 @@
     *: "Level 8: 1 move / 15 min"
   </dest>
   <voice>
-    *: "Level 8: 1 move per 15 minutes"
+    *: "Level 8, 1 move per 15 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13391,7 +13433,7 @@
     *: "Level 9: 1 move / 60 min"
   </dest>
   <voice>
-    *: "Level 9: 1 move per 60 minutes"
+    *: "Level 9, 1 move per 60 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -13405,7 +13447,7 @@
     *: "Level 10: 1 move / 600 min"
   </dest>
   <voice>
-    *: "Level 10: 1 move per 600 minutes"
+    *: "Level 10, 1 move per 600 minutes"
   </voice>
 </phrase>
 <phrase>
@@ -15077,16 +15119,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </dest>
   <voice>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </voice>
 </phrase>
 <phrase>
@@ -16486,3 +16525,45 @@
     *: 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>
+    *: "Choose File"
+  </dest>
+  <voice>
+    *: "Choose File"
+  </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
+  <source>
+    *: "Remaining"
+  </source>
+  <dest>
+    *: "Remaining"
+  </dest>
+  <voice>
+    *: "Remaining"
+  </voice>
+</phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 55b7ae9f63..45f1fc55db 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>
@@ -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
@@ -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
@@ -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
@@ -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>
@@ -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/italiano.lang b/apps/lang/italiano.lang
index a7d1eaa9a7..1d791f0a1d 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -5141,7 +5141,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Suddivisione per: "
+    recording: "Suddivisione per "
   </voice>
 </phrase>
 <phrase>
@@ -5209,7 +5209,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Tempo: "
+    recording: "Tempo "
   </voice>
 </phrase>
 <phrase>
@@ -5634,7 +5634,7 @@
   </dest>
   <voice>
     *: none
-    remote: "(Vol- : Re-Attivato)"
+    remote: "(Volume, meno per riattivare)"
   </voice>
 </phrase>
 <phrase>
@@ -5916,7 +5916,7 @@
     *: "Liberi:"
   </dest>
   <voice>
-    *: "Spazio Libero su Disco:"
+    *: "Spazio Libero su Disco"
   </voice>
 </phrase>
 <phrase>
@@ -7030,7 +7030,7 @@
     *: "Modo:"
   </dest>
   <voice>
-    *: "Modo:"
+    *: "Modo"
   </voice>
 </phrase>
 <phrase>
@@ -8692,7 +8692,7 @@
   </dest>
   <voice>
     *: none
-    rtc: "ora attuale:"
+    rtc: "ora attuale"
   </voice>
 </phrase>
 <phrase>
@@ -10627,7 +10627,7 @@
     *: "Prossima Traccia:"
   </dest>
   <voice>
-    *: "Prossima Traccia:"
+    *: "Prossima Traccia"
   </voice>
 </phrase>
 <phrase>
@@ -10641,7 +10641,7 @@
     *: "Prossima:"
   </dest>
   <voice>
-    *: "Prossima:"
+    *: "Prossima"
   </voice>
 </phrase>
 <phrase>
@@ -11189,7 +11189,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Potenza segnale:"
+    radio: "Potenza segnale"
   </voice>
 </phrase>
 <phrase>
@@ -12463,7 +12463,7 @@
     *: "Livello 9: 1 mossa / 60 min"
   </dest>
   <voice>
-    *: "Livello 9: 1 mossa ogni 60 minuti"
+    *: "Livello 9, 1 mossa ogni 60 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -12477,7 +12477,7 @@
     *: "Livello 8: 1 mossa / 15 min"
   </dest>
   <voice>
-    *: "Livello 8: 1 mossa ogni 15 minuti"
+    *: "Livello 8, 1 mossa ogni 15 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -12991,7 +12991,7 @@
     *: "Livello 2: 60 mosse / 15 min"
   </dest>
   <voice>
-    *: "Livello 2: 60 mosse ogni 15 minuti"
+    *: "Livello 2, 60 mosse ogni 15 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -13095,7 +13095,7 @@
     *: "Livello 5: 40 mosse / 60 min"
   </dest>
   <voice>
-    *: "Livello 5: 40 mosse ogni 60 minuti"
+    *: "Livello 5, 40 mosse ogni 60 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -13272,7 +13272,7 @@
     *: "Livello 10: 1 mossa / 600 min"
   </dest>
   <voice>
-    *: "Livello 10: 1 mossa ogni 600 minuti"
+    *: "Livello 10, 1 mossa ogni 600 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -13572,21 +13572,21 @@
     *: "Livello 7: 40 mosse / 240 min"
   </dest>
   <voice>
-    *: "Livello 7: 40 mosse ogni 240 minuti"
+    *: "Livello 7, 40 mosse ogni 240 minuti"
   </voice>
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining:"
+    *: ""
   </source>
   <dest>
-    *: "Playlist rimanente:"
+    *: ""
   </dest>
   <voice>
-    *: "Playlist rimanente"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13875,7 +13875,7 @@
     *: "Livello 3: 60 mosse / 30 min"
   </dest>
   <voice>
-    *: "Livello 3: 60 mosse ogni 30 minuti"
+    *: "Livello 3, 60 mosse ogni 30 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14027,7 +14027,7 @@
     *: "Livello 6: 40 mosse / 120 min"
   </dest>
   <voice>
-    *: "Livello 6: 40 mosse ogni 120 minuti"
+    *: "Livello 6, 40 mosse ogni 120 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14134,7 +14134,7 @@
     *: "Livello 1: 60 mosse / 5 min"
   </dest>
   <voice>
-    *: "Livello 1: 60 mosse ogni 5 minuti"
+    *: "Livello 1, 60 mosse ogni 5 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14260,7 +14260,7 @@
     *: "Livello 4: 40 mosse / 30 min"
   </dest>
   <voice>
-    *: "Livello 4: 40 mosse ogni 30 minuti"
+    *: "Livello 4, 40 mosse ogni 30 minuti"
   </voice>
 </phrase>
 <phrase>
@@ -14695,16 +14695,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Trascorso"
+    *: "Trascorso"
   </dest>
   <voice>
-    *: none
-    hotkey: "Trascorso"
+    *: "Trascorso"
   </voice>
 </phrase>
 <phrase>
@@ -16413,3 +16410,59 @@
     *: 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>
+    *: "Scegli file"
+  </dest>
+  <voice>
+    *: "Scegli file"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMAINING
+  desc: Playing Time
+  user: core
+  <source>
+    *: "Remaining"
+  </source>
+  <dest>
+    *: "Rimanente"
+  </dest>
+  <voice>
+    *: "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>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 3656675b19..dee9f8a022 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -19,6 +19,7 @@
 # - Kong Hui Sug
 # - Jeong Taek In
 # - Sanggon Lee
+# - Hoseok Seo
 #
 # � 파�� 한국어 언어 파�입니다.
 #
@@ -66,10 +67,10 @@
     *: "On"
   </source>
   <dest>
-    *: "사용"
+    *: "켬"
   </dest>
   <voice>
-    *: "사용"
+    *: "켬"
   </voice>
 </phrase>
 <phrase>
@@ -80,10 +81,24 @@
     *: "Off"
   </source>
   <dest>
-    *: "사용안함"
+    *: "�"
   </dest>
   <voice>
-    *: "사용안함"
+    *: "�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ASK
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Ask"
+  </source>
+  <dest>
+    *: "요청"
+  </dest>
+  <voice>
+    *: "요청"
   </voice>
 </phrase>
 <phrase>
@@ -101,6 +116,34 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_NORMAL
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Normal"
+  </source>
+  <dest>
+    *: "보통"
+  </dest>
+  <voice>
+    *: "보통"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GAIN
+  desc: Generic string for gain used in EQ menu and recording screen
+  user: core
+  <source>
+    *: "Gain"
+  </source>
+  <dest>
+    *: "게�"
+  </dest>
+  <voice>
+    *: "게�"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_WAIT
   desc: general please wait splash
   user: core
@@ -108,27 +151,38 @@
     *: "Loading..."
   </source>
   <dest>
-    *: "불러오고 있습니다..."
+    *: "로딩 중..."
   </dest>
   <voice>
-    *: ""
+    *: "로딩 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CONFIRM_SHUTDOWN
-  desc: in shutdown screen
+  id: LANG_LOADING_PERCENT
+  desc: splash number of percents loaded
   user: core
   <source>
-    *: none
-    soft_shutdown: "Press OFF to shut down"
+    *: "Loading... %d%% done (%s)"
   </source>
   <dest>
-    *: none
-    soft_shutdown: "OFF버튼으로 전��기"
+    *: "로딩 중... %d%% 완료 (%s)"
   </dest>
   <voice>
-    *: none
-    soft_shutdown: ""
+    *: "로딩 중"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCANNING_DISK
+  desc: when booting up and rebuilding the cache and calculating free space
+  user: core
+  <source>
+    *: "Scanning disk..."
+  </source>
+  <dest>
+    *: "디스� 검사 중..."
+  </dest>
+  <voice>
+    *: "디스� 검사 중"
   </voice>
 </phrase>
 <phrase>
@@ -139,27 +193,24 @@
     *: "Shutting down..."
   </source>
   <dest>
-    *: "시스템� 종료�니다."
+    *: "종료 중..."
   </dest>
   <voice>
-    *: ""
+    *: "종료 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOVE_MMC
-  desc: before acknowledging usb in case an MMC is inserted (Ondio)
+  id: LANG_CANCEL
+  desc: Visual confirmation of canceling a changed setting
   user: core
   <source>
-    *: none
-    archosondio*: "Please remove inserted MMC"
+    *: "Cancelled"
   </source>
   <dest>
-    *: none
-    archosondio*: "삽입� MMC를 제거해주세요"
+    *: "취소�"
   </dest>
   <voice>
-    *: none
-    archosondio*: "삽입� MMC를 제거해주세요"
+    *: "취소�"
   </voice>
 </phrase>
 <phrase>
@@ -170,651 +221,673 @@
     *: "Failed"
   </source>
   <dest>
-    *: "실패하였습니다."
+    *: "실패함"
+  </dest>
+  <voice>
+    *: "실패함"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNELS
+  desc: in sound_settings
+  user: core
+  <source>
+    *: "Channels"
+  </source>
+  <dest>
+    *: "채�"
+  </dest>
+  <voice>
+    *: "채�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_ASK
+  desc: confirm to reset settings
+  user: core
+  <source>
+    *: "Are You Sure?"
+  </source>
+  <dest>
+    *: "확실하나요?"
+  </dest>
+  <voice>
+    *: "확실하나요?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONFIRM_WITH_BUTTON
+  desc: Generic string to use to confirm
+  user: core
+  <source>
+    *: "PLAY = Yes"
+    cowond2*: "MENU, or top-right = 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>
+    *: "재� = 예"
+    cowond2*: "메뉴, �는 오른쪽 �단 = 예"
+    creativezen*,gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "선� = 예"
+    iriverh100,iriverh120,iriverh300: "�색 = 예"
+    mrobe500: "재�, 전� �는 오른쪽 �단 = 예"
+    vibe500: "확� = 예"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
-  desc: in the main menu
+  id: LANG_CANCEL_WITH_ANY
+  desc: Generic string to use to cancel
   user: core
   <source>
-    *: "Recent Bookmarks"
+    *: "Any Other = No"
   </source>
   <dest>
-    *: "최근 �마�"
+    *: "기타 = 아니오"
   </dest>
   <voice>
-    *: "최근 �마�"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SOUND_SETTINGS
-  desc: in the main menu
+  id: LANG_ROCKBOX_TITLE
+  desc: main menu title
   user: core
   <source>
-    *: "Sound Settings"
+    *: "Rockbox"
   </source>
   <dest>
-    *: "�향 설정"
+    *: "�박스"
   </dest>
   <voice>
-    *: "�향 설정"
+    *: "�박스"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_GENERAL_SETTINGS
+  id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
   desc: in the main menu
   user: core
   <source>
-    *: "General Settings"
+    *: "Recent Bookmarks"
   </source>
   <dest>
-    *: "�반 설정"
+    *: "최근 �마�"
   </dest>
   <voice>
-    *: "�반 설정"
+    *: "최근 �마�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MANAGE_MENU
-  desc: in the main menu
+  id: LANG_DIR_BROWSER
+  desc: main menu title
   user: core
   <source>
-    *: "Manage Settings"
+    *: "Files"
   </source>
   <dest>
-    *: "설정 관리"
+    *: "파�"
   </dest>
   <voice>
-    *: "설정 관리"
+    *: "파�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUSTOM_THEME
-  desc: in the main menu
+  id: LANG_TAGCACHE
+  desc: in the main menu and the settings menu
   user: core
   <source>
-    *: "Browse Themes"
+    *: "Database"
   </source>
   <dest>
-    *: "테마 선�"
+    *: "��터베�스"
   </dest>
   <voice>
-    *: "테마 선�"
+    *: "��터베�스"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_RADIO
+  id: LANG_NOW_PLAYING
   desc: in the main menu
   user: core
   <source>
-    *: none
-    radio: "FM Radio"
+    *: "Now Playing"
   </source>
   <dest>
-    *: none
-    radio: "FM �디오"
+    *: "지금 재� 중"
   </dest>
   <voice>
-    *: none
-    radio: "FM �디오"
+    *: "지금 재� 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING
+  id: LANG_RESUME_PLAYBACK
   desc: in the main menu
   user: core
   <source>
-    *: none
-    recording: "Recording"
+    *: "Resume Playback"
   </source>
   <dest>
-    *: none
-    recording: "녹�"
+    *: "재� 재시작"
   </dest>
   <voice>
-    *: none
-    recording: "녹�"
+    *: "재� 재시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGINS
-  desc: in the main menu
+  id: LANG_SETTINGS
+  desc:  in main menu and visual confirmation after settings reset
   user: core
   <source>
-    *: "Plugins"
+    *: "Settings"
   </source>
   <dest>
-    *: "플러그� 보기"
+    *: "설정"
   </dest>
   <voice>
-    *: "플러그� 보기"
+    *: "설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUTDOWN
-  desc: in main menu
+  id: LANG_RECORDING
+  desc: in the main menu
   user: core
   <source>
     *: none
-    soft_shutdown: "Shut down"
+    recording: "Recording"
   </source>
   <dest>
     *: none
-    soft_shutdown: "�기"
+    recording: "녹�"
   </dest>
   <voice>
     *: none
-    soft_shutdown: "�기"
+    recording: "녹�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOLUME
-  desc: in sound_settings
+  id: LANG_FM_RADIO
+  desc: in the main menu
   user: core
   <source>
-    *: "Volume"
+    *: none
+    radio: "FM Radio"
   </source>
   <dest>
-    *: "볼륨 조절"
+    *: none
+    radio: "FM �디오"
   </dest>
   <voice>
-    *: "볼륨 조절"
+    *: none
+    radio: "FM �디오"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BASS
-  desc: in sound_settings
+  id: LANG_PLAYLISTS
+  desc: in the file view setting
   user: core
   <source>
-    *: "Bass"
+    *: "Playlists"
   </source>
   <dest>
-    *: "저� 설정"
+    *: "재�목�"
   </dest>
   <voice>
-    *: "저� 설정"
+    *: "재�목�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TREBLE
-  desc: in sound_settings
+  id: LANG_PLUGINS
+  desc: in the main menu
   user: core
   <source>
-    *: "Treble"
+    *: "Plugins"
   </source>
   <dest>
-    *: "고� 설정"
+    *: "플러그�"
   </dest>
   <voice>
-    *: "고� 설정"
+    *: "플러그�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BALANCE
-  desc: in sound_settings
+  id: LANG_SYSTEM
+  desc: in the main menu and settings menu
   user: core
   <source>
-    *: "Balance"
+    *: "System"
   </source>
   <dest>
-    *: "좌우 밸런스"
+    *: "시스템"
   </dest>
   <voice>
-    *: "좌우 밸런스"
+    *: "시스템"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  id: LANG_BOOKMARK_SELECT_BOOKMARK
+  desc: bookmark selection list title
   user: core
   <source>
-    *: "Stereo"
+    *: "Select Bookmark"
   </source>
   <dest>
-    *: "스테레오"
+    *: "�마� 선�"
   </dest>
   <voice>
-    *: "스테레오"
+    *: "�마� 선�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  id: LANG_BOOKMARK_DONT_RESUME
+  desc: top item in the list when asking user about bookmark auto load
   user: core
   <source>
-    *: "Mono"
+    *: "<Don't Resume>"
   </source>
   <dest>
-    *: "모노"
+    *: "<재시작하지 않�>"
   </dest>
   <voice>
-    *: "모노"
+    *: "재시작하지 않�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_CUSTOM
-  desc: in sound_settings
+  id: LANG_BOOKMARK_SHUFFLE
+  desc: bookmark selection list, bookmark enables shuffle
   user: core
   <source>
-    *: "Custom"
+    *: ", Shuffle"
   </source>
   <dest>
-    *: "�반"
+    *: ", 셔플"
   </dest>
   <voice>
-    *: "�반"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_LEFT
-  desc: in sound_settings
+  id: LANG_BOOKMARK_INVALID
+  desc: bookmark selection list, bookmark couldn't be parsed
   user: core
   <source>
-    *: "Mono Left"
+    *: "<Invalid Bookmark>"
   </source>
   <dest>
-    *: "왼쪽 모노"
+    *: "<잘못� �마�>"
   </dest>
   <voice>
-    *: "왼쪽 모노"
+    *: "잘못� �마�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_RIGHT
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CONTEXT_MENU
+  desc: bookmark selection list context menu
   user: core
   <source>
-    *: "Mono Right"
+    *: "Bookmark Actions"
   </source>
   <dest>
-    *: "오른쪽 모노"
+    *: "�마� 작업"
   </dest>
   <voice>
-    *: "오른쪽 모노"
+    *: "�마� 작업"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_KARAOKE
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CONTEXT_RESUME
+  desc: bookmark context menu, resume this bookmark
   user: core
   <source>
-    *: "Karaoke"
+    *: "Resume"
   </source>
   <dest>
-    *: "�성 제거"
+    *: "재시작"
   </dest>
   <voice>
-    *: "�성 제거"
+    *: "재시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STEREO_WIDTH
-  desc: in sound_settings
+  id: LANG_AUTO_BOOKMARK_QUERY
+  desc: prompt for user to decide to create an bookmark
   user: core
   <source>
-    *: "Stereo Width"
+    *: "Create a Bookmark?"
   </source>
   <dest>
-    *: "스테레오 너비"
+    *: "�마�를 만들겠습니까?"
   </dest>
   <voice>
-    *: "스테레오 너비"
+    *: "�마�를 만들겠습니까?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LOUDNESS
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CREATE_SUCCESS
+  desc: Indicates bookmark was successfully created
   user: core
   <source>
-    *: none
-    masf: "Loudness"
+    *: "Bookmark Created"
   </source>
   <dest>
-    *: none
-    masf: "소리�기"
+    *: "�마� �성�"
   </dest>
   <voice>
-    *: none
-    masf: "소리�기"
+    *: "�마� �성�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTOVOL
-  desc: in sound_settings
+  id: LANG_BOOKMARK_CREATE_FAILURE
+  desc: Indicates bookmark was not created
   user: core
   <source>
-    *: none
-    masf: "Auto Volume"
+    *: "Bookmark Failed!"
   </source>
   <dest>
-    *: none
-    masf: "�� 볼륨설정"
+    *: "�마� 실패함!"
   </dest>
   <voice>
-    *: none
-    masf: "�� 볼륨설정"
+    *: "�마� 실패함!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DECAY
-  desc: in sound_settings
+  id: LANG_BOOKMARK_LOAD_EMPTY
+  desc: Indicates bookmark was empty
   user: core
   <source>
-    *: none
-    masf: "AV Decay Time"
+    *: "Bookmark Empty"
   </source>
   <dest>
-    *: none
-    masf: "AV �� 시간"
+    *: "�마� 비어 있�"
   </dest>
   <voice>
-    *: none
-    masf: ""
+    *: "�마� 비어 있�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SUPERBASS
-  desc: in sound settings
+  id: LANG_SOUND_SETTINGS
+  desc: in the main menu
   user: core
   <source>
-    *: none
-    masf: "Super Bass"
+    *: "Sound Settings"
   </source>
   <dest>
-    *: none
-    masf: "저�역 강화"
+    *: "사운드 설정"
   </dest>
   <voice>
-    *: none
-    masf: "저�역 강화"
+    *: "사운드 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_ENABLE
-  desc: in sound settings
+  id: LANG_VOLUME
+  desc: in sound_settings
   user: core
   <source>
-    *: none
-    masf: "MDB Enable"
+    *: "Volume"
   </source>
   <dest>
-    *: none
-    masf: "MDB 켬"
+    *: "볼륨"
   </dest>
   <voice>
-    *: none
-    masf: "MDB 켬"
+    *: "볼륨"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_STRENGTH
-  desc: in sound settings
+  id: LANG_BASS
+  desc: in sound_settings
   user: core
   <source>
-    *: none
-    masf: "MDB Strength"
+    *: "Bass"
   </source>
   <dest>
-    *: none
-    masf: "MDB 세기"
+    *: "저�"
   </dest>
   <voice>
-    *: none
-    masf: "MDB 세기"
+    *: "저�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_HARMONICS
-  desc: in sound settings
+  id: LANG_TREBLE
+  desc: in sound_settings
   user: core
   <source>
-    *: none
-    masf: "MDB Harmonics"
+    *: "Treble"
   </source>
   <dest>
-    *: none
-    masf: "MDB 하모닉스"
+    *: "고�"
   </dest>
   <voice>
-    *: none
-    masf: "MDB 하모닉스"
+    *: "고�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_CENTER
-  desc: in sound settings
+  id: LANG_BALANCE
+  desc: in sound_settings
   user: core
   <source>
-    *: none
-    masf: "MDB Centre Frequency"
+    *: "Balance"
   </source>
   <dest>
-    *: none
-    masf: "MDB 센터 주파수"
+    *: "균형"
   </dest>
   <voice>
-    *: none
-    masf: "MDB 센터 주파수"
+    *: "균형"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MDB_SHAPE
-  desc: in sound settings
+  id: LANG_CHANNEL_CONFIGURATION
+  desc: in sound_settings
   user: core
   <source>
-    *: none
-    masf: "MDB Shape"
+    *: "Channel Configuration"
   </source>
   <dest>
-    *: none
-    masf: "MDB 모양"
+    *: "채� 구성"
   </dest>
   <voice>
-    *: none
-    masf: "MDB 모양"
+    *: "채� 구성"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFEED
-  desc: in sound settings
+  id: LANG_CHANNEL_STEREO
+  desc: in sound_settings and radio screen
   user: core
   <source>
-    *: "Crossfeed"
+    *: "Stereo"
   </source>
   <dest>
-    *: "�로스피드"
+    *: "스테레오"
   </dest>
   <voice>
-    *: "�로스피드"
+    *: "스테레오"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EQUALIZER
-  desc: in the sound settings menu
+  id: LANG_CHANNEL_MONO
+  desc: in sound_settings and radio screen
   user: core
   <source>
-    *: "Equalizer"
+    *: "Mono"
   </source>
   <dest>
-    *: "�퀄��져"
+    *: "모노"
   </dest>
   <voice>
-    *: "�퀄��져"
+    *: "모노"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYBACK
-  desc: in settings_menu()
+  id: LANG_CHANNEL_CUSTOM
+  desc: in sound_settings
   user: core
   <source>
-    *: "Playback Settings"
+    *: "Custom"
   </source>
   <dest>
-    *: "재� 설정"
+    *: "커스텀"
   </dest>
   <voice>
-    *: "재� 설정"
+    *: "커스텀"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILE
-  desc: in settings_menu()
+  id: LANG_CHANNEL_LEFT
+  desc: in sound_settings
   user: core
   <source>
-    *: "File View"
+    *: "Mono Left"
   </source>
   <dest>
-    *: "보기 설정"
+    *: "모노 왼쪽"
   </dest>
   <voice>
-    *: "보기 설정"
+    *: "모노 왼쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY
-  desc: in settings_menu()
+  id: LANG_CHANNEL_RIGHT
+  desc: in sound_settings
   user: core
   <source>
-    *: "Display"
+    *: "Mono Right"
   </source>
   <dest>
-    *: "화면 설정"
+    *: "모노 오른쪽"
   </dest>
   <voice>
-    *: "화면 설정"
+    *: "모노 오른쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSTEM
-  desc: in the main menu and settings menu
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
   user: core
   <source>
-    *: "System"
+    *: none
+    recording: "Mono Left + Right"
   </source>
   <dest>
-    *: "시스템 설정"
+    *: none
+    recording: "모노 왼쪽 + 오른쪽"
   </dest>
   <voice>
-    *: "시스템 설정"
+    *: none
+    recording: "모노 왼쪽과 오른쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS
-  desc: in general settings
+  id: LANG_CHANNEL_KARAOKE
+  desc: in sound_settings
   user: core
   <source>
-    *: "Bookmarking"
+    *: "Karaoke"
   </source>
   <dest>
-    *: "�마� 설정"
+    *: "가�오케"
   </dest>
   <voice>
-    *: "�마� 설정"
+    *: "가�오케"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LANGUAGE
-  desc: in settings_menu
+  id: LANG_STEREO_WIDTH
+  desc: in sound_settings
   user: core
   <source>
-    *: "Language"
+    *: "Stereo Width"
   </source>
   <dest>
-    *: "언어 선�"
+    *: "스테레오 �"
   </dest>
   <voice>
-    *: "언어 선�"
+    *: "스테레오 �"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE
-  desc: root of voice menu
+  id: LANG_CROSSFEED
+  desc: in sound settings
   user: core
   <source>
-    *: "Voice"
+    *: "Crossfeed"
   </source>
   <dest>
-    *: "�성 안내"
+    *: "�로스피드"
   </dest>
   <voice>
-    *: "�성 안내"
+    *: "�로스피드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUSTOM_CFG
-  desc: in setting_menu()
+  id: LANG_CROSSFEED_DIRECT_GAIN
+  desc: in crossfeed settings
   user: core
   <source>
-    *: "Browse .cfg Files"
+    *: "Direct Gain"
   </source>
   <dest>
-    *: "설정 파� 보기"
+    *: "다�렉트 게�"
   </dest>
   <voice>
-    *: "설정 파� 보기"
+    *: "다�렉트 게�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET
-  desc: in system_settings_menu()
+  id: LANG_CROSSFEED_CROSS_GAIN
+  desc: in crossfeed settings
   user: core
   <source>
-    *: "Reset Settings"
+    *: "Cross Gain"
   </source>
   <dest>
-    *: "설정 초기화"
+    *: "�로스 게�"
   </dest>
   <voice>
-    *: "설정 초기화"
+    *: "�로스 게�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_DONE_CLEAR
-  desc: visual confirmation after settings reset
+  id: LANG_CROSSFEED_HF_ATTENUATION
+  desc: in crossfeed settings
   user: core
   <source>
-    *: "Cleared"
+    *: "High-Frequency Attenuation"
   </source>
   <dest>
-    *: "초기화 �었습니다."
+    *: "고주파 �쇠"
   </dest>
   <voice>
-    *: ""
+    *: "고주파 �쇠"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_SETTINGS
-  desc: in system_settings_menu()
+  id: LANG_CROSSFEED_HF_CUTOFF
+  desc: in crossfeed settings
   user: core
   <source>
-    *: "Save .cfg File"
+    *: "High-Frequency Cutoff"
   </source>
   <dest>
-    *: "설정 파� 만들기"
+    *: "고주파 차단"
   </dest>
   <voice>
-    *: "설정 파� 만들기"
+    *: "고주파 차단"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SETTINGS
-  desc: in the main menu
+  id: LANG_EQUALIZER
+  desc: in the sound settings menu
   user: core
   <source>
-    *: none
-    recording: "Recording Settings"
+    *: "Equalizer"
   </source>
   <dest>
-    *: none
-    recording: "녹� 설정"
+    *: "�퀄��저"
   </dest>
   <voice>
-    *: none
-    recording: "녹� 설정"
+    *: "�퀄��저"
   </voice>
 </phrase>
 <phrase>
@@ -825,10 +898,10 @@
     *: "Enable EQ"
   </source>
   <dest>
-    *: "�퀄��져 켜기"
+    *: "EQ 활성화"
   </dest>
   <voice>
-    *: "�퀄��져 켜기"
+    *: "�퀄��저 활성화"
   </voice>
 </phrase>
 <phrase>
@@ -842,7 +915,7 @@
     *: "그래픽 EQ"
   </dest>
   <voice>
-    *: "그래픽 EQ"
+    *: "그래픽 �퀄��저"
   </voice>
 </phrase>
 <phrase>
@@ -853,10 +926,10 @@
     *: "Precut"
   </source>
   <dest>
-    *: "미리 줄임"
+    *: "프리컷"
   </dest>
   <voice>
-    *: "미리 줄임"
+    *: "프리컷"
   </voice>
 </phrase>
 <phrase>
@@ -867,10 +940,10 @@
     *: "Simple EQ Settings"
   </source>
   <dest>
-    *: "간단한 EQ설정"
+    *: "간단한 EQ 설정"
   </dest>
   <voice>
-    *: "간단한 EQ설정"
+    *: "간단한 �퀄��저 설정"
   </voice>
 </phrase>
 <phrase>
@@ -881,10 +954,10 @@
     *: "Advanced EQ Settings"
   </source>
   <dest>
-    *: "고급 EQ설정"
+    *: "고급 EQ 설정"
   </dest>
   <voice>
-    *: "고급 EQ설정"
+    *: "고급 �퀄��저 설정"
   </voice>
 </phrase>
 <phrase>
@@ -895,10 +968,10 @@
     *: "Save EQ Preset"
   </source>
   <dest>
-    *: "EQ 프리셋 저장"
+    *: "EQ 사전설정 저장"
   </dest>
   <voice>
-    *: "EQ 프리셋 저장"
+    *: "�퀄��저 사전설정 저장"
   </voice>
 </phrase>
 <phrase>
@@ -909,24 +982,10 @@
     *: "Browse EQ Presets"
   </source>
   <dest>
-    *: "EQ 프리셋 �색"
-  </dest>
-  <voice>
-    *: "EQ 프리셋 �색"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_EQUALIZER_EDIT_MODE
-  desc: in the equalizer settings menu
-  user: core
-  <source>
-    *: "Edit mode: %s"
-  </source>
-  <dest>
-    *: "편집 모드: %s"
+    *: "EQ 사전설정 찾아보기"
   </dest>
   <voice>
-    *: ""
+    *: "�퀄��저 사전설정 찾아보기"
   </voice>
 </phrase>
 <phrase>
@@ -937,10 +996,10 @@
     *: "%d Hz Band Gain"
   </source>
   <dest>
-    *: "%d Hz 밴드 게�"
+    *: "%d Hz 대역 게�"
   </dest>
   <voice>
-    *: "Hertz 밴드 게�"
+    *: "헤르츠 대역 게�"
   </voice>
 </phrase>
 <phrase>
@@ -951,10 +1010,10 @@
     *: "Low Shelf Filter"
   </source>
   <dest>
-    *: "로우 셀프 필터"
+    *: "Low Shelf í•„í„°"
   </dest>
   <voice>
-    *: "로우 셀프 필터"
+    *: "로우 쉘프 필터"
   </voice>
 </phrase>
 <phrase>
@@ -979,10 +1038,10 @@
     *: "High Shelf Filter"
   </source>
   <dest>
-    *: "하� 셀프 필터"
+    *: "하� 쉘프 필터"
   </dest>
   <voice>
-    *: "하� 셀프 필터"
+    *: "하� 쉘프 필터"
   </voice>
 </phrase>
 <phrase>
@@ -1007,10 +1066,10 @@
     *: "Centre Frequency"
   </source>
   <dest>
-    *: "센터 주파수"
+    *: "중심 주파수"
   </dest>
   <voice>
-    *: "센터 주파수"
+    *: "중심 주파수"
   </voice>
 </phrase>
 <phrase>
@@ -1021,192 +1080,178 @@
     *: "Q"
   </source>
   <dest>
-    *: "Qê°’"
+    *: "Q"
   </dest>
   <voice>
-    *: "Qê°’"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CREATE_PLAYLIST
-  desc: Menu option for creating a playlist
+  id: LANG_DITHERING
+  desc: in the sound settings and some other menus
   user: core
   <source>
-    *: "Create Playlist"
+    *: "Dithering"
   </source>
   <dest>
-    *: "재�목� 만들기"
+    *: "디��"
   </dest>
   <voice>
-    *: "재�목� 만들기"
+    *: "디��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VIEW_DYNAMIC_PLAYLIST
-  desc: in playlist menu.
+  id: LANG_GENERAL_SETTINGS
+  desc: in the main menu
   user: core
   <source>
-    *: "View Current Playlist"
+    *: "General Settings"
   </source>
   <dest>
-    *: "현재 재�목� 보기"
+    *: "�반 설정"
   </dest>
   <voice>
-    *: "현재 재�목� 보기"
+    *: "�반 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_DYNAMIC_PLAYLIST
-  desc: in playlist menu.
+  id: LANG_PLAYBACK
+  desc: in settings_menu()
   user: core
   <source>
-    *: "Save Current Playlist"
+    *: "Playback Settings"
   </source>
   <dest>
-    *: "현재 재�목� 저장"
+    *: "재� 설정"
   </dest>
   <voice>
-    *: "현재 재�목� 저장"
+    *: "재� 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECURSE_DIRECTORY
-  desc: In playlist menu
+  id: LANG_SHUFFLE
+  desc: in settings_menu
   user: core
   <source>
-    *: "Recursively Insert Directories"
+    *: "Shuffle"
   </source>
   <dest>
-    *: "�악 추가시 하위 ��� 추가"
+    *: "셔플"
   </dest>
   <voice>
-    *: "�악 추가시 하위 ��� 추가"
+    *: "셔플"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARN_ERASEDYNPLAYLIST_MENU
-  desc: in playlist options menu, option to warn when erasing dynamic playlist
+  id: LANG_REPEAT
+  desc: in settings_menu
   user: core
   <source>
-    *: "Warn When Erasing Dynamic Playlist"
+    *: "Repeat"
   </source>
   <dest>
-    *: "현재 재�목� 삭제시 알림"
+    *: "반복"
   </dest>
   <voice>
-    *: "현재 재�목� 삭제시 알림"
+    *: "반복"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VERSION
-  desc: in the info menu
+  id: LANG_ALL
+  desc: generic string used both in dir file filter and repeat mode selection
   user: core
   <source>
-    *: "Version"
+    *: "All"
   </source>
   <dest>
-    *: "Rockbox ì •ë³´"
+    *: "모�"
   </dest>
   <voice>
-    *: "Rockbox ì •ë³´"
+    *: "모�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DEBUG
-  desc: in the info menu
+  id: LANG_REPEAT_ONE
+  desc: repeat one song
   user: core
   <source>
-    *: "Debug (Keep Out!)"
+    *: "One"
   </source>
   <dest>
-    *: "디버깅 모드 (접근금지)"
+    *: "한 곡"
   </dest>
   <voice>
-    *: "디버깅 모드 (접근금지)"
+    *: "한 곡"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUFFLE
-  desc: in settings_menu
+  id: LANG_REPEAT_AB
+  desc: repeat range from point A to B
   user: core
   <source>
-    *: "Shuffle"
+    *: "A-B"
   </source>
   <dest>
-    *: "임� 재�"
+    *: "A-B"
   </dest>
   <voice>
-    *: "임� 재�"
+    *: "A-B"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPEAT
+  id: LANG_PLAY_SELECTED
   desc: in settings_menu
   user: core
   <source>
-    *: "Repeat"
-  </source>
-  <dest>
-    *: "반복 재�"
-  </dest>
-  <voice>
-    *: "반복 재�"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REPEAT_ONE
-  desc: repeat one song
-  user: core
-  <source>
-    *: "One"
+    *: "Play Selected First"
   </source>
   <dest>
-    *: "한 곡"
+    *: "선�한 곡 먼저 재�"
   </dest>
   <voice>
-    *: "한 곡"
+    *: "선�한 곡 먼저 재�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPEAT_AB
-  desc: repeat range from point A to B
+  id: LANG_WIND_MENU
+  desc: in the playback sub menu
   user: core
   <source>
-    *: "A-B"
+    *: "Fast-Forward/Rewind"
   </source>
   <dest>
-    *: "A-B 구간반복"
+    *: "빨리�기/��기"
   </dest>
   <voice>
-    *: "A-B 구간반복"
+    *: "빨리�기와 ��기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAY_SELECTED
+  id: LANG_FFRW_STEP
   desc: in settings_menu
   user: core
   <source>
-    *: "Play Selected First"
+    *: "FF/RW Min Step"
   </source>
   <dest>
-    *: "선�한 곡 먼저 재�"
+    *: "빨리�기/��기 단계"
   </dest>
   <voice>
-    *: "선�한 곡 먼저 재�"
+    *: "최소 단계"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WIND_MENU
-  desc: in the playback sub menu
+  id: LANG_FFRW_ACCEL
+  desc: in settings_menu
   user: core
   <source>
-    *: "Fast-Forward/Rewind"
+    *: "FF/RW Accel"
   </source>
   <dest>
-    *: "�/빨리�기 설정"
+    *: "빨리�기/��기 가�"
   </dest>
   <voice>
-    *: "�/빨리�기 설정"
+    *: "가�"
   </voice>
 </phrase>
 <phrase>
@@ -1218,11 +1263,11 @@
     flash_storage: none
   </source>
   <dest>
-    *: "�김방지 버� 설정"
+    *: "건너뛰기 방지 버�"
     flash_storage: none
   </dest>
   <voice>
-    *: "�김방지 버� 설정"
+    *: "건너뛰기 방지 버�"
     flash_storage: none
   </voice>
 </phrase>
@@ -1234,10 +1279,24 @@
     *: "Fade on Stop/Pause"
   </source>
   <dest>
-    *: "�악 정지시 페�드 �"
+    *: "정지/�시 정지 시 페�드"
+  </dest>
+  <voice>
+    *: "정지와 �시 정지 시 페�드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SINGLE_MODE
+  desc: single mode
+  user: core
+  <source>
+    *: "Single Mode"
+  </source>
+  <dest>
+    *: "싱글 모드"
   </dest>
   <voice>
-    *: "�악 정지시 페�드 �"
+    *: "싱글 모드"
   </voice>
 </phrase>
 <phrase>
@@ -1248,10 +1307,10 @@
     *: "Party Mode"
   </source>
   <dest>
-    *: "예약 모드 사용"
+    *: "파티 모드"
   </dest>
   <voice>
-    *: "예약 모드 사용"
+    *: "파티 모드"
   </voice>
 </phrase>
 <phrase>
@@ -1272,6 +1331,159 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_CROSSFADE_ENABLE
+  desc: in crossfade settings menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Enable Crossfade"
+  </source>
+  <dest>
+    *: none
+    crossfade: "�로스페�드 활성화"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "�로스페�드 활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MANTRACKSKIP
+  desc: in crossfade settings
+  user: core
+  <source>
+    *: none
+    crossfade: "Manual Track Skip Only"
+  </source>
+  <dest>
+    *: none
+    crossfade: "수� 트랙 건너뛰기 전용"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "수� 트랙 건너뛰기 전용"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHUFFLE_TRACKSKIP
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Shuffle or Manual Track Skip"
+  </source>
+  <dest>
+    *: none
+    crossfade: "셔플 �는 수� 트랙 건너뛰기"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "셔플 �는 수� 트랙 건너뛰기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFADE_FADE_IN_DELAY
+  desc: in crossfade settings menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Fade-In Delay"
+  </source>
+  <dest>
+    *: none
+    crossfade: "페�드� 지연"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "페�드� 지연"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFADE_FADE_IN_DURATION
+  desc: in crossfade settings menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Fade-In Duration"
+  </source>
+  <dest>
+    *: none
+    crossfade: "페�드� 지� 시간"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "페�드� 지� 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFADE_FADE_OUT_DELAY
+  desc: in crossfade settings menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Fade-Out Delay"
+  </source>
+  <dest>
+    *: none
+    crossfade: "페�드아웃 지연"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "페�드아웃 지연"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFADE_FADE_OUT_DURATION
+  desc: in crossfade settings menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Fade-Out Duration"
+  </source>
+  <dest>
+    *: none
+    crossfade: "페�드아웃 지� 시간"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "페�드아웃 지� 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFADE_FADE_OUT_MODE
+  desc: in crossfade settings menu
+  user: core
+  <source>
+    *: none
+    crossfade: "Fade-Out Mode"
+  </source>
+  <dest>
+    *: none
+    crossfade: "페�드아웃 모드"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "페�드아웃 모드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIX
+  desc: in playback settings, crossfade option
+  user: core
+  <source>
+    *: none
+    crossfade: "Mix"
+  </source>
+  <dest>
+    *: none
+    crossfade: "혼합"
+  </dest>
+  <voice>
+    *: none
+    crossfade: "혼합"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_REPLAYGAIN
   desc: in replaygain
   user: core
@@ -1286,17 +1498,101 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_REPLAYGAIN_NOCLIP
+  desc: in replaygain
+  user: core
+  <source>
+    *: "Prevent Clipping"
+  </source>
+  <dest>
+    *: "�리핑 방지"
+  </dest>
+  <voice>
+    *: "�리핑 방지"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REPLAYGAIN_MODE
+  desc: in replaygain
+  user: core
+  <source>
+    *: "Replaygain Type"
+  </source>
+  <dest>
+    *: "리플레�게� 유형"
+  </dest>
+  <voice>
+    *: "리플레�게� 유형"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUM_GAIN
+  desc: in replaygain
+  user: core
+  <source>
+    *: "Album Gain"
+  </source>
+  <dest>
+    *: "앨범 게�"
+  </dest>
+  <voice>
+    *: "앨범 게�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_GAIN
+  desc: in replaygain
+  user: core
+  <source>
+    *: "Track Gain"
+  </source>
+  <dest>
+    *: "트랙 게�"
+  </dest>
+  <voice>
+    *: "트랙 게�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHUFFLE_GAIN
+  desc: use track gain if shuffle mode is on, album gain otherwise
+  user: core
+  <source>
+    *: "Track Gain if Shuffling"
+  </source>
+  <dest>
+    *: "셔플 시 트랙 게�"
+  </dest>
+  <voice>
+    *: "셔플 시 트랙 게�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REPLAYGAIN_PREAMP
+  desc: in replaygain settings
+  user: core
+  <source>
+    *: "Pre-amp"
+  </source>
+  <dest>
+    *: "프리앰프"
+  </dest>
+  <voice>
+    *: "프리앰프"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_BEEP
   desc: in playback settings
   user: core
   <source>
-    *: "Beep Volume"
+    *: "Track Skip Beep"
   </source>
   <dest>
-    *: "� 소리�기"
+    *: "트랙 건너뛰기 경고�"
   </dest>
   <voice>
-    *: "� 소리�기"
+    *: "트랙 건너뛰기 경고�"
   </voice>
 </phrase>
 <phrase>
@@ -1307,10 +1603,10 @@
     *: "Weak"
   </source>
   <dest>
-    *: "작�"
+    *: "약함"
   </dest>
   <voice>
-    *: "작�"
+    *: "약함"
   </voice>
 </phrase>
 <phrase>
@@ -1321,10 +1617,10 @@
     *: "Moderate"
   </source>
   <dest>
-    *: "중간"
+    *: "보통"
   </dest>
   <voice>
-    *: "중간"
+    *: "보통"
   </voice>
 </phrase>
 <phrase>
@@ -1335,10 +1631,10 @@
     *: "Strong"
   </source>
   <dest>
-    *: "�"
+    *: "강함"
   </dest>
   <voice>
-    *: ""
+    *: "강함"
   </voice>
 </phrase>
 <phrase>
@@ -1366,97 +1662,117 @@
     *: "Auto-Change Directory"
   </source>
   <dest>
-    *: "�� 간 �� ��"
+    *: "디렉토리 �� 변경"
   </dest>
   <voice>
-    *: "�� 간 �� ��"
+    *: "디렉토리 �� 변경"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE
-  desc: in the main menu and the settings menu
+  id: LANG_RANDOM
+  desc: random folder
   user: core
   <source>
-    *: "Database"
+    *: "Random"
   </source>
   <dest>
-    *: "�악 DB"
+    *: "랜�"
   </dest>
   <voice>
-    *: "�악 DB"
+    *: "랜�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_RAM
-  desc: in tag cache settings
+  id: LANG_AUDIOSCROBBLER
+  desc: "Last.fm Logger" in Plugin/apps/scrobbler
   user: core
   <source>
-    *: none
-    tc_ramcache: "Load to RAM"
+    *: "Last.fm Logger"
   </source>
   <dest>
-    *: none
-    tc_ramcache: "메모리� �기"
+    *: "Last.fm 로거"
   </dest>
   <voice>
-    *: none
-    tc_ramcache: "메모리� �기"
+    *: "Last.fm 로거"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_FORCE_UPDATE
-  desc: in tag cache settings
+  id: LANG_CUESHEET_ENABLE
+  desc: cuesheet support option
   user: core
   <source>
-    *: "Initialize Now"
+    *: "Cuesheet Support"
   </source>
   <dest>
-    *: "지금 초기화하기"
+    *: "�시트 지�"
   </dest>
   <voice>
-    *: "지금 초기화하기"
+    *: "�시트 지�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
-  desc: in tag cache settings
+  id: LANG_HEADPHONE_UNPLUG
+  desc: in settings_menu.
   user: core
   <source>
-    *: "Updating in background"
+    *: none
+    headphone_detection: "Pause on Headphone Unplug"
   </source>
   <dest>
-    *: "업��트 중입니다..."
+    *: none
+    headphone_detection: "헤드� 분리 시 �시 중지"
   </dest>
   <voice>
-    *: ""
+    *: none
+    headphone_detection: "헤드� 분리 시 �시 중지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_INIT
-  desc: while initializing tagcache on boot
+  id: LANG_HEADPHONE_UNPLUG_RESUME
+  desc: in pause_phones_menu.
   user: core
   <source>
-    *: "Committing database"
+    *: none
+    headphone_detection: "Pause and Resume"
   </source>
   <dest>
-    *: "�악 DB 업��트 중..."
+    *: none
+    headphone_detection: "�시 중지 � 재시작"
   </dest>
   <voice>
-    *: ""
+    *: none
+    headphone_detection: "�시 중지 � 재시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RUNTIMEDB_ACTIVE
-  desc: in settings_menu.
+  id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME
+  desc: in pause_phones_menu.
   user: core
   <source>
-    *: "Gather Runtime Data"
+    *: none
+    headphone_detection: "Disable resume on startup if phones unplugged"
   </source>
   <dest>
-    *: "런타임 ��터 수집"
+    *: none
+    headphone_detection: "휴대�� 분리� 경우 시작 시 재시작 비활성화"
   </dest>
   <voice>
-    *: "런타임 ��터 수집"
+    *: none
+    headphone_detection: "휴대�� 분리� 경우 시작 시 재시작 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILE
+  desc: in settings_menu()
+  user: core
+  <source>
+    *: "File View"
+  </source>
+  <dest>
+    *: "파� 보기"
+  </dest>
+  <voice>
+    *: "파� 보기"
   </voice>
 </phrase>
 <phrase>
@@ -1467,10 +1783,10 @@
     *: "Sort Case Sensitive"
   </source>
   <dest>
-    *: "대/소문� 순서로 정렬"
+    *: "대소문� 구분 정렬"
   </dest>
   <voice>
-    *: "대/소문� 순서로 정렬"
+    *: "대소문� 구분 정렬"
   </voice>
 </phrase>
 <phrase>
@@ -1481,10 +1797,10 @@
     *: "Sort Directories"
   </source>
   <dest>
-    *: "�� 정렬 순서"
+    *: "디렉토리 정렬"
   </dest>
   <voice>
-    *: "�� 정렬 순서"
+    *: "디렉토리 정렬"
   </voice>
 </phrase>
 <phrase>
@@ -1495,10 +1811,10 @@
     *: "Sort Files"
   </source>
   <dest>
-    *: "파� 정렬 순서"
+    *: "파� 정렬"
   </dest>
   <voice>
-    *: "파� 정렬 순서"
+    *: "파� 정렬"
   </voice>
 </phrase>
 <phrase>
@@ -1509,10 +1825,10 @@
     *: "Alphabetical"
   </source>
   <dest>
-    *: "�름"
+    *: "알파벳순"
   </dest>
   <voice>
-    *: "�름"
+    *: "알파벳순"
   </voice>
 </phrase>
 <phrase>
@@ -1523,10 +1839,10 @@
     *: "By Date"
   </source>
   <dest>
-    *: "날짜"
+    *: "날짜별"
   </dest>
   <voice>
-    *: "날짜"
+    *: "날짜별"
   </voice>
 </phrase>
 <phrase>
@@ -1537,10 +1853,10 @@
     *: "By Newest Date"
   </source>
   <dest>
-    *: "수정한 날짜"
+    *: "최신 날짜별"
   </dest>
   <voice>
-    *: "수정한 날짜"
+    *: "최신 날짜별"
   </voice>
 </phrase>
 <phrase>
@@ -1551,10 +1867,10 @@
     *: "By Type"
   </source>
   <dest>
-    *: "형�"
+    *: "유형별"
   </dest>
   <voice>
-    *: "형�"
+    *: "유형별"
   </voice>
 </phrase>
 <phrase>
@@ -1565,10 +1881,10 @@
     *: "Show Files"
   </source>
   <dest>
-    *: "파� 표시 설정"
+    *: "파� 표시"
   </dest>
   <voice>
-    *: "파� 표시 설정"
+    *: "파� 표시"
   </voice>
 </phrase>
 <phrase>
@@ -1579,10 +1895,10 @@
     *: "Supported"
   </source>
   <dest>
-    *: "지� 파�"
+    *: "지��"
   </dest>
   <voice>
-    *: "지� 파�"
+    *: "지��"
   </voice>
 </phrase>
 <phrase>
@@ -1593,10 +1909,10 @@
     *: "Music"
   </source>
   <dest>
-    *: "�악 파�"
+    *: "�악"
   </dest>
   <voice>
-    *: "�악 파�"
+    *: "�악"
   </voice>
 </phrase>
 <phrase>
@@ -1607,24 +1923,245 @@
     *: "Follow Playlist"
   </source>
   <dest>
-    *: "재�중� ��로 ��"
+    *: "재�목� 팔로우"
   </dest>
   <voice>
-    *: "재�중� ��로 ��"
+    *: "재�목� 팔로우"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_ICONS
+  id: LANG_SHOW_PATH
   desc: in settings_menu
   user: core
   <source>
-    *: "Show Icons"
+    *: "Show Path"
   </source>
   <dest>
-    *: "아�콘 표시"
+    *: "경로 표시"
   </dest>
   <voice>
-    *: "아�콘 표시"
+    *: "경로 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_PATH_CURRENT
+  desc: in show path menu
+  user: core
+  <source>
+    *: "Current Directory Only"
+  </source>
+  <dest>
+    *: "현재 디렉토리만"
+  </dest>
+  <voice>
+    *: "현재 디렉토리만"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_FULL_PATH
+  desc: track display options
+  user: core
+  <source>
+    *: "Full Path"
+  </source>
+  <dest>
+    *: "전체 경로"
+  </dest>
+  <voice>
+    *: "전체 경로"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BUILDING_DATABASE
+  desc: splash database building progress
+  user: core
+  <source>
+    *: "Building database... %d found (OFF to return)"
+    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)"
+    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+  </source>
+  <dest>
+    *: "��터베�스 구축하는 중... %d 찾았� (�아오려면 OFF)"
+    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "��터베�스 구축하는 중... %d found (�아오려면 LEFT)"
+    gogearsa9200: "��터베�스 구축하는 중... %d 찾았� (�아오려면 REW)"
+    ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "��터베�스 구축하는 중... %d 찾았� (�아오려면 PREV)"
+    iriverh100,iriverh120,iriverh300: "��터베�스 구축하는 중... %d 찾았� (�아오려면 STOP)"
+  </dest>
+  <voice>
+    *: "��터베�스�서 찾� 항목"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_RAM
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: none
+    tc_ramcache: "Load to RAM"
+  </source>
+  <dest>
+    *: none
+    tc_ramcache: "RAM� 로드"
+  </dest>
+  <voice>
+    *: none
+    tc_ramcache: "RAM� 로드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_AUTOUPDATE
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: "Auto Update"
+  </source>
+  <dest>
+    *: "�� 업��트"
+  </dest>
+  <voice>
+    *: "�� 업��트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_FORCE_UPDATE
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: "Initialize Now"
+  </source>
+  <dest>
+    *: "지금 초기화"
+  </dest>
+  <voice>
+    *: "지금 초기화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_UPDATE
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: "Update Now"
+  </source>
+  <dest>
+    *: "지금 업��트"
+  </dest>
+  <voice>
+    *: "지금 업��트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RUNTIMEDB_ACTIVE
+  desc: in settings_menu.
+  user: core
+  <source>
+    *: "Gather Runtime Data"
+  </source>
+  <dest>
+    *: "런타임 ��터 수집"
+  </dest>
+  <voice>
+    *: "런타임 ��터 수집"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_EXPORT
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: "Export Modifications"
+  </source>
+  <dest>
+    *: "수정사항 내보내기"
+  </dest>
+  <voice>
+    *: "수정사항 내보내기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_IMPORT
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: "Import Modifications"
+  </source>
+  <dest>
+    *: "수정사항 가져오기"
+  </dest>
+  <voice>
+    *: "수정사항 가져오기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
+  desc: in tag cache settings
+  user: core
+  <source>
+    *: "Updating in background"
+  </source>
+  <dest>
+    *: "백그�운드�서 업��트 중"
+  </dest>
+  <voice>
+    *: "백그�운드�서 업��트 중"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_INIT
+  desc: while initializing tagcache on boot
+  user: core
+  <source>
+    *: "Committing database"
+  </source>
+  <dest>
+    *: "��터베�스 커밋 중"
+  </dest>
+  <voice>
+    *: "��터베�스 커밋 중"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_BUSY
+  desc: when trying to shutdown and tagcache is committing
+  user: core
+  <source>
+    *: "Database is not ready"
+  </source>
+  <dest>
+    *: "��터베�스가 준비�지 않았�"
+  </dest>
+  <voice>
+    *: "��터베�스가 준비�지 않았�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS
+  desc: "<All tracks>" entry in tag browser
+  user: core
+  <source>
+    *: "<All tracks>"
+  </source>
+  <dest>
+    *: "<모든 트랙>"
+  </dest>
+  <voice>
+    *: "모든 트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY
+  desc: in settings_menu()
+  user: core
+  <source>
+    *: "Display"
+  </source>
+  <dest>
+    *: "화면"
+  </dest>
+  <voice>
+    *: "화면"
   </voice>
 </phrase>
 <phrase>
@@ -1632,13 +2169,13 @@
   desc: in setting_menu()
   user: core
   <source>
-    *: "Browse Fonts"
+    *: "Font"
   </source>
   <dest>
-    *: "�트 찾기"
+    *: "글꼴"
   </dest>
   <voice>
-    *: "�트 찾기"
+    *: "글꼴"
   </voice>
 </phrase>
 <phrase>
@@ -1646,13 +2183,13 @@
   desc: in settings_menu()
   user: core
   <source>
-    *: "Browse .wps files"
+    *: "While Playing Screen"
   </source>
   <dest>
-    *: "WPS 선�"
+    *: "화면� 재�하는 �안"
   </dest>
   <voice>
-    *: "재�화면 선�"
+    *: "화면� 재�하는 �안"
   </voice>
 </phrase>
 <phrase>
@@ -1661,15 +2198,15 @@
   user: core
   <source>
     *: none
-    remote: "Browse .rwps files"
+    remote: "Remote While Playing Screen"
   </source>
   <dest>
     *: none
-    remote: "리모트 WPS 찾기"
+    remote: "화면� 재�하는 �안 �격"
   </dest>
   <voice>
     *: none
-    remote: "리모트 WPS 찾기"
+    remote: "화면� 재�하는 �안 �격"
   </voice>
 </phrase>
 <phrase>
@@ -1680,10 +2217,377 @@
     *: "LCD Settings"
   </source>
   <dest>
-    *: "본체 LCD 설정"
+    *: "LCD 설정"
+  </dest>
+  <voice>
+    *: "LCD 설정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Backlight"
+  </source>
+  <dest>
+    *: "백��트"
+  </dest>
+  <voice>
+    *: "백��트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_ON_WHEN_CHARGING
+  desc: in display_settings_menu, backlight timeout with charger connected
+  user: core
+  <source>
+    *: none
+    charging: "Backlight (While Plugged In)"
+  </source>
+  <dest>
+    *: none
+    charging: "백��트 (연결� �안)"
+  </dest>
+  <voice>
+    *: none
+    charging: "백��트 (연결� �안)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_ON_BUTTON_HOLD
+  desc: in lcd settings
+  user: core
+  <source>
+    *: "Backlight on Lock"
+    hold_button: "Backlight on Hold"
+  </source>
+  <dest>
+    *: "잠궜� 시 백��트"
+    hold_button: "홀드 시 백��트"
+  </dest>
+  <voice>
+    *: "잠궜� 시 백��트"
+    hold_button: "홀드 시 백��트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CAPTION_BACKLIGHT
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Caption Backlight"
+  </source>
+  <dest>
+    *: "캡션 백��트"
+  </dest>
+  <voice>
+    *: "캡션 백��트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_FADE_IN
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    backlight_fade*: "Backlight Fade In"
+  </source>
+  <dest>
+    *: none
+    backlight_fade*: "백��트 페�드 �"
+  </dest>
+  <voice>
+    *: none
+    backlight_fade*: "백��트 페�드 �"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_FADE_OUT
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    backlight_fade*: "Backlight Fade Out"
+  </source>
+  <dest>
+    *: none
+    backlight_fade*: "백��트 페�드 아웃"
+  </dest>
+  <voice>
+    *: none
+    backlight_fade*: "백��트 페�드 아웃"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "First Buttonpress Enables Backlight Only"
+  </source>
+  <dest>
+    *: "첫 번째 버튼� 누르면 백��트만 활성화"
+  </dest>
+  <voice>
+    *: "첫 번째 버튼� 누르면 백��트만 활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
+  desc: In display settings, time to switch LCD chip into power saving state
+  user: core
+  <source>
+    *: none
+    lcd_sleep: "Sleep (After Backlight Off)"
+  </source>
+  <dest>
+    *: none
+    lcd_sleep: "절전 (백��트가 꺼진 후)"
+  </dest>
+  <voice>
+    *: none
+    lcd_sleep: "절전(백��트가 꺼진 후)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BRIGHTNESS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    backlight_brightness: "Brightness"
+  </source>
+  <dest>
+    *: none
+    backlight_brightness: "�기"
+  </dest>
+  <voice>
+    *: none
+    backlight_brightness: "�기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONTRAST
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Contrast"
+  </source>
+  <dest>
+    *: "대비"
+  </dest>
+  <voice>
+    *: "대비"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    lcd_invert,remote_lcd_invert: "LCD Mode"
+  </source>
+  <dest>
+    *: none
+    lcd_invert,remote_lcd_invert: "LCD 모드"
+  </dest>
+  <voice>
+    *: none
+    lcd_invert,remote_lcd_invert: "LCD 모드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_LCD_INVERSE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    lcd_invert,remote_lcd_invert: "Inverse"
+  </source>
+  <dest>
+    *: none
+    lcd_invert,remote_lcd_invert: "반전"
+  </dest>
+  <voice>
+    *: none
+    lcd_invert,remote_lcd_invert: "반전"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FLIP_DISPLAY
+  desc: in settings_menu, option to turn display+buttos by 180 degrees
+  user: core
+  <source>
+    *: "Upside Down"
+  </source>
+  <dest>
+    *: "�하 반전"
+  </dest>
+  <voice>
+    *: "�하 반전"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_CURSOR
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Line Selector Type"
+  </source>
+  <dest>
+    *: "�� 선�기 유형"
+  </dest>
+  <voice>
+    *: "�� 선�기 유형"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_CURSOR_POINTER
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Pointer"
+  </source>
+  <dest>
+    *: "��터"
+  </dest>
+  <voice>
+    *: "��터"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_CURSOR_BAR
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Bar (Inverse)"
+  </source>
+  <dest>
+    *: "바 (반전)"
+  </dest>
+  <voice>
+    *: "반전바"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_BACKDROP
+  desc: text for LCD settings menu
+  user: core
+  <source>
+    *: none
+    lcd_non-mono: "Clear Backdrop"
+  </source>
+  <dest>
+    *: none
+    lcd_non-mono: "배경화면 지우기"
   </dest>
   <voice>
-    *: "본체 LCD 설정"
+    *: none
+    lcd_non-mono: "배경화면 지우기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKGROUND_COLOR
+  desc: menu entry to set the background color
+  user: core
+  <source>
+    *: none
+    lcd_color: "Background Colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "배경색"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "배경색"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FOREGROUND_COLOR
+  desc: menu entry to set the foreground color
+  user: core
+  <source>
+    *: none
+    lcd_color: "Foreground Colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "전경색"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "전경색"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_COLORS
+  desc: menu
+  user: core
+  <source>
+    *: none
+    lcd_color: "Reset Colours"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "색� 재설정"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "색� 재설정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COLOR_RGB_LABELS
+  desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
+  user: core
+  <source>
+    *: none
+    lcd_color: "RGB"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "RGB"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COLOR_RGB_VALUE
+  desc: in color screen
+  user: core
+  <source>
+    *: none
+    lcd_color: "RGB: %02X%02X%02X"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "RGB: %02X%02X%02X"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COLOR_UNACCEPTABLE
+  desc: splash when user selects an invalid colour
+  user: core
+  <source>
+    *: none
+    lcd_color: "Invalid colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "잘못� 색�"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: ""
   </voice>
 </phrase>
 <phrase>
@@ -1696,11 +2600,42 @@
   </source>
   <dest>
     *: none
-    remote: "리모트 LCD 설정"
+    remote: "�격 LCD 설정"
+  </dest>
+  <voice>
+    *: none
+    remote: "�격 LCD 설정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REDUCE_TICKING
+  desc: in remote lcd settings menu
+  user: core
+  <source>
+    *: none
+    remote_ticking: "Reduce Ticking"
+  </source>
+  <dest>
+    *: none
+    remote_ticking: "티킹 �소"
   </dest>
   <voice>
     *: none
-    remote: "리모트 LCD 설정"
+    remote_ticking: "티킹 �소"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ICONS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Show Icons"
+  </source>
+  <dest>
+    *: "아�콘 표시"
+  </dest>
+  <voice>
+    *: "아�콘 표시"
   </voice>
 </phrase>
 <phrase>
@@ -1711,10 +2646,187 @@
     *: "Scrolling"
   </source>
   <dest>
-    *: "문� �름 설정"
+    *: "스�롤"
   </dest>
   <voice>
-    *: "문� �름 설정"
+    *: "스�롤"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Scroll Speed Setting Example"
+  </source>
+  <dest>
+    *: "스�롤 �� 설정 예제"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL_SPEED
+  desc: in display_settings_menu()
+  user: core
+  <source>
+    *: "Scroll Speed"
+  </source>
+  <dest>
+    *: "스�롤 ��"
+  </dest>
+  <voice>
+    *: "스�롤 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL_DELAY
+  desc: Delay before scrolling
+  user: core
+  <source>
+    *: "Scroll Start Delay"
+  </source>
+  <dest>
+    *: "스�롤 시작 지연"
+  </dest>
+  <voice>
+    *: "스�롤 시작 지연"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL_STEP
+  desc: Pixels to advance per scroll
+  user: core
+  <source>
+    *: "Scroll Step Size"
+  </source>
+  <dest>
+    *: "스�롤 단계 �기"
+  </dest>
+  <voice>
+    *: "스�롤 단계 �기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL_STEP_EXAMPLE
+  desc: Pixels to advance per scroll
+  user: core
+  <source>
+    *: "Scroll Step Size Setting Example Text"
+  </source>
+  <dest>
+    *: "스�롤 단계 �기 설정 예제 �스트"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BIDIR_SCROLL
+  desc: Bidirectional scroll limit
+  user: core
+  <source>
+    *: "Bidirectional Scroll Limit"
+  </source>
+  <dest>
+    *: "양방향 스�롤 제한"
+  </dest>
+  <voice>
+    *: "양방향 스�롤 제한"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_SCROLL_SETS
+  desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
+  user: core
+  <source>
+    *: none
+    remote: "Remote Scrolling Options"
+  </source>
+  <dest>
+    *: none
+    remote: "�격 스�롤 옵션"
+  </dest>
+  <voice>
+    *: none
+    remote: "�격 스�롤 옵션"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCREEN_SCROLL_VIEW
+  desc: should lines scroll out of the screen
+  user: core
+  <source>
+    *: "Screen Scrolls Out Of View"
+  </source>
+  <dest>
+    *: "화면 스�롤� 보�지 않�"
+  </dest>
+  <voice>
+    *: "화면 스�롤� 보�지 않�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCREEN_SCROLL_STEP
+  desc: Pixels to advance per Screen scroll
+  user: core
+  <source>
+    *: "Screen Scroll Step Size"
+  </source>
+  <dest>
+    *: "화면 스�롤 단계 �기"
+  </dest>
+  <voice>
+    *: "화면 스�롤 단계 �기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL_PAGINATED
+  desc: jump to new page when scrolling
+  user: core
+  <source>
+    *: "Paged Scrolling"
+  </source>
+  <dest>
+    *: "페�지 스�롤"
+  </dest>
+  <voice>
+    *: "페�지 스�롤"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LISTACCEL_START_DELAY
+  desc: Delay before list starts accelerating
+  user: core
+  <source>
+    *: "List Acceleration Start Delay"
+    wheel_acceleration: none
+  </source>
+  <dest>
+    *: "목� 가� 시작 지연"
+    wheel_acceleration: none
+  </dest>
+  <voice>
+    *: "목� 가� 시작 지연"
+    wheel_acceleration: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LISTACCEL_ACCEL_SPEED
+  desc: list acceleration speed
+  user: core
+  <source>
+    *: "List Acceleration Speed"
+    wheel_acceleration: none
+  </source>
+  <dest>
+    *: "목� 가� ��"
+    wheel_acceleration: none
+  </dest>
+  <voice>
+    *: "목� 가� ��"
+    wheel_acceleration: none
   </voice>
 </phrase>
 <phrase>
@@ -1725,10 +2837,94 @@
     *: "Status-/Scrollbar"
   </source>
   <dest>
-    *: "�태/스�롤 바"
+    *: "�태-/스�롤바"
+  </dest>
+  <voice>
+    *: "�태-와 스�롤바"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SCROLL_BAR
+  desc: display menu, F3 substitute
+  user: core
+  <source>
+    *: "Scroll Bar"
+  </source>
+  <dest>
+    *: "스�롤바"
+  </dest>
+  <voice>
+    *: "스�롤바"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STATUS_BAR
+  desc: display menu, F3 substitute
+  user: core
+  <source>
+    *: "Status Bar"
+  </source>
+  <dest>
+    *: "�태바"
+  </dest>
+  <voice>
+    *: "�태바"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOLUME_DISPLAY
+  desc: Volume type title
+  user: core
+  <source>
+    *: "Volume Display"
+  </source>
+  <dest>
+    *: "볼륨 표시"
+  </dest>
+  <voice>
+    *: "볼륨 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BATTERY_DISPLAY
+  desc: Battery type title
+  user: core
+  <source>
+    *: "Battery Display"
+  </source>
+  <dest>
+    *: "배터리 표시"
+  </dest>
+  <voice>
+    *: "배터리 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_GRAPHIC
+  desc: Label for type of icon display
+  user: core
+  <source>
+    *: "Graphic"
+  </source>
+  <dest>
+    *: "그래픽"
+  </dest>
+  <voice>
+    *: "그래픽"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_NUMERIC
+  desc: Label for type of icon display
+  user: core
+  <source>
+    *: "Numeric"
+  </source>
+  <dest>
+    *: "숫�"
   </dest>
   <voice>
-    *: "�태/스�롤 바"
+    *: "숫�"
   </voice>
 </phrase>
 <phrase>
@@ -1737,15 +2933,138 @@
   user: core
   <source>
     *: "Peak Meter"
-    masd: none
   </source>
   <dest>
-    *: "피� 미터 설정"
-    masd: none
+    *: "피� 미터"
+  </dest>
+  <voice>
+    *: "피� 미터"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_CLIP_HOLD
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Clip Hold Time"
+  </source>
+  <dest>
+    *: "�립 유지 시간"
+  </dest>
+  <voice>
+    *: "�립 유지 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_PEAK_HOLD
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Peak Hold Time"
+  </source>
+  <dest>
+    *: "피� 유지 시간"
   </dest>
   <voice>
-    *: "피� 미터 설정"
-    masd: none
+    *: "피� 유지 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_ETERNAL
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Eternal"
+  </source>
+  <dest>
+    *: "�터�"
+  </dest>
+  <voice>
+    *: "�터�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_RELEASE
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Peak Release"
+  </source>
+  <dest>
+    *: "피� 릴리스"
+  </dest>
+  <voice>
+    *: "피� 릴리스"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_SCALE
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Scale"
+  </source>
+  <dest>
+    *: "스케�"
+  </dest>
+  <voice>
+    *: "스케�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_DBFS
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Logarithmic (dB)"
+  </source>
+  <dest>
+    *: "대수 (dB)"
+  </dest>
+  <voice>
+    *: "대수 �시벨"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_LINEAR
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Linear (%)"
+  </source>
+  <dest>
+    *: "선형 (%)"
+  </dest>
+  <voice>
+    *: "선형 �센트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_MIN
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Minimum Of Range"
+  </source>
+  <dest>
+    *: "최소 범위"
+  </dest>
+  <voice>
+    *: "최소 범위"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_MAX
+  desc: in the peak meter menu
+  user: core
+  <source>
+    *: "Maximum Of Range"
+  </source>
+  <dest>
+    *: "최대 범위"
+  </dest>
+  <voice>
+    *: "최대 범위"
   </voice>
 </phrase>
 <phrase>
@@ -1770,10 +3089,10 @@
     *: "Latin1 (ISO-8859-1)"
   </source>
   <dest>
-    *: "�틴어 (ISO-8859-1)"
+    *: "�틴어1 (ISO-8859-1)"
   </dest>
   <voice>
-    *: "�틴어"
+    *: "�틴어 1"
   </voice>
 </phrase>
 <phrase>
@@ -1812,10 +3131,10 @@
     *: "Cyrillic (CP1251)"
   </source>
   <dest>
-    *: "키릴문� (CP1251)"
+    *: "키릴어 (CP1251)"
   </dest>
   <voice>
-    *: "키릴문�"
+    *: "키릴어"
   </voice>
 </phrase>
 <phrase>
@@ -1826,10 +3145,10 @@
     *: "Thai (ISO-8859-11)"
   </source>
   <dest>
-    *: "태국어 (ISO-8859-11)"
+    *: "타�어 (ISO-8859-11)"
   </dest>
   <voice>
-    *: "태국어"
+    *: "타�어"
   </voice>
 </phrase>
 <phrase>
@@ -1854,10 +3173,10 @@
     *: "Turkish (ISO-8859-9)"
   </source>
   <dest>
-    *: "터키어 (ISO-8859-9)"
+    *: "튀르키예어 (ISO-8859-9)"
   </dest>
   <voice>
-    *: "터키어"
+    *: "튀르키예어"
   </voice>
 </phrase>
 <phrase>
@@ -1868,10 +3187,10 @@
     *: "Latin Extended (ISO-8859-2)"
   </source>
   <dest>
-    *: "추가 �틴어 (ISO-8859-2)"
+    *: "�틴어 확장 (ISO-8859-2)"
   </dest>
   <voice>
-    *: "추가 �틴어"
+    *: "�틴어 확장"
   </voice>
 </phrase>
 <phrase>
@@ -1896,10 +3215,10 @@
     *: "Simp. Chinese (GB2312)"
   </source>
   <dest>
-    *: "중국어 간체 (GB2312)"
+    *: "간체 중국어 (GB2312)"
   </dest>
   <voice>
-    *: "중국어 간체"
+    *: "간체 중국어"
   </voice>
 </phrase>
 <phrase>
@@ -1913,7 +3232,7 @@
     *: "한국어 (KSX1001)"
   </dest>
   <voice>
-    *: "한국어"
+    *: "í•­êµ­ì–´"
   </voice>
 </phrase>
 <phrase>
@@ -1924,10 +3243,10 @@
     *: "Trad. Chinese (BIG5)"
   </source>
   <dest>
-    *: "중국어 번체 (BIG5)"
+    *: "번체 중국어 (BIG5)"
   </dest>
   <voice>
-    *: "중국어 번체"
+    *: "번체 중국어"
   </voice>
 </phrase>
 <phrase>
@@ -1945,6 +3264,85 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_BUTTONLIGHT_TIMEOUT
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    button_light: "Button Light Timeout"
+    sansae200*,sansafuze*: "Wheel Light Timeout"
+  </source>
+  <dest>
+    *: none
+    button_light: "버튼 ��트 시간 초과"
+    sansae200*,sansafuze*: "휠 ��트 시간 초과"
+  </dest>
+  <voice>
+    *: none
+    button_light: "버튼 ��트 시간 초과"
+    sansae200*,sansafuze*: "휠 ��트 시간 초과"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BUTTONLIGHT_BRIGHTNESS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    buttonlight_brightness: "Button Light Brightness"
+  </source>
+  <dest>
+    *: none
+    buttonlight_brightness: "버튼 ��트 �기"
+  </dest>
+  <voice>
+    *: none
+    buttonlight_brightness: "버튼 ��트 �기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_START_SCREEN
+  desc: in the system sub menu
+  user: core
+  <source>
+    *: "Start Screen"
+  </source>
+  <dest>
+    *: "시작 화면"
+  </dest>
+  <voice>
+    *: "시작 화면"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_MENU
+  desc: in start screen setting
+  user: core
+  <source>
+    *: "Main Menu"
+  </source>
+  <dest>
+    *: "메� 메뉴"
+  </dest>
+  <voice>
+    *: "메� 메뉴"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREVIOUS_SCREEN
+  desc: in start screen setting
+  user: core
+  <source>
+    *: "Previous Screen"
+  </source>
+  <dest>
+    *: "�전 화면"
+  </dest>
+  <voice>
+    *: "�전 화면"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_BATTERY_MENU
   desc: in the system sub menu
   user: core
@@ -1952,10 +3350,81 @@
     *: "Battery"
   </source>
   <dest>
-    *: "배터리 설정"
+    *: "배터리"
+  </dest>
+  <voice>
+    *: "배터리"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BATTERY_CAPACITY
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Battery Capacity"
+  </source>
+  <dest>
+    *: "배터리 용량"
+  </dest>
+  <voice>
+    *: "배터리 용량"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BATTERY_TYPE
+  desc: in battery settings
+  user: core
+  <source>
+    *: none
+    battery_types: "Battery Type"
+  </source>
+  <dest>
+    *: none
+    battery_types: "배터리 유형"
+  </dest>
+  <voice>
+    *: none
+    battery_types: "배터리 유형"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BATTERY_TYPE_1
+  desc: in battery settings
+  user: core
+  <source>
+    *: none
+    battery_types: "Alkaline"
+    xduoox3: "Newer (2000 mAh)"
+  </source>
+  <dest>
+    *: none
+    battery_types: "알카��"
+    xduoox3: "최신 (2000 mAh)"
+  </dest>
+  <voice>
+    *: none
+    battery_types: "알카��"
+    xduoox3: "최신 2000 밀리암페어 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BATTERY_TYPE_2
+  desc: in battery settings
+  user: core
+  <source>
+    *: none
+    battery_types: "NiMH"
+    xduoox3: "Older (1500 mAh)"
+  </source>
+  <dest>
+    *: none
+    battery_types: "~NiMH"
+    xduoox3: "오래� (1500 mAh)"
   </dest>
   <voice>
-    *: "배터리 설정"
+    *: none
+    battery_types: "니켈 수소"
+    xduoox3: "오래� 1500 밀리암페어 시간"
   </voice>
 </phrase>
 <phrase>
@@ -1966,10 +3435,44 @@
     *: "Disk"
   </source>
   <dest>
-    *: "디스� 설정"
+    *: "디스�"
+  </dest>
+  <voice>
+    *: "디스�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPINDOWN
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Disk Spindown"
+    flash_storage: none
+  </source>
+  <dest>
+    *: "디스� 스핀다운"
+    flash_storage: none
+  </dest>
+  <voice>
+    *: "디스� 스핀다운"
+    flash_storage: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIRCACHE_ENABLE
+  desc: in directory cache settings
+  user: core
+  <source>
+    *: none
+    dircache: "Directory Cache"
+  </source>
+  <dest>
+    *: none
+    dircache: "디렉토리 �시"
   </dest>
   <voice>
-    *: "디스� 설정"
+    *: none
+    dircache: "디렉토리 �시"
   </voice>
 </phrase>
 <phrase>
@@ -1986,7 +3489,419 @@
   </dest>
   <voice>
     *: none
-    rtc: "시간 & 날짜"
+    rtc: "시간과 날짜"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_TIME
+  desc: in settings_menu
+  user: core
+  <source>
+    *: none
+    rtc: "Set Time/Date"
+  </source>
+  <dest>
+    *: none
+    rtc: "시간/날짜 설정"
+  </dest>
+  <voice>
+    *: none
+    rtc: "시간과 날짜 설정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIMEFORMAT
+  desc: select the time format of time in status bar
+  user: core
+  <source>
+    *: "Time Format"
+  </source>
+  <dest>
+    *: "시간 형�"
+  </dest>
+  <voice>
+    *: "시간 형�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_12_HOUR_CLOCK
+  desc: option for 12 hour clock
+  user: core
+  <source>
+    *: "12 Hour Clock"
+  </source>
+  <dest>
+    *: "12 시간"
+  </dest>
+  <voice>
+    *: "12 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_24_HOUR_CLOCK
+  desc: option for 24 hour clock
+  user: core
+  <source>
+    *: "24 Hour Clock"
+  </source>
+  <dest>
+    *: "24 시간"
+  </dest>
+  <voice>
+    *: "24 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIME_SET_BUTTON
+  desc: used in set_time()
+  user: core
+  <source>
+    *: none
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
+    gogearsa9200,samsungyh*: "PLAY = Set"
+    iriverh100,iriverh120,iriverh300: "NAVI = Set"
+    mpiohd300: "ENTER = Set"
+    mrobe500: "HEART = Set"
+    rtc: "ON = Set"
+    vibe500: "OK = Set"
+  </source>
+  <dest>
+    *: none
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "선� 버튼 = 설정"
+    gogearsa9200,samsungyh*: "재� 버튼 = 설정"
+    iriverh100,iriverh120,iriverh300: "�색 버튼 = 설정"
+    mpiohd300: "진입 버튼 = 설정"
+    mrobe500: "하트 버튼 = 설정"
+    rtc: "켬 버튼 = 설정"
+    vibe500: "확� 버튼 = 설정"
+  </dest>
+  <voice>
+    *: none
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIME_REVERT
+  desc: used in set_time()
+  user: core
+  <source>
+    *: none
+    gigabeatfx,mrobe500: "POWER = Revert"
+    gigabeats,sansafuzeplus: "BACK = Revert"
+    gogearsa9200: "LEFT = Revert"
+    iaudiom5,iaudiox5: "RECORD = Revert"
+    ipod*,mpiohd300,sansac200*: "MENU = Revert"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
+    iriverh100,iriverh120,iriverh300: "STOP = Revert"
+    mrobe100: "DISPLAY = Revert"
+    rtc: "OFF = Revert"
+    samsungyh*: "REW = Revert"
+    vibe500: "CANCEL = Revert"
+  </source>
+  <dest>
+    *: none
+    gigabeatfx,mrobe500: "전� 버터� = 반복"
+    gigabeats,sansafuzeplus: "뒤로가기 버튼 = 반복"
+    gogearsa9200: "왼쪽 버튼 = 반복"
+    iaudiom5,iaudiox5: "녹� 버튼 = 반복"
+    ipod*,mpiohd300,sansac200*: "메뉴 버튼 = 반복"
+    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "�전 버튼 = 반복"
+    iriverh100,iriverh120,iriverh300: "정지 버튼 = 반복"
+    mrobe100: "화면 버튼 = 반복"
+    rtc: "� 버튼 = 반복"
+    samsungyh*: "��기 버튼 = 반복"
+    vibe500: "취소 버튼 = 반복"
+  </dest>
+  <voice>
+    *: none
+    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_SUNDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Sun"
+  </source>
+  <dest>
+    *: none
+    rtc: "�"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_MONDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Mon"
+  </source>
+  <dest>
+    *: none
+    rtc: "ì›”"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_TUESDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Tue"
+  </source>
+  <dest>
+    *: none
+    rtc: "í™”"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_WEDNESDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Wed"
+  </source>
+  <dest>
+    *: none
+    rtc: "수"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_THURSDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Thu"
+  </source>
+  <dest>
+    *: none
+    rtc: "목"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_FRIDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Fri"
+  </source>
+  <dest>
+    *: none
+    rtc: "금"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WEEKDAY_SATURDAY
+  desc: Maximum 3-letter abbreviation for weekday
+  user: core
+  <source>
+    *: none
+    rtc: "Sat"
+  </source>
+  <dest>
+    *: none
+    rtc: "토"
+  </dest>
+  <voice>
+    *: none
+    rtc: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_JANUARY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Jan"
+  </source>
+  <dest>
+    *: "1ì›”"
+  </dest>
+  <voice>
+    *: "�월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_FEBRUARY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Feb"
+  </source>
+  <dest>
+    *: "2ì›”"
+  </dest>
+  <voice>
+    *: "�월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_MARCH
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Mar"
+  </source>
+  <dest>
+    *: "3ì›”"
+  </dest>
+  <voice>
+    *: "삼월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_APRIL
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Apr"
+  </source>
+  <dest>
+    *: "4ì›”"
+  </dest>
+  <voice>
+    *: "사월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_MAY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "May"
+  </source>
+  <dest>
+    *: "5ì›”"
+  </dest>
+  <voice>
+    *: "오월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_JUNE
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Jun"
+  </source>
+  <dest>
+    *: "6ì›”"
+  </dest>
+  <voice>
+    *: "유월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_JULY
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Jul"
+  </source>
+  <dest>
+    *: "7ì›”"
+  </dest>
+  <voice>
+    *: "ì¹ ì›”"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_AUGUST
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Aug"
+  </source>
+  <dest>
+    *: "8ì›”"
+  </dest>
+  <voice>
+    *: "팔월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_SEPTEMBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Sep"
+  </source>
+  <dest>
+    *: "9ì›”"
+  </dest>
+  <voice>
+    *: "구월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_OCTOBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Oct"
+  </source>
+  <dest>
+    *: "10ì›”"
+  </dest>
+  <voice>
+    *: "시월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_NOVEMBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Nov"
+  </source>
+  <dest>
+    *: "11ì›”"
+  </dest>
+  <voice>
+    *: "십�월"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MONTH_DECEMBER
+  desc: Maximum 3-letter abbreviation for monthname
+  user: core
+  <source>
+    *: "Dec"
+  </source>
+  <dest>
+    *: "12ì›”"
+  </dest>
+  <voice>
+    *: "십�월"
   </voice>
 </phrase>
 <phrase>
@@ -1997,10 +3912,10 @@
     *: "Idle Poweroff"
   </source>
   <dest>
-    *: "대기시간 설정"
+    *: "유휴 전� �기"
   </dest>
   <voice>
-    *: "대기시간 설정"
+    *: "유휴 전� �기"
   </voice>
 </phrase>
 <phrase>
@@ -2011,10 +3926,69 @@
     *: "Sleep Timer"
   </source>
   <dest>
-    *: "취침 예약"
+    *: "절전 타�머"
   </dest>
   <voice>
-    *: "취침 예약"
+    *: "절전 타�머"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIMITS_MENU
+  desc: in the system sub menu
+  user: core
+  <source>
+    *: "Limits"
+  </source>
+  <dest>
+    *: "제한"
+  </dest>
+  <voice>
+    *: "제한"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAX_FILES_IN_DIR
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Max Entries in File Browser"
+  </source>
+  <dest>
+    *: "파� 브�우저� 최대 항목"
+  </dest>
+  <voice>
+    *: "파� 브�우저� 최대 항목"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAX_FILES_IN_PLAYLIST
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Max Playlist Size"
+  </source>
+  <dest>
+    *: "최대 재� 목� �기"
+  </dest>
+  <voice>
+    *: "최대 재� 목� �기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CAR_ADAPTER_MODE
+  desc: Displayed for setting car adapter mode to on/off
+  user: core
+  <source>
+    *: none
+    charging: "Car Adapter Mode"
+  </source>
+  <dest>
+    *: none
+    charging: "차량용 어댑터 모드"
+  </dest>
+  <voice>
+    *: none
+    charging: "차량용 어댑터 모드"
   </voice>
 </phrase>
 <phrase>
@@ -2027,59 +4001,110 @@
   </source>
   <dest>
     *: none
-    alarm: "켜지는 시간 설정"
+    alarm: "기� 알람"
   </dest>
   <voice>
     *: none
-    alarm: "켜지는 시간 설정"
+    alarm: "기� 알람"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LIMITS_MENU
-  desc: in the system sub menu
+  id: LANG_ALARM_WAKEUP_SCREEN
+  desc: in alarm menu setting
   user: core
   <source>
-    *: "Limits"
+    *: none
+    alarm: "Alarm Wake up Screen"
   </source>
   <dest>
-    *: "제한 설정"
+    *: none
+    alarm: "알람 기� 화면"
   </dest>
   <voice>
-    *: "제한 설정"
+    *: none
+    alarm: "알람 기� 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LINE_IN
-  desc: in the recording settings
+  id: LANG_ALARM_MOD_TIME
+  desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
   user: core
   <source>
     *: none
-    recording: "Line In"
+    alarm: "Alarm Time:"
   </source>
   <dest>
     *: none
-    recording: "�� �"
+    alarm: "알람 시간:"
   </dest>
   <voice>
     *: none
-    recording: "�� �"
+    alarm: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CAR_ADAPTER_MODE
-  desc: Displayed for setting car adapter mode to on/off
+  id: LANG_ALARM_MOD_TIME_TO_GO
+  desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
   user: core
   <source>
     *: none
-    charging: "Car Adapter Mode"
+    alarm: "Waking Up In %d:%02d"
+  </source>
+  <dest>
+    *: none
+    alarm: "%d:%02d� 깨어남"
+  </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
+  <source>
+    *: none
+    alarm: "Alarm Time Is Too Soon!"
+  </source>
+  <dest>
+    *: none
+    alarm: "알람 시간� 너무 �릅니다!"
+  </dest>
+  <voice>
+    *: none
+    alarm: "알람 시간� 너무 �릅니다!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALARM_MOD_DISABLE
+  desc: Announce that the RTC alarm has been turned off
+  user: core
+  <source>
+    *: none
+    alarm: "Alarm Disabled"
   </source>
   <dest>
     *: none
-    charging: "카 어댑터 모드"
+    alarm: "알람 비활성화"
   </dest>
   <voice>
     *: none
-    charging: "카 어댑터 모드"
+    alarm: "알람 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS
+  desc: in general settings
+  user: core
+  <source>
+    *: "Bookmarking"
+  </source>
+  <dest>
+    *: "�마�"
+  </dest>
+  <voice>
+    *: "�마�"
   </voice>
 </phrase>
 <phrase>
@@ -2090,10 +4115,10 @@
     *: "Bookmark on Stop"
   </source>
   <dest>
-    *: "정지시 �� �마�"
+    *: "중지 시 �마�"
   </dest>
   <voice>
-    *: "정지시 �� �마�"
+    *: "중지 시 �마�"
   </voice>
 </phrase>
 <phrase>
@@ -2104,10 +4129,10 @@
     *: "Yes - Recent only"
   </source>
   <dest>
-    *: "최근� �마�만 저장"
+    *: "예 - 최근만"
   </dest>
   <voice>
-    *: "최근� �마�만 저장"
+    *: "예 - 최근만"
   </voice>
 </phrase>
 <phrase>
@@ -2118,10 +4143,10 @@
     *: "Ask - Recent only"
   </source>
   <dest>
-    *: "최근� �마�만 매번 확�"
+    *: "요청 - 최근만"
   </dest>
   <voice>
-    *: "최근� �마�만 매번 확�"
+    *: "요청 - 최근만"
   </voice>
 </phrase>
 <phrase>
@@ -2132,10 +4157,10 @@
     *: "Load Last Bookmark"
   </source>
   <dest>
-    *: "최근 �마� 열기"
+    *: "마지막 �마� 로드"
   </dest>
   <voice>
-    *: "최근 �마� 열기"
+    *: "마지막 �마� 로드"
   </voice>
 </phrase>
 <phrase>
@@ -2146,24 +4171,52 @@
     *: "Maintain a List of Recent Bookmarks?"
   </source>
   <dest>
-    *: "최근 �마�� 목� 유지"
+    *: "최근 �마� 목�� 유지할까요?"
+  </dest>
+  <voice>
+    *: "최근 �마� 목�� 유지할까요?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LANGUAGE
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Language"
+  </source>
+  <dest>
+    *: "언어"
   </dest>
   <voice>
-    *: "최근 �마�� 목� 유지"
+    *: "언어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY
-  desc: Save only on bookmark for each playlist in recent bookmarks
+  id: LANG_LANGUAGE_LOADED
+  desc: shown when a language has been loaded from the dir browser
   user: core
   <source>
-    *: "Unique only"
+    *: "New Language"
   </source>
   <dest>
-    *: "특별한 것만"
+    *: "새 언어"
   </dest>
   <voice>
-    *: "특별한 것만"
+    *: "새 언어"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE
+  desc: root of voice menu
+  user: core
+  <source>
+    *: "Voice"
+  </source>
+  <dest>
+    *: "�섬"
+  </dest>
+  <voice>
+    *: "�성"
   </voice>
 </phrase>
 <phrase>
@@ -2174,10 +4227,10 @@
     *: "Voice Menus"
   </source>
   <dest>
-    *: "�성 안내 사용"
+    *: "�성 메뉴"
   </dest>
   <voice>
-    *: "�성 안내 사용"
+    *: "�성 메뉴"
   </voice>
 </phrase>
 <phrase>
@@ -2188,10 +4241,24 @@
     *: "Voice Directories"
   </source>
   <dest>
-    *: "�� �름 안내"
+    *: "�성 디렉토리"
+  </dest>
+  <voice>
+    *: "�성 디렉토리"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE_DIR_TALK
+  desc: Item of voice menu, whether to use directory .talk clips
+  user: core
+  <source>
+    *: "Use Directory .talk Clips"
+  </source>
+  <dest>
+    *: "디렉토리 .talk �립 사용"
   </dest>
   <voice>
-    *: "�� �름 안내"
+    *: "디렉토리 .talk �립 사용"
   </voice>
 </phrase>
 <phrase>
@@ -2202,10 +4269,24 @@
     *: "Voice Filenames"
   </source>
   <dest>
-    *: "파� �름 안내"
+    *: "�성 파��름"
+  </dest>
+  <voice>
+    *: "�성 파��름"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE_FILE_TALK
+  desc: Item of voice menu, whether to use file .talk clips
+  user: core
+  <source>
+    *: "Use File .talk Clips"
+  </source>
+  <dest>
+    *: "파� .talk �립 사용"
   </dest>
   <voice>
-    *: "파� �름 안내"
+    *: "파� .talk �립 사용"
   </voice>
 </phrase>
 <phrase>
@@ -2216,10 +4297,10 @@
     *: "Numbers"
   </source>
   <dest>
-    *: "숫�"
+    *: "번호"
   </dest>
   <voice>
-    *: "숫�"
+    *: "번호"
   </voice>
 </phrase>
 <phrase>
@@ -2230,10 +4311,10 @@
     *: "Spell"
   </source>
   <dest>
-    *: "철�"
+    *: "철� �하기"
   </dest>
   <voice>
-    *: "철�"
+    *: "철� �하기"
   </voice>
 </phrase>
 <phrase>
@@ -2241,1608 +4322,1842 @@
   desc: "talkbox" mode for directories + files
   user: core
   <source>
-    *: ".talk mp3 clip"
+    *: ".talk Clip"
   </source>
   <dest>
-    *: "MP3 파� 사용"
+    *: ".talk �립"
   </dest>
   <voice>
-    *: "MP3 파� 사용"
+    *: "토� �립"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_QUALITY
-  desc: in the recording settings
+  id: LANG_MANAGE_MENU
+  desc: in the main menu
+  user: core
+  <source>
+    *: "Manage Settings"
+  </source>
+  <dest>
+    *: "설정 관리"
+  </dest>
+  <voice>
+    *: "설정 관리"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CUSTOM_CFG
+  desc: in setting_menu()
+  user: core
+  <source>
+    *: "Browse .cfg Files"
+  </source>
+  <dest>
+    *: ".cfg 파� 찾아보기"
+  </dest>
+  <voice>
+    *: "구성 파� 찾아보기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SETTINGS_LOADED
+  desc: Feedback shown when a .cfg file is loaded
+  user: core
+  <source>
+    *: "Settings Loaded"
+  </source>
+  <dest>
+    *: "설정 로드�"
+  </dest>
+  <voice>
+    *: "설정 로드�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET
+  desc: in system_settings_menu()
+  user: core
+  <source>
+    *: "Reset Settings"
+  </source>
+  <dest>
+    *: "설정 초기화"
+  </dest>
+  <voice>
+    *: "설정 초기화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_DONE_CLEAR
+  desc: visual confirmation after settings reset
+  user: core
+  <source>
+    *: "Cleared"
+  </source>
+  <dest>
+    *: "지워�"
+  </dest>
+  <voice>
+    *: "설정 지워�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_SETTINGS
+  desc: in system_settings_menu()
+  user: core
+  <source>
+    *: "Save .cfg File"
+  </source>
+  <dest>
+    *: ".cfg 파� 저장"
+  </dest>
+  <voice>
+    *: "구성 파� 저장"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SETTINGS_SAVED
+  desc: Feedback shown when a .cfg file is saved
+  user: core
+  <source>
+    *: "Settings Saved"
+  </source>
+  <dest>
+    *: "설정 저장�"
+  </dest>
+  <voice>
+    *: "설정 저장�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_THEME
+  desc: save a theme file
+  user: core
+  <source>
+    *: "Save Theme Settings"
+  </source>
+  <dest>
+    *: "테마 설정 저장"
+  </dest>
+  <voice>
+    *: "테마 설정 저장"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CUSTOM_THEME
+  desc: in the main menu
+  user: core
+  <source>
+    *: "Browse Theme Files"
+  </source>
+  <dest>
+    *: "테마 파� 찾아보기"
+  </dest>
+  <voice>
+    *: "테마 파� 찾아보기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_SETTINGS
+  desc: in the main menu
   user: core
   <source>
     *: none
-    recording_hwcodec: "Quality"
+    recording: "Recording Settings"
   </source>
   <dest>
     *: none
-    recording_hwcodec: "�질"
+    recording: "녹� 설정"
   </dest>
   <voice>
     *: none
-    recording_hwcodec: "�질"
+    recording: "녹� 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FREQUENCY
-  desc: in recording and playback settings
+  id: LANG_FM_MENU
+  desc: fm menu title
   user: core
   <source>
     *: none
-    play_frequency,recording: "Frequency"
+    radio: "FM Radio Menu"
   </source>
   <dest>
     *: none
-    play_frequency,recording: "주파수"
+    radio: "FM �디오 메뉴"
   </dest>
   <voice>
     *: none
-    play_frequency,recording: "주파수"
+    radio: "FM �디오 메뉴"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SOURCE
-  desc: in the recording settings
+  id: LANG_FM_NO_PRESETS
+  desc: error when preset list is empty
   user: core
   <source>
     *: none
-    recording: "Source"
+    radio: "No presets"
   </source>
   <dest>
     *: none
-    recording: "소스"
+    radio: "사전 설정 없�"
   </dest>
   <voice>
     *: none
-    recording: "소스"
+    radio: "사전 설정 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SRC_MIC
-  desc: in the recording settings
+  id: LANG_FM_ADD_PRESET
+  desc: in radio menu
   user: core
   <source>
     *: none
-    iriverh100,iriverh120,iriverh300: "Internal Microphone"
-    recording: "Microphone"
+    radio: "Add Preset"
   </source>
   <dest>
     *: none
-    iriverh100,iriverh120,iriverh300: "내장 마��"
-    recording: "외부 마��"
+    radio: "사전 설정 추가"
   </dest>
   <voice>
     *: none
-    iriverh100,iriverh120,iriverh300: "내장 마��"
-    recording: "외부 마��"
+    radio: "사전 설정 추가"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SRC_DIGITAL
-  desc: in the recording settings
+  id: LANG_FM_EDIT_PRESET
+  desc: in radio screen
   user: core
   <source>
     *: none
-    recording: "Digital"
+    radio: "Edit Preset"
   </source>
   <dest>
     *: none
-    recording: "디지털"
+    radio: "사전 설정 편집"
   </dest>
   <voice>
     *: none
-    recording: "디지털"
+    radio: "사전 설정 편집"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_EDITABLE
-  desc: Editable recordings setting
+  id: LANG_FM_DELETE_PRESET
+  desc: in radio screen
   user: core
   <source>
     *: none
-    recording_hwcodec: "Independent Frames"
+    radio: "Remove Preset"
   </source>
   <dest>
     *: none
-    recording_hwcodec: "�립� 프레임"
+    radio: "사전 설정 제거"
   </dest>
   <voice>
     *: none
-    recording_hwcodec: "�립� 프레임"
+    radio: "사전 설정 제거"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TIMESPLIT
-  desc: Record split menu
+  id: LANG_FM_PRESET_SAVE_FAILED
+  desc: in radio screen
   user: core
   <source>
     *: none
-    recording: "File Split Options"
+    radio: "Preset Save Failed"
   </source>
   <dest>
     *: none
-    recording: "파� 분리 옵션"
+    radio: "프리셋 저장 실패함"
   </dest>
   <voice>
     *: none
-    recording: "파� 분리 옵션"
+    radio: "프리셋 저장 실패함"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_PRERECORD_TIME
-  desc: in recording settings_menu
+  id: LANG_FM_NO_FREE_PRESETS
+  desc: in radio screen
   user: core
   <source>
     *: none
-    recording: "Prerecord Time"
+    radio: "The Preset List is Full"
   </source>
   <dest>
     *: none
-    recording: "프리 레코딩 타임"
+    radio: "사전 설정 목� 가� 참"
   </dest>
   <voice>
     *: none
-    recording: "프리 레코딩 타임"
+    radio: "사전 설정 목� 가� 참"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_DIRECTORY
-  desc: in recording settings_menu
+  id: LANG_PRESET
+  desc: in button bar and radio screen / menu
   user: core
   <source>
     *: none
-    recording: "Directory"
+    radio: "Preset"
   </source>
   <dest>
     *: none
-    recording: "디렉토리"
+    radio: "사전 설정"
   </dest>
   <voice>
     *: none
-    recording: "디렉토리"
+    radio: "사전 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER
-  desc: in recording settings_menu
+  id: LANG_FM_MONO_MODE
+  desc: in radio screen
   user: core
   <source>
     *: none
-    recording: "Trigger"
+    radio: "Force Mono"
   </source>
   <dest>
     *: none
-    recording: "트리거"
+    radio: "강제 모노"
   </dest>
   <voice>
     *: none
-    recording: "트리거"
+    radio: "강제 모노"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLIP_LIGHT
-  desc: in record settings menu.
+  id: LANG_FM_FREEZE
+  desc: splash screen during freeze in radio mode
   user: core
   <source>
     *: none
-    recording: "Clipping Light"
+    radio: "Screen frozen!"
   </source>
   <dest>
     *: none
-    recording: "�리핑 램프"
+    radio: "화면� 멈췄습니다!"
   </dest>
   <voice>
     *: none
-    recording: "�리핑 램프"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAIN_UNIT
-  desc: in record settings menu.
+  id: LANG_FM_SCAN_PRESETS
+  desc: in radio menu
   user: core
   <source>
     *: none
-    remote: "Main Unit Only"
+    radio: "Auto-Scan Presets"
   </source>
   <dest>
     *: none
-    remote: "본체만"
+    radio: "사전 설정 �� 검색"
   </dest>
   <voice>
     *: none
-    remote: "본체만"
+    radio: "사전 설정 �� 검"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_UNIT
-  desc: in record settings menu.
+  id: LANG_FM_CLEAR_PRESETS
+  desc: confirmation if presets can be cleared
   user: core
   <source>
     *: none
-    remote: "Remote Unit Only"
+    radio: "Clear Current Presets?"
   </source>
   <dest>
     *: none
-    remote: "리모트만"
+    radio: "현재 사전 설정� 지�니까?"
   </dest>
   <voice>
     *: none
-    remote: "리모트만"
+    radio: "현재 사전 설정� 지�니까?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_MAIN
-  desc: in record settings menu.
+  id: LANG_FM_SCANNING
+  desc: during auto scan
   user: core
   <source>
     *: none
-    remote: "Main and Remote Unit"
+    radio: "Scanning %d.%02d MHz"
   </source>
   <dest>
     *: none
-    remote: "본체와 리모트"
+    radio: "%d.%02d MHz 검색 중"
   </dest>
   <voice>
     *: none
-    remote: "본체와 리모트"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FFRW_STEP
-  desc: in settings_menu
+  id: LANG_FM_DEFAULT_PRESET_NAME
+  desc: default preset name for auto scan mode
   user: core
   <source>
-    *: "FF/RW Min Step"
+    *: none
+    radio: "%d.%02d MHz"
   </source>
   <dest>
-    *: "�/빨리�기 범위"
+    *: none
+    radio: "%d.%02d MHz"
   </dest>
   <voice>
-    *: "최소 범위"
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FFRW_ACCEL
-  desc: in settings_menu
+  id: LANG_RADIO_SCAN_MODE
+  desc: in radio screen / menu
   user: core
   <source>
-    *: "FF/RW Accel"
+    *: none
+    radio: "Scan"
   </source>
   <dest>
-    *: "�/빨리�기 ��"
+    *: none
+    radio: "검색"
   </dest>
   <voice>
-    *: "��"
+    *: none
+    radio: "검색"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_ENABLE
-  desc: in crossfade settings menu
+  id: LANG_FM_PRESET_LOAD
+  desc: load preset list in fm radio
   user: core
   <source>
     *: none
-    crossfade: "Enable Crossfade"
+    radio: "Load Preset List"
   </source>
   <dest>
     *: none
-    crossfade: "�로스페�드 켜기"
+    radio: "사전 설정 목� 로드"
   </dest>
   <voice>
     *: none
-    crossfade: "�로스페�드 켜기"
+    radio: "사전설정 목� 로드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MANTRACKSKIP
-  desc: in crossfade settings
+  id: LANG_FM_PRESET_SAVE
+  desc: Save preset list in fm radio
   user: core
   <source>
     *: none
-    crossfade: "Manual Track Skip Only"
+    radio: "Save Preset List"
   </source>
   <dest>
     *: none
-    crossfade: "트랙 스킵만"
+    radio: "사전 설정 목� 저장"
   </dest>
   <voice>
     *: none
-    crossfade: "트랙 스킵만"
+    radio: "사전 설정 목� 저장"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_FADE_IN_DELAY
-  desc: in crossfade settings menu
+  id: LANG_FM_PRESET_CLEAR
+  desc: clear preset list in fm radio
   user: core
   <source>
     *: none
-    crossfade: "Fade-In Delay"
+    radio: "Clear Preset List"
   </source>
   <dest>
     *: none
-    crossfade: "페�드� 지연시간"
+    radio: "사전 설정 목� 지우기"
   </dest>
   <voice>
     *: none
-    crossfade: "페�드� 지연시간"
+    radio: "사전 설정 목� 지우기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_FADE_IN_DURATION
-  desc: in crossfade settings menu
+  id: LANG_FMR
+  desc: Used when you need to say Preset List, also voiced
   user: core
   <source>
     *: none
-    crossfade: "Fade-In Duration"
+    radio: "Preset List"
   </source>
   <dest>
     *: none
-    crossfade: "페�드� 시간"
+    radio: "사전 설정 목�"
   </dest>
   <voice>
     *: none
-    crossfade: "페�드� 시간"
+    radio: "사전 설정 목�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_FADE_OUT_DELAY
-  desc: in crossfade settings menu
+  id: LANG_FM_FIRST_AUTOSCAN
+  desc: When you run the radio without an fmr file in settings
   user: core
   <source>
     *: none
-    crossfade: "Fade-Out Delay"
+    radio: "No settings found. Autoscan?"
   </source>
   <dest>
     *: none
-    crossfade: "페�드아웃 지연시간"
+    radio: "설정� 찾� 수 없습니다. �� 검색� 할까요?"
   </dest>
   <voice>
     *: none
-    crossfade: "페�드아웃 지연시간"
+    radio: "설정� 찾� 수 없습니다. �� 검색� 할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_FADE_OUT_DURATION
-  desc: in crossfade settings menu
+  id: LANG_FM_REGION
+  desc: fm tuner region setting
   user: core
   <source>
     *: none
-    crossfade: "Fade-Out Duration"
+    radio: "Region"
   </source>
   <dest>
     *: none
-    crossfade: "페�드아웃 시간"
+    radio: "지역"
   </dest>
   <voice>
     *: none
-    crossfade: "페�드아웃 시간"
+    radio: "지역"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFADE_FADE_OUT_MODE
-  desc: in crossfade settings menu
+  id: LANG_FM_EUROPE
+  desc: fm tuner region europe
   user: core
   <source>
     *: none
-    crossfade: "Fade-Out Mode"
+    radio: "Europe"
   </source>
   <dest>
     *: none
-    crossfade: "페�드아웃 모드"
+    radio: "유럽"
   </dest>
   <voice>
     *: none
-    crossfade: "페�드아웃 모드"
+    radio: "유럽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MIX
-  desc: in playback settings, crossfade option
+  id: LANG_FM_US
+  desc: fm region us / canada
   user: core
   <source>
     *: none
-    crossfade: "Mix"
+    radio: "US / Canada"
   </source>
   <dest>
     *: none
-    crossfade: "혼합"
+    radio: "미국 / �나다"
   </dest>
   <voice>
     *: none
-    crossfade: "혼합"
+    radio: "미국과 �나다"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLAYGAIN_NOCLIP
-  desc: in replaygain
+  id: LANG_FM_JAPAN
+  desc: fm region japan
   user: core
   <source>
-    *: "Prevent Clipping"
+    *: none
+    radio: "Japan"
   </source>
   <dest>
-    *: "�리핑 방지"
+    *: none
+    radio: "�본"
   </dest>
   <voice>
-    *: "�리핑 방지"
+    *: none
+    radio: "�본"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLAYGAIN_MODE
-  desc: in replaygain
+  id: LANG_FM_KOREA
+  desc: fm region korea
   user: core
   <source>
-    *: "Replaygain Type"
+    *: none
+    radio: "Korea"
   </source>
   <dest>
-    *: "리플레�게� 종류"
+    *: none
+    radio: "대한민국"
   </dest>
   <voice>
-    *: "리플레�게� 종류"
+    *: none
+    radio: "대한민국"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALBUM_GAIN
-  desc: in replaygain
+  id: LANG_FORMAT
+  desc: audio format
   user: core
   <source>
-    *: "Album Gain"
+    *: "Format"
   </source>
   <dest>
-    *: "앨범 게�"
+    *: "형�"
   </dest>
   <voice>
-    *: "앨범 게�"
+    *: "형�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TRACK_GAIN
-  desc: in replaygain
+  id: LANG_AFMT_MPA_L3
+  desc: audio format description
   user: core
   <source>
-    *: "Track Gain"
+    *: none
+    recording: "MPEG Layer 3"
   </source>
   <dest>
-    *: "트랙 게�"
+    *: none
+    recording: "MPEG 레�어 3"
   </dest>
   <voice>
-    *: "트랙 게�"
+    *: none
+    recording: "MPEG 레�어 3"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUFFLE_GAIN
-  desc: use track gain if shuffle mode is on, album gain otherwise
+  id: LANG_AFMT_PCM_WAV
+  desc: audio format description
   user: core
   <source>
-    *: "Track Gain if Shuffling"
+    *: none
+    recording: "PCM Wave"
   </source>
   <dest>
-    *: "임� 재�시 트랙 게� 사용"
+    *: none
+    recording: "~PCM Wave"
   </dest>
   <voice>
-    *: "임� 재�시 트랙 게� 사용"
+    *: none
+    recording: "PCM 웨�브"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLAYGAIN_PREAMP
-  desc: in replaygain settings
+  id: LANG_AFMT_WAVPACK
+  desc: audio format description
   user: core
   <source>
-    *: "Pre-amp"
+    *: none
+    recording: "WavPack"
   </source>
   <dest>
-    *: "미리 ��"
+    *: none
+    recording: "WavPack"
   </dest>
   <voice>
-    *: "미리 ��"
+    *: none
+    recording: "WavPack"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT
-  desc: in settings_menu
+  id: LANG_AFMT_AIFF
+  desc: audio format description
   user: core
   <source>
-    *: "Backlight"
+    *: none
+    recording: "AIFF"
   </source>
   <dest>
-    *: "배터리 조명 시간"
+    *: none
+    recording: "AIFF"
   </dest>
   <voice>
-    *: "배터리 조명 시간"
+    *: none
+    recording: "AIFF"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_ON_WHEN_CHARGING
-  desc: in display_settings_menu, backlight timeout with charger connected
+  id: LANG_ENCODER_SETTINGS
+  desc: encoder settings
   user: core
   <source>
     *: none
-    charging: "Backlight (While Plugged In)"
+    recording: "Encoder Settings"
   </source>
   <dest>
     *: none
-    charging: "플러그 연결시 백��트 설정"
+    recording: "�코� 설정"
   </dest>
   <voice>
     *: none
-    charging: "플러그 연결시 백��트 설정"
+    recording: "�코� 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CAPTION_BACKLIGHT
-  desc: in settings_menu
+  id: LANG_BITRATE
+  desc: bits-kilobits per unit time
   user: core
   <source>
-    *: "Caption Backlight"
+    *: none
+    recording: "Bitrate"
   </source>
   <dest>
-    *: "�악 시작/종료시 조명 켜기"
+    *: none
+    recording: "비트전송률"
   </dest>
   <voice>
-    *: "�악 시작/종료시 조명 켜기"
+    *: none
+    recording: "비트전송률"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_FADE_IN
-  desc: in settings_menu
+  id: LANG_NO_SETTINGS
+  desc: when something has settings in a certain context
   user: core
   <source>
     *: none
-    backlight_fade*: "Backlight Fade In"
+    recording: "(No Settings)"
   </source>
   <dest>
     *: none
-    backlight_fade*: "백��트 페�드�"
+    recording: "(설정 없�)"
   </dest>
   <voice>
     *: none
-    backlight_fade*: "백��트 페�드�"
+    recording: "사용 가능한 설정� 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_FADE_OUT
-  desc: in settings_menu
+  id: LANG_FREQUENCY
+  desc: in recording and playback settings
   user: core
   <source>
     *: none
-    backlight_fade*: "Backlight Fade Out"
+    play_frequency,recording: "Frequency"
   </source>
   <dest>
     *: none
-    backlight_fade*: "백��트 페�드아웃"
+    play_frequency,recording: "주파수"
   </dest>
   <voice>
     *: none
-    backlight_fade*: "백��트 페�드아웃"
+    play_frequency,recording: "주파수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BRIGHTNESS
-  desc: in settings_menu
+  id: LANG_SOURCE_FREQUENCY
+  desc: when recording source frequency setting must follow source
   user: core
   <source>
     *: none
-    backlight_brightness: "Brightness"
+    recording: "(Same As Source)"
   </source>
   <dest>
     *: none
-    backlight_brightness: "화면�기"
+    recording: "(�본과 같�)"
   </dest>
   <voice>
     *: none
-    backlight_brightness: "화면�기"
+    recording: "�본과 같�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CONTRAST
-  desc: in settings_menu
+  id: LANG_RECORDING_SOURCE
+  desc: in the recording settings
   user: core
   <source>
-    *: "Contrast"
+    *: none
+    recording: "Source"
   </source>
   <dest>
-    *: "명암 조절"
+    *: none
+    recording: "소스"
   </dest>
   <voice>
-    *: "명암 조절"
+    *: none
+    recording: "소스"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
-  desc: Backlight behaviour setting
+  id: LANG_RECORDING_SRC_MIC
+  desc: in the recording settings
   user: core
   <source>
-    *: "First Buttonpress Enables Backlight Only"
+    *: none
+    iriverh100,iriverh120,iriverh300: "Internal Microphone"
+    recording: "Microphone"
   </source>
   <dest>
-    *: "버튼 한번 누르면 조명 켜기"
+    *: none
+    iriverh100,iriverh120,iriverh300: "내장 마��"
+    recording: "마��"
   </dest>
   <voice>
-    *: "버튼 한번 누르면 조명 켜기"
+    *: none
+    iriverh100,iriverh120,iriverh300: "내장 마��"
+    recording: "마��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT
-  desc: in settings_menu
+  id: LANG_RECORDING_SRC_DIGITAL
+  desc: in the recording settings
   user: core
   <source>
     *: none
-    lcd_invert,remote_lcd_invert: "LCD Mode"
+    recording: "Digital"
   </source>
   <dest>
     *: none
-    lcd_invert,remote_lcd_invert: "LCD모드"
+    recording: "디지털"
   </dest>
   <voice>
     *: none
-    lcd_invert,remote_lcd_invert: "LCD모드"
+    recording: "디지털"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_LCD_INVERSE
-  desc: in settings_menu
+  id: LANG_LINE_IN
+  desc: in the recording settings
   user: core
   <source>
     *: none
-    lcd_invert,remote_lcd_invert: "Inverse"
+    recording: "Line In"
   </source>
   <dest>
     *: none
-    lcd_invert,remote_lcd_invert: "반전"
+    recording: "�� �"
   </dest>
   <voice>
     *: none
-    lcd_invert,remote_lcd_invert: "반전"
+    recording: "�� �"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FLIP_DISPLAY
-  desc: in settings_menu, option to turn display+buttos by 180 degrees
+  id: LANG_RECORD_TIMESPLIT
+  desc: Record split menu
   user: core
   <source>
-    *: "Upside Down"
+    *: none
+    recording: "File Split Options"
   </source>
   <dest>
-    *: "뒤집기"
+    *: none
+    recording: "파� 분할 옵션"
   </dest>
   <voice>
-    *: "뒤집기"
+    *: none
+    recording: "파� 분할 옵션"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR
-  desc: in settings_menu
+  id: LANG_SPLIT_MEASURE
+  desc: in record timesplit options
   user: core
   <source>
-    *: "Line Selector Type"
+    *: none
+    recording: "Split Measure"
   </source>
   <dest>
-    *: "�� 선�기 타입"
+    *: none
+    recording: "분할 측정"
   </dest>
   <voice>
-    *: "�� 선�기 타입"
+    *: none
+    recording: "분할 측정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR_POINTER
-  desc: in settings_menu
+  id: LANG_SPLIT_TYPE
+  desc: in record timesplit options
   user: core
   <source>
-    *: "Pointer"
+    *: none
+    recording: "What to do when Splitting"
   </source>
   <dest>
-    *: "��터"
+    *: none
+    recording: "분할 시 해야 할 �"
   </dest>
   <voice>
-    *: "��터"
+    *: none
+    recording: "분할 시 해야 할 �"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR_BAR
-  desc: in settings_menu
+  id: LANG_START_NEW_FILE
+  desc: in record timesplit options
   user: core
   <source>
-    *: "Bar (Inverse)"
+    *: none
+    recording: "Start new file"
   </source>
   <dest>
-    *: "바(반전)"
+    *: none
+    recording: "새 파� 시작"
   </dest>
   <voice>
-    *: "바(반전)"
+    *: none
+    recording: "새 파� 시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_BACKDROP
-  desc: text for LCD settings menu
+  id: LANG_STOP_RECORDING
+  desc: in record timesplit options
   user: core
   <source>
     *: none
-    lcd_non-mono: "Clear Backdrop"
+    recording: "Stop recording"
   </source>
   <dest>
     *: none
-    lcd_non-mono: "배경화면 없애기"
+    recording: "녹� 정지"
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "배경화면 없애기"
+    recording: "녹� 정지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKGROUND_COLOR
-  desc: menu entry to set the background color
+  id: LANG_SPLIT_TIME
+  desc: in record timesplit options
   user: core
   <source>
     *: none
-    lcd_color: "Background Colour"
+    recording: "Split Time"
   </source>
   <dest>
     *: none
-    lcd_color: "배경색"
+    recording: "분할 시간"
   </dest>
   <voice>
     *: none
-    lcd_color: "배경색"
+    recording: "분할 시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FOREGROUND_COLOR
-  desc: menu entry to set the foreground color
+  id: LANG_SPLIT_SIZE
+  desc: in record timesplit options
   user: core
   <source>
     *: none
-    lcd_color: "Foreground Colour"
+    recording: "Split Filesize"
   </source>
   <dest>
     *: none
-    lcd_color: "전면색"
+    recording: "분할 파��기"
   </dest>
   <voice>
     *: none
-    lcd_color: "전면색"
+    recording: "분할 파��기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_COLORS
-  desc: menu
+  id: LANG_RECORD_PRERECORD_TIME
+  desc: in recording settings_menu
   user: core
   <source>
     *: none
-    lcd_color: "Reset Colours"
+    recording: "Prerecord Time"
   </source>
   <dest>
     *: none
-    lcd_color: "색깔 초기화"
+    recording: "사전 녹� 시간"
   </dest>
   <voice>
     *: none
-    lcd_color: "색깔 초기화"
+    recording: "사전 녹� 시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REDUCE_TICKING
-  desc: in remote lcd settings menu
+  id: LANG_CLEAR_REC_DIR
+  desc:
   user: core
   <source>
     *: none
-    remote_ticking: "Reduce Ticking"
+    recording: "Clear Recording Directory"
   </source>
   <dest>
     *: none
-    remote_ticking: "Ticking �소시키기"
+    recording: "녹� 디렉토리 지우기"
   </dest>
   <voice>
     *: none
-    remote_ticking: "Ticking �소시키기"
+    recording: "녹� 디렉토리 지우기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_SPEED
-  desc: in display_settings_menu()
+  id: LANG_REC_DIR_NOT_WRITABLE
+  desc:
   user: core
   <source>
-    *: "Scroll Speed"
+    *: none
+    recording: "Can't write to recording directory"
   </source>
   <dest>
-    *: "문� �름 ��"
+    *: none
+    recording: "녹� 디렉토리� 쓸 수 없�"
   </dest>
   <voice>
-    *: "문� �름 ��"
+    *: none
+    recording: "녹� 디렉토리� 쓸 수 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL
-  desc: in settings_menu
+  id: LANG_CLIP_LIGHT
+  desc: in record settings menu.
   user: core
   <source>
-    *: "Scroll Speed Setting Example"
+    *: none
+    recording: "Clipping Light"
   </source>
   <dest>
-    *: "문� �름 �� 설정� 미리보기 위한 예시입니다"
+    *: none
+    recording: "�리핑 ��트"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "�리핑 ��트"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_DELAY
-  desc: Delay before scrolling
+  id: LANG_MAIN_UNIT
+  desc: in record settings menu.
   user: core
   <source>
-    *: "Scroll Start Delay"
+    *: none
+    remote: "Main Unit Only"
   </source>
   <dest>
-    *: "문� �름 지연시간"
+    *: none
+    remote: "본체만"
   </dest>
   <voice>
-    *: "문� �름 지연시간"
+    *: none
+    remote: "본체만"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_STEP
-  desc: Pixels to advance per scroll
+  id: LANG_REMOTE_UNIT
+  desc: in record settings menu.
   user: core
   <source>
-    *: "Scroll Step Size"
+    *: none
+    remote: "Remote Unit Only"
   </source>
   <dest>
-    *: "문� �름 �기"
+    *: none
+    remote: "�격 장치만"
   </dest>
   <voice>
-    *: "문� �름 �기"
+    *: none
+    remote: "�격 장치만"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_STEP_EXAMPLE
-  desc: Pixels to advance per scroll
+  id: LANG_REMOTE_MAIN
+  desc: in record settings menu.
   user: core
   <source>
-    *: "Scroll Step Size Setting Example Text"
+    *: none
+    remote: "Main and Remote Unit"
   </source>
   <dest>
-    *: "문� �름 �기 설정� 미리보기 위한 예시입니다"
+    *: none
+    remote: "본체 � �격 장치"
   </dest>
   <voice>
-    *: ""
+    *: none
+    remote: "본체 � �격 장치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BIDIR_SCROLL
-  desc: Bidirectional scroll limit
+  id: LANG_RECORD_TRIGGER
+  desc: in recording settings_menu
   user: core
   <source>
-    *: "Bidirectional Scroll Limit"
+    *: none
+    recording: "Trigger"
   </source>
   <dest>
-    *: "�아오는 문� �름 제한"
+    *: none
+    recording: "트리거"
   </dest>
   <voice>
-    *: "�아오는 문� �름 제한"
+    *: none
+    recording: "트리거"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCREEN_SCROLL_VIEW
-  desc: should lines scroll out of the screen
+  id: LANG_RECORD_TRIG_NOREARM
+  desc: in recording settings_menu
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: none
+    recording: "Once"
   </source>
   <dest>
-    *: "화면� ��해 긴 문� 보기"
+    *: none
+    recording: "즉시"
   </dest>
   <voice>
-    *: "화면� ��해 긴 문� 보기"
+    *: none
+    recording: "즉시"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCREEN_SCROLL_STEP
-  desc: Pixels to advance per Screen scroll
+  id: LANG_RECORD_TRIGGER_TYPE
+  desc: in recording trigger menu
   user: core
   <source>
-    *: "Screen Scroll Step Size"
+    *: none
+    recording: "Trigtype"
   </source>
   <dest>
-    *: "화면 �� �기"
+    *: none
+    recording: "트리거유형"
   </dest>
   <voice>
-    *: "화면 �� �기"
+    *: none
+    recording: "트리거 유형"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_PAGINATED
-  desc: jump to new page when scrolling
+  id: LANG_RECORD_TRIGGER_NEWFILESTP
+  desc: trigger types
   user: core
   <source>
-    *: "Paged Scrolling"
+    *: none
+    recording: "New file"
   </source>
   <dest>
-    *: "빠른 페�지 넘김 사용"
+    *: none
+    recording: "새 파�"
   </dest>
   <voice>
-    *: "빠른 페�지 넘김 사용"
+    *: none
+    recording: "새 파�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCROLL_BAR
-  desc: display menu, F3 substitute
+  id: LANG_RECORD_TRIGGER_STOP
+  desc: trigger types
   user: core
   <source>
-    *: "Scroll Bar"
+    *: none
+    recording: "Stop"
   </source>
   <dest>
-    *: "스�롤 바"
+    *: none
+    recording: "정지"
   </dest>
   <voice>
-    *: "스�롤 바"
+    *: none
+    recording: "정지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STATUS_BAR
-  desc: display menu, F3 substitute
+  id: LANG_RECORD_START_THRESHOLD
+  desc: in recording settings_menu
   user: core
   <source>
-    *: "Status Bar"
+    *: none
+    recording: "Start Above"
   </source>
   <dest>
-    *: "�태 바"
+    *: none
+    recording: "위�서 시작"
   </dest>
   <voice>
-    *: "�태 바"
+    *: none
+    recording: "위�서 시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTON_BAR
-  desc: in settings menu
+  id: LANG_MIN_DURATION
+  desc: in recording settings_menu
   user: core
   <source>
     *: none
-    recorder_pad: "Button Bar"
+    recording: "for at least"
   </source>
   <dest>
     *: none
-    recorder_pad: "버튼 바"
+    recording: "최소한"
   </dest>
   <voice>
     *: none
-    recorder_pad: "버튼 바"
+    recording: "최소한"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOLUME_DISPLAY
-  desc: Volume type title
+  id: LANG_RECORD_STOP_THRESHOLD
+  desc: in recording settings_menu
   user: core
   <source>
-    *: "Volume Display"
+    *: none
+    recording: "Stop Below"
   </source>
   <dest>
-    *: "볼륨 표시"
+    *: none
+    recording: "아래�서 중지"
   </dest>
   <voice>
-    *: "볼륨 표시"
+    *: none
+    recording: "아래�서 중지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_DISPLAY
-  desc: Battery type title
+  id: LANG_RECORD_STOP_GAP
+  desc: in recording settings_menu
   user: core
   <source>
-    *: "Battery Display"
+    *: none
+    recording: "Presplit Gap"
   </source>
   <dest>
-    *: "배터리 표시"
+    *: none
+    recording: "사전 분할 간격"
   </dest>
   <voice>
-    *: "배터리 표시"
+    *: none
+    recording: "사전 분할 간격"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY_GRAPHIC
-  desc: Label for type of icon display
+  id: LANG_RECORD_PRERECORD
+  desc: in recording and radio screen
   user: core
   <source>
-    *: "Graphic"
+    *: none
+    recording: "Pre-Recording"
   </source>
   <dest>
-    *: "그래픽"
+    *: none
+    recording: "사전 녹�"
   </dest>
   <voice>
-    *: "그래픽"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY_NUMERIC
-  desc: Label for type of icon display
+  id: LANG_AGC_SAFETY
+  desc: AGC preset
   user: core
   <source>
-    *: "Numeric"
+    *: none
+    agc: "Safety (clip)"
   </source>
   <dest>
-    *: "숫�"
+    *: none
+    agc: "안전하게 (�립)"
   </dest>
   <voice>
-    *: "숫�"
+    *: none
+    agc: "안전하게 (�립)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_RELEASE
-  desc: in the peak meter menu
+  id: LANG_AGC_LIVE
+  desc: AGC preset
   user: core
   <source>
-    *: "Peak Release"
-    masd: none
+    *: none
+    agc: "Live (slow)"
   </source>
   <dest>
-    *: "피� 미터 ��"
-    masd: none
+    *: none
+    agc: "��브 (�림)"
   </dest>
   <voice>
-    *: "피� 미터 ��"
-    masd: none
+    *: none
+    agc: "��브 (�림)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_PEAK_HOLD
-  desc: in the peak meter menu
+  id: LANG_AGC_DJSET
+  desc: AGC preset
   user: core
   <source>
-    *: "Peak Hold Time"
-    masd: none
+    *: none
+    agc: "DJ-Set (slow)"
   </source>
   <dest>
-    *: "피� 미터 시간"
-    masd: none
+    *: none
+    agc: "DJ 설정 (�림)"
   </dest>
   <voice>
-    *: "피� 미터 시간"
-    masd: none
+    *: none
+    agc: "DJ 설정 (�림)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_CLIP_HOLD
-  desc: in the peak meter menu
+  id: LANG_AGC_MEDIUM
+  desc: AGC preset
   user: core
   <source>
-    *: "Clip Hold Time"
-    masd: none
+    *: none
+    agc: "Medium"
   </source>
   <dest>
-    *: "고� 표시 시간"
-    masd: none
+    *: none
+    agc: "중간"
   </dest>
   <voice>
-    *: "고� 표시 시간"
-    masd: none
+    *: none
+    agc: "중간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_ETERNAL
-  desc: in the peak meter menu
+  id: LANG_AGC_VOICE
+  desc: AGC preset
   user: core
   <source>
-    *: "Eternal"
-    masd: none
+    *: none
+    agc: "Voice (fast)"
   </source>
   <dest>
-    *: "내려오지 않게 하기"
-    masd: none
+    *: none
+    agc: "�성 (빠름)"
   </dest>
   <voice>
-    *: "내려오지 않게 하기"
-    masd: none
+    *: none
+    agc: "�성 (빠름)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_SCALE
-  desc: in the peak meter menu
+  id: LANG_REMOTE_LCD_OFF
+  desc: Remote lcd off splash in recording screen
   user: core
   <source>
-    *: "Scale"
-    masd: none
+    *: none
+    remote: "Remote Display OFF"
   </source>
   <dest>
-    *: "표시 단위"
-    masd: none
+    *: none
+    remote: "�격 화면 꺼�"
   </dest>
   <voice>
-    *: "표시 단위"
-    masd: none
+    *: none
+    remote: "�격 화면 꺼�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_DBFS
-  desc: in the peak meter menu
+  id: LANG_REMOTE_LCD_ON
+  desc: Remote lcd off splash in recording screen
   user: core
   <source>
-    *: "Logarithmic (dB)"
-    masd: none
+    *: none
+    remote: "(Vol- : Re-enable)"
   </source>
   <dest>
-    *: "�시벨 (dB)"
-    masd: none
+    *: none
+    remote: "(볼륨- : 다시 켜기)"
   </dest>
   <voice>
-    *: "�시벨"
-    masd: none
+    *: none
+    remote: "(재활성화하려면 볼륨 마�너스)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_LINEAR
-  desc: in the peak meter menu
+  id: LANG_CREATE_PLAYLIST
+  desc: Menu option for creating a playlist
   user: core
   <source>
-    *: "Linear (%)"
-    masd: none
+    *: "Create Playlist"
   </source>
   <dest>
-    *: "�센트 (%)"
-    masd: none
+    *: "재�목� �성"
   </dest>
   <voice>
-    *: "�센트"
-    masd: none
+    *: "재�목� �성"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_MIN
-  desc: in the peak meter menu
+  id: LANG_PLAYLISTVIEWER_SETTINGS
+  desc: title for the playlist viewer settings menus
   user: core
   <source>
-    *: "Minimum Of Range"
-    masd: none
+    *: "Playlist Viewer Settings"
   </source>
   <dest>
-    *: "최소 범위"
-    masd: none
+    *: "재�목� 뷰어 설정"
   </dest>
   <voice>
-    *: "최소 범위"
-    masd: none
+    *: "재�목� 뷰어 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_MAX
-  desc: in the peak meter menu
+  id: LANG_VIEW_DYNAMIC_PLAYLIST
+  desc: in playlist menu.
   user: core
   <source>
-    *: "Maximum Of Range"
-    masd: none
+    *: "View Current Playlist"
   </source>
   <dest>
-    *: "최대 범위"
-    masd: none
+    *: "현재 재�목� 보기"
   </dest>
   <voice>
-    *: "최대 범위"
-    masd: none
+    *: "현재 재�목� 보기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_CAPACITY
-  desc: in settings_menu
+  id: LANG_MOVE
+  desc: The verb/action Move
   user: core
   <source>
-    *: "Battery Capacity"
+    *: "Move"
   </source>
   <dest>
-    *: "배터리 용량"
+    *: "��"
   </dest>
   <voice>
-    *: "배터리 용량"
+    *: "��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
+  id: LANG_SHOW_INDICES
+  desc: in playlist viewer menu
   user: core
   <source>
-    *: none
-    battery_types: "Battery Type"
+    *: "Show Indices"
   </source>
   <dest>
-    *: none
-    battery_types: "배터리 타입"
+    *: "��스 표시"
   </dest>
   <voice>
-    *: none
-    battery_types: "배터리 타입"
+    *: "��스 표시"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
+  id: LANG_TRACK_DISPLAY
+  desc: in playlist viewer on+play menu
   user: core
   <source>
-    *: none
-    battery_types: "Alkaline"
+    *: "Track Display"
   </source>
   <dest>
-    *: none
-    battery_types: "알카��"
+    *: "트랙 화면"
   </dest>
   <voice>
-    *: none
-    battery_types: "알카��"
+    *: "트랙 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
+  id: LANG_DISPLAY_TRACK_NAME_ONLY
+  desc: track display options
   user: core
   <source>
-    *: none
-    battery_types: "NiMH"
+    *: "Track Name Only"
   </source>
   <dest>
-    *: none
-    battery_types: "니켈 수소"
+    *: "트랙 �름만"
   </dest>
   <voice>
-    *: none
-    battery_types: "니켈 수소"
+    *: "트랙 �름만"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPINDOWN
-  desc: in settings_menu
+  id: LANG_REMOVE
+  desc: in playlist viewer on+play menu
   user: core
   <source>
-    *: "Disk Spindown"
-    flash_storage: none
+    *: "Remove"
   </source>
   <dest>
-    *: "디스� 회전시간"
-    flash_storage: none
+    *: "제거"
   </dest>
   <voice>
-    *: "디스� 회전시간"
-    flash_storage: none
+    *: "제거"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIRCACHE_ENABLE
-  desc: in directory cache settings
+  id: LANG_SAVE_DYNAMIC_PLAYLIST
+  desc: in playlist menu.
   user: core
   <source>
-    *: none
-    dircache: "Directory Cache"
+    *: "Save Current Playlist"
   </source>
   <dest>
-    *: none
-    dircache: "디렉토리 �쉬"
+    *: "현재 재�목� 저장"
   </dest>
   <voice>
-    *: none
-    dircache: "디렉토리 �쉬"
+    *: "현재 재�목� 저장"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIME
-  desc: Used on the bookmark select window to label elapsed time
+  id: LANG_PLAYLIST_SAVE_COUNT
+  desc: splash number of tracks saved
   user: core
   <source>
-    *: "Time"
+    *: "Saved %d tracks (%s)"
   </source>
   <dest>
-    *: "현재시� 설정"
+    *: "%d 개 트랙 저장함 (%s)"
   </dest>
   <voice>
-    *: "현재시� 설정"
+    *: "트랙� 저장�었�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIMEFORMAT
-  desc: select the time format of time in status bar
+  id: LANG_CATALOG
+  desc: in main menu and onplay menu
   user: core
   <source>
-    *: "Time Format"
+    *: "Playlist Catalogue"
   </source>
   <dest>
-    *: "시간 형�"
+    *: "재�목� 카탈로그"
   </dest>
   <voice>
-    *: "시간 형�"
+    *: "재�목� 카탈로그"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_12_HOUR_CLOCK
-  desc: option for 12 hour clock
+  id: LANG_RECURSE_DIRECTORY
+  desc: In playlist menu
   user: core
   <source>
-    *: "12 Hour Clock"
+    *: "Recursively Insert Directories"
   </source>
   <dest>
-    *: "12시간"
+    *: "�악 추가시 하위 ��� 추가"
   </dest>
   <voice>
-    *: "12시간"
+    *: "�악 추가시 하위 ��� 추가"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_24_HOUR_CLOCK
-  desc: option for 24 hour clock
+  id: LANG_RECURSE_DIRECTORY_QUESTION
+  desc: Asked from onplay screen
   user: core
   <source>
-    *: "24 Hour Clock"
+    *: "Recursively?"
   </source>
   <dest>
-    *: "24시간"
+    *: "하위 ��� 추가할까요?"
   </dest>
   <voice>
-    *: "24시간"
+    *: "하위 ��� 추가할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAX_FILES_IN_DIR
-  desc: in settings_menu
+  id: LANG_WARN_ERASEDYNPLAYLIST_MENU
+  desc: in playlist options menu, option to warn when erasing dynamic playlist
   user: core
   <source>
-    *: "Max Entries in File Browser"
+    *: "Warn When Erasing Dynamic Playlist"
   </source>
   <dest>
-    *: "�� 내 최대 파� 수"
+    *: "현재 재�목� 삭제시 경고"
   </dest>
   <voice>
-    *: "�� 내 최대 파� 수"
+    *: "현재 재�목� 삭제시 경고"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAX_FILES_IN_PLAYLIST
-  desc: in settings_menu
+  id: LANG_WARN_ERASEDYNPLAYLIST_PROMPT
+  desc: prompt shown when about to erase a modified dynamic playlist
   user: core
   <source>
-    *: "Max Playlist Size"
+    *: "Erase dynamic playlist?"
   </source>
   <dest>
-    *: "재�목�� 최대 �기"
+    *: "현재 재�목�� 삭제할까요?"
   </dest>
   <voice>
-    *: "재�목�� 최대 �기"
+    *: "현재 재�목�� 삭제할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST
-  desc: Used when you need to say playlist, also voiced
+  id: LANG_ROCKBOX_INFO
+  desc: displayed topmost on the info screen and in the info menu
   user: core
   <source>
-    *: "Playlist"
+    *: "Rockbox Info"
   </source>
   <dest>
-    *: "현재 재�목� 관리"
+    *: "�박스 정보"
   </dest>
   <voice>
-    *: "현재 재�목� 관리"
+    *: "�박스 정보"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU
-  desc: Text on main menu to get to bookmark commands
+  id: LANG_BUFFER_STAT
+  desc: the buffer size, %d MB %d fraction of MB
   user: core
   <source>
-    *: "Bookmarks"
+    *: "Buffer:"
   </source>
   <dest>
-    *: "�마� 관리"
+    *: "버�:"
   </dest>
   <voice>
-    *: "�마� 관리"
+    *: "버� �기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MENU_SHOW_ID3_INFO
-  desc: Menu option to start tag viewer
+  id: LANG_BATTERY_TIME
+  desc: battery level in % and estimated time remaining
   user: core
   <source>
-    *: "Show Track Info"
+    *: "Battery: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
   </source>
   <dest>
-    *: "ID3 정보 보기"
+    *: "배터리: %d%% %dh %dm"
+    ipodmini1g,ipodmini2g,iriverh10: "배터리: %d%% %dh %dm"
   </dest>
   <voice>
-    *: "ID3 정보 보기"
+    *: "배터리 잔량"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MENU_SET_RATING
-  desc: Set the rating of a file in the wps context menu
+  id: LANG_DISK_SIZE_INFO
+  desc: disk size info
   user: core
   <source>
-    *: "Set Song Rating"
+    *: "Disk:"
   </source>
   <dest>
-    *: "�악 �� 주기"
+    *: "디스�:"
   </dest>
   <voice>
-    *: "�악 �� 주기"
+    *: "디스� �기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RENAME
-  desc: The verb/action Rename
+  id: LANG_DISK_FREE_INFO
+  desc: disk size info
   user: core
   <source>
-    *: "Rename"
+    *: "Free:"
   </source>
   <dest>
-    *: "�름 바꾸기"
+    *: "여유:"
   </dest>
   <voice>
-    *: "�름 바꾸기"
+    *: "여유 디스�공간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUT
-  desc: The verb/action Cut
+  id: LANG_DISK_NAME_INTERNAL
+  desc: in info menu; name for internal disk with multivolume (keep short!)
   user: core
   <source>
-    *: "Cut"
+    *: "Int:"
+    hibylinux: "mSD:"
+    xduoox3: "mSD1:"
   </source>
   <dest>
-    *: "잘�내기"
+    *: "내부:"
+    hibylinux: "마��로SD:"
+    xduoox3: "마��로SD1:"
   </dest>
   <voice>
-    *: "잘�내기"
+    *: "내부"
+    hibylinux: "마��로 S D"
+    xduoox3: "마��로 S D 1"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COPY
-  desc: The verb/action Copy
+  id: LANG_DISK_NAME_MMC
+  desc: in info menu;  name for external disk with multivolume (keep short!)
   user: core
   <source>
-    *: "Copy"
+    *: none
+    hibylinux: "USB:"
+    multivolume: "HD1:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
+    xduoox3: "mSD2:"
   </source>
   <dest>
-    *: "복사하기"
+    *: none
+    hibylinux: "~USB:"
+    multivolume: "~HD1:"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "마��로SD:"
+    xduoox3: "마��로SD2:"
   </dest>
   <voice>
-    *: "복사하기"
+    *: none
+    hibylinux: "~U S B"
+    multivolume: "~H D 1"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "마��로 S D"
+    xduoox3: "마��로 S D 2"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PASTE
-  desc: The verb/action Paste
+  id: LANG_VERSION
+  desc: in the Rockbox Info screen
   user: core
   <source>
-    *: "Paste"
+    *: "Version"
   </source>
   <dest>
-    *: "붙여넣기"
+    *: "버전"
   </dest>
   <voice>
-    *: "붙여넣기"
+    *: "버전"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REALLY_OVERWRITE
-  desc: The verb/action Paste
+  id: LANG_RUNNING_TIME
+  desc: in run time screen
   user: core
   <source>
-    *: "File/directory exists. Overwrite?"
+    *: "Running Time"
   </source>
   <dest>
-    *: "같� �름� 존재합니다. �어 쓰시겠습니까?"
+    *: "작� 시간"
   </dest>
   <voice>
-    *: ""
+    *: "작� 시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETE
-  desc: The verb/action Delete
+  id: LANG_TOP_TIME
+  desc: in run time screen
   user: core
   <source>
-    *: "Delete"
+    *: "Top Time"
   </source>
   <dest>
-    *: "삭제하기"
+    *: "누� 시간"
   </dest>
   <voice>
-    *: "삭제하기"
+    *: "누� 시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_BACKDROP
-  desc: text for onplay menu entry
+  id: LANG_CLEAR_TIME
+  desc: in run time screen
   user: core
   <source>
-    *: none
-    lcd_non-mono: "Set As Backdrop"
+    *: "Clear Time?"
   </source>
   <dest>
-    *: none
-    lcd_non-mono: "배경화면으로 설정"
+    *: "시간� 지울까요?"
   </dest>
   <voice>
-    *: none
-    lcd_non-mono: "배경화면으로 설정"
+    *: "시간� 지울까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETE_DIR
-  desc: in on+play menu
+  id: LANG_DEBUG
+  desc: in the info menu
   user: core
   <source>
-    *: "Delete Directory"
+    *: "Debug (Keep Out!)"
   </source>
   <dest>
-    *: "삭제하기"
+    *: "디버깅 모드 (접근금지!)"
   </dest>
   <voice>
-    *: "삭제하기"
+    *: "디버깅 모드, 접근금지!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REALLY_DELETE
-  desc: Really Delete?
+  id: LANG_PLAYLIST
+  desc: Used when you need to say playlist, also voiced
   user: core
   <source>
-    *: "Delete?"
+    *: "Playlist"
   </source>
   <dest>
-    *: "삭제하시겠습니까?"
+    *: "재�목�"
   </dest>
   <voice>
-    *: ""
+    *: "재�목�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETED
-  desc: A file has beed deleted
+  id: LANG_QUEUE
+  desc: The verb/action Queue
   user: core
   <source>
-    *: "Deleted"
+    *: "Queue"
   </source>
   <dest>
-    *: "삭제�었습니다."
+    *: "대기열"
   </dest>
   <voice>
-    *: ""
+    *: "대기열"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ONPLAY_OPEN_WITH
-  desc: Onplay open with
+  id: LANG_QUEUE_FIRST
+  desc: in onplay menu.  queue a track/playlist into dynamic playlist.
   user: core
   <source>
-    *: "Open With..."
+    *: "Queue Next"
   </source>
   <dest>
-    *: "플러그�으로 열기"
+    *: "대기열 다�"
   </dest>
   <voice>
-    *: "플러그�으로 열기"
+    *: "대기열 다�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CREATE_DIR
-  desc: in main menu
+  id: LANG_QUEUE_LAST
+  desc: in onplay menu.  queue a track/playlist at end of playlist.
   user: core
   <source>
-    *: "Create Directory"
+    *: "Queue Last"
   </source>
   <dest>
-    *: "�� 만들기"
+    *: "대기열 마지막"
   </dest>
   <voice>
-    *: "�� 만들기"
+    *: "대기열 마지막"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH
-  desc: "pitch" in the pitch screen
+  id: LANG_QUEUE_SHUFFLED
+  desc: in onplay menu.  queue a track/playlist randomly into dynamic playlist
   user: core
   <source>
-    *: none
-    pitchscreen: "Pitch"
+    *: "Queue Shuffled"
   </source>
   <dest>
-    *: none
-    pitchscreen: "피치"
+    *: "대기열 섞�"
   </dest>
   <voice>
-    *: none
-    pitchscreen: "피치"
+    *: "대기열 섞�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_INSERT_COUNT
+  desc: splash number of tracks inserted
+  user: core
+  <source>
+    *: "Inserted %d tracks (%s)"
+  </source>
+  <dest>
+    *: "%d 개 트랙 삽입� (%s)"
+  </dest>
+  <voice>
+    *: "삽입� 트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_QUEUE_COUNT
+  desc: splash number of tracks queued
+  user: core
+  <source>
+    *: "Queued %d tracks (%s)"
+  </source>
+  <dest>
+    *: "%d 개 트랙 대기� (%s)"
+  </dest>
+  <voice>
+    *: "대기� 트랙"
   </voice>
 </phrase>
 <phrase>
@@ -3860,6 +6175,34 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_SEARCH_IN_PLAYLIST
+  desc: in playlist menu.
+  user: core
+  <source>
+    *: "Search In Playlist"
+  </source>
+  <dest>
+    *: "재�목��서 검색"
+  </dest>
+  <voice>
+    *: "재�목��서 검색"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_SEARCH_MSG
+  desc: splash number of tracks inserted
+  user: core
+  <source>
+    *: "Searching... %d found (%s)"
+  </source>
+  <dest>
+    *: "검색 중... %d 개 찾았� (%s)"
+  </dest>
+  <voice>
+    *: "찾았�"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_SHUFFLE_PLAYLIST
   desc: in playlist menu, reshuffles the order in which songs are played
   user: core
@@ -3867,1293 +6210,1236 @@
     *: "Reshuffle"
   </source>
   <dest>
-    *: "재�순서 다시섞기"
+    *: "리셔플"
   </dest>
   <voice>
-    *: "재�순서 다시섞기"
+    *: "리셔플"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
+  id: LANG_CATALOG_ADD_TO_NEW
+  desc: in onplay playlist catalogue submenu
   user: core
   <source>
-    *: "Insert"
+    *: "Add to New Playlist"
   </source>
   <dest>
-    *: "재�목�� 삽입"
+    *: "새 재�목�� 추가"
   </dest>
   <voice>
-    *: "재�목�� 삽입"
+    *: "새 재�목�� 추가"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_FIRST
-  desc: in onplay menu.  insert a track/playlist into dynamic playlist.
+  id: LANG_CATALOG_NO_DIRECTORY
+  desc: error message when playlist catalogue directory doesn't exist
   user: core
   <source>
-    *: "Insert Next"
+    *: "%s doesn't exist"
   </source>
   <dest>
-    *: "다�곡으로 삽입"
+    *: "%s�(가) 존재하지 않�"
   </dest>
   <voice>
-    *: "다�곡으로 삽입"
+    *: "재� 목� 디렉토리가 존재하지 않�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_LAST
-  desc: in onplay menu.  append a track/playlist into dynamic playlist.
+  id: LANG_CATALOG_NO_PLAYLISTS
+  desc: error message when no playlists for playlist catalogue
   user: core
   <source>
-    *: "Insert Last"
+    *: "No Playlists"
   </source>
   <dest>
-    *: "마지막곡� 삽입"
+    *: "재�목� 없�"
   </dest>
   <voice>
-    *: "마지막곡� 삽입"
+    *: "재�목� 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INSERT_SHUFFLED
-  desc: in onplay menu.  insert a track/playlist randomly into dynamic playlist
+  id: LANG_BOOKMARK_MENU
+  desc: Text on main menu to get to bookmark commands
   user: core
   <source>
-    *: "Insert Shuffled"
+    *: "Bookmarks"
   </source>
   <dest>
-    *: "임�순서로 삽입"
+    *: "�마�"
   </dest>
   <voice>
-    *: "임�순서로 삽입"
+    *: "�마�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE
-  desc: The verb/action Queue
+  id: LANG_BOOKMARK_MENU_CREATE
+  desc: Used off of the bookmark menu to create a bookmark
   user: core
   <source>
-    *: "Queue"
+    *: "Create Bookmark"
   </source>
   <dest>
-    *: "재�목�� 예약"
+    *: "�마� �성"
   </dest>
   <voice>
-    *: "재�목�� 예약"
+    *: "�마� �성"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE_FIRST
-  desc: in onplay menu.  queue a track/playlist into dynamic playlist.
+  id: LANG_BOOKMARK_MENU_LIST
+  desc: Used off of the bookmark menu to list available bookmarks for the currently playing directory or M3U
   user: core
   <source>
-    *: "Queue Next"
+    *: "List Bookmarks"
   </source>
   <dest>
-    *: "다�곡으로 예약"
+    *: "�마� 목�"
   </dest>
   <voice>
-    *: "다�곡으로 예약"
+    *: "�마� 목�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE_LAST
-  desc: in onplay menu.  queue a track/playlist at end of playlist.
+  id: LANG_ONPLAY_MENU_TITLE
+  desc: title for the onplay menus
   user: core
   <source>
-    *: "Queue Last"
+    *: "Context Menu"
   </source>
   <dest>
-    *: "마지막곡� 예약"
+    *: "콘�스트 메뉴"
   </dest>
   <voice>
-    *: "마지막곡� 예약"
+    *: "콘�스트 메뉴"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_QUEUE_SHUFFLED
-  desc: in onplay menu.  queue a track/playlist randomly into dynamic playlist
+  id: LANG_MENU_SET_RATING
+  desc: Set the rating of a file in the wps context menu
   user: core
   <source>
-    *: "Queue Shuffled"
+    *: "Set Song Rating"
   </source>
   <dest>
-    *: "임�순서로 예약"
+    *: "노래 등급 설정"
   </dest>
   <voice>
-    *: "임�순서로 예약"
+    *: "노래 등급 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SEARCH_IN_PLAYLIST
-  desc: in playlist menu.
+  id: LANG_BROWSE_CUESHEET
+  desc:
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Browse Cuesheet"
   </source>
   <dest>
-    *: "재�목��서 �악 검색"
+    *: "�시트 찾아보기"
   </dest>
   <voice>
-    *: "재�목��서 �악 검색"
+    *: "�시트 찾아보기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_SEARCH_MSG
-  desc: splash number of tracks inserted
+  id: LANG_MENU_SHOW_ID3_INFO
+  desc: Menu option to start tag viewer
   user: core
   <source>
-    *: "Searching... %d found (%s)"
+    *: "Show Track Info"
   </source>
   <dest>
-    *: "찾는 중... %d개 검색� (%s)"
+    *: "트랙 정보 표시"
   </dest>
   <voice>
-    *: ""
+    *: "트랙 정보 표시"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU_CREATE
-  desc: Used off of the bookmark menu to create a bookmark
+  id: LANG_ID3_TITLE
+  desc: in tag viewer
   user: core
   <source>
-    *: "Create Bookmark"
+    *: "Title"
   </source>
   <dest>
-    *: "�마� 만들기"
+    *: "제목"
   </dest>
   <voice>
-    *: "�마� 만들기"
+    *: "제목"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_MENU_LIST
-  desc: Used off of the bookmark menu to list available bookmarks for the currently playing directory or M3U
+  id: LANG_ID3_ARTIST
+  desc: in tag viewer
   user: core
   <source>
-    *: "List Bookmarks"
+    *: "Artist"
   </source>
   <dest>
-    *: "�마� 목�"
+    *: "아티스트"
   </dest>
   <voice>
-    *: "�마� 목�"
+    *: "아티스트"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ROCKBOX_INFO
-  desc: displayed topmost on the info screen and in the info menu
+  id: LANG_ID3_ALBUM
+  desc: in tag viewer
   user: core
   <source>
-    *: "Rockbox Info"
+    *: "Album"
   </source>
   <dest>
-    *: "시스템 정보"
+    *: "앨범"
   </dest>
   <voice>
-    *: "시스템 정보"
+    *: "앨범"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_CHARGE
-  desc: tells that the battery is charging, instead of battery level
+  id: LANG_ID3_TRACKNUM
+  desc: in tag viewer
   user: core
   <source>
-    *: none
-    charging: "Battery: Charging"
+    *: "Tracknum"
   </source>
   <dest>
-    *: none
-    charging: "배터리: 충전"
+    *: "트랙번호"
   </dest>
   <voice>
-    *: none
-    charging: "배터리: 충전"
+    *: "트랙 번호"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TOPOFF_CHARGE
-  desc: in info display, shows that top off charge is running Only for V1 archosrecorder
+  id: LANG_ID3_GENRE
+  desc: in tag viewer
   user: core
   <source>
-    *: none
-    archosrecorder: "Battery: Top-Off Chg"
+    *: "Genre"
   </source>
   <dest>
-    *: none
-    archosrecorder: "배터리: Top-Off Chg"
+    *: "장르"
   </dest>
   <voice>
-    *: none
-    archosrecorder: "배터리: Top-Off Chg"
+    *: "장르"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TRICKLE_CHARGE
-  desc: in info display, shows that trickle charge is running
+  id: LANG_ID3_YEAR
+  desc: in tag viewer
   user: core
   <source>
-    *: none
-    charging: "Battery: Trickle Chg"
+    *: "Year"
   </source>
   <dest>
-    *: none
-    charging: "배터리: Trickle Chg"
+    *: "년�"
   </dest>
   <voice>
-    *: none
-    charging: "배터리: Trickle Chg"
+    *: "년�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BATTERY_TIME
-  desc: battery level in % and estimated time remaining
+  id: LANG_ID3_LENGTH
+  desc: in tag viewer
   user: core
   <source>
-    *: "Battery: %d%% %dh %dm"
-    ipodmini1g,ipodmini2g,iriverh10: "Batt: %d%% %dh %dm"
-    iriverifp7xx: "%d%% %dh %dm"
+    *: "Length"
   </source>
   <dest>
-    *: "배터리: %d%% (%d시간 %d분)"
-    ipodmini1g,ipodmini2g,iriverh10: "배터리: %d%% %d시간 %d분"
-    iriverifp7xx: "%d%% %d시간 %d분"
+    *: "길�"
   </dest>
   <voice>
-    *: "배터리 레벨"
+    *: "길�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_SIZE_INFO
-  desc: disk size info
+  id: LANG_ID3_PLAYLIST
+  desc: in tag viewer
   user: core
   <source>
-    *: "Disk:"
+    *: "Playlist"
   </source>
   <dest>
-    *: "전체 용량:"
+    *: "재�목�"
   </dest>
   <voice>
-    *: ""
+    *: "재�목�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_FREE_INFO
-  desc: disk size info
+  id: LANG_ID3_BITRATE
+  desc: in tag viewer
   user: core
   <source>
-    *: "Free:"
+    *: "Bitrate"
   </source>
   <dest>
-    *: "남� 용량:"
+    *: "비트전송률"
   </dest>
   <voice>
-    *: "남� 용량"
+    *: "비트 전송률"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_NAME_INTERNAL
-  desc: in info menu; name for internal disk with multivolume (keep short!)
+  id: LANG_ID3_ALBUMARTIST
+  desc: in tag viewer
   user: core
   <source>
-    *: "Int:"
-    xduoox3: "mSD1:"
+    *: "Album Artist"
   </source>
   <dest>
-    *: "내부:"
-    xduoox3: "mSD1:"
+    *: "앨범 아티스트"
   </dest>
   <voice>
-    *: "내부"
-    xduoox3: "micro S D 1"
+    *: "앨범 아티스트"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_NAME_MMC
-  desc: in info menu;  name for external disk with multivolume (Ondio; keep short!)
+  id: LANG_ID3_DISCNUM
+  desc: in tag viewer
   user: core
   <source>
-    *: none
-    archosondio*: "MMC:"
-    multivolume: "HD1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
-    xduoox3: "mSD2:"
+    *: "Discnum"
   </source>
   <dest>
-    *: none
-    archosondio*: "MMC:"
-    multivolume: "HD1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
-    xduoox3: "mSD2:"
+    *: "디스�번호"
   </dest>
   <voice>
-    *: none
-    archosondio*: "M M C"
-    multivolume: "H D 1 "
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "micro S D"
-    xduoox3: "micro S D 2"
+    *: "디스� 번호"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_ID3_COMMENT
+  desc: in tag viewer
   user: core
   <source>
-    *: none
-    rtc: ""
+    *: "Comment"
   </source>
   <dest>
-    *: none
-    rtc: ""
+    *: "설명"
   </dest>
   <voice>
-    *: none
-    rtc: "현재 시간:"
+    *: "설명"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH_UP
-  desc: in wps
+  id: LANG_ID3_VBR
+  desc: in browse_id3
   user: core
   <source>
-    *: none
-    pitchscreen: "Pitch Up"
+    *: " (VBR)"
   </source>
   <dest>
-    *: none
-    pitchscreen: "피치 올리기"
+    *: " (VBR)"
   </dest>
   <voice>
-    *: none
-    pitchscreen: ""
+    *: "VBR"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH_DOWN
-  desc: in wps
+  id: LANG_ID3_FREQUENCY
+  desc: in tag viewer
   user: core
   <source>
-    *: none
-    pitchscreen: "Pitch Down"
+    *: "Frequency"
   </source>
   <dest>
-    *: none
-    pitchscreen: "피치 내리기"
+    *: "주파수"
   </dest>
   <voice>
-    *: none
-    pitchscreen: ""
+    *: "주파수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PAUSE
-  desc: in wps and recording trigger menu
+  id: LANG_ID3_TRACK_GAIN
+  desc: in tag viewer
   user: core
   <source>
-    *: "Pause"
+    *: "Track Gain"
   </source>
   <dest>
-    *: "�시정지"
+    *: "트랙 게�"
   </dest>
   <voice>
-    *: "�시 정지"
+    *: "트랙 게�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUTO_BOOKMARK_QUERY
-  desc: prompt for user to decide to create an bookmark
+  id: LANG_ID3_PATH
+  desc: in tag viewer
   user: core
   <source>
-    *: "Create a Bookmark?"
+    *: "Path"
   </source>
   <dest>
-    *: "�마�를 만드시겠습니까?"
+    *: "경로"
   </dest>
   <voice>
-    *: ""
+    *: "경로"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CREATE_SUCCESS
-  desc: Indicates bookmark was successfully created
+  id: LANG_ID3_NO_INFO
+  desc: in tag viewer
   user: core
   <source>
-    *: "Bookmark Created"
+    *: "<No Info>"
   </source>
   <dest>
-    *: "�마�가 �성�었습니다."
+    *: "<정보 없�>"
   </dest>
   <voice>
-    *: ""
+    *: "정보 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CREATE_FAILURE
-  desc: Indicates bookmark was not created
+  id: LANG_RENAME
+  desc: The verb/action Rename
   user: core
   <source>
-    *: "Bookmark Failed!"
+    *: "Rename"
   </source>
   <dest>
-    *: "�마� �성� 실패하였습니다."
+    *: "�름 바꾸기"
   </dest>
   <voice>
-    *: ""
+    *: "�름 바꾸기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_LOAD_EMPTY
-  desc: Indicates bookmark was empty
+  id: LANG_CUT
+  desc: The verb/action Cut
   user: core
   <source>
-    *: "Bookmark Empty"
+    *: "Cut"
   </source>
   <dest>
-    *: "�마�가 없습니다."
+    *: "잘�내기"
   </dest>
   <voice>
-    *: ""
+    *: "잘�내기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIME_REVERT
-  desc: used in set_time()
+  id: LANG_COPY
+  desc: The verb/action Copy
   user: core
   <source>
-    *: none
-    gigabeatfx: "A = Revert"
-    gigabeats: "BACK = Revert"
-    gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = Revert"
-    iaudiom5,iaudiox5: "RECORD = Revert"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
-    iriverh100,iriverh120,iriverh300: "STOP = Revert"
-    mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
-    samsungyh*: "REW = Revert"
-    vibe500: "CANCEL = Revert"
+    *: "Copy"
   </source>
   <dest>
-    *: none
-    gigabeatfx: "[전�]: ��태 복구"
-    gigabeats: "[뒤]: ��태 복구"
-    gogearsa9200,ipod*,mpiohd300,sansac200*: "[메뉴]: ��태 복구"
-    iaudiom5,iaudiox5: "[녹�]: ��태 복구"
-    iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "[�전]: ��태 복구"
-    iriverh100,iriverh120,iriverh300: "[정지]: ��태 복구"
-    mrobe100: "[화면]: ��태 복구"
-    rtc: "[�]: ��태 복구"
-    samsungyh*: "REW: ��태 복구"
-    vibe500: "C: ��태 복구"
+    *: "복사"
   </dest>
   <voice>
-    *: none
+    *: "복사"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_TIME
-  desc: Display of recorded time
+  id: LANG_PASTE
+  desc: The verb/action Paste
   user: core
   <source>
-    *: none
-    recording: "Time:"
+    *: "Paste"
   </source>
   <dest>
-    *: none
-    recording: "시간:"
+    *: "붙여넣기"
   </dest>
   <voice>
-    *: none
-    recording: ""
+    *: "붙여넣기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_SIZE
-  desc: Display of recorded file size
+  id: LANG_REALLY_OVERWRITE
+  desc: The verb/action Paste
   user: core
   <source>
-    *: none
-    recording: "Size:"
+    *: "File/directory exists. Overwrite?"
   </source>
   <dest>
-    *: none
-    recording: "�기:"
+    *: "파�/디렉토리가 존재합니다. �어쓸까요?"
   </dest>
   <voice>
-    *: none
-    recording: ""
+    *: "파�/디렉토리가 존재합니다. �어쓸까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_PRERECORD
-  desc: in recording and radio screen
+  id: LANG_DELETE
+  desc: The verb/action Delete
   user: core
   <source>
-    *: none
-    recording: "Pre-Recording"
+    *: "Delete"
   </source>
   <dest>
-    *: none
-    recording: "사전 녹�"
+    *: "삭제"
   </dest>
   <voice>
-    *: none
-    recording: ""
+    *: "삭제"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISK_FULL
-  desc: in recording screen
+  id: LANG_DELETE_DIR
+  desc: in on+play menu
   user: core
   <source>
-    *: none
-    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
-    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
-    recording: "The disk is full. Press OFF to continue."
-    samsungyh*: "Disk full. Press LEFT to continue."
-    sansac200*,sansae200*,vibe500: "The disk is full. Press UP to continue."
+    *: "Delete Directory"
   </source>
   <dest>
-    *: none
-    iaudiom5,iaudiox5: "디스� 공간� 부족합니다. [전�] 버튼� 누르세요."
-    iriverh100,iriverh120,iriverh300: "디스� 공간� 부족합니다. [정지] 버튼� 누르세요."
-    recording: "디스� 공간� 부족합니다. [�] 버튼� 누르세요."
-    samsungyh*: "디스� 공간� 부족합니다. LEFT 버튼� 누르세요."
-    sansac200*,sansae200*,vibe500: "디스� 공간� 부족합니다. [위] 버튼� 누르세요."
+    *: "디렉토리 삭제"
   </dest>
   <voice>
-    *: none
+    *: "디렉토리 삭제"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIG_NOREARM
-  desc: in recording settings_menu
+  id: LANG_REALLY_DELETE
+  desc: Really Delete?
   user: core
   <source>
-    *: none
-    recording: "Once"
+    *: "Delete?"
   </source>
   <dest>
-    *: none
-    recording: "한번"
+    *: "삭제할까요?"
   </dest>
   <voice>
-    *: none
-    recording: "한번"
+    *: "정� 삭제할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_START_THRESHOLD
-  desc: in recording settings_menu
+  id: LANG_COPYING
+  desc:
   user: core
   <source>
-    *: none
-    recording: "Start Above"
+    *: "Copying..."
   </source>
   <dest>
-    *: none
-    recording: "위�서 시작"
+    *: "복사 중..."
   </dest>
   <voice>
-    *: none
-    recording: "위�서 시작"
+    *: "복사 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_STOP_THRESHOLD
-  desc: in recording settings_menu
+  id: LANG_DELETING
+  desc:
   user: core
   <source>
-    *: none
-    recording: "Stop Below"
+    *: "Deleting..."
   </source>
   <dest>
-    *: none
-    recording: "아래�서 멈춤"
+    *: "삭제 중..."
   </dest>
   <voice>
-    *: none
-    recording: "아래�서 멈춤"
+    *: "삭제 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_STOP_GAP
-  desc: in recording settings_menu
+  id: LANG_MOVING
+  desc:
   user: core
   <source>
-    *: none
-    recording: "Presplit Gap"
+    *: "Moving..."
   </source>
   <dest>
-    *: none
-    recording: "미리 나눔 갭"
+    *: "�� 중..."
   </dest>
   <voice>
-    *: none
-    recording: "미리 나눔 갭"
+    *: "�� 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DB_INF
-  desc: -inf db for values below measurement
+  id: LANG_DELETED
+  desc: A file has beed deleted
   user: core
   <source>
-    *: none
-    recording: "-inf"
+    *: "Deleted"
   </source>
   <dest>
-    *: none
-    recording: "마�너스 무한대"
+    *: "삭제�"
   </dest>
   <voice>
-    *: none
-    recording: "마�너스 무한대"
+    *: "삭제�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_TIME
-  desc: The current alarm time shown in the alarm menu for the RTC alarm mod.
+  id: LANG_SET_AS_BACKDROP
+  desc: text for onplay menu entry
   user: core
   <source>
     *: none
-    alarm: "Alarm Time:"
+    lcd_non-mono: "Set As Backdrop"
   </source>
   <dest>
     *: none
-    alarm: "알람 시간:"
+    lcd_non-mono: "배경화면으로 설정"
   </dest>
   <voice>
     *: none
-    alarm: ""
+    lcd_non-mono: "배경화면으로 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_TIME_TO_GO
-  desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
+  id: LANG_ONPLAY_OPEN_WITH
+  desc: Onplay open with
   user: core
   <source>
-    *: none
-    alarm: "Waking Up In %d:%02d"
+    *: "Open With..."
   </source>
   <dest>
-    *: none
-    alarm: "%d:%02d � 켜기"
+    *: "다�으로 열기..."
   </dest>
   <voice>
-    *: none
-    alarm: "지정� 시간� 켜기"
+    *: "다�으로 열기"
   </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).
+  id: LANG_CREATE_DIR
+  desc: in main menu
   user: core
   <source>
-    *: none
-    alarm: "Alarm Set"
+    *: "Create Directory"
   </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).
+  id: LANG_PROPERTIES
+  desc: browser file/dir properties
   user: core
   <source>
-    *: none
-    alarm: "Alarm Time Is Too Soon!"
+    *: "Properties"
   </source>
   <dest>
-    *: none
-    alarm: "알람 시간� 너무 짧습니다"
+    *: "�성"
   </dest>
   <voice>
-    *: none
-    alarm: "알람 시간� 너무 짧습니다"
+    *: "�성"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_KEYS
-  desc: Shown key functions in alarm menu (for the RTC alarm mod).
+  id: LANG_ADD_TO_FAVES
+  desc:
+  user: core
+  <source>
+    *: "Add to Shortcuts"
+  </source>
+  <dest>
+    *: "바로가기� 추가"
+  </dest>
+  <voice>
+    *: "바로가기� 추가"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PITCH
+  desc: "pitch" in the pitch screen
   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"
+    pitchscreen: "Pitch"
   </source>
   <dest>
     *: none
-    alarm: "[재�]: 설정   [꺼�]: 취소"
-    gigabeats: "[선�]: 설정   [꺼�]: 취소"
-    ipod*: "[선�]: 설정   [메뉴]: 취소"
-    iriverh10,iriverh10_5gb: "[선�]: 설정   [�전]: 취소"
-    mpiohd300: "ENTER: 설정   MENU: 취소"
-    vibe500: "OK: 설정   C: 취소"
+    pitchscreen: "피치"
   </dest>
   <voice>
     *: none
+    pitchscreen: "피치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_MOD_DISABLE
-  desc: Announce that the RTC alarm has been turned off
+  id: LANG_PITCH_UP
+  desc: in wps
   user: core
   <source>
     *: none
-    alarm: "Alarm Disabled"
+    pitchscreen: "Pitch Up"
   </source>
   <dest>
     *: none
-    alarm: "알람 �기"
+    pitchscreen: "피치 업"
   </dest>
   <voice>
     *: none
-    alarm: "알람 �기"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLOR_RGB_LABELS
-  desc: what to show for the 'R' 'G' 'B' ONE LETTER EACH
+  id: LANG_PITCH_DOWN
+  desc: in wps
   user: core
   <source>
     *: none
-    lcd_color: "RGB"
+    pitchscreen: "Pitch Down"
   </source>
   <dest>
     *: none
-    lcd_color: "RGB"
+    pitchscreen: "피치 다운"
   </dest>
   <voice>
     *: none
-    lcd_color: "RGB"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLOR_RGB_VALUE
-  desc: in color screen
+  id: LANG_PITCH_UP_SEMITONE
+  desc: in wps
   user: core
   <source>
     *: none
-    lcd_color: "RGB: %02X%02X%02X"
+    pitchscreen: "Semitone Up"
   </source>
   <dest>
     *: none
-    lcd_color: "RGB Code: %02X%02X%02X"
+    pitchscreen: "반� 올리기"
   </dest>
   <voice>
     *: none
-    lcd_color: ""
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLOR_UNACCEPTABLE
-  desc: splash when user selects an invalid colour
+  id: LANG_PITCH_DOWN_SEMITONE
+  desc: in wps
   user: core
   <source>
     *: none
-    lcd_color: "Invalid colour"
+    pitchscreen: "Semitone Down"
   </source>
   <dest>
     *: none
-    lcd_color: "잘못� 색깔입니다."
+    pitchscreen: "반� 내리기"
   </dest>
   <voice>
     *: none
-    lcd_color: ""
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_TITLE
-  desc: in tag viewer
+  id: LANG_PLAYLIST_BUFFER_FULL
+  desc: in playlist.indices() when playlist is full
   user: core
   <source>
-    *: "Title"
+    *: "Playlist Buffer Full"
   </source>
   <dest>
-    *: "제목"
+    *: "재�목� 버�가 가� 참"
   </dest>
   <voice>
-    *: "제목"
+    *: "재�목� 버�가 가� 참"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ARTIST
-  desc: in tag viewer
+  id: LANG_END_PLAYLIST
+  desc: when playlist has finished
   user: core
   <source>
-    *: "Artist"
+    *: "End of Song List"
   </source>
   <dest>
-    *: "�악가"
+    *: "노래 목� �"
   </dest>
   <voice>
-    *: "�악가"
+    *: "노래 목� �"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUM
-  desc: in tag viewer
+  id: LANG_CREATING
+  desc: Screen feedback during playlist creation
   user: core
   <source>
-    *: "Album"
+    *: "Creating"
   </source>
   <dest>
-    *: "앨범"
+    *: "만들기"
   </dest>
   <voice>
-    *: "앨범"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_TRACKNUM
-  desc: in tag viewer
+  id: LANG_NOTHING_TO_RESUME
+  desc: Error message displayed when resume button pressed but no playlist
   user: core
   <source>
-    *: "Tracknum"
+    *: "Nothing to resume"
   </source>
   <dest>
-    *: "트랙 번호"
+    *: "재시작할 파�� 없�"
   </dest>
   <voice>
-    *: "트랙 번호"
+    *: "재시작할 파�� 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_GENRE
-  desc: in tag viewer
+  id: LANG_PLAYLIST_ACCESS_ERROR
+  desc: Playlist error
   user: core
   <source>
-    *: "Genre"
+    *: "Error accessing playlist file"
   </source>
   <dest>
-    *: "장르"
+    *: "재�목� 파�� 접�하는 중 오류 발�"
   </dest>
   <voice>
-    *: "장르"
+    *: "재�목� 파�� 접�하는 중 오류 발�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_YEAR
-  desc: in tag viewer
+  id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR
+  desc: Playlist error
   user: core
   <source>
-    *: "Year"
+    *: "Error accessing playlist control file"
   </source>
   <dest>
-    *: "연�"
+    *: "재�목� 제어 파�� 접�하는 중 오류 발�"
   </dest>
   <voice>
-    *: "연�"
+    *: "재�목� 제어 파�� 접�하는 중 오류 발�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_LENGTH
-  desc: in tag viewer
+  id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR
+  desc: Playlist error
   user: core
   <source>
-    *: "Length"
+    *: "Error accessing directory"
   </source>
   <dest>
-    *: "길�"
+    *: "디렉토리 접�하는 중 오류 발�"
   </dest>
   <voice>
-    *: "길�"
+    *: "디렉토리 접�하는 중 오류 발�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_PLAYLIST
-  desc: in tag viewer
+  id: LANG_PLAYLIST_CONTROL_INVALID
+  desc: Playlist resume error
   user: core
   <source>
-    *: "Playlist"
+    *: "Playlist control file is invalid"
   </source>
   <dest>
-    *: "재�순서"
+    *: "재�목� 제어 파�� 잘못�"
   </dest>
   <voice>
-    *: "재�순서"
+    *: "재�목� 제어 파�� 잘못�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_BITRATE
-  desc: in tag viewer
+  id: LANG_PAUSE
+  desc: in wps and recording trigger menu
   user: core
   <source>
-    *: "Bitrate"
+    *: "Pause"
   </source>
   <dest>
-    *: "비트 전송률"
+    *: "�시 정지"
   </dest>
   <voice>
-    *: "비트 전송률"
+    *: "�시 정지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_VBR
-  desc: in browse_id3
+  id: LANG_MODE
+  desc: in wps F2 pressed and radio screen
   user: core
   <source>
-    *: " (VBR)"
+    *: "Mode:"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "모드:"
   </dest>
   <voice>
-    *: "VBR"
+    *: "모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_FREQUENCY
-  desc: in tag viewer
+  id: LANG_TIME
+  desc: Used on the bookmark select window to label elapsed time
   user: core
   <source>
-    *: "Frequency"
+    *: "Time"
   </source>
   <dest>
-    *: "오디오 샘플 ��"
+    *: "시간"
   </dest>
   <voice>
-    *: "오디오 샘플 ��"
+    *: "시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_TRACK_GAIN
-  desc: in tag viewer
+  id: LANG_USB_CHARGING
+  desc: in Battery menu
   user: core
   <source>
-    *: "Track Gain"
+    *: none
+    usb_charging_enable: "Charge During USB Connection"
   </source>
   <dest>
-    *: "트랙 게�"
+    *: none
+    usb_charging_enable: "USB 연결 중 충전"
   </dest>
   <voice>
-    *: "트랙 게�"
+    *: none
+    usb_charging_enable: "U S B 연결 중 충전"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUM_GAIN
-  desc: in tag viewer
+  id: LANG_KEYLOCK_ON
+  desc: displayed when key lock is on
   user: core
   <source>
-    *: "Album Gain"
+    *: "Buttons Locked"
   </source>
   <dest>
-    *: "앨범 게�"
+    *: "버튼� 잠금"
   </dest>
   <voice>
-    *: "앨범 게�"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_PATH
-  desc: in tag viewer
+  id: LANG_KEYLOCK_OFF
+  desc: displayed when key lock is turned off
   user: core
   <source>
-    *: "Path"
+    *: "Buttons Unlocked"
   </source>
   <dest>
-    *: "파� 위치"
+    *: "버튼 잠금 해제"
   </dest>
   <voice>
-    *: "파� 위치"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_SUNDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_RECORDING_TIME
+  desc: Display of recorded time
   user: core
   <source>
     *: none
-    rtc: "Sun"
+    recording: "Time:"
   </source>
   <dest>
     *: none
-    rtc: "�"
+    recording: "시간:"
   </dest>
   <voice>
     *: none
-    rtc: ""
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_MONDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_DISK_FULL
+  desc: in recording screen
   user: core
   <source>
     *: none
-    rtc: "Mon"
+    iaudiom5,iaudiox5: "The disk is full. Press POWER to continue."
+    iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    samsungyh*: "Disk full. Press LEFT to continue."
+    sansac200*,sansae200*,vibe500: "The disk is full. Press PREV to continue."
   </source>
   <dest>
     *: none
-    rtc: "ì›”"
+    iaudiom5,iaudiox5: "디스�가 꽉 찼습니다. 계�하려면 전� 버튼� 누르세요."
+    iriverh100,iriverh120,iriverh300: "디스�가 꽉 찼습니다. 계�하려면 정지 버튼� 누르세요."
+    recording: "디스�가 꽉 찼습니다. 계�하려면 � 버튼� 누르세요."
+    samsungyh*: "디스�가 꽉 찼습니다. 계�하려면 왼쪽 버튼� 누르세요."
+    sansac200*,sansae200*,vibe500: "디스�가 꽉 찼습니다. 계�하려면 �전 버튼� 누르세요."
   </dest>
   <voice>
     *: none
-    rtc: ""
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_TUESDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_BOOT_CHANGED
+  desc: File browser discovered the boot file was changed
   user: core
   <source>
-    *: none
-    rtc: "Tue"
+    *: "Boot changed"
   </source>
   <dest>
-    *: none
-    rtc: "í™”"
+    *: "부팅 변경�"
   </dest>
   <voice>
-    *: none
-    rtc: ""
+    *: "부팅 변경�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_WEDNESDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_REBOOT_NOW
+  desc: Do you want to reboot?
   user: core
   <source>
-    *: none
-    rtc: "Wed"
+    *: "Reboot now?"
   </source>
   <dest>
-    *: none
-    rtc: "수"
+    *: "지금 재부팅할까요?"
   </dest>
   <voice>
-    *: none
-    rtc: ""
+    *: "지금 재부팅할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_THURSDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_OFF_ABORT
+  desc: Used on many models
   user: core
   <source>
-    *: none
-    rtc: "Thu"
+    *: "OFF to abort"
+    gigabeatfx: "POWER to abort"
+    gigabeats,sansafuzeplus: "BACK to abort"
+    iaudiom5,iaudiox5: "Long PLAY to abort"
+    ipod*: "PLAY/PAUSE to abort"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
+    iriverh100,iriverh120,iriverh300: "STOP to abort"
   </source>
   <dest>
-    *: none
-    rtc: "목"
+    *: "중단하려면 � 버튼"
+    gigabeatfx: "중단하려면 전� 버튼"
+    gigabeats,sansafuzeplus: "중단하려면 뒤로가기 버튼"
+    iaudiom5,iaudiox5: "중단하려면 길게 재� 버튼"
+    ipod*: "중단하려면 재�/�시정지 버튼"
+    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "중단하려면 �전 버튼"
+    iriverh100,iriverh120,iriverh300: "중단하려면 중지 버튼"
   </dest>
   <voice>
-    *: none
-    rtc: ""
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_FRIDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_NO_FILES
+  desc: in settings_menu
   user: core
   <source>
-    *: none
-    rtc: "Fri"
+    *: "No files"
   </source>
   <dest>
-    *: none
-    rtc: "금"
+    *: "파� 없�"
   </dest>
   <voice>
-    *: none
-    rtc: ""
+    *: "파� 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WEEKDAY_SATURDAY
-  desc: Maximum 3-letter abbreviation for weekday
+  id: LANG_KEYBOARD_LOADED
+  desc: shown when a keyboard has been loaded from the dir browser
   user: core
   <source>
-    *: none
-    rtc: "Sat"
+    *: "New Keyboard"
   </source>
   <dest>
-    *: none
-    rtc: "토"
+    *: "새 키보드"
   </dest>
   <voice>
-    *: none
-    rtc: ""
+    *: "새 키보드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_JANUARY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_PLUGIN_CANT_OPEN
+  desc: Plugin open error message
   user: core
   <source>
-    *: "Jan"
+    *: "Can't open %s"
   </source>
   <dest>
-    *: "1ì›”"
+    *: "%s �(를) 열 수 없�"
   </dest>
   <voice>
-    *: "1ì›”"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_FEBRUARY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_READ_FAILED
+  desc: There was an error reading a file
   user: core
   <source>
-    *: "Feb"
+    *: "Failed reading %s"
   </source>
   <dest>
-    *: "2ì›”"
+    *: "%s�(를) �기 실패함"
   </dest>
   <voice>
-    *: "2ì›”"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_MARCH
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_PLUGIN_WRONG_MODEL
+  desc: The plugin is not compatible with the player model trying to run it
   user: core
   <source>
-    *: "Mar"
+    *: "Incompatible model"
   </source>
   <dest>
-    *: "3ì›”"
+    *: "호환�지 않는 모�"
   </dest>
   <voice>
-    *: "3ì›”"
+    *: "호환�지 않는 모�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_APRIL
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_PLUGIN_WRONG_VERSION
+  desc: The plugin is not compatible with the rockbox version trying to run it
   user: core
   <source>
-    *: "Apr"
+    *: "Incompatible version"
   </source>
   <dest>
-    *: "4ì›”"
+    *: "호환�지 않는 버전"
   </dest>
   <voice>
-    *: "4ì›”"
+    *: "호환�지 않는 버전"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_MAY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_PLUGIN_ERROR
+  desc: The plugin return an error code
   user: core
   <source>
-    *: "May"
+    *: "Plugin returned error"
   </source>
   <dest>
-    *: "5ì›”"
+    *: "플러그��서 오류가 반환�"
   </dest>
   <voice>
-    *: "5ì›”"
+    *: "플러그��서 오류가 반환�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_JUNE
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_FILETYPES_FULL
+  desc: Filetype array full
   user: core
   <source>
-    *: "Jun"
+    *: "Filetype array full"
   </source>
   <dest>
-    *: "6ì›”"
+    *: "파�형� 배열� 가� 참"
   </dest>
   <voice>
-    *: "6ì›”"
+    *: "파�형� 배열� 가� 참"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_JULY
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_SHOWDIR_BUFFER_FULL
+  desc: in showdir(), displayed on screen when you reach buffer limit
   user: core
   <source>
-    *: "Jul"
+    *: "Dir Buffer is Full!"
   </source>
   <dest>
-    *: "7ì›”"
+    *: "디렉토리 버�가 가� 찼습니다!"
   </dest>
   <voice>
-    *: "7ì›”"
+    *: "디렉토리 버�가 가� 찼습니다!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_AUGUST
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_INVALID_FILENAME
+  desc: "invalid filename entered" error message
   user: core
   <source>
-    *: "Aug"
+    *: "Invalid Filename!"
   </source>
   <dest>
-    *: "8ì›”"
+    *: "잘못� 파��름입니다!"
   </dest>
   <voice>
-    *: "8ì›”"
+    *: "잘못� 파��름!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_SEPTEMBER
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_PLEASE_REBOOT
+  desc: when activating an option that requires a reboot
   user: core
   <source>
-    *: "Sep"
+    *: "Please reboot to enable"
   </source>
   <dest>
-    *: "9ì›”"
+    *: "활성화하려면 재부팅"
   </dest>
   <voice>
-    *: "9ì›”"
+    *: "활성화하려면 재부팅"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_OCTOBER
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_BATTERY_CHARGE
+  desc: tells that the battery is charging, instead of battery level
   user: core
   <source>
-    *: "Oct"
+    *: none
+    charging: "Battery: Charging"
   </source>
   <dest>
-    *: "10ì›”"
+    *: none
+    charging: "배터리: 충전중"
   </dest>
   <voice>
-    *: "10ì›”"
+    *: none
+    charging: "배터리 충전 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_NOVEMBER
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_WARNING_BATTERY_LOW
+  desc: general warning
   user: core
   <source>
-    *: "Nov"
+    *: "WARNING! Low Battery!"
   </source>
   <dest>
-    *: "11ì›”"
+    *: "경고! 배터리 부족합니다!"
   </dest>
   <voice>
-    *: "11ì›”"
+    *: "경고! 배터리 부족합니다!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MONTH_DECEMBER
-  desc: Maximum 3-letter abbreviation for monthname
+  id: LANG_WARNING_BATTERY_EMPTY
+  desc: general warning
   user: core
   <source>
-    *: "Dec"
+    *: "Battery empty! RECHARGE!"
   </source>
   <dest>
-    *: "12ì›”"
+    *: "배터리가 방전�어갑니다! 재충전하세요!"
   </dest>
   <voice>
-    *: "12ì›”"
+    *: "배터리가 방전�어갑니다! 재충전하세요!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BYTE
+  desc: a unit postfix
+  user: core
+  <source>
+    *: "B"
+  </source>
+  <dest>
+    *: "B"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_POINT
+  desc: decimal separator for composing numbers
+  user: core
+  <source>
+    *: "."
+  </source>
+  <dest>
+    *: "~."
+  </dest>
+  <voice>
+    *: "��트"
   </voice>
 </phrase>
 <phrase>
@@ -5587,7 +7873,7 @@
     *: ""
   </dest>
   <voice>
-    *: "백만"
+    *: "만"
   </voice>
 </phrase>
 <phrase>
@@ -5601,7 +7887,7 @@
     *: ""
   </dest>
   <voice>
-    *: "ì‹­ì–µ"
+    *: "십만"
   </voice>
 </phrase>
 <phrase>
@@ -5643,7 +7929,7 @@
     *: ""
   </dest>
   <voice>
-    *: "밀리세컨드"
+    *: "밀리초"
   </voice>
 </phrase>
 <phrase>
@@ -5713,7 +7999,7 @@
     *: ""
   </dest>
   <voice>
-    *: "시간"
+    *: "시"
   </voice>
 </phrase>
 <phrase>
@@ -5727,7 +8013,7 @@
     *: ""
   </dest>
   <voice>
-    *: "시간"
+    *: "시"
   </voice>
 </phrase>
 <phrase>
@@ -5829,73 +8115,17 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BYTE
-  desc: a unit postfix
+  id: VOICE_KBIT_PER_SEC
+  desc: spoken only, a unit postfix
   user: core
   <source>
-    *: "B"
-  </source>
-  <dest>
-    *: "B"
-  </dest>
-  <voice>
     *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_KILOBYTE
-  desc: a unit postfix, also voiced
-  user: core
-  <source>
-    *: "KB"
-  </source>
-  <dest>
-    *: "KB"
-  </dest>
-  <voice>
-    *: "킬로바�트"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_MEGABYTE
-  desc: a unit postfix, also voiced
-  user: core
-  <source>
-    *: "MB"
-  </source>
-  <dest>
-    *: "MB"
-  </dest>
-  <voice>
-    *: "메가바�트"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_GIGABYTE
-  desc: a unit postfix, also voiced
-  user: core
-  <source>
-    *: "GB"
-  </source>
-  <dest>
-    *: "GB"
-  </dest>
-  <voice>
-    *: "기가바�트"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_POINT
-  desc: decimal separator for composing numbers
-  user: core
-  <source>
-    *: "."
   </source>
   <dest>
-    *: "."
+    *: ""
   </dest>
   <voice>
-    *: "ì �"
+    *: "초당 킬로비트"
   </voice>
 </phrase>
 <phrase>
@@ -6273,7 +8503,7 @@
     *: ""
   </dest>
   <voice>
-    *: "ì �"
+    *: "ë‹·"
   </voice>
 </phrase>
 <phrase>
@@ -6329,7 +8559,7 @@
     *: ""
   </dest>
   <voice>
-    *: "오디오 파�"
+    *: "오디오"
   </voice>
 </phrase>
 <phrase>
@@ -6343,7 +8573,7 @@
     *: ""
   </dest>
   <voice>
-    *: "설정 파�"
+    *: "구성"
   </voice>
 </phrase>
 <phrase>
@@ -6357,7 +8587,7 @@
     *: ""
   </dest>
   <voice>
-    *: "재� 화면 파�"
+    *: "재� 중 화면"
   </voice>
 </phrase>
 <phrase>
@@ -6371,7 +8601,7 @@
     *: ""
   </dest>
   <voice>
-    *: "플러그� 파�"
+    *: "플러그�"
   </voice>
 </phrase>
 <phrase>
@@ -6385,7 +8615,7 @@
     *: ""
   </dest>
   <voice>
-    *: "�트 파�"
+    *: "글꼴"
   </voice>
 </phrase>
 <phrase>
@@ -6399,7 +8629,7 @@
     *: ""
   </dest>
   <voice>
-    *: "�마� 파�"
+    *: "�마�"
   </voice>
 </phrase>
 <phrase>
@@ -6413,7 +8643,7 @@
     *: ""
   </dest>
   <voice>
-    *: "펌웨어 파�"
+    *: "펌웨어"
   </voice>
 </phrase>
 <phrase>
@@ -6430,7 +8660,7 @@
   </dest>
   <voice>
     *: none
-    remote: "리모트 재� 중 화면"
+    remote: "재� 중 화면 �격"
   </voice>
 </phrase>
 <phrase>
@@ -6444,2523 +8674,3789 @@
     *: ""
   </dest>
   <voice>
-    *: "키보드 파�"
+    *: "키보드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_BUFFER_FULL
-  desc: in playlist.indices() when playlist is full
+  id: VOICE_EXT_CUESHEET
+  desc:
   user: core
   <source>
-    *: "Playlist Buffer Full"
+    *: ""
   </source>
   <dest>
-    *: "재�목� 버�� 공간� 부족합니다."
+    *: ""
   </dest>
   <voice>
+    *: "�시트"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BOOKMARK_SELECT_INDEX_TEXT
+  desc: voice only, used in the bookmark list to label index number
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
     *: ""
+  </dest>
+  <voice>
+    *: "��스"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CREATING
-  desc: Screen feedback during playlist creation
+  id: VOICE_CURRENT_TIME
+  desc: spoken only, for wall clock announce
   user: core
   <source>
-    *: "Creating"
+    *: none
+    rtc: ""
   </source>
   <dest>
-    *: "�성하고 있습니다..."
+    *: none
+    rtc: ""
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: "현재 시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_INSERT_COUNT
-  desc: splash number of tracks inserted
+  id: LANG_SYSFONT_EQUALIZER_EDIT_MODE
+  desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Inserted %d tracks (%s)"
+    *: "Edit mode: %s %s"
   </source>
   <dest>
-    *: "%d개� �악 추가 (%s)"
+    *: "편집 모드: %s %s"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_QUEUE_COUNT
-  desc: splash number of tracks queued
+  id: LANG_SYSFONT_EQUALIZER_BAND_CUTOFF
+  desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Queued %d tracks (%s)"
+    *: "Cutoff"
   </source>
   <dest>
-    *: "%d개� �악 예약 (%s)"
+    *: "컷오프"
   </dest>
   <voice>
-    *: ""
+    *: "컷오프 주파수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_SAVE_COUNT
-  desc: splash number of tracks saved
+  id: LANG_SYSFONT_GAIN
+  desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Saved %d tracks (%s)"
+    *: "Gain"
   </source>
   <dest>
-    *: "%d개� �악 저장 (%s)"
+    *: "게�"
   </dest>
   <voice>
+    *: "게�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_OF
+  desc: spoken only, as in 3/8 => 3 of 8
+  user: core
+  <source>
     *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECURSE_DIRECTORY_QUESTION
-  desc: Asked from onplay screen
+  id: LANG_PLUGIN_GAMES
+  desc: in the main menu
   user: core
   <source>
-    *: "Recursively?"
+    *: "Games"
   </source>
   <dest>
-    *: "하위 ��� 추가하시겠습니까?"
+    *: "게임"
   </dest>
   <voice>
-    *: ""
+    *: "게임"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARN_ERASEDYNPLAYLIST_PROMPT
-  desc: prompt shown when about to erase a modified dynamic playlist
+  id: LANG_PLUGIN_APPS
+  desc: in the main menu
   user: core
   <source>
-    *: "Erase dynamic playlist?"
+    *: "Applications"
   </source>
   <dest>
-    *: "현재 재�목�� 삭제하시겠습니까?"
+    *: "�용 프로그램"
   </dest>
   <voice>
-    *: ""
+    *: "�용 프로그램"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NOTHING_TO_RESUME
-  desc: Error message displayed when resume button pressed but no playlist
+  id: LANG_PLUGIN_DEMOS
+  desc: in the main menu
   user: core
   <source>
-    *: "Nothing to resume"
+    *: "Demos"
   </source>
   <dest>
-    *: "재�할 파�� 없습니다."
+    *: "�모"
   </dest>
   <voice>
-    *: ""
+    *: "�모"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR
-  desc: Playlist error
+  id: LANG_ID3_GROUPING
+  desc: in tag viewer
   user: core
   <source>
-    *: "Error updating playlist control file"
+    *: "Work"
   </source>
   <dest>
-    *: "재�목� 제어 파� 업��트 �러"
+    *: "ìž‘ì—…"
   </dest>
   <voice>
-    *: ""
+    *: "ìž‘ì—…"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_ACCESS_ERROR
-  desc: Playlist error
+  id: LANG_SHOW_FILENAME_EXT
+  desc: in settings_menu
   user: core
   <source>
-    *: "Error accessing playlist file"
+    *: "Show Filename Extensions"
   </source>
   <dest>
-    *: "재�목� 파� 접근 �러"
+    *: "파��름 확장� 표시"
   </dest>
   <voice>
-    *: ""
+    *: "파��름 확장� 표시"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR
-  desc: Playlist error
+  id: LANG_UNKNOWN_TYPES
+  desc: in settings_menu
   user: core
   <source>
-    *: "Error accessing playlist control file"
+    *: "Only Unknown Types"
+  </source>
+  <dest>
+    *: "알 수 없는 유형만"
+  </dest>
+  <voice>
+    *: "알 수 없는 유형만"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EXT_ONLY_VIEW_ALL
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Only When Viewing All Types"
   </source>
   <dest>
-    *: "재�목� 제어 파� 접근 �러"
+    *: "모든 유형� 볼 때만"
   </dest>
   <voice>
+    *: "모든 유형� 볼 때만"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PM_UNITS_PER_TICK
+  desc: spoken only, peak meter release unit
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
     *: ""
+  </dest>
+  <voice>
+    *: "틱당 단위"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR
-  desc: Playlist error
+  id: VOICE_OCLOCK
+  desc: spoken only, for wall clock announce
   user: core
   <source>
-    *: "Error accessing directory"
+    *: ""
   </source>
   <dest>
-    *: "�� 접근 �러"
+    *: ""
   </dest>
   <voice>
+    *: "ì •ê°�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PM
+  desc: spoken only, for wall clock announce
+  user: core
+  <source>
     *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "오후"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLIST_CONTROL_INVALID
-  desc: Playlist resume error
+  id: VOICE_AM
+  desc: spoken only, for wall clock announce
   user: core
   <source>
-    *: "Playlist control file is invalid"
+    *: ""
   </source>
   <dest>
-    *: "재�목� 제어 파�� 유효하지 않습니다."
+    *: ""
   </dest>
   <voice>
+    *: "오전"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_OH
+  desc: spoken only, for wall clock announce
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
     *: ""
+  </dest>
+  <voice>
+    *: "오"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_NO_PRESETS
-  desc: error when preset list is empty
+  id: LANG_PM_CLIPCOUNTER
+  desc: in settings, for recording peak meter
   user: core
   <source>
     *: none
-    radio: "No presets"
+    recording: "Clip Counter"
   </source>
   <dest>
     *: none
-    radio: "프리셋 없�"
+    recording: "�립 카운터"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 없�"
+    recording: "�립 카운터"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_ADD_PRESET
-  desc: in radio menu
+  id: LANG_SELECTOR_START_COLOR
+  desc: line selector color option
   user: core
   <source>
     *: none
-    radio: "Add Preset"
+    lcd_color: "Primary Colour"
   </source>
   <dest>
     *: none
-    radio: "프리셋 추가"
+    lcd_color: "기본 색�"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 추가"
+    lcd_color: "기본 색�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_EDIT_PRESET
-  desc: in radio screen
+  id: LANG_SELECTOR_END_COLOR
+  desc: line selector color option
   user: core
   <source>
     *: none
-    radio: "Edit Preset"
+    lcd_color: "Secondary Colour"
   </source>
   <dest>
     *: none
-    radio: "프리셋 편집"
+    lcd_color: "보조 색�"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 편집"
+    lcd_color: "보조 색�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_DELETE_PRESET
-  desc: in radio screen
+  id: LANG_SELECTOR_TEXT_COLOR
+  desc: line selector text color option
   user: core
   <source>
     *: none
-    radio: "Remove Preset"
+    lcd_color: "Text Colour"
   </source>
   <dest>
     *: none
-    radio: "프리셋 제거"
+    lcd_color: "문� 색�"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 제거"
+    lcd_color: "문� 색�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_SAVE_FAILED
-  desc: in radio screen
+  id: LANG_INVERT_CURSOR_COLOR
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    radio: "Preset Save Failed"
+    lcd_color: "Bar (Solid Colour)"
   </source>
   <dest>
     *: none
-    radio: "프리셋 저장 실패"
+    lcd_color: "바 (단색)"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 저장 실패"
+    lcd_color: "바 (단색)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_NO_FREE_PRESETS
-  desc: in radio screen
+  id: LANG_INVERT_CURSOR_GRADIENT
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    radio: "The Preset List is Full"
+    lcd_color: "Bar (Gradient Colour)"
   </source>
   <dest>
     *: none
-    radio: "프리셋 리스트가 꽉 찼습니다"
+    lcd_color: "바 (그���션 색�)"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 리스트가 꽉 찼습니다"
+    lcd_color: "바 (그���션 색�)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CODEPAGE_CENTRAL_EUROPEAN
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Central European (CP1250)"
+  </source>
+  <dest>
+    *: "중앙 유럽어 (CP1250)"
+  </dest>
+  <voice>
+    *: "중앙 유럽어"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_THEME_MENU
+  desc: in the settings menu
+  user: core
+  <source>
+    *: "Theme Settings"
+  </source>
+  <dest>
+    *: "테마 설정"
+  </dest>
+  <voice>
+    *: "테마 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONBAR_MENU
-  desc: in button bar
+  id: LANG_COLORS_MENU
+  desc: colours menu under theme settings
   user: core
   <source>
     *: none
-    radio_screen_button_bar: "Menu"
+    lcd_color: "Colours"
   </source>
   <dest>
     *: none
-    radio_screen_button_bar: "메뉴"
+    lcd_color: "색�"
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: ""
+    lcd_color: "색�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_EXIT
-  desc: in radio screen
+  id: LANG_SELECTOR_COLOR_MENU
+  desc: line selector color menu title
   user: core
   <source>
     *: none
-    radio_screen_button_bar: "Exit"
+    lcd_color: "Line Selector Colours"
   </source>
   <dest>
     *: none
-    radio_screen_button_bar: "나가기"
+    lcd_color: "�� 선�기 색�"
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: ""
+    lcd_color: "�� 선�기 색�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_ACTION
-  desc: in radio screen
+  id: VOICE_EDIT
+  desc: keyboard
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "편집"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BLANK
+  desc: keyboard
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "공백"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EMPTY_LIST
+  desc: spoken only, when a list dialog contains no elements
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "빈 목�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NOT_PRESENT
+  desc: when external memory is not present
   user: core
   <source>
     *: none
-    radio_screen_button_bar: "Action"
+    multivolume: "Not present"
   </source>
   <dest>
     *: none
-    radio_screen_button_bar: "하기"
+    multivolume: "존재하지 않�"
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: ""
+    multivolume: "존재하지 않�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_ADD
-  desc: in radio screen
+  id: LANG_TALK_BATTERY_LEVEL
+  desc: Setting for spontaneous battery level announcement
+  user: core
+  <source>
+    *: "Announce Battery Level"
+  </source>
+  <dest>
+    *: "배터리 잔량 알리기"
+  </dest>
+  <voice>
+    *: "배터리 잔량 알리기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TALK_MIXER_LEVEL
+  desc: Relative volume of voice prompts
+  user: core
+  <source>
+    *: "Voice prompt volume"
+  </source>
+  <dest>
+    *: "�성 안내 볼륨"
+  </dest>
+  <voice>
+    *: "�성 안내 볼륨"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE_FILETYPE
+  desc: voice settings menu
+  user: core
+  <source>
+    *: "Say File Type"
+  </source>
+  <dest>
+    *: "파� 유형 �하기"
+  </dest>
+  <voice>
+    *: "파� 유형 �하기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASS_CUTOFF
+  desc: Bass setting cut-off frequency
   user: core
   <source>
     *: none
-    radio_screen_button_bar: "Add"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
   </source>
   <dest>
     *: none
-    radio_screen_button_bar: "추가"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "저� 컷오프"
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: ""
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "저� 컷오프"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_BUTTONBAR_RECORD
-  desc: in radio screen
+  id: LANG_TREBLE_CUTOFF
+  desc: Treble setting cut-off frequency
   user: core
   <source>
     *: none
-    radio_screen_button_bar: "Record"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
   </source>
   <dest>
     *: none
-    radio_screen_button_bar: "녹�"
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고� 컷오프"
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: ""
+    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고� 컷오프"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_MONO_MODE
-  desc: in radio screen
+  id: LANG_TAGNAVI_RANDOM
+  desc: "<Random>" entry in tag browser
+  user: core
+  <source>
+    *: "<Random>"
+  </source>
+  <dest>
+    *: "<랜�>"
+  </dest>
+  <voice>
+    *: "랜�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_SOUND
+  desc: save a sound config file
+  user: core
+  <source>
+    *: "Save Sound Settings"
+  </source>
+  <dest>
+    *: "사운드 설정 저장"
+  </dest>
+  <voice>
+    *: "사운드 설정 저장"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEYCLICK
+  desc: in keyclick settings menu
+  user: core
+  <source>
+    *: "Keyclick"
+  </source>
+  <dest>
+    *: "키�릭"
+  </dest>
+  <voice>
+    *: "키�릭"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEYCLICK_REPEATS
+  desc: in keyclick settings menu
+  user: core
+  <source>
+    *: "Keyclick Repeats"
+  </source>
+  <dest>
+    *: "키�릭 반복"
+  </dest>
+  <voice>
+    *: "키�릭 반복"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACCESSORY_SUPPLY
+  desc: in system settings menu
   user: core
   <source>
     *: none
-    radio: "Force Mono"
+    accessory_supply: "Accessory Power Supply"
   </source>
   <dest>
     *: none
-    radio: "강제 모노"
+    accessory_supply: "액세서리 전� 공급 장치"
   </dest>
   <voice>
     *: none
-    radio: "강제 모노"
+    accessory_supply: "액세서리 전� 공급 장치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_FREEZE
-  desc: splash screen during freeze in radio mode
+  id: LANG_UNKNOWN
+  desc: generic string for unknown states, such as an unset clock
+  user: core
+  <source>
+    *: "Unknown"
+  </source>
+  <dest>
+    *: "알 수 없�"
+  </dest>
+  <voice>
+    *: "알 수 없�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUICKSCREEN
+  desc: spoken only, Announces entering the "quick screen"
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "빠른 화면"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_OK
+  desc: spoken only, On exiting a context, specifically the quick screen
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "확�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STOP_RECORDING_AND_SHUTDOWN
+  desc: in record timesplit options
   user: core
   <source>
     *: none
-    radio: "Screen frozen!"
+    recording: "Stop Recording And Shutdown"
   </source>
   <dest>
     *: none
-    radio: "화면 멈춤!"
+    recording: "녹화 중지 � 종료"
   </dest>
   <voice>
     *: none
-    radio: ""
+    recording: "녹화 중지 � 종료"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_SCAN_PRESETS
-  desc: in radio menu
+  id: LANG_TOUCHPAD_SENSITIVITY
+  desc: touchpad sensitivity setting
   user: core
   <source>
     *: none
-    radio: "Auto-Scan Presets"
+    fiiom3k,gigabeatfx,sansafuzeplus: "Touchpad Sensitivity"
   </source>
   <dest>
     *: none
-    radio: "주파수 �� 검색"
+    fiiom3k,gigabeatfx,sansafuzeplus: "터치패드 ��"
   </dest>
   <voice>
     *: none
-    radio: "주파수 �� 검색"
+    fiiom3k,gigabeatfx,sansafuzeplus: "터치패드 ��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_CLEAR_PRESETS
-  desc: confirmation if presets can be cleared
+  id: LANG_DEADZONE
+  desc: touchpad deadzone setting
   user: core
   <source>
     *: none
-    radio: "Clear Current Presets?"
+    sansafuzeplus: "Touchpad Dead Zone"
   </source>
   <dest>
     *: none
-    radio: "현재 프리셋� 제거할까요?"
+    sansafuzeplus: "터치패드 �드존"
   </dest>
   <voice>
     *: none
-    radio: "현재 프리셋� 제거할까요?"
+    sansafuzeplus: "터치패드 �드존"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_SCANNING
-  desc: during auto scan
+  id: LANG_HIGH
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    radio: "Scanning %d.%02d MHz"
+    gigabeatfx: "High"
   </source>
   <dest>
     *: none
-    radio: "검색 %d.%02d MHz"
+    gigabeatfx: "높�"
   </dest>
   <voice>
     *: none
-    radio: ""
+    gigabeatfx: "높�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_DEFAULT_PRESET_NAME
-  desc: default preset name for auto scan mode
+  id: LANG_SERIAL_BITRATE
+  desc: in system settings menu
   user: core
   <source>
     *: none
-    radio: "%d.%02d MHz"
+    serial_port: "Serial Bitrate"
   </source>
   <dest>
     *: none
-    radio: "%d.%02d MHz"
+    serial_port: "�렬 비트 전송률"
   </dest>
   <voice>
     *: none
-    radio: ""
+    serial_port: "�렬 비트 전송률"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RADIO_SCAN_MODE
-  desc: in radio screen / menu
+  id: LANG_SERIAL_BITRATE_AUTO
+  desc: in system settings menu
   user: core
   <source>
     *: none
-    radio: "Scan"
+    serial_port: "Auto"
   </source>
   <dest>
     *: none
-    radio: "검색"
+    serial_port: "��"
   </dest>
   <voice>
     *: none
-    radio: "검색"
+    serial_port: "��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOWDIR_BUFFER_FULL
-  desc: in showdir(), displayed on screen when you reach buffer limit
+  id: LANG_SERIAL_BITRATE_9600
+  desc: in system settings menu
   user: core
   <source>
-    *: "Dir Buffer is Full!"
+    *: none
+    serial_port: "9600"
   </source>
   <dest>
-    *: "�� 버�� 공간� 부족합니다."
+    *: none
+    serial_port: "9600"
   </dest>
   <voice>
-    *: ""
+    *: none
+    serial_port: "9600"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LANGUAGE_LOADED
-  desc: shown when a language has been loaded from the dir browser
+  id: LANG_SERIAL_BITRATE_19200
+  desc: in system settings menu
   user: core
   <source>
-    *: "New Language"
+    *: none
+    serial_port: "19200"
   </source>
   <dest>
-    *: "새 언어가 �용�었습니다."
+    *: none
+    serial_port: "19200"
   </dest>
   <voice>
-    *: ""
+    *: none
+    serial_port: "19200"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_LOADED
-  desc: Feedback shown when a .cfg file is loaded
+  id: LANG_SERIAL_BITRATE_38400
+  desc: in system settings menu
   user: core
   <source>
-    *: "Settings Loaded"
+    *: none
+    serial_port: "38400"
   </source>
   <dest>
-    *: "설정� �용�었습니다."
+    *: none
+    serial_port: "38400"
   </dest>
   <voice>
-    *: ""
+    *: none
+    serial_port: "38400"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS_SAVED
-  desc: Feedback shown when a .cfg file is saved
+  id: LANG_SERIAL_BITRATE_57600
+  desc: in system settings menu
   user: core
   <source>
-    *: "Settings Saved"
+    *: none
+    serial_port: "57600"
   </source>
   <dest>
-    *: "설정� 저장�었습니다."
+    *: none
+    serial_port: "57600"
   </dest>
   <voice>
-    *: ""
+    *: none
+    serial_port: "57600"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOT_CHANGED
-  desc: File browser discovered the boot file was changed
+  id: LANG_VERY_SLOW
+  desc: in settings_menu
   user: core
   <source>
-    *: "Boot changed"
+    *: "Very slow"
   </source>
   <dest>
-    *: "부트 파�� 변경�었습니다."
+    *: "매우 �림"
   </dest>
   <voice>
-    *: ""
+    *: "매우 �림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REBOOT_NOW
-  desc: Do you want to reboot?
+  id: LANG_SLOW
+  desc: in settings_menu
   user: core
   <source>
-    *: "Reboot now?"
+    *: "Slow"
   </source>
   <dest>
-    *: "지금 재부팅 하시겠습니까?"
+    *: "�림"
   </dest>
   <voice>
-    *: ""
+    *: "�림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  id: LANG_VERY_FAST
+  desc: in settings_menu
   user: core
   <source>
-    *: "OFF to abort"
-    gigabeatfx: "POWER to abort"
-    gigabeats,sansafuzeplus: "BACK to abort"
-    iaudiom5,iaudiox5: "Long PLAY to abort"
-    ipod*: "PLAY/PAUSE to abort"
-    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "PREV to abort"
-    iriverh100,iriverh120,iriverh300: "STOP to abort"
+    *: "Very fast"
   </source>
   <dest>
-    *: "[꺼�]: 중지"
-    gigabeatfx: "[전�]: 중지"
-    gigabeats: "[뒤]: 중지"
-    iaudiom5,iaudiox5: "[재� 길게누름]: 중지"
-    ipod*: "[재�/�시정지]: 중지"
-    iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "[�전]: 중지"
-    iriverh100,iriverh120,iriverh300: "[정지]: 중지"
+    *: "매우 빠름"
   </dest>
   <voice>
-    *: ""
+    *: "매우 빠름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NO_FILES
+  id: LANG_FAST
   desc: in settings_menu
   user: core
   <source>
-    *: "No files"
+    *: "Fast"
   </source>
   <dest>
-    *: "파�� 없습니다."
+    *: "빠름"
   </dest>
   <voice>
-    *: ""
+    *: "빠름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYBOARD_LOADED
-  desc: shown when a keyboard has been loaded from the dir browser
+  id: LANG_SKIP_LENGTH
+  desc: playback settings menu
   user: core
   <source>
-    *: "New Keyboard"
+    *: "Skip Length"
+  </source>
+  <dest>
+    *: "길� 건너뛰기"
+  </dest>
+  <voice>
+    *: "길� 건너뛰기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_TRACK
+  desc: skip length setting entry 0
+  user: core
+  <source>
+    *: "Skip Track"
   </source>
   <dest>
-    *: "새 키보드가 �용�었습니다."
+    *: "트랙 건너뛰기"
   </dest>
   <voice>
+    *: "트랙 건너뛰기"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_CHAR_SLASH
+  desc: spoken only, for spelling
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
     *: ""
+  </dest>
+  <voice>
+    *: "슬래쉬"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MOVE
-  desc: The verb/action Move
+  id: LANG_GAIN_LEFT
+  desc: in the recording screen
   user: core
   <source>
-    *: "Move"
+    *: none
+    recording: "Gain L"
   </source>
   <dest>
-    *: "��하기"
+    *: none
+    recording: "게� L"
   </dest>
   <voice>
-    *: "��하기"
+    *: none
+    recording: "게� 왼쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_INDICES
-  desc: in playlist viewer menu
+  id: LANG_GAIN_RIGHT
+  desc: in the recording screen
   user: core
   <source>
-    *: "Show Indices"
+    *: none
+    recording: "Gain R"
   </source>
   <dest>
-    *: "순서 보기"
+    *: none
+    recording: "게� R"
   </dest>
   <voice>
-    *: "순서 보기"
+    *: none
+    recording: "게� 오른쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TRACK_DISPLAY
-  desc: in playlist viewer on+play menu
+  id: LANG_RECORDING_AGC_PRESET
+  desc: automatic gain control in record settings and screen
   user: core
   <source>
-    *: "Track Display"
+    *: none
+    agc: "AGC"
   </source>
   <dest>
-    *: "트랙 보기"
+    *: none
+    agc: "지� 게� 제어"
   </dest>
   <voice>
-    *: "트랙 보기"
+    *: none
+    agc: "�� 게� 제어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY_TRACK_NAME_ONLY
-  desc: track display options
+  id: LANG_RECORDING_AGC_CLIPTIME
+  desc: in record settings
   user: core
   <source>
-    *: "Track Name Only"
+    *: none
+    agc: "AGC clip time"
   </source>
   <dest>
-    *: "트랙 �름만 보기"
+    *: none
+    agc: "AGC �립 시간"
   </dest>
   <voice>
-    *: "트랙 �름만 보기"
+    *: none
+    agc: "�� 게� 제어 �립 시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DISPLAY_FULL_PATH
-  desc: track display options
+  id: LANG_RECORDING_AGC_MAXGAIN
+  desc: AGC maximum gain in recording screen
   user: core
   <source>
-    *: "Full Path"
+    *: none
+    agc: "AGC max. gain"
   </source>
   <dest>
-    *: "전체 경로"
+    *: none
+    agc: "AGC 최대 게�"
   </dest>
   <voice>
-    *: "전체 경로"
+    *: none
+    agc: "�� 게� 제어 최대 게�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOVE
-  desc: in playlist viewer on+play menu
+  id: LANG_RECORDING_FILENAME
+  desc: Filename header in recording screen
   user: core
   <source>
-    *: "Remove"
+    *: none
+    recording: "Filename:"
   </source>
   <dest>
-    *: "제거하기"
+    *: none
+    recording: "파��름:"
   </dest>
   <voice>
-    *: "제거하기"
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_CANT_OPEN
-  desc: Plugin open error message
+  id: LANG_PM_CLIPCOUNT
+  desc: in recording GUI, for recording peak meter. MAX 5 characters!
   user: core
   <source>
-    *: "Can't open %s"
+    *: none
+    recording: "CLIP:"
   </source>
   <dest>
-    *: "%s�(를) 열 수 없습니다."
+    *: none
+    recording: "�립:"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_READ_FAILED
-  desc: There was an error reading a file
+  id: LANG_RECORDING_TIMESPLIT_REC
+  desc: Display of record timer interval setting, on the record screen
   user: core
   <source>
-    *: "Failed reading %s"
+    *: none
+    recording: "Split Time:"
   </source>
   <dest>
-    *: "%s�(를) �지 못하였습니다."
+    *: none
+    recording: "분할 시간:"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_WRONG_MODEL
-  desc: The plugin is not compatible with the archos model trying to run it
+  id: LANG_RECORDING_SIZE
+  desc: Display of recorded file size
   user: core
   <source>
-    *: "Incompatible model"
+    *: none
+    recording: "Size:"
   </source>
   <dest>
-    *: "� 모�� 지�하지 않습니다."
+    *: none
+    recording: "�기:"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_WRONG_VERSION
-  desc: The plugin is not compatible with the rockbox version trying to run it
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
   user: core
   <source>
-    *: "Incompatible version"
+    *: none
+    recording: "Mono mode"
   </source>
   <dest>
-    *: "� 버전� 지�하지 않습니다."
+    *: none
+    recording: "모노 모드"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: "모노 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_ERROR
-  desc: The plugin return an error code
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
   user: core
   <source>
-    *: "Plugin returned error"
+    *: "Search Results"
   </source>
   <dest>
-    *: "플러그��서 오류가 발�하였습니다."
+    *: "검색 결과"
   </dest>
   <voice>
-    *: ""
+    *: "검색 결과"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILETYPES_FULL
-  desc: Filetype array full
+  id: LANG_LEFT
+  desc: Generic use of 'left'
   user: core
   <source>
-    *: "Filetype array full"
+    *: "Left"
   </source>
   <dest>
-    *: "확장�� 길�가 너무 �니다."
+    *: "왼쪽"
   </dest>
   <voice>
-    *: ""
+    *: "왼쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_LOAD
-  desc: load preset list in fm radio
+  id: LANG_RIGHT
+  desc: Generic use of 'right'
   user: core
   <source>
-    *: none
-    radio: "Load Preset List"
+    *: "Right"
   </source>
   <dest>
-    *: none
-    radio: "프리셋 리스트 불러오기"
+    *: "오른쪽"
   </dest>
   <voice>
-    *: none
-    radio: "프리셋 리스트 불러오기"
+    *: "오른쪽"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_SAVE
-  desc: Save preset list in fm radio
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
   user: core
   <source>
-    *: none
-    radio: "Save Preset List"
+    *: "Reset Setting"
   </source>
   <dest>
-    *: none
-    radio: "프리셋 리스트 저장"
+    *: "설정 초기화"
   </dest>
   <voice>
-    *: none
-    radio: "프리셋 리스트 저장"
+    *: "설정 초기화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_PRESET_CLEAR
-  desc: clear preset list in fm radio
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
   user: core
   <source>
     *: none
-    radio: "Clear Preset List"
+    quickscreen: "Set as Left Quickscreen Item"
   </source>
   <dest>
     *: none
-    radio: "프리셋 리스트 지움"
+    quickscreen: "왼쪽 빠른화면 항목으로 설정"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 리스트 지움"
+    quickscreen: "왼쪽 빠른화면 항목으로 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FMR
-  desc: Used when you need to say Preset List, also voiced
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
   user: core
   <source>
     *: none
-    radio: "Preset List"
+    quickscreen: "Set as Right Quickscreen Item"
   </source>
   <dest>
     *: none
-    radio: "프리셋 리스트"
+    quickscreen: "오른쪽 빠른화면 항목으로 설정"
   </dest>
   <voice>
     *: none
-    radio: "프리셋 리스트"
+    quickscreen: "오른쪽 빠른화면 항목으로 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_FIRST_AUTOSCAN
-  desc: When you run the radio without an fmr file in settings
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
   user: core
   <source>
     *: none
-    radio: "No settings found. Autoscan?"
+    quickscreen: "Set as Bottom Quickscreen Item"
   </source>
   <dest>
     *: none
-    radio: "설정� 찾지 못했습니다. �� 검색� 할까요?"
+    quickscreen: "하단 빠른화면 항목으로 설정"
   </dest>
   <voice>
     *: none
-    radio: "설정� 찾지 못했습니다. �� 검색� 할까요?"
+    quickscreen: "하단 빠른화면 항목으로 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFEED_DIRECT_GAIN
-  desc: in crossfeed settings
+  id: LANG_CREDITS
+  desc: in the Main Menu -> System screen
   user: core
   <source>
-    *: "Direct Gain"
+    *: "Credits"
   </source>
   <dest>
-    *: "다�렉트 게�"
+    *: "�레딧"
   </dest>
   <voice>
-    *: "다�렉트 게�"
+    *: "�레딧"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFEED_CROSS_GAIN
-  desc: in crossfeed settings
+  id: LANG_SORT_INTERPRET_NUMBERS
+  desc: in Settings -> File view
   user: core
   <source>
-    *: "Cross Gain"
+    *: "Interpret numbers when sorting"
   </source>
   <dest>
-    *: "�로스 게�"
+    *: "정렬 시 숫� 해�"
   </dest>
   <voice>
-    *: "�로스 게�"
+    *: "정렬 시 숫� 해�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFEED_HF_ATTENUATION
-  desc: in crossfeed settings
+  id: LANG_SORT_INTERPRET_AS_DIGIT
+  desc: in Settings -> File view
   user: core
   <source>
-    *: "High-Frequency Attenuation"
+    *: "As digits"
   </source>
   <dest>
-    *: "고주파수 �쇄율"
+    *: "숫�로"
   </dest>
   <voice>
-    *: "고주파수 �쇄율"
+    *: "숫�로"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CROSSFEED_HF_CUTOFF
-  desc: in crossfeed settings
+  id: LANG_SORT_INTERPRET_AS_NUMBERS
+  desc: in Settings -> File view
   user: core
   <source>
-    *: "High-Frequency Cutoff"
+    *: "As whole numbers"
   </source>
   <dest>
-    *: "고주파수 컷오프"
+    *: "정수로"
   </dest>
   <voice>
-    *: "고주파수 컷오프"
+    *: "정수로"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_BUSY
-  desc: when trying to shutdown and tagcache is committing
+  id: LANG_ENABLE_SPEAKER
+  desc: in Settings -> Sound Settings
   user: core
   <source>
-    *: "Database is not ready"
+    *: none
+    speaker: "Enable Speaker"
   </source>
   <dest>
-    *: "�악 DB가 없습니다."
+    *: none
+    speaker: "스피커 활성화"
   </dest>
   <voice>
-    *: "�악 DB가 없습니다."
+    *: none
+    speaker: "스피커 활성화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGNAVI_ALL_TRACKS
-  desc: "<All tracks>" entry in tag browser
+  id: LANG_TOUCHSCREEN_MODE
+  desc: in Settings -> General -> Display -> Touchscreen Settings
   user: core
   <source>
-    *: "<All tracks>"
+    *: none
+    touchscreen: "Touchscreen Mode"
   </source>
   <dest>
-    *: "<모든 �악>"
+    *: none
+    touchscreen: "터치스�린 모드"
   </dest>
   <voice>
-    *: "모든 �악"
+    *: none
+    touchscreen: "터치스�린 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVALID_FILENAME
-  desc: "invalid filename entered" error message
+  id: LANG_TOUCHSCREEN_GRID
+  desc: in Settings -> General -> Display -> Touchscreen Settings
   user: core
   <source>
-    *: "Invalid Filename!"
+    *: none
+    touchscreen: "3x3 Grid"
   </source>
   <dest>
-    *: "잘못� 파�명입니다."
+    *: none
+    touchscreen: "3x3 그리드"
   </dest>
   <voice>
-    *: "잘못� 파�명입니다."
+    *: none
+    touchscreen: "3 곱하기 3 그리드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_SCROLL_SETS
-  desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
+  id: LANG_TOUCHSCREEN_POINT
+  desc: in Settings -> General -> Display -> Touchscreen Settings
   user: core
   <source>
     *: none
-    remote: "Remote Scrolling Options"
+    touchscreen: "Absolute Point"
   </source>
   <dest>
     *: none
-    remote: "리모트 스�롤 옵션"
+    touchscreen: "절대�"
   </dest>
   <voice>
     *: none
-    remote: "리모트 스�롤 옵션"
+    touchscreen: "절대�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_UPDATE
-  desc: in tag cache settings
+  id: LANG_PREVENT_SKIPPING
+  desc: in Settings -> Playback Settings
   user: core
   <source>
-    *: "Update Now"
+    *: "Prevent Track Skipping"
   </source>
   <dest>
-    *: "지금 업��트하기"
+    *: "트랙 건너뛰기 방지"
   </dest>
   <voice>
-    *: "지금 업��트하기"
+    *: "트랙 건너뛰기 방지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_AUTOUPDATE
-  desc: in tag cache settings
+  id: LANG_TIMESTRETCH
+  desc: timestretch enable
   user: core
   <source>
-    *: "Auto Update"
+    *: "Timestretch"
   </source>
   <dest>
-    *: "�� 업��트"
+    *: "타임스트레치"
   </dest>
   <voice>
-    *: "�� 업��트"
+    *: "타임 스트레치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_EXPORT
-  desc: in tag cache settings
+  id: LANG_SPEED
+  desc: timestretch speed
   user: core
   <source>
-    *: "Export Modifications"
+    *: "Speed"
   </source>
   <dest>
-    *: "변경 사항 내보내기"
+    *: "��"
   </dest>
   <voice>
-    *: "변경 사항 내보내기"
+    *: "��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG
-  desc: in onplay menu
+  id: LANG_TOUCHSCREEN_SETTINGS
+  desc: in Settings -> General -> Display menu
   user: core
   <source>
-    *: "Playlist Catalogue"
+    *: none
+    touchscreen: "Touchscreen Settings"
   </source>
   <dest>
-    *: "재�목� 모�"
+    *: none
+    touchscreen: "터치스�린 설정"
   </dest>
   <voice>
-    *: "재�목� 모�"
+    *: none
+    touchscreen: "터치스�린 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_ADD_TO
-  desc: in onplay playlist catalogue submenu
+  id: LANG_TOUCHSCREEN_CALIBRATE
+  desc: in Settings -> General -> Display -> Touchscreen Settings
   user: core
   <source>
-    *: "Add to Playlist"
+    *: none
+    touchscreen: "Calibrate"
   </source>
   <dest>
-    *: "재�목�� 추가"
+    *: none
+    touchscreen: "�정"
   </dest>
   <voice>
-    *: "재�목�� 추가"
+    *: none
+    touchscreen: "�정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_ADD_TO_NEW
-  desc: in onplay playlist catalogue submenu
+  id: LANG_TOUCHSCREEN_RESET_CALIBRATION
+  desc: in Settings -> General -> Display -> Touchscreen Settings
   user: core
   <source>
-    *: "Add to New Playlist"
+    *: none
+    touchscreen: "Reset Calibration"
   </source>
   <dest>
-    *: "새 재�목�� 추가"
+    *: none
+    touchscreen: "�정 재설정"
   </dest>
   <voice>
-    *: "새 재�목�� 추가"
+    *: none
+    touchscreen: "�정 재설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_VIEW
-  desc: in onplay playlist catalogue submenu
+  id: LANG_STATUSBAR_TOP
+  desc: in Settings -> General -> Display -> statusbar
   user: core
   <source>
-    *: "View Catalogue"
+    *: "Top"
   </source>
   <dest>
-    *: "재�목�들 보기"
+    *: "�단"
   </dest>
   <voice>
-    *: "재�목�들 보기"
+    *: "�단"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_NO_DIRECTORY
-  desc: error message when playlist catalogue directory doesn't exist
+  id: LANG_STATUSBAR_BOTTOM
+  desc: in Settings -> General -> Display -> statusbar
   user: core
   <source>
-    *: "%s doesn't exist"
+    *: "Bottom"
   </source>
   <dest>
-    *: "%s가 존재하지 않습니다."
+    *: "하단"
   </dest>
   <voice>
-    *: ""
+    *: "하단"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CATALOG_NO_PLAYLISTS
-  desc: error message when no playlists for playlist catalogue
+  id: LANG_REMOTE_STATUSBAR
+  desc: in Settings -> General -> Display -> statusbar
   user: core
   <source>
-    *: "No Playlists"
+    *: none
+    remote: "Remote Statusbar"
   </source>
   <dest>
-    *: "재�목�� 없습니다."
+    *: none
+    remote: "�격 �태표시줄"
   </dest>
   <voice>
-    *: ""
+    *: none
+    remote: "�격 �태표시줄"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGCACHE_IMPORT
-  desc: in tag cache settings
+  id: LANG_SEMITONE
+  desc:
   user: core
   <source>
-    *: "Import Modifications"
+    *: none
+    pitchscreen: "Semitone"
   </source>
   <dest>
-    *: "변경 사항 들여오기"
+    *: none
+    pitchscreen: "반�"
   </dest>
   <voice>
-    *: "변경 사항 들여오기"
+    *: none
+    pitchscreen: "반�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPLIT_MEASURE
-  desc: in record timesplit options
+  id: LANG_STRETCH_LIMIT
+  desc: "limit" in pitch screen
   user: core
   <source>
     *: none
-    recording: "Split Measure"
+    pitchscreen: "Limit"
   </source>
   <dest>
     *: none
-    recording: "분리 기준"
+    pitchscreen: "제한"
   </dest>
   <voice>
     *: none
-    recording: "분리 기준"
+    pitchscreen: "제한"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPLIT_TYPE
-  desc: in record timesplit options
+  id: LANG_PLAYBACK_RATE
+  desc: "rate" in pitch screen
   user: core
   <source>
     *: none
-    recording: "What to do when Splitting"
+    pitchscreen: "Rate"
   </source>
   <dest>
     *: none
-    recording: "분리중� 하는 �작"
+    pitchscreen: "전송률"
   </dest>
   <voice>
     *: none
-    recording: "분리중� 하는 �작"
+    pitchscreen: "전송률"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPLIT_TIME
-  desc: in record timesplit options
+  id: LANG_USB_KEYPAD_MODE
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    recording: "Split Time"
+    usb_hid: "USB Keypad Mode"
   </source>
   <dest>
     *: none
-    recording: "시간� 따른 분리"
+    usb_hid: "USB 키패드 모드"
   </dest>
   <voice>
     *: none
-    recording: "시간� 따른 분리"
+    usb_hid: "USB 키패드 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SPLIT_SIZE
-  desc: in record timesplit options
+  id: LANG_MULTIMEDIA_MODE
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    recording: "Split Filesize"
+    usb_hid: "Multimedia"
   </source>
   <dest>
     *: none
-    recording: "파��기� 따� 분리"
+    usb_hid: "멀티미디어"
   </dest>
   <voice>
     *: none
-    recording: "파��기� 따� 분리"
+    usb_hid: "멀티미디어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_START_NEW_FILE
-  desc: in record timesplit options
+  id: LANG_PRESENTATION_MODE
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    recording: "Start new file"
+    usb_hid: "Presentation"
   </source>
   <dest>
     *: none
-    recording: "새 파� 시작"
+    usb_hid: "프레젠테�션"
   </dest>
   <voice>
     *: none
-    recording: "새 파� 시작"
+    usb_hid: "프레젠테�션"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STOP_RECORDING
-  desc: in record timesplit options
+  id: LANG_BROWSER_MODE
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    recording: "Stop recording"
+    usb_hid: "Browser"
   </source>
   <dest>
     *: none
-    recording: "녹� 중지"
+    usb_hid: "�색기"
   </dest>
   <voice>
     *: none
-    recording: "녹� 중지"
+    usb_hid: "�색기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_LCD_OFF
-  desc: Remote lcd off splash in recording screen
+  id: LANG_MOUSE_MODE
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    remote: "Remote Display OFF"
+    usb_hid: "Mouse"
   </source>
   <dest>
     *: none
-    remote: "리모트 화면 �기"
+    usb_hid: "마우스"
   </dest>
   <voice>
     *: none
-    remote: "리모트 화면 �기"
+    usb_hid: "마우스"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_LCD_ON
-  desc: Remote lcd off splash in recording screen
+  id: LANG_SCROLLBAR_WIDTH
+  desc: in Settings -> General -> Display -> Status-/Scrollbar
+  user: core
+  <source>
+    *: "Scroll Bar Width"
+  </source>
+  <dest>
+    *: "스�롤바 �"
+  </dest>
+  <voice>
+    *: "스�롤바 �"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Compressor"
+  </source>
+  <dest>
+    *: "압축기"
+  </dest>
+  <voice>
+    *: "압축기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOP_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
   user: core
   <source>
     *: none
-    remote: "(Vol- : Re-enable)"
+    quickscreen: "Set as Top Quickscreen Item"
   </source>
   <dest>
     *: none
-    remote: "(볼륨- : 다시 켜기)"
+    quickscreen: "�단 빠른화면 항목으로 설정"
   </dest>
   <voice>
     *: none
-    remote: "(볼륨- : 다시 켜기)"
+    quickscreen: "�단 빠른화면 항목으로 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BACKLIGHT_ON_BUTTON_HOLD
-  desc: in lcd settings
+  id: LANG_FM_ITALY
+  desc: fm region Italy
   user: core
   <source>
     *: none
-    hold_button: "Backlight on Hold"
+    radio: "Italy"
   </source>
   <dest>
     *: none
-    hold_button: "홀드 버튼� 켜졌�때 백��트 설정"
+    radio: "�탈리아"
   </dest>
   <voice>
     *: none
-    hold_button: "홀드 버튼� 켜졌�때 백��트 설정"
+    radio: "�탈리아"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NEVER
-  desc: in lcd settings
+  id: LANG_FM_OTHER
+  desc: Catch-all FM region. Select if none of the others work
   user: core
   <source>
     *: none
-    lcd_sleep: "Never"
+    radio: "Other"
   </source>
   <dest>
     *: none
-    lcd_sleep: "켜지 않�"
+    radio: "기타"
   </dest>
   <voice>
     *: none
-    lcd_sleep: "켜지 않�"
+    radio: "기타"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
-  desc: In display settings, time to switch LCD chip into power saving state
+  id: LANG_COMPRESSOR_THRESHOLD
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Threshold"
+  </source>
+  <dest>
+    *: "한계�"
+  </dest>
+  <voice>
+    *: "한계�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Ratio"
+  </source>
+  <dest>
+    *: "비율"
+  </dest>
+  <voice>
+    *: "비율"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_2
+  desc: in sound settings
+  user: core
+  <source>
+    *: "2:1"
+  </source>
+  <dest>
+    *: "2:1"
+  </dest>
+  <voice>
+    *: "2 대 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_4
+  desc: in sound settings
+  user: core
+  <source>
+    *: "4:1"
+  </source>
+  <dest>
+    *: "4:1"
+  </dest>
+  <voice>
+    *: "4 대 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_6
+  desc: in sound settings
+  user: core
+  <source>
+    *: "6:1"
+  </source>
+  <dest>
+    *: "6:1"
+  </dest>
+  <voice>
+    *: "6 대 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_10
+  desc: in sound settings
+  user: core
+  <source>
+    *: "10:1"
+  </source>
+  <dest>
+    *: "10:1"
+  </dest>
+  <voice>
+    *: "10 대 1"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RATIO_LIMIT
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Limit"
+  </source>
+  <dest>
+    *: "제한"
+  </dest>
+  <voice>
+    *: "제한"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_GAIN
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Makeup Gain"
+  </source>
+  <dest>
+    *: "메��업 게�"
+  </dest>
+  <voice>
+    *: "메��업 게�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTO
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Auto"
+  </source>
+  <dest>
+    *: "��"
+  </dest>
+  <voice>
+    *: "��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Knee"
+  </source>
+  <dest>
+    *: "니"
+  </dest>
+  <voice>
+    *: "니"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_HARD_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Hard Knee"
+  </source>
+  <dest>
+    *: "하드 니"
+  </dest>
+  <voice>
+    *: "하드 니"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_SOFT_KNEE
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Soft Knee"
+  </source>
+  <dest>
+    *: "소프트 니"
+  </dest>
+  <voice>
+    *: "소프트 니"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_ATTACK
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Attack Time"
+  </source>
+  <dest>
+    *: "어� 타임"
+  </dest>
+  <voice>
+    *: "어� 타임"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COMPRESSOR_RELEASE
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Release Time"
+  </source>
+  <dest>
+    *: "릴리즈 타임"
+  </dest>
+  <voice>
+    *: "릴리즈 타임"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_OUTRO
+  desc: skipping to the 5 seconds before the end of a track
+  user: core
+  <source>
+    *: "Skip to Outro"
+  </source>
+  <dest>
+    *: "아웃트로로 건너뛰기"
+  </dest>
+  <voice>
+    *: "아웃트로로 건너뛰기"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_SBS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�태표시줄 스킨"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RSBS
+  desc: spoken only, for file extension
   user: core
   <source>
     *: none
-    lcd_sleep: "Sleep (After Backlight Off)"
+    remote: ""
   </source>
   <dest>
     *: none
-    lcd_sleep: "백��트 꺼진 후 슬립모드 진입시간"
+    remote: ""
   </dest>
   <voice>
     *: none
-    lcd_sleep: "백��트 꺼진 후 슬립모드 진입시간"
+    remote: "�격 �태표시줄 스킨"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_CHANNEL_STEREO
-  desc: in sound_settings
+  id: LANG_USB_HID
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    recording: "Stereo"
+    usb_hid: "USB HID"
   </source>
   <dest>
     *: none
-    recording: "스테레오"
+    usb_hid: "USB HID"
   </dest>
   <voice>
     *: none
-    recording: "스테레오"
+    usb_hid: "USB 휴먼 �터페�스 장치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_CHANNEL_MONO
-  desc: in sound_settings
+  id: LANG_QUEUE_LAST_SHUFFLED
+  desc: in onplay menu.  queue a playlist randomly at end of dynamic playlist
+  user: core
+  <source>
+    *: "Queue Last Shuffled"
+  </source>
+  <dest>
+    *: "마지막으로 섞� 대기열"
+  </dest>
+  <voice>
+    *: "마지막으로 섞� 대기열"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MORSE_INPUT
+  desc: in Settings -> System
   user: core
   <source>
     *: none
-    recording: "Mono"
+    morse_input: "Use Morse Code Input"
   </source>
   <dest>
     *: none
-    recording: "모노"
+    morse_input: "모스 부호 입력 사용"
   </dest>
   <voice>
     *: none
-    recording: "모노"
+    morse_input: "모스 부호 입력 사용"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_EQUALIZER_EDIT_MODE
-  desc: in the equalizer settings menu
+  id: LANG_AUTOTRACKSKIP
+  desc: in crossfade settings
   user: core
   <source>
-    *: "Edit mode: %s %s"
+    *: none
+    crossfade: "Automatic Track Change Only"
   </source>
   <dest>
-    *: "편집 모드: %s %s"
+    *: none
+    crossfade: "�� 트랙 변경만 가능"
   </dest>
   <voice>
-    *: ""
+    *: none
+    crossfade: "�� 트랙 변경만 가능"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_EQUALIZER_BAND_CUTOFF
-  desc: in the equalizer settings menu
+  id: LANG_NEXT_TRACK
+  desc: Shown in WPS
   user: core
   <source>
-    *: "Cutoff"
+    *: "Next Track:"
   </source>
   <dest>
-    *: "컷오프 주파수"
+    *: "다� 트랙:"
   </dest>
   <voice>
-    *: "컷오프 주파수"
+    *: "다� 트랙"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_QUALITY
-  desc: in the recording settings
+  id: LANG_NEXT
+  desc: Shown in WPS (short form of Next Track)
+  user: core
+  <source>
+    *: "Next:"
+  </source>
+  <dest>
+    *: "다�:"
+  </dest>
+  <voice>
+    *: "다�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_OF
+  desc: Shown in WPS: X of Y (tracks)
+  user: core
+  <source>
+    *: "of"
+  </source>
+  <dest>
+    *: "�"
+  </dest>
+  <voice>
+    *: "�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *: "Base Skin"
+  </source>
+  <dest>
+    *: "기본 스킨"
+  </dest>
+  <voice>
+    *: "기본 스킨"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_BASE_SKIN
+  desc: browse for the base skin in theme settings
+  user: core
+  <source>
+    *: "Remote Base Skin"
+  </source>
+  <dest>
+    *: "기본 스킨 �격"
+  </dest>
+  <voice>
+    *: "기본 스킨 �격"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_SCREEN
+  desc: in the main menu
   user: core
   <source>
     *: none
-    recording_hwcodec: "Quality"
+    remote: "Main Screen"
   </source>
   <dest>
     *: none
-    recording_hwcodec: "�질"
+    remote: "메� 화면"
   </dest>
   <voice>
     *: none
-    recording_hwcodec: "�질"
+    remote: "메� 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_FREQUENCY
-  desc: in the recording settings
+  id: LANG_REMOTE_SCREEN
+  desc: in the main menu
   user: core
   <source>
     *: none
-    recording: "Frequency"
+    remote: "Remote Screen"
   </source>
   <dest>
     *: none
-    recording: "주파수"
+    remote: "�격 화면"
   </dest>
   <voice>
     *: none
-    recording: "주파수"
+    remote: "�격 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SOURCE
-  desc: in the recording settings
+  id: LANG_HISTOGRAM_INTERVAL
+  desc: in record settings menu
   user: core
   <source>
     *: none
-    recording: "Source"
+    histogram: "Histogram interval"
   </source>
   <dest>
     *: none
-    recording: "소스"
+    histogram: "히스토그램 간격"
   </dest>
   <voice>
     *: none
-    recording: "소스"
+    histogram: "히스토그램 간격"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_MIC
-  desc: in the recording settings
+  id: LANG_LINEOUT_ONOFF
+  desc: in system settings menu
   user: core
   <source>
     *: none
-    recording: "Int. Mic"
+    lineout_poweroff: "Line Out"
   </source>
   <dest>
     *: none
-    recording: "내부 마��"
+    lineout_poweroff: "�� 아웃"
   </dest>
   <voice>
     *: none
-    recording: "내부 마��"
+    lineout_poweroff: "�� 아웃"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORDING_SRC_DIGITAL
-  desc: in the recording settings
+  id: LANG_HOTKEY
+  desc: hotkey menu
   user: core
   <source>
     *: none
-    recording: "Digital"
+    hotkey: "Hotkey"
   </source>
   <dest>
     *: none
-    recording: "디지털"
+    hotkey: "단축키"
   </dest>
   <voice>
     *: none
-    recording: "디지털"
+    hotkey: "단축키"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_RECORD_TRIGGER
-  desc: in recording settings_menu
+  id: LANG_HOTKEY_WPS
+  desc: hotkey menu
   user: core
   <source>
     *: none
-    recording: "Trigger"
+    hotkey: "WPS Hotkey"
   </source>
   <dest>
     *: none
-    recording: "트리거"
+    hotkey: "WPS 단축키"
   </dest>
   <voice>
     *: none
-    recording: "트리거"
+    hotkey: "WPS 단축키"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F1
-  desc: in dir browser, F1 button bar text
+  id: LANG_HOTKEY_FILE_BROWSER
+  desc: hotkey menu
   user: core
   <source>
     *: none
-    recorder_pad: "Menu"
+    hotkey: "File Browser Hotkey"
   </source>
   <dest>
     *: none
-    recorder_pad: "메뉴"
+    hotkey: "파� �색기 단축키"
   </dest>
   <voice>
     *: none
-    recorder_pad: ""
+    hotkey: "파� �색기 단축키"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESUME_REWIND
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: "Rewind Before Resume"
+  </source>
+  <dest>
+    *: "재시작 전 ��기"
+  </dest>
+  <voice>
+    *: "재시작 전 ��기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F2
-  desc: in dir browser, F2 button bar text
+  id: LANG_REMOTE_RADIOSCREEN
+  desc: in the theme menu
   user: core
   <source>
     *: none
-    recorder_pad: "Option"
+    radio_remote: "Remote Radio Screen"
   </source>
   <dest>
     *: none
-    recorder_pad: "옵션"
+    radio_remote: "�격 �디오 화면"
   </dest>
   <voice>
     *: none
-    recorder_pad: ""
+    radio_remote: "�격 �디오 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_DIRBROWSE_F3
-  desc: in dir browser, F3 button bar text
+  id: VOICE_EXT_FMS
+  desc: spoken only, for file extension
   user: core
   <source>
     *: none
-    recorder_pad: "LCD"
+    radio: ""
   </source>
   <dest>
     *: none
-    recorder_pad: "ì•¡ì •"
+    radio: ""
   </dest>
   <voice>
     *: none
-    recorder_pad: ""
+    radio: "�디오 화면 스킨"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LOADING_PERCENT
-  desc: splash number of percents loaded
+  id: VOICE_EXT_RFMS
+  desc: spoken only, for file extension
   user: core
   <source>
-    *: "Loading... %d%% done (%s)"
+    *: none
+    radio_remote: ""
   </source>
   <dest>
-    *: "불러오는 중... %d%% 완료 (%s)"
+    *: none
+    radio_remote: ""
   </dest>
   <voice>
-    *: ""
+    *: none
+    radio_remote: "�격 �디오 화면 스킨"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_PATH
-  desc: in settings_menu
+  id: LANG_FM_STATION_HEADER
+  desc: in radio screen
   user: core
   <source>
-    *: "Show Path"
+    *: none
+    radio: "Station:"
   </source>
   <dest>
-    *: "경로 표시"
+    *: none
+    radio: "스테�션:"
   </dest>
   <voice>
-    *: "경로 표시"
+    *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_PATH_CURRENT
-  desc: in show path menu
+  id: LANG_HW_EQ_TONE_CONTROLS
+  desc: in sound_menu, hardware equalizer tone controls
   user: core
   <source>
-    *: "Current Directory Only"
+    *: none
+    gigabeats,samsungypr1: "Tone Controls"
   </source>
   <dest>
-    *: "현재 ��명만"
+    *: none
+    gigabeats,samsungypr1: "톤 제어"
   </dest>
   <voice>
-    *: "현재 ��명만"
+    *: none
+    gigabeats,samsungypr1: "톤 제어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AGC_SAFETY
-  desc: AGC preset
+  id: LANG_HW_EQ_TONE_CONTROLS_ADVANCED
+  desc: in sound_menu, advanced settings for hardware equalizer tone controls
   user: core
   <source>
     *: none
-    agc: "Safety (clip)"
+    gigabeats,samsungypr1: "Advanced Tone Control Settings"
   </source>
   <dest>
     *: none
-    agc: "안전하게 (�리핑)"
+    gigabeats,samsungypr1: "고급 톤 제어 설정"
   </dest>
   <voice>
     *: none
-    agc: "안전하게 (�리핑)"
+    gigabeats,samsungypr1: "고급 톤 제어 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AGC_LIVE
-  desc: AGC preset
+  id: LANG_HW_EQ_GAIN
+  desc: in sound_menu, hardware equalizer tone controls filter gain
   user: core
   <source>
     *: none
-    agc: "Live (slow)"
+    gigabeats,samsungypr1: "Band %d Gain"
   </source>
   <dest>
     *: none
-    agc: "��브 (�림)"
+    gigabeats,samsungypr1: "대역 %d 게�"
   </dest>
   <voice>
     *: none
-    agc: "��브 (�림)"
+    gigabeats,samsungypr1: "대역 게�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AGC_DJSET
-  desc: AGC preset
+  id: LANG_HW_EQ_FREQUENCY
+  desc: in sound_menu, hardware equalizer tone controls shelf filter cutoff frequency
   user: core
   <source>
     *: none
-    agc: "DJ-Set (slow)"
+    gigabeats,samsungypr1: "Band %d Frequency"
   </source>
   <dest>
     *: none
-    agc: "DJ-세팅 (�림)"
+    gigabeats,samsungypr1: "대역 %d 주파수"
   </dest>
   <voice>
     *: none
-    agc: "DJ-세팅 (�림)"
+    gigabeats,samsungypr1: "대역 주파수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AGC_MEDIUM
-  desc: AGC preset
+  id: LANG_HW_EQ_WIDTH
+  desc: in sound_menu, hardware equalizer tone controls peak bandwith setting
   user: core
   <source>
     *: none
-    agc: "Medium"
+    gigabeats,samsungypr1: "Band %d Width"
   </source>
   <dest>
     *: none
-    agc: "중간"
+    gigabeats,samsungypr1: "대역 %d �"
   </dest>
   <voice>
     *: none
-    agc: "중간"
+    gigabeats,samsungypr1: "대역�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AGC_VOICE
-  desc: AGC preset
+  id: LANG_HW_EQ_WIDTH_NARROW
+  desc: in sound_menu, hardware equalizer tone controls narrow bandwith setting
   user: core
   <source>
     *: none
-    agc: "Voice (fast)"
+    gigabeats,samsungypr1: "Narrow"
   </source>
   <dest>
     *: none
-    agc: "�성 (빠름)"
+    gigabeats,samsungypr1: "��"
   </dest>
   <voice>
     *: none
-    agc: "�성 (빠름)"
+    gigabeats,samsungypr1: "��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_AGC_MAXGAIN
-  desc: AGC maximum gain in recording screen
+  id: LANG_HW_EQ_WIDTH_WIDE
+  desc: in sound_menu, hardware equalizer tone controls wide bandwidth setting
   user: core
   <source>
     *: none
-    agc: "AGC max. gain"
+    gigabeats,samsungypr1: "Wide"
   </source>
   <dest>
     *: none
-    agc: "AGC 최대 게�"
+    gigabeats,samsungypr1: "넓�"
   </dest>
   <voice>
     *: none
-    agc: "AGC 최대 게�"
+    gigabeats,samsungypr1: "넓�"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_KBIT_PER_SEC
-  desc: spoken only, a unit postfix
+  id: LANG_DEPTH_3D
+  desc: in sound_menu, amount of 3D enhancement effect
   user: core
   <source>
-    *: ""
+    *: none
+    depth_3d: "3-D Enhancement"
   </source>
   <dest>
-    *: ""
+    *: none
+    depth_3d: "3-D 향�"
   </dest>
   <voice>
-    *: "초당 킬로바�트"
+    *: none
+    depth_3d: "3-D 향�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_REGION
-  desc: fm tuner region setting
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<태그가 지정�지 않�>"
+  </dest>
+  <voice>
+    *: "태그가 지정�지 않�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RADIOSCREEN
+  desc: in the theme menu
   user: core
   <source>
     *: none
-    radio: "Region"
+    radio: "Radio Screen"
   </source>
   <dest>
     *: none
-    radio: "지역"
+    radio: "�디오 화면"
   </dest>
   <voice>
     *: none
-    radio: "지역"
+    radio: "�디오 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_EUROPE
-  desc: fm tuner region europe
+  id: LANG_ID3_COMPOSER
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Composer"
+  </source>
+  <dest>
+    *: "작곡가"
+  </dest>
+  <voice>
+    *: "작곡가"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FORCE
+  desc: alternative to yes/no for tristate settings
+  user: core
+  <source>
+    *: "Force"
+  </source>
+  <dest>
+    *: "강제"
+  </dest>
+  <voice>
+    *: "강제"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ONPLAY_PICTUREFLOW
+  desc: Onplay pictureflow
+  user: core
+  <source>
+    *: "PictureFlow"
+  </source>
+  <dest>
+    *: "픽�플로우"
+  </dest>
+  <voice>
+    *: "픽� 플로우 열기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KBD_OK
+  desc: in keyboard
   user: core
   <source>
     *: none
-    radio: "Europe"
+    touchscreen: "OK"
   </source>
   <dest>
     *: none
-    radio: "유럽"
+    touchscreen: "확�"
   </dest>
   <voice>
     *: none
-    radio: "유럽"
+    touchscreen: "확�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_US
-  desc: fm region us / canada
+  id: LANG_KBD_DELETE
+  desc: in keyboard
   user: core
   <source>
     *: none
-    radio: "US / Canada"
+    touchscreen: "Del"
   </source>
   <dest>
     *: none
-    radio: "미국 / 케나다"
+    touchscreen: "삭제"
   </dest>
   <voice>
     *: none
-    radio: "미국 / 케나다"
+    touchscreen: "삭제"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_JAPAN
-  desc: fm region japan
+  id: LANG_KBD_CANCEL
+  desc: in keyboard
   user: core
   <source>
     *: none
-    radio: "Japan"
+    touchscreen: "Cancel"
   </source>
   <dest>
     *: none
-    radio: "�본"
+    touchscreen: "취소"
   </dest>
   <voice>
     *: none
-    radio: "�본"
+    touchscreen: "취소"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_KOREA
-  desc: fm region korea
+  id: LANG_BOOKMARK_SETTINGS_AUTOUPDATE
+  desc: prompt for user to decide whether to update bookmarks
+  user: core
+  <source>
+    *: "Update on Stop"
+  </source>
+  <dest>
+    *: "중지 시 업��트"
+  </dest>
+  <voice>
+    *: "중지 시 업��트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_START_DIR
+  desc: reset the browser start directory
+  user: core
+  <source>
+    *: "Start File Browser at /"
+  </source>
+  <dest>
+    *: "/ �서 파� 브�우저 시작"
+  </dest>
+  <voice>
+    *: "루트�서 파� 브�우저 시작"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_RSSI
+  desc: Signal strength of a received FM station
   user: core
   <source>
     *: none
-    radio: "Korea"
+    radio: "Signal strength:"
   </source>
   <dest>
     *: none
-    radio: "한국"
+    radio: "신호 강�:"
   </dest>
   <voice>
     *: none
-    radio: "한국"
+    radio: "신호 강�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RANDOM
-  desc: random folder
+  id: LANG_FILESIZE
+  desc: in record timesplit options and in track information viewer
   user: core
   <source>
-    *: "Random"
+    *: "Filesize"
   </source>
   <dest>
-    *: "무작위"
+    *: "파��기"
   </dest>
   <voice>
-    *: "무작위"
+    *: "파��기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AUDIOSCROBBLER
-  desc: "Last.fm Log" in the playback menu
+  id: LANG_AUTORESUME
+  desc: resume settings menu
   user: core
   <source>
-    *: "Last.fm Log"
+    *: "Automatic resume"
   </source>
   <dest>
-    *: "Last.fm 로그 기�"
+    *: "�� 재시작"
   </dest>
   <voice>
-    *: "Last.fm 로그 기�"
+    *: "�� 재시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLEASE_REBOOT
-  desc: when activating an option that requires a reboot
+  id: LANG_AUTORESUME_AUTOMATIC
+  desc: resume on automatic track change
   user: core
   <source>
-    *: "Please reboot to enable"
+    *: "Resume on automatic track change"
   </source>
   <dest>
-    *: "사용하려면 다시 시작해주세요."
+    *: "�� 트랙 변경 재시작"
   </dest>
   <voice>
-    *: ""
+    *: "�� 트랙 변경 재시작"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DITHERING
-  desc: in the sound settings menu
+  id: LANG_AUTORESUME_CUSTOM
+  desc: enable customization of resume on automatic track change
   user: core
   <source>
-    *: "Dithering"
+    *: "In custom directories only"
   </source>
   <dest>
-    *: "디��"
+    *: "커스텀 디렉토리�서만"
   </dest>
   <voice>
-    *: "디��"
+    *: "커스텀 디렉토리�서만"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FORMAT
-  desc: audio format
+  id: LANG_PAUSE_REWIND
+  desc: Seconds to rewind when rewind on pause is enabled.
   user: core
   <source>
-    *: "Format"
+    *: "Rewind on Pause"
   </source>
   <dest>
-    *: "파� 형�"
+    *: "�시정지 시 ��기"
   </dest>
   <voice>
-    *: "파� 형�"
+    *: "�시정지 시 ��기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_MPA_L3
-  desc: audio format description
+  id: LANG_RESET_PLAYLISTCAT_DIR
+  desc:
   user: core
   <source>
-    *: none
-    recording: "MPEG Layer 3"
+    *: "Reset Playlist Catalogue Directory"
   </source>
   <dest>
-    *: none
-    recording: "MPEG Layer 3"
+    *: "재� 목� 카탈로그 디렉토리 재설정"
   </dest>
   <voice>
-    *: none
-    recording: "MPEG Layer 3"
+    *: "재� 목� 카탈로그 디렉토리 재설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_PCM_WAV
-  desc: audio format description
+  id: LANG_CURRENT_PLAYLIST
+  desc: Used when you need to say playlist, also voiced
+  user: core
+  <source>
+    *: "Current Playlist"
+  </source>
+  <dest>
+    *: "현재 재�목�"
+  </dest>
+  <voice>
+    *: "현재 재�목�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_CHANGES
+  desc: When you try to exit screens to confirm save
+  user: core
+  <source>
+    *: "Save Changes?"
+  </source>
+  <dest>
+    *: "변경 사항 저장할까요?"
+  </dest>
+  <voice>
+    *: "변경 사항 저장할까요?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USB_SKIP_FIRST_DRIVE
+  desc: in settings_menu
   user: core
   <source>
     *: none
-    recording: "PCM Wave"
+    multidrive_usb: "USB Hide Internal Drive"
   </source>
   <dest>
     *: none
-    recording: "PCM Wave"
+    multidrive_usb: "USB 내부 드��브 숨기기"
   </dest>
   <voice>
     *: none
-    recording: "PCM Wave"
+    multidrive_usb: "USB 내부 드��브 숨기기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_WAVPACK
-  desc: audio format description
+  id: LANG_LIST_LINE_PADDING
+  desc: list padding, in display settings
   user: core
   <source>
     *: none
-    recording: "WavPack"
+    touchscreen: "Line Padding in Lists"
   </source>
   <dest>
     *: none
-    recording: "WavPack"
+    touchscreen: "목�� �� 패딩"
   </dest>
   <voice>
     *: none
-    recording: "WavPack"
+    touchscreen: "목�� �� 패딩"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ENCODER_SETTINGS
-  desc: encoder settings
+  id: LANG_SLEEP_TIMER_DURATION
+  desc: default sleep timer duration in minutes
+  user: core
+  <source>
+    *: "Default Sleep Timer Duration"
+  </source>
+  <dest>
+    *: "기본 절전 타�머 기간"
+  </dest>
+  <voice>
+    *: "기본 절전 타�머 기간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLEEP_TIMER_ON_POWER_UP
+  desc: whether sleep timer starts on power up
+  user: core
+  <source>
+    *: "Start Sleep Timer On Boot"
+  </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
+  <source>
+    *: "Cancel Sleep Timer"
+  </source>
+  <dest>
+    *: "절전 타�머 취소"
+  </dest>
+  <voice>
+    *: "절전 타�머 취소"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_SEPARATOR
+  desc: line between lines in lists
+  user: core
+  <source>
+    *: "Line Separator"
+  </source>
+  <dest>
+    *: "�� 분리기"
+  </dest>
+  <voice>
+    *: "�� 분리기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_SEPARATOR_COLOR
+  desc: line between lines in lists
+  user: core
+  <source>
+    *: "Line Separator Colour"
+  </source>
+  <dest>
+    *: "�� 분리기 색�"
+  </dest>
+  <voice>
+    *: "�� 분리기 색�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHORTCUTS
+  desc: Title in the shortcuts menu
+  user: core
+  <source>
+    *: "Shortcuts"
+  </source>
+  <dest>
+    *: "바로가기"
+  </dest>
+  <voice>
+    *: "바로가기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEYCLICK_SOFTWARE
+  desc: in keyclick settings menu
   user: core
   <source>
     *: none
-    recording: "Encoder Settings"
+    hardware_click: "Headphone Keyclick"
   </source>
   <dest>
     *: none
-    recording: "�코� 설정"
+    hardware_click: "헤드� 키�릭"
   </dest>
   <voice>
     *: none
-    recording: "�코� 설정"
+    hardware_click: "헤드� 키�릭"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NO_SETTINGS
-  desc: when something has settings in a certain context
+  id: LANG_KEYCLICK_HARDWARE
+  desc: in keyclick settings menu
   user: core
   <source>
     *: none
-    recording: "(No Settings)"
+    hardware_click: "Speaker Keyclick"
   </source>
   <dest>
     *: none
-    recording: "(가능한 설정 없�)"
+    hardware_click: "스피커 키�릭"
   </dest>
   <voice>
     *: none
-    recording: "가능한 설정 없�"
+    hardware_click: "스피커 키�릭"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SOURCE_FREQUENCY
-  desc: when recording source frequency setting must follow source
+  id: LANG_GLYPHS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Glyphs To Cache"
+  </source>
+  <dest>
+    *: "�시할 문�"
+  </dest>
+  <voice>
+    *: "�시할 문�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_STARTUP_SHUTDOWN
+  desc: in the general settings menu
+  user: core
+  <source>
+    *: "Startup/Shutdown"
+  </source>
+  <dest>
+    *: "시작/종료"
+  </dest>
+  <voice>
+    *: "시작/종료"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEYPRESS_RESTARTS_SLEEP_TIMER
+  desc: whether to restart running sleep timer on keypress
+  user: core
+  <source>
+    *: "Restart Sleep Timer On Keypress"
+  </source>
+  <dest>
+    *: "키를 누를 때 절전 타�머 다시 시작"
+  </dest>
+  <voice>
+    *: "키를 누를 때 절전 타�머 다시 시작"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONSTRAIN_NEXT_FOLDER
+  desc: in settings_menu. Whether LANG_NEXT_FOLDER should be constrained to directories within LANG_SET_AS_START_DIR
+  user: core
+  <source>
+    *: "Constrain Auto-Change"
+  </source>
+  <dest>
+    *: "�� 변경 제한"
+  </dest>
+  <voice>
+    *: "�� 변경 제한"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_SHORTCUTS_INSTEAD_OF_QS
+  desc: in settings_menu.
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    quickscreen: "Use Shortcuts Menu Instead of Quick Screen"
   </source>
   <dest>
     *: none
-    recording: "(소스와 ��하게 설정)"
+    quickscreen: "빠른 화면 대신 바로가기 메뉴 사용"
   </dest>
   <voice>
     *: none
-    recording: "소스와 ��하게 설정"
+    quickscreen: "빠른 화면 대신 바로가기 메뉴 사용"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BITRATE
-  desc: bits-kilobits per unit time
+  id: LANG_SLEEP_TIMER_START_CURRENT
+  desc: shown when a sleep timer isn't running
+  user: core
+  <source>
+    *: "Start Sleep Timer"
+  </source>
+  <dest>
+    *: "절전 타�머 시작"
+  </dest>
+  <voice>
+    *: "절전 타�머 시작"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CODEPAGE_WESTERN_EUROPEAN
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Western European (CP1252)"
+  </source>
+  <dest>
+    *: "서유럽어 (CP1252)"
+  </dest>
+  <voice>
+    *: "서유럽어"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_MEIER
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Simple (Meier)"
+  </source>
+  <dest>
+    *: "간단한 (마�어)"
+  </dest>
+  <voice>
+    *: "간단함"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_CUSTOM
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Custom"
+  </source>
+  <dest>
+    *: "커스텀"
+  </dest>
+  <voice>
+    *: "커스텀"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECT_FOLDER
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select one or more directories"
+  </source>
+  <dest>
+    *: "하나 ��� 디렉터리 선�"
+  </dest>
+  <voice>
+    *: "하나 ��� 디렉터리 선�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECT_DATABASE_DIRS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select directories to scan"
+  </source>
+  <dest>
+    *: "검색할 디렉토리 선�"
+  </dest>
+  <voice>
+    *: "검색할 디렉토리 선�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILTER_ROLL_OFF
+  desc: in sound settings
   user: core
   <source>
     *: none
-    recording: "Bitrate"
+    filter_roll_off: "DAC filter roll-off"
   </source>
   <dest>
     *: none
-    recording: "비트레�트"
+    filter_roll_off: "DAC 필터 롤오프"
   </dest>
   <voice>
     *: none
-    recording: "비트레�트"
+    filter_roll_off: "DAC 필터 롤오프"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER_TYPE
-  desc: in recording trigger menu
+  id: LANG_FILTER_SHARP
+  desc: in sound settings
   user: core
   <source>
     *: none
-    recording: "Trigtype"
+    filter_roll_off: "Sharp"
   </source>
   <dest>
     *: none
-    recording: "트리거 타입"
+    filter_roll_off: "선명함"
   </dest>
   <voice>
     *: none
-    recording: "트리거 타입"
+    filter_roll_off: "선명함"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER_STOP
-  desc: trigger types
+  id: LANG_FILTER_SLOW
+  desc: in sound settings
   user: core
   <source>
     *: none
-    recording: "Stop"
+    filter_roll_off: "Slow"
   </source>
   <dest>
     *: none
-    recording: "정지"
+    filter_roll_off: "�림"
   </dest>
   <voice>
     *: none
-    recording: "정지"
+    filter_roll_off: "�림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORD_TRIGGER_NEWFILESTP
-  desc: trigger types
+  id: LANG_FILTER_SHORT_SHARP
+  desc: in sound settings
   user: core
   <source>
     *: none
-    recording: "New file"
+    filter_roll_off: "Short Sharp"
   </source>
   <dest>
     *: none
-    recording: "새 파�"
+    filter_roll_off: "약간 부족한 선명함"
   </dest>
   <voice>
     *: none
-    recording: "새 파�"
+    filter_roll_off: "약간 부족한 선명함"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARNING_BATTERY_LOW
-  desc: general warning
+  id: LANG_FILTER_SHORT_SLOW
+  desc: in sound settings
   user: core
   <source>
-    *: "WARNING! Low Battery!"
+    *: none
+    filter_roll_off: "Short Slow"
   </source>
   <dest>
-    *: "주�! 배터리가 부족합니다!"
+    *: none
+    filter_roll_off: "약간 �림"
   </dest>
   <voice>
-    *: ""
+    *: none
+    filter_roll_off: "약간 �림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_WARNING_BATTERY_EMPTY
-  desc: general warning
+  id: LANG_FILTER_SUPER_SLOW
+  desc: in sound settings
   user: core
   <source>
-    *: "Battery empty! RECHARGE!"
+    *: none
+    filter_roll_off: "Super Slow"
   </source>
   <dest>
-    *: "배터리가 없습니다! 충전해주세요!"
+    *: none
+    filter_roll_off: "엄청 �림"
   </dest>
   <voice>
-    *: ""
+    *: none
+    filter_roll_off: "엄청 �림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_AFMT_AIFF
-  desc: audio format description
+  id: LANG_FILTER_SHORT
+  desc: in sound settings
   user: core
   <source>
     *: none
-    recording: "AIFF"
+    es9018: "Short"
   </source>
   <dest>
     *: none
-    recording: "AIFF"
+    es9018: "짧�"
   </dest>
   <voice>
     *: none
-    recording: "AIFF"
+    es9018: "짧�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PROPERTIES
-  desc: browser file/dir properties
+  id: LANG_FILTER_BYPASS
+  desc: in sound settings
   user: core
   <source>
-    *: "Properties"
+    *: none
+    es9018: "Bypass"
   </source>
   <dest>
-    *: "�성"
+    *: none
+    es9018: "우회"
   </dest>
   <voice>
-    *: "�성"
+    *: none
+    es9018: "우회"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHUFFLE_TRACKSKIP
-  desc: in settings_menu
+  id: LANG_FILTER_LINEAR_FAST
+  desc: in sound settings
   user: core
   <source>
     *: none
-    crossfade: "Shuffle or Manual Track Skip"
+    es9218: "Linear Fast"
   </source>
   <dest>
     *: none
-    crossfade: "무작위 & 트랙 스킵"
+    es9218: "선형 빠름"
   </dest>
   <voice>
     *: none
-    crossfade: "무작위 & 트랙 스킵"
+    es9218: "선형 빠름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RUNNING_TIME
-  desc: in run time screen
+  id: LANG_FILTER_LINEAR_SLOW
+  desc: in sound settings
   user: core
   <source>
-    *: "Running Time"
+    *: none
+    es9218: "Linear Slow"
   </source>
   <dest>
-    *: "작� 시간"
+    *: none
+    es9218: "선형 �림"
   </dest>
   <voice>
-    *: "작� 시간"
+    *: none
+    es9218: "선형 �림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TOP_TIME
-  desc: in run time screen
+  id: LANG_FILTER_MINIMUM_FAST
+  desc: in sound settings
   user: core
   <source>
-    *: "Top Time"
+    *: none
+    es9218: "Minimum Fast"
   </source>
   <dest>
-    *: "누� 시간"
+    *: none
+    es9218: "최소한 빠름"
   </dest>
   <voice>
-    *: "누� 시간"
+    *: none
+    es9218: "최소한 빠름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_TIME
-  desc: in run time screen
+  id: LANG_FILTER_MINIMUM_SLOW
+  desc: in sound settings
   user: core
   <source>
-    *: "Clear Time?"
+    *: none
+    es9218: "Minimum Slow"
   </source>
   <dest>
-    *: "초기화 하시겠습니까?"
+    *: none
+    es9218: "최소한 �림"
   </dest>
   <voice>
-    *: "초기화 하시겠습니까?"
+    *: none
+    es9218: "최소한 �림"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REPLACE
-  desc: in onplay menu.  Replace the current playlist with a new one.
+  id: LANG_FILTER_APODIZING_1
+  desc: in sound settings
   user: core
   <source>
-    *: "Play Next"
+    *: none
+    es9218: "Apodizing type 1"
   </source>
   <dest>
-    *: "다�곡으로 재�"
+    *: none
+    es9218: "아�다�징 유형 1"
   </dest>
   <voice>
-    *: "다�곡으로 재�"
+    *: none
+    es9218: "아�다�징 유형 1"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_THEME
-  desc: save a theme file
+  id: LANG_FILTER_APODIZING_2
+  desc: in sound settings
   user: core
   <source>
-    *: "Save Theme Settings"
+    *: none
+    es9218: "Apodizing type 2"
   </source>
   <dest>
-    *: "테마 설정 저장"
+    *: none
+    es9218: "아�다�징 유형 2"
   </dest>
   <voice>
-    *: "테마 설정 저장"
+    *: none
+    es9218: "아�다�징 유형 2"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_USB_CHARGING
-  desc: in Battery menu
+  id: LANG_FILTER_HYBRID_FAST
+  desc: in sound settings
   user: core
   <source>
     *: none
-    usb_charging_enable: "Charge During USB Connection"
+    es9218: "Hybrid Fast"
   </source>
   <dest>
     *: none
-    usb_charging_enable: "USB 연결 중 충전"
+    es9218: "복합� 빠름"
   </dest>
   <voice>
     *: none
-    usb_charging_enable: "USB 연결 중 충전"
+    es9218: "복합� 빠름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_ALBUMARTIST
-  desc: in tag viewer
+  id: LANG_FILTER_BRICK_WALL
+  desc: in sound settings
   user: core
   <source>
-    *: "Album Artist"
+    *: none
+    es9218: "Brick Wall"
   </source>
   <dest>
-    *: "앨범 �악가"
+    *: none
+    es9218: "벽�"
   </dest>
   <voice>
-    *: "앨범 �악가"
+    *: none
+    es9218: "벽�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_COMMENT
-  desc: in tag viewer
+  id: LANG_DAC_POWER_MODE
+  desc: in sound settings
   user: core
   <source>
-    *: "Comment"
+    *: none
+    dac_power_mode: "DAC power mode"
+    es9218: "DAC output level"
   </source>
   <dest>
-    *: "설명"
+    *: none
+    dac_power_mode: "DAC 파워 모드"
+    es9218: "DAC 출력 레벨"
   </dest>
   <voice>
-    *: "설명"
+    *: none
+    dac_power_mode: "DAC 파워 모드"
+    es9218: "DAC 출력 레벨"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CUESHEET_ENABLE
-  desc: cuesheet support option
+  id: LANG_DAC_POWER_HIGH
+  desc: in sound settings
   user: core
   <source>
-    *: "Cuesheet Support"
+    *: none
+    dac_power_mode: "High performance"
+    es9218: "High Gain (2 Vrms)"
   </source>
   <dest>
-    *: "� 시트 지�"
+    *: none
+    dac_power_mode: "고성능"
+    es9218: "높� 게� (2 Vrms)"
   </dest>
   <voice>
-    *: "� 시트 지�"
+    *: none
+    dac_power_mode: "고성능"
+    es9218: "높� 게� (2 Vrms)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FM_MENU
-  desc: fm menu title
+  id: LANG_DAC_POWER_LOW
+  desc: in sound settings
   user: core
   <source>
     *: none
-    radio: "FM Radio Menu"
+    dac_power_mode: "Save battery"
+    es9218: "Low Gain (1 Vrms)"
   </source>
   <dest>
     *: none
-    radio: "FM �디오 메뉴"
+    dac_power_mode: "배터리 저장"
+    es9218: "낮� 게� (1 Vrms)"
   </dest>
   <voice>
     *: none
-    radio: "FM �디오 메뉴"
+    dac_power_mode: "배터리 저장"
+    es9218: "낮� 게� (1 Vrms)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DIR_BROWSER
-  desc: main menu title
+  id: LANG_VOLUME_LIMIT
+  desc: in sound_settings
   user: core
   <source>
-    *: "Files"
+    *: "Maximum Volume Limit"
   </source>
   <dest>
-    *: "파� 보기"
+    *: "최대 볼륨 제한"
   </dest>
   <voice>
-    *: "파� 보기"
+    *: "최대 볼륨 제한"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NOW_PLAYING
-  desc: in the main menu
+  id: LANG_SYSFONT_EQUALIZER_BAND_Q
+  desc: in the equalizer settings menu
   user: core
   <source>
-    *: "Now Playing"
+    *: "Q"
   </source>
   <dest>
-    *: "지금 재� 중"
+    *: "Q"
   </dest>
   <voice>
-    *: "지금 재� 중"
+    *: "Q"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESUME_PLAYBACK
-  desc: in the main menu
+  id: LANG_PBE
+  desc: in sound settings
   user: core
   <source>
-    *: "Resume Playback"
+    *: "Perceptual Bass Enhancement"
   </source>
   <dest>
-    *: "재� 계�하기"
+    *: "지� 저� 강화"
   </dest>
   <voice>
-    *: "재� 계�하기"
+    *: "지� 저� 강화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_START_SCREEN
-  desc: in the system sub menu
+  id: LANG_AFR
+  desc: in sound settings
   user: core
   <source>
-    *: "Start Screen"
+    *: "Auditory Fatigue Reduction"
   </source>
   <dest>
-    *: "시작화면 설정"
+    *: "청� 피로 �소"
   </dest>
   <voice>
-    *: "시작화면 설정"
+    *: "청� 피로 �소"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ROCKBOX_TITLE
-  desc: main menu title
+  id: LANG_SURROUND
+  desc: in the sound settings menu
   user: core
   <source>
-    *: "Rockbox"
+    *: "Haas Surround"
   </source>
   <dest>
-    *: "Rockbox 메뉴"
+    *: "하스 서�운드"
   </dest>
   <voice>
-    *: "Rockbox 메뉴"
+    *: "하스 서�운드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MAIN_MENU
-  desc: in start screen setting
+  id: LANG_SURROUND_FX1
+  desc: in sound settings
   user: core
   <source>
-    *: "Main Menu"
+    *: "f(x1)"
   </source>
   <dest>
-    *: "메� 메뉴"
+    *: "f(x1)"
   </dest>
   <voice>
-    *: "메� 메뉴"
+    *: "f(x1)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PREVIOUS_SCREEN
-  desc: in start screen setting
+  id: LANG_SURROUND_FX2
+  desc: in sound settings
   user: core
   <source>
-    *: "Previous Screen"
+    *: "f(x2)"
   </source>
   <dest>
-    *: "�전 화면"
+    *: "f(x2)"
   </dest>
   <voice>
-    *: "�전 화면"
+    *: "f(x2)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALARM_WAKEUP_SCREEN
-  desc: in alarm menu setting
+  id: LANG_SURROUND_METHOD2
+  desc: in sound settings
+  user: core
+  <source>
+    *: "SIDE ONLY"
+  </source>
+  <dest>
+    *: "측면만"
+  </dest>
+  <voice>
+    *: "측면만"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SURROUND_MIX
+  desc: in sound settings
+  user: core
+  <source>
+    *: "Dry / Wet Mix"
+  </source>
+  <dest>
+    *: "드�� / 웻 믹스"
+  </dest>
+  <voice>
+    *: "드�� / 웻 믹스"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_IBASSO_FREQ_SCALING_GOVERNOR
+  desc: in Settings -> General -> System -> Freq Scaling Governor
   user: core
   <source>
     *: none
-    alarm: "Alarm Wake up Screen"
+    ibassodx50,ibassodx90: "Freq Scaling Governor"
   </source>
   <dest>
     *: none
-    alarm: "알람으로 켜졌�때 화면"
+    ibassodx50,ibassodx90: "주파수 스케�� 거버너"
   </dest>
   <voice>
     *: none
-    alarm: "알람으로 켜졌�때 화면"
+    ibassodx50,ibassodx90: "주파수 스케�� 거버너"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUILDING_DATABASE
-  desc: splash database building progress
+  id: LANG_USB_MODE
+  desc: in Settings -> General -> System -> USB Mode
   user: core
   <source>
-    *: "Building database... %d found (OFF to return)"
-    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "Building database... %d found (LEFT to return)"
-    gogearsa9200,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "Building database... %d found (PREV to return)"
-    iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)"
+    *: "USB Mode"
   </source>
   <dest>
-    *: "�악 DB �성 중... %d개 완료 ([꺼�]: �아가기)"
-    gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "�악 DB �성 중... %d개 완료 ([왼쪽]: �아가기)"
-    gogearsa9200,ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "�악 DB �성 중... %d개 완료 ([�전]: �아가기)"
-    iriverh100,iriverh120,iriverh300: "�악 DB �성 중... %d개 완료 ([정지]: �아가기)"
+    *: "USB 모드"
   </dest>
   <voice>
-    *: "�악 DB� 요소를 찾�"
+    *: "USB 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ONPLAY_MENU_TITLE
-  desc: title for the onplay menus
+  id: LANG_USB_MODE_MASS_STORAGE
+  desc: in Settings -> General -> System -> USB Mode: Mass Storage
   user: core
   <source>
-    *: "Context Menu"
+    *: "Mass Storage"
   </source>
   <dest>
-    *: "재� 메뉴"
+    *: "대용량 저장 장치"
   </dest>
   <voice>
-    *: "재� 메뉴"
+    *: "대용량 저장 장치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONLIGHT_TIMEOUT
-  desc: in settings_menu
+  id: LANG_USB_MODE_CHARGE
+  desc: in Settings -> General -> System -> USB Mode: Charge Only
   user: core
   <source>
-    *: none
-    button_light: "Button Light Timeout"
-    sansae200*,sansafuze*: "Wheel Light Timeout"
+    *: "Charge Only"
   </source>
   <dest>
-    *: none
-    button_light: "버튼 조명 시간"
-    sansae200*,sansafuze*: "휠 조명 시간"
+    *: "충전만"
   </dest>
   <voice>
-    *: none
-    button_light: "버튼 조명 시간"
-    sansae200*,sansafuze*: "휠 조명 시간"
+    *: "충전만"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUTTONLIGHT_BRIGHTNESS
-  desc: in settings_menu
+  id: LANG_USB_MODE_ADB
+  desc: in Settings -> General -> System -> USB Mode: Android Debug Bridge
   user: core
   <source>
-    *: none
-    buttonlight_brightness: "Button Light Brightness"
+    *: "Android Debug Bridge"
   </source>
   <dest>
-    *: none
-    buttonlight_brightness: "버튼 조명 �기"
+    *: "안드로�드 디버그 브리지"
   </dest>
   <voice>
-    *: none
-    buttonlight_brightness: "버튼 조명 �기"
+    *: "안드로�드 디버그 브리지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLISTVIEWER_SETTINGS
-  desc: title for the playlist viewer settings menus
+  id: LANG_ACTION_ENABLED
+  desc: Selective Actions
   user: core
   <source>
-    *: "Playlist Viewer Settings"
+    *: "Enabled"
   </source>
   <dest>
-    *: "재�목� 보기 설정"
+    *: "활성화"
   </dest>
   <voice>
-    *: "재�목� 보기 설정"
+    *: "활성화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BROWSE_CUESHEET
-  desc:
+  id: LANG_ACTION_PLAY
+  desc: Selective Actions
   user: core
   <source>
-    *: "Browse Cuesheet"
+    *: "Exempt Play"
   </source>
   <dest>
-    *: "� 시트 보기"
+    *: "예외 재�"
   </dest>
   <voice>
-    *: "� 시트 보기"
+    *: "�외 재�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COPYING
-  desc:
+  id: LANG_ACTION_SEEK
+  desc: Selective Actions
   user: core
   <source>
-    *: "Copying..."
+    *: "Exempt Seek"
   </source>
   <dest>
-    *: "복사하고 있습니다..."
+    *: "예외 �색"
   </dest>
   <voice>
-    *: "복사 중입니다."
+    *: "예외 �색"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_DELETING
-  desc:
+  id: LANG_ACTION_SKIP
+  desc: Selective Actions
   user: core
   <source>
-    *: "Deleting..."
+    *: "Exempt Skip"
   </source>
   <dest>
-    *: "삭제하고 있습니다..."
+    *: "예외 건너뛰기"
   </dest>
   <voice>
-    *: "삭제 중입니다."
+    *: "예외 건너뛰기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MOVING
-  desc:
+  id: LANG_BACKLIGHT_SELECTIVE
+  desc: Backlight behaviour setting
   user: core
   <source>
-    *: "Moving..."
+    *: "Backlight Exemptions"
   </source>
   <dest>
-    *: "��하고 있습니다..."
+    *: "백��트 예외"
   </dest>
   <voice>
-    *: "�� 중입니다."
+    *: "백��트 예외"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_FILETYPE
-  desc: voice settings menu
+  id: LANG_ACTION_DISABLE_EXT_POWER
+  desc: Backlight behaviour setting
   user: core
   <source>
-    *: "Say File Type"
+    *: "Disable on External Power"
   </source>
   <dest>
-    *: "�성 파� 종류"
+    *: "외부 전� 비활성화"
   </dest>
   <voice>
-    *: "�성 파� 종류"
+    *: "외부 전� 비활성화"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_PM_UNITS_PER_TICK
-  desc: spoken only, peak meter release unit
+  id: LANG_ACTION_DISABLE_UNMAPPED
+  desc: Backlight behaviour setting
+  user: core
+  <source>
+    *: "Disable Unmapped Keys"
+  </source>
+  <dest>
+    *: "매핑�지 않� 키 비활성화"
+  </dest>
+  <voice>
+    *: "매핑�지 않� 키 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_SELECTIVE
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Advanced Key Lock"
+  </source>
+  <dest>
+    *: "고급 키 잠금"
+  </dest>
+  <voice>
+    *: "고급 키 잠금"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_AUTOLOCK_ON
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Autolock On"
+  </source>
+  <dest>
+    *: "��잠금 켬"
+  </dest>
+  <voice>
+    *: "��잠금 켬"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_AUTOLOCK_OFF
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Autolock Off"
+  </source>
+  <dest>
+    *: "��잠금 �"
+  </dest>
+  <voice>
+    *: "��잠금 �"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_NOTIFY
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Disable Locked Reminders"
+  </source>
+  <dest>
+    *: "잠긴 알림 비활성화"
+  </dest>
+  <voice>
+    *: "잠긴 알림 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_DISABLE_TOUCH
+  desc: Softlock behaviour setting
+  user: core
+  <source>
+    *: "Disable Touch"
+  </source>
+  <dest>
+    *: "터치 비활성화"
+  </dest>
+  <voice>
+    *: "터치 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KIBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "KiB"
+  </source>
+  <dest>
+    *: "KiB"
+  </dest>
+  <voice>
+    *: "키비바�트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MEBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "MiB"
+  </source>
+  <dest>
+    *: "MiB"
+  </dest>
+  <voice>
+    *: "메비바�트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GIBIBYTE
+  desc: a unit postfix, also voiced
+  user: core
+  <source>
+    *: "GiB"
+  </source>
+  <dest>
+    *: "GiB"
+  </dest>
+  <voice>
+    *: "기비바�트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST
+  desc: Save only one bookmark for a playlist in recent bookmarks
+  user: core
+  <source>
+    *: "One per playlist"
+  </source>
+  <dest>
+    *: "재�목�당 하나"
+  </dest>
+  <voice>
+    *: "재�목�당 하나"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK
+  desc: Save only one bookmark for a combination (playlist,track) in recent bookmarks
+  user: core
+  <source>
+    *: "One per track"
+  </source>
+  <dest>
+    *: "트랙당 하나"
+  </dest>
+  <voice>
+    *: "트랙당 하나"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_TRACK_TO_MOVE
+  desc: playlist viewer
   user: core
   <source>
     *: ""
@@ -8969,648 +12465,1116 @@
     *: ""
   </dest>
   <voice>
+    *: "��할 트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_QUEUED
+  desc: playlist viewer
+  user: core
+  <source>
     *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "대기함"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NOT_PRESENT
-  desc: when external memory is not present
+  id: VOICE_BAD_TRACK
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "나� 트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_MOVING_TRACK
+  desc: playlist viewer
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "�� 트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEVER
+  desc: in lcd settings
+  user: core
+  <source>
+    *: "Never"
+  </source>
+  <dest>
+    *: "절대 안 함"
+  </dest>
+  <voice>
+    *: "절대 안 함"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ELAPSED
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Playlist elapsed:"
+  </source>
+  <dest>
+    *: "재�목� 경과�:"
+  </dest>
+  <voice>
+    *: "재�목� 경과�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRK_ELAPSED
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track elapsed:"
+  </source>
+  <dest>
+    *: "트랙 경과�:"
+  </dest>
+  <voice>
+    *: "트랙 경과�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_REMAINING
+  desc: deprecated
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRK_REMAINING
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track remaining:"
+  </source>
+  <dest>
+    *: "남� 트랙:"
+  </dest>
+  <voice>
+    *: "남� 트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_TRACK
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Track:"
+  </source>
+  <dest>
+    *: "트랙:"
+  </dest>
+  <voice>
+    *: "트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_STORAGE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Storage (Done / Remaining):"
+  </source>
+  <dest>
+    *: "저장용량 (완료 / 남�):"
+  </dest>
+  <voice>
+    *: "저장용량"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYTIME_DONE
+  desc: playing time screen
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "완료"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_TRACK_SIZE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Average track size:"
+  </source>
+  <dest>
+    *: "�균 트랙 �기:"
+  </dest>
+  <voice>
+    *: "�균 트랙 �기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_AVG_BITRATE
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Average bitrate:"
+  </source>
+  <dest>
+    *: "�균 비트전송률:"
+  </dest>
+  <voice>
+    *: "�균 비트 전송률"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYTIME_ERROR
+  desc: playing time screen
+  user: core
+  <source>
+    *: "Error while gathering info"
+  </source>
+  <dest>
+    *: "정보를 수집하는 중 오류 발�"
+  </dest>
+  <voice>
+    *: "정보를 수집하는 중 오류 발�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_TIME
+  desc: onplay menu
+  user: core
+  <source>
+    *: "Playing time"
+  </source>
+  <dest>
+    *: "재� 시간"
+  </dest>
+  <voice>
+    *: "재� 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CAR_ADAPTER_MODE_DELAY
+  desc: Displayed for setting car adapter mode delay
   user: core
   <source>
     *: none
-    multivolume: "Not present"
+    charging: "Delay Before Resume"
   </source>
   <dest>
     *: none
-    multivolume: "없�"
+    charging: "재시작 전 지연"
   </dest>
   <voice>
     *: none
-    multivolume: "없�"
+    charging: "재시작 전 지연"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BASS_CUTOFF
-  desc: Bass setting cut-off frequency
+  id: VOICE_PITCH_ABSOLUTE_MODE
+  desc: spoken only
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Bass Cutoff"
+    pitchscreen: ""
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "중저� 컷오프 주파수"
+    pitchscreen: ""
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "중저� 컷오프 주파수"
+    pitchscreen: "절대 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SELECTOR_START_COLOR
-  desc: line selector color option
+  id: VOICE_PITCH_SEMITONE_MODE
+  desc: spoken only
   user: core
   <source>
     *: none
-    lcd_color: "Primary Colour"
+    pitchscreen: ""
   </source>
   <dest>
     *: none
-    lcd_color: "주 색깔"
+    pitchscreen: ""
   </dest>
   <voice>
     *: none
-    lcd_color: "주 색깔"
+    pitchscreen: "반� 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_LINE_IN
-  desc: in the recording settings
+  id: VOICE_PITCH_TIMESTRETCH_MODE
+  desc: spoken only
   user: core
   <source>
     *: none
-    recording: "Line In"
+    pitchscreen: ""
   </source>
   <dest>
     *: none
-    recording: "�� �"
+    pitchscreen: ""
   </dest>
   <voice>
     *: none
-    recording: "�� �"
+    pitchscreen: "타임 스�레치"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SCANNING_DISK
-  desc: when booting up and rebuilding the cache and calculating free space
+  id: LANG_REMOTE_CONTROL
+  desc: Item for menus
   user: core
   <source>
-    *: "Scanning disk..."
+    *: "Remote Control"
   </source>
   <dest>
-    *: "디스� 검색 중..."
+    *: "리모컨"
   </dest>
   <voice>
-    *: "디스� 검색 중..."
+    *: "리모컨"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_BLANK
-  desc: keyboard
+  id: LANG_NO_REM_CONTROL
+  desc: Item for menus
   user: core
   <source>
-    *: ""
+    *: "No Rem. Control"
   </source>
   <dest>
-    *: ""
+    *: "리모컨 없�"
   </dest>
   <voice>
-    *: "비어있�"
+    *: "리모컨 없�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_CLIPCOUNTER
-  desc: in settings, for recording peak meter
+  id: LANG_OUT_OF_CONTROL
+  desc: Item for menus
   user: core
   <source>
-    *: none
-    recording: "Clip Counter"
+    *: "Out of Control"
   </source>
   <dest>
-    *: none
-    recording: "�립 카운터"
+    *: "제어 불능"
   </dest>
   <voice>
-    *: none
-    recording: "�립 카운터"
+    *: "제어 불능"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_GAIN
-  desc: Generic string for gain used in EQ menu and recording screen
+  id: LANG_2_KEY_CONTROL
+  desc: Item for menus
   user: core
   <source>
-    *: "Gain"
+    *: "2 Key Control"
   </source>
   <dest>
-    *: "게�"
+    *: "2 키 제어"
   </dest>
   <voice>
-    *: "게�"
+    *: "2 키 제어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_LEFTRIGHT
-  desc: in sound_settings
+  id: LANG_4_KEY_CONTROL
+  desc: Item for menus
   user: core
   <source>
-    *: none
-    recording: "Mono Left + Right"
+    *: "4 Key Control"
   </source>
   <dest>
-    *: none
-    recording: "모노 (좌 + 우)"
+    *: "4 키 제어"
   </dest>
   <voice>
-    *: none
-    recording: "좌 우 합한 모노"
+    *: "4 키 제어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_NO_INFO
-  desc: in tag viewer
+  id: LANG_PLAY_WORMLET
+  desc: For wormlet menu
   user: core
   <source>
-    *: "<No Info>"
+    *: "Play Wormlet!"
   </source>
   <dest>
-    *: "<정보 없�>"
+    *: "Wormlet� 플레�해보세요!"
   </dest>
   <voice>
-    *: "정보 없�"
+    *: "Wormlet� 플레�해보세요!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TOUCHPAD_SENSITIVITY
-  desc: touchpad sensitivity setting
+  id: LANG_NUMBER_OF_WORMS
+  desc: For wormlet menu
   user: core
   <source>
-    *: none
-    fiiom3k,gigabeatfx,sansafuzeplus: "Touchpad Sensitivity"
+    *: "Number of Worms"
   </source>
   <dest>
-    *: none
-    fiiom3k,gigabeatfx,sansafuzeplus: "터치패드 ��"
+    *: "벌레 수"
   </dest>
   <voice>
-    *: none
-    fiiom3k,gigabeatfx,sansafuzeplus: "터치패드 ��"
+    *: "벌레 수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME
-  desc: in pause_phones_menu.
+  id: LANG_WORM_GROWTH_PER_FOOD
+  desc: For wormlet menu
   user: core
   <source>
-    *: none
-    headphone_detection: "Disable resume on startup if phones unplugged"
+    *: "Worm Growth Per Food"
   </source>
   <dest>
-    *: none
-    headphone_detection: "�어�/헤드� 연결� �어있지않으면 시작할때 �어서 ��재�하지 않�"
+    *: "먹�별 벌레 성장"
   </dest>
   <voice>
-    *: none
-    headphone_detection: "�어�/헤드� 연결� �어있지않으면 시작할때 �어서 ��재�하지 않�"
+    *: "먹�별 벌레 성장"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_RESUME
-  desc: bookmark context menu, resume this bookmark
+  id: LANG_WORM_SPEED
+  desc: For wormlet menu
   user: core
   <source>
-    *: "Resume"
+    *: "Worm Speed"
   </source>
   <dest>
-    *: "�어서 재�"
+    *: "벌레 ��"
   </dest>
   <voice>
-    *: "�어서 재�"
+    *: "벌레 ��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TALK_BATTERY_LEVEL
-  desc: Setting for spontaneous battery level announcement
+  id: LANG_ARGHS_PER_FOOD
+  desc: For wormlet menu
   user: core
   <source>
-    *: "Announce Battery Level"
+    *: "Arghs Per Food"
   </source>
   <dest>
-    *: "배터리 레밸 표시"
+    *: "먹�별 외마디 비명"
   </dest>
   <voice>
-    *: "배터리 레밸 표시"
+    *: "먹�별 외마디 비명"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SELECTOR_COLOR_MENU
-  desc: line selector color menu title
+  id: LANG_ARGH_SIZE
+  desc: For wormlet menu
   user: core
   <source>
-    *: none
-    lcd_color: "Line Selector Colours"
+    *: "Argh Size"
   </source>
   <dest>
-    *: none
-    lcd_color: "�� 선�기 색깔"
+    *: "외마디 비명 �기"
   </dest>
   <voice>
-    *: none
-    lcd_color: "�� 선�기 색깔"
+    *: "외마디 비명 �기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_TIME
-  desc: in settings_menu
+  id: LANG_FOOD_SIZE
+  desc: For wormlet menu
   user: core
   <source>
-    *: none
-    rtc: "Set Time/Date"
+    *: "Food Size"
   </source>
   <dest>
-    *: none
-    rtc: "시간/날짜 설정"
+    *: "먹� �기"
   </dest>
   <voice>
-    *: none
-    rtc: "시간과 날짜 설정"
+    *: "먹� �기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FAST
-  desc: in settings_menu
+  id: LANG_NUMBER_OF_PLAYERS
+  desc: For game menus
   user: core
   <source>
-    *: "Fast"
+    *: "Number of Players"
   </source>
   <dest>
-    *: "빠름"
+    *: "플레�어 수"
   </dest>
   <voice>
-    *: "빠름"
+    *: "플레�어 수"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EMPTY_LIST
-  desc: spoken only, when a list dialog contains no elements
+  id: LANG_CONTROL_STYLE
+  desc: In various menus
   user: core
   <source>
-    *: ""
+    *: "Control Style"
   </source>
   <dest>
-    *: ""
+    *: "제어 스타�"
   </dest>
   <voice>
-    *: "빈 목�"
+    *: "제어 스타�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LISTACCEL_ACCEL_SPEED
-  desc: list acceleration speed
+  id: LANG_REVERT_TO_DEFAULT_SETTINGS
+  desc: In various menus
   user: core
   <source>
-    *: "List Acceleration Speed"
-    wheel_acceleration: none
+    *: "Revert to Default Settings"
   </source>
   <dest>
-    *: "목� 가� ��"
-    wheel_acceleration: none
+    *: "기본 설정으로 ��리기"
   </dest>
   <voice>
-    *: "목� 가� ��"
-    wheel_acceleration: none
+    *: "기본 설정으로 ��리기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_MENU
-  desc: bookmark selection list context menu
+  id: LANG_MENU_QUIT
+  desc: in various menus
   user: core
   <source>
-    *: "Bookmark Actions"
+    *: "Quit"
   </source>
   <dest>
-    *: "�마� 행�"
+    *: "종료"
   </dest>
   <voice>
-    *: "�마� 행�"
+    *: "종료"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_NORMAL
-  desc: in settings_menu
+  id: LANG_MENU_DISPLAY_OPTIONS
+  desc: in various menus
   user: core
   <source>
-    *: "Normal"
+    *: "Display Options"
   </source>
   <dest>
-    *: "노멀"
+    *: "화면 옵션"
   </dest>
   <voice>
-    *: "노멀"
+    *: "화면 옵션"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_AM
-  desc: spoken only, for wall clock announce
+  id: LANG_PREVTRACK
+  desc: in playback control menu
   user: core
   <source>
-    *: ""
+    *: "Previous Track"
   </source>
   <dest>
-    *: ""
+    *: "�전 트랙"
   </dest>
   <voice>
-    *: "A M"
+    *: "�전 트랙"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BUFFER_STAT
-  desc: the buffer size, %d MB %d fraction of MB
+  id: LANG_PLAYPAUSE
+  desc: in playback control menu
   user: core
   <source>
-    *: "Buffer:"
-    archosplayer: "Buf:"
+    *: "Pause / Play"
   </source>
   <dest>
-    *: "버�:"
-    archosplayer: "버�:"
+    *: "�시정지 / 재�"
   </dest>
   <voice>
-    *: "버� �기"
+    *: "�시정지 / 재�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LEFT_QS_ITEM
-  desc: used for the submenu name for the quickscreen items
+  id: LANG_STOP_PLAYBACK
+  desc: in playback control menu
   user: core
   <source>
-    *: none
-    quickscreen: "Set as Left Quickscreen Item"
+    *: "Stop Playback"
   </source>
   <dest>
-    *: none
-    quickscreen: "왼쪽 퀵스�린 아�템으로 지정"
+    *: "재� 중지"
   </dest>
   <voice>
-    *: none
-    quickscreen: "왼쪽 퀵스�린 아�템으로 지정"
+    *: "재� 중지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_SETTING
-  desc: used in the settings context menu
+  id: LANG_NEXTTRACK
+  desc: in playback control menu
   user: core
   <source>
-    *: "Reset Setting"
+    *: "Next Track"
   </source>
   <dest>
-    *: "세팅 초기화"
+    *: "다� 트랙"
   </dest>
   <voice>
-    *: "세팅 초기화"
+    *: "다� 트랙"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CHAR_SLASH
-  desc: spoken only, for spelling
+  id: LANG_CHANGE_VOLUME
+  desc: in playback control menu
   user: core
   <source>
-    *: ""
+    *: "Change Volume"
   </source>
   <dest>
-    *: ""
+    *: "볼륨 변경"
   </dest>
   <voice>
-    *: "slash"
+    *: "볼륨 변경"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HEADPHONE_UNPLUG_RESUME
-  desc: in pause_phones_menu.
+  id: LANG_CHANGE_SHUFFLE_MODE
+  desc: in playback control menu
   user: core
   <source>
-    *: none
-    headphone_detection: "Pause and Resume"
+    *: "Shuffle Mode"
   </source>
   <dest>
-    *: none
-    headphone_detection: "정지 / �어 재�"
+    *: "셔플 모드"
   </dest>
   <voice>
-    *: none
-    headphone_detection: "정지와 �어재�"
+    *: "셔플 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REC_DIR_NOT_WRITABLE
-  desc:
+  id: LANG_CHANGE_REPEAT_MODE
+  desc: in playback control menu
   user: core
   <source>
-    *: none
-    recording: "Can't write to recording directory"
+    *: "Change Repeat Mode"
   </source>
   <dest>
-    *: none
-    recording: "녹� 디렉토리� 기�할 수 없습니다."
+    *: "반복 모드 변경"
   </dest>
   <voice>
-    *: none
-    recording: "녹� 디렉토리� 기�할 수 없습니다."
+    *: "반복 모드 변경"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNEL_CONFIGURATION
-  desc: in sound_settings
+  id: LANG_PLAYBACK_CONTROL
+  desc: in playback control menu
   user: core
   <source>
-    *: "Channel Configuration"
+    *: "Playback Control"
   </source>
   <dest>
-    *: "채� 설정"
+    *: "재� 제어"
   </dest>
   <voice>
-    *: "채� 설정"
+    *: "재� 제어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CONFIRM_WITH_BUTTON
-  desc: Generic string to use to confirm
+  id: LANG_CHESSBOX_CHECKMATE
+  desc: in chessbox
   user: core
   <source>
-    *: "PLAY = Yes"
-    archosplayer: "(PLAY/STOP)"
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Yes"
-    iriverh100,iriverh120,iriverh300: "NAVI = Yes"
-    vibe500: "OK = Yes"
+    *: "Checkmate!"
+  </source>
+  <dest>
+    *: "체�메�트!"
+  </dest>
+  <voice>
+    *: "체�메�트!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_ILLEGAL_MOVE
+  desc: in chessbox
+  user: core
+  <source>
+    *: "Illegal move!"
+  </source>
+  <dest>
+    *: "불법 ��입니다!"
+  </dest>
+  <voice>
+    *: "불법 ��입니다!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_NEW_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "New Game"
+  </source>
+  <dest>
+    *: "새 게임"
+  </dest>
+  <voice>
+    *: "새 게임"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESUME_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Resume Game"
+  </source>
+  <dest>
+    *: "게임 재시작"
+  </dest>
+  <voice>
+    *: "게임 재시작"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_SAVE_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Save Game"
+  </source>
+  <dest>
+    *: "게임 저장"
+  </dest>
+  <voice>
+    *: "게임 저장"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESTORE_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Restore Game"
   </source>
   <dest>
-    *: "[재�] = 예"
-    archosplayer: "(재�/정지)"
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "[선�] = 예"
-    iriverh100,iriverh120,iriverh300: "[네비] = 예"
-    vibe500: "OK = 예"
+    *: "게임 복�"
   </dest>
   <voice>
+    *: "게임 복�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_RESTART_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Restart Game"
+  </source>
+  <dest>
+    *: "게임 재시작"
+  </dest>
+  <voice>
+    *: "게임 재시작"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_MENU_SELECT_OTHER_GAME
+  desc: in the chessbox menu
+  user: core
+  <source>
+    *: "Select Other Game"
+  </source>
+  <dest>
+    *: "다른 게임 선�"
+  </dest>
+  <voice>
+    *: "다른 게임 선�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_1
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 1: 60 moves / 5 min"
+  </source>
+  <dest>
+    *: "레벨 1: 60 �� / 5 분"
+  </dest>
+  <voice>
+    *: "레벨 1, 5 분당 60 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_2
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 2: 60 moves / 15 min"
+  </source>
+  <dest>
+    *: "레벨 2: 60 �� / 15 분"
+  </dest>
+  <voice>
+    *: "레벨 2, 15 분당 60 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_3
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 3: 60 moves / 30 min"
+  </source>
+  <dest>
+    *: "레벨 3: 60 �� / 30 분"
+  </dest>
+  <voice>
+    *: "레벨 3, 30 분당 60 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_4
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 4: 40 moves / 30 min"
+  </source>
+  <dest>
+    *: "레벨 4: 40 �� / 30 분"
+  </dest>
+  <voice>
+    *: "레벨 4, 30 분당 40 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_5
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 5: 40 moves / 60 min"
+  </source>
+  <dest>
+    *: "레벨 5: 40 �� / 60 분"
+  </dest>
+  <voice>
+    *: "레벨 5, 60 분당 40 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_6
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 6: 40 moves / 120 min"
+  </source>
+  <dest>
+    *: "레벨 6: 40 �� / 120 분"
+  </dest>
+  <voice>
+    *: "레벨 6, 120 분당 40 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_7
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 7: 40 moves / 240 min"
+  </source>
+  <dest>
+    *: "레벨 7: 40 �� / 240 분"
+  </dest>
+  <voice>
+    *: "레벨 7, 240 분당 40 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_8
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 8: 1 move / 15 min"
+  </source>
+  <dest>
+    *: "레벨 8: 1 �� / 15 분"
+  </dest>
+  <voice>
+    *: "레벨 8, 15 분당 1 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_9
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 9: 1 move / 60 min"
+  </source>
+  <dest>
+    *: "레벨 9: 1 �� / 60 분"
+  </dest>
+  <voice>
+    *: "레벨 9, 60 분당 1 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_LEVEL_10
+  desc: in the chessbox game level selection
+  user: core
+  <source>
+    *: "Level 10: 1 move / 600 min"
+  </source>
+  <dest>
+    *: "레벨 10: 1 �� / 600 분"
+  </dest>
+  <voice>
+    *: "레벨 10, 600 분당 1 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_PGN_PARSE_ERROR
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "Error parsing game !"
+  </source>
+  <dest>
+    *: "게임 분�하는 중 오류가 발�했습니다!"
+  </dest>
+  <voice>
+    *: "게임 분�하는 중 오류가 발�했습니다!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_NO_GAMES
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "No games found !"
+  </source>
+  <dest>
+    *: "게임� 찾� 수 없습니다!"
+  </dest>
+  <voice>
+    *: "게임� 찾� 수 없습니다!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAME_BEGINNING
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "At the beginning of the game"
+  </source>
+  <dest>
+    *: "게임 시작시"
+  </dest>
+  <voice>
+    *: "게임 시작시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAME_END
+  desc: in the chessbox game viewer
+  user: core
+  <source>
+    *: "At the end of the game"
+  </source>
+  <dest>
+    *: "게임� �나면"
+  </dest>
+  <voice>
+    *: "게임� �나면"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PLAYER
+  desc: spoken only, for announcing player's id
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
     *: ""
+  </dest>
+  <voice>
+    *: "플레�어"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TIME_SET_BUTTON
-  desc: used in set_time()
+  id: VOICE_GNUCHESS
+  desc: spoken only, for announcing player's id
   user: core
   <source>
-    *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
-    iriverh100,iriverh120,iriverh300: "NAVI = Set"
-    mpiohd300: "ENTER = Set"
-    rtc: "ON = Set"
-    vibe500: "OK = Set"
+    *: ""
   </source>
   <dest>
-    *: none
-    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "[선�] = 설정"
-    gogearsa9200,samsungyh*: "PLAY = 설정"
-    iriverh100,iriverh120,iriverh300: "[네비] = 설정"
-    mpiohd300: "ENTER = 설정"
-    rtc: "[켬] = 설정"
-    vibe500: "OK = 설정"
+    *: ""
   </dest>
   <voice>
-    *: none
+    *: "GNU 체스"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CANCEL_WITH_ANY
-  desc: Generic string to use to cancel
+  id: VOICE_MARKED
+  desc: spoken only, for announcing chess piece marking
   user: core
   <source>
-    *: "Any Other = No"
-    archosplayer: none
+    *: ""
   </source>
   <dest>
-    *: "다른 버튼 = 아니오"
-    archosplayer: none
+    *: ""
   </dest>
   <voice>
+    *: "표시�"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_UNMARKED
+  desc: spoken only, for announcing chess piece unmarking
+  user: core
+  <source>
     *: ""
-    archosplayer: none
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "표시�지 않�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_DEMOS
-  desc: in the main menu
+  id: VOICE_WHITE
+  desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: "Demos"
+    *: ""
   </source>
   <dest>
-    *: "�모"
+    *: ""
   </dest>
   <voice>
-    *: "�모"
+    *: "�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TAGNAVI_RANDOM
-  desc: "<Random>" entry in tag browser
+  id: VOICE_BLACK
+  desc: spoken only, for announcing chess piece color
   user: core
   <source>
-    *: "<Random>"
+    *: ""
   </source>
   <dest>
-    *: "<무작위>"
+    *: ""
   </dest>
   <voice>
-    *: "무작위"
+    *: "검정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_FILE_TALK
-  desc: Item of voice menu, whether to use file .talk clips
+  id: VOICE_CHESSBOX_CHECK
+  desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: "Use File .talk Clips"
+    *: ""
   </source>
   <dest>
-    *: ".talk Clip 파�� 사용"
+    *: ""
   </dest>
   <voice>
-    *: "talk Clip 파�� 사용"
+    *: "체�!"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOTTOM_QS_ITEM
-  desc: used for the submenu name for the quickscreen items
+  id: VOICE_CHESSBOX_CAPTURES
+  desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    quickscreen: "Set as Bottom Quickscreen Item"
+    *: ""
   </source>
   <dest>
-    *: none
-    quickscreen: "아래 퀵스�린 아�템으로 설정"
+    *: ""
   </dest>
   <voice>
-    *: none
-    quickscreen: "아래 퀵스�린 아�템으로 설정"
+    *: "�로"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SELECTOR_TEXT_COLOR
-  desc: line selector text color option
+  id: VOICE_CHESSBOX_CASTLE
+  desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: none
-    lcd_color: "Text Colour"
+    *: ""
   </source>
   <dest>
-    *: none
-    lcd_color: "문� 색깔"
+    *: ""
   </dest>
   <voice>
-    *: none
-    lcd_color: "문� 색깔"
+    *: "성"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_THEME_MENU
-  desc: in the settings menu
+  id: VOICE_CHESSBOX_KINGSIDE
+  desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: "Theme Settings"
+    *: ""
   </source>
   <dest>
-    *: "테마 설정"
+    *: ""
   </dest>
   <voice>
-    *: "테마 설정"
+    *: "킹 사�드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ALL
-  desc: generic string used both in dir file filter and repeat mode selection
+  id: VOICE_CHESSBOX_QUEENSIDE
+  desc: spoken only, for announcing chess moves
   user: core
   <source>
-    *: "All"
+    *: ""
   </source>
   <dest>
-    *: "모�"
+    *: ""
   </dest>
   <voice>
-    *: "모�"
+    *: "퀸 사�드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ACCESSORY_SUPPLY
-  desc: in system settings menu
+  id: VOICE_PAWN
+  desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    accessory_supply: "Accessory Power Supply"
+    *: ""
   </source>
   <dest>
-    *: none
-    accessory_supply: "악세서리 전� 공급"
+    *: ""
   </dest>
   <voice>
-    *: none
-    accessory_supply: "악세서리 전� 공급"
+    *: "�(보병)"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_OH
-  desc: spoken only, for wall clock announce
+  id: VOICE_KNIGHT
+  desc: spoken only, for announcing chess piece names
   user: core
   <source>
     *: ""
@@ -9619,43 +13583,68 @@
     *: ""
   </dest>
   <voice>
+    *: "나�트(기사)"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BISHOP
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
     *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "비�(주�)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ADD_TO_FAVES
-  desc:
+  id: VOICE_ROOK
+  desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: "Add to Shortcuts"
+    *: ""
   </source>
   <dest>
-    *: "�겨찾기� 추가"
+    *: ""
   </dest>
   <voice>
-    *: "�겨찾기� 추가"
+    *: "룩(성)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PRESET
-  desc: in button bar and radio screen / menu
+  id: VOICE_QUEEN
+  desc: spoken only, for announcing chess piece names
   user: core
   <source>
-    *: none
-    radio: "Preset"
+    *: ""
   </source>
   <dest>
-    *: none
-    radio: "프리셋"
+    *: ""
   </dest>
   <voice>
-    *: none
-    radio: "프리셋"
+    *: "퀸(여왕)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_GAMES
-  desc: in the main menu
+  id: VOICE_KING
+  desc: spoken only, for announcing chess piece names
+  user: core
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "킹(왕)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHESSBOX_GAMES
+  desc: in chessbox
   user: core
   <source>
     *: "Games"
@@ -9664,74 +13653,68 @@
     *: "게임"
   </dest>
   <voice>
-    *: "게임"
+    *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_END_PLAYLIST
-  desc: when playlist has finished
+  id: LANG_CHESSBOX_SAVING_POSITION
+  desc: in chessbox
   user: core
   <source>
-    *: "End of Song List"
-    archosplayer: "End of List"
+    *: "Saving position"
   </source>
   <dest>
-    *: "노래 목�� 마지막"
-    archosplayer: "목�� 마지막"
+    *: "위치 저장"
   </dest>
   <voice>
-    *: "노래 목�� 마지막"
-    archosplayer: "목�� 마지막"
+    *: "위치 저장"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_GAIN
-  desc: in the equalizer settings menu
+  id: LANG_CHESSBOX_LOADING_POSITION
+  desc: in chessbox
   user: core
   <source>
-    *: "Gain"
+    *: "Loading position"
   </source>
   <dest>
-    *: "게�"
+    *: "위치 로드"
   </dest>
   <voice>
-    *: "게�"
+    *: "위치 로드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CLEAR_REC_DIR
-  desc:
+  id: LANG_CHESSBOX_THINKING
+  desc: in chessbox
   user: core
   <source>
-    *: none
-    recording: "Clear Recording Directory"
+    *: "Thinking..."
   </source>
   <dest>
-    *: none
-    recording: "녹� 디렉토리 비우기"
+    *: "��하는 중..."
   </dest>
   <voice>
-    *: none
-    recording: "녹� 디렉토리 비우기"
+    *: "��하는 중"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYLOCK_OFF
-  desc: displayed when key lock is turned off
+  id: VOICE_BATTERY_BENCH_IS_ALREADY_RUNNING
+  desc: Spoken if battery bench is already running
   user: core
   <source>
-    *: "Buttons Unlocked"
+    *: ""
   </source>
   <dest>
-    *: "버튼 잠김 해제"
+    *: ""
   </dest>
   <voice>
-    *: ""
+    *: "배터리 벤치가 �미 실행 중"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_PM
-  desc: spoken only, for wall clock announce
+  id: VOICE_BAT_BENCH_KEYS
+  desc: Battery bench start up message
   user: core
   <source>
     *: ""
@@ -9740,561 +13723,1680 @@
     *: ""
   </dest>
   <voice>
-    *: "P M"
+    *: "재� 버튼� 눌러 배터리 벤치를 실행하거나 중지하여 취소"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_STOP_RECORDING_AND_SHUTDOWN
-  desc: in record timesplit options
+  id: LANG_CANNOT_RESTART_PLAYBACK
+  desc: cannot restart playback splash in imageviewer
+  user: core
+  <source>
+    *: "Cannot restart playback"
+  </source>
+  <dest>
+    *: "재�� 다시 시작할 수 없�"
+  </dest>
+  <voice>
+    *: "재�� 다시 시작할 수 없�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ORDERED
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Ordered"
+  </source>
+  <dest>
+    *: "지시함"
+  </dest>
+  <voice>
+    *: "지시함"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIFFUSION
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Diffusion"
+  </source>
+  <dest>
+    *: "확산"
+  </dest>
+  <voice>
+    *: "확산"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GRAYSCALE
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Grayscale"
+  </source>
+  <dest>
+    *: "그레�스케�"
+  </dest>
+  <voice>
+    *: "그레�스케�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLIDESHOW_MODE
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Toggle Slideshow Mode"
+  </source>
+  <dest>
+    *: "슬��드쇼 모드 전환"
+  </dest>
+  <voice>
+    *: "슬��드 쇼 모드 전환"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLIDESHOW_TIME
+  desc: in the imageviewer settings menu
+  user: core
+  <source>
+    *: "Slideshow Time"
+  </source>
+  <dest>
+    *: "슬��드쇼 시간"
+  </dest>
+  <voice>
+    *: "슬��드 쇼 시간"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RETURN
+  desc: in various plugin menus
+  user: core
+  <source>
+    *: "Return"
+  </source>
+  <dest>
+    *: "��아가기"
+  </dest>
+  <voice>
+    *: "��아가기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REC_DIR
+  desc: used in the info screen to show a recording dir
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Recording Directory"
   </source>
   <dest>
     *: none
-    recording: "녹� 멈추고 �기"
+    recording: "녹� 디렉토리"
   </dest>
   <voice>
     *: none
-    recording: "녹� 멈추고 �기"
+    recording: "녹� 디렉토리"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_MODE
-  desc: in wps F2 pressed
+  id: LANG_CHESSBOX_MENU_VIEW_GAMES
+  desc: in the chessbox menu
   user: core
   <source>
-    *: "Mode:"
+    *: "View Played Games"
   </source>
   <dest>
-    *: "모드:"
+    *: "�겼� 게임 보기"
+  </dest>
+  <voice>
+    *: "�겼� 게임 보기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_AUDIO_OPTIONS
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Audio Options"
+    lowmem: none
+  </source>
+  <dest>
+    *: "오디오 옵션"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "오디오 옵션"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_RESUME_OPTIONS
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Resume Options"
+    lowmem: none
+  </source>
+  <dest>
+    *: "옵션 재시작"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "옵션 재시작"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MENU_PLAY_MODE
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Play Mode"
+    lowmem: none
+  </source>
+  <dest>
+    *: "재� 모드"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "재� 모드"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SINGLE
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Single"
+    lowmem: none
+  </source>
+  <dest>
+    *: "싱글"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "싱글"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_SOUND_SETTING
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Use sound setting"
+    lowmem: none
+  </source>
+  <dest>
+    *: "사운드 설정 사용"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "사운드 설정 사용"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESTART_PLAYBACK
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Play from beginning"
+    lowmem: none
+  </source>
+  <dest>
+    *: "처�부터 재�"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "처�부터 재�"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_RESUME_TIME
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Set resume time (min)"
+    lowmem: none
+  </source>
+  <dest>
+    *: "재시작 시간 설정 (분)"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "재시작 시간 설정"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DISPLAY_FPS
+  desc: in the mpegplayer and pictureflow settings menus
+  user: core
+  <source>
+    *: "Display FPS"
+  </source>
+  <dest>
+    *: "FPS 보기"
+  </dest>
+  <voice>
+    *: "FPS 보기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIMIT_FPS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Limit FPS"
+    lowmem: none
+  </source>
+  <dest>
+    *: "FPS 제한"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "FPS 제한"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_FRAMES
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Skip frames"
+    lowmem: none
+  </source>
+  <dest>
+    *: "프레임 건너뛰기"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "프레임 건너뛰기"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_BRIGHTNESS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Backlight brightness"
+    lowmem: none
+  </source>
+  <dest>
+    *: "백��트 �기"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "백��트 �기"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_COMMON_SETTING
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Use common setting"
+    lowmem: none
+  </source>
+  <dest>
+    *: "공통 설정 사용"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "공통 설정 사용"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TONE_CONTROLS
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Tone controls"
+    lowmem: none
+  </source>
+  <dest>
+    *: "톤 제어"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "톤 제어"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FORCE_START_MENU
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Start menu"
+    lowmem: none
+  </source>
+  <dest>
+    *: "시작 메뉴"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "시작 메뉴"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONDITIONAL_START_MENU
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Start menu if not completed"
+    lowmem: none
+  </source>
+  <dest>
+    *: "완료�지 않� 경우 시작 메뉴"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "완료�지 않� 경우 시작 메뉴"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTO_RESUME
+  desc: in mpegplayer menus
+  user: core
+  <source>
+    *: "Resume automatically"
+    lowmem: none
+  </source>
+  <dest>
+    *: "��으로 재시작"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "��으로 재시작"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL_RESUMES
+  desc: in the mpegplayer settings menu
+  user: core
+  <source>
+    *: "Clear all resumes"
+    lowmem: none
+  </source>
+  <dest>
+    *: "모든 �력 지우기"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "모든 �력 지우기"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UNAVAILABLE
+  desc: in mpegplayer settings
+  user: core
+  <source>
+    *: "Unavailable"
+    lowmem: none
+  </source>
+  <dest>
+    *: "사용할 수 없�"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "사용할 수 없�"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOGGLE_ITEM
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Toggle Item"
+  </source>
+  <dest>
+    *: "전환 항목"
+  </dest>
+  <voice>
+    *: "전환 항목"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOVE_ITEM_UP
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Move Item Up"
+  </source>
+  <dest>
+    *: "항목� 위로 ��"
+  </dest>
+  <voice>
+    *: "항목� 위로 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MOVE_ITEM_DOWN
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Move Item Down"
+  </source>
+  <dest>
+    *: "항목� 아래로 ��"
+  </dest>
+  <voice>
+    *: "항목� 아래로 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LOAD_DEFAULT_CONFIGURATION
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Load Default Configuration"
+  </source>
+  <dest>
+    *: "기본 구성 로드"
+  </dest>
+  <voice>
+    *: "기본 구성 로드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_EXIT
+  desc: in main_menu_config
+  user: core
+  <source>
+    *: "Save and Exit"
+  </source>
+  <dest>
+    *: "저장 � 종료"
+  </dest>
+  <voice>
+    *: "저장 � 종료"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_MENU_ORDER
+  desc: main_menu_config plugin title
+  user: core
+  <source>
+    *: "Rockbox Main Menu Order"
+  </source>
+  <dest>
+    *: "�박스 메� 메뉴 순서"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_TIMESPLIT_REC
-  desc: Display of record timer interval setting, on the record screen
+  id: LANG_PROPERTIES_PATH
+  desc: in properties plugin
   user: core
   <source>
-    *: none
-    recording: "Split Time:"
+    *: "[Path]"
   </source>
   <dest>
-    *: none
-    recording: "분리 시간:"
+    *: "[경로]"
   </dest>
   <voice>
-    *: none
-    recording: ""
+    *: "경로"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MIN_DURATION
-  desc: in recording settings_menu
+  id: LANG_PROPERTIES_FILENAME
+  desc: in properties plugin
   user: core
   <source>
-    *: none
-    recording: "for at least"
+    *: "[Filename]"
   </source>
   <dest>
-    *: none
-    recording: "최소한"
+    *: "[파��름]"
   </dest>
   <voice>
-    *: none
-    recording: "최소한"
+    *: "파��름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CHANNELS
-  desc: in sound_settings
+  id: LANG_PROPERTIES_SIZE
+  desc: in properties plugin
   user: core
   <source>
-    *: "Channels"
+    *: "[Size]"
   </source>
   <dest>
-    *: "채�"
+    *: "[�기]"
   </dest>
   <voice>
-    *: "채�"
+    *: "�기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ASK
-  desc: in settings_menu
+  id: LANG_PROPERTIES_DATE
+  desc: in properties plugin
   user: core
   <source>
-    *: "Ask"
+    *: "[Date]"
   </source>
   <dest>
-    *: "묻기"
+    *: "[날짜]"
   </dest>
   <voice>
-    *: "묻기"
+    *: "날짜"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_MODE
-  desc: in wps F2 pressed and radio screen
+  id: LANG_PROPERTIES_TIME
+  desc: in properties plugin
   user: core
   <source>
-    *: "Mode:"
+    *: "[Time]"
   </source>
   <dest>
-    *: "모드:"
+    *: "[시간]"
   </dest>
   <voice>
-    *: "모드:"
+    *: "시간"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH_DOWN_SEMITONE
-  desc: in wps
+  id: LANG_PROPERTIES_SUBDIRS
+  desc: in properties plugin
   user: core
   <source>
-    *: none
-    pitchscreen: "Semitone Down"
+    *: "[Subdirs]"
   </source>
   <dest>
-    *: none
-    pitchscreen: "반�으로 내리기"
+    *: "[하위 디렉토리]"
   </dest>
   <voice>
-    *: none
-    pitchscreen: ""
+    *: "하위 디렉토리"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SAVE_SOUND
-  desc: save a sound config file
+  id: LANG_PROPERTIES_FILES
+  desc: in properties plugin
   user: core
   <source>
-    *: "Save Sound Settings"
+    *: "[Files]"
   </source>
   <dest>
-    *: "소리 설정 저장"
+    *: "[파�]"
   </dest>
   <voice>
-    *: "소리 설정 저장"
+    *: "파�"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EDIT
-  desc: keyboard
+  id: LANG_PROPERTIES_DIRECTORY_PROPERTIES
+  desc: in properties plugin
   user: core
   <source>
+    *: "Directory properties"
+  </source>
+  <dest>
+    *: "디렉토리 �성"
+  </dest>
+  <voice>
     *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FILE_PROPERTIES
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "File properties"
   </source>
   <dest>
+    *: "파� �성"
+  </dest>
+  <voice>
     *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PROPERTIES_FAIL
+  desc: in properties plugin
+  user: core
+  <source>
+    *: "Failed to gather information"
+  </source>
+  <dest>
+    *: "정보수집 실패함"
   </dest>
   <voice>
-    *: "편집"
+    *: "정보수집 실패함"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HEADPHONE_UNPLUG
-  desc: in settings_menu.
+  id: LANG_SWAP_CHANNELS
+  desc: in sound_settings
   user: core
   <source>
-    *: none
-    headphone_detection: "Pause on Headphone Unplug"
+    *: "Swap Channels"
   </source>
   <dest>
-    *: none
-    headphone_detection: "�어�/헤드� 연결시 정지"
+    *: "채� �환"
   </dest>
   <voice>
-    *: none
-    headphone_detection: "�어��나 헤드� 연결시 정지"
+    *: "채� �환"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_GROUPING
-  desc: in tag viewer
+  id: LANG_PANNING_SEPARATION
+  desc: in mikmod settings menu
   user: core
   <source>
-    *: "Work"
+    *: "Panning Separation"
+    lowmem: none
   </source>
   <dest>
-    *: "ìž‘ì—…"
+    *: "패� 분리"
+    lowmem: none
   </dest>
   <voice>
-    *: "ìž‘ì—…"
+    *: "패� 분리"
+    lowmem: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RIGHT_QS_ITEM
-  desc: used for the submenu name for the quickscreen items
+  id: LANG_REVERBERATION
+  desc: in mikmod settings menu
   user: core
   <source>
-    *: none
-    quickscreen: "Set as Right Quickscreen Item"
+    *: "Reverberation"
+    lowmem: none
   </source>
   <dest>
-    *: none
-    quickscreen: "오른쪽 퀵스�린 아�템으로 지정"
+    *: "잔향"
+    lowmem: none
   </dest>
   <voice>
-    *: none
-    quickscreen: "오른쪽 퀵스�린 아�템으로 지정"
+    *: "잔향"
+    lowmem: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VERY_SLOW
-  desc: in settings_menu
+  id: LANG_INTERPOLATION
+  desc: in mikmod settings menu
   user: core
   <source>
-    *: "Very slow"
+    *: "Interpolation"
+    lowmem: none
   </source>
   <dest>
-    *: "매우 �림"
+    *: "ë³´ê°„"
+    lowmem: none
   </dest>
   <voice>
-    *: "매우 �림"
+    *: "ë³´ê°„"
+    lowmem: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYCLICK
-  desc: in keyclick settings menu
+  id: LANG_MIKMOD_SURROUND
+  desc: in mikmod settings menu
   user: core
   <source>
-    *: "Keyclick"
+    *: "Surround"
+    lowmem: none
   </source>
   <dest>
-    *: "키�릭"
+    *: "서�운드"
+    lowmem: none
   </dest>
   <voice>
-    *: "키�릭"
+    *: "서�운드"
+    lowmem: none
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PM_CLIPCOUNT
-  desc: in recording GUI, for recording peak meter. MAX 5 characters!
+  id: LANG_MIKMOD_HQMIXER
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "HQ Mixer"
+    lowmem: none
+  </source>
+  <dest>
+    *: "고품질 믹서"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "고품질 믹서"
+    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: LANG_CPU_BOOST
+  desc: in mikmod settings menu
+  user: core
+  <source>
+    *: "CPU Boost"
+    lowmem: none
+  </source>
+  <dest>
+    *: "CPU 부스트"
+    lowmem: none
+  </dest>
+  <voice>
+    *: "CPU 부스트"
+    lowmem: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPACING
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Spacing"
+  </source>
+  <dest>
+    *: "간격"
+  </dest>
+  <voice>
+    *: "간격"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CENTRE_MARGIN
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Centre margin"
+  </source>
+  <dest>
+    *: "중앙 여백"
+  </dest>
+  <voice>
+    *: "중앙 여백"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NUMBER_OF_SLIDES
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Number of slides"
+  </source>
+  <dest>
+    *: "슬��드 수"
+  </dest>
+  <voice>
+    *: "슬��드 수"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ZOOM
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Zoom"
+  </source>
+  <dest>
+    *: "확대/축소"
+  </dest>
+  <voice>
+    *: "확대 � 축소"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALBUM_TITLE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Show album title"
+  </source>
+  <dest>
+    *: "앨범 제목 표시"
+  </dest>
+  <voice>
+    *: "앨범 제목 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESIZE_COVERS
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Resize Covers"
+  </source>
+  <dest>
+    *: "표지 �기 조정"
+  </dest>
+  <voice>
+    *: "표지 �기 조정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REBUILD_CACHE
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Rebuild cache"
+  </source>
+  <dest>
+    *: "�시 리빌드"
+  </dest>
+  <voice>
+    *: "�시 리빌드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WPS_INTEGRATION
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "WPS Integration"
+  </source>
+  <dest>
+    *: "WPS 통합"
+  </dest>
+  <voice>
+    *: "WPS 통합"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GOTO_WPS
+  desc: in the pictureflow main menu
+  user: core
+  <source>
+    *: "Go to WPS"
+  </source>
+  <dest>
+    *: "WPS로 ��"
+  </dest>
+  <voice>
+    *: "WPS로 ��"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Hide album title"
+  </source>
+  <dest>
+    *: "앨범 제목 숨기기"
+  </dest>
+  <voice>
+    *: "앨범 제목 숨기기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show at the bottom"
+  </source>
+  <dest>
+    *: "하단� 표시"
+  </dest>
+  <voice>
+    *: "하단� 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show at the top"
+  </source>
+  <dest>
+    *: "�단� 표시"
+  </dest>
+  <voice>
+    *: "�단� 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIRECT
+  desc: in the pictureflow settings, also a volume adjustment mode
+  user: core
+  <source>
+    *: "Direct"
+  </source>
+  <dest>
+    *: "�접"
+  </dest>
+  <voice>
+    *: "�접"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIA_TRACK_LIST
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Via Track list"
+  </source>
+  <dest>
+    *: "트랙 목�� 통해"
+  </dest>
+  <voice>
+    *: "트랙 목�� 통해"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALWAYS_ON
+  desc: in the pictureflow settings menu
+  user: core
+  <source>
+    *: "Always On"
+  </source>
+  <dest>
+    *: "항� 켜져 있�"
+  </dest>
+  <voice>
+    *: "항� 켜져 있�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NO_ALBUMART_FOUND
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "No album art found"
+  </source>
+  <dest>
+    *: "앨범 아트를 찾� 수 없�"
+  </dest>
+  <voice>
+    *: "앨범 아트를 찾� 수 없�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CACHE_REBUILT_NEXT_RESTART
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "Cache will be rebuilt on next restart"
+  </source>
+  <dest>
+    *: "다�� 다시 시작할 때 �시가 다시 작성�"
+  </dest>
+  <voice>
+    *: "다�� 다시 시작할 때 �시가 다시 작성�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ERROR_WRITING_CONFIG
+  desc: in the pictureflow splash messages
+  user: core
+  <source>
+    *: "Error writing config"
+  </source>
+  <dest>
+    *: "구성� 쓰는 중 오류 발�"
+  </dest>
+  <voice>
+    *: "구성� 쓰는 중 오류 발�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NOT_A_VBR_FILE
+  desc: in vbrfix plugin
+  user: core
+  <source>
+    *: "Not a VBR file"
+  </source>
+  <dest>
+    *: "VBR 파�� 아님"
+  </dest>
+  <voice>
+    *: "VBR 파�� 아님"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILE_ERROR
+  desc: in vbrfix plugin
+  user: core
+  <source>
+    *: "File error: %d"
+  </source>
+  <dest>
+    *: "파� 오류: %d"
+  </dest>
+  <voice>
+    *: "파� 오류"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UPDATE_CACHE
+  desc: in pictureflow
+  user: core
+  <source>
+    *: "Update cache"
+  </source>
+  <dest>
+    *: "업��트 �시"
+  </dest>
+  <voice>
+    *: "업��트 �시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIDE_ALBUM_TITLE_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Hide information"
+  </source>
+  <dest>
+    *: "정보 숨기기"
+  </dest>
+  <voice>
+    *: "정보 숨기기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_BOTTOM_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album at the bottom"
+  </source>
+  <dest>
+    *: "하단� 앨범 표시"
+  </dest>
+  <voice>
+    *: "하단� 앨범 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_AT_THE_TOP_NEW
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album at the top"
+  </source>
+  <dest>
+    *: "�단� 앨범 표시"
+  </dest>
+  <voice>
+    *: "�단� 앨범 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALL_AT_THE_TOP
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album and artist at the top"
+  </source>
+  <dest>
+    *: "앨범 � 아티스트를 �단� 표시"
+  </dest>
+  <voice>
+    *: "앨범 � 아티스트를 �단� 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALL_AT_THE_BOTTOM
+  desc: in the pictureflow settings
+  user: core
+  <source>
+    *: "Show album and artist at the bottom"
+  </source>
+  <dest>
+    *: "앨범 � 아티스트를 하단� 표시"
+  </dest>
+  <voice>
+    *: "앨범 � 아티스트를 하단� 표시"
+  </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>
+    *: "취소하려면 왼쪽 버튼� 누르세요."
+    android,hifietma*,zenvision: "취소하려면 뒤로가기 버튼� 누르세요."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "취소하려면 전� 버튼� 누르세요."
+    ihifi760,ihifi960: "취소하려면 리턴 버튼� � 번 탭하세요."
+    ihifi770,ihifi770c,ihifi800: "취소하려면 홈 버튼� 누르세요."
+    iriverh10,samsungyh*: "취소하려면 왼쪽 버튼� � 번 탭하세요."
+    mpiohd200: "취소하려면 녹화 버튼� � 번 탭하세요."
+    mpiohd300: "취소하려면 메뉴 버튼� � 번 탭하세요."
+    rx27generic: "취소하려면 볼륨 버튼� 누르세요."
+    sonynwza860: "키맵� 불완전합니다."
+    touchscreen: "취소하려면 왼쪽 가운� 버튼� 누르세요."
+    vibe500: "취소하려면 �전 버튼� 누르세요."
+    xduoox20,xduoox3,xduoox3ii: "취소하려면 홈 버튼� � 번 탭하세요."
+  </dest>
+  <voice>
+    *: "취소하려면 왼쪽 버튼� 누르세요."
+    android,hifietma*,zenvision: "취소하려면 뒤로가기 버튼� 누르세요."
+    cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "취소하려면 전� 버튼� 누르세요."
+    ihifi760,ihifi960: "취소하려면 리턴 버튼� � 번 탭하세요."
+    ihifi770,ihifi770c,ihifi800: "취소하려면 홈 버튼� 누르세요."
+    iriverh10,samsungyh*: "취소하려면 왼쪽 버튼� � 번 탭하세요."
+    mpiohd200: "취소하려면 녹화 버튼� � 번 탭하세요."
+    mpiohd300: "취소하려면 메뉴 버튼� � 번 탭하세요."
+    rx27generic: "취소하려면 볼륨 버튼� 누르세요."
+    touchscreen: "취소하려면 왼쪽 가운� 버튼� 누르세요."
+    vibe500: "취소하려면 �전 버튼� 누르세요."
+    xduoox20,xduoox3,xduoox3ii: "취소하려면 홈 버튼� � 번 탭하세요."
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DATE
+  desc: for constructing time and date announcements
+  user: core
+  <source>
+    *: "Date"
+  </source>
+  <dest>
+    *: "날짜"
+  </dest>
+  <voice>
+    *: "날짜"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_ALL
+  desc:
+  user: core
+  <source>
+    *: "Clear all"
+  </source>
+  <dest>
+    *: "모� 지우기"
+  </dest>
+  <voice>
+    *: "모� 지우기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CANCEL_0
+  desc: CANCEL.
+  user: core
+  <source>
+    *: "Cancel"
+  </source>
+  <dest>
+    *: "취소"
+  </dest>
+  <voice>
+    *: "취소"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE
+  desc:
+  user: core
+  <source>
+    *: "Save"
+  </source>
+  <dest>
+    *: "저장"
+  </dest>
+  <voice>
+    *: "저장"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TIMEOUT
+  desc:
+  user: core
+  <source>
+    *: "Timeout"
+  </source>
+  <dest>
+    *: "시간 초과"
+  </dest>
+  <voice>
+    *: "시간 초과"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK
+  desc: used in track x of y constructs
+  user: core
+  <source>
+    *: "Track"
+  </source>
+  <dest>
+    *: "트랙"
+  </dest>
+  <voice>
+    *: "트랙"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ELAPSED
+  desc: prefix for elapsed playtime announcement
+  user: core
+  <source>
+    *: "Elapsed"
+  </source>
+  <dest>
+    *: "경과�"
+  </dest>
+  <voice>
+    *: "경과�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ANNOUNCEMENT_FMT
+  desc: format for wps hotkey announcement
   user: core
   <source>
     *: none
-    recording: "CLIP:"
+    hotkey: "Announcement format"
   </source>
   <dest>
     *: none
-    recording: "�립:"
+    hotkey: "발매 형�"
   </dest>
   <voice>
     *: none
-    recording: ""
+    hotkey: "발매 형�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_GAIN_RIGHT
-  desc: in the recording screen
+  id: LANG_REMAIN
+  desc: for constructs such as number of tracks remaining etc
   user: core
   <source>
     *: none
-    recording: "Gain R"
+    hotkey: "Remain"
   </source>
   <dest>
     *: none
-    recording: "게� R"
+    hotkey: "남�"
   </dest>
   <voice>
     *: none
-    recording: "오른쪽 게�"
+    hotkey: "남�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_FILENAME
-  desc: Filename header in recording screen
+  id: LANG_GROUPING
+  desc:
   user: core
   <source>
     *: none
-    recording: "Filename:"
+    hotkey: "Grouping"
   </source>
   <dest>
     *: none
-    recording: "파�명:"
+    hotkey: "그룹화"
   </dest>
   <voice>
     *: none
-    recording: ""
+    hotkey: "그룹화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HEADPHONE_UNPLUG_RW
-  desc: in pause_phones_menu.
+  id: LANG_ANNOUNCE_ON
+  desc:
   user: core
   <source>
     *: none
-    headphone_detection: "Duration to Rewind"
+    hotkey: "Announce on"
   </source>
   <dest>
     *: none
-    headphone_detection: "��기 시간"
+    hotkey: "발매�"
   </dest>
   <voice>
     *: none
-    headphone_detection: "��기 시간"
+    hotkey: "발매�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PITCH_UP_SEMITONE
-  desc: in wps
+  id: LANG_TRACK_CHANGE
+  desc:
   user: core
   <source>
     *: none
-    pitchscreen: "Semitone Up"
+    hotkey: "Track change"
   </source>
   <dest>
     *: none
-    pitchscreen: "반� 올림"
+    hotkey: "트랙 변경"
   </dest>
   <voice>
     *: none
-    pitchscreen: ""
+    hotkey: "트랙 변경"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_BOOKMARK_SELECT_INDEX_TEXT
-  desc: voice only, used in the bookmark list to label index number
+  id: LANG_HOLD_FOR_SETTINGS
+  desc:
   user: core
   <source>
-    *: ""
+    *: none
+    hotkey: "Hold for settings"
   </source>
   <dest>
-    *: ""
+    *: none
+    hotkey: "설정� 위해 유지"
   </dest>
   <voice>
-    *: "��스"
+    *: none
+    hotkey: "설정� 위해 유지"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SLOW
-  desc: in settings_menu
+  id: LANG_OPEN_PLUGIN
+  desc: onplay open plugin
   user: core
   <source>
-    *: "Slow"
+    *: "Open Plugin"
   </source>
   <dest>
-    *: "�리게"
+    *: "플러그� 열기"
   </dest>
   <voice>
-    *: "�리게"
+    *: "플러그� 열기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR_GRADIENT
-  desc: in settings_menu
+  id: LANG_OPEN_PLUGIN_NOT_A_PLUGIN
+  desc: open plugin module
   user: core
   <source>
-    *: none
-    lcd_color: "Bar (Gradient Colour)"
+    *: "Not a plugin: %s"
   </source>
   <dest>
-    *: none
-    lcd_color: "바 (그�디언트 색깔)"
+    *: "플러그� 아님: %s"
   </dest>
   <voice>
-    *: none
-    lcd_color: "바 (그�디언트 색깔)"
+    *: "플러그� 아닙"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_GAIN_LEFT
-  desc: in the recording screen
+  id: LANG_OPEN_PLUGIN_SET_WPS_CONTEXT_PLUGIN
+  desc: open plugin module
   user: core
   <source>
-    *: none
-    recording: "Gain L"
+    *: "Set Wps Context Plugin"
   </source>
   <dest>
-    *: none
-    recording: "게� L"
+    *: "Wps 컨�스트 플러그� 설정"
   </dest>
   <voice>
-    *: none
-    recording: "왼쪽 게�"
+    *: "Wps 컨�스트 플러그� 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_ID3_DISCNUM
-  desc: in tag viewer
+  id: LANG_PARAMETER
+  desc:
   user: core
   <source>
-    *: "Discnum"
+    *: "Parameter"
   </source>
   <dest>
-    *: "디스� 번호"
+    *: "매개변수"
   </dest>
   <voice>
-    *: "디스� 번호"
+    *: "매개변수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SHOW_FILENAME_EXT
-  desc: in settings_menu
+  id: LANG_NAME
+  desc:
   user: core
   <source>
-    *: "Show Filename Extensions"
+    *: "Name"
   </source>
   <dest>
-    *: "파� 확장� 표시"
+    *: "�름"
   </dest>
   <voice>
-    *: "파� 확장� 표시"
+    *: "�름e"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_QUICKSCREEN
-  desc: spoken only, Announces entering the "quick screen"
+  id: LANG_ADD
+  desc:
   user: core
   <source>
-    *: ""
+    *: "Add"
   </source>
   <dest>
-    *: ""
+    *: "추가"
   </dest>
   <voice>
-    *: "퀵스�린"
+    *: "추가"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VERY_FAST
-  desc: in settings_menu
+  id: LANG_BACK
+  desc:
   user: core
   <source>
-    *: "Very fast"
+    *: "Back"
   </source>
   <dest>
-    *: "매우 빠름"
+    *: "뒤로가기"
   </dest>
   <voice>
-    *: "매우 빠름"
+    *: "뒤로가기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_INVERT_CURSOR_COLOR
-  desc: in settings_menu
+  id: LANG_EDIT
+  desc:
   user: core
   <source>
-    *: none
-    lcd_color: "Bar (Solid Colour)"
+    *: "Edit"
   </source>
   <dest>
-    *: none
-    lcd_color: "바 (고정 색깔)"
+    *: "편집"
   </dest>
   <voice>
-    *: none
-    lcd_color: "바 (고정 색깔)"
+    *: "편집"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_DONT_RESUME
-  desc: top item in the list when asking user about bookmark auto load
+  id: LANG_RUN
+  desc:
   user: core
   <source>
-    *: "<Don't Resume>"
+    *: "Run"
   </source>
   <dest>
-    *: "<�어서 재�하지 않�>"
+    *: "실행"
   </dest>
   <voice>
-    *: "�어서 재�하지 않�"
+    *: "실행"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_CONTEXT_DELETE
-  desc: bookmark context menu, delete this bookmark
+  id: LANG_EXPORT
+  desc:
   user: core
   <source>
-    *: "Delete"
+    *: "Export"
   </source>
   <dest>
-    *: "지우기"
+    *: "내보내기"
   </dest>
   <voice>
-    *: "지우기"
+    *: "내보내기"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_OCLOCK
-  desc: spoken only, for wall clock announce
+  id: LANG_BROWSE
+  desc:
   user: core
   <source>
-    *: ""
+    *: "Browse"
   </source>
   <dest>
-    *: ""
+    *: "찾아보기"
   </dest>
   <voice>
-    *: ""
+    *: "찾아보기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SELECT_BOOKMARK
-  desc: bookmark selection list title
+  id: LANG_ENTER_USB_STORAGE_MODE_QUERY
+  desc: upon plugging in USB
   user: core
   <source>
-    *: "Select Bookmark"
+    *: "Enter USB mass storage mode?"
   </source>
   <dest>
-    *: "�마� 선�"
+    *: "USB 대용량 저장 모드로 진입할까요?"
   </dest>
   <voice>
-    *: "�마� 선�"
+    *: "USB 대용량 저장 모드로 진입할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLUGIN_APPS
-  desc: in the main menu
+  id: LANG_QUEUE_MENU
+  desc: in onplay menu
   user: core
   <source>
-    *: "Applications"
+    *: "Queue..."
   </source>
   <dest>
-    *: "어플리케�션"
+    *: "대기열..."
   </dest>
   <voice>
-    *: "어플리케�션"
+    *: "대기열"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_LISTACCEL_START_DELAY
-  desc: Delay before list starts accelerating
+  id: LANG_SHOW_QUEUE_OPTIONS
+  desc: in Current Playlist settings
   user: core
   <source>
-    *: "List Acceleration Start Delay"
-    wheel_acceleration: none
+    *: "Show Queue Options"
   </source>
   <dest>
-    *: "목� 가� 시작 지연시간"
-    wheel_acceleration: none
+    *: "대기열 옵션 표시"
   </dest>
   <voice>
-    *: "목� 가� 시작 지연시간"
-    wheel_acceleration: none
+    *: "대기열 옵션 표시"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_VOICE_DIR_TALK
-  desc: Item of voice menu, whether to use directory .talk clips
+  id: LANG_SHOW_SHUFFLED_ADDING_OPTIONS
+  desc: in Current Playlist settings
   user: core
   <source>
-    *: "Use Directory .talk Clips"
+    *: "Show Shuffled Adding Options"
   </source>
   <dest>
-    *: "디렉토리 .talk Clip 사용"
+    *: "셔플 추가 옵션 표시"
   </dest>
   <voice>
-    *: "디렉토리 talk Clip 사용"
+    *: "셔플 추가 옵션 표시"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_EXT_CUESHEET
-  desc:
+  id: LANG_IN_SUBMENU
+  desc: in Settings
+  user: core
+  <source>
+    *: "In Submenu"
+  </source>
+  <dest>
+    *: "하위 메뉴"
+  </dest>
+  <voice>
+    *: "하위 메뉴"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOFTLOCK_DISABLE_ALL_NOTIFY
+  desc: disable all softlock notifications
+  user: core
+  <source>
+    *: "Disable All Lock Notifications"
+  </source>
+  <dest>
+    *: "모든 잠금 알림 비활성화"
+  </dest>
+  <voice>
+    *: "모든 잠금 알림 비활성화"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_VOLUME
+  desc: exempt volume from softlock
+  user: core
+  <source>
+    *: "Exempt Volume"
+  </source>
+  <dest>
+    *: "예외 볼륨"
+  </dest>
+  <voice>
+    *: "예외 볼륨"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ACTION_ALWAYSAUTOLOCK
+  desc: always prime autolock
+  user: core
+  <source>
+    *: "Always Autolock"
+  </source>
+  <dest>
+    *: "항� �� 잠금"
+  </dest>
+  <voice>
+    *: "항� �� 잠금"
+  </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>
     *: ""
@@ -10307,309 +15409,981 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_SHUFFLE
-  desc: bookmark selection list, bookmark enables shuffle
+  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>
-    *: ", Shuffle"
+    *: "dAY"
   </source>
   <dest>
-    *: ", 무작위"
+    *: "dAY"
   </dest>
   <voice>
     *: ""
   </voice>
 </phrase>
 <phrase>
-  id: LANG_COLORS_MENU
-  desc: colours menu under theme settings
+  id: LANG_LIST_WRAPAROUND
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Wraparound"
+  </source>
+  <dest>
+    *: "목� 랩어�운드"
+  </dest>
+  <voice>
+    *: "목� 랩어�운드"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_SHUTDOWN_MESSAGE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show Shutdown Message"
+  </source>
+  <dest>
+    *: "종료 메시지 표시"
+  </dest>
+  <voice>
+    *: "종료 메시지 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LIST_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "List Order"
+  </source>
+  <dest>
+    *: "목� 순서"
+  </dest>
+  <voice>
+    *: "목� 순서"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ASCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Ascending"
+  </source>
+  <dest>
+    *: "오름차순"
+  </dest>
+  <voice>
+    *: "오름차순"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DESCENDING
+  desc: in Settings
+  user: core
+  <source>
+    *: "Descending"
+  </source>
+  <dest>
+    *: "내림차순"
+  </dest>
+  <voice>
+    *: "내림차순"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUM_ART
+  desc: in Settings
+  user: core
+  <source>
+    *: "Album Art"
+  </source>
+  <dest>
+    *: "앨범 아트"
+  </dest>
+  <voice>
+    *: "앨범 아트"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_EMBEDDED
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Embedded"
+  </source>
+  <dest>
+    *: "임베디드 선호"
+  </dest>
+  <voice>
+    *: "임베디드 선호"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PREFER_IMAGE_FILE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Prefer Image File"
+  </source>
+  <dest>
+    *: "�미지 파� 선호"
+  </dest>
+  <voice>
+    *: "�미지 파� 선호"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_SYNC_RDS_TIME
+  desc: in radio screen and Settings
   user: core
   <source>
     *: none
-    lcd_color: "Colours"
+    rds: "Sync RDS Time"
   </source>
   <dest>
     *: none
-    lcd_color: "색깔"
+    rds: "RDS 시간 �기화"
   </dest>
   <voice>
     *: none
-    lcd_color: "색깔"
+    rds: "RDS 시간 �기화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_BOOKMARK_INVALID
-  desc: bookmark selection list, bookmark couldn't be parsed
+  id: LANG_SORT_ALBUMS_BY
+  desc: in Settings
   user: core
   <source>
-    *: "<Invalid Bookmark>"
+    *: "Sort albums by"
   </source>
   <dest>
-    *: "<잘못� �마�>"
+    *: "앨범 정렬 기준"
   </dest>
   <voice>
-    *: "잘못� �마�"
+    *: "앨범 정렬 기준"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SEARCH_RESULTS
-  desc: title for the list of results displayed after searching in a playlist
+  id: LANG_ARTIST_PLUS_NAME
+  desc: in Settings
   user: core
   <source>
-    *: "Search Results"
+    *: "Artist + Name"
   </source>
   <dest>
-    *: "검색 결과"
+    *: "아티스트 + �름"
   </dest>
   <voice>
-    *: "검색 결과"
+    *: "아티스트와 �름"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_AGC_PRESET
-  desc: automatic gain control in record settings and screen
+  id: LANG_ARTIST_PLUS_YEAR
+  desc: in Settings
+  user: core
+  <source>
+    *: "Artist + Year"
+  </source>
+  <dest>
+    *: "아티스트 + 연�"
+  </dest>
+  <voice>
+    *: "아티스트와 연�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_YEAR_SORT_ORDER
+  desc: in Settings
+  user: core
+  <source>
+    *: "Year sort order"
+  </source>
+  <dest>
+    *: "연� 정렬 순서"
+  </dest>
+  <voice>
+    *: "연� 정렬 순서"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_YEAR_IN_ALBUM_TITLE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Show year in album title"
+  </source>
+  <dest>
+    *: "앨범 제목� 연� 표시"
+  </dest>
+  <voice>
+    *: "앨범 제목� 연� 표시"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WAIT_FOR_CACHE
+  desc: in Settings
+  user: core
+  <source>
+    *: "Cache needs to finish updating first!"
+  </source>
+  <dest>
+    *: "먼저 �시 업��트를 완료해야 합니다!"
+  </dest>
+  <voice>
+    *: "먼저 �시 업��트를 완료해야 합니다!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACK_INFO
+  desc: Track Info Title
+  user: core
+  <source>
+    *: "Track Info"
+  </source>
+  <dest>
+    *: "트랙 정보"
+  </dest>
+  <voice>
+    *: "트랙 정보"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY
+  desc: play selected file/directory, in playlist context menu
+  user: core
+  <source>
+    *: "Play"
+  </source>
+  <dest>
+    *: "재�"
+  </dest>
+  <voice>
+    *: "재�"
+  </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>
+    *: "셔플 재�"
+  </dest>
+  <voice>
+    *: "셔플 재�"
+  </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>
+    *: "재�목� �체 시 현재 트랙 유지"
+  </dest>
+  <voice>
+    *: "재�목� �체 시 현재 트랙 유지"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_SETTINGS_ON_HOLD
+  desc: in the system sub menu
   user: core
   <source>
     *: none
-    agc: "AGC"
+    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
-    agc: "AGC"
+    clear_settings_on_hold,iriverh10: "시작하는 �안 재설정 버튼� 누르고 있으면 설정 지우기"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "시작하는 �안 홀드 스위치가 켜져 있으면 설정 지우기"
   </dest>
   <voice>
     *: none
-    agc: "�� 게� 조작"
+    clear_settings_on_hold,iriverh10: "시작하는 �안 재설정 버튼� 누르고 있으면 설정� 지우기"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "시작하는 �안 홀드 스위치가 켜져 있으면 설정 지우기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SELECTOR_END_COLOR
-  desc: line selector color option
+  id: LANG_REWIND_ACROSS_TRACKS
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: "Rewind Across Tracks"
+  </source>
+  <dest>
+    *: "트랙� 가로질러 ��기"
+  </dest>
+  <voice>
+    *: "트랙� 가로질러 ��기"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_AS
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Set As..."
+  </source>
+  <dest>
+    *: "다른 �름으로 설정..."
+  </dest>
+  <voice>
+    *: "다른 �름으로 설정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLIST_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playlist Directory"
+  </source>
+  <dest>
+    *: "재�목� 디렉토리"
+  </dest>
+  <voice>
+    *: "재�목� 디렉토리"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_START_DIR
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Start Directory"
+  </source>
+  <dest>
+    *: "시작 디렉토리"
+  </dest>
+  <voice>
+    *: "시작 디렉토리"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_DIR
+  desc: used in the onplay menu
   user: core
   <source>
     *: none
-    lcd_color: "Secondary Colour"
+    recording: "Recording Directory"
   </source>
   <dest>
     *: none
-    lcd_color: "�번째 색깔"
+    recording: "녹� 디렉토리"
   </dest>
   <voice>
     *: none
-    lcd_color: "�번째 색깔"
+    recording: "녹� 디렉토리"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_TREBLE_CUTOFF
-  desc: Treble setting cut-off frequency
+  id: LANG_ADD_TO_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Playlist..."
+  </source>
+  <dest>
+    *: "재�목�� 추가..."
+  </dest>
+  <voice>
+    *: "재�목�� 추가"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_TO_EXISTING_PL
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add to Existing Playlist"
+  </source>
+  <dest>
+    *: "기존 재�목�� 추가"
+  </dest>
+  <voice>
+    *: "기존 재�목�� 추가"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYING_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Playing Next..."
+  </source>
+  <dest>
+    *: "다� 재� 중..."
+  </dest>
+  <voice>
+    *: "다� 재� 중"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_NEXT
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Next"
+  </source>
+  <dest>
+    *: "다� 재�"
+  </dest>
+  <voice>
+    *: "다� 재�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ADD_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Add Shuffled"
+  </source>
+  <dest>
+    *: "셔플 추가"
+  </dest>
+  <voice>
+    *: "셔플 추가"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last"
+  </source>
+  <dest>
+    *: "마지막 재�"
+  </dest>
+  <voice>
+    *: "마지막 재�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAY_LAST_SHUFFLED
+  desc: used in the onplay menu
+  user: core
+  <source>
+    *: "Play Last Shuffled"
+  </source>
+  <dest>
+    *: "마지막 셔플 재�"
+  </dest>
+  <voice>
+    *: "마지막 셔플 재�"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOLUME_ADJUST_MODE
+  desc: in system settings
   user: core
   <source>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "Treble Cutoff"
+    perceptual_volume: "Volume Adjustment Mode"
   </source>
   <dest>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고�역 컷오프 주파수"
+    perceptual_volume: "볼륨 조정 모드"
   </dest>
   <voice>
     *: none
-    gigabeatfx,ipod6g,ipodvideo,mpiohd200,mpiohd300,mrobe100: "고�역 컷오프 주파수"
+    perceptual_volume: "볼륨 조정 모드"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_MONO_MODE
-  desc: in the recording settings
+  id: LANG_VOLUME_ADJUST_NORM_STEPS
+  desc: in system settings
   user: core
   <source>
     *: none
-    recording: "Mono mode"
+    perceptual_volume: "Number of Volume Steps"
   </source>
   <dest>
     *: none
-    recording: "모노 모드"
+    perceptual_volume: "볼륨 단계 수"
   </dest>
   <voice>
     *: none
-    recording: "모노 모드"
+    perceptual_volume: "볼륨 단계 수"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SYSFONT_CHANNELS
-  desc: in the recording settings
+  id: LANG_PERCEPTUAL
+  desc: in system settings -> volume adjustment mode
   user: core
   <source>
     *: none
-    recording: "Channels"
+    perceptual_volume: "Perceptual"
   </source>
   <dest>
     *: none
-    recording: "채�"
+    perceptual_volume: "지��"
   </dest>
   <voice>
     *: none
-    recording: "채�"
+    perceptual_volume: "지��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_PLAYLISTS
-  desc: in the main menu and file view setting
+  id: LANG_SHOW_TRACKS_WHILE_BROWSING
+  desc: in PictureFlow Main Menu
   user: core
   <source>
-    *: "Playlists"
+    *: "Show Tracks While Browsing"
   </source>
   <dest>
-    *: "재� 목�"
+    *: "�색하는 �안 트랙 표시"
   </dest>
   <voice>
-    *: "재� 목�"
+    *: "�색하는 �안 트랙 표시"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_EXT_ONLY_VIEW_ALL
-  desc: in settings_menu
+  id: LANG_GOTO_LAST_ALBUM
+  desc: in PictureFlow Main Menu
   user: core
   <source>
-    *: "Only When Viewing All Types"
+    *: "Go to Last Album"
   </source>
   <dest>
-    *: "모든 종류 볼때만 보여주기"
+    *: "마지막 앨범으로 ��"
   </dest>
   <voice>
-    *: "모든 종류 볼때만 보여주기"
+    *: "마지막 앨범으로 ��"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNKNOWN_TYPES
-  desc: in settings_menu
+  id: LANG_DATABASE_DIR
+  desc: in database settings menu
   user: core
   <source>
-    *: "Only Unknown Types"
+    *: "Database Directory"
   </source>
   <dest>
-    *: "알려지지 않� 종류만"
+    *: "��터베�스 디렉토리"
   </dest>
   <voice>
-    *: "알려지지 않� 종류만"
+    *: "��터베�스 디렉토리"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_UNKNOWN
-  desc: generic string for unknown states, such as an unset clock
+  id: LANG_REMOVE_QUEUED_TRACKS
+  desc: Confirmation dialog
   user: core
   <source>
-    *: "Unknown"
+    *: "Remove Queued Tracks?"
   </source>
   <dest>
-    *: "모름"
+    *: "대기 중� 트랙� 제거할까요?"
   </dest>
   <voice>
-    *: "모름"
+    *: "대기 중� 트랙� 제거할까요?"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYLOCK_ON
-  desc: displayed when key lock is on
+  id: LANG_QUICK_IGNORE_DIRACHE
+  desc: in Settings
   user: core
   <source>
-    *: "Buttons Locked"
+    *: "Quick (Ignore Directory Cache)"
   </source>
   <dest>
-    *: "버튼 잠김"
+    *: "빠름 (디렉토리 �시 무시)"
   </dest>
   <voice>
-    *: ""
+    *: "빠름 (디렉토리 �시 무시)"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RECORDING_AGC_CLIPTIME
-  desc: in record settings
+  id: LANG_WPS
+  desc: in Settings
   user: core
   <source>
-    *: none
-    agc: "AGC clip time"
+    *: "What's Playing Screen"
   </source>
   <dest>
-    *: none
-    agc: "AGC �립 시간"
+    *: "재� 중 화면"
   </dest>
   <voice>
-    *: none
-    agc: "AGC �립 시간"
+    *: "재� 중 화면"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SKIP_TRACK
-  desc: skip length setting entry 0
+  id: LANG_DEFAULT_BROWSER
+  desc: in Settings
   user: core
   <source>
-    *: "Skip Track"
+    *: "Default Browser"
   </source>
   <dest>
-    *: "트랙 건너뛰기"
+    *: "기본 �색기"
   </dest>
   <voice>
-    *: "트랙 건너뛰기"
+    *: "기본 �색기"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  id: LANG_AMAZE_MENU
+  desc: Amaze game
   user: core
   <source>
-    *: ""
+    *: "Amaze Main Menu"
   </source>
   <dest>
-    *: ""
+    *: "Amaze 메� 메뉴"
   </dest>
   <voice>
-    *: ""
+    *: "Amaze 메� 메뉴"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SETTINGS
-  desc:  in main menu and visual confirmation after settings reset
+  id: LANG_SET_MAZE_SIZE
+  desc: Maze size in Amaze game
   user: core
   <source>
-    *: "Settings"
+    *: "Set Maze Size"
   </source>
   <dest>
-    *: "설정"
+    *: "미로 �기 설정"
   </dest>
   <voice>
-    *: "설정"
+    *: "미로 �기 설정"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_KEYCLICK_REPEATS
-  desc: in keyclick settings menu
+  id: LANG_VIEW_MAP
+  desc: Map in Amaze game
   user: core
   <source>
-    *: "Keyclick Repeats"
+    *: "View Map"
   </source>
   <dest>
-    *: "반복 키�릭"
+    *: "지� 보기"
   </dest>
   <voice>
-    *: "반복 키�릭"
+    *: "지� 보기"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CANCEL
-  desc: Visual confirmation of canceling a changed setting
+  id: LANG_SHOW_COMPASS
+  desc: Compass in Amaze game
   user: core
   <source>
-    *: "Cancelled"
+    *: "Show Compass"
   </source>
   <dest>
-    *: "취소�"
+    *: "나침반 표시"
   </dest>
   <voice>
-    *: "취소�"
+    *: "나침반 표시"
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_OF
-  desc: spoken only, as in 3/8 => 3 of 8
+  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>
+    *: "� 타� 사용"
+  </dest>
+  <voice>
+    *: "� 타� 사용"
+  </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>
+    *: "Mik개조 설정"
+  </dest>
+  <voice>
+    *: "Mik 개조 설정"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MIKMOD_MENU
+  desc: mikmod plugin
+  user: core
+  <source>
+    *: "Mikmod Menu"
+  </source>
+  <dest>
+    *: "Mik개조 메뉴"
+  </dest>
+  <voice>
+    *: "Mik 개조 메뉴"
+  </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>
     *: ""
@@ -10618,96 +16392,118 @@
     *: ""
   </dest>
   <voice>
-    *: "분�"
+    *: "잘못� �성 파�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: VOICE_LANG_NAME
+  desc: Spoken name of the language
   user: core
   <source>
-    *: "Are You Sure?"
+    *: ""
   </source>
   <dest>
-    *: "정�입니까?"
+    *: ""
   </dest>
   <voice>
-    *: "정�입니까?"
+    *: "한국�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_HIGH
-  desc: in settings_menu
+  id: LANG_PERCENT_FORMAT
+  desc: percent formatting ( `10%` is default ,  for `10 %` use '%ld %%' , for `%10` use '%%%ld' and so on)
   user: core
   <source>
-    *: none
-    gigabeatfx: "High"
+    *: "%ld%%"
   </source>
   <dest>
-    *: none
-    gigabeatfx: "높�"
+    *: "~%ld%%"
   </dest>
   <voice>
     *: none
-    gigabeatfx: "높�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SET_AS_REC_DIR
-  desc: used in the onplay menu to set a recording dir
+  id: LANG_CHOOSE_FILE
+  desc: file_picker plugin ask user to select a file
   user: core
   <source>
-    *: none
-    recording: "Set As Recording Directory"
+    *: "Choose File"
   </source>
   <dest>
-    *: none
-    recording: "녹� 디렉토리로 설정"
+    *: "파� 선�"
   </dest>
   <voice>
-    *: none
-    recording: "녹� 디렉토리로 설정"
+    *: "파� 선�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_SKIP_LENGTH
-  desc: playback settings menu
+  id: LANG_REMAINING
+  desc: Playing Time
   user: core
   <source>
-    *: "Skip Length"
+    *: "Remaining"
   </source>
   <dest>
-    *: "스터디 모드"
+    *: "남�"
   </dest>
   <voice>
-    *: "스터디 모드"
+    *: "남�"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_CODEPAGE_CENTRAL_EUROPEAN
-  desc: in codepage setting menu
+  id: LANG_DISABLE_MAINMENU_SCROLLING
+  desc: Disable main menu scrolling
   user: core
   <source>
-    *: "Central European (CP1250)"
+    *: "Disable main menu scrolling"
   </source>
   <dest>
-    *: "중유럽 (CP1250)"
+    *: "메� 메뉴 스�롤 비활성화"
   </dest>
   <voice>
-    *: "중유럽"
+    *: "메� 메뉴 스�롤 비활성화"
   </voice>
 </phrase>
 <phrase>
-  id: LANG_FILESIZE
-  desc: in record timesplit options and in track information viewer
+  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>
-    *: "Filesize"
+    *: "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/nederlands.lang b/apps/lang/nederlands.lang
index 805eb0aa85..42ed25b897 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -15219,16 +15219,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Verstreken"
+    *: "Verstreken"
   </dest>
   <voice>
-    *: none
-    hotkey: "Verstreken"
+    *: "Verstreken"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index b7200a8830..9cbde96420 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -454,10 +454,10 @@
     *: "System"
   </source>
   <dest>
-    *: "System"
+    *: "~System"
   </dest>
   <voice>
-    *: "System"
+    *: "~System"
   </voice>
 </phrase>
 <phrase>
@@ -692,10 +692,10 @@
     *: "Stereo"
   </source>
   <dest>
-    *: "Stereo"
+    *: "~Stereo"
   </dest>
   <voice>
-    *: "Stereofoniczny"
+    *: "~Stereofoniczny"
   </voice>
 </phrase>
 <phrase>
@@ -706,10 +706,10 @@
     *: "Mono"
   </source>
   <dest>
-    *: "Mono"
+    *: "~Mono"
   </dest>
   <voice>
-    *: "Monofoniczny"
+    *: "~Monofoniczny"
   </voice>
 </phrase>
 <phrase>
@@ -779,10 +779,10 @@
     *: "Karaoke"
   </source>
   <dest>
-    *: "Karaoke"
+    *: "~Karaoke"
   </dest>
   <voice>
-    *: "Karaoke"
+    *: "~Karaoke"
   </voice>
 </phrase>
 <phrase>
@@ -807,7 +807,7 @@
     *: "Crossfeed"
   </source>
   <dest>
-    *: "Crossfeed"
+    *: "~Crossfeed"
   </dest>
   <voice>
     *: "krosfid"
@@ -1470,7 +1470,7 @@
     *: "Replaygain"
   </source>
   <dest>
-    *: "Replaygain"
+    *: "~Replaygain"
   </dest>
   <voice>
     *: "riplejgejn"
@@ -4871,11 +4871,11 @@
   </source>
   <dest>
     *: none
-    radio: "Korea"
+    radio: "~Korea"
   </dest>
   <voice>
     *: none
-    radio: "Korea"
+    radio: "~Korea"
   </voice>
 </phrase>
 <phrase>
@@ -4886,10 +4886,10 @@
     *: "Format"
   </source>
   <dest>
-    *: "Format"
+    *: "~Format"
   </dest>
   <voice>
-    *: "Format"
+    *: "~Format"
   </voice>
 </phrase>
 <phrase>
@@ -4902,11 +4902,11 @@
   </source>
   <dest>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "~MPEG Layer 3"
   </dest>
   <voice>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "~MPEG Layer 3"
   </voice>
 </phrase>
 <phrase>
@@ -4919,11 +4919,11 @@
   </source>
   <dest>
     *: none
-    recording: "PCM Wave"
+    recording: "~PCM Wave"
   </dest>
   <voice>
     *: none
-    recording: "PCM Wave"
+    recording: "~PCM Wave"
   </voice>
 </phrase>
 <phrase>
@@ -5636,11 +5636,11 @@
   </source>
   <dest>
     *: none
-    remote: "(Vol- : Przywróć)"
+    remote: "(Głośność- : Przywróć)"
   </dest>
   <voice>
     *: none
-    remote: "(Vol- : Przywróć)"
+    remote: "Głośność minus przywróć"
   </voice>
 </phrase>
 <phrase>
@@ -5922,7 +5922,7 @@
     *: "Wolne miejsce:"
   </dest>
   <voice>
-    *: "Wolne miejsce na dysku:"
+    *: "Wolne miejsce na dysku"
   </voice>
 </phrase>
 <phrase>
@@ -5965,7 +5965,7 @@
   </dest>
   <voice>
     *: none
-    hibylinux: "U S B"
+    hibylinux: "u es be"
     multivolume: "ha de 1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mikro es de"
     xduoox3: "mikro es de 2"
@@ -6371,10 +6371,10 @@
     *: "Album"
   </source>
   <dest>
-    *: "Album"
+    *: "~Album"
   </dest>
   <voice>
-    *: "Album"
+    *: "~Album"
   </voice>
 </phrase>
 <phrase>
@@ -6892,7 +6892,7 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Obniżenie Półtonu"
+    pitchscreen: "Obniżenie półtonu"
   </dest>
   <voice>
     *: none
@@ -7036,7 +7036,7 @@
     *: "Tryb:"
   </dest>
   <voice>
-    *: "Tryb:"
+    *: "Tryb"
   </voice>
 </phrase>
 <phrase>
@@ -7880,7 +7880,7 @@
     *: ""
   </dest>
   <voice>
-    *: "minus"
+    *: "~minus"
   </voice>
 </phrase>
 <phrase>
@@ -7894,7 +7894,7 @@
     *: ""
   </dest>
   <voice>
-    *: "plus"
+    *: "~plus"
   </voice>
 </phrase>
 <phrase>
@@ -8922,7 +8922,7 @@
     *: ""
   </dest>
   <voice>
-    *: "oh"
+    *: "~oh"
   </voice>
 </phrase>
 <phrase>
@@ -10142,11 +10142,11 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Limit"
+    pitchscreen: "~Limit"
   </dest>
   <voice>
     *: none
-    pitchscreen: "Limit"
+    pitchscreen: "~Limit"
   </voice>
 </phrase>
 <phrase>
@@ -10450,7 +10450,7 @@
     *: "Następny:"
   </dest>
   <voice>
-    *: "Następny:"
+    *: "Następny"
   </voice>
 </phrase>
 <phrase>
@@ -10814,10 +10814,10 @@
     *: "Limit"
   </source>
   <dest>
-    *: "Limit"
+    *: "~Limit"
   </dest>
   <voice>
-    *: "Limit"
+    *: "~Limit"
   </voice>
 </phrase>
 <phrase>
@@ -10830,11 +10830,11 @@
   </source>
   <dest>
     *: none
-    usb_hid: "Multimedia"
+    usb_hid: "~Multimedia"
   </dest>
   <voice>
     *: none
-    usb_hid: "Multimedia"
+    usb_hid: "~Multimedia"
   </voice>
 </phrase>
 <phrase>
@@ -10961,7 +10961,7 @@
     *: "Następny:"
   </dest>
   <voice>
-    *: "Następny:"
+    *: "Następny"
   </voice>
 </phrase>
 <phrase>
@@ -11070,11 +11070,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "OK"
+    touchscreen: "~OK"
   </dest>
   <voice>
     *: none
-    touchscreen: "OK"
+    touchscreen: "~OK"
   </voice>
 </phrase>
 <phrase>
@@ -11195,7 +11195,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Poziom sygnału:"
+    radio: "Poziom sygnału"
   </voice>
 </phrase>
 <phrase>
@@ -11632,11 +11632,11 @@
   </source>
   <dest>
     *: none
-    sansafuzeplus: "Martwa strefa touchpada"
+    sansafuzeplus: "Martwa strefa panelu dotykowego"
   </dest>
   <voice>
     *: none
-    sansafuzeplus: "Martwa strefa touchpada"
+    sansafuzeplus: "Martwa strefa panelu dotykowego"
   </voice>
 </phrase>
 <phrase>
@@ -12283,16 +12283,16 @@
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining:"
+    *: ""
   </source>
   <dest>
-    *: "Pozostały czas listy odtwarzania:"
+    *: ""
   </dest>
   <voice>
-    *: "Pozostały czas listy odtwarzania"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -12334,7 +12334,7 @@
     *: "Poziom 3: 60 ruchów / 30 min"
   </dest>
   <voice>
-    *: "Poziom 3: 60 ruchów na 30 minut"
+    *: "Poziom 3 60 ruchów na 30 minut"
   </voice>
 </phrase>
 <phrase>
@@ -12612,7 +12612,7 @@
     *: "Poziom 1: 60 ruchów / 5 min"
   </dest>
   <voice>
-    *: "Poziom 1: 60 ruchów na 5 minut"
+    *: "Poziom 1 60 ruchów na 5 minut"
   </voice>
 </phrase>
 <phrase>
@@ -12643,7 +12643,7 @@
     *: "Poziom 8: 1 ruch / 15 min"
   </dest>
   <voice>
-    *: "Poziom 8: 1 ruch na 15 minut"
+    *: "Poziom 8 1 ruch na 15 minut"
   </voice>
 </phrase>
 <phrase>
@@ -12671,7 +12671,7 @@
     *: "Poziom 4: 40 ruchów / 30 min"
   </dest>
   <voice>
-    *: "Poziom 4: 40 ruchów na 30 minut"
+    *: "Poziom 4 40 ruchów na 30 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13199,7 +13199,7 @@
     *: "Poziom 7: 40 ruchów / 240 min"
   </dest>
   <voice>
-    *: "Poziom 7: 40 ruchów na 240 minut"
+    *: "Poziom 7 40 ruchów na 240 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13230,7 +13230,7 @@
     *: "Poziom 2: 60 ruchów / 15 min"
   </dest>
   <voice>
-    *: "Poziom 2: 60 ruchów na 15 minut"
+    *: "Poziom 2 60 ruchów na 15 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13401,7 +13401,7 @@
     *: "Poziom 6: 40 ruchów / 120 min"
   </dest>
   <voice>
-    *: "Poziom 6: 40 ruchów na 120 minut"
+    *: "Poziom 6 40 ruchów na 120 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13567,7 +13567,7 @@
     *: "Poziom 5: 40 ruchów / 60 min"
   </dest>
   <voice>
-    *: "Poziom 5: 40 ruchów na 60 minut"
+    *: "Poziom 5 40 ruchów na 60 minut"
   </voice>
 </phrase>
 <phrase>
@@ -13814,7 +13814,7 @@
     *: "Poziom 10: 1 ruch / 600 min"
   </dest>
   <voice>
-    *: "Poziom 10: 1 ruch na 600 minut"
+    *: "Poziom 10 1 ruch na 600 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14322,7 +14322,7 @@
     *: "Poziom 9: 1 ruch / 60 min"
   </dest>
   <voice>
-    *: "Poziom 9: 1 ruch na 60 minut"
+    *: "Poziom 9 1 ruch na 60 minut"
   </voice>
 </phrase>
 <phrase>
@@ -14701,16 +14701,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Upłynęło"
+    *: "Upłynęło"
   </dest>
   <voice>
-    *: none
-    hotkey: "Upłynęło"
+    *: "Upłynęło"
   </voice>
 </phrase>
 <phrase>
@@ -16419,3 +16416,87 @@
     *: 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>
+    *: "Wybierz plik"
+  </dest>
+  <voice>
+    *: "Wybierz plik"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMAINING
+  desc: Playing Time
+  user: core
+  <source>
+    *: "Remaining"
+  </source>
+  <dest>
+    *: "Pozostały"
+  </dest>
+  <voice>
+    *: "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/russian.lang b/apps/lang/russian.lang
index cf4a762ae6..29c3eea147 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -317,7 +317,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_STEREO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Stereo"
@@ -331,7 +331,7 @@
 </phrase>
 <phrase>
   id: LANG_CHANNEL_MONO
-  desc: in sound_settings
+  desc: in sound_settings and radio screen
   user: core
   <source>
     *: "Mono"
@@ -697,20 +697,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 +1417,12 @@
   user: core
   <source>
     *: "Peak Meter"
-    masd: none
   </source>
   <dest>
     *: "Уровень �игнала"
-    masd: none
   </dest>
   <voice>
     *: "Уровень �игнала"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2036,23 +2019,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 +2784,12 @@
   user: core
   <source>
     *: "Peak Release"
-    masd: none
   </source>
   <dest>
     *: "Сбро� пиков"
-    masd: none
   </dest>
   <voice>
     *: "Сбро� пиков"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2835,15 +2798,12 @@
   user: core
   <source>
     *: "Peak Hold Time"
-    masd: none
   </source>
   <dest>
     *: "Врем� удержани� пиков"
-    masd: none
   </dest>
   <voice>
     *: "Врем� удержани� пиков"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2852,15 +2812,12 @@
   user: core
   <source>
     *: "Clip Hold Time"
-    masd: none
   </source>
   <dest>
     *: "Врем� удержани� индикатора"
-    masd: none
   </dest>
   <voice>
     *: "Врем� удержани� индикатора"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2869,15 +2826,12 @@
   user: core
   <source>
     *: "Eternal"
-    masd: none
   </source>
   <dest>
     *: "По�то�нно"
-    masd: none
   </dest>
   <voice>
     *: "По�то�нно"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2886,15 +2840,12 @@
   user: core
   <source>
     *: "Scale"
-    masd: none
   </source>
   <dest>
     *: "Шкала"
-    masd: none
   </dest>
   <voice>
     *: "Шкала"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2903,15 +2854,12 @@
   user: core
   <source>
     *: "Logarithmic (dB)"
-    masd: none
   </source>
   <dest>
     *: "Логарифмиче�ка� (дБ)"
-    masd: none
   </dest>
   <voice>
     *: "Логарифмиче�ка� в децибелах"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2920,15 +2868,12 @@
   user: core
   <source>
     *: "Linear (%)"
-    masd: none
   </source>
   <dest>
     *: "Линейна� (%)"
-    masd: none
   </dest>
   <voice>
     *: "Линейна� в процентах"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2937,15 +2882,12 @@
   user: core
   <source>
     *: "Minimum Of Range"
-    masd: none
   </source>
   <dest>
     *: "�ижн�� граница диапазона"
-    masd: none
   </dest>
   <voice>
     *: "�ижн�� граница диапазона"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -2954,15 +2896,12 @@
   user: core
   <source>
     *: "Maximum Of Range"
-    masd: none
   </source>
   <dest>
     *: "Верхн�� граница диапазона"
-    masd: none
   </dest>
   <voice>
     *: "Верхн�� граница диапазона"
-    masd: none
   </voice>
 </phrase>
 <phrase>
@@ -3354,62 +3293,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
@@ -3525,34 +3408,16 @@
   </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: "�ккумул�тор: Импуль�н. зар�д"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_BATTERY_TIME
   desc: battery level in % and estimated time remaining
   user: core
   <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>
     *: "Зар�д аккумул�тора"
@@ -3592,38 +3457,41 @@
   user: core
   <source>
     *: "Int:"
-    xduoox3: "mSD1:"
     hibylinux: "mSD:"
+    xduoox3: "mSD1:"
   </source>
   <dest>
     *: "Внутр:"
-    xduoox3: "mSD1:"
     hibylinux: "mSD:"
+    xduoox3: "mSD1:"
   </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
+    hibylinux: "USB:"
     multivolume: "HD1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
     xduoox3: "mSD2:"
   </dest>
   <voice>
     *: none
+    hibylinux: "U S B"
     multivolume: "Эйч Ди 1"
     sansac200*,sansaclipplus,sansae200*,sansafuze*: "микро Э� Ди"
     xduoox3: "микро Э� Ди 2"
@@ -3772,6 +3640,7 @@
     *: none
     gigabeatfx,mrobe500,rtc: "ВЫКЛ. = Отмена"
     gigabeats: "��З�Д = Отмена"
+    sansafuzeplus: "BACK = Revert"
     gogearsa9200: "ЛЕВО = Отмена"
     iaudiom5,iaudiox5: "З�ПИСЬ = Отмена"
     ipod*,mpiohd300,sansac200*: "МЕ�Ю = Отмена"
@@ -3783,6 +3652,7 @@
   </dest>
   <voice>
     *: none
+    gogearsa9200,iaudiom5,iaudiox5,ipod*,sansac200*,iriverh10,iriverh10_5gb,sansae200*,iriverh100,iriverh120,iriverh300,mrobe100,rtc,samsungyh*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3840,6 +3710,7 @@
   </dest>
   <voice>
     *: none
+    iaudiom5,iaudiox5,iriverh100,iriverh120,iriverh300,recording,samsungyh*,sansac200*,sansae200*,vibe500: ""
   </voice>
 </phrase>
 <phrase>
@@ -3911,23 +3782,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 +3816,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 +3833,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 +4004,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
@@ -5823,7 +5617,7 @@
     *: "Saved %d tracks (%s)"
   </source>
   <dest>
-    *: "Сохранено %d треков (%d)"
+    *: "Saved %d tracks (%s)"
   </dest>
   <voice>
     *: "Тр�ков �охранено"
@@ -5872,20 +5666,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 +5824,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 +6028,7 @@
 </phrase>
 <phrase>
   id: LANG_OFF_ABORT
-  desc: Used on archosrecorder models
+  desc: Used on many models
   user: core
   <source>
     *: "OFF to abort"
@@ -6348,6 +6043,7 @@
     *: "ВЫКЛ. дл� отмены"
     gigabeatfx: "ВЫКЛ. дл� отмены"
     gigabeats: "��З�Д дл� отмены"
+    sansafuzeplus: "BACK to abort"
     iaudiom5,iaudiox5: "ВОСПР. дл� отмены"
     ipod*: "П�УЗ� дл� отмены"
     iriverh10,iriverh10_5gb,sansac200*,sansae200*,vibe500: "ПРЕД. дл� отмены"
@@ -6485,7 +6181,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 +6393,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 +6400,6 @@
   </source>
   <dest>
     *: "По�троение базы... %d найдено (ВЫКЛ. дл� отмены)"
-    archosplayer: "По�троение БД... %d найдено"
     gigabeat*,iaudiom5,iaudiox5,mrobe100,samsungyh*: "По�троение базы... %d найдено (ВЛЕВО дл� отмены)"
     gogearsa9200: "По�троение базы... %d найдено (РЕВЕРС. дл� отмены)"
     ipod*,iriverh10,iriverh10_5gb,sansac200*,sansae200*,sansafuze*,vibe500: "По�троение базы... %d найдено (ПРЕД. дл� отмены)"
@@ -7318,11 +7012,9 @@
   user: core
   <source>
     *: "Buffer:"
-    archosplayer: "Buf:"
   </source>
   <dest>
     *: "Буфер:"
-    archosplayer: "Буф:"
   </dest>
   <voice>
     *: "Буфер:"
@@ -7396,17 +7088,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 +7123,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 +7133,7 @@
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,sansac200*,sansae200*: ""
+    gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*,gogearsa9200,samsungyh*,iriverh100,iriverh120,iriverh300,rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -7453,15 +7142,12 @@
   user: core
   <source>
     *: "Any Other = No"
-    archosplayer: none
   </source>
   <dest>
     *: "Люба� друга� = �ет"
-    archosplayer: none
   </dest>
   <voice>
     *: ""
-    archosplayer: none
   </voice>
 </phrase>
 <phrase>
@@ -7768,11 +7454,9 @@
   user: core
   <source>
     *: "End of Song List"
-    archosplayer: "End of List"
   </source>
   <dest>
     *: "Конец �пи�ка"
-    archosplayer: "Конец �пи�ка"
   </dest>
   <voice>
     *: "Конец �пи�ка"
@@ -8202,20 +7886,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 +8390,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
@@ -8917,20 +8573,6 @@
   </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
@@ -9139,20 +8781,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
@@ -9410,10 +9038,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 +9162,7 @@
     *: "%s не �уще�твует"
   </dest>
   <voice>
-    *: ""
+    *: "%s не �уще�твует"
   </voice>
 </phrase>
 <phrase>
@@ -9583,23 +9211,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
@@ -10604,20 +10215,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 +10291,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
@@ -11270,20 +10853,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 +11188,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
@@ -11737,20 +11292,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>
-    *: "У�тановить как папку каталога �пи�ков"
-  </dest>
-  <voice>
-    *: "У�тановить как папку каталога �пи�ков"
-  </voice>
-</phrase>
-<phrase>
   id: LANG_LIST_LINE_PADDING
   desc: list padding, in display settings
   user: core
@@ -11796,20 +11337,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 +11869,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Seek"
+    *: "Exempt Seek"
   </source>
   <dest>
     *: "Перемотка"
@@ -12401,7 +11928,7 @@
   desc: Softlock behaviour setting
   user: core
   <source>
-    *: "Disable Notify"
+    *: "Disable Locked Reminders"
   </source>
   <dest>
     *: "Запрет оповещени�"
@@ -12516,7 +12043,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Skip"
+    *: "Exempt Skip"
   </source>
   <dest>
     *: "Смена трека"
@@ -12596,20 +12123,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 +12225,7 @@
   desc: Selective Actions
   user: core
   <source>
-    *: "Play"
+    *: "Exempt Play"
   </source>
   <dest>
     *: "Во�произведение или пауза"
@@ -13034,20 +12547,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 +12590,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 +12659,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
@@ -13573,16 +13044,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>
@@ -13784,7 +13255,7 @@
     *: "Думаю..."
   </dest>
   <voice>
-    *: ""
+    *: "Думаю..."
   </voice>
 </phrase>
 <phrase>
@@ -14945,62 +14416,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
@@ -15292,16 +14707,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Проиграно"
+    *: "Проиграно"
   </dest>
   <voice>
-    *: none
-    hotkey: "Проиграно"
+    *: "Проиграно"
   </voice>
 </phrase>
 <phrase>
@@ -15649,20 +15061,6 @@
   </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
   user: core
@@ -15719,20 +15117,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
@@ -15775,20 +15159,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
@@ -15942,132 +15312,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
@@ -16356,18 +15600,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"
+    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: "Сбро�ит на�тройки при нажатой кнопке �бро�а во врем� загрузки"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
   </dest>
   <voice>
     *: none
-    ipodcolor,ipodnano1g,ipodvideo,ipod4g,ipodmini1g,ipodmini2g: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
     clear_settings_on_hold, iriverh10: "Сбро�ит на�тройки при нажатой кнопке �бро�а во врем� загрузки"
+    ipod4g,ipodcolor,ipodmini1g,ipodmini2g,ipodnano1g,ipodvideo: "Сбро�ить на�тройки при включенной блокировке во врем� загрузки"
   </voice>
 </phrase>
 <phrase>
@@ -16634,3 +15878,603 @@
     *: "Ру��кий"
   </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 picked from it"
+  </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>
+    *: "День"
+  </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>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 107e9d425c..b01f2a38dc 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -15176,16 +15176,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Trvanie"
+    *: "Trvanie"
   </dest>
   <voice>
-    *: none
-    hotkey: "Trvanie"
+    *: "Trvanie"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/srpski.lang b/apps/lang/srpski.lang
index e738109bbc..da940e8311 100644
--- a/apps/lang/srpski.lang
+++ b/apps/lang/srpski.lang
@@ -15249,16 +15249,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "Протекло"
+    *: "Протекло"
   </dest>
   <voice>
-    *: none
-    hotkey: "Протекло"
+    *: "Протекло"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index e7515b5f8f..560c63f5ca 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -15452,16 +15452,13 @@
   desc: prefix for elapsed playtime announcement
   user: core
   <source>
-    *: none
-    hotkey: "Elapsed"
+    *: "Elapsed"
   </source>
   <dest>
-    *: none
-    hotkey: "geçen"
+    *: "geçen"
   </dest>
   <voice>
-    *: none
-    hotkey: "geçen"
+    *: "geçen"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/main.c b/apps/main.c
index 20b9a0bc55..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
@@ -131,6 +135,12 @@
 #define MAIN_NORETURN_ATTR
 #endif
 
+#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
+#ifdef HAVE_MULTIVOLUME
+#include "pathfuncs.h" /* for init_volume_names */
+#endif
+#endif
+
 #if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
 #ifdef SIMULATOR
 #include "sim_tasks.h"
@@ -170,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
@@ -381,6 +394,9 @@ static void init(void)
     powermgmt_init();
     backlight_init();
     unicode_init();
+#ifdef HAVE_MULTIVOLUME
+    init_volume_names();
+#endif
 #ifdef SIMULATOR
     sim_tasks_init();
 #endif
@@ -450,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();
 
@@ -604,7 +624,7 @@ static void init(void)
         {
             lcd_clear_display();
             lcd_puts(0, 0, "No partition");
-            lcd_puts(0, 1, "found.");
+            lcd_putsf(0, 1, "found (%d).", rc);
 #ifndef USB_NONE
             lcd_puts(0, 2, "Insert USB cable");
             lcd_puts(0, 3, "and fix it.");
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/menus/main_menu.c b/apps/menus/main_menu.c
index a483a72eb0..2fa5be5623 100644
--- a/apps/menus/main_menu.c
+++ b/apps/menus/main_menu.c
@@ -134,8 +134,8 @@ static int show_legal(void)
 struct info_data
 
 {
-    unsigned long size[NUM_VOLUMES];
-    unsigned long free[NUM_VOLUMES];
+    sector_t size[NUM_VOLUMES];
+    sector_t free[NUM_VOLUMES];
     unsigned long name[NUM_VOLUMES];
     bool new_data;
 };
@@ -163,15 +163,18 @@ enum infoscreenorder
 static int refresh_data(struct info_data *info)
 {
     int i = 0;
+#ifdef HAVE_MULTIVOLUME
 #ifdef HAVE_MULTIDRIVE
-    int drive;
     int max = -1;
-
+#endif
+    int drive = 0;
     for (i = 0 ; CHECK_VOL(i) ; i++) {
 #endif
         volume_size(IF_MV(i,) &info->size[i], &info->free[i]);
+#ifdef HAVE_MULTIVOLUME
 #ifdef HAVE_MULTIDRIVE
         drive = volume_drive(i);
+#endif
         if (drive > 0 || info->size[i] == 0)
             info->name[i] = LANG_DISK_NAME_MMC;
         else
@@ -182,9 +185,12 @@ static int refresh_data(struct info_data *info)
             max = drive;
         else if (drive < max)
             break;
+#elif defined(HAVE_MULTIVOLUME) && (defined(HAVE_HOTSWAP) || defined(HAVE_HOTSWAP) || defined(HAVE_DIRCACHE) || defined(HAVE_BOOTDATA))
+        if (volume_partition(i) == -1)
+            break;
+#endif
+#ifdef HAVE_MULTIVOLUME
     }
-#else
-    i++;
 #endif
 
     info->new_data = false;
diff --git a/apps/misc.c b/apps/misc.c
index d8caabd397..0bbaba965b 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -139,7 +139,7 @@ const unsigned char * const unit_strings_core[] =
  * voiced.*/
 char *output_dyn_value(char *buf,
                        int buf_size,
-                       int value,
+                       int64_t value,
                        const unsigned char * const *units,
                        unsigned int unit_count,
                        bool binary_scale)
@@ -147,8 +147,9 @@ char *output_dyn_value(char *buf,
     unsigned int scale = binary_scale ? 1024 : 1000;
     unsigned int fraction = 0;
     unsigned int unit_no = 0;
-    unsigned int value_abs = (value < 0) ? -value : value;
+    uint64_t value_abs = (value < 0) ? -value : value;
     char tbuf[5];
+    int value2;
 
     while (value_abs >= scale && unit_no < (unit_count - 1))
     {
@@ -157,7 +158,7 @@ char *output_dyn_value(char *buf,
         unit_no++;
     }
 
-    value = (value < 0) ? -value_abs : value_abs; /* preserve sign */
+    value2 = (value < 0) ? -value_abs : value_abs; /* preserve sign */
     fraction = (fraction * 1000 / scale) / 10;
 
     if (value_abs >= 100 || fraction >= 100 || !unit_no)
@@ -170,10 +171,10 @@ char *output_dyn_value(char *buf,
     if (buf)
     {
         if (*tbuf)
-            snprintf(buf, buf_size, "%d%s%s%s", value, str(LANG_POINT),
+            snprintf(buf, buf_size, "%d%s%s%s", value2, str(LANG_POINT),
                      tbuf, P2STR(units[unit_no]));
         else
-            snprintf(buf, buf_size, "%d%s", value, P2STR(units[unit_no]));
+            snprintf(buf, buf_size, "%d%s", value2, P2STR(units[unit_no]));
     }
     else
     {
@@ -200,7 +201,7 @@ bool warn_on_pl_erase(void)
         return true;
 }
 
-bool show_search_progress(bool init, int count)
+bool show_search_progress(bool init, int display_count, int current, int total)
 {
     static int last_tick = 0;
 
@@ -214,7 +215,15 @@ bool show_search_progress(bool init, int count)
     /* Update progress every 1/10 of a second */
     if (TIME_AFTER(current_tick, last_tick + HZ/10))
     {
-        splashf(0, str(LANG_PLAYLIST_SEARCH_MSG), count, str(LANG_OFF_ABORT));
+        if (total != current)
+        {
+            splash_progress(current, total, str(LANG_PLAYLIST_SEARCH_MSG),
+                            display_count, str(LANG_OFF_ABORT));
+        }
+        else
+            splashf(0, str(LANG_PLAYLIST_SEARCH_MSG),
+                    display_count, str(LANG_OFF_ABORT));
+
         if (action_userabort(TIMEOUT_NOBLOCK))
             return false;
         last_tick = current_tick;
@@ -1843,7 +1852,7 @@ enum current_activity get_current_activity(void)
 * ** Extended error info truth table **
 *  [ Handle ][buf_reqd]
 *  [  > 0   ][  > 0   ] buf_reqd indicates how many bytes were used
-*  [ALOC_ERR][  > 0   ] buf_reqd indicates how many bytes are needed 
+*  [ALOC_ERR][  > 0   ] buf_reqd indicates how many bytes are needed
 *  [ALOC_ERR][READ_ERR] there was an error reading the file or it is empty
 */
 int core_load_bmp(const char * filename, struct bitmap *bm, const int bmformat,
diff --git a/apps/misc.h b/apps/misc.h
index e5fb7a3d1f..87765b28b1 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -1,10 +1,10 @@
 /***************************************************************************
- *             __________               __   ___.                  
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
- *                     \/            \/     \/    \/            \/ 
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
  * $Id$
  *
  * Copyright (C) 2002 by Daniel Stenberg
@@ -22,6 +22,7 @@
 #define MISC_H
 
 #include <stdbool.h>
+#include <stdint.h>
 #include <inttypes.h>
 #include "config.h"
 #include "screen_access.h"
@@ -36,7 +37,7 @@ extern const unsigned char * const unit_strings_core[];
  * voiced.*/
 char *output_dyn_value(char *buf,
                        int buf_size,
-                       int value,
+                       int64_t value,
                        const unsigned char * const *units,
                        unsigned int unit_count,
                        bool binary_scale);
@@ -110,12 +111,12 @@ void talk_timedate(void);
  * returns true if the playlist should be replaced */
 bool warn_on_pl_erase(void);
 
-bool show_search_progress(bool init, int count);
+bool show_search_progress(bool init, int count, int current, int total);
 
 /* Read (up to) a line of text from fd into buffer and return number of bytes
- * read (which may be larger than the number of bytes stored in buffer). If 
- * an error occurs, -1 is returned (and buffer contains whatever could be 
- * read). A line is terminated by a LF char. Neither LF nor CR chars are 
+ * read (which may be larger than the number of bytes stored in buffer). If
+ * an error occurs, -1 is returned (and buffer contains whatever could be
+ * read). A line is terminated by a LF char. Neither LF nor CR chars are
  * stored in buffer.
  */
 int read_line(int fd, char* buffer, int buffer_size);
diff --git a/apps/onplay.c b/apps/onplay.c
index d468c0a545..ab507f08ac 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -138,7 +138,7 @@ static bool clipboard_clip(struct clipboard *clip, const char *path,
 static int bookmark_load_menu_wrapper(void)
 {
     if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
-        pop_current_activity_without_refresh(); /* when called from ctxt menu */
+        pop_current_activity_without_refresh();          /* when called from ctxt menu */
 
     return bookmark_load_menu();
 }
@@ -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)
@@ -689,7 +689,7 @@ MENUITEM_FUNCTION(view_cue_item, 0, ID2P(LANG_BROWSE_CUESHEET),
 static int browse_id3_wrapper(void)
 {
     if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
-        pop_current_activity_without_refresh(); /* when called from ctxt menu */
+        pop_current_activity_without_refresh();          /* when called from ctxt menu */
 
     if (browse_id3(audio_current_track(),
             playlist_get_display_index(),
@@ -806,6 +806,10 @@ static bool onplay_load_plugin(void *param)
     if (!prepare_database_sel(param))
         return false;
 #endif
+
+    if (get_current_activity() == ACTIVITY_CONTEXTMENU)  /* get rid of parent activity */
+        pop_current_activity_without_refresh();          /* when called from ctxt menu */
+
     int ret = filetype_load_plugin((const char*)param, selected_file.path);
     if (ret == PLUGIN_USB_CONNECTED)
         onplay_result = ONPLAY_RELOAD_DIR;
@@ -1251,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;
@@ -1290,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)
@@ -1299,7 +1311,7 @@ int onplay(char* file, int attr, int from_context, bool hotkey)
     menu_selection = do_menu(menu, NULL, NULL, false);
 
     if (get_current_activity() == ACTIVITY_CONTEXTMENU) /* Activity may have been      */
-        pop_current_activity();     /* popped already by menu item */
+        pop_current_activity();                         /* popped already by menu item */
 
 
     if (menu_selection == GO_TO_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/pcmbuf.c b/apps/pcmbuf.c
index 8718d730fb..773e97cce0 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -741,9 +741,6 @@ void pcmbuf_start_track_change(enum pcm_track_change_type type)
         }
     }
 
-    if (auto_skip && global_settings.single_mode != SINGLE_MODE_OFF && !global_settings.party_mode)
-        crossfade = false;
-
     if (crossfade)
     {
         logf("crossfade track change");
diff --git a/apps/playback.c b/apps/playback.c
index 8a30af5199..a284a1858d 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2494,6 +2494,23 @@ static inline char* single_mode_get_id3_tag(struct mp3entry *id3)
     return NULL;
 }
 
+static bool single_mode_do_pause(int id3_hid)
+{
+    if (global_settings.single_mode != SINGLE_MODE_OFF && global_settings.party_mode == 0 &&
+        ((skip_pending == TRACK_SKIP_AUTO) || (skip_pending == TRACK_SKIP_AUTO_NEW_PLAYLIST))) {
+
+        if (global_settings.single_mode == SINGLE_MODE_TRACK)
+            return true;
+
+        char *previous_tag = single_mode_get_id3_tag(id3_get(PLAYING_ID3));
+        char *new_tag = single_mode_get_id3_tag(bufgetid3(id3_hid));
+        return previous_tag == NULL ||
+               new_tag == NULL ||
+               strcmp(previous_tag, new_tag) != 0;
+    }
+    return false;
+}
+
 /* Called to make an outstanding track skip the current track and to send the
    transition events */
 static void audio_finalise_track_change(void)
@@ -2540,43 +2557,28 @@ static void audio_finalise_track_change(void)
     bool have_info = track_list_current(0, &info);
     struct mp3entry *track_id3 = NULL;
 
-    id3_mutex_lock();
-
     /* Update the current cuesheet if any and enabled */
     if (have_info)
     {
         buf_read_cuesheet(info.cuesheet_hid);
         track_id3 = bufgetid3(info.id3_hid);
-    }
-
-    if (SINGLE_MODE_OFF != global_settings.single_mode && global_settings.party_mode == 0 &&
-        ((skip_pending == TRACK_SKIP_AUTO) || (skip_pending == TRACK_SKIP_AUTO_NEW_PLAYLIST)))
-    {
-        bool single_mode_do_pause = true;
-        if (SINGLE_MODE_TRACK != global_settings.single_mode)
-        {
-            char *previous_tag = single_mode_get_id3_tag(id3_get(PLAYING_ID3));
-            char *new_tag = single_mode_get_id3_tag(track_id3);
-            single_mode_do_pause = previous_tag == NULL ||
-                                   new_tag == NULL ||
-                                   strcmp(previous_tag, new_tag) != 0;
-        }
 
-        if (single_mode_do_pause)
+        if (single_mode_do_pause(info.id3_hid))
         {
             play_status = PLAY_PAUSED;
             pcmbuf_pause(true);
         }
     }
+    /* Sync the next track information */
+    have_info = track_list_current(1, &info);
+
+    id3_mutex_lock();
 
     id3_write(PLAYING_ID3, track_id3);
 
     /* The skip is technically over */
     skip_pending = TRACK_SKIP_NONE;
 
-    /* Sync the next track information */
-    have_info = track_list_current(1, &info);
-
     id3_write(NEXTTRACK_ID3, have_info ? bufgetid3(info.id3_hid) :
                                          id3_get(UNBUFFERED_ID3));
 
@@ -2641,54 +2643,12 @@ static void audio_monitor_end_of_playlist(void)
     pcmbuf_start_track_change(TRACK_CHANGE_END_OF_DATA);
 }
 
-/* Codec has completed decoding the track
-   (usually Q_AUDIO_CODEC_COMPLETE) */
-static void audio_on_codec_complete(int status)
+/* Does this track have an entry allocated? */
+static bool audio_can_change_track(int *trackstat, int *id3_hid)
 {
-    logf("%s(%d)", __func__, status);
-
-    if (play_status == PLAY_STOPPED)
-        return;
-
-    /* If it didn't notify us first, don't expect "seek complete" message
-       since the codec can't post it now - do things like it would have
-       done */
-    audio_complete_codec_seek();
-
-    if (play_status == PLAY_PAUSED || skip_pending != TRACK_SKIP_NONE)
-    {
-        /* Old-hay on the ip-skay - codec has completed decoding
-
-           Paused: We're not sounding it, so just remember that it happened
-                   and the resume will begin the transition
-
-           Skipping: There was already a skip in progress, remember it and
-                     allow no further progress until the PCM from the previous
-                     song has finished
-
-           This function will be reentered upon completing the existing
-           transition in order to do the one that was just tried (below)
-         */
-        codec_skip_pending = true;
-        codec_skip_status = status;
-
-        /* PCM buffer must know; audio could still be filling and hasn't
-           yet reached the play watermark */
-        pcmbuf_start_track_change(TRACK_CHANGE_AUTO_PILEUP);
-        return;
-    }
-
-    codec_skip_pending = false;
-
-    int trackstat = LOAD_TRACK_OK;
-
-    track_event_flags = TEF_AUTO_SKIP;
-    skip_pending = TRACK_SKIP_AUTO;
-
-    /* Does this track have an entry allocated? */
     struct track_info info;
     bool have_track = track_list_advance_current(1, &info);
-
+    *id3_hid = info.id3_hid;
     if (!have_track || info.audio_hid < 0)
     {
         bool end_of_playlist = false;
@@ -2697,8 +2657,8 @@ static void audio_on_codec_complete(int status)
         {
             if (filling == STATE_STOPPED)
             {
-                audio_begin_track_change(TRACK_CHANGE_END_OF_DATA, trackstat);
-                return;
+                audio_begin_track_change(TRACK_CHANGE_END_OF_DATA, *trackstat);
+                return false;
             }
 
             /* Track load is not complete - it might have stopped on a
@@ -2719,8 +2679,7 @@ static void audio_on_codec_complete(int status)
             {
                 /* Continue filling after this track */
                 audio_reset_and_rebuffer(TRACK_LIST_KEEP_CURRENT, 1);
-                audio_begin_track_change(TRACK_CHANGE_AUTO, trackstat);
-                return;
+                return true;
             }
             /* else rebuffer at this track; status applies to the track we
                want */
@@ -2736,10 +2695,10 @@ static void audio_on_codec_complete(int status)
 
         if (!end_of_playlist)
         {
-            trackstat = audio_reset_and_rebuffer(TRACK_LIST_CLEAR_ALL,
-                            skip_pending == TRACK_SKIP_AUTO ? 0 : -1);
+            *trackstat = audio_reset_and_rebuffer(TRACK_LIST_CLEAR_ALL,
+                    skip_pending == TRACK_SKIP_AUTO ? 0 : -1);
 
-            if (trackstat == LOAD_TRACK_ERR_NO_MORE)
+            if (*trackstat == LOAD_TRACK_ERR_NO_MORE)
             {
                 /* Failed to find anything after all - do playlist switchover
                    instead */
@@ -2751,11 +2710,64 @@ static void audio_on_codec_complete(int status)
         if (end_of_playlist)
         {
             audio_monitor_end_of_playlist();
-            return;
+            return false;
         }
     }
+    return true;
+}
+
+/* Codec has completed decoding the track
+   (usually Q_AUDIO_CODEC_COMPLETE) */
+static void audio_on_codec_complete(int status)
+{
+    logf("%s(%d)", __func__, status);
 
-    audio_begin_track_change(TRACK_CHANGE_AUTO, trackstat);
+    if (play_status == PLAY_STOPPED)
+        return;
+
+    /* If it didn't notify us first, don't expect "seek complete" message
+       since the codec can't post it now - do things like it would have
+       done */
+    audio_complete_codec_seek();
+
+    if (play_status == PLAY_PAUSED || skip_pending != TRACK_SKIP_NONE)
+    {
+        /* Old-hay on the ip-skay - codec has completed decoding
+
+           Paused: We're not sounding it, so just remember that it happened
+                   and the resume will begin the transition
+
+           Skipping: There was already a skip in progress, remember it and
+                     allow no further progress until the PCM from the previous
+                     song has finished
+
+           This function will be reentered upon completing the existing
+           transition in order to do the one that was just tried (below)
+         */
+        codec_skip_pending = true;
+        codec_skip_status = status;
+
+        /* PCM buffer must know; audio could still be filling and hasn't
+           yet reached the play watermark */
+        pcmbuf_start_track_change(TRACK_CHANGE_AUTO_PILEUP);
+        return;
+    }
+
+    codec_skip_pending = false;
+
+    int trackstat = LOAD_TRACK_OK;
+
+    track_event_flags = TEF_AUTO_SKIP;
+    skip_pending = TRACK_SKIP_AUTO;
+
+    int id3_hid = 0;
+    if (audio_can_change_track(&trackstat, &id3_hid)) 
+    {
+        audio_begin_track_change(
+                single_mode_do_pause(id3_hid)
+                ? TRACK_CHANGE_END_OF_DATA
+                : TRACK_CHANGE_AUTO, trackstat);
+    }
 }
 
 /* Called when codec completes seek operation
diff --git a/apps/playlist.c b/apps/playlist.c
index 70637b39a2..d23f3ec0d1 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -2519,6 +2519,7 @@ bool playlist_entries_iterate(const char *filename,
     bool ret = false;
     int max;
     char *dir;
+    off_t filesize;
 
     char temp_buf[MAX_PATH+1];
     char trackname[MAX_PATH+1];
@@ -2533,14 +2534,16 @@ bool playlist_entries_iterate(const char *filename,
         notify_access_error();
         goto out;
     }
-
+    off_t start = lseek(fd, 0, SEEK_CUR);
+    filesize = lseek(fd, 0, SEEK_END);
+    lseek(fd, start, SEEK_SET);
     /* we need the directory name for formatting purposes */
     size_t dirlen = path_dirname(filename, (const char **)&dir);
     //dir = strmemdupa(dir, dirlen);
 
 
     if (action_cb)
-        show_search_progress(true, 0);
+        show_search_progress(true, 0, 0, 0);
 
     while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0)
     {
@@ -2561,17 +2564,17 @@ bool playlist_entries_iterate(const char *filename,
 
             /* we need to format so that relative paths are correctly
                handled */
-            if (format_track_path(trackname, temp_buf,
-                                  sizeof(trackname), dir, dirlen) < 0)
+            if ((max = format_track_path(trackname, temp_buf,
+                                  sizeof(trackname), dir, dirlen)) < 0)
             {
                 goto out;
             }
-
+            start += max;
             if (action_cb)
             {
                 if (!action_cb(trackname))
                     goto out;
-                else if (!show_search_progress(false, i))
+                else if (!show_search_progress(false, i, start, filesize))
                     break;
             }
             else if (playlist_insert_context_add(pl_context, trackname) < 0)
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 b0435365e2..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))
@@ -1219,7 +1320,6 @@ bool search_playlist(void)
     gui_synclist_init(&playlist_lists, playlist_search_callback_name,
                       &s_data, false, 1, NULL);
     gui_synclist_set_title(&playlist_lists, str(LANG_SEARCH_RESULTS), NOICON);
-    gui_synclist_set_icon_callback(&playlist_lists, NULL);
     if(global_settings.talk_file)
         gui_synclist_set_voice_callback(&playlist_lists,
                                         global_settings.talk_file?
diff --git a/apps/plugin.c b/apps/plugin.c
index 7c80e5c6e1..adf207da79 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -352,7 +352,6 @@ static const struct plugin_api rockbox_api = {
     yesno_pop,
 
     /* action handling */
-    list_do_action,
     get_custom_action,
     get_action,
 #ifdef HAVE_TOUCHSCREEN
@@ -422,6 +421,7 @@ static const struct plugin_api rockbox_api = {
     crc_32,
     crc_32r,
     filetype_get_attr,
+    filetype_get_plugin,
 
     /* dir */
     FS_PREFIX(opendir),
@@ -582,6 +582,9 @@ static const struct plugin_api rockbox_api = {
     utf8length,
     utf8seek,
 
+    /* language */
+    lang_is_rtl,
+
     /* the buflib memory management library */
     buflib_init,
     buflib_available,
@@ -665,7 +668,7 @@ static const struct plugin_api rockbox_api = {
 
     /* metadata */
     get_metadata,
-    mp3info,
+    get_codec_string,
     count_mp3_frames,
     create_xing_header,
 #ifdef HAVE_TAGCACHE
@@ -677,6 +680,7 @@ static const struct plugin_api rockbox_api = {
     tagcache_search_finish,
     tagcache_get_numeric,
     tagcache_get_stat,
+    tagcache_commit_finalize,
 #if defined(HAVE_TC_RAMCACHE)
     tagcache_is_in_ram,
 #if defined(HAVE_DIRCACHE)
@@ -694,6 +698,9 @@ static const struct plugin_api rockbox_api = {
     playlist_get_current,
     playlist_get_resume_info,
     playlist_get_track_info,
+    playlist_get_first_index,
+    playlist_get_display_index,
+    playlist_entries_iterate,
     playlist_amount,
     playlist_resume,
     playlist_resume_track,
@@ -833,14 +840,8 @@ static const struct plugin_api rockbox_api = {
 
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef HAVE_TAGCACHE
-    tagcache_commit_finalize,
-#endif
-    playlist_get_first_index,
-    playlist_get_display_index,
-    filetype_get_plugin,
-    playlist_entries_iterate,
-    lang_is_rtl,
+
+    talk_fullpath,
 };
 
 static int plugin_buffer_handle;
@@ -855,6 +856,10 @@ int plugin_load(const char* plugin, const void* parameter)
     if (!plugin)
         return PLUGIN_ERROR;
 
+    /* for some plugins, the SBS can be left enabled */
+    const char *sepch = strrchr(plugin, PATH_SEPCH);
+    bool theme_enabled = sepch && !strcmp("properties.rock", sepch + 1);
+
     if (current_plugin_handle && pfn_tsr_exit)
     {    /* if we have a resident old plugin and a callback */
         bool reenter = (strcmp(current_plugin, plugin) == 0);
@@ -922,7 +927,8 @@ int plugin_load(const char* plugin, const void* parameter)
 
     *(p_hdr->api) = &rockbox_api;
     lcd_set_viewport(NULL);
-    lcd_clear_display();
+    if (!theme_enabled)
+        lcd_clear_display();
 
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_set_viewport(NULL);
@@ -937,8 +943,9 @@ int plugin_load(const char* plugin, const void* parameter)
      * they should be fixed properly instead of this lock */
     tree_lock_cache(tree_get_context());
 
-    FOR_NB_SCREENS(i)
-       viewportmanager_theme_enable(i, false, NULL);
+    if (!theme_enabled)
+        FOR_NB_SCREENS(i)
+            viewportmanager_theme_enable(i, false, NULL);
 
 #ifdef HAVE_TOUCHSCREEN
     touchscreen_set_mode(TOUCHSCREEN_BUTTON);
@@ -999,13 +1006,16 @@ int plugin_load(const char* plugin, const void* parameter)
 #endif
 #endif
 
-    lcd_clear_display();
 #ifdef HAVE_REMOTE_LCD
     lcd_remote_clear_display();
 #endif
 
-    FOR_NB_SCREENS(i)
-        viewportmanager_theme_undo(i, true);
+    if (!theme_enabled)
+    {
+        lcd_clear_display();
+        FOR_NB_SCREENS(i)
+            viewportmanager_theme_undo(i, true);
+    }
 
     plugin_check_open_close__exit();
 
diff --git a/apps/plugin.h b/apps/plugin.h
index 4dbd9d04c0..31e1c77cb7 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -163,7 +163,7 @@ int plugin_open(const char *plugin, const char *parameter);
  * when this happens please take the opportunity to sort in
  * any new functions "waiting" at the end of the list.
  */
-#define PLUGIN_API_VERSION 270
+#define PLUGIN_API_VERSION 271
 
 /* 239 Marks the removal of ARCHOS HWCODEC and CHARCELL */
 
@@ -405,8 +405,6 @@ struct plugin_api {
     bool (*yesno_pop)(const char* text);
 
     /* action handling */
-    bool (*list_do_action)(int context, int timeout,
-                           struct gui_synclist *lists, int *action);
     int (*get_custom_action)(int context,int timeout,
                           const struct button_mapping* (*get_context_map)(int));
     int (*get_action)(int context, int timeout);
@@ -479,6 +477,7 @@ struct plugin_api {
     uint32_t (*crc_32r)(const void *src, uint32_t len, uint32_t crc32);
 
     int (*filetype_get_attr)(const char* file);
+    char* (*filetype_get_plugin)(int attr, char *buffer, size_t buffer_len);
 
     /* dir */
     DIR * (*opendir)(const char *dirname);
@@ -650,7 +649,7 @@ struct plugin_api {
     int (*memcmp)(const void *s1, const void *s2, size_t n);
     char *(*strcasestr) (const char* phaystack, const char* pneedle);
     char* (*strtok_r)(char *ptr, const char *sep, char **end);
-    char* (*output_dyn_value)(char *buf, int buf_size, int value,
+    char* (*output_dyn_value)(char *buf, int buf_size, int64_t value,
                               const unsigned char * const *units,
                               unsigned int unit_count, bool binary_scale);
     /* unicode stuff */
@@ -662,6 +661,9 @@ struct plugin_api {
     unsigned long (*utf8length)(const unsigned char *utf8);
     int (*utf8seek)(const unsigned char* utf8, int offset);
 
+    /* language */
+    int  (*lang_is_rtl)(void);
+
     /* the buflib memory management library */
     void   (*buflib_init)(struct buflib_context* ctx, void* buf, size_t size);
     size_t (*buflib_available)(struct buflib_context* ctx);
@@ -761,7 +763,7 @@ struct plugin_api {
 
     /* metadata */
     bool (*get_metadata)(struct mp3entry* id3, int fd, const char* trackname);
-    bool (*mp3info)(struct mp3entry *entry, const char *filename);
+    const char* (*get_codec_string)(int codectype);
     int (*count_mp3_frames)(int fd,  int startpos,  int filesize,
                      void (*progressfunc)(int),
                      unsigned char* buf, size_t buflen);
@@ -782,6 +784,7 @@ struct plugin_api {
     void (*tagcache_search_finish)(struct tagcache_search *tcs);
     long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag);
     struct tagcache_stat* (*tagcache_get_stat)(void);
+    void (*tagcache_commit_finalize)(void);
 #if defined(HAVE_TC_RAMCACHE)
     bool (*tagcache_is_in_ram)(void);
 #if defined(HAVE_DIRCACHE)
@@ -801,6 +804,11 @@ struct plugin_api {
     int (*playlist_get_resume_info)(int *resume_index);
     int (*playlist_get_track_info)(struct playlist_info* playlist, int index,
                                    struct playlist_track_info* info);
+    int (*playlist_get_first_index)(const struct playlist_info* playlist);
+    int (*playlist_get_display_index)(void);
+    bool (*playlist_entries_iterate)(const char *filename,
+                                     struct playlist_insert_context *pl_context,
+                                     bool (*action_cb)(const char *file_name));
     int (*playlist_amount)(void);
     int (*playlist_resume)(void);
     void (*playlist_resume_track)(int start_index, unsigned int crc,
@@ -969,16 +977,8 @@ struct plugin_api {
 #endif
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
-#ifdef HAVE_TAGCACHE
-    void (*tagcache_commit_finalize)(void);
-#endif
-    int (*playlist_get_first_index)(const struct playlist_info* playlist);
-    int (*playlist_get_display_index)(void);
-    char* (*filetype_get_plugin)(int attr, char *buffer, size_t buffer_len);
-    bool (*playlist_entries_iterate)(const char *filename,
-                                     struct playlist_insert_context *pl_context,
-                                     bool (*action_cb)(const char *file_name));
-    int  (*lang_is_rtl)(void);
+
+    int (*talk_fullpath)(const char* path, bool enqueue);
 };
 
 /* plugin header */
diff --git a/apps/plugins/CATEGORIES b/apps/plugins/CATEGORIES
index 5e22bea980..79186b7aed 100644
--- a/apps/plugins/CATEGORIES
+++ b/apps/plugins/CATEGORIES
@@ -23,6 +23,7 @@ clock,apps
 codebuster,games
 credits,viewers
 cube,demos
+cue_playlist,viewers
 dart_scorer,apps
 db_commit,apps
 db_folder_select,viewers
@@ -34,6 +35,7 @@ doom,games
 duke3d,games
 euroconverter,apps
 fft,demos
+file_picker,viewers
 fire,demos
 fireworks,demos
 firmware_flash,apps
@@ -127,6 +129,7 @@ sgt-loopy,games
 sgt-magnets,games
 sgt-map,games
 sgt-mines,games
+sgt-mosaic,games
 sgt-net,games
 sgt-netslide,games
 sgt-palisade,games
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 8028758ef0..a070637a77 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -9,8 +9,10 @@ tagcache/tagcache.c
 chessclock.c
 credits.c
 cube.c
+cue_playlist.c
 dart_scorer.c
 dict.c
+file_picker.c
 jackpot.c
 keybox.c
 keyremap.c
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c
index bb35bec726..d6da369b9e 100644
--- a/apps/plugins/chessbox/chessbox_pgn.c
+++ b/apps/plugins/chessbox/chessbox_pgn.c
@@ -674,7 +674,6 @@ struct pgn_game_node* pgn_show_game_list(struct pgn_game_node* first_game){
 
     rb->gui_synclist_init(&games_list, &get_game_text, first_game, false, 1, NULL);
     rb->gui_synclist_set_title(&games_list, rb->str(LANG_CHESSBOX_GAMES), NOICON);
-    rb->gui_synclist_set_icon_callback(&games_list, NULL);
     if (rb->global_settings->talk_menu)
         rb->gui_synclist_set_voice_callback(&games_list, speak_game_selection);
     rb->gui_synclist_set_nb_items(&games_list, i);
diff --git a/apps/plugins/cue_playlist.c b/apps/plugins/cue_playlist.c
new file mode 100644
index 0000000000..d3f64fcc50
--- /dev/null
+++ b/apps/plugins/cue_playlist.c
@@ -0,0 +1,375 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2024 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.
+ *
+ ****************************************************************************/
+
+/* convert supplied playlist file to a .cue file */
+
+#include "plugin.h"
+
+#if defined(DEBUG) || defined(SIMULATOR)
+    #define logf(...) rb->debugf(__VA_ARGS__); rb->debugf("\n")
+#elif defined(ROCKBOX_HAS_LOGF)
+    #define logf rb->logf
+#else
+    #define logf(...) do { } while(0)
+#endif
+
+#define CPS_MAX_ENTRY_SZ (4 *1024)
+#define TDINDENT "   " /* prepend spaces for track data formatting */
+
+static struct cps
+{
+    char *buffer;
+    size_t buffer_sz;
+    size_t buffer_index;
+    int cue_fd;
+    int entries;
+} cps;
+
+static int sprfunc(void *ptr, int letter)
+{
+    /* callback for vuprintf */
+    (void) ptr;
+    if (cps.buffer_index < cps.buffer_sz - 1)
+    {
+        cps.buffer[cps.buffer_index++] = letter;
+        return 1;
+    }
+    return -1;
+}
+
+void cps_printf(const char *fmt, ...)
+{
+    /* NOTE! this is made for flushing the buffer to disk -- WARNING
+     * Nothing is NULL terminated here unless explicitly made so.. \0 */
+    va_list ap;
+    va_start(ap, fmt);
+    rb->vuprintf(sprfunc, NULL, fmt, ap);
+    va_end(ap);
+}
+
+static uint32_t write_metadata_tags(struct mp3entry *id3)
+{
+/* check an ID3 and write any numeric tags and valid string tags (non empty) */
+#define ISVALID(s) (s != NULL && s[0] != '\0')
+    uint32_t tag_flags = 0;
+
+    const char *performer = rb->str(LANG_TAGNAVI_UNTAGGED);
+    if (ISVALID(id3->artist))
+        performer = id3->artist;
+    else if (ISVALID(id3->albumartist))
+        performer = id3->albumartist;
+
+    const char *title = rb->str(LANG_TAGNAVI_UNTAGGED);
+    if (ISVALID(id3->title))
+        title = id3->title;
+
+#define PERFORMER_TITLE_SZ TDINDENT "PERFORMER \"%s\"\n" \
+                           TDINDENT "TITLE \"%s\"\n" \
+                           TDINDENT "SIZE_INFO %ld\n"
+
+    cps_printf(PERFORMER_TITLE_SZ, performer, title, id3->filesize);
+    if (ISVALID(id3->composer))
+        cps_printf(TDINDENT "COMPOSER \"%s\"\n", id3->composer);
+
+    cps_printf(TDINDENT "INDEX 01 00:00:00\n");
+
+#define ID3_TAG_NUM(theid3, TAGID, flag) \
+    {cps_printf(TDINDENT "REM %s %lu\n", TAGID, (unsigned long)theid3);tag_flags |= flag;}
+#define ID3_TAG_STR(theid3, TAGID, flag) if (ISVALID(theid3)) \
+    {cps_printf(TDINDENT "REM %s \"%s\"\n", TAGID, theid3);tag_flags |= flag;}
+
+    ID3_TAG_STR(id3->album, "ALBUM", 0x01);
+    ID3_TAG_STR(id3->albumartist, "ALBUMARTIST", 0x02);
+    ID3_TAG_STR(id3->comment, "COMMENT", 0x04);
+    ID3_TAG_STR(id3->genre_string, "GENRE", 0x08);
+    ID3_TAG_STR(id3->disc_string, "DISC", 0x10);
+    ID3_TAG_STR(id3->track_string, "TRACK", 0x20);
+    ID3_TAG_STR(id3->grouping, "GROUPING", 0x40);
+    ID3_TAG_STR(id3->mb_track_id, "MB_TRACK_ID", 0x80);
+    ID3_TAG_STR(rb->get_codec_string(id3->codectype), "ID3_CODEC", 0x100);
+
+    ID3_TAG_NUM(id3->discnum, "DISCNUM", 0x200);
+    ID3_TAG_NUM(id3->tracknum, "TRACKNUM", 0x400);
+    ID3_TAG_NUM(id3->length, "LENGTH", 0x800);
+    ID3_TAG_NUM(id3->bitrate, "BITRATE", 0x1000);
+    ID3_TAG_NUM(id3->frequency, "FREQUENCY", 0x2000);
+    ID3_TAG_NUM(id3->track_level, "TRACK_LEVEL",0x4000);
+    ID3_TAG_NUM(id3->album_level, "ALBUM_LEVEL", 0x8000);
+#undef ID3_TAG_STR
+#undef ID3_TAG_NUM
+#undef IS_VALID
+    return tag_flags;
+}
+
+static bool current_playlist_filename_cb(const char *filename, int attr, int index, int display_index)
+{
+    /* worker function for writing the actual cue data */
+    int szpos = 0; /* records position of the size string */
+    int namepos = 0; /* records position of the end of filename string */
+    struct mp3entry id3;
+
+    logf("found: %s", filename);
+
+    uint32_t id3_flags = 0;
+    bool have_metadata = rb->get_metadata(&id3, -1, filename);
+
+    if (!have_metadata && !rb->file_exists(filename))
+        return false;
+#define RB_ENTRY_DATA_FMT "REM RB_ENTRY_DATA " \
+                          "\"DISPLAY_INDEX %012u " \
+                          "PLAYLIST_INDEX %012u " \
+                          "SIZE %n%012zu TAGS %012lu\"\n"
+
+    const char *audiotype = "WAVE"; /* everything except MP3 */
+    const char *skipped = "";;
+    const char *queued = "";
+
+    size_t entry_start = cps.buffer_index; /* get start to calculate final size */
+
+    cps_printf(RB_ENTRY_DATA_FMT, display_index, index, &szpos, 0, 0UL);
+
+    size_t file_start = cps.buffer_index;
+    cps_printf("FILE \"%s%n\"", filename, &namepos);
+
+    if (cps.buffer[file_start + namepos - 1] == '3')
+        audiotype = "MP3";
+
+    cps_printf(" %s\n", audiotype);
+
+    if (attr & PLAYLIST_ATTR_SKIPPED)
+        skipped = TDINDENT "REM SKIPPED\n";
+    if (attr & PLAYLIST_ATTR_QUEUED)
+        queued = TDINDENT "REM QUEUED\n";
+
+    cps_printf(" TRACK %d AUDIO\n%s%s", display_index, skipped, queued);
+
+    if (have_metadata)
+        id3_flags = write_metadata_tags(&id3);
+
+    if (cps.buffer_index - entry_start < CPS_MAX_ENTRY_SZ)
+    {
+        /* place the write pointer at the size entry so we can update size + tags*/
+        size_t index = cps.buffer_index;
+        cps.buffer_index = entry_start + szpos;
+        cps_printf("%012zu TAGS %012lu", (index - entry_start), id3_flags);
+        cps.buffer_index = index; /* set the write pointer back at the end */
+    }
+    else
+    {
+        rb->splashf(HZ * 3, "Entry too large %s", filename);
+        cps.buffer_index = entry_start;
+        return false;
+    }
+
+    cps.entries++;
+    return true;
+}
+
+static bool playlist_filename_cb(const char *filename)
+{
+    /* get entries from an on-disk playlist */
+    return current_playlist_filename_cb(filename, 0,
+                                        cps.entries, cps.entries);
+}
+
+static bool current_playlist_get_entries(void)
+{
+    /* get entries from a loaded playlist ( may have queued or skipped tracks ) */
+#if defined(HAVE_ADJUSTABLE_CPU_FREQ)
+#define cpuboost(enable) rb->cpu_boost(enable);
+#else
+#define cpuboost(enable) do{ } while(0)
+#endif
+    struct playlist_track_info info;
+    int count = rb->playlist_amount();
+    int i, res = 0;
+    logf("current playlist contains %d entries", count);
+
+    cpuboost(true);
+
+    long next_progress_tick = *rb->current_tick;
+    for (i = 0; i < count; i++)
+    {
+        res = rb->playlist_get_track_info(NULL, i, &info);
+        int attr = info.attr;
+        int index = info.index;
+        int display_index = info.display_index;
+        if (res < 0 || !current_playlist_filename_cb(info.filename, attr, index, display_index))
+            break;
+
+        if (cps.buffer_index >= (cps.buffer_sz - CPS_MAX_ENTRY_SZ))
+        {
+            logf("Buffer full, writing to disk");
+            rb->write(cps.cue_fd, cps.buffer, cps.buffer_index);
+            cps.buffer_index = 0;
+        }
+
+        if (TIME_AFTER(*rb->current_tick, next_progress_tick))
+        {
+            rb->splash_progress(i, count, "Processing current playlist %d", i);
+            int action = rb->get_action(CONTEXT_STD, TIMEOUT_NOBLOCK);
+            if (action == ACTION_STD_CANCEL)
+            {
+                res = -10;
+                break;
+            }
+            if (rb->default_event_handler(action) == SYS_USB_CONNECTED)
+            {
+                cpuboost(false);
+                return PLUGIN_USB_CONNECTED;
+            }
+            next_progress_tick = *rb->current_tick + HZ / 2;
+        }
+        rb->yield();
+    }
+
+    cpuboost(false);
+
+    return res >= 0;
+#undef cpuboost
+}
+
+static void init_new_cue(const char *playlist_filename)
+{
+    if (cps.cue_fd >= 0)
+    {
+        rb->lseek(cps.cue_fd, 0, SEEK_SET);
+        rb->fdprintf(cps.cue_fd, "REM COMMENT \"generated by Rockbox version: " \
+                                 "%s\"\n", rb->rbversion);
+
+        rb->fdprintf(cps.cue_fd, "TITLE \"%s\"\n", playlist_filename); /* top level TITLE */
+    }
+}
+
+static void finalize_new_cue(void)
+{
+    rb->write(cps.cue_fd, "\n", 1);
+    rb->close(cps.cue_fd);
+}
+
+static int create_new_cue(const char *filename)
+{
+    char buf[MAX_PATH];
+    if (!filename)
+        filename = "/Playlists/current.cue";
+    const char *dot = rb->strrchr(filename, '.');
+    int dotpos = 0;
+    if (dot)
+        dotpos = dot - filename;
+    rb->snprintf(buf, sizeof(buf), "%.*s.cue", dotpos, filename);
+    cps.cue_fd = rb->open(buf, O_WRONLY|O_CREAT|O_TRUNC, 0666);
+
+    init_new_cue(filename);
+
+    return cps.cue_fd;
+}
+
+enum plugin_status plugin_start(const void* parameter)
+{
+
+    bool res;
+    rb->splash(HZ*2, ID2P(LANG_WAIT));
+
+    const char *filename = parameter;
+
+    if (create_new_cue(filename) < 0)
+    {
+        rb->splashf(HZ, "creat() failed: %d", cps.cue_fd);
+        return PLUGIN_ERROR;
+    }
+
+    cps.buffer = rb->plugin_get_buffer(&cps.buffer_sz);
+    if (cps.buffer != NULL)
+    {
+        cps.buffer_index = 0;
+#ifdef STORAGE_WANTS_ALIGN
+        /* align start and length for DMA */
+        STORAGE_ALIGN_BUFFER(cps.buffer, cps.buffer_sz);
+#else
+        /* align start and length to 32 bit */
+        ALIGN_BUFFER(cps.buffer, cps.buffer_sz, 4);
+#endif
+    }
+    if (cps.buffer == NULL|| cps.buffer_sz < CPS_MAX_ENTRY_SZ)
+    {
+        rb->splashf(HZ, "No Buffers Available :( ");
+        return PLUGIN_ERROR;
+    }
+
+    if (filename && filename[0])
+        res = rb->playlist_entries_iterate(filename, NULL, &playlist_filename_cb);
+    else
+        res = current_playlist_get_entries();
+
+    if (res)
+    {
+
+        if (cps.buffer_index > 0)
+        {
+            rb->write(cps.cue_fd, cps.buffer, cps.buffer_index);
+            cps.buffer_index = 0;
+
+        }
+        rb->splashf(HZ * 2,
+                    "Playist parsing SUCCESS %d entries written", cps.entries);
+    }
+    else
+    {
+        rb->splashf(HZ * 2, "Playist parsing FAILED after %d entries", cps.entries);
+    }
+
+    finalize_new_cue();
+
+    if (!res)
+        return PLUGIN_ERROR;
+    return PLUGIN_OK;
+}
+
+/*
+#CUE FORMAT
+    CATALOG
+    CDTEXTFILE
+    FILE
+    FLAGS
+    INDEX
+    ISRC
+    PERFORMER
+    POSTGAP
+    PREGAP
+    REM
+    SONGWRITER
+    TITLE
+    TRACK
+#CD-TEXT https://wyday.com/cuesharp/specification.php
+    ARRANGER
+    COMPOSER
+    DISC_ID
+    GENRE
+    ISRC
+    MESSAGE
+    PERFORMER
+    SONGWRITER
+    TITLE
+    TOC_INFO
+    TOC_INFO2
+    UPC_EAN
+    SIZE_INFO
+*/
diff --git a/apps/plugins/file_picker.c b/apps/plugins/file_picker.c
new file mode 100644
index 0000000000..ce9d81728e
--- /dev/null
+++ b/apps/plugins/file_picker.c
@@ -0,0 +1,295 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2024 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.
+ *
+ ****************************************************************************/
+/*File Picker Plugin
+
+FPP accepts several arguments to help in your file picking adventure
+* NOTE: anything with spaces should be quoted, -f and -l can't be used together *
+  -r "<GOTO_PLUGIN_NAME>" doesn't need to be a full path demos/file.rock works
+      the file (if choosen, cancel exits) will be passed as a parameter
+  -t "<TITLE ( max 64 chars )>"
+  -s "<START DIR>"
+  -f "<.EXT (max 64 chars) >" the extension of the files you are looking for
+              must have the '.' and ".*" accepts any file
+  -l "<.EXT.EXT,.EXT .EXT (max 64 chars) >" list of extensions for files you are looking for
+              each must have the '.' spaces and commas are ignored
+  -a attrib flags eg FILE_ATTR_AUDIO
+  -d disallow changing directories (hide directories doesn't allow changing from start dir)
+*/
+#include "plugin.h"
+#include "lang_enum.h"
+#include "lib/arg_helper.h"
+
+#if defined(DEBUG) || defined(SIMULATOR)
+    #define logf(...) rb->debugf(__VA_ARGS__); rb->debugf("\n")
+#elif defined(ROCKBOX_HAS_LOGF)
+    #define logf rb->logf
+#else
+    #define logf(...) do { } while(0)
+#endif
+
+#define FIND_NODIRS      0x01
+#define FIND_ATTRIB      0x02
+#define FIND_WILDCARD    0x04
+#define FIND_EXT         0x08
+#define FIND_EXT_IN_LIST 0x10
+
+static struct fpp
+{
+    char return_plugin[MAX_PATH];
+    char start_dir[MAX_PATH];
+    char file_ext[64];
+    char title[64];
+    int tree_attr;
+    int flags;
+}fpp;
+
+static int arg_callback(char argchar, const char **parameter, void *userdata)
+{
+    struct fpp *pfp = userdata;
+    int ret;
+    long num;
+    const char* start = *parameter;
+    while (*parameter[0] > '/' && ispunct(*parameter[0])) (*parameter)++;
+    switch (tolower(argchar))
+    {
+        case 'd' :
+            pfp->flags |= FIND_NODIRS;
+            logf ("Find no dirs");
+            break;
+        case 'r' : /*return_plugin*/
+            logf ("trying PLUGIN_DIR...");
+            size_t l = rb->strlcpy(pfp->return_plugin,
+                                   PLUGIN_DIR,
+                                   sizeof(pfp->return_plugin));
+
+            ret = string_parse(parameter,
+                         pfp->return_plugin + l,
+                         sizeof(pfp->return_plugin) - l);
+
+            if (ret && !rb->file_exists(pfp->return_plugin))
+            {
+                logf("Failed");
+                *parameter = start;
+                string_parse(parameter, pfp->return_plugin,
+                                sizeof(pfp->return_plugin));
+            }
+
+            if (ret)
+            {
+                logf ("Ret plugin: Val: %s\n", pfp->return_plugin);
+                logf("ate %d chars\n", ret);
+            }
+            break;
+        case 't' : /* title */
+            ret = string_parse(parameter, pfp->title, sizeof(pfp->title));
+            if (ret)
+            {
+                logf ("Title: Val: %s\n", pfp->title);
+                logf("ate %d chars\n", ret);
+            }
+            break;
+        case 's' : /* start directory */
+            ret = string_parse(parameter, pfp->start_dir, sizeof(pfp->start_dir));
+            if (ret)
+            {
+                if (!rb->dir_exists(pfp->start_dir))
+                {
+                    rb->strlcpy(pfp->start_dir, PATH_ROOTSTR, sizeof(pfp->start_dir));
+                }
+
+                logf ("Start dir: Val: %s\n", pfp->start_dir);
+                logf("ate %d chars\n", ret);
+            }
+            break;
+        case 'f' : /* file extension */
+            if (pfp->flags & FIND_EXT_IN_LIST)
+            {
+                rb->splash(HZ*5, "list extensions already active -f ignored");
+                break;
+            }
+            ret = string_parse(parameter, pfp->file_ext, sizeof(pfp->file_ext));
+            if (ret)
+            {
+                if (pfp->file_ext[1] == '*')
+                    pfp->flags |= FIND_WILDCARD;
+                else
+                    pfp->flags |= FIND_EXT;
+                logf ("Extension: Val: %s\n", pfp->file_ext);
+                logf("ate %d chars\n", ret);
+            }
+            break;
+        case 'l' : /* file extension list */
+            if (pfp->flags & FIND_EXT)
+            {
+                rb->splash(HZ*5, "extension already active -l ignored");
+                break;
+            }
+            ret = string_parse(parameter, pfp->file_ext, sizeof(pfp->file_ext));
+            if (ret)
+            {
+                char *wr = pfp->file_ext;
+                char *rd = pfp->file_ext;
+                while (*rd != '\0') /* copy the extensions */
+                {
+                    if (*rd == ' ' || *rd == ',' || *rd == ';')
+                    {
+                        /* ignore spaces, commas, and semicolons */
+                        rd++;
+                        continue;
+                    }
+                    *wr++ = *rd++;
+                }
+                *wr = '\0';
+                pfp->flags |= FIND_EXT_IN_LIST;
+                logf ("Extension List: Val: %s\n", pfp->file_ext);
+                logf("ate %d chars\n", ret);
+            }
+            break;
+        case 'a' : /* tree attribute */
+            ret = longnum_parse(parameter, &num, NULL);
+            if (ret)
+            {
+                pfp->tree_attr = (num)&FILE_ATTR_MASK;
+                pfp->flags |= FIND_ATTRIB;
+                logf ("Attrib: Val: 0x%x\n", (uint32_t)num);
+                logf("ate %d chars\n", ret);
+            }
+            break;
+        default :
+            rb->splashf(HZ, "Unknown switch '%c'",argchar);
+            logf("Unknown switch '%c'",argchar);
+            //return 0;
+    }
+
+    return 1;
+}
+
+static bool cb_show_item(char *name, int attr, struct tree_context *tc)
+{
+    static int dirlevel = -1;
+    if(attr & ATTR_DIRECTORY)
+    {
+        if (fpp.flags & FIND_NODIRS)
+        {
+            if (tc->dirlevel == dirlevel)
+                return false;
+            dirlevel = tc->dirlevel;
+            if (rb->strcasestr(tc->currdir, fpp.start_dir) == NULL)
+            {
+                tc->is_browsing = false; /* exit immediately */
+                logf("exiting %d", tc->dirlevel);
+            }
+        }
+
+        return true;
+    }
+    if (fpp.flags & FIND_WILDCARD)
+    {
+        return true;
+    }
+    if ((fpp.flags & FIND_ATTRIB) && (fpp.tree_attr & attr) != 0)
+    {
+        return true;
+    }
+    if (fpp.flags & FIND_EXT)
+    {
+        const char *p = rb->strrchr(name, '.' );
+        if (p != NULL && !rb->strcasecmp( p, fpp.file_ext))
+            return true;
+    }
+
+    if (fpp.flags & FIND_EXT_IN_LIST)
+    {
+        const char *p = rb->strrchr(name, '.' );
+        if (p != NULL && rb->strcasestr(fpp.file_ext, p) != NULL)
+            return true;
+    }
+
+    logf("Excluded: %s", name);
+    return false;
+
+}
+
+static int browse_file_dir(struct fpp *pfp)
+{
+    char buf[MAX_PATH];
+    struct browse_context browse = {
+        .dirfilter = SHOW_ALL,
+        .flags = BROWSE_SELECTONLY | BROWSE_DIRFILTER,
+        .title = pfp->title,
+        .icon = Icon_Playlist,
+        .buf = buf,
+        .bufsize = sizeof(buf),
+        .root = pfp->start_dir,
+        .callback_show_item = &cb_show_item,
+    };
+
+    if (rb->rockbox_browse(&browse) == GO_TO_PREVIOUS)
+    {
+        if (rb->file_exists(buf))
+        {
+            logf("Loading %s", buf);
+            return rb->plugin_open(pfp->return_plugin, buf);
+        }
+        else
+        {
+            logf("Error opening %s", buf);
+            rb->splashf(HZ *2, "Error Opening %s", buf);
+            return PLUGIN_ERROR;
+        }
+    }
+
+    return PLUGIN_OK;
+}
+
+enum plugin_status plugin_start(const void* parameter)
+{
+    if (!parameter)
+    {
+        rb->splash(HZ *2, "No Args");
+        return PLUGIN_ERROR;
+    }
+
+    argparse((const char*) parameter, -1, &fpp, &arg_callback);
+
+    if (fpp.title[0] == '\0')
+    {
+        if (rb->global_settings->talk_menu)
+            rb->talk_id(LANG_CHOOSE_FILE, true);
+
+        if ((fpp.flags & FIND_EXT) || (fpp.flags & FIND_EXT_IN_LIST))
+        {
+            rb->snprintf(fpp.title, sizeof(fpp.title),
+                         "%s (%s)", rb->str(LANG_CHOOSE_FILE), fpp.file_ext);
+            if (rb->global_settings->talk_menu)
+                rb->talk_spell(fpp.file_ext, true);
+        }
+        else
+        {
+            rb->snprintf(fpp.title, sizeof(fpp.title), "%s", rb->str(LANG_CHOOSE_FILE));
+        }
+        rb->talk_force_enqueue_next();
+    }
+    if (fpp.start_dir[0] == '\0' || !rb->dir_exists(fpp.start_dir))
+        rb->strcpy(fpp.start_dir, PATH_ROOTSTR);
+
+    return browse_file_dir(&fpp);
+}
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c
index cb2e23a94a..749d76af74 100644
--- a/apps/plugins/keybox.c
+++ b/apps/plugins/keybox.c
@@ -657,7 +657,6 @@ enum plugin_status plugin_start(const void *parameter)
     rb->gui_synclist_init(&kb_list, &kb_list_cb, NULL, false, 1, NULL);
 
     rb->gui_synclist_set_title(&kb_list, "Keybox", NOICON);
-    rb->gui_synclist_set_icon_callback(&kb_list, NULL);
     rb->gui_synclist_set_nb_items(&kb_list, 0);
     rb->gui_synclist_select_item(&kb_list, 0);
 
diff --git a/apps/plugins/lib/arg_helper.c b/apps/plugins/lib/arg_helper.c
index 3ea5ba714d..63b7acbb2b 100644
--- a/apps/plugins/lib/arg_helper.c
+++ b/apps/plugins/lib/arg_helper.c
@@ -31,7 +31,7 @@
 #ifdef PLUGIN
     #define strchr rb->strchr
 #endif
-int string_parse(const char **parameter, char* buf, size_t buf_sz)
+int string_parse(const char **parameter, char *buf, size_t buf_sz)
 {
 /* fills buf with a string upto buf_sz, null terminates the buffer
  * strings break on WS by default but can be enclosed in single or double quotes
@@ -44,6 +44,11 @@ int string_parse(const char **parameter, char* buf, size_t buf_sz)
     char stopchars[] = "\'\"";
     int skipped = 0;
     int found = 0;
+    if (!parameter || !*parameter)
+    {
+        *buf = '\0';
+        return 0;
+    }
     const char* start = *parameter;
 
     if (strchr(stopchars, *start))
@@ -79,7 +84,7 @@ int string_parse(const char **parameter, char* buf, size_t buf_sz)
     return found + skipped;
 }
 
-int char_parse(const char **parameter, char* character)
+int char_parse(const char **parameter, char *character)
 {
 /* passes *character a single character eats remaining non-WS characters */
     char buf[2];
@@ -95,6 +100,8 @@ int bool_parse(const char **parameter, bool *choice)
 /* determine true false using the first character the rest are skipped/ignored */
     int found = 0;
     const char tf_val[]="fn0ty1";/* false chars on left f/t should be balanced fffttt */
+    if (!parameter || !*parameter)
+        return 0;
     const char* start = *parameter;
 
 
@@ -133,7 +140,9 @@ int longnum_parse(const char **parameter, long *number, long *decimal)
     int neg = 0;
     int digits = 0;
     //logf ("n: %s\n", *parameter);
-    const char *start = *parameter;
+    if (!parameter || !*parameter)
+        return 0;
+    const char* start = *parameter;
 
     if (*start == '-')
     {
@@ -209,7 +218,8 @@ int num_parse(const char **parameter, int *number, int *decimal)
 * Note: WS at beginning is stripped, **parameter starts at the first NON WS char
 * return 0 for arg_callback to quit parsing immediately
 */
-void argparse(const char *parameter, int parameter_len, int (*arg_callback)(char argchar, const char **parameter))
+void argparse(const char *parameter, int parameter_len, void *userdata,
+        int (*arg_callback)(char argchar, const char **parameter, void *userdata))
 {
     bool lastchr;
     char argchar;
@@ -222,7 +232,10 @@ void argparse(const char *parameter, int parameter_len, int (*arg_callback)(char
             {
                 if ((*parameter) == '\0')
                     return;
-                logf ("%s\n",parameter);
+
+                if (parameter_len < 0) { logf ("%s\n", parameter); }
+                else { logf ("%.*s\n", plen, parameter); }
+
                 argchar = *parameter;
                 lastchr = (*(parameter + 1) == '\0');
                 while (*++parameter || lastchr)
@@ -230,7 +243,7 @@ void argparse(const char *parameter, int parameter_len, int (*arg_callback)(char
                     lastchr = false;
                     if (isspace(*parameter))
                         continue; /* eat spaces at beginning */
-                    if (!arg_callback(argchar, &parameter))
+                    if (!arg_callback(argchar, &parameter, userdata))
                         return;
                     break;
                 }
diff --git a/apps/plugins/lib/arg_helper.h b/apps/plugins/lib/arg_helper.h
index 2cf94ba1dd..638279ee42 100644
--- a/apps/plugins/lib/arg_helper.h
+++ b/apps/plugins/lib/arg_helper.h
@@ -54,7 +54,7 @@ int num_parse(const char **parameter, int *number, int *decimal);
 * Note: WS at beginning is stripped, **parameter starts at the first NON WS char
 * return 0 for arg_callback to quit parsing immediately
 */
-void argparse(const char *parameter, int parameter_len,
-              int (*arg_callback)(char argchar, const char **parameter));
+void argparse(const char *parameter, int parameter_len, void *userdata,
+         int (*arg_callback)(char argchar, const char **parameter, void *userdata));
 
 #endif /* _LIB_ARG_HELPER_H_ */
diff --git a/apps/plugins/lib/id3.c b/apps/plugins/lib/id3.c
index b0202b1d9c..6af715b1fb 100644
--- a/apps/plugins/lib/id3.c
+++ b/apps/plugins/lib/id3.c
@@ -35,5 +35,5 @@ bool retrieve_id3(struct mp3entry *id3, const char* file)
     }
 #endif
 
-    return !rb->mp3info(id3, file);
+    return rb->get_metadata(id3, -1, file);
 }
diff --git a/apps/plugins/lib/mul_id3.c b/apps/plugins/lib/mul_id3.c
index edf44f7282..3ab3a438c8 100644
--- a/apps/plugins/lib/mul_id3.c
+++ b/apps/plugins/lib/mul_id3.c
@@ -40,6 +40,13 @@ struct multiple_tracks_id3 {
 
 static struct multiple_tracks_id3 mul_id3;
 
+static const int32_t units[] =
+{
+    LANG_BYTE,
+    LANG_KIBIBYTE,
+    LANG_MEBIBYTE,
+    LANG_GIBIBYTE
+};
 
 /* Calculate modified FNV hash of string
  * has good avalanche behaviour and uniform distribution
@@ -130,9 +137,7 @@ void collect_id3(struct mp3entry *id3, bool is_first_track)
     mul_id3.filesize += id3->filesize;
 }
 
-/* (!) Note scale factor applied to returned metadata:
- *     - Unit for filesize will be KiB instead of Bytes
- *     - Unit for length will be s instead of ms
+/* (!) Note unit conversion below
  *
  *     Use result only as input for browse_id3,
  *     with the track_ct parameter set to  > 1.
@@ -159,8 +164,8 @@ void finalize_id3(struct mp3entry *id3)
     id3->track_string = NULL;
     id3->year_string = NULL;
     id3->year = mul_id3.year;
-    mul_id3.length /= 1000;
-    mul_id3.filesize >>= 10;
+    mul_id3.length /= 1000;  /* convert from ms to s */
+    mul_id3.filesize >>= 10; /* convert from B to KiB */
     id3->length = mul_id3.length > ULONG_MAX ? 0 : mul_id3.length;
     id3->filesize = mul_id3.filesize > INT_MAX ? 0 : mul_id3.filesize;
     id3->frequency = mul_id3.frequency;
@@ -172,3 +177,163 @@ void finalize_id3(struct mp3entry *id3)
     id3->track_level = 0;
     id3->album_level = 0;
 }
+
+unsigned long human_size(unsigned long long byte_count, int32_t *unit_lang_id)
+{
+    const size_t n = sizeof(units)/sizeof(units[0]);
+    unsigned int i;
+
+    /* margin set at 10K boundary: 10239 B +1 => 10 KB */
+    for(i = 0; i < n-1 && byte_count >= 10*1024; i++)
+        byte_count >>= 10; /* div by 1024 */
+
+    *unit_lang_id = units[i];
+    return (unsigned long)byte_count;
+}
+
+/* missing filetype attribute for images */
+static const char *image_exts[] = {"bmp","jpg","jpe","jpeg","png","ppm"};
+/* and videos */
+static const char *video_exts[] = {"mpg","mpeg","mpv","m2v"};
+
+static void display_dir_stats_vp(struct dir_stats *stats, struct viewport *vp,
+                                 struct screen *display)
+{
+    int32_t lang_size_unit;
+    unsigned long display_size = human_size(stats->byte_count, &lang_size_unit);
+    struct viewport *last_vp = display->set_viewport(vp);
+    display->clear_viewport();
+    display->putsf(0, 0, "Files: %d (%lu %s)", stats->file_count,
+                   display_size, rb->str(lang_size_unit));
+    display->putsf(0, 1, "Audio: %d", stats->audio_file_count);
+    if (stats->count_all)
+    {
+        display->putsf(0, 2, "Playlists: %d", stats->m3u_file_count);
+        display->putsf(0, 3, "Images: %d", stats->img_file_count);
+        display->putsf(0, 4, "Videos: %d", stats->vid_file_count);
+        display->putsf(0, 5, "Directories: %d", stats->dir_count);
+        display->putsf(0, 6, "Max files in Dir: %d", stats->max_files_in_dir);
+    }
+    else
+        display->putsf(0, 2, "Directories: %d", stats->dir_count);
+
+    display->update_viewport();
+    display->set_viewport(last_vp);
+}
+
+void display_dir_stats(struct dir_stats *stats)
+{
+    struct viewport vps[NB_SCREENS];
+    FOR_NB_SCREENS(i)
+    {
+        rb->viewport_set_defaults(&vps[i], i);
+        display_dir_stats_vp(stats, &vps[i], rb->screens[i]);
+    }
+}
+
+/* Recursively scans directories in search of files
+ * and informs the user of the progress.
+ */
+bool collect_dir_stats(struct dir_stats *stats, bool (*id3_cb)(const char*))
+{
+    bool result = true;
+    unsigned int files_in_dir = 0;
+    static unsigned int id3_count;
+    static unsigned long last_displayed, last_get_action;
+    struct dirent* entry;
+    int dirlen = rb->strlen(stats->dirname);
+    DIR* dir =  rb->opendir(stats->dirname);
+    if (!dir)
+    {
+        rb->splashf(HZ*2, "open error: %s", stats->dirname);
+        return false;
+    }
+    else if (!stats->dirname[1]) /* root dir */
+        stats->dirname[0] = dirlen = 0;
+
+    /* walk through the directory content */
+    while(result && (0 != (entry = rb->readdir(dir))))
+    {
+        struct dirinfo info = rb->dir_get_info(dir, entry);
+        if (info.attribute & ATTR_DIRECTORY)
+        {
+            if (!rb->strcmp((char *)entry->d_name, ".") ||
+                !rb->strcmp((char *)entry->d_name, ".."))
+                continue; /* skip these */
+
+            rb->snprintf(stats->dirname + dirlen, sizeof(stats->dirname) - dirlen,
+                         "/%s", entry->d_name); /* append name to current directory */
+            if (!id3_cb)
+            {
+                stats->dir_count++; /* new directory */
+                if (*rb->current_tick - last_displayed > (HZ/2))
+                {
+                    if (last_displayed)
+                        display_dir_stats(stats);
+                    last_displayed = *(rb->current_tick);
+                }
+            }
+            result = collect_dir_stats(stats, id3_cb); /* recursion */
+        }
+        else if (!id3_cb)
+        {
+            char *ptr;
+            stats->file_count++; /* new file */
+            files_in_dir++;
+            stats->byte_count += info.size;
+
+            int attr = rb->filetype_get_attr(entry->d_name);
+            if (attr == FILE_ATTR_AUDIO)
+                stats->audio_file_count++;
+            else if (attr == FILE_ATTR_M3U)
+                stats->m3u_file_count++;
+            /* image or video file attributes have to be compared manually */
+            else if (stats->count_all &&
+                     (ptr = rb->strrchr(entry->d_name,'.')))
+            {
+                unsigned int i;
+                ptr++;
+                for(i = 0; i < ARRAYLEN(image_exts); i++)
+                {
+                    if(!rb->strcasecmp(ptr, image_exts[i]))
+                    {
+                        stats->img_file_count++;
+                        break;
+                    }
+                }
+                if (i >= ARRAYLEN(image_exts)) {
+                    for(i = 0; i < ARRAYLEN(video_exts); i++) {
+                        if(!rb->strcasecmp(ptr, video_exts[i])) {
+                            stats->vid_file_count++;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        else if (rb->filetype_get_attr(entry->d_name) == FILE_ATTR_AUDIO)
+        {
+            rb->splash_progress(id3_count++, stats->audio_file_count,
+                                "%s (%s)",
+                                rb->str(LANG_WAIT), rb->str(LANG_OFF_ABORT));
+            rb->snprintf(stats->dirname + dirlen, sizeof(stats->dirname) - dirlen,
+                         "/%s", entry->d_name); /* append name to current directory */
+            id3_cb(stats->dirname); /* allow metadata to be collected */
+        }
+
+        if (TIME_AFTER(*(rb->current_tick), last_get_action + HZ/8))
+        {
+            if(ACTION_STD_CANCEL == rb->get_action(CONTEXT_STD,TIMEOUT_NOBLOCK))
+            {
+                stats->canceled = true;
+                result = false;
+            }
+            last_get_action = *(rb->current_tick);
+        }
+        rb->yield();
+    }
+    rb->closedir(dir);
+    if (stats->max_files_in_dir < files_in_dir)
+        stats->max_files_in_dir = files_in_dir;
+    return result;
+}
diff --git a/apps/plugins/lib/mul_id3.h b/apps/plugins/lib/mul_id3.h
index d08095de5c..1bb311c441 100644
--- a/apps/plugins/lib/mul_id3.h
+++ b/apps/plugins/lib/mul_id3.h
@@ -21,7 +21,39 @@
 #ifndef MUL_ID3_H
 #define MUL_ID3_H
 
+struct dir_stats {
+    char dirname[MAX_PATH];
+    unsigned int dir_count;
+    unsigned int file_count;
+    unsigned int audio_file_count;
+    unsigned int m3u_file_count;
+    unsigned int img_file_count;
+    unsigned int vid_file_count;
+    unsigned int max_files_in_dir;
+    unsigned long long byte_count;
+    bool count_all;
+    bool canceled;
+};
+
+/* create mp3entry that contains matching metadata from multiple tracks */
 void collect_id3(struct mp3entry *id3, bool is_first_track);
 void finalize_id3(struct mp3entry *id3);
 
+/* Traverse directory, collecting stats/track metadata.
+ *
+ * 1) If id3_cb is null, dir_properties calculates all dir stats, including the
+ * audio file count.
+ *
+ * 2) If id3_cb points to a function, dir_properties will call it for every audio
+ * file encountered, to allow the file's metadata to be collected. The displayed
+ * progress bar's maximum value is set to the audio file count.
+ * Stats are assumed to have already been generated by a preceding run.
+ *
+ * If the count_all parameter is set to false, images and videos are not counted,
+ * nor is the playlist, image, video or max file in dir count displayed.
+ */
+bool collect_dir_stats(struct dir_stats *stats, bool (*id3_cb)(const char*));
+void display_dir_stats(struct dir_stats *stats);
+unsigned long human_size(unsigned long long byte_count, int32_t *unit_lang_id);
+
 #endif /* MUL_ID3_H */
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/lua/rocklua.c b/apps/plugins/lua/rocklua.c
index 3cf0fce945..650c4d6dae 100644
--- a/apps/plugins/lua/rocklua.c
+++ b/apps/plugins/lua/rocklua.c
@@ -241,6 +241,20 @@ static void display_traceback(const char *errstr)
   rb->splash(10 * HZ, errstr);
 #endif
 }
+
+int browse_scripts(void)
+{
+    static char buf[MAX_PATH];
+    const char *fname = rb->plugin_get_current_filename();
+    /* strip plugin dir to save space in the param buffer */
+    if (rb->strncmp(fname, PLUGIN_DIR, sizeof(PLUGIN_DIR) - 1) == 0)
+        fname += sizeof(PLUGIN_DIR) - 1; /* leave slash */
+    /* -r return to this plugin, -f looking for lua files,
+       -s start in lua_scripts, -d lock to that directory */
+    snprintf(buf, sizeof(buf), "-r'%s'-f'.lua'-s'%s'-d",
+             fname, PLUGIN_DEMOS_DIR"/lua_scripts/");
+    return rb->plugin_open(VIEWERS_DIR "/file_picker.rock", buf);
+}
 /***************** Plugin Entry Point *****************/
 enum plugin_status plugin_start(const void* parameter)
 {
@@ -249,7 +263,10 @@ enum plugin_status plugin_start(const void* parameter)
     if (parameter == NULL)
     {
       if (!Ls)
+      {
         rb->splash(HZ, "Play a .lua file!");
+        return browse_scripts();
+      }
     }
     else
     {
diff --git a/apps/plugins/open_plugins.c b/apps/plugins/open_plugins.c
index 66200df8a5..7206fe2a49 100644
--- a/apps/plugins/open_plugins.c
+++ b/apps/plugins/open_plugins.c
@@ -643,7 +643,6 @@ static void synclist_set(char* menu_id, int selection, int items, int sel_size)
     rb->gui_synclist_init(&lists,list_get_name_cb,
                           menu_id, false, sel_size, NULL);
 
-    rb->gui_synclist_set_icon_callback(&lists,NULL);
     rb->gui_synclist_set_voice_callback(&lists, list_voice_cb);
     rb->gui_synclist_set_nb_items(&lists,items);
     rb->gui_synclist_select_item(&lists, selection);
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 87ad1a403f..e5492cf01c 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -4040,7 +4040,7 @@ static int show_id3_info(const char *selected_file)
     i = 0;
     do {
         file_name = i == 0 ? selected_file : get_track_filename(i);
-        if (rb->mp3info(&id3, file_name))
+        if (!rb->get_metadata(&id3, -1, file_name))
             return 0;
 
         if (is_multiple_tracks)
diff --git a/apps/plugins/pitch_screen.c b/apps/plugins/pitch_screen.c
index e24e0240a2..4af34fed3b 100644
--- a/apps/plugins/pitch_screen.c
+++ b/apps/plugins/pitch_screen.c
@@ -1120,8 +1120,9 @@ int gui_syncpitchscreen_run(void)
     return 0;
 }
 
-static int arg_callback(char argchar, const char **parameter)
+static int arg_callback(char argchar, const char **parameter, void *userdata)
 {
+    (void)userdata;
     int ret;
     long num, dec;
     bool bret;
@@ -1232,7 +1233,7 @@ enum plugin_status plugin_start(const void* parameter)
         struct pvars cur;
         fill_pitchvars(&cur);
         fill_pitchvars(&pitch_vars);
-        argparse((const char*) parameter, -1, &arg_callback);
+        argparse((const char*) parameter, -1, NULL, &arg_callback);
         if (pitch_vars.pitch != cur.pitch)
         {
             rb->sound_set_pitch(pitch_vars.pitch);
diff --git a/apps/plugins/playing_time.c b/apps/plugins/playing_time.c
index e465c35a18..47784cf85e 100644
--- a/apps/plugins/playing_time.c
+++ b/apps/plugins/playing_time.c
@@ -32,10 +32,10 @@ const unsigned char * const byte_units[] =
 };
 
 const int menu_items[] = {
-        LANG_PLAYTIME_ELAPSED,
-        LANG_PLAYTIME_REMAINING,
-        LANG_PLAYTIME_TRK_ELAPSED,
+        LANG_REMAINING,
+        LANG_ELAPSED,
         LANG_PLAYTIME_TRK_REMAINING,
+        LANG_PLAYTIME_TRK_ELAPSED,
         LANG_PLAYTIME_TRACK,
         LANG_PLAYTIME_STORAGE,
         LANG_PLAYTIME_AVG_TRACK_SIZE,
@@ -44,212 +44,237 @@ const int menu_items[] = {
 
 const unsigned char * const * const kibyte_units = &byte_units[1];
 
-enum ePT_SECS {
-    ePT_SECS_TTL = 0,
-    ePT_SECS_BEF,
-    ePT_SECS_AFT,
-    ePT_SECS_COUNT
-};
-
-enum ePT_KBS {
+enum ePT_SUM {
     /* Note: Order matters (voicing order of LANG_PLAYTIME_STORAGE) */
-    ePT_KBS_TTL = 0,
-    ePT_KBS_BEF,
-    ePT_KBS_AFT,
-    ePT_KBS_COUNT
+    ePT_TOTAL = 0,
+    ePT_ELAPSED,
+    ePT_REMAINING,
+
+    ePT_COUNT
 };
 
-/* playing_time screen context */
 struct playing_time_info {
-    int curr_index;         /* index of currently playing track in playlist */
-    int curr_display_index; /* display index of currently playing track in playlist */
-    int nb_tracks;          /* how many tracks in playlist */
-
-    /* seconds total, before, and after current position.  Datatype
-       allows for values up to 68years.  If I had kept it in ms
-       though, it would have overflowed at 24days, which takes
-       something like 8.5GB at 32kbps, and so we could conceivably
-       have playlists lasting longer than that. */
-    long secs[ePT_SECS_COUNT];
-    long trk_secs[ePT_SECS_COUNT];
-
-    /* kilobytes played total, before, and after current pos.
-       Kilobytes because bytes would overflow. Data type range is up
-       to 2TB. */
-    long kbs[ePT_KBS_COUNT];
+    char single_mode_tag[MAX_PATH]; /* Relevant tag when single mode enabled */
+    unsigned long long size[ePT_COUNT]; /*               File size of tracks */
+    unsigned long long length[ePT_COUNT]; /*                Length of tracks */
+    unsigned long curr_track_length[ePT_COUNT]; /*      Current track length */
+    int curr_track_index;   /*  Index of currently playing track in playlist */
+    int curr_display_index; /*      Display index of currently playing track */
+    int actual_index; /*            Display index in actually counted tracks */
+    int counted; /*                        Number of tracks already added up */
+    int nb_tracks; /*                           Number of tracks in playlist */
+    int error_count; /*    Number of tracks whose data couldn't be retrieved */
+    bool remaining_only; /*                 Whether to ignore elapsed tracks */
 };
 
+static int32_t single_mode_lang(void)
+{
+    switch (rb->global_settings->single_mode)
+    {
+        case SINGLE_MODE_ALBUM:
+            return LANG_ID3_ALBUM;
+        case SINGLE_MODE_ALBUM_ARTIST:
+            return LANG_ID3_ALBUMARTIST;
+        case SINGLE_MODE_ARTIST:
+            return LANG_ID3_ARTIST;
+        case SINGLE_MODE_COMPOSER:
+            return LANG_ID3_COMPOSER;
+        case SINGLE_MODE_GROUPING:
+            return LANG_ID3_GROUPING;
+        case SINGLE_MODE_GENRE:
+            return LANG_ID3_GENRE;
+        case SINGLE_MODE_TRACK:
+            return LANG_TRACK;
+    }
+    return LANG_OFF;
+}
+
+static char* single_mode_id3_tag(struct mp3entry *id3)
+{
+    switch (rb->global_settings->single_mode)
+    {
+        case SINGLE_MODE_ALBUM:
+            return id3->album;
+        case SINGLE_MODE_ALBUM_ARTIST:
+            return id3->albumartist;
+        case SINGLE_MODE_ARTIST:
+            return id3->artist;
+        case SINGLE_MODE_COMPOSER:
+            return id3->composer;
+        case SINGLE_MODE_GROUPING:
+            return id3->grouping;
+        case SINGLE_MODE_GENRE:
+            return id3->genre_string;
+    }
+    return NULL;
+}
+
 static char* get_percent_str(long percents)
 {
     static char val[10];
-    rb->snprintf(val, 10, rb->str(LANG_PERCENT_FORMAT), percents);
+    rb->snprintf(val, sizeof(val), rb->str(LANG_PERCENT_FORMAT), percents);
     return val;
 }
 
-static inline void prepare_time_string(char *buf, size_t buffer_len, long elapsed_pct, const char *timestr1, const char *timestr2)
+static inline void prepare_time_string(char *buf, size_t buffer_len,
+                                       long elapsed_pct, const char *timestr1,
+                                       const char *timestr2)
 {
     if (rb->lang_is_rtl())
-    {
         rb->snprintf(buf, buffer_len, "%s %s / %s",
-                get_percent_str(elapsed_pct), timestr2, timestr1);
-    }
+                     get_percent_str(elapsed_pct), timestr2, timestr1);
     else
-    {
         rb->snprintf(buf, buffer_len, "%s / %s %s",
-                timestr1, timestr2, get_percent_str(elapsed_pct));
-    }
+                     timestr1, timestr2, get_percent_str(elapsed_pct));
 }
 
 /* list callback for playing_time screen */
-static const char * playing_time_get_or_speak_info(int selected_item, void * data,
-                                                   char *buf, size_t buffer_len,
-                                                   bool say_it)
+static const char * pt_get_or_speak_info(int selected_item, void * data,
+                                         char *buf, size_t buffer_len,
+                                         bool say_it)
 {
     long elapsed_pct; /* percentage of duration elapsed */
     struct playing_time_info *pti = (struct playing_time_info *)data;
     int info_no = selected_item/2;
     const int menu_name_id = menu_items[info_no];
 
-    if (!(selected_item%2))
-    {/* header */
+    /* header */
+    if (!say_it && !(selected_item % 2))
         return rb->str(menu_name_id);
-    }
 
+    /* data */
     switch(info_no) {
-    case 0: { /* elapsed and total time */
+    case 0: { /* playlist remaining time */
+        char timestr[25];
+        rb->format_time_auto(timestr, sizeof(timestr),
+                             pti->length[ePT_REMAINING], UNIT_SEC, false);
+        rb->snprintf(buf, buffer_len, "%s", timestr);
+
+        if (say_it)
+            rb_talk_ids(false, menu_name_id,
+                        TALK_ID(pti->length[ePT_REMAINING], UNIT_TIME));
+        break;
+    }
+    case 1: { /* elapsed and total time */
         char timestr1[25], timestr2[25];
         rb->format_time_auto(timestr1, sizeof(timestr1),
-                         pti->secs[ePT_SECS_BEF], UNIT_SEC, true);
+                             pti->length[ePT_ELAPSED], UNIT_SEC, true);
 
         rb->format_time_auto(timestr2, sizeof(timestr2),
-                         pti->secs[ePT_SECS_TTL], UNIT_SEC, true);
+                             pti->length[ePT_TOTAL], UNIT_SEC, true);
 
-        if (pti->secs[ePT_SECS_TTL] == 0)
+        if (pti->length[ePT_TOTAL] == 0)
             elapsed_pct = 0;
-        else if (pti->secs[ePT_SECS_TTL] <= 0xFFFFFF)
+        else if (pti->length[ePT_TOTAL] <= 0xFFFFFF)
         {
-            elapsed_pct = (pti->secs[ePT_SECS_BEF] * 100
-                            / pti->secs[ePT_SECS_TTL]);
+            elapsed_pct = (pti->length[ePT_ELAPSED] * 100
+                           / pti->length[ePT_TOTAL]);
         }
         else /* sacrifice some precision to avoid overflow */
         {
-            elapsed_pct = (pti->secs[ePT_SECS_BEF] >> 7) * 100
-                           / (pti->secs[ePT_SECS_TTL] >> 7);
+            elapsed_pct = (pti->length[ePT_ELAPSED] >> 7) * 100
+                          / (pti->length[ePT_TOTAL] >> 7);
         }
         prepare_time_string(buf, buffer_len, elapsed_pct, timestr1, timestr2);
 
         if (say_it)
             rb_talk_ids(false, menu_name_id,
-                     TALK_ID(pti->secs[ePT_SECS_BEF], UNIT_TIME),
-                     VOICE_OF,
-                     TALK_ID(pti->secs[ePT_SECS_TTL], UNIT_TIME),
-                     VOICE_PAUSE,
-                     TALK_ID(elapsed_pct, UNIT_PERCENT));
+                        TALK_ID(pti->length[ePT_ELAPSED], UNIT_TIME),
+                        VOICE_OF,
+                        TALK_ID(pti->length[ePT_TOTAL], UNIT_TIME),
+                        VOICE_PAUSE,
+                        TALK_ID(elapsed_pct, UNIT_PERCENT));
         break;
     }
-    case 1: { /* playlist remaining time */
+    case 2: { /* track remaining time */
         char timestr[25];
-        rb->format_time_auto(timestr, sizeof(timestr), pti->secs[ePT_SECS_AFT],
-            UNIT_SEC, false);
+        rb->format_time_auto(timestr, sizeof(timestr),
+                             pti->curr_track_length[ePT_REMAINING], UNIT_SEC, false);
         rb->snprintf(buf, buffer_len, "%s", timestr);
 
         if (say_it)
-          rb_talk_ids(false, menu_name_id,
-                     TALK_ID(pti->secs[ePT_SECS_AFT], UNIT_TIME));
+            rb_talk_ids(false, menu_name_id,
+                        TALK_ID(pti->curr_track_length[ePT_REMAINING], UNIT_TIME));
         break;
     }
-    case 2: { /* track elapsed and duration */
+    case 3: { /* track elapsed and duration */
         char timestr1[25], timestr2[25];
 
-        rb->format_time_auto(timestr1, sizeof(timestr1), pti->trk_secs[ePT_SECS_BEF],
-            UNIT_SEC, true);
-        rb->format_time_auto(timestr2, sizeof(timestr2), pti->trk_secs[ePT_SECS_TTL],
-            UNIT_SEC, true);
+        rb->format_time_auto(timestr1, sizeof(timestr1),
+                             pti->curr_track_length[ePT_ELAPSED], UNIT_SEC, true);
+        rb->format_time_auto(timestr2, sizeof(timestr2),
+                             pti->curr_track_length[ePT_TOTAL], UNIT_SEC, true);
 
-        if (pti->trk_secs[ePT_SECS_TTL] == 0)
+        if (pti->curr_track_length[ePT_TOTAL] == 0)
             elapsed_pct = 0;
-        else if (pti->trk_secs[ePT_SECS_TTL] <= 0xFFFFFF)
+        else if (pti->curr_track_length[ePT_TOTAL] <= 0xFFFFFF)
         {
-            elapsed_pct = (pti->trk_secs[ePT_SECS_BEF] * 100
-                           / pti->trk_secs[ePT_SECS_TTL]);
+            elapsed_pct = (pti->curr_track_length[ePT_ELAPSED] * 100
+                           / pti->curr_track_length[ePT_TOTAL]);
         }
         else /* sacrifice some precision to avoid overflow */
         {
-            elapsed_pct = (pti->trk_secs[ePT_SECS_BEF] >> 7) * 100
-                            / (pti->trk_secs[ePT_SECS_TTL] >> 7);
+            elapsed_pct = (pti->curr_track_length[ePT_ELAPSED] >> 7) * 100
+                          / (pti->curr_track_length[ePT_TOTAL] >> 7);
         }
         prepare_time_string(buf, buffer_len, elapsed_pct, timestr1, timestr2);
 
         if (say_it)
             rb_talk_ids(false, menu_name_id,
-                     TALK_ID(pti->trk_secs[ePT_SECS_BEF], UNIT_TIME),
-                     VOICE_OF,
-                     TALK_ID(pti->trk_secs[ePT_SECS_TTL], UNIT_TIME),
-                     VOICE_PAUSE,
-                     TALK_ID(elapsed_pct, UNIT_PERCENT));
-        break;
-    }
-    case 3: { /* track remaining time */
-        char timestr[25];
-        rb->format_time_auto(timestr, sizeof(timestr), pti->trk_secs[ePT_SECS_AFT],
-            UNIT_SEC, false);
-        rb->snprintf(buf, buffer_len, "%s", timestr);
-
-        if (say_it)
-          rb_talk_ids(false, menu_name_id,
-                     TALK_ID(pti->trk_secs[ePT_SECS_AFT], UNIT_TIME));
+                        TALK_ID(pti->curr_track_length[ePT_ELAPSED], UNIT_TIME),
+                        VOICE_OF,
+                        TALK_ID(pti->curr_track_length[ePT_TOTAL], UNIT_TIME),
+                        VOICE_PAUSE,
+                        TALK_ID(elapsed_pct, UNIT_PERCENT));
         break;
     }
     case 4: { /* track index */
-        int track_pct = pti->curr_display_index * 100 / pti->nb_tracks;
+        int track_pct = pti->actual_index * 100 / pti->counted;
 
         if (rb->lang_is_rtl())
-        {
-            rb->snprintf(buf, buffer_len, "%s %d / %d",
-                    get_percent_str(track_pct), pti->nb_tracks, pti->curr_display_index);
-        }
+            rb->snprintf(buf, buffer_len, "%s %d / %d", get_percent_str(track_pct),
+                         pti->counted, pti->actual_index);
         else
-        {
-            rb->snprintf(buf, buffer_len, "%d / %d %s",
-                    pti->curr_display_index, pti->nb_tracks, get_percent_str(track_pct));
-        }
+            rb->snprintf(buf, buffer_len, "%d / %d %s", pti->actual_index,
+                         pti->counted, get_percent_str(track_pct));
 
         if (say_it)
-          rb_talk_ids(false, menu_name_id,
-                     TALK_ID(pti->curr_display_index, UNIT_INT),
-                     VOICE_OF,
-                     TALK_ID(pti->nb_tracks, UNIT_INT),
-                     VOICE_PAUSE,
-                     TALK_ID(track_pct, UNIT_PERCENT));
+            rb_talk_ids(false, menu_name_id,
+                        TALK_ID(pti->actual_index, UNIT_INT),
+                        VOICE_OF,
+                        TALK_ID(pti->counted, UNIT_INT),
+                        VOICE_PAUSE,
+                        TALK_ID(track_pct, UNIT_PERCENT));
         break;
     }
     case 5: { /* storage size */
         int i;
-        char kbstr[ePT_KBS_COUNT][20];
+        char kbstr[ePT_COUNT][20];
 
-        for (i = 0; i < ePT_KBS_COUNT; i++) {
+        for (i = 0; i < ePT_COUNT; i++) {
             rb->output_dyn_value(kbstr[i], sizeof(kbstr[i]),
-                             pti->kbs[i], kibyte_units, 3, true);
+                                 pti->size[i], kibyte_units, 3, true);
         }
-        rb->snprintf(buf, buffer_len, "%s (%s / %s)",
-                 kbstr[ePT_KBS_TTL], kbstr[ePT_KBS_BEF],kbstr[ePT_KBS_AFT]);
+        rb->snprintf(buf, buffer_len, "%s (%s / %s)", kbstr[ePT_TOTAL],
+                     kbstr[ePT_ELAPSED], kbstr[ePT_REMAINING]);
 
         if (say_it) {
-            int32_t voice_ids[ePT_KBS_COUNT];
-            voice_ids[ePT_KBS_TTL] = menu_name_id;
-            voice_ids[ePT_KBS_BEF] = VOICE_PLAYTIME_DONE;
-            voice_ids[ePT_KBS_AFT] = LANG_PLAYTIME_REMAINING;
+            int32_t voice_ids[ePT_COUNT];
+            voice_ids[ePT_TOTAL] = menu_name_id;
+            voice_ids[ePT_ELAPSED] = VOICE_PLAYTIME_DONE;
+            voice_ids[ePT_REMAINING] = LANG_REMAINING;
 
-            for (i = 0; i < ePT_KBS_COUNT; i++) {
+            for (i = 0; i < ePT_COUNT; i++)
+            {
                 rb_talk_ids(i > 0, VOICE_PAUSE, voice_ids[i]);
-                rb->output_dyn_value(NULL, 0, pti->kbs[i], kibyte_units, 3, true);
+                rb->output_dyn_value(NULL, 0, pti->size[i], kibyte_units, 3, true);
             }
         }
         break;
     }
     case 6: { /* Average track file size */
         char str[20];
-        long avg_track_size = pti->kbs[ePT_KBS_TTL] / pti->nb_tracks;
+        long avg_track_size = pti->size[ePT_TOTAL] / pti->counted;
         rb->output_dyn_value(str, sizeof(str), avg_track_size, kibyte_units, 3, true);
         rb->snprintf(buf, buffer_len, "%s", str);
 
@@ -261,163 +286,268 @@ static const char * playing_time_get_or_speak_info(int selected_item, void * dat
     }
     case 7: { /* Average bitrate */
         /* Convert power of 2 kilobytes to power of 10 kilobits */
-        long avg_bitrate = (pti->kbs[ePT_KBS_TTL] / pti->secs[ePT_SECS_TTL]
+        long avg_bitrate = (pti->size[ePT_TOTAL] / pti->length[ePT_TOTAL]
                             * 1024 * 8 / 1000);
         rb->snprintf(buf, buffer_len, "%ld  kbps", avg_bitrate);
 
         if (say_it)
-          rb_talk_ids(false, menu_name_id,
-                   TALK_ID(avg_bitrate, UNIT_KBIT));
+            rb_talk_ids(false, menu_name_id,
+                        TALK_ID(avg_bitrate, UNIT_KBIT));
         break;
     }
     }
     return buf;
 }
 
-static const char * playing_time_get_info(int selected_item, void * data,
-                                          char *buffer, size_t buffer_len)
+static const char * pt_get_info(int selected_item, void * data,
+                                char *buffer, size_t buffer_len)
 {
-    return playing_time_get_or_speak_info(selected_item, data,
-                                          buffer, buffer_len, false);
+    return pt_get_or_speak_info(selected_item, data,
+                                buffer, buffer_len, false);
 }
 
-static int playing_time_speak_info(int selected_item, void * data)
+static int pt_speak_info(int selected_item, void * data)
 {
     static char buffer[MAX_PATH];
-    playing_time_get_or_speak_info(selected_item, data,
-                                   buffer, MAX_PATH, true);
+    pt_get_or_speak_info(selected_item, data, buffer, sizeof(buffer), true);
     return 0;
 }
 
-/* playing time screen: shows total and elapsed playlist duration and
-   other stats */
-static bool playing_time(void)
+static bool pt_display_stats(struct playing_time_info *pti)
 {
-    int error_count = 0;
-    unsigned long talked_tick = *rb->current_tick;
-    struct playing_time_info pti;
-    struct playlist_track_info pltrack;
-    struct mp3entry id3;
-    int i, index, fd;
+    struct gui_synclist pt_lists;
+    rb->gui_synclist_init(&pt_lists, &pt_get_info, pti, true, 2, NULL);
+    if (rb->global_settings->talk_menu)
+        rb->gui_synclist_set_voice_callback(&pt_lists, pt_speak_info);
+    rb->gui_synclist_set_nb_items(&pt_lists, pti->remaining_only ? 2 : 8*2);
+    rb->gui_synclist_set_title(&pt_lists, *pti->single_mode_tag ?
+                                          rb->str(single_mode_lang()) :
+                                          rb->str(LANG_PLAYLIST), NOICON);
+    rb->gui_synclist_draw(&pt_lists);
+    rb->gui_synclist_speak_item(&pt_lists);
+    while (true)
+    {
+        int action = rb->get_action(CONTEXT_LIST, HZ/2);
+        if (rb->gui_synclist_do_button(&pt_lists, &action) == 0
+            && action != ACTION_NONE && action != ACTION_UNKNOWN)
+        {
+            bool usb = rb->default_event_handler(action) == SYS_USB_CONNECTED;
 
-    pti.nb_tracks = rb->playlist_amount();
-    rb->playlist_get_resume_info(&pti.curr_index);
-    struct mp3entry *curr_id3 = rb->audio_current_track();
-    if (pti.curr_index == -1 || !curr_id3)
-        return false;
-    pti.curr_display_index = rb->playlist_get_display_index();
-
-    pti.secs[ePT_SECS_BEF] = pti.trk_secs[ePT_SECS_BEF] = curr_id3->elapsed / 1000;
-    pti.secs[ePT_SECS_AFT] = pti.trk_secs[ePT_SECS_AFT]
-        = (curr_id3->length -curr_id3->elapsed) / 1000;
-    pti.kbs[ePT_KBS_BEF] = curr_id3->offset / 1024;
-    pti.kbs[ePT_KBS_AFT] = (curr_id3->filesize -curr_id3->offset) / 1024;
-
-    rb->splash(0, ID2P(LANG_WAIT));
-    rb->splash_progress_set_delay(5 * HZ);
-    /* Go through each file in the playlist and get its stats. For
-       huge playlists this can take a while... The reference position
-       is the position at the moment this function was invoked,
-       although playback continues forward. */
-    index = rb->playlist_get_first_index(NULL);
-    for (i = 0; i < pti.nb_tracks; i++, index++) {
-
-        if (index == pti.nb_tracks)
-            index = 0;
-
-        /* Show a splash while we are loading. */
-        rb->splash_progress(i, pti.nb_tracks,
-                         "%s (%s)", rb->str(LANG_WAIT), rb->str(LANG_OFF_ABORT));
-
-        /* Voice equivalent */
-        if (TIME_AFTER(*rb->current_tick, talked_tick + 5 * HZ)) {
-            talked_tick = *rb->current_tick;
-            rb_talk_ids(false, LANG_LOADING_PERCENT,
-                     TALK_ID(i * 100 / pti.nb_tracks, UNIT_PERCENT));
+            if (!usb && IS_SYSEVENT(action))
+                continue;
+
+            rb->talk_force_shutup();
+            return usb;
         }
-        if (rb->action_userabort(TIMEOUT_NOBLOCK))
-            goto exit;
+    }
+    return false;
+}
 
-        if (index == pti.curr_index)
-            continue;
+static const char *pt_options_name(int selected_item, void * data,
+                                   char *buf, size_t buf_size)
+{
+    (void) data;
+    (void) buf;
+    (void) buf_size;
+    return selected_item == 0 ? rb->str(LANG_ALL) :
+           selected_item == 1 ? rb->str(LANG_REMAINING) :
+           rb->str(single_mode_lang());
+}
 
-        if (rb->playlist_get_track_info(NULL, index, &pltrack) >= 0)
-        {
-            bool ret = false;
-            if ((fd = rb->open(pltrack.filename, O_RDONLY)) >= 0)
-            {
-                ret = rb->get_metadata(&id3, fd, pltrack.filename);
-                rb->close(fd);
-                if (ret)
-                {
-                    if (pltrack.display_index < pti.curr_display_index) {
-                        pti.secs[ePT_SECS_BEF] += id3.length / 1000;
-                        pti.kbs[ePT_KBS_BEF] += id3.filesize / 1024;
-                    } else {
-                        pti.secs[ePT_SECS_AFT] += id3.length / 1000;
-                        pti.kbs[ePT_KBS_AFT] += id3.filesize / 1024;
-                    }
-                }
-            }
+static int pt_options_speak(int selected_item, void * data)
+{
+    (void) data;
+    rb->talk_id(selected_item == 0 ? LANG_ALL :
+                selected_item == 1 ? LANG_REMAINING :
+                single_mode_lang(), false);
+    return 0;
+}
 
-            if (!ret)
+static int pt_options(struct playing_time_info *pti)
+{
+    struct gui_synclist pt_options;
+    rb->gui_synclist_init(&pt_options, &pt_options_name, NULL, true, 1, NULL);
+    if (rb->global_settings->talk_menu)
+        rb->gui_synclist_set_voice_callback(&pt_options, pt_options_speak);
+    rb->gui_synclist_set_nb_items(&pt_options, *pti->single_mode_tag ? 3 : 2);
+    rb->gui_synclist_set_title(&pt_options, rb->str(LANG_PLAYING_TIME), NOICON);
+    rb->gui_synclist_draw(&pt_options);
+    rb->gui_synclist_speak_item(&pt_options);
+
+    while(true)
+    {
+        int button = rb->get_action(CONTEXT_LIST, HZ);
+        if (rb->gui_synclist_do_button(&pt_options, &button))
+            continue;
+        switch(button)
+        {
+            case ACTION_STD_OK:
             {
-                error_count++;
-                continue;
+                int sel = rb->gui_synclist_get_sel_pos(&pt_options);
+                if (sel < 2)
+                    *pti->single_mode_tag = 0;
+                if (sel == 1)
+                    pti->remaining_only = true;
+                return -1;
             }
-        }
-        else
-        {
-            error_count++;
-            break;
+            case ACTION_STD_CANCEL:
+                return 0;
+            default:
+                if (rb->default_event_handler(button) == SYS_USB_CONNECTED)
+                    return 1;
         }
     }
+}
+
+static void pt_store_converted_totals(struct playing_time_info *pti)
+{
+    /* convert units from ms to s */
+    pti->length[ePT_ELAPSED] /= 1000;
+    pti->length[ePT_REMAINING] /= 1000;
+    pti->curr_track_length[ePT_ELAPSED] /= 1000;
+    pti->curr_track_length[ePT_REMAINING] /= 1000;
+    /* convert units from Bytes to KiB  */
+    pti->size[ePT_ELAPSED] >>= 10;
+    pti->size[ePT_REMAINING] >>= 10;
+
+    pti->length[ePT_TOTAL] = pti->length[ePT_ELAPSED] + pti->length[ePT_REMAINING];
+    pti->curr_track_length[ePT_TOTAL] = pti->curr_track_length[ePT_ELAPSED]
+                                       + pti->curr_track_length[ePT_REMAINING];
+    pti->size[ePT_TOTAL] = pti->size[ePT_ELAPSED] + pti->size[ePT_REMAINING];
+}
 
-    if (error_count > 0)
+static int pt_add_track(int i, enum ePT_SUM section, struct playing_time_info *pti)
+{
+    struct mp3entry id3;
+    struct playlist_track_info pl_track;
+    static unsigned long talked_tick;
+    int progress_total = pti->remaining_only ?
+                         pti->nb_tracks - pti->curr_display_index :
+                         pti->nb_tracks;
+
+    rb->splash_progress(pti->counted, progress_total, "%s (%s)",
+                        rb->str(LANG_WAIT), rb->str(LANG_OFF_ABORT));
+
+    if (TIME_AFTER(*rb->current_tick, talked_tick + HZ*5))
     {
-        rb->splash(HZ, ID2P(LANG_PLAYTIME_ERROR));
+        talked_tick = *rb->current_tick;
+        rb_talk_ids(false, LANG_LOADING_PERCENT,
+                    TALK_ID(pti->counted * 100 / progress_total,
+                    UNIT_PERCENT));
     }
 
-    pti.nb_tracks -= error_count;
-    pti.secs[ePT_SECS_TTL] = pti.secs[ePT_SECS_BEF] + pti.secs[ePT_SECS_AFT];
-    pti.trk_secs[ePT_SECS_TTL] = pti.trk_secs[ePT_SECS_BEF] + pti.trk_secs[ePT_SECS_AFT];
-    pti.kbs[ePT_KBS_TTL] = pti.kbs[ePT_KBS_BEF] + pti.kbs[ePT_KBS_AFT];
+    if (rb->action_userabort(TIMEOUT_NOBLOCK))
+        return -1;
+    else if (rb->playlist_get_track_info(NULL, i, &pl_track) < 0
+             || !rb->get_metadata(&id3, -1, pl_track.filename))
+    {
+        pti->error_count++;
+        return -2;
+    }
+    else if(*pti->single_mode_tag &&    /* single mode tag doesn't match */
+            rb->strcmp(pti->single_mode_tag, single_mode_id3_tag(&id3) ?: ""))
+        return 1;
 
-    struct gui_synclist pt_lists;
-    int key;
+    pti->length[section] += id3.length;
+    pti->size[section] += id3.filesize;
+    pti->counted++;
+    return 0;
+}
 
-    rb->gui_synclist_init(&pt_lists, &playing_time_get_info, &pti, true, 2, NULL);
-    if (rb->global_settings->talk_menu)
-        rb->gui_synclist_set_voice_callback(&pt_lists, playing_time_speak_info);
-    rb->gui_synclist_set_nb_items(&pt_lists, 16);
-    rb->gui_synclist_set_title(&pt_lists, rb->str(LANG_PLAYING_TIME), NOICON);
-    rb->gui_synclist_draw(&pt_lists);
-    rb->gui_synclist_speak_item(&pt_lists);
-    while (true) {
-        if (rb->list_do_action(CONTEXT_LIST, HZ/2, &pt_lists, &key) == 0
-           && key!=ACTION_NONE && key!=ACTION_UNKNOWN)
-        {
-            bool usb = rb->default_event_handler(key) == SYS_USB_CONNECTED;
+static bool pt_add_remaining(struct playing_time_info *pti)
+{
+    int display_index = pti->curr_display_index + 1;
+    for (int i = pti->curr_track_index + 1; display_index <= pti->nb_tracks; i++, display_index++)
+    {
+        if (i == pti->nb_tracks)
+            i = 0;
 
-            if (!usb && IS_SYSEVENT(key))
-                continue;
+        int ret = pt_add_track(i, ePT_REMAINING, pti);
+        if (ret == 1)
+            break;
+        else if (ret == -1)
+            return false;
+    }
+    return true;
+}
 
-            rb->talk_force_shutup();
-            return usb;
-        }
+static bool pt_add_elapsed(struct playing_time_info *pti)
+{
+    int display_index = pti->curr_display_index - 1;
+    for (int i = pti->curr_track_index - 1; display_index > 0; i--, display_index--)
+    {
+        if (i < 0)
+            i = pti->nb_tracks - 1;
 
+        int ret = pt_add_track(i, ePT_ELAPSED, pti);
+        if (ret == 1)
+            break;
+        else if (ret == -1)
+            return false;
+        else if (ret == 0)
+            pti->actual_index++;
     }
+    return true;
+}
 
- exit:
-    return false;
+static bool pt_add_curr_track(struct playing_time_info *pti)
+{
+    struct mp3entry *curr_id3 = rb->audio_current_track();
+    rb->playlist_get_resume_info(&pti->curr_track_index);
+
+    if (pti->curr_track_index == -1 || !curr_id3)
+        return false;
+
+    pti->curr_display_index = rb->playlist_get_display_index();
+    pti->length[ePT_ELAPSED] = pti->curr_track_length[ePT_ELAPSED]
+                             = curr_id3->elapsed;
+    pti->length[ePT_REMAINING] = pti->curr_track_length[ePT_REMAINING]
+                               = curr_id3->length - curr_id3->elapsed;
+    pti->size[ePT_ELAPSED] = curr_id3->offset;
+    pti->size[ePT_REMAINING] = curr_id3->filesize - curr_id3->offset;
+    pti->actual_index = pti->counted = 1;
+    rb->strlcpy(pti->single_mode_tag, single_mode_id3_tag(curr_id3) ?: "",
+                sizeof(pti->single_mode_tag));
+    return true;
+}
+
+/* playing time screen: shows total and elapsed playlist duration and
+   other stats */
+static bool playing_time(void)
+{
+    struct playing_time_info pti;
+    rb->memset(&pti, 0, sizeof(struct playing_time_info));
+
+    if (!pt_add_curr_track(&pti))
+        return false;
+
+    int opt = pt_options(&pti);
+    if (opt > -1)
+        return opt;
+
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    rb->cpu_boost(true);
+#endif
+    rb->splash_progress_set_delay(HZ/2);
+    pti.nb_tracks = rb->playlist_amount();
+    int success = (pti.remaining_only || pt_add_elapsed(&pti)) && pt_add_remaining(&pti);
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    rb->cpu_boost(false);
+#endif
+    if (!success)
+        return false;
+    if (pti.error_count > 0)
+        rb->splash(HZ, ID2P(LANG_PLAYTIME_ERROR));
+
+    pt_store_converted_totals(&pti);
+    return pt_display_stats(&pti);
 }
 
 /* this is the plugin entry point */
 enum plugin_status plugin_start(const void* parameter)
 {
-    enum plugin_status status = PLUGIN_OK;
-
     (void)parameter;
+    enum plugin_status status = PLUGIN_OK;
 
     if (!rb->audio_status())
     {
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index 32bc8b9150..dcd3d89edf 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -25,14 +25,6 @@
     #define ARRAY_SIZE(x) (sizeof((x)) / sizeof((x)[0]))
 #endif
 
-struct dir_stats {
-    char dirname[MAX_PATH];
-    int len;
-    unsigned int dir_count;
-    unsigned int file_count;
-    unsigned long long byte_count;
-};
-
 enum props_types {
     PROPS_FILE = 0,
     PROPS_PLAYLIST,
@@ -41,26 +33,20 @@ enum props_types {
     PROPS_DIR
 };
 
-static int props_type = PROPS_FILE;
-
+static struct gui_synclist properties_lists;
 static struct mp3entry id3;
-static int mul_id3_count;
-static int skipped_count;
+static struct tm tm;
+static unsigned long display_size;
+static int32_t lang_size_unit;
+static int props_type, mul_id3_count, skipped_count;
 
-static char str_filename[MAX_PATH];
-static char str_dirname[MAX_PATH];
-static char str_size[64];
-static char str_dircount[64];
-static char str_filecount[64];
-static char str_date[64];
-static char str_time[64];
+static char str_filename[MAX_PATH], str_dirname[MAX_PATH],
+            str_size[64], str_dircount[64], str_filecount[64],
+            str_audio_filecount[64], str_date[64], str_time[64];
 
-static unsigned long nsize;
-static int32_t size_unit;
-static struct tm tm;
 
 #define NUM_FILE_PROPERTIES 5
-#define NUM_PLAYLIST_PROPERTIES 1 + NUM_FILE_PROPERTIES
+#define NUM_PLAYLIST_PROPERTIES (1 + NUM_FILE_PROPERTIES)
 static const unsigned char* const props_file[] =
 {
     ID2P(LANG_PROPERTIES_PATH),       str_dirname,
@@ -68,170 +54,44 @@ static const unsigned char* const props_file[] =
     ID2P(LANG_PROPERTIES_SIZE),       str_size,
     ID2P(LANG_PROPERTIES_DATE),       str_date,
     ID2P(LANG_PROPERTIES_TIME),       str_time,
+
     ID2P(LANG_MENU_SHOW_ID3_INFO),    "...",
 };
 
 #define NUM_DIR_PROPERTIES 4
+#define NUM_AUDIODIR_PROPERTIES (1 + NUM_DIR_PROPERTIES)
 static const unsigned char* const props_dir[] =
 {
     ID2P(LANG_PROPERTIES_PATH),       str_dirname,
     ID2P(LANG_PROPERTIES_SUBDIRS),    str_dircount,
     ID2P(LANG_PROPERTIES_FILES),      str_filecount,
     ID2P(LANG_PROPERTIES_SIZE),       str_size,
-};
 
-static const int32_t units[] =
-{
-    LANG_BYTE,
-    LANG_KIBIBYTE,
-    LANG_MEBIBYTE,
-    LANG_GIBIBYTE
+    ID2P(LANG_MENU_SHOW_ID3_INFO),    str_audio_filecount,
 };
 
-static unsigned human_size_log(unsigned long long size)
-{
-    const size_t n = sizeof(units)/sizeof(units[0]);
-
-    unsigned i;
-    /* margin set at 10K boundary: 10239 B +1 => 10 KB */
-    for(i=0; i < n-1 && size >= 10*1024; i++)
-        size >>= 10; /* div by 1024 */
-
-    return i;
-}
-
-static bool file_properties(const char* selected_file)
-{
-    bool found = false;
-    DIR* dir;
-    struct dirent* entry;
-
-    dir = rb->opendir(str_dirname);
-    if (dir)
-    {
-        while(0 != (entry = rb->readdir(dir)))
-        {
-            struct dirinfo info = rb->dir_get_info(dir, entry);
-            if(!rb->strcmp(entry->d_name, str_filename))
-            {
-                unsigned log;
-                log = human_size_log((unsigned long)info.size);
-                nsize = ((unsigned long)info.size) >> (log*10);
-                size_unit = units[log];
-                rb->snprintf(str_size, sizeof str_size, "%lu %s",
-                             nsize, rb->str(size_unit));
-                rb->gmtime_r(&info.mtime, &tm);
-                rb->snprintf(str_date, sizeof str_date, "%04d/%02d/%02d",
-                    tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
-                rb->snprintf(str_time, sizeof str_time, "%02d:%02d:%02d",
-                    tm.tm_hour, tm.tm_min, tm.tm_sec);
-
-                if (!rb->mp3info(&id3, selected_file))
-                    props_type = PROPS_ID3;
-                found = true;
-                break;
-            }
-        }
-        rb->closedir(dir);
-    }
-    return found;
-}
-
-static bool _dir_properties(struct dir_stats *stats)
-{
-    /* recursively scan directories in search of files
-       and informs the user of the progress */
-    bool result;
-    static long lasttick=0;
-    int dirlen;
-    DIR* dir;
-    struct dirent* entry;
-
-    result = true;
-    dirlen = rb->strlen(stats->dirname);
-    dir = rb->opendir(stats->dirname);
-    if (!dir)
-    {
-        rb->splashf(HZ*2, "%s", stats->dirname);
-        return false; /* open error */
-    }
-
-    /* walk through the directory content */
-    while(result && (0 != (entry = rb->readdir(dir))))
-    {
-        struct dirinfo info = rb->dir_get_info(dir, entry);
-        /* append name to current directory */
-        rb->snprintf(stats->dirname+dirlen, stats->len-dirlen, "/%s",
-                     entry->d_name);
-
-        if (info.attribute & ATTR_DIRECTORY)
-        {
-            if (!rb->strcmp((char *)entry->d_name, ".") ||
-                !rb->strcmp((char *)entry->d_name, ".."))
-                continue; /* skip these */
-
-            stats->dir_count++; /* new directory */
-            if (*rb->current_tick - lasttick > (HZ/8))
-            {
-                unsigned log;
-                lasttick = *rb->current_tick;
-                rb->lcd_clear_display();
-                rb->lcd_puts(0,0,"SCANNING...");
-                rb->lcd_puts(0,1,stats->dirname);
-                rb->lcd_putsf(0,2,"Directories: %d", stats->dir_count);
-                rb->lcd_putsf(0,3,"Files: %d", stats->file_count);
-                log = human_size_log(stats->byte_count);
-                rb->lcd_putsf(0,4,"Size: %lu %s",
-                              (unsigned long)(stats->byte_count >> (10*log)),
-                              rb->str(units[log]));
-                rb->lcd_update();
-            }
-
-             /* recursion */
-            result = _dir_properties(stats);
-        }
-        else
-        {
-            stats->file_count++; /* new file */
-            stats->byte_count += info.size;
-        }
-        if(ACTION_STD_CANCEL == rb->get_action(CONTEXT_STD,TIMEOUT_NOBLOCK))
-            result = false;
-        rb->yield();
-    }
-    rb->closedir(dir);
-    return result;
-}
-
 static bool dir_properties(const char* selected_file, struct dir_stats *stats)
 {
-    unsigned log;
-
-    rb->strlcpy(stats->dirname, selected_file, MAX_PATH);
+    rb->strlcpy(stats->dirname, selected_file, sizeof(stats->dirname));
 
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
-    rb->cpu_boost(true);
+        rb->cpu_boost(true);
 #endif
-
-    if (!_dir_properties(stats))
-    {
+    bool success = collect_dir_stats(stats, NULL);
 #ifdef HAVE_ADJUSTABLE_CPU_FREQ
         rb->cpu_boost(false);
 #endif
+    if (!success)
         return false;
-    }
 
-#ifdef HAVE_ADJUSTABLE_CPU_FREQ
-    rb->cpu_boost(false);
-#endif
-
-    rb->strlcpy(str_dirname, selected_file, MAX_PATH);
+    rb->strlcpy(str_dirname, selected_file, sizeof(str_dirname));
     rb->snprintf(str_dircount, sizeof str_dircount, "%d", stats->dir_count);
     rb->snprintf(str_filecount, sizeof str_filecount, "%d", stats->file_count);
-    log = human_size_log(stats->byte_count);
-    nsize = (long) (stats->byte_count >> (log*10));
-    size_unit = units[log];
-    rb->snprintf(str_size, sizeof str_size, "%ld %s", nsize, rb->str(size_unit));
+    rb->snprintf(str_audio_filecount, sizeof str_filecount, "%d",
+                 stats->audio_file_count);
+    display_size = human_size(stats->byte_count, &lang_size_unit);
+    rb->snprintf(str_size, sizeof str_size, "%lu %s", display_size,
+                 rb->str(lang_size_unit));
     return true;
 }
 
@@ -246,12 +106,11 @@ static const char * get_props(int selected_item, void* data,
 {
     (void)data;
     if (PROPS_DIR == props_type)
-        rb->strlcpy(buffer, selected_item >= (int)(ARRAY_SIZE(props_dir)) ? "ERROR" :
-                                (char *) p2str(props_dir[selected_item]), buffer_len);
+        rb->strlcpy(buffer, selected_item >= (int)(ARRAY_SIZE(props_dir)) ?
+                    "ERROR" : (char *) p2str(props_dir[selected_item]), buffer_len);
     else
-        rb->strlcpy(buffer, selected_item >= (int)(ARRAY_SIZE(props_file)) ? "ERROR" :
-                                (char *) p2str(props_file[selected_item]), buffer_len);
-
+        rb->strlcpy(buffer, selected_item >= (int)(ARRAY_SIZE(props_file)) ?
+                    "ERROR" : (char *) p2str(props_file[selected_item]), buffer_len);
     return buffer;
 }
 
@@ -264,32 +123,14 @@ static int speak_property_selection(int selected_item, void *data)
     switch (id)
     {
     case LANG_PROPERTIES_PATH:
-        if (str_dirname[0] == '/')
-        {
-            char *start = str_dirname;
-            char *ptr;
-            while (0 != (ptr = rb->strchr(start, '/')))
-            {
-                *ptr = '\0';
-                rb->talk_dir_or_spell(str_dirname, NULL, true);
-                *ptr = '/';
-                rb->talk_id(VOICE_CHAR_SLASH, true);
-                start = ptr + 1;
-            }
-            if (*start)
-                rb->talk_dir_or_spell(str_dirname, NULL, true);
-        }
-        else
-        {
-            rb->talk_spell(str_dirname, true);
-        }
+        rb->talk_fullpath(str_dirname, true);
         break;
     case LANG_PROPERTIES_FILENAME:
         rb->talk_file_or_spell(str_dirname, str_filename, NULL, true);
         break;
     case LANG_PROPERTIES_SIZE:
-        rb->talk_number(nsize, true);
-        rb->talk_id(size_unit, true);
+        rb->talk_number(display_size, true);
+        rb->talk_id(lang_size_unit, true);
         break;
     case LANG_PROPERTIES_DATE:
         rb->talk_date(&tm, true);
@@ -310,40 +151,46 @@ static int speak_property_selection(int selected_item, void *data)
     return 0;
 }
 
-static int browse_file_or_dir(struct dir_stats *stats)
+static void setup_properties_list(struct dir_stats *stats)
 {
-    struct gui_synclist properties_lists;
-    int button;
+    int nb_props;
+    if (props_type == PROPS_FILE)
+        nb_props = NUM_FILE_PROPERTIES;
+    else if (props_type == PROPS_PLAYLIST)
+        nb_props = NUM_PLAYLIST_PROPERTIES;
+    else
+        nb_props = NUM_DIR_PROPERTIES;
 
     rb->gui_synclist_init(&properties_lists, &get_props, stats, false, 2, NULL);
     rb->gui_synclist_set_title(&properties_lists,
                                rb->str(props_type == PROPS_DIR ?
-                                                LANG_PROPERTIES_DIRECTORY_PROPERTIES :
-                                                LANG_PROPERTIES_FILE_PROPERTIES),
+                                       LANG_PROPERTIES_DIRECTORY_PROPERTIES :
+                                       LANG_PROPERTIES_FILE_PROPERTIES),
                                NOICON);
-    rb->gui_synclist_set_icon_callback(&properties_lists, NULL);
     if (rb->global_settings->talk_menu)
         rb->gui_synclist_set_voice_callback(&properties_lists, speak_property_selection);
-    rb->gui_synclist_set_nb_items(&properties_lists,
-                                  2 * (props_type == PROPS_FILE ? NUM_FILE_PROPERTIES :
-                                       props_type == PROPS_PLAYLIST ? 
-                                       NUM_PLAYLIST_PROPERTIES : NUM_DIR_PROPERTIES));
-    rb->gui_synclist_select_item(&properties_lists, 0);
+    rb->gui_synclist_set_nb_items(&properties_lists, nb_props*2);
+}
+
+static int browse_file_or_dir(struct dir_stats *stats)
+{
+    if (props_type == PROPS_DIR && stats->audio_file_count)
+        rb->gui_synclist_set_nb_items(&properties_lists, NUM_AUDIODIR_PROPERTIES*2);
     rb->gui_synclist_draw(&properties_lists);
     rb->gui_synclist_speak_item(&properties_lists);
-
     while(true)
     {
-        button = rb->get_action(CONTEXT_LIST, HZ);
+        int button = rb->get_action(CONTEXT_LIST, HZ);
         /* HZ so the status bar redraws corectly */
-        if (rb->gui_synclist_do_button(&properties_lists,&button))
+        if (rb->gui_synclist_do_button(&properties_lists, &button))
             continue;
         switch(button)
         {
             case ACTION_STD_OK:
-                if (props_type == PROPS_PLAYLIST &&
+                if ((props_type == PROPS_PLAYLIST || props_type == PROPS_DIR) &&
                       rb->gui_synclist_get_sel_pos(&properties_lists)
-                        == ARRAY_SIZE(props_file) - 2)
+                        == (props_type == PROPS_DIR ?
+                            ARRAY_SIZE(props_dir) : ARRAY_SIZE(props_file)) - 2)
                     return -1;
                 break;
             case ACTION_STD_CANCEL:
@@ -356,60 +203,101 @@ static int browse_file_or_dir(struct dir_stats *stats)
     }
 }
 
-static bool determine_file_or_dir(void)
+static bool determine_props_type(const char *file)
 {
-    DIR* dir;
-    struct dirent* entry;
-
-    dir = rb->opendir(str_dirname);
-    if (dir)
+    if (file[0] == PATH_SEPCH)
     {
+        const char* basename = rb->strrchr(file, PATH_SEPCH) + 1;
+        const int dir_len = (basename - file);
+        if ((int) sizeof(str_dirname) <= dir_len)
+            return false;
+        rb->strlcpy(str_dirname, file, dir_len + 1);
+        rb->strlcpy(str_filename, basename, sizeof str_filename);
+        struct dirent* entry;
+        DIR* dir = rb->opendir(str_dirname);
+        if (!dir)
+            return false;
         while(0 != (entry = rb->readdir(dir)))
         {
-            if(!rb->strcmp(entry->d_name, str_filename))
+            if(rb->strcmp(entry->d_name, str_filename))
+                continue;
+
+            struct dirinfo info = rb->dir_get_info(dir, entry);
+            if (info.attribute & ATTR_DIRECTORY)
+                props_type = PROPS_DIR;
+            else
             {
-                struct dirinfo info = rb->dir_get_info(dir, entry);
-                props_type = info.attribute & ATTR_DIRECTORY ? PROPS_DIR : PROPS_FILE;
-                rb->closedir(dir);
-                return true;
+                display_size = human_size(info.size, &lang_size_unit);
+                rb->snprintf(str_size, sizeof str_size, "%lu %s",
+                             display_size, rb->str(lang_size_unit));
+                rb->gmtime_r(&info.mtime, &tm);
+                rb->snprintf(str_date, sizeof str_date, "%04d/%02d/%02d",
+                             tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
+                rb->snprintf(str_time, sizeof str_time, "%02d:%02d:%02d",
+                             tm.tm_hour, tm.tm_min, tm.tm_sec);
+
+                if (rb->filetype_get_attr(entry->d_name) == FILE_ATTR_M3U)
+                    props_type = PROPS_PLAYLIST;
+                else
+                    props_type = rb->get_metadata(&id3, -1, file) ?
+                                 PROPS_ID3 : PROPS_FILE;
             }
+            rb->closedir(dir);
+            return true;
         }
         rb->closedir(dir);
     }
+    else if (!rb->strcmp(file, MAKE_ACT_STR(ACTIVITY_DATABASEBROWSER)))
+    {
+        props_type = PROPS_MUL_ID3;
+        return true;
+    }
     return false;
 }
 
 bool mul_id3_add(const char *file_name)
 {
-    if (!file_name || rb->mp3info(&id3, file_name))
+    if (!file_name || !rb->get_metadata(&id3, -1, file_name))
         skipped_count++;
     else
     {
         collect_id3(&id3, mul_id3_count == 0);
         mul_id3_count++;
     }
-
     return true;
 }
 
-static bool has_pl_extension(const char* filename)
-{
-    char *dot = rb->strrchr(filename, '.');
-    return (dot && (!rb->strcasecmp(dot, ".m3u") || !rb->strcasecmp(dot, ".m3u8")));
-}
-
-/* Assemble track info from a database table or the contents of a playlist file */
-static bool assemble_track_info(const char *filename)
+/* Assemble track info from a dir, a playlist, or a database table */
+static bool assemble_track_info(const char *filename, struct dir_stats *stats)
 {
-    props_type = PROPS_MUL_ID3;
-    mul_id3_count = skipped_count = 0;
-
-    if (     (filename && !rb->playlist_entries_iterate(filename, NULL, &mul_id3_add))
+    if (props_type == PROPS_DIR)
+    {
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+        rb->cpu_boost(true);
+#endif
+        rb->strlcpy(stats->dirname, filename, sizeof(stats->dirname));
+        rb->splash_progress_set_delay(HZ/2); /* hide progress bar for 0.5s */
+        bool success = collect_dir_stats(stats, &mul_id3_add);
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+        rb->cpu_boost(false);
+#endif
+        if (!success)
+            return false;
+    }
+    else if(props_type == PROPS_PLAYLIST &&
+            !rb->playlist_entries_iterate(filename, NULL, &mul_id3_add))
+        return false;
 #ifdef HAVE_TAGCACHE
-         || (!filename && !rb->tagtree_subentries_do_action(&mul_id3_add))
+    else if (props_type == PROPS_MUL_ID3 &&
+             !rb->tagtree_subentries_do_action(&mul_id3_add))
+        return false;
 #endif
-         || mul_id3_count == 0)
+
+    if (mul_id3_count == 0)
+    {
+        rb->splashf(HZ*2, "None found");
         return false;
+    }
     else if (mul_id3_count > 1) /* otherwise, the retrieved id3 can be used as-is */
         finalize_id3(&id3);
 
@@ -421,78 +309,43 @@ static bool assemble_track_info(const char *filename)
 
 enum plugin_status plugin_start(const void* parameter)
 {
-    int ret;
-    static struct dir_stats stats =
-    {
-        .len = MAX_PATH,
-        .dir_count  = 0,
-        .file_count  = 0,
-        .byte_count  = 0,
-    };
-
+    static struct dir_stats stats;
     const char *file = parameter;
-    if(!parameter)
-        return PLUGIN_ERROR;
-
 #ifdef HAVE_TOUCHSCREEN
     rb->touchscreen_set_mode(rb->global_settings->touch_mode);
 #endif
-
-    if (file[0] == '/') /* single file selected */
+    int ret = file && determine_props_type(file);
+    if (!ret)
     {
-        const char* file_name = rb->strrchr(file, '/') + 1;
-        int dirlen = (file_name - file);
-
-        rb->strlcpy(str_dirname, file, dirlen + 1);
-        rb->snprintf(str_filename, sizeof str_filename, "%s", file+dirlen);
-
-        if(!determine_file_or_dir())
-        {
-            /* weird: we couldn't find the entry. This Should Never Happen (TM) */
-            rb->splashf(0, "File/Dir not found: %s", file);
-            rb->action_userabort(TIMEOUT_BLOCK);
-            return PLUGIN_OK;
-        }
-
-        if (props_type == PROPS_FILE && has_pl_extension(file))
-            props_type = PROPS_PLAYLIST;
+        rb->splashf(0, "Could not find: %s", file ?: "(NULL)");
+        rb->action_userabort(TIMEOUT_BLOCK);
+        return PLUGIN_OK;
+    }
 
-        /* get the info depending on its_a_dir */
-        if(!(props_type == PROPS_DIR ?
-             dir_properties(file, &stats) : file_properties(file)))
+    if (props_type == PROPS_MUL_ID3)
+        ret = assemble_track_info(NULL, NULL);
+    else if (props_type != PROPS_ID3)
+    {
+        setup_properties_list(&stats);               /* Show title during dir scan */
+        if (props_type == PROPS_DIR)
+            ret = dir_properties(file, &stats);
+    }
+    if (!ret)
+    {
+        if (!stats.canceled)
         {
-            /* something went wrong (to do: tell user what it was (nesting,...) */
-            rb->splash(0, ID2P(LANG_PROPERTIES_FAIL));
+            rb->splash(0, ID2P(LANG_PROPERTIES_FAIL));    /* TODO: describe error */
             rb->action_userabort(TIMEOUT_BLOCK);
-            return PLUGIN_OK;
         }
     }
-             /* database table selected */
-    else if (rb->strcmp(file, MAKE_ACT_STR(ACTIVITY_DATABASEBROWSER))
-             || !assemble_track_info(NULL))
-        return PLUGIN_ERROR;
-
-    FOR_NB_SCREENS(i)
-        rb->viewportmanager_theme_enable(i, true, NULL);
-
-    if (props_type == PROPS_ID3)
+    else if (props_type == PROPS_ID3)
         ret = rb->browse_id3(&id3, 0, 0, &tm, 1);   /* Track Info for single file */
     else if (props_type == PROPS_MUL_ID3)
         ret = rb->browse_id3(&id3, 0, 0, NULL, mul_id3_count); /* database tracks */
     else if ((ret = browse_file_or_dir(&stats)) < 0)
-        ret = assemble_track_info(file) ?                      /* playlist tracks */
-                rb->browse_id3(&id3, 0, 0, NULL, mul_id3_count) : -1;
+        ret = assemble_track_info(file, &stats) ?    /* playlist or folder tracks */
+              rb->browse_id3(&id3, 0, 0, NULL, mul_id3_count) :
+              (stats.canceled ? 0 : -1);
 
-    FOR_NB_SCREENS(i)
-        rb->viewportmanager_theme_undo(i, false);
-
-    switch (ret)
-    {
-        case 1:
-            return PLUGIN_USB_CONNECTED;
-        case -1:
-            return PLUGIN_ERROR;
-        default:
-            return PLUGIN_OK;
-    }
+    return ret == -1 ? PLUGIN_ERROR : ret == 1 ? PLUGIN_USB_CONNECTED : PLUGIN_OK;
 }
diff --git a/apps/plugins/puzzles/README.rockbox b/apps/plugins/puzzles/README.rockbox
index e497c9794f..c7ecc540a1 100644
--- a/apps/plugins/puzzles/README.rockbox
+++ b/apps/plugins/puzzles/README.rockbox
@@ -4,11 +4,6 @@ Introduction
 This is the readme for the Rockbox port of Simon Tatham's Portable
 Puzzle Collection.
 
-The upstream version used is subject to change, as it should be
-relatively trivial to update it to a newer version. Simply copying the
-upstream repo's contents into src/ and running genhelp.sh ought to do
-it (watch out for API changes, though!).
-
 Source structure
 ================
 
@@ -31,6 +26,46 @@ distribution. The compression is LZ4, implemented in lz4tiny.c (for
 decompression on target), and compress.c (for generation). genhelp.sh
 should be run whenever the documentation is changed.
 
+Upstreams
+=========
+
+As of 2024, Simon's tree is located at:
+
+https://git.tartarus.org/?p=simon/puzzles.git
+
+For a long time (i.e. 2017-2024), our version of the puzzles tree
+contained several modifications by myself (notably cursor interfaces
+to Untangle and Palisade). These divergent changes complicated
+maintenance of this port, as merge conflicts often arose when upstream
+changes to these games conflicted with our changes. To remedy this, I
+sent most of these patches back upstream in summer 2024, and since
+then, Simon has merged them into his repo. We are now able to run with
+a fully unmodified puzzles source tree.
+
+Maintenance
+===========
+
+Simon's upstream tree sees continued development. The port is
+structured so that integrating new upstream versions is
+straightforward: all the upstream sources live in the src/
+subdirectory; all of the Rockbox frontend lives in the root
+apps/plugins/puzzles/ directory.
+
+The `resync.sh' shell script automates the resyncing process. It
+copies the upstream sources (point it to a local copy of the
+rockbox-devel branch above) into src/ and performs auto-generation of
+the help content. Note that a modified version of "halibut" (Simon's
+homegrown documentation processor) must be compiled from this source:
+
+https://github.com/built1n/halibut
+
+The LZ4 library and GCC are necessary as well.
+
+Wishlist
+========
+
+- Nothing!
+
 Kudos to Simon (duh), and Frank, for telling me about it.
 
 Franklin Wei (__builtin)
@@ -64,3 +99,12 @@ May 2019: Resync to e2135d5.
 
 June 2020: Resync to 9aa7b7c. Fixed really embarrassing bug in loading
 saved games.
+
+July 2024: Resync to 1c62dac (branched from Simon's fd304c5).
+Implement user preferences menu. Introduced "Mosaic".
+
+August 2024: Resync to ee5e327 (branched from Simon's
+1c1899e). Changes default Map stipple size to "Small".
+
+August 2024: Resync to Simon's 262f709 (unmodified). Uses new scanline
+polygon filling algorithm. Updates drawing API.
diff --git a/apps/plugins/puzzles/SOURCES b/apps/plugins/puzzles/SOURCES
index 5301ceef3d..dfbd184ba2 100644
--- a/apps/plugins/puzzles/SOURCES
+++ b/apps/plugins/puzzles/SOURCES
@@ -1,29 +1,31 @@
+/* Auto-generated by resync.sh */
 rockbox.c
 rbwrappers.c
 rbmalloc.c
 lz4tiny.c
+dummy/nullhelp.c
 
+/* puzzles core sources */
 src/combi.c
 src/divvy.c
+src/draw-poly.c
 src/drawing.c
 src/dsf.c
 src/findloop.c
 src/grid.c
+src/hat.c
 src/latin.c
 src/laydomino.c
 src/loopgen.c
-/*src/malloc.c*/ /* we have our own */
 src/matching.c
 src/midend.c
 src/misc.c
+src/penrose-legacy.c
 src/penrose.c
-src/printing.c
 src/random.c
 src/sort.c
+src/spectre.c
 src/tdq.c
 src/tree234.c
 src/version.c
-
-#ifdef COMBINED
-src/list.c
-#endif
+src/printing.c
diff --git a/apps/plugins/puzzles/SOURCES.games b/apps/plugins/puzzles/SOURCES.games
index 2b80ea3300..70f34f3334 100644
--- a/apps/plugins/puzzles/SOURCES.games
+++ b/apps/plugins/puzzles/SOURCES.games
@@ -1,5 +1,3 @@
-/* every game works! :) */
-
 src/blackbox.c
 src/bridges.c
 src/cube.c
@@ -16,6 +14,7 @@ src/lightup.c
 src/magnets.c
 src/map.c
 src/mines.c
+src/mosaic.c
 src/net.c
 src/netslide.c
 src/palisade.c
@@ -36,12 +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) */
-/*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
new file mode 100644
index 0000000000..61ce4275ff
--- /dev/null
+++ b/apps/plugins/puzzles/SOURCES.rockbox
@@ -0,0 +1,5 @@
+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 78b2aa4d4a..d127a9af17 100644
--- a/apps/plugins/puzzles/compress.c
+++ b/apps/plugins/puzzles/compress.c
@@ -72,7 +72,7 @@ int main()
     int inlen = strlen(help_text) + 1, outlen;
     int minsz, minlev;
 
-    printf("/* auto-generated on " __DATE__ " by genhelp.sh */\n");
+    printf("/* auto-generated by genhelp.sh */\n");
     printf("/* help text is compressed using LZ4; see compress.c for details */\n");
     printf("/* DO NOT EDIT! */\n\n");
 
@@ -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/genhelp.sh b/apps/plugins/puzzles/genhelp.sh
index 3df7706b5d..588eff4c97 100755
--- a/apps/plugins/puzzles/genhelp.sh
+++ b/apps/plugins/puzzles/genhelp.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # usage: ./genhelp.sh
 #
-# Expects halibut to be installed in $PATH:
-# https://www.fwei.tk/git/halibut
+# Expects a modified version of `halibut' to be installed in $PATH:
+# https://github.com/built1n/halibut
 #
 # Also requires host CC and lz4 library to be available
 
@@ -36,6 +36,9 @@ BEGIN {
         if($3 ~ "Rectangles")
              file = "help/rect.c";
 
+        if($3 ~ "Train")
+             file = "help/tracks.c";
+
         print "/* auto-generated by genhelp.sh (intermediate file) */" > file;
         print "/* DO NOT EDIT! */" > file;
         print "const char help_text[] = " > file;
@@ -87,8 +90,24 @@ do
     mv $f.tmp $f
 done
 
-# generate quick help from all the .R files
-cat src/*.R | awk 'print_next { print_next = 0; print; } /!begin/ && />/ && /gamedesc.txt/ { print_next = 1; }' | awk -F ":" '{print "const char quick_help_text[] = \""$5"\";" >> "help/"$1".c" }'
+# Generate quick help by parsing the CMakeLists.txt file to isolate
+# the "Objective" text for each puzzle.
+cat <<EOF > parsed_cmakelists.txt
+function(puzzle NAME)
+  cmake_parse_arguments(OPT
+    "" "DISPLAYNAME;DESCRIPTION;OBJECTIVE;WINDOWS_EXE_NAME" "" \${ARGN})
+
+  message("\${NAME}:\${OPT_OBJECTIVE}")
+endfunction()
+EOF
+
+# This parses out the puzzle(...) definitions from CMakeLists.
+
+# TODO: Perhaps ask Simon to include special header/footer comments to
+# make this less brittle?
+cat src/CMakeLists.txt  | awk '/puzzle\(/{p=1} p{print} /\)/{p=0}' >> parsed_cmakelists.txt
+cmake -P parsed_cmakelists.txt 2>&1 | awk -F ":" '{print "const char quick_help_text[] = \""$2"\";" >> "help/"$1".c" }'
 
+rm parsed_cmakelists.txt
 rm puzzles.txt
 rm compress
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 0121ee3f93..90933604c1 100644
--- a/apps/plugins/puzzles/help/blackbox.c
+++ b/apps/plugins/puzzles/help/blackbox.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,337 +6,339 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 450, TEXT_UNDERLINE },
- { 476, TEXT_UNDERLINE },
- { 503, TEXT_CENTER | C_RED },
- { 869, TEXT_UNDERLINE },
- { 897, TEXT_CENTER | C_RED },
- { 914, TEXT_UNDERLINE },
+ { 451, TEXT_UNDERLINE },
+ { 477, TEXT_UNDERLINE },
+ { 504, TEXT_CENTER | C_RED },
+ { 870, TEXT_UNDERLINE },
+ { 898, TEXT_CENTER | C_RED },
  { 915, TEXT_UNDERLINE },
- { 927, TEXT_UNDERLINE },
- { 929, TEXT_UNDERLINE },
- { 942, TEXT_UNDERLINE },
+ { 916, TEXT_UNDERLINE },
+ { 928, TEXT_UNDERLINE },
+ { 930, TEXT_UNDERLINE },
+ { 943, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 5458 comp 3139 ratio 0.575119 level 10 saved 2319 */
+/* orig 5480 comp 3142 ratio 0.573358 level 10 saved 2338 */
 const char help_text[] = {
-0xf0, 0x37, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x09, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x39, 0x3a, 0x20, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x20,
-0x42, 0x6f, 0x78, 0x20, 0x00, 0x00, 0x00, 0x41, 0x00, 0x6e,
-0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x62,
-0x61, 0x6c, 0x6c, 0x73, 0x00, 0x61, 0x72, 0x65, 0x00, 0x68,
-0x69, 0x64, 0x64, 0x65, 0x6e, 0x00, 0x69, 0x6e, 0x00, 0x61,
-0x00, 0x72, 0x65, 0x63, 0x74, 0x61, 0x6e, 0x67, 0x75, 0x6c,
-0x61, 0x72, 0x1c, 0x00, 0xf0, 0x15, 0x6e, 0x61, 0x2e, 0x00,
-0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x74,
-0x6f, 0x00, 0x64, 0x65, 0x64, 0x75, 0x63, 0x65, 0x00, 0x74,
-0x68, 0x65, 0x00, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
-0x6e, 0x73, 0x4d, 0x00, 0x00, 0x11, 0x00, 0x02, 0x51, 0x00,
-0xf5, 0x01, 0x62, 0x79, 0x00, 0x66, 0x69, 0x72, 0x69, 0x6e,
-0x67, 0x00, 0x6c, 0x61, 0x73, 0x65, 0x72, 0x73, 0x28, 0x00,
-0x51, 0x65, 0x64, 0x00, 0x61, 0x74, 0x29, 0x00, 0x45, 0x65,
-0x64, 0x67, 0x65, 0x36, 0x00, 0x01, 0x65, 0x00, 0xb0, 0x00,
-0x61, 0x6e, 0x64, 0x00, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76,
-0x3a, 0x00, 0x30, 0x68, 0x6f, 0x77, 0x1c, 0x00, 0x72, 0x69,
-0x72, 0x00, 0x62, 0x65, 0x61, 0x6d, 0xa5, 0x00, 0xe1, 0x64,
-0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0x00,
-0x00, 0x00, 0x42, 0x17, 0x00, 0xf3, 0x0a, 0x77, 0x69, 0x6c,
-0x6c, 0x00, 0x74, 0x72, 0x61, 0x76, 0x65, 0x6c, 0x00, 0x73,
-0x74, 0x72, 0x61, 0x69, 0x67, 0x68, 0x74, 0x00, 0x66, 0x72,
-0x6f, 0x6d, 0x3d, 0x00, 0xc0, 0x6f, 0x72, 0x69, 0x67, 0x69,
-0x6e, 0x00, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x13, 0x00, 0x42,
-0x79, 0x00, 0x68, 0x69, 0x82, 0x00, 0x21, 0x6f, 0x70, 0x96,
-0x00, 0x6a, 0x65, 0x00, 0x73, 0x69, 0x64, 0x65, 0x8a, 0x00,
-0xf2, 0x00, 0x28, 0x61, 0x74, 0x00, 0x77, 0x68, 0x69, 0x63,
-0x68, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x38, 0x00, 0xf1,
-0x04, 0x65, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x29, 0x2c, 0x00,
-0x75, 0x6e, 0x6c, 0x65, 0x73, 0x73, 0x00, 0x61, 0x66, 0x66,
-0x8c, 0x00, 0x00, 0xee, 0x00, 0x02, 0xf7, 0x00, 0x55, 0x69,
-0x6e, 0x00, 0x6f, 0x6e, 0x4b, 0x00, 0x60, 0x66, 0x6f, 0x6c,
-0x6c, 0x6f, 0x77, 0xcb, 0x00, 0xb1, 0x77, 0x61, 0x79, 0x73,
-0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x41, 0xcd, 0x00, 0x50,
-0x00, 0x74, 0x68, 0x61, 0x74, 0x88, 0x00, 0x31, 0x73, 0x00,
-0x61, 0x3b, 0x00, 0xf1, 0x05, 0x00, 0x68, 0x65, 0x61, 0x64,
-0x2d, 0x6f, 0x6e, 0x00, 0x69, 0x73, 0x00, 0x61, 0x62, 0x73,
-0x6f, 0x72, 0x62, 0x65, 0x64, 0x0f, 0x01, 0x01, 0xde, 0x00,
-0x93, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x00, 0x72, 0x65, 0x2d,
-0x83, 0x00, 0x50, 0x2e, 0x00, 0x54, 0x68, 0x69, 0x6e, 0x00,
-0x63, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x73, 0x20, 0x01, 0x01,
-0x54, 0x00, 0x44, 0x6d, 0x65, 0x65, 0x74, 0x54, 0x00, 0x22,
-0x6f, 0x6e, 0x87, 0x00, 0x99, 0x69, 0x72, 0x73, 0x74, 0x00,
-0x72, 0x61, 0x6e, 0x6b, 0xe4, 0x00, 0x18, 0x2e, 0x90, 0x00,
-0x44, 0x77, 0x69, 0x74, 0x68, 0x37, 0x00, 0x30, 0x69, 0x6e,
-0x00, 0x99, 0x00, 0xe0, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2d,
-0x6c, 0x65, 0x66, 0x74, 0x00, 0x73, 0x71, 0x75, 0x7d, 0x01,
-0x00, 0x90, 0x00, 0x22, 0x6e, 0x6f, 0x25, 0x00, 0x10, 0x61,
-0xb1, 0x00, 0x00, 0x50, 0x00, 0x76, 0x69, 0x74, 0x00, 0x67,
-0x65, 0x74, 0x73, 0x9a, 0x01, 0xb0, 0x00, 0x39, 0x30, 0x00,
-0x64, 0x65, 0x67, 0x72, 0x65, 0x65, 0x73, 0x2c, 0x02, 0x00,
-0x70, 0x00, 0x10, 0x72, 0x94, 0x01, 0x0f, 0x70, 0x00, 0x13,
-0x01, 0x2b, 0x00, 0x0f, 0x71, 0x00, 0x12, 0x97, 0x73, 0x69,
-0x6d, 0x69, 0x6c, 0x61, 0x72, 0x6c, 0x79, 0x7b, 0x00, 0x03,
-0x70, 0x00, 0x00, 0xb5, 0x00, 0x1d, 0x2e, 0x6f, 0x01, 0x50,
-0x77, 0x6f, 0x75, 0x6c, 0x64, 0x46, 0x01, 0x02, 0x45, 0x01,
-0x02, 0x24, 0x02, 0x00, 0x7a, 0x00, 0xc2, 0x65, 0x6e, 0x74,
-0x72, 0x79, 0x00, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x83,
-0x01, 0x30, 0x63, 0x6f, 0x6e, 0x14, 0x02, 0x12, 0x72, 0x53,
-0x00, 0x54, 0x62, 0x65, 0x00, 0x60, 0x72, 0x64, 0x00, 0x1a,
-0x27, 0xc8, 0x00, 0x01, 0x24, 0x02, 0x02, 0x5a, 0x00, 0x37,
-0x67, 0x65, 0x74, 0x8b, 0x00, 0x60, 0x62, 0x65, 0x66, 0x6f,
-0x72, 0x65, 0x5c, 0x00, 0x11, 0x65, 0x08, 0x03, 0x06, 0x5c,
-0x02, 0x24, 0x62, 0x79, 0xfa, 0x00, 0x03, 0xaf, 0x00, 0x07,
-0x6a, 0x01, 0x29, 0x6f, 0x72, 0x08, 0x01, 0x27, 0x6f, 0x66,
-0xa1, 0x00, 0x02, 0x8a, 0x02, 0x00, 0x21, 0x02, 0x3f, 0x6c,
-0x73, 0x6f, 0xa3, 0x00, 0x0e, 0x16, 0x42, 0x14, 0x02, 0x00,
-0x4b, 0x01, 0x15, 0x72, 0x99, 0x00, 0x40, 0x61, 0x70, 0x70,
-0x65, 0xd7, 0x03, 0x00, 0x7b, 0x02, 0x48, 0x60, 0x52, 0x27,
-0x3b, 0x3e, 0x02, 0x00, 0x1a, 0x03, 0x02, 0xca, 0x02, 0x01,
-0x90, 0x02, 0x00, 0x42, 0x02, 0x06, 0x2f, 0x00, 0xf4, 0x02,
-0x60, 0x48, 0x27, 0x2e, 0x00, 0x4f, 0x74, 0x68, 0x65, 0x72,
-0x77, 0x69, 0x73, 0x65, 0x2c, 0x00, 0x61, 0x47, 0x04, 0x02,
-0x23, 0x00, 0x14, 0x73, 0xd9, 0x03, 0x03, 0xf9, 0x03, 0x02,
-0xaf, 0x00, 0x00, 0xc3, 0x01, 0x01, 0x93, 0x01, 0x04, 0x5e,
-0x01, 0x42, 0x77, 0x68, 0x65, 0x72, 0x3b, 0x04, 0x01, 0x41,
-0x01, 0x02, 0x8c, 0x01, 0x40, 0x73, 0x00, 0x28, 0x74, 0xd2,
-0x02, 0x03, 0x51, 0x00, 0x81, 0x69, 0x73, 0x00, 0x75, 0x6e,
-0x69, 0x71, 0x75, 0x6d, 0x04, 0x01, 0x99, 0x00, 0x50, 0x73,
-0x68, 0x6f, 0x74, 0x29, 0xd7, 0x00, 0x00, 0x87, 0x04, 0xf5,
-0x04, 0x63, 0x61, 0x6e, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65,
-0x00, 0x67, 0x75, 0x65, 0x73, 0x73, 0x65, 0x73, 0x00, 0x61,
-0x6b, 0x02, 0x05, 0x68, 0x00, 0x08, 0x8f, 0x04, 0x74, 0x2c,
-0x00, 0x62, 0x61, 0x73, 0x65, 0x64, 0x11, 0x03, 0x02, 0x4f,
-0x01, 0x00, 0x9a, 0x00, 0xb7, 0x65, 0x78, 0x69, 0x74, 0x00,
-0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0xc2, 0x04, 0x00, 0x10,
-0x01, 0x84, 0x3b, 0x00, 0x6f, 0x6e, 0x63, 0x65, 0x00, 0x79,
-0xf6, 0x04, 0x01, 0x70, 0x00, 0x84, 0x64, 0x00, 0x65, 0x6e,
-0x6f, 0x75, 0x67, 0x68, 0x36, 0x05, 0x55, 0x00, 0x62, 0x75,
-0x74, 0x74, 0x24, 0x01, 0x00, 0xa8, 0x01, 0x30, 0x61, 0x62,
-0x6c, 0xfc, 0x00, 0x00, 0x37, 0x00, 0x22, 0x74, 0x6f, 0x3a,
-0x00, 0x45, 0x79, 0x6f, 0x75, 0x72, 0xa9, 0x00, 0x52, 0x63,
-0x68, 0x65, 0x63, 0x6b, 0xbe, 0x04, 0x10, 0x48, 0x08, 0x01,
-0x10, 0x69, 0x46, 0x00, 0x70, 0x64, 0x69, 0x61, 0x67, 0x72,
-0x61, 0x6d, 0xe5, 0x00, 0x17, 0x77, 0xf9, 0x04, 0x0a, 0x5c,
-0x05, 0x02, 0x73, 0x00, 0x00, 0xfb, 0x00, 0xb8, 0x63, 0x72,
-0x65, 0x61, 0x74, 0x65, 0x00, 0x65, 0x61, 0x63, 0x68, 0xb3,
-0x00, 0xb1, 0x00, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f,
-0x75, 0x72, 0x73, 0x4a, 0x00, 0x70, 0x6e, 0x00, 0x61, 0x62,
-0x6f, 0x76, 0x65, 0x77, 0x04, 0xf3, 0x09, 0x31, 0x52, 0x48,
-0x52, 0x2d, 0x2d, 0x2d, 0x2d, 0x00, 0x00, 0x7c, 0x2e, 0x2e,
-0x4f, 0x2e, 0x4f, 0x2e, 0x2e, 0x2e, 0x7c, 0x00, 0x00, 0x32,
-0x2e, 0x01, 0x00, 0x11, 0x33, 0x18, 0x00, 0x02, 0x01, 0x00,
-0x1a, 0x7c, 0x0c, 0x00, 0x1e, 0x33, 0x18, 0x00, 0x10, 0x4f,
-0x0c, 0x00, 0x1d, 0x48, 0x18, 0x00, 0x11, 0x4f, 0x0c, 0x00,
-0x51, 0x31, 0x32, 0x2d, 0x52, 0x52, 0x6a, 0x00, 0x33, 0x00,
-0x00, 0x41, 0x88, 0x00, 0x10, 0x2c, 0xb3, 0x03, 0x11, 0x69,
-0x03, 0x06, 0x40, 0x73, 0x69, 0x62, 0x6c, 0x18, 0x05, 0x33,
-0x72, 0x00, 0x61, 0x99, 0x03, 0x10, 0x6f, 0x6c, 0x06, 0xc5,
-0x65, 0x69, 0x76, 0x65, 0x00, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-0x70, 0x6c, 0xab, 0x02, 0x01, 0xf9, 0x00, 0x03, 0x46, 0x03,
-0x04, 0xb5, 0x03, 0x00, 0x1e, 0x01, 0xf4, 0x00, 0x28, 0x73,
-0x65, 0x65, 0x00, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x33, 0x29,
-0x2e, 0x00, 0x53, 0x06, 0x04, 0x14, 0x2c, 0x53, 0x00, 0x58,
-0x6d, 0x61, 0x79, 0x00, 0x62, 0xf1, 0x02, 0x13, 0x28, 0x79,
-0x00, 0x41, 0x79, 0x00, 0x6d, 0x6f, 0x7b, 0x02, 0x21, 0x61,
-0x6e, 0xdd, 0x01, 0x16, 0x29, 0x5e, 0x00, 0x00, 0x82, 0x00,
-0x00, 0x5c, 0x00, 0x11, 0x61, 0x02, 0x03, 0x10, 0x28, 0x53,
-0x01, 0x34, 0x60, 0x48, 0x27, 0x30, 0x02, 0x02, 0x04, 0x05,
-0x07, 0x24, 0x06, 0x71, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-0x65, 0x91, 0x02, 0x43, 0x4e, 0x6f, 0x74, 0x65, 0x67, 0x03,
-0x92, 0x6e, 0x79, 0x00, 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74,
-0xdf, 0x04, 0x06, 0x6e, 0x00, 0x13, 0x34, 0xbe, 0x01, 0x00,
-0x9b, 0x00, 0x01, 0x14, 0x02, 0x63, 0x61, 0x00, 0x6e, 0x6f,
-0x6e, 0x2d, 0xe4, 0x02, 0x40, 0x73, 0x6f, 0x6c, 0x75, 0xee,
-0x00, 0x00, 0xd6, 0x05, 0x08, 0x35, 0x06, 0x04, 0x17, 0x02,
-0x40, 0x69, 0x6c, 0x6c, 0x75, 0xd9, 0x06, 0x20, 0x74, 0x65,
-0xa6, 0x03, 0x61, 0x69, 0x73, 0x3b, 0x00, 0x69, 0x66, 0x62,
-0x02, 0x23, 0x6b, 0x6e, 0x29, 0x02, 0x50, 0x62, 0x6f, 0x61,
-0x72, 0x64, 0x12, 0x04, 0x74, 0x74, 0x61, 0x69, 0x6e, 0x73,
-0x00, 0x35, 0xf6, 0x02, 0x02, 0x78, 0x01, 0x25, 0x69, 0x6d,
-0x7a, 0x01, 0x01, 0xbc, 0x07, 0x77, 0x74, 0x65, 0x72, 0x6d,
-0x69, 0x6e, 0x65, 0x8a, 0x03, 0x53, 0x66, 0x69, 0x66, 0x74,
-0x68, 0x8d, 0x05, 0x15, 0x73, 0x30, 0x01, 0x08, 0x81, 0x02,
-0x63, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0xb7, 0x05, 0x41,
-0x6e, 0x00, 0x78, 0x29, 0xce, 0x06, 0x03, 0x01, 0x00, 0x0f,
-0x3f, 0x02, 0x07, 0x11, 0x7c, 0x18, 0x02, 0x15, 0x4f, 0x18,
-0x00, 0x3e, 0x78, 0x78, 0x2e, 0x0c, 0x00, 0x0b, 0x24, 0x00,
-0x0e, 0x48, 0x00, 0x08, 0x6a, 0x00, 0x61, 0x00, 0x00, 0x46,
-0x6f, 0x72, 0x00, 0x2d, 0x04, 0x70, 0x72, 0x65, 0x61, 0x73,
-0x6f, 0x6e, 0x2c, 0xc8, 0x00, 0x16, 0x6e, 0xa9, 0x03, 0x0f,
-0x6f, 0x03, 0x01, 0x11, 0x2c, 0xe6, 0x00, 0x42, 0x67, 0x61,
-0x6d, 0x65, 0x50, 0x07, 0x01, 0x17, 0x00, 0x02, 0xb5, 0x01,
-0x01, 0x2f, 0x00, 0x04, 0x82, 0x01, 0x40, 0x00, 0x70, 0x72,
-0x6f, 0xda, 0x08, 0xf2, 0x02, 0x73, 0x20, 0x74, 0x68, 0x65,
-0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x72, 0x65, 0x73, 0x75,
-0x6c, 0x74, 0x62, 0x04, 0xf0, 0x02, 0x68, 0x65, 0x00, 0x63,
-0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x27, 0x73, 0x2c,
-0x00, 0x72, 0x61, 0x0c, 0x05, 0x02, 0xe2, 0x01, 0x0e, 0x4c,
-0x00, 0x01, 0x7a, 0x01, 0x75, 0x64, 0x65, 0x6e, 0x74, 0x69,
-0x63, 0x61, 0xea, 0x05, 0x06, 0x3f, 0x00, 0x62, 0x2e, 0x00,
-0x53, 0x6f, 0x00, 0x69, 0x60, 0x02, 0x01, 0xa8, 0x03, 0x04,
-0x55, 0x02, 0x11, 0x2c, 0xcb, 0x00, 0x11, 0x63, 0x52, 0x06,
-0x3c, 0x70, 0x75, 0x74, 0xa0, 0x01, 0x03, 0x68, 0x02, 0x29,
-0x6f, 0x66, 0xee, 0x04, 0x0e, 0xa1, 0x01, 0x11, 0x2c, 0xe0,
-0x04, 0x00, 0x4b, 0x00, 0x02, 0x9d, 0x06, 0x20, 0x73, 0x74,
-0xf9, 0x00, 0x31, 0x77, 0x69, 0x6e, 0x1c, 0x06, 0x00, 0x0e,
-0x0a, 0x81, 0x00, 0x42, 0x6f, 0x78, 0x00, 0x77, 0x61, 0x73,
-0x38, 0x02, 0x45, 0x72, 0x69, 0x62, 0x75, 0x41, 0x07, 0x01,
-0x01, 0x07, 0x13, 0x6c, 0x84, 0x03, 0x00, 0xaf, 0x06, 0xd0,
-0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76,
-0x65, 0x79, 0x2e, 0x50, 0x04, 0x37, 0x39, 0x2e, 0x31, 0x53,
-0x0a, 0x01, 0x41, 0x00, 0x30, 0x6f, 0x6c, 0x73, 0x5c, 0x0a,
-0x20, 0x54, 0x6f, 0x00, 0x06, 0x00, 0xe2, 0x02, 0x01, 0xf9,
-0x09, 0x01, 0x93, 0x03, 0x11, 0x2c, 0x42, 0x03, 0x62, 0x2d,
-0x63, 0x6c, 0x69, 0x63, 0x6b, 0x60, 0x0a, 0x04, 0xe0, 0x07,
-0x55, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x0e, 0x0a, 0x0b, 0x9f,
-0x08, 0x00, 0x0e, 0x03, 0x04, 0x7f, 0x01, 0x01, 0xb7, 0x01,
-0xf0, 0x0c, 0x62, 0x65, 0x00, 0x64, 0x69, 0x73, 0x70, 0x6c,
-0x61, 0x79, 0x65, 0x64, 0x00, 0x69, 0x6d, 0x6d, 0x65, 0x64,
-0x69, 0x61, 0x74, 0x65, 0x6c, 0x79, 0x2e, 0x00, 0x43, 0x5b,
-0x00, 0x00, 0x34, 0x03, 0x74, 0x6f, 0x72, 0x00, 0x68, 0x6f,
-0x6c, 0x64, 0x71, 0x07, 0x01, 0xba, 0x03, 0x03, 0xa5, 0x05,
-0x18, 0x6f, 0x9c, 0x09, 0x23, 0x73, 0x65, 0x84, 0x00, 0x03,
-0x5b, 0x00, 0x51, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x73, 0x07,
-0x01, 0xa7, 0x01, 0xb1, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
-0x00, 0x67, 0x6f, 0x00, 0x28, 0xac, 0x04, 0x30, 0x70, 0x72,
-0x65, 0x5a, 0x05, 0x71, 0x73, 0x00, 0x67, 0x6f, 0x29, 0x00,
-0x74, 0x7d, 0x07, 0x31, 0x66, 0x69, 0x72, 0x62, 0x0a, 0x03,
-0x44, 0x06, 0x01, 0xed, 0x06, 0x00, 0xd9, 0x04, 0x01, 0x0a,
-0x02, 0x01, 0xfc, 0x00, 0x10, 0x2c, 0xa8, 0x03, 0xb2, 0x61,
-0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-0x1e, 0x01, 0x01, 0x9b, 0x02, 0x0d, 0xab, 0x06, 0x02, 0x11,
-0x08, 0x09, 0x29, 0x01, 0x00, 0xcb, 0x01, 0x2b, 0x69, 0x6e,
-0x1e, 0x0b, 0x31, 0x61, 0x00, 0x62, 0xbc, 0x01, 0x53, 0x63,
-0x69, 0x72, 0x63, 0x6c, 0xce, 0x02, 0x03, 0xa2, 0x07, 0x00,
-0x02, 0x02, 0x04, 0xf8, 0x00, 0x01, 0x65, 0x00, 0x22, 0x3b,
-0x00, 0x49, 0x00, 0x52, 0x61, 0x67, 0x61, 0x69, 0x6e, 0x6a,
-0x05, 0x10, 0x6d, 0x69, 0x02, 0x05, 0x21, 0x00, 0x21, 0x65,
-0x64, 0x76, 0x00, 0x00, 0x99, 0x00, 0x15, 0x4c, 0x49, 0x02,
-0x09, 0x73, 0x00, 0x03, 0x4c, 0x05, 0x20, 0x6c, 0x6f, 0x46,
-0x03, 0x02, 0x49, 0x00, 0xb4, 0x73, 0x74, 0x00, 0x6d, 0x6f,
-0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x1f, 0x02, 0x01, 0xac,
-0x08, 0x33, 0x2d, 0x00, 0x63, 0x85, 0x01, 0x50, 0x3b, 0x00,
-0x77, 0x68, 0x6f, 0xc8, 0x05, 0x31, 0x6f, 0x77, 0x73, 0xb5,
-0x00, 0x74, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x4e,
-0x00, 0x06, 0xb9, 0x09, 0x03, 0x58, 0x00, 0x0e, 0x43, 0x00,
-0x04, 0x86, 0x00, 0x02, 0x44, 0x02, 0x04, 0x2e, 0x02, 0x00,
-0x27, 0x03, 0x62, 0x2f, 0x62, 0x65, 0x6c, 0x6f, 0x77, 0x66,
-0x01, 0x02, 0x58, 0x00, 0x10, 0x2c, 0xf5, 0x01, 0x07, 0xf9,
-0x09, 0x15, 0x2f, 0x3b, 0x09, 0x01, 0x25, 0x00, 0x31, 0x72,
-0x6f, 0x77, 0x7a, 0x01, 0x02, 0xd7, 0x01, 0x72, 0x73, 0x6f,
-0x72, 0x00, 0x6b, 0x65, 0x79, 0x8c, 0x00, 0x01, 0x48, 0x09,
-0x52, 0x62, 0x65, 0x00, 0x75, 0x73, 0xfa, 0x02, 0x01, 0x1e,
-0x01, 0x07, 0x94, 0x02, 0xb4, 0x67, 0x72, 0x69, 0x64, 0x2e,
-0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x59, 0x01, 0x10, 0x45,
-0xcf, 0x09, 0x00, 0x42, 0x00, 0x02, 0x7b, 0x01, 0x09, 0xeb,
-0x02, 0x00, 0x2a, 0x02, 0x20, 0x64, 0x64, 0xdc, 0x05, 0x21,
-0x65, 0x77, 0x59, 0x01, 0x15, 0x2d, 0xe2, 0x01, 0x01, 0x6f,
-0x01, 0x02, 0x93, 0x03, 0x14, 0x70, 0x4f, 0x00, 0x43, 0x53,
-0x70, 0x61, 0x63, 0xc2, 0x01, 0x20, 0x6c, 0x6f, 0xa7, 0x01,
-0x30, 0x00, 0x63, 0x65, 0x03, 0x02, 0x31, 0x72, 0x6f, 0x77,
-0xd3, 0x00, 0x02, 0xde, 0x00, 0x00, 0xbc, 0x00, 0x10, 0x57,
-0xe1, 0x04, 0x11, 0x61, 0x67, 0x08, 0x40, 0x72, 0x6f, 0x70,
-0x72, 0xf5, 0x02, 0x0d, 0xc2, 0x0d, 0x01, 0xfc, 0x04, 0x44,
-0x62, 0x65, 0x65, 0x6e, 0xdb, 0x01, 0x16, 0x2c, 0x9f, 0x08,
-0x08, 0x26, 0x02, 0x03, 0xa4, 0x09, 0x32, 0x74, 0x6f, 0x70,
-0x71, 0x0a, 0x42, 0x63, 0x6f, 0x72, 0x6e, 0x48, 0x00, 0x04,
-0xf2, 0x00, 0x16, 0x3b, 0x86, 0x01, 0x01, 0x41, 0x01, 0x13,
-0x28, 0xcd, 0x06, 0x31, 0x75, 0x73, 0x65, 0x97, 0x00, 0x01,
-0x45, 0x01, 0x18, 0x29, 0x49, 0x05, 0x08, 0x73, 0x05, 0x00,
-0xb0, 0x00, 0x12, 0x49, 0x9f, 0x06, 0x02, 0x7e, 0x02, 0x01,
-0x4c, 0x07, 0x01, 0x28, 0x00, 0x15, 0x27, 0x2f, 0x09, 0x2a,
-0x6e, 0x64, 0xa7, 0x05, 0x00, 0xde, 0x01, 0x21, 0x6e, 0x6f,
-0x8d, 0x00, 0x00, 0x7a, 0x0e, 0x0c, 0xaf, 0x05, 0x00, 0x46,
-0x08, 0x02, 0x53, 0x09, 0xf2, 0x02, 0x68, 0x65, 0x00, 0x6d,
-0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x00, 0x69, 0x6e, 0x66,
-0x6f, 0x72, 0x6d, 0x5f, 0x01, 0x92, 0x6e, 0x65, 0x63, 0x65,
-0x73, 0x73, 0x61, 0x72, 0x79, 0xe1, 0x06, 0x32, 0x6d, 0x6f,
-0x6e, 0x30, 0x07, 0x02, 0xcc, 0x04, 0x20, 0x74, 0x6f, 0x3d,
-0x00, 0x31, 0x2c, 0x00, 0x73, 0x08, 0x00, 0x01, 0x43, 0x09,
-0x01, 0x00, 0x0a, 0x00, 0xce, 0x02, 0x13, 0x2e, 0xad, 0x00,
-0x12, 0x72, 0x5e, 0x05, 0x06, 0xf1, 0x06, 0x06, 0x93, 0x00,
-0x73, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0xd5, 0x07,
-0x05, 0x6e, 0x09, 0x51, 0x70, 0x61, 0x74, 0x68, 0x73, 0x51,
-0x00, 0x72, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x8f,
-0x07, 0x61, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x2c, 0x6a, 0x04,
-0x05, 0x27, 0x00, 0x05, 0xbe, 0x04, 0x02, 0xb6, 0x03, 0x01,
-0x6c, 0x02, 0x30, 0x69, 0x6e, 0x64, 0x42, 0x03, 0x03, 0x3b,
-0x08, 0x20, 0x69, 0x74, 0x7b, 0x06, 0x32, 0x76, 0x65, 0x73,
-0xb2, 0x05, 0x46, 0x72, 0x6f, 0x6e, 0x67, 0x9a, 0x00, 0x08,
-0x86, 0x07, 0x41, 0x74, 0x63, 0x68, 0x00, 0x3a, 0x0c, 0x02,
-0x79, 0x04, 0x20, 0x73, 0x74, 0xa7, 0x01, 0x07, 0x90, 0x00,
-0x22, 0x62, 0x75, 0xef, 0x0b, 0x03, 0xef, 0x05, 0x00, 0x49,
-0x00, 0x02, 0x8d, 0x00, 0x01, 0x94, 0x02, 0x0d, 0x91, 0x00,
-0x60, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c, 0x24, 0x09, 0x52,
-0x77, 0x72, 0x69, 0x74, 0x74, 0xff, 0x0f, 0x43, 0x72, 0x65,
-0x64, 0x29, 0xd9, 0x0c, 0x2f, 0x69, 0x73, 0x05, 0x01, 0x02,
-0x01, 0x97, 0x00, 0x05, 0x25, 0x05, 0x0d, 0xf9, 0x01, 0x51,
-0x64, 0x65, 0x63, 0x69, 0x64, 0x6d, 0x08, 0x10, 0x67, 0xd9,
-0x09, 0x21, 0x75, 0x70, 0xf8, 0x06, 0x20, 0x6c, 0x65, 0xac,
-0x05, 0x15, 0x2c, 0x84, 0x01, 0x20, 0x73, 0x65, 0x62, 0x06,
-0x42, 0x00, 0x53, 0x6f, 0x6c, 0x55, 0x10, 0x02, 0x8c, 0x00,
-0x02, 0x7d, 0x04, 0x5b, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x93,
-0x01, 0x42, 0x2e, 0x00, 0x41, 0x74, 0xd1, 0x01, 0x01, 0x6d,
-0x05, 0x14, 0x2c, 0x2e, 0x02, 0x33, 0x6c, 0x79, 0x2d, 0x9d,
-0x0b, 0x02, 0x0a, 0x03, 0x0e, 0x2b, 0x06, 0x60, 0x61, 0x73,
-0x00, 0x66, 0x69, 0x6c, 0xe7, 0x00, 0x08, 0x3d, 0x05, 0x00,
-0x20, 0x09, 0x1f, 0x6e, 0x44, 0x00, 0x04, 0x0f, 0x32, 0x00,
-0x04, 0x02, 0xfe, 0x00, 0x00, 0x73, 0x0d, 0x30, 0x63, 0x72,
-0x6f, 0xf5, 0x00, 0x02, 0xd3, 0x03, 0x22, 0x6d, 0x69, 0xd2,
-0x03, 0x0c, 0x3c, 0x00, 0x01, 0x29, 0x00, 0x02, 0x3a, 0x00,
-0x40, 0x2e, 0x00, 0x49, 0x6e, 0x1e, 0x04, 0x01, 0xcb, 0x00,
-0x00, 0x9b, 0x03, 0x06, 0x1c, 0x00, 0x01, 0xb9, 0x05, 0x13,
-0x73, 0x3e, 0x0a, 0x00, 0x48, 0x04, 0x02, 0xcb, 0x08, 0x15,
-0x64, 0x58, 0x02, 0x00, 0x65, 0x04, 0x1f, 0x64, 0x91, 0x01,
-0x10, 0x01, 0x2f, 0x01, 0x03, 0x81, 0x0a, 0x50, 0x28, 0x6a,
-0x75, 0x73, 0x74, 0x8b, 0x00, 0x05, 0x1d, 0x09, 0x01, 0x78,
-0x04, 0x0f, 0x8e, 0x03, 0x00, 0x12, 0x29, 0xc4, 0x00, 0x01,
-0x48, 0x0e, 0x3e, 0x65, 0x78, 0x74, 0x8e, 0x00, 0x05, 0x8e,
-0x08, 0x01, 0x63, 0x04, 0x02, 0x8d, 0x00, 0x00, 0xe8, 0x10,
-0x41, 0x72, 0x64, 0x65, 0x72, 0x70, 0x03, 0x02, 0x86, 0x02,
-0x3e, 0x75, 0x69, 0x73, 0x88, 0x00, 0x05, 0x88, 0x11, 0x04,
-0xad, 0x01, 0x00, 0x8c, 0x02, 0x00, 0x2a, 0x02, 0x35, 0x28,
-0x41, 0x6c, 0xeb, 0x01, 0x01, 0xdb, 0x02, 0x72, 0x64, 0x65,
-0x73, 0x63, 0x72, 0x69, 0x62, 0x5c, 0x00, 0x13, 0x73, 0x7b,
-0x08, 0x31, 0x32, 0x2e, 0x31, 0xce, 0x02, 0x01, 0xa9, 0x05,
-0x51, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x49, 0x07, 0x12, 0x29,
-0x83, 0x08, 0x17, 0x32, 0x83, 0x08, 0x50, 0x70, 0x61, 0x72,
-0x61, 0x6d, 0xda, 0x0a, 0x02, 0x85, 0x08, 0x01, 0xe1, 0x07,
-0x06, 0x14, 0x00, 0x02, 0x45, 0x00, 0x04, 0x40, 0x00, 0x06,
-0x95, 0x00, 0xe2, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x8c, 0x07, 0x12,
-0x6e, 0x1a, 0x00, 0xa1, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0x82, 0x05, 0x81, 0x69, 0x64, 0x74,
-0x68, 0x2c, 0x00, 0x48, 0x65, 0x5b, 0x06, 0x51, 0x00, 0x00,
-0x53, 0x69, 0x7a, 0x4a, 0x08, 0x00, 0x30, 0x05, 0x01, 0xb1,
-0x00, 0x02, 0x4c, 0x08, 0x01, 0xb4, 0x08, 0x21, 0x72, 0x65,
-0x6f, 0x00, 0x32, 0x32, 0x00, 0x78, 0x37, 0x00, 0x24, 0x00,
-0x78, 0x38, 0x00, 0x04, 0x0b, 0x13, 0x21, 0x65, 0x72, 0x39,
-0x00, 0x51, 0x2c, 0x00, 0x74, 0x77, 0x6f, 0x0e, 0x00, 0x32,
-0x72, 0x6f, 0x77, 0x29, 0x0f, 0x03, 0x10, 0x00, 0x06, 0xfb,
-0x05, 0x72, 0x4e, 0x6f, 0x2e, 0x20, 0x6f, 0x66, 0x20, 0x5a,
-0x02, 0x3b, 0x00, 0x00, 0x4e, 0xf6, 0x05, 0x23, 0x74, 0x6f,
-0x09, 0x0f, 0x27, 0x69, 0x6e, 0xb2, 0x06, 0x01, 0x1d, 0x12,
-0x00, 0x63, 0x03, 0x10, 0x62, 0x9d, 0x06, 0x00, 0x9b, 0x02,
-0x14, 0x6c, 0x31, 0x06, 0x11, 0x2c, 0xa6, 0x06, 0x00, 0x0d,
-0x12, 0x20, 0x67, 0x65, 0x4a, 0x0d, 0x00, 0x24, 0x01, 0x15,
-0x74, 0x38, 0x0a, 0xf3, 0x04, 0x00, 0x68, 0x79, 0x70, 0x68,
-0x65, 0x6e, 0x2c, 0x00, 0x6c, 0x69, 0x6b, 0x65, 0x00, 0x60,
-0x32, 0x2d, 0x36, 0x27, 0x1f, 0x02, 0x05, 0x36, 0x0c, 0x02,
-0x43, 0x02, 0x1f, 0x6e, 0x88, 0x00, 0x05, 0x1a, 0x6f, 0x88,
-0x00, 0x01, 0x96, 0x10, 0x00, 0xd7, 0x03, 0x05, 0xfc, 0x05,
-0x72, 0x69, 0x73, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x2b, 0x0f,
-0x00, 0xee, 0x01, 0x16, 0x66, 0xbb, 0x0b, 0x04, 0x95, 0x08,
-0x0f, 0xeb, 0x06, 0x0b, 0x33, 0x3b, 0x00, 0x61, 0x45, 0x09,
-0x11, 0x75, 0x76, 0x03, 0x00, 0x40, 0x0f, 0x31, 0x66, 0x66,
-0x65, 0x8c, 0x04, 0x03, 0x2b, 0x00, 0x03, 0x0e, 0x08, 0x02,
-0xfa, 0x13, 0x29, 0x61, 0x6c, 0x94, 0x0b, 0x02, 0x1a, 0x05,
-0x60, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74, 0x83, 0x00, 0x02,
-0xa6, 0x09, 0x26, 0x6c, 0x6c, 0xda, 0x05, 0x62, 0x69, 0x6e,
-0x70, 0x75, 0x74, 0x73, 0x8d, 0x14, 0x21, 0x75, 0x74, 0x0c,
-0x00, 0x70, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x00,
+0x42, 0x6f, 0x78, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x01, 0xf0,
+0x21, 0x00, 0x00, 0x00, 0x41, 0x00, 0x6e, 0x75, 0x6d, 0x62,
+0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x62, 0x61, 0x6c, 0x6c,
+0x73, 0x00, 0x61, 0x72, 0x65, 0x00, 0x68, 0x69, 0x64, 0x64,
+0x65, 0x6e, 0x00, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x72, 0x65,
+0x63, 0x74, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x1c,
+0x00, 0xf0, 0x15, 0x6e, 0x61, 0x2e, 0x00, 0x59, 0x6f, 0x75,
+0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x74, 0x6f, 0x00, 0x64,
+0x65, 0x64, 0x75, 0x63, 0x65, 0x00, 0x74, 0x68, 0x65, 0x00,
+0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4d,
+0x00, 0x00, 0x11, 0x00, 0x02, 0x51, 0x00, 0xf5, 0x01, 0x62,
+0x79, 0x00, 0x66, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x00, 0x6c,
+0x61, 0x73, 0x65, 0x72, 0x73, 0x28, 0x00, 0x51, 0x65, 0x64,
+0x00, 0x61, 0x74, 0x29, 0x00, 0x45, 0x65, 0x64, 0x67, 0x65,
+0x36, 0x00, 0x01, 0x65, 0x00, 0xb0, 0x00, 0x61, 0x6e, 0x64,
+0x00, 0x6f, 0x62, 0x73, 0x65, 0x72, 0x76, 0x3a, 0x00, 0x30,
+0x68, 0x6f, 0x77, 0x1c, 0x00, 0x72, 0x69, 0x72, 0x00, 0x62,
+0x65, 0x61, 0x6d, 0xa5, 0x00, 0xe1, 0x64, 0x65, 0x66, 0x6c,
+0x65, 0x63, 0x74, 0x65, 0x64, 0x2e, 0x00, 0x00, 0x00, 0x42,
+0x17, 0x00, 0xf3, 0x0a, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x74,
+0x72, 0x61, 0x76, 0x65, 0x6c, 0x00, 0x73, 0x74, 0x72, 0x61,
+0x69, 0x67, 0x68, 0x74, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x3d,
+0x00, 0xc0, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x00, 0x75,
+0x6e, 0x74, 0x69, 0x6c, 0x13, 0x00, 0x42, 0x79, 0x00, 0x68,
+0x69, 0x82, 0x00, 0x21, 0x6f, 0x70, 0x96, 0x00, 0x6a, 0x65,
+0x00, 0x73, 0x69, 0x64, 0x65, 0x8a, 0x00, 0xf2, 0x00, 0x28,
+0x61, 0x74, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x70,
+0x6f, 0x69, 0x6e, 0x74, 0x38, 0x00, 0xf1, 0x04, 0x65, 0x6d,
+0x65, 0x72, 0x67, 0x65, 0x29, 0x2c, 0x00, 0x75, 0x6e, 0x6c,
+0x65, 0x73, 0x73, 0x00, 0x61, 0x66, 0x66, 0x8c, 0x00, 0x00,
+0xee, 0x00, 0x02, 0xf7, 0x00, 0x55, 0x69, 0x6e, 0x00, 0x6f,
+0x6e, 0x4b, 0x00, 0x60, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77,
+0xcb, 0x00, 0xb1, 0x77, 0x61, 0x79, 0x73, 0x3a, 0x00, 0x00,
+0x00, 0x2d, 0x00, 0x41, 0xcd, 0x00, 0x50, 0x00, 0x74, 0x68,
+0x61, 0x74, 0x88, 0x00, 0x31, 0x73, 0x00, 0x61, 0x3b, 0x00,
+0xf1, 0x05, 0x00, 0x68, 0x65, 0x61, 0x64, 0x2d, 0x6f, 0x6e,
+0x00, 0x69, 0x73, 0x00, 0x61, 0x62, 0x73, 0x6f, 0x72, 0x62,
+0x65, 0x64, 0x0f, 0x01, 0x01, 0xde, 0x00, 0x93, 0x6e, 0x65,
+0x76, 0x65, 0x72, 0x00, 0x72, 0x65, 0x2d, 0x83, 0x00, 0x50,
+0x2e, 0x00, 0x54, 0x68, 0x69, 0x6e, 0x00, 0x63, 0x63, 0x6c,
+0x75, 0x64, 0x65, 0x73, 0x20, 0x01, 0x01, 0x54, 0x00, 0x44,
+0x6d, 0x65, 0x65, 0x74, 0x54, 0x00, 0x22, 0x6f, 0x6e, 0x87,
+0x00, 0x99, 0x69, 0x72, 0x73, 0x74, 0x00, 0x72, 0x61, 0x6e,
+0x6b, 0xe4, 0x00, 0x18, 0x2e, 0x90, 0x00, 0x44, 0x77, 0x69,
+0x74, 0x68, 0x37, 0x00, 0x30, 0x69, 0x6e, 0x00, 0x99, 0x00,
+0xe0, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2d, 0x6c, 0x65, 0x66,
+0x74, 0x00, 0x73, 0x71, 0x75, 0x7d, 0x01, 0x00, 0x90, 0x00,
+0x22, 0x6e, 0x6f, 0x25, 0x00, 0x10, 0x61, 0xb1, 0x00, 0x00,
+0x50, 0x00, 0x76, 0x69, 0x74, 0x00, 0x67, 0x65, 0x74, 0x73,
+0x9a, 0x01, 0xb0, 0x00, 0x39, 0x30, 0x00, 0x64, 0x65, 0x67,
+0x72, 0x65, 0x65, 0x73, 0x2c, 0x02, 0x00, 0x70, 0x00, 0x10,
+0x72, 0x94, 0x01, 0x0f, 0x70, 0x00, 0x13, 0x01, 0x2b, 0x00,
+0x0f, 0x71, 0x00, 0x12, 0x97, 0x73, 0x69, 0x6d, 0x69, 0x6c,
+0x61, 0x72, 0x6c, 0x79, 0x7b, 0x00, 0x03, 0x70, 0x00, 0x00,
+0xb5, 0x00, 0x1d, 0x2e, 0x6f, 0x01, 0x50, 0x77, 0x6f, 0x75,
+0x6c, 0x64, 0x46, 0x01, 0x02, 0x45, 0x01, 0x02, 0x24, 0x02,
+0x00, 0x7a, 0x00, 0xc2, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x00,
+0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x83, 0x01, 0x30, 0x63,
+0x6f, 0x6e, 0x14, 0x02, 0x12, 0x72, 0x53, 0x00, 0x54, 0x62,
+0x65, 0x00, 0x60, 0x72, 0x64, 0x00, 0x1a, 0x27, 0xc8, 0x00,
+0x01, 0x24, 0x02, 0x02, 0x5a, 0x00, 0x37, 0x67, 0x65, 0x74,
+0x8b, 0x00, 0x60, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x5c,
+0x00, 0x11, 0x65, 0x08, 0x03, 0x06, 0x5c, 0x02, 0x24, 0x62,
+0x79, 0xfa, 0x00, 0x03, 0xaf, 0x00, 0x07, 0x6a, 0x01, 0x29,
+0x6f, 0x72, 0x08, 0x01, 0x27, 0x6f, 0x66, 0xa1, 0x00, 0x02,
+0x8a, 0x02, 0x00, 0x21, 0x02, 0x3f, 0x6c, 0x73, 0x6f, 0xa3,
+0x00, 0x0e, 0x16, 0x42, 0x14, 0x02, 0x00, 0x4b, 0x01, 0x15,
+0x72, 0x99, 0x00, 0x40, 0x61, 0x70, 0x70, 0x65, 0xd7, 0x03,
+0x00, 0x7b, 0x02, 0x48, 0x60, 0x52, 0x27, 0x3b, 0x3e, 0x02,
+0x00, 0x1a, 0x03, 0x02, 0xca, 0x02, 0x01, 0x90, 0x02, 0x00,
+0x42, 0x02, 0x06, 0x2f, 0x00, 0xf4, 0x02, 0x60, 0x48, 0x27,
+0x2e, 0x00, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x77, 0x69, 0x73,
+0x65, 0x2c, 0x00, 0x61, 0x47, 0x04, 0x02, 0x23, 0x00, 0x14,
+0x73, 0xd9, 0x03, 0x03, 0xf9, 0x03, 0x02, 0xaf, 0x00, 0x00,
+0xc3, 0x01, 0x01, 0x93, 0x01, 0x04, 0x5e, 0x01, 0x42, 0x77,
+0x68, 0x65, 0x72, 0x3b, 0x04, 0x01, 0x41, 0x01, 0x02, 0x8c,
+0x01, 0x40, 0x73, 0x00, 0x28, 0x74, 0xd2, 0x02, 0x03, 0x51,
+0x00, 0x81, 0x69, 0x73, 0x00, 0x75, 0x6e, 0x69, 0x71, 0x75,
+0x6d, 0x04, 0x01, 0x99, 0x00, 0x50, 0x73, 0x68, 0x6f, 0x74,
+0x29, 0xd7, 0x00, 0x00, 0x87, 0x04, 0xf5, 0x04, 0x63, 0x61,
+0x6e, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x00, 0x67, 0x75,
+0x65, 0x73, 0x73, 0x65, 0x73, 0x00, 0x61, 0x6b, 0x02, 0x05,
+0x68, 0x00, 0x08, 0x8f, 0x04, 0x74, 0x2c, 0x00, 0x62, 0x61,
+0x73, 0x65, 0x64, 0x11, 0x03, 0x02, 0x4f, 0x01, 0x00, 0x9a,
+0x00, 0xb7, 0x65, 0x78, 0x69, 0x74, 0x00, 0x70, 0x61, 0x74,
+0x74, 0x65, 0x72, 0xc2, 0x04, 0x00, 0x10, 0x01, 0x84, 0x3b,
+0x00, 0x6f, 0x6e, 0x63, 0x65, 0x00, 0x79, 0xf6, 0x04, 0x01,
+0x70, 0x00, 0x84, 0x64, 0x00, 0x65, 0x6e, 0x6f, 0x75, 0x67,
+0x68, 0x36, 0x05, 0x55, 0x00, 0x62, 0x75, 0x74, 0x74, 0x24,
+0x01, 0x00, 0xa8, 0x01, 0x30, 0x61, 0x62, 0x6c, 0xfc, 0x00,
+0x00, 0x37, 0x00, 0x22, 0x74, 0x6f, 0x3a, 0x00, 0x45, 0x79,
+0x6f, 0x75, 0x72, 0xa9, 0x00, 0x52, 0x63, 0x68, 0x65, 0x63,
+0x6b, 0xbe, 0x04, 0x10, 0x48, 0x08, 0x01, 0x10, 0x69, 0x46,
+0x00, 0x70, 0x64, 0x69, 0x61, 0x67, 0x72, 0x61, 0x6d, 0xe5,
+0x00, 0x17, 0x77, 0xf9, 0x04, 0x0a, 0x5c, 0x05, 0x02, 0x73,
+0x00, 0x00, 0xfb, 0x00, 0xb8, 0x63, 0x72, 0x65, 0x61, 0x74,
+0x65, 0x00, 0x65, 0x61, 0x63, 0x68, 0xb3, 0x00, 0xb1, 0x00,
+0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x75, 0x72, 0x73,
+0x4a, 0x00, 0x70, 0x6e, 0x00, 0x61, 0x62, 0x6f, 0x76, 0x65,
+0x77, 0x04, 0x42, 0x31, 0x52, 0x48, 0x52, 0xfc, 0x05, 0xe3,
+0x7c, 0x2e, 0x2e, 0x4f, 0x2e, 0x4f, 0x2e, 0x2e, 0x2e, 0x7c,
+0x00, 0x00, 0x32, 0x2e, 0x01, 0x00, 0x11, 0x33, 0x18, 0x00,
+0x02, 0x01, 0x00, 0x1a, 0x7c, 0x0c, 0x00, 0x1e, 0x33, 0x18,
+0x00, 0x10, 0x4f, 0x0c, 0x00, 0x1d, 0x48, 0x18, 0x00, 0x11,
+0x4f, 0x0c, 0x00, 0x52, 0x31, 0x32, 0x2d, 0x52, 0x52, 0x66,
+0x06, 0x23, 0x00, 0x41, 0x88, 0x00, 0x10, 0x2c, 0xb3, 0x03,
+0x11, 0x69, 0x03, 0x06, 0x40, 0x73, 0x69, 0x62, 0x6c, 0x18,
+0x05, 0x33, 0x72, 0x00, 0x61, 0x99, 0x03, 0x10, 0x6f, 0x6c,
+0x06, 0xc5, 0x65, 0x69, 0x76, 0x65, 0x00, 0x6d, 0x75, 0x6c,
+0x74, 0x69, 0x70, 0x6c, 0xab, 0x02, 0x01, 0xf9, 0x00, 0x03,
+0x46, 0x03, 0x04, 0xb5, 0x03, 0x00, 0x1e, 0x01, 0xf4, 0x00,
+0x28, 0x73, 0x65, 0x65, 0x00, 0x74, 0x75, 0x72, 0x6e, 0x00,
+0x33, 0x29, 0x2e, 0x00, 0x53, 0x06, 0x04, 0x14, 0x2c, 0x53,
+0x00, 0x58, 0x6d, 0x61, 0x79, 0x00, 0x62, 0xf1, 0x02, 0x13,
+0x28, 0x79, 0x00, 0x41, 0x79, 0x00, 0x6d, 0x6f, 0x7b, 0x02,
+0x21, 0x61, 0x6e, 0xdd, 0x01, 0x16, 0x29, 0x5e, 0x00, 0x00,
+0x82, 0x00, 0x00, 0x5c, 0x00, 0x11, 0x61, 0x02, 0x03, 0x10,
+0x28, 0x53, 0x01, 0x34, 0x60, 0x48, 0x27, 0x30, 0x02, 0x02,
+0x04, 0x05, 0x07, 0x24, 0x06, 0x71, 0x65, 0x78, 0x61, 0x6d,
+0x70, 0x6c, 0x65, 0x91, 0x02, 0x43, 0x4e, 0x6f, 0x74, 0x65,
+0x67, 0x03, 0x92, 0x6e, 0x79, 0x00, 0x6c, 0x61, 0x79, 0x6f,
+0x75, 0x74, 0xdf, 0x04, 0x06, 0x6e, 0x00, 0x13, 0x34, 0xbe,
+0x01, 0x00, 0x9b, 0x00, 0x01, 0x14, 0x02, 0x63, 0x61, 0x00,
+0x6e, 0x6f, 0x6e, 0x2d, 0xe4, 0x02, 0x40, 0x73, 0x6f, 0x6c,
+0x75, 0xee, 0x00, 0x00, 0xd6, 0x05, 0x08, 0x35, 0x06, 0x04,
+0x17, 0x02, 0x40, 0x69, 0x6c, 0x6c, 0x75, 0xd9, 0x06, 0x20,
+0x74, 0x65, 0xa6, 0x03, 0x61, 0x69, 0x73, 0x3b, 0x00, 0x69,
+0x66, 0x62, 0x02, 0x23, 0x6b, 0x6e, 0x29, 0x02, 0x50, 0x62,
+0x6f, 0x61, 0x72, 0x64, 0x12, 0x04, 0x74, 0x74, 0x61, 0x69,
+0x6e, 0x73, 0x00, 0x35, 0xf6, 0x02, 0x02, 0x78, 0x01, 0x25,
+0x69, 0x6d, 0x7a, 0x01, 0x01, 0xbc, 0x07, 0x77, 0x74, 0x65,
+0x72, 0x6d, 0x69, 0x6e, 0x65, 0x8a, 0x03, 0x53, 0x66, 0x69,
+0x66, 0x74, 0x68, 0x8d, 0x05, 0x15, 0x73, 0x30, 0x01, 0x08,
+0x81, 0x02, 0x63, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0xb7,
+0x05, 0x41, 0x6e, 0x00, 0x78, 0x29, 0xce, 0x06, 0x05, 0x53,
+0x08, 0x0f, 0x3f, 0x02, 0x05, 0x11, 0x7c, 0x18, 0x02, 0x15,
+0x4f, 0x18, 0x00, 0x3e, 0x78, 0x78, 0x2e, 0x0c, 0x00, 0x0b,
+0x24, 0x00, 0x0f, 0x48, 0x00, 0x01, 0x07, 0xbd, 0x08, 0x51,
+0x00, 0x46, 0x6f, 0x72, 0x00, 0x2d, 0x04, 0x70, 0x72, 0x65,
+0x61, 0x73, 0x6f, 0x6e, 0x2c, 0xc8, 0x00, 0x16, 0x6e, 0xa9,
+0x03, 0x0f, 0x6f, 0x03, 0x01, 0x11, 0x2c, 0xe6, 0x00, 0x42,
+0x67, 0x61, 0x6d, 0x65, 0x50, 0x07, 0x01, 0x17, 0x00, 0x02,
+0xb5, 0x01, 0x01, 0x2f, 0x00, 0x04, 0x82, 0x01, 0x40, 0x00,
+0x70, 0x72, 0x6f, 0xda, 0x08, 0xf2, 0x02, 0x73, 0x20, 0x74,
+0x68, 0x65, 0x20, 0x73, 0x61, 0x6d, 0x65, 0x20, 0x72, 0x65,
+0x73, 0x75, 0x6c, 0x74, 0x62, 0x04, 0xf0, 0x02, 0x68, 0x65,
+0x00, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x27,
+0x73, 0x2c, 0x00, 0x72, 0x61, 0x0c, 0x05, 0x02, 0xe2, 0x01,
+0x0e, 0x4c, 0x00, 0x01, 0x7a, 0x01, 0x75, 0x64, 0x65, 0x6e,
+0x74, 0x69, 0x63, 0x61, 0xea, 0x05, 0x06, 0x3f, 0x00, 0x62,
+0x2e, 0x00, 0x53, 0x6f, 0x00, 0x69, 0x60, 0x02, 0x01, 0xa8,
+0x03, 0x04, 0x55, 0x02, 0x11, 0x2c, 0xcb, 0x00, 0x11, 0x63,
+0x52, 0x06, 0x3c, 0x70, 0x75, 0x74, 0xa0, 0x01, 0x03, 0x68,
+0x02, 0x29, 0x6f, 0x66, 0xee, 0x04, 0x0e, 0xa1, 0x01, 0x11,
+0x2c, 0xe0, 0x04, 0x00, 0x4b, 0x00, 0x02, 0x9d, 0x06, 0x20,
+0x73, 0x74, 0xf9, 0x00, 0x31, 0x77, 0x69, 0x6e, 0x1c, 0x06,
+0x00, 0x24, 0x0a, 0x81, 0x00, 0x42, 0x6f, 0x78, 0x00, 0x77,
+0x61, 0x73, 0x38, 0x02, 0x45, 0x72, 0x69, 0x62, 0x75, 0x41,
+0x07, 0x01, 0x01, 0x07, 0x13, 0x6c, 0x84, 0x03, 0x00, 0xaf,
+0x06, 0xd0, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61,
+0x72, 0x76, 0x65, 0x79, 0x2e, 0x50, 0x04, 0x37, 0x39, 0x2e,
+0x31, 0x69, 0x0a, 0x01, 0x41, 0x00, 0x90, 0x6f, 0x6c, 0x73,
+0x20, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x00, 0x06, 0x00, 0xe2,
+0x02, 0x01, 0xf9, 0x09, 0x01, 0x93, 0x03, 0x11, 0x2c, 0x42,
+0x03, 0x62, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x60, 0x0a,
+0x04, 0xe0, 0x07, 0x55, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x0e,
+0x0a, 0x0b, 0x9f, 0x08, 0x00, 0x0e, 0x03, 0x04, 0x7f, 0x01,
+0x01, 0xb7, 0x01, 0xf0, 0x0c, 0x62, 0x65, 0x00, 0x64, 0x69,
+0x73, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x00, 0x69, 0x6d,
+0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x6c, 0x79, 0x2e,
+0x00, 0x43, 0x5b, 0x00, 0x00, 0x34, 0x03, 0x74, 0x6f, 0x72,
+0x00, 0x68, 0x6f, 0x6c, 0x64, 0x71, 0x07, 0x01, 0xba, 0x03,
+0x03, 0xa5, 0x05, 0x18, 0x6f, 0x9c, 0x09, 0x23, 0x73, 0x65,
+0x84, 0x00, 0x03, 0x5b, 0x00, 0x51, 0x68, 0x69, 0x67, 0x68,
+0x6c, 0x73, 0x07, 0x01, 0xa7, 0x01, 0xb1, 0x75, 0x72, 0x72,
+0x65, 0x6e, 0x74, 0x00, 0x67, 0x6f, 0x00, 0x28, 0xac, 0x04,
+0x30, 0x70, 0x72, 0x65, 0x5a, 0x05, 0x71, 0x73, 0x00, 0x67,
+0x6f, 0x29, 0x00, 0x74, 0x7d, 0x07, 0x31, 0x66, 0x69, 0x72,
+0x62, 0x0a, 0x03, 0x44, 0x06, 0x01, 0xed, 0x06, 0x00, 0xd9,
+0x04, 0x01, 0x0a, 0x02, 0x01, 0xfc, 0x00, 0x10, 0x2c, 0xa8,
+0x03, 0xb2, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x62,
+0x6c, 0x65, 0x2e, 0x1e, 0x01, 0x01, 0x9b, 0x02, 0x0d, 0xab,
+0x06, 0x02, 0x11, 0x08, 0x09, 0x29, 0x01, 0x00, 0xcb, 0x01,
+0x2b, 0x69, 0x6e, 0x1e, 0x0b, 0x31, 0x61, 0x00, 0x62, 0xbc,
+0x01, 0x53, 0x63, 0x69, 0x72, 0x63, 0x6c, 0xce, 0x02, 0x03,
+0xa2, 0x07, 0x00, 0x02, 0x02, 0x04, 0xf8, 0x00, 0x01, 0x65,
+0x00, 0x22, 0x3b, 0x00, 0x49, 0x00, 0x52, 0x61, 0x67, 0x61,
+0x69, 0x6e, 0x6a, 0x05, 0x10, 0x6d, 0x69, 0x02, 0x05, 0x21,
+0x00, 0x21, 0x65, 0x64, 0x76, 0x00, 0x00, 0x99, 0x00, 0x15,
+0x4c, 0x49, 0x02, 0x09, 0x73, 0x00, 0x03, 0x4c, 0x05, 0x20,
+0x6c, 0x6f, 0x46, 0x03, 0x02, 0x49, 0x00, 0xb4, 0x73, 0x74,
+0x00, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x63, 0x61, 0x1f,
+0x02, 0x01, 0xac, 0x08, 0x33, 0x2d, 0x00, 0x63, 0x85, 0x01,
+0x50, 0x3b, 0x00, 0x77, 0x68, 0x6f, 0xc8, 0x05, 0x31, 0x6f,
+0x77, 0x73, 0xb5, 0x00, 0x74, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+0x6e, 0x73, 0x4e, 0x00, 0x06, 0xb9, 0x09, 0x03, 0x58, 0x00,
+0x0e, 0x43, 0x00, 0x04, 0x86, 0x00, 0x02, 0x44, 0x02, 0x04,
+0x2e, 0x02, 0x00, 0x27, 0x03, 0x62, 0x2f, 0x62, 0x65, 0x6c,
+0x6f, 0x77, 0x66, 0x01, 0x02, 0x58, 0x00, 0x10, 0x2c, 0xf5,
+0x01, 0x07, 0xf9, 0x09, 0x15, 0x2f, 0x3b, 0x09, 0x01, 0x25,
+0x00, 0x31, 0x72, 0x6f, 0x77, 0x7a, 0x01, 0x02, 0xd7, 0x01,
+0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x8c, 0x00,
+0x01, 0x48, 0x09, 0x52, 0x62, 0x65, 0x00, 0x75, 0x73, 0xfa,
+0x02, 0x01, 0x1e, 0x01, 0x07, 0x94, 0x02, 0xb4, 0x67, 0x72,
+0x69, 0x64, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x59,
+0x01, 0x10, 0x45, 0xcf, 0x09, 0x00, 0x42, 0x00, 0x02, 0x7b,
+0x01, 0x09, 0xeb, 0x02, 0x00, 0x2a, 0x02, 0x20, 0x64, 0x64,
+0xdc, 0x05, 0x21, 0x65, 0x77, 0x59, 0x01, 0x15, 0x2d, 0xe2,
+0x01, 0x01, 0x6f, 0x01, 0x02, 0x93, 0x03, 0x14, 0x70, 0x4f,
+0x00, 0x43, 0x53, 0x70, 0x61, 0x63, 0xc2, 0x01, 0x20, 0x6c,
+0x6f, 0xa7, 0x01, 0x30, 0x00, 0x63, 0x65, 0x03, 0x02, 0x31,
+0x72, 0x6f, 0x77, 0xd3, 0x00, 0x02, 0xde, 0x00, 0x00, 0xbc,
+0x00, 0x10, 0x57, 0xe1, 0x04, 0x11, 0x61, 0x67, 0x08, 0x40,
+0x72, 0x6f, 0x70, 0x72, 0xf5, 0x02, 0x0d, 0xc2, 0x0d, 0x01,
+0xfc, 0x04, 0x44, 0x62, 0x65, 0x65, 0x6e, 0xdb, 0x01, 0x16,
+0x2c, 0x9f, 0x08, 0x08, 0x26, 0x02, 0x03, 0xa4, 0x09, 0x32,
+0x74, 0x6f, 0x70, 0x71, 0x0a, 0x42, 0x63, 0x6f, 0x72, 0x6e,
+0x48, 0x00, 0x04, 0xf2, 0x00, 0x16, 0x3b, 0x86, 0x01, 0x01,
+0x41, 0x01, 0x13, 0x28, 0xcd, 0x06, 0x31, 0x75, 0x73, 0x65,
+0x97, 0x00, 0x01, 0x45, 0x01, 0x18, 0x29, 0x49, 0x05, 0x08,
+0x73, 0x05, 0x00, 0xb0, 0x00, 0x12, 0x49, 0x9f, 0x06, 0x02,
+0x7e, 0x02, 0x01, 0x4c, 0x07, 0x01, 0x28, 0x00, 0x15, 0x27,
+0x2f, 0x09, 0x2a, 0x6e, 0x64, 0xa7, 0x05, 0x00, 0xde, 0x01,
+0x21, 0x6e, 0x6f, 0x8d, 0x00, 0x00, 0x7a, 0x0e, 0x0c, 0xaf,
+0x05, 0x00, 0x46, 0x08, 0x02, 0x53, 0x09, 0xf2, 0x02, 0x68,
+0x65, 0x00, 0x6d, 0x69, 0x6e, 0x69, 0x6d, 0x75, 0x6d, 0x00,
+0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x5f, 0x01, 0x92, 0x6e,
+0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0xe1, 0x06,
+0x32, 0x6d, 0x6f, 0x6e, 0x30, 0x07, 0x02, 0xcc, 0x04, 0x20,
+0x74, 0x6f, 0x3d, 0x00, 0x31, 0x2c, 0x00, 0x73, 0x08, 0x00,
+0x01, 0x43, 0x09, 0x01, 0x00, 0x0a, 0x00, 0xce, 0x02, 0x13,
+0x2e, 0xad, 0x00, 0x12, 0x72, 0x5e, 0x05, 0x06, 0xf1, 0x06,
+0x06, 0x93, 0x00, 0x73, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65,
+0x6e, 0xd5, 0x07, 0x05, 0x6e, 0x09, 0x51, 0x70, 0x61, 0x74,
+0x68, 0x73, 0x51, 0x00, 0x72, 0x61, 0x6c, 0x72, 0x65, 0x61,
+0x64, 0x79, 0x8f, 0x07, 0x61, 0x61, 0x62, 0x6f, 0x75, 0x74,
+0x2c, 0x6a, 0x04, 0x05, 0x27, 0x00, 0x05, 0xbe, 0x04, 0x02,
+0xb6, 0x03, 0x01, 0x6c, 0x02, 0x30, 0x69, 0x6e, 0x64, 0x42,
+0x03, 0x03, 0x3b, 0x08, 0x20, 0x69, 0x74, 0x7b, 0x06, 0x32,
+0x76, 0x65, 0x73, 0xb2, 0x05, 0x46, 0x72, 0x6f, 0x6e, 0x67,
+0x9a, 0x00, 0x08, 0x86, 0x07, 0x41, 0x74, 0x63, 0x68, 0x00,
+0x3a, 0x0c, 0x02, 0x79, 0x04, 0x20, 0x73, 0x74, 0xa7, 0x01,
+0x07, 0x90, 0x00, 0x22, 0x62, 0x75, 0xef, 0x0b, 0x03, 0xef,
+0x05, 0x00, 0x49, 0x00, 0x02, 0x8d, 0x00, 0x01, 0x94, 0x02,
+0x0d, 0x91, 0x00, 0x60, 0x72, 0x65, 0x76, 0x65, 0x61, 0x6c,
+0x24, 0x09, 0x52, 0x77, 0x72, 0x69, 0x74, 0x74, 0xff, 0x0f,
+0x43, 0x72, 0x65, 0x64, 0x29, 0xd9, 0x0c, 0x2f, 0x69, 0x73,
+0x05, 0x01, 0x02, 0x01, 0x97, 0x00, 0x05, 0x25, 0x05, 0x0d,
+0xf9, 0x01, 0x51, 0x64, 0x65, 0x63, 0x69, 0x64, 0x6d, 0x08,
+0x10, 0x67, 0xd9, 0x09, 0x21, 0x75, 0x70, 0xf8, 0x06, 0x20,
+0x6c, 0x65, 0xac, 0x05, 0x15, 0x2c, 0x84, 0x01, 0x20, 0x73,
+0x65, 0x62, 0x06, 0x42, 0x00, 0x53, 0x6f, 0x6c, 0x55, 0x10,
+0x02, 0x8c, 0x00, 0x02, 0x7d, 0x04, 0x5b, 0x63, 0x74, 0x75,
+0x61, 0x6c, 0x93, 0x01, 0x42, 0x2e, 0x00, 0x41, 0x74, 0xd1,
+0x01, 0x01, 0x6d, 0x05, 0x14, 0x2c, 0x2e, 0x02, 0x33, 0x6c,
+0x79, 0x2d, 0x9d, 0x0b, 0x02, 0x0a, 0x03, 0x0e, 0x2b, 0x06,
+0x60, 0x61, 0x73, 0x00, 0x66, 0x69, 0x6c, 0xe7, 0x00, 0x08,
+0x3d, 0x05, 0x00, 0x20, 0x09, 0x1f, 0x6e, 0x44, 0x00, 0x04,
+0x0f, 0x32, 0x00, 0x04, 0x02, 0xfe, 0x00, 0x00, 0x73, 0x0d,
+0x30, 0x63, 0x72, 0x6f, 0xf5, 0x00, 0x02, 0xd3, 0x03, 0x22,
+0x6d, 0x69, 0xd2, 0x03, 0x0c, 0x3c, 0x00, 0x01, 0x29, 0x00,
+0x02, 0x3a, 0x00, 0x40, 0x2e, 0x00, 0x49, 0x6e, 0x1e, 0x04,
+0x01, 0xcb, 0x00, 0x00, 0x9b, 0x03, 0x06, 0x1c, 0x00, 0x01,
+0xb9, 0x05, 0x13, 0x73, 0x3e, 0x0a, 0x00, 0x48, 0x04, 0x02,
+0xcb, 0x08, 0x15, 0x64, 0x58, 0x02, 0x00, 0x65, 0x04, 0x1f,
+0x64, 0x91, 0x01, 0x10, 0x01, 0x2f, 0x01, 0x03, 0x81, 0x0a,
+0x50, 0x28, 0x6a, 0x75, 0x73, 0x74, 0x8b, 0x00, 0x05, 0x1d,
+0x09, 0x01, 0x78, 0x04, 0x0f, 0x8e, 0x03, 0x00, 0x12, 0x29,
+0xc4, 0x00, 0x01, 0x48, 0x0e, 0x3e, 0x65, 0x78, 0x74, 0x8e,
+0x00, 0x05, 0x8e, 0x08, 0x01, 0x63, 0x04, 0x02, 0x8d, 0x00,
+0x00, 0xe8, 0x10, 0x41, 0x72, 0x64, 0x65, 0x72, 0x70, 0x03,
+0x02, 0x86, 0x02, 0x3e, 0x75, 0x69, 0x73, 0x88, 0x00, 0x05,
+0x88, 0x11, 0x04, 0xad, 0x01, 0x00, 0x8c, 0x02, 0x00, 0x2a,
+0x02, 0x35, 0x28, 0x41, 0x6c, 0xeb, 0x01, 0x01, 0xdb, 0x02,
+0x72, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x5c, 0x00,
+0x13, 0x73, 0x7b, 0x08, 0x31, 0x32, 0x2e, 0x31, 0xce, 0x02,
+0x01, 0xa9, 0x05, 0x51, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x49,
+0x07, 0x12, 0x29, 0x83, 0x08, 0x17, 0x32, 0x83, 0x08, 0x50,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0xda, 0x0a, 0x02, 0x85, 0x08,
+0x01, 0xe1, 0x07, 0x06, 0x14, 0x00, 0x02, 0x45, 0x00, 0x04,
+0x40, 0x00, 0x06, 0x95, 0x00, 0xe2, 0x60, 0x43, 0x75, 0x73,
+0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70,
+0x8c, 0x07, 0x12, 0x6e, 0x1a, 0x00, 0xa1, 0x54, 0x79, 0x70,
+0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x82, 0x05, 0x81,
+0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x5b, 0x06,
+0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x4a, 0x08, 0x00, 0x30,
+0x05, 0x01, 0xb1, 0x00, 0x02, 0x4c, 0x08, 0x01, 0xb4, 0x08,
+0x21, 0x72, 0x65, 0x6f, 0x00, 0x32, 0x32, 0x00, 0x78, 0x37,
+0x00, 0x24, 0x00, 0x78, 0x38, 0x00, 0x04, 0x0b, 0x13, 0x21,
+0x65, 0x72, 0x39, 0x00, 0x51, 0x2c, 0x00, 0x74, 0x77, 0x6f,
+0x0e, 0x00, 0x32, 0x72, 0x6f, 0x77, 0x29, 0x0f, 0x03, 0x10,
+0x00, 0x06, 0xfb, 0x05, 0x72, 0x4e, 0x6f, 0x2e, 0x20, 0x6f,
+0x66, 0x20, 0x5a, 0x02, 0x3b, 0x00, 0x00, 0x4e, 0xf6, 0x05,
+0x23, 0x74, 0x6f, 0x09, 0x0f, 0x27, 0x69, 0x6e, 0xb2, 0x06,
+0x01, 0x1d, 0x12, 0x00, 0x63, 0x03, 0x10, 0x62, 0x9d, 0x06,
+0x00, 0x9b, 0x02, 0x14, 0x6c, 0x31, 0x06, 0x11, 0x2c, 0xa6,
+0x06, 0x00, 0x0d, 0x12, 0x20, 0x67, 0x65, 0x4a, 0x0d, 0x00,
+0x24, 0x01, 0x15, 0x74, 0x38, 0x0a, 0xf3, 0x04, 0x00, 0x68,
+0x79, 0x70, 0x68, 0x65, 0x6e, 0x2c, 0x00, 0x6c, 0x69, 0x6b,
+0x65, 0x00, 0x60, 0x32, 0x2d, 0x36, 0x27, 0x1f, 0x02, 0x05,
+0x36, 0x0c, 0x02, 0x43, 0x02, 0x1f, 0x6e, 0x88, 0x00, 0x05,
+0x1a, 0x6f, 0x88, 0x00, 0x01, 0x96, 0x10, 0x00, 0xd7, 0x03,
+0x05, 0xfc, 0x05, 0x72, 0x69, 0x73, 0x00, 0x6f, 0x6e, 0x6c,
+0x79, 0x2b, 0x0f, 0x00, 0xee, 0x01, 0x16, 0x66, 0xbb, 0x0b,
+0x04, 0x95, 0x08, 0x0f, 0xeb, 0x06, 0x0b, 0x33, 0x3b, 0x00,
+0x61, 0x45, 0x09, 0x11, 0x75, 0x76, 0x03, 0x00, 0x40, 0x0f,
+0x31, 0x66, 0x66, 0x65, 0x8c, 0x04, 0x03, 0x2b, 0x00, 0x03,
+0x0e, 0x08, 0x02, 0xfa, 0x13, 0x29, 0x61, 0x6c, 0x94, 0x0b,
+0x02, 0x1a, 0x05, 0x60, 0x61, 0x63, 0x63, 0x65, 0x70, 0x74,
+0x83, 0x00, 0x02, 0xa6, 0x09, 0x26, 0x6c, 0x6c, 0xda, 0x05,
+0x62, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x8d, 0x14, 0x21,
+0x75, 0x74, 0x0c, 0x00, 0x70, 0x6d, 0x61, 0x74, 0x63, 0x68,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 5458;
-const unsigned short help_text_words = 1015;
+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 be4469b5ac..4d42314e4b 100644
--- a/apps/plugins/puzzles/help/bridges.c
+++ b/apps/plugins/puzzles/help/bridges.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,336 +6,357 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 180, TEXT_CENTER | C_RED },
- { 312, TEXT_UNDERLINE },
- { 737, TEXT_CENTER | C_RED },
- { 754, TEXT_UNDERLINE },
- { 755, TEXT_UNDERLINE },
- { 765, TEXT_UNDERLINE },
- { 774, TEXT_UNDERLINE },
- { 813, TEXT_UNDERLINE },
- { 845, TEXT_UNDERLINE },
- { 880, TEXT_UNDERLINE },
+ { 178, TEXT_CENTER | C_RED },
+ { 310, TEXT_UNDERLINE },
+ { 763, TEXT_CENTER | C_RED },
+ { 780, TEXT_UNDERLINE },
+ { 781, TEXT_UNDERLINE },
+ { 791, TEXT_UNDERLINE },
+ { 800, TEXT_UNDERLINE },
+ { 839, TEXT_UNDERLINE },
+ { 871, TEXT_UNDERLINE },
+ { 906, TEXT_UNDERLINE },
+ { 991, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 5230 comp 3126 ratio 0.597706 level 10 saved 2104 */
+/* orig 5613 comp 3312 ratio 0.590059 level 10 saved 2301 */
 const char help_text[] = {
-0xf3, 0x4b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x36, 0x3a, 0x20, 0x42, 0x72, 0x69, 0x64, 0x67, 0x65,
-0x73, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68,
-0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x73, 0x65, 0x74, 0x00,
-0x6f, 0x66, 0x00, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73,
-0x00, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74,
-0x65, 0x64, 0x00, 0x61, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x00,
-0x74, 0x68, 0x65, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x69, 0x6e,
-0x67, 0x00, 0x61, 0x72, 0x65, 0x61, 0x2e, 0x00, 0x45, 0x61,
-0x63, 0x68, 0x32, 0x00, 0xf0, 0x04, 0x00, 0x63, 0x6f, 0x6e,
-0x74, 0x61, 0x69, 0x6e, 0x73, 0x00, 0x61, 0x00, 0x6e, 0x75,
-0x6d, 0x62, 0x65, 0x72, 0x2e, 0x5e, 0x00, 0xb0, 0x72, 0x00,
-0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x22,
-0x00, 0x41, 0x6e, 0x65, 0x63, 0x74, 0x48, 0x00, 0x04, 0x67,
-0x00, 0xf2, 0x00, 0x74, 0x6f, 0x67, 0x65, 0x74, 0x68, 0x65,
-0x72, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x62, 0x9a, 0x00,
-0xf3, 0x0b, 0x2c, 0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63,
-0x68, 0x00, 0x61, 0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68,
-0x61, 0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0xbb, 0x00,
-0xa0, 0x00, 0x72, 0x75, 0x6e, 0x00, 0x68, 0x6f, 0x72, 0x69,
-0x7a, 0x75, 0x00, 0xd0, 0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72,
-0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e, 0x00, 0x11,
-0x2e, 0x2c, 0x00, 0x33, 0x54, 0x68, 0x65, 0x8a, 0x00, 0x00,
-0xd8, 0x00, 0x13, 0x62, 0x3a, 0x00, 0x81, 0x74, 0x65, 0x72,
-0x6d, 0x69, 0x6e, 0x61, 0x74, 0xc5, 0x00, 0x54, 0x74, 0x00,
-0x61, 0x6e, 0x79, 0xc1, 0x00, 0x80, 0x69, 0x73, 0x00, 0x65,
-0x71, 0x75, 0x61, 0x6c, 0xab, 0x00, 0x16, 0x74, 0x3c, 0x00,
-0x70, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x93, 0x00,
-0x00, 0x88, 0x00, 0x03, 0x2e, 0x00, 0x03, 0x63, 0x00, 0x25,
-0x77, 0x6f, 0x59, 0x00, 0x31, 0x6d, 0x61, 0x79, 0x97, 0x00,
-0xf1, 0x04, 0x69, 0x6e, 0x00, 0x70, 0x61, 0x72, 0x61, 0x6c,
-0x6c, 0x65, 0x6c, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65,
-0x6e, 0x4f, 0x00, 0x84, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x74,
-0x77, 0x6f, 0xfb, 0x00, 0xd0, 0x2c, 0x00, 0x62, 0x75, 0x74,
-0x00, 0x6e, 0x6f, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0x5b, 0x00,
-0x11, 0x6e, 0x1e, 0x00, 0x00, 0x47, 0x00, 0x52, 0x64, 0x6f,
-0x00, 0x73, 0x6f, 0x62, 0x00, 0x14, 0x4e, 0x61, 0x00, 0x11,
-0x00, 0x84, 0x01, 0x61, 0x65, 0x73, 0x00, 0x61, 0x6e, 0x6f,
-0x31, 0x01, 0x02, 0x17, 0x00, 0x02, 0x26, 0x00, 0x39, 0x41,
-0x6c, 0x6c, 0x56, 0x01, 0x34, 0x61, 0x72, 0x65, 0x6e, 0x01,
-0x25, 0x65, 0x64, 0x64, 0x01, 0x00, 0x2c, 0x00, 0x51, 0x54,
-0x68, 0x65, 0x72, 0x65, 0x20, 0x00, 0x31, 0x73, 0x6f, 0x6d,
-0x25, 0x00, 0xf0, 0x00, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-0x62, 0x6c, 0x65, 0x00, 0x61, 0x6c, 0x74, 0x65, 0x72, 0x1b,
-0x01, 0x60, 0x76, 0x65, 0x00, 0x6d, 0x6f, 0x64, 0x88, 0x01,
-0x30, 0x77, 0x68, 0x69, 0xe2, 0x01, 0xc0, 0x6e, 0x76, 0x6f,
-0x6c, 0x76, 0x65, 0x00, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x39,
-0x01, 0x01, 0x0a, 0x02, 0x03, 0xe5, 0x00, 0x13, 0x2d, 0xa0,
-0x00, 0x50, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x3c, 0x01, 0x00,
-0x59, 0x00, 0x20, 0x74, 0x68, 0x27, 0x00, 0x02, 0xa9, 0x00,
-0x01, 0xdb, 0x00, 0x31, 0x32, 0x2c, 0x00, 0x64, 0x01, 0x74,
-0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x45, 0x00, 0xa0,
-0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
-0x8b, 0x00, 0x72, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74,
-0x68, 0x01, 0xb8, 0x6e, 0x6f, 0x00, 0x73, 0x65, 0x71, 0x75,
-0x65, 0x6e, 0x63, 0x65, 0xc0, 0x01, 0x00, 0x20, 0x01, 0xf4,
-0x05, 0x66, 0x6f, 0x72, 0x6d, 0x00, 0x61, 0x00, 0x6c, 0x6f,
-0x6f, 0x70, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x6f, 0x6e,
-0x65, 0xc6, 0x01, 0x44, 0x62, 0x61, 0x63, 0x6b, 0xc2, 0x01,
-0x01, 0x73, 0x01, 0x04, 0xb0, 0x01, 0x00, 0x0f, 0x02, 0x91,
-0x72, 0x75, 0x6c, 0x65, 0x73, 0x00, 0x73, 0x74, 0x61, 0xd6,
-0x02, 0x32, 0x62, 0x6f, 0x76, 0x0b, 0x01, 0x00, 0x2c, 0x00,
-0x70, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x4b, 0x00,
-0x10, 0x73, 0x29, 0x01, 0x60, 0x43, 0x72, 0x65, 0x64, 0x69,
-0x74, 0x6b, 0x00, 0xf1, 0x01, 0x00, 0x74, 0x68, 0x69, 0x73,
-0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f,
-0x65, 0xcc, 0x02, 0xb0, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69,
-0x00, 0x5b, 0x31, 0x32, 0x5d, 0x2e, 0x00, 0x04, 0x98, 0x02,
-0x31, 0x77, 0x61, 0x73, 0x09, 0x03, 0x04, 0x3a, 0x03, 0x01,
-0x89, 0x00, 0x10, 0x69, 0x14, 0x00, 0x40, 0x6c, 0x6c, 0x65,
-0x63, 0xea, 0x00, 0xf1, 0x00, 0x00, 0x62, 0x79, 0x00, 0x4a,
-0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65,
-0xac, 0x02, 0x00, 0x46, 0x00, 0xd1, 0x00, 0x68, 0x74, 0x74,
-0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x5d,
-0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65,
-0x6e, 0x2f, 0x7c, 0x00, 0xf1, 0x0c, 0x73, 0x2f, 0x68, 0x61,
-0x73, 0x68, 0x69, 0x77, 0x6f, 0x6b, 0x61, 0x6b, 0x65, 0x72,
-0x6f, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0x28, 0x62, 0x65,
-0x77, 0x61, 0x72, 0x22, 0x01, 0xd5, 0x46, 0x6c, 0x61, 0x73,
-0x68, 0x29, 0x00, 0x00, 0x00, 0x32, 0x36, 0x2e, 0x31, 0xe5,
-0x03, 0x01, 0x8e, 0x00, 0x21, 0x6f, 0x6c, 0xee, 0x03, 0x20,
-0x54, 0x6f, 0xc0, 0x03, 0x10, 0x63, 0xee, 0x03, 0x03, 0xb5,
-0x01, 0x05, 0xa1, 0x02, 0x08, 0x98, 0x02, 0x30, 0x63, 0x6c,
-0x69, 0x44, 0x01, 0x10, 0x68, 0x06, 0x02, 0xb8, 0x75, 0x73,
-0x65, 0x00, 0x64, 0x6f, 0x77, 0x6e, 0x00, 0x6f, 0x6e, 0x66,
-0x01, 0x00, 0x04, 0x00, 0x51, 0x64, 0x72, 0x61, 0x67, 0x00,
-0xf3, 0x01, 0x42, 0x77, 0x61, 0x72, 0x64, 0x1f, 0x04, 0x01,
-0xf2, 0x01, 0x01, 0xf9, 0x03, 0x00, 0xc5, 0x02, 0x62, 0x6e,
-0x6f, 0x74, 0x00, 0x6e, 0x65, 0x07, 0x01, 0x01, 0x2e, 0x00,
-0x13, 0x61, 0xa8, 0x02, 0x01, 0xd5, 0x03, 0x16, 0x6f, 0x32,
-0x00, 0x03, 0x57, 0x00, 0xa5, 0x3b, 0x00, 0x79, 0x6f, 0x75,
-0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x37, 0x00, 0x10, 0x6d, 0xa4,
-0x01, 0x06, 0x8b, 0x00, 0xa3, 0x66, 0x61, 0x72, 0x00, 0x65,
-0x6e, 0x6f, 0x75, 0x67, 0x68, 0x9a, 0x01, 0x10, 0x65, 0x53,
-0x02, 0x54, 0x65, 0x6e, 0x64, 0x65, 0x64, 0xd3, 0x00, 0x33,
-0x64, 0x69, 0x72, 0x6a, 0x01, 0xf1, 0x07, 0x74, 0x6f, 0x00,
-0x62, 0x65, 0x00, 0x75, 0x6e, 0x61, 0x6d, 0x62, 0x69, 0x67,
-0x75, 0x6f, 0x75, 0x73, 0x2e, 0x00, 0x28, 0x53, 0x6f, 0x64,
-0x00, 0x87, 0x63, 0x61, 0x6e, 0x00, 0x6b, 0x65, 0x65, 0x70,
-0x5b, 0x00, 0x42, 0x6e, 0x65, 0x61, 0x72, 0x36, 0x02, 0x31,
-0x74, 0x61, 0x72, 0x1f, 0x04, 0x07, 0xec, 0x00, 0xb0, 0x63,
-0x6f, 0x6e, 0x76, 0x65, 0x6e, 0x69, 0x65, 0x6e, 0x74, 0x6c,
-0x8f, 0x04, 0x35, 0x72, 0x6f, 0x77, 0x91, 0x02, 0x32, 0x6f,
-0x75, 0x74, 0x85, 0x02, 0x20, 0x69, 0x74, 0xfc, 0x03, 0x10,
-0x6d, 0x52, 0x04, 0x05, 0x84, 0x00, 0x20, 0x73, 0x2e, 0x91,
-0x01, 0x22, 0x44, 0x6f, 0xf0, 0x02, 0xd6, 0x69, 0x73, 0x00,
-0x61, 0x67, 0x61, 0x69, 0x6e, 0x00, 0x77, 0x68, 0x65, 0x6e,
-0x85, 0x01, 0x00, 0x17, 0x00, 0xf0, 0x04, 0x6c, 0x72, 0x65,
-0x61, 0x64, 0x79, 0x00, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e,
-0x74, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x1d, 0x03, 0x05, 0xee,
-0x03, 0x06, 0x53, 0x04, 0x03, 0xf7, 0x03, 0x45, 0x49, 0x66,
-0x00, 0x74, 0xcc, 0x03, 0x04, 0x3f, 0x00, 0x22, 0x61, 0x73,
-0x80, 0x00, 0x04, 0x9c, 0x00, 0x08, 0x80, 0x04, 0x07, 0xe3,
-0x01, 0x00, 0x28, 0x00, 0x10, 0x70, 0x08, 0x05, 0x20, 0x74,
-0x74, 0x38, 0x01, 0x11, 0x79, 0x20, 0x00, 0x40, 0x63, 0x75,
-0x72, 0x72, 0x7b, 0x00, 0x34, 0x67, 0x61, 0x6d, 0x29, 0x03,
-0x51, 0x28, 0x69, 0x2e, 0x65, 0x2e, 0x39, 0x00, 0x24, 0x62,
-0x79, 0x21, 0x03, 0x26, 0x29, 0x2c, 0x5b, 0x03, 0x00, 0xd4,
-0x01, 0x11, 0x67, 0x49, 0x05, 0x02, 0x71, 0x01, 0x01, 0xb6,
-0x00, 0x21, 0x72, 0x65, 0xb4, 0x01, 0x00, 0xeb, 0x01, 0x11,
-0x6f, 0xa4, 0x00, 0x10, 0x6d, 0xe3, 0x02, 0x21, 0x49, 0x66,
-0x78, 0x01, 0x31, 0x77, 0x61, 0x6e, 0x24, 0x04, 0x60, 0x72,
-0x65, 0x6d, 0x69, 0x6e, 0x64, 0x13, 0x00, 0x52, 0x72, 0x73,
-0x65, 0x6c, 0x66, 0xf2, 0x03, 0x08, 0xa2, 0x00, 0x90, 0x64,
-0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x6c, 0x0e, 0x05,
-0x10, 0x20, 0x49, 0x02, 0x03, 0xa7, 0x06, 0x0c, 0xb9, 0x02,
-0x45, 0x68, 0x65, 0x6d, 0x2c, 0xd3, 0x01, 0x61, 0x72, 0x69,
-0x67, 0x68, 0x74, 0x2d, 0x6b, 0x02, 0x08, 0x21, 0x00, 0x27,
-0x00, 0x69, 0x83, 0x05, 0x03, 0x7c, 0x02, 0xb3, 0x64, 0x72,
-0x61, 0x77, 0x00, 0x61, 0x00, 0x60, 0x6e, 0x6f, 0x6e, 0xc2,
-0x04, 0x87, 0x27, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72,
-0xaf, 0x00, 0x00, 0xc7, 0x04, 0x34, 0x6b, 0x00, 0x79, 0x25,
-0x07, 0x00, 0x93, 0x00, 0x42, 0x73, 0x68, 0x65, 0x64, 0xad,
-0x06, 0x24, 0x61, 0x6e, 0x22, 0x02, 0x02, 0x28, 0x01, 0x05,
-0x27, 0x00, 0x01, 0x64, 0x03, 0x11, 0x64, 0x02, 0x01, 0x35,
-0x69, 0x74, 0x73, 0x8d, 0x01, 0x01, 0x4c, 0x02, 0x13, 0x72,
-0x74, 0x05, 0x24, 0x64, 0x65, 0xe8, 0x04, 0x41, 0x74, 0x68,
-0x65, 0x79, 0x18, 0x00, 0x03, 0xa5, 0x00, 0x01, 0xc4, 0x00,
-0x02, 0x44, 0x00, 0x26, 0x73, 0x29, 0xdb, 0x00, 0x00, 0x9c,
-0x00, 0x07, 0xe4, 0x05, 0x00, 0xc3, 0x01, 0x05, 0x8f, 0x00,
-0x81, 0x62, 0x79, 0x00, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0xb9,
-0x03, 0x01, 0x79, 0x05, 0x40, 0x6e, 0x00, 0x69, 0x74, 0xf3,
-0x04, 0x22, 0x69, 0x73, 0x95, 0x01, 0x51, 0x68, 0x69, 0x67,
-0x68, 0x6c, 0x59, 0x00, 0x22, 0x69, 0x74, 0x89, 0x00, 0x03,
-0x8a, 0x03, 0x04, 0x9d, 0x00, 0x08, 0x2e, 0x06, 0x32, 0x00,
-0x69, 0x74, 0xae, 0x05, 0x01, 0xb2, 0x01, 0x20, 0x69, 0x6c,
-0xc8, 0x06, 0x00, 0x9a, 0x02, 0x30, 0x76, 0x65, 0x6e, 0x21,
-0x00, 0x01, 0xed, 0x02, 0x31, 0x61, 0x63, 0x63, 0xc4, 0x00,
-0x01, 0x7d, 0x07, 0x52, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x17,
-0x08, 0x22, 0x6e, 0x79, 0xf6, 0x01, 0x26, 0x6f, 0x73, 0x5c,
-0x00, 0xc9, 0x69, 0x6e, 0x00, 0x66, 0x75, 0x74, 0x75, 0x72,
-0x65, 0x2e, 0x00, 0x4c, 0xa7, 0x00, 0x02, 0x0d, 0x03, 0x10,
-0x6f, 0x0b, 0x03, 0x05, 0xa1, 0x00, 0x24, 0x65, 0x64, 0xe2,
-0x00, 0x01, 0x7a, 0x00, 0x21, 0x75, 0x6e, 0xf9, 0x00, 0x03,
-0xb6, 0x00, 0x40, 0x72, 0x65, 0x73, 0x74, 0x2e, 0x07, 0x11,
-0x79, 0x59, 0x08, 0x51, 0x62, 0x69, 0x6c, 0x69, 0x74, 0xcd,
-0x01, 0x02, 0x81, 0x00, 0x01, 0xf4, 0x00, 0x02, 0xd4, 0x08,
-0x00, 0x32, 0x01, 0x50, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0xda,
-0x03, 0x03, 0xde, 0x02, 0x85, 0x73, 0x6f, 0x72, 0x00, 0x6b,
-0x65, 0x79, 0x73, 0x57, 0x04, 0x61, 0x61, 0x72, 0x6f, 0x75,
-0x6e, 0x64, 0x1f, 0x00, 0xf9, 0x01, 0x67, 0x72, 0x69, 0x64,
-0x3a, 0x00, 0x69, 0x66, 0x00, 0x70, 0x6f, 0x73, 0x73, 0x69,
-0x62, 0x6c, 0x35, 0x00, 0x02, 0x8d, 0x03, 0x52, 0x6c, 0x77,
-0x61, 0x79, 0x73, 0x39, 0x00, 0x80, 0x6f, 0x72, 0x74, 0x68,
-0x6f, 0x67, 0x6f, 0x6e, 0xfd, 0x00, 0x12, 0x2c, 0xc2, 0x04,
-0x63, 0x77, 0x69, 0x73, 0x65, 0x00, 0x69, 0xb9, 0x03, 0x02,
-0xb5, 0x04, 0x07, 0x17, 0x05, 0x00, 0x5c, 0x04, 0x24, 0x65,
-0x73, 0x3c, 0x08, 0x04, 0xfb, 0x04, 0x51, 0x69, 0x6e, 0x64,
-0x69, 0x63, 0x8b, 0x06, 0x05, 0x30, 0x04, 0x60, 0x2e, 0x00,
-0x48, 0x6f, 0x6c, 0x64, 0x1c, 0x01, 0x12, 0x43, 0xb8, 0x05,
-0x01, 0xf7, 0x00, 0x00, 0x16, 0x04, 0x11, 0x73, 0x31, 0x01,
-0x07, 0xc8, 0x00, 0x02, 0x6b, 0x00, 0x37, 0x6c, 0x61, 0x79,
-0x49, 0x04, 0x03, 0xa3, 0x08, 0x06, 0x03, 0x05, 0x90, 0x28,
-0x69, 0x66, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0xe1, 0x07,
-0x73, 0x29, 0x3b, 0x00, 0x53, 0x68, 0x69, 0x66, 0x01, 0x02,
-0x0f, 0x4b, 0x00, 0x04, 0x01, 0x11, 0x03, 0x1c, 0x00, 0x12,
-0x03, 0x14, 0x50, 0x82, 0x00, 0x01, 0xa2, 0x02, 0x40, 0x65,
-0x74, 0x75, 0x72, 0x40, 0x05, 0x00, 0x8a, 0x07, 0x42, 0x6c,
-0x6c, 0x6f, 0x77, 0x83, 0x02, 0x0e, 0x52, 0x00, 0x01, 0x82,
-0x01, 0x0f, 0xa2, 0x00, 0x0b, 0x08, 0xb1, 0x01, 0x01, 0xea,
-0x01, 0x2f, 0x61, 0x6e, 0xe2, 0x02, 0x04, 0x18, 0x70, 0x83,
-0x00, 0x20, 0x73, 0x70, 0xc7, 0x06, 0x30, 0x62, 0x61, 0x72,
-0xf9, 0x09, 0x0c, 0x1d, 0x00, 0x07, 0xa0, 0x00, 0x51, 0x74,
-0x77, 0x69, 0x63, 0x65, 0xa1, 0x07, 0x07, 0x24, 0x00, 0x04,
-0xa1, 0x0a, 0x00, 0x22, 0x00, 0x06, 0x61, 0x03, 0x45, 0x6a,
-0x75, 0x6d, 0x70, 0xfb, 0x09, 0x0a, 0xb0, 0x01, 0x01, 0xef,
-0x03, 0x02, 0x95, 0x08, 0x03, 0xda, 0x0a, 0xf0, 0x0c, 0x4c,
-0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x00, 0x60, 0x61, 0x27,
-0x2c, 0x00, 0x2e, 0x2e, 0x2e, 0x2c, 0x00, 0x60, 0x66, 0x27,
-0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0xb8, 0x00, 0x23, 0x31,
-0x30, 0x16, 0x00, 0x21, 0x31, 0x35, 0x6d, 0x01, 0x31, 0x60,
-0x30, 0x27, 0x17, 0x00, 0x10, 0x36, 0x8b, 0x00, 0x51, 0x56,
-0x69, 0x6f, 0x6c, 0x61, 0x1d, 0x06, 0x03, 0x21, 0x05, 0x04,
-0x5c, 0x08, 0x02, 0x75, 0x05, 0x04, 0x71, 0x03, 0x01, 0x7b,
-0x01, 0x10, 0x64, 0x32, 0x01, 0x42, 0x72, 0x65, 0x64, 0x3a,
-0xe7, 0x09, 0x1a, 0x6e, 0x92, 0x00, 0x2a, 0x6f, 0x6f, 0xef,
-0x05, 0x04, 0x3b, 0x00, 0x09, 0x4d, 0x03, 0x01, 0x40, 0x00,
-0x1f, 0x2e, 0x40, 0x00, 0x05, 0x3f, 0x66, 0x65, 0x77, 0x3f,
-0x00, 0x10, 0x00, 0x1a, 0x03, 0x00, 0xdf, 0x06, 0x09, 0x98,
-0x05, 0xf3, 0x03, 0x61, 0x6e, 0x00, 0x65, 0x72, 0x72, 0x6f,
-0x72, 0x00, 0x28, 0x61, 0x73, 0x00, 0x6f, 0x70, 0x70, 0x6f,
-0x73, 0xb3, 0x07, 0x20, 0x65, 0x72, 0x1f, 0x00, 0x00, 0xb4,
-0x05, 0x20, 0x62, 0x65, 0x70, 0x01, 0x05, 0xc6, 0x01, 0x41,
-0x79, 0x65, 0x74, 0x29, 0x66, 0x03, 0x21, 0x61, 0x64, 0xe4,
-0x02, 0x03, 0xca, 0x07, 0x05, 0x80, 0x00, 0x45, 0x6f, 0x75,
-0x6c, 0x64, 0x6d, 0x0a, 0x31, 0x68, 0x61, 0x76, 0xd1, 0x01,
-0x12, 0x6f, 0xfa, 0x0a, 0x0b, 0xf8, 0x0a, 0x00, 0xf8, 0x01,
-0x04, 0x6a, 0x06, 0x16, 0x00, 0xc4, 0x05, 0x03, 0xb1, 0x02,
-0x10, 0x2c, 0x1f, 0x00, 0x28, 0x69, 0x66, 0x30, 0x05, 0x20,
-0x68, 0x61, 0x0f, 0x07, 0x29, 0x65, 0x6e, 0xde, 0x00, 0x01,
-0xae, 0x09, 0x54, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x49, 0x0b,
-0x68, 0x00, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x09, 0x0d, 0x01,
-0x55, 0x0a, 0x07, 0x7d, 0x0a, 0x0f, 0x21, 0x01, 0x0c, 0x41,
-0x61, 0x00, 0x63, 0x6c, 0x0a, 0x01, 0x33, 0x73, 0x75, 0x62,
-0x53, 0x0d, 0x07, 0xe3, 0x01, 0x01, 0x78, 0x01, 0x24, 0x6e,
-0x6f, 0x85, 0x06, 0x04, 0x12, 0x0d, 0x02, 0x39, 0x0b, 0x02,
-0xbc, 0x02, 0x15, 0x73, 0x34, 0x00, 0x03, 0x82, 0x00, 0x90,
-0x2e, 0x00, 0x46, 0x6f, 0x72, 0x00, 0x65, 0x78, 0x61, 0xa9,
-0x00, 0x32, 0x2c, 0x00, 0x69, 0x9b, 0x06, 0x02, 0x42, 0x03,
-0x26, 0x6c, 0x79, 0x56, 0x0d, 0x4c, 0x77, 0x6f, 0x00, 0x31,
-0x51, 0x0d, 0x05, 0x79, 0x03, 0x01, 0x77, 0x04, 0x04, 0x6a,
-0x06, 0x22, 0x6e, 0x6f, 0x85, 0x0d, 0x01, 0x6a, 0x09, 0x08,
-0x76, 0x07, 0x25, 0x6f, 0x6e, 0x0e, 0x05, 0x01, 0xe7, 0x07,
-0x04, 0x1a, 0x04, 0x01, 0x3a, 0x06, 0x43, 0x75, 0x70, 0x00,
-0x72, 0x20, 0x06, 0x03, 0xb9, 0x04, 0x02, 0x14, 0x03, 0x03,
-0xa9, 0x0d, 0x02, 0x39, 0x01, 0x32, 0x63, 0x61, 0x6e, 0xf9,
-0x01, 0x04, 0x10, 0x0e, 0x02, 0x23, 0x01, 0x00, 0xa6, 0x02,
-0xa4, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x00, 0x73, 0x6f, 0x6c,
-0x75, 0xf9, 0x03, 0x14, 0x2d, 0x68, 0x07, 0x01, 0x37, 0x07,
-0x33, 0x73, 0x65, 0x6c, 0x82, 0x06, 0x40, 0x68, 0x65, 0x00,
-0x28, 0xd4, 0x01, 0x04, 0x73, 0x08, 0x34, 0x00, 0x6f, 0x70,
-0xd1, 0x09, 0x40, 0x64, 0x69, 0x73, 0x61, 0x73, 0x04, 0x01,
-0xfd, 0x0b, 0x15, 0x73, 0xd9, 0x07, 0x03, 0x55, 0x00, 0x15,
-0x2c, 0x88, 0x00, 0x07, 0x32, 0x0c, 0x02, 0xc4, 0x0c, 0x00,
-0x34, 0x0c, 0x14, 0x73, 0x35, 0x0c, 0x0e, 0xea, 0x02, 0x01,
-0x22, 0x03, 0x14, 0x28, 0x48, 0x0d, 0x02, 0xd0, 0x08, 0x00,
-0xee, 0x02, 0x52, 0x73, 0x63, 0x72, 0x69, 0x62, 0xc4, 0x00,
-0x13, 0x73, 0x54, 0x05, 0x33, 0x32, 0x2e, 0x31, 0x75, 0x09,
-0x26, 0x73, 0x6f, 0x5d, 0x05, 0x13, 0x2e, 0x7a, 0x0b, 0x15,
-0x32, 0x7a, 0x0b, 0x00, 0xb3, 0x09, 0x20, 0x6d, 0x65, 0x27,
-0x04, 0x12, 0x20, 0x79, 0x0d, 0x36, 0x73, 0x65, 0x00, 0x14,
-0x00, 0x02, 0x43, 0x00, 0x04, 0x3e, 0x00, 0x02, 0x55, 0x07,
-0x00, 0x7b, 0x00, 0xb4, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f,
-0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0xf7, 0x00, 0x03, 0x96, 0x01,
-0x40, 0x60, 0x54, 0x79, 0x70, 0x93, 0x05, 0x30, 0x65, 0x6e,
-0x75, 0xad, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c,
-0x00, 0x48, 0x65, 0x9d, 0x01, 0x51, 0x00, 0x00, 0x53, 0x69,
-0x7a, 0x07, 0x0c, 0x00, 0xbd, 0x01, 0x01, 0xaf, 0x00, 0x42,
-0x71, 0x75, 0x61, 0x72, 0xcc, 0x0c, 0xaa, 0x44, 0x69, 0x66,
-0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x0d, 0x00, 0x41,
-0x6c, 0x65, 0x76, 0x65, 0xa6, 0x09, 0x02, 0x9e, 0x02, 0x00,
-0x2b, 0x00, 0x10, 0x41, 0x5d, 0x01, 0x12, 0x20, 0x5d, 0x01,
-0x12, 0x00, 0x41, 0x08, 0x21, 0x69, 0x73, 0x1c, 0x10, 0x06,
-0x03, 0x0a, 0x01, 0x7d, 0x0a, 0x20, 0x63, 0x6c, 0x24, 0x05,
-0x23, 0x64, 0x2c, 0x3c, 0x00, 0x06, 0x3e, 0x04, 0x51, 0x67,
-0x65, 0x6e, 0x65, 0x72, 0xd6, 0x06, 0x0e, 0xc5, 0x0f, 0x06,
-0x83, 0x02, 0x03, 0x4f, 0x07, 0x00, 0xb9, 0x01, 0x13, 0x62,
-0x18, 0x03, 0x00, 0x49, 0x0b, 0x33, 0x63, 0x72, 0x65, 0x9b,
-0x0f, 0x01, 0xa9, 0x01, 0x02, 0x87, 0x08, 0x04, 0xde, 0x01,
-0x04, 0xcb, 0x01, 0x25, 0x64, 0x6f, 0x25, 0x04, 0x0b, 0xd0,
-0x01, 0x04, 0x1e, 0x02, 0x02, 0xcf, 0x01, 0x64, 0x4d, 0x61,
-0x78, 0x2e, 0x20, 0x62, 0x8e, 0x01, 0x36, 0x65, 0x72, 0x20,
-0x18, 0x07, 0x01, 0x1d, 0x00, 0x4e, 0x69, 0x6d, 0x75, 0x6d,
-0x22, 0x10, 0x04, 0xaf, 0x02, 0x20, 0x70, 0x61, 0x4f, 0x10,
-0x48, 0x75, 0x6c, 0x61, 0x72, 0xae, 0x06, 0x17, 0x54, 0x2b,
-0x0e, 0x42, 0x69, 0x73, 0x00, 0x32, 0xc6, 0x0f, 0x04, 0x44,
-0x06, 0x01, 0x21, 0x0f, 0x13, 0x65, 0xcf, 0x03, 0x40, 0x31,
-0x2c, 0x00, 0x33, 0x88, 0x04, 0x53, 0x34, 0x2e, 0x00, 0x49,
-0x6e, 0x17, 0x01, 0x20, 0x6c, 0x2c, 0x72, 0x05, 0x21, 0x65,
-0x72, 0x6d, 0x10, 0x32, 0x61, 0x73, 0x69, 0x6e, 0x0a, 0x82,
-0x25, 0x61, 0x67, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x87, 0x03,
-0x13, 0x20, 0xba, 0x01, 0x70, 0x00, 0x00, 0x00, 0x47, 0x69,
-0x76, 0x65, 0xb5, 0x02, 0x11, 0x72, 0x28, 0x05, 0x40, 0x70,
-0x65, 0x72, 0x63, 0x73, 0x09, 0x28, 0x67, 0x65, 0xa0, 0x04,
-0x25, 0x74, 0x68, 0x74, 0x01, 0x04, 0xac, 0x08, 0x31, 0x74,
-0x72, 0x79, 0x39, 0x01, 0x11, 0x6c, 0xaf, 0x04, 0x34, 0x66,
-0x6f, 0x72, 0xbb, 0x0a, 0x05, 0xbc, 0x0f, 0x03, 0xf0, 0x01,
-0x30, 0x43, 0x65, 0x72, 0xa4, 0x03, 0x00, 0x29, 0x00, 0x33,
-0x6f, 0x75, 0x74, 0xc4, 0x01, 0x00, 0xc0, 0x03, 0x30, 0x6d,
-0x61, 0x6e, 0x67, 0x00, 0x12, 0x74, 0xbf, 0x07, 0x03, 0xa8,
-0x05, 0x03, 0x72, 0x00, 0x12, 0x3b, 0xca, 0x0c, 0x10, 0x69,
-0x1b, 0x05, 0x40, 0x00, 0x75, 0x70, 0x70, 0x94, 0x05, 0x22,
-0x6f, 0x75, 0x13, 0x11, 0xf0, 0x03, 0x45, 0x78, 0x70, 0x61,
-0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x66, 0x61, 0x63, 0x74,
-0x6f, 0x72, 0x20, 0x28, 0xdc, 0x00, 0x12, 0x29, 0x00, 0x03,
-0x02, 0x9b, 0x02, 0x07, 0xac, 0x00, 0x41, 0x6f, 0x72, 0x6b,
-0x73, 0xbe, 0x07, 0x04, 0x10, 0x0a, 0x69, 0x6e, 0x00, 0x65,
-0x78, 0x69, 0x73, 0x7d, 0x0d, 0xf8, 0x05, 0x74, 0x00, 0x72,
-0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x00, 0x28, 0x61, 0x66, 0x74,
-0x65, 0x72, 0x00, 0x66, 0x69, 0x72, 0x73, 0x28, 0x02, 0x20,
-0x6e, 0x00, 0x90, 0x06, 0x34, 0x69, 0x61, 0x6c, 0x32, 0x00,
-0x00, 0x7f, 0x10, 0x10, 0x77, 0x1a, 0x0d, 0x41, 0x29, 0x2e,
-0x00, 0x49, 0x72, 0x02, 0x40, 0x6e, 0x00, 0x64, 0x65, 0xae,
-0x0a, 0x12, 0x73, 0x6b, 0x0a, 0x07, 0x1e, 0x09, 0x05, 0x5e,
-0x00, 0x24, 0x29, 0x2c, 0x22, 0x05, 0x13, 0x6e, 0x97, 0x00,
-0x00, 0x8e, 0x02, 0x31, 0x68, 0x6f, 0x77, 0x72, 0x0e, 0x41,
-0x69, 0x74, 0x00, 0x63, 0x9c, 0x06, 0x20, 0x65, 0x78, 0x6c,
-0x0e, 0x04, 0x54, 0x01, 0x07, 0x85, 0x00, 0x08, 0xc6, 0x0e,
-0x03, 0x78, 0x0b, 0x05, 0xeb, 0x03, 0x32, 0x00, 0x64, 0x65,
-0x75, 0x12, 0x21, 0x65, 0x73, 0x52, 0x00, 0x50, 0x6c, 0x69,
-0x6b, 0x65, 0x6c, 0xad, 0x0a, 0x03, 0x17, 0x13, 0x03, 0x55,
-0x00, 0x21, 0x61, 0x73, 0x6c, 0x00, 0x21, 0x61, 0x73, 0x6f,
-0x00, 0x66, 0x61, 0x6e, 0x2c, 0x00, 0x72, 0x61, 0x40, 0x11,
-0x41, 0x63, 0x68, 0x6f, 0x6f, 0xbd, 0x08, 0x05, 0xdf, 0x00,
-0x02, 0x68, 0x06, 0x01, 0x40, 0x02, 0x64, 0x48, 0x69, 0x67,
-0x68, 0x00, 0x65, 0x7b, 0x01, 0x12, 0x00, 0x7b, 0x01, 0x52,
-0x73, 0x00, 0x75, 0x73, 0x75, 0x9f, 0x0b, 0x33, 0x65, 0x61,
-0x6e, 0x6e, 0x02, 0x07, 0xae, 0x03, 0x23, 0x74, 0x68, 0x8b,
-0x02, 0x05, 0xf3, 0x0a, 0x05, 0xe0, 0x01, 0x00, 0x60, 0x05,
-0x0e, 0x4f, 0x00, 0x01, 0xe1, 0x02, 0x20, 0x72, 0x65, 0xf8,
-0x05, 0x32, 0x6c, 0x6f, 0x74, 0xbd, 0x08, 0x00, 0x7c, 0x04,
-0x73, 0x6c, 0x79, 0x2d, 0x70, 0x61, 0x63, 0x6b, 0xb9, 0x0b,
-0x50, 0x6e, 0x64, 0x73, 0x2e, 0x00,
+0x73, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf3, 0x37, 0x00, 0x00,
+0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
+0x61, 0x00, 0x73, 0x65, 0x74, 0x00, 0x6f, 0x66, 0x00, 0x69,
+0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x00, 0x64, 0x69, 0x73,
+0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x00, 0x61,
+0x63, 0x72, 0x6f, 0x73, 0x73, 0x00, 0x74, 0x68, 0x65, 0x00,
+0x70, 0x6c, 0x61, 0x79, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x72,
+0x65, 0x61, 0x2e, 0x00, 0x45, 0x61, 0x63, 0x68, 0x32, 0x00,
+0xf0, 0x04, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
+0x73, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+0x2e, 0x5e, 0x00, 0xb0, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00,
+0x69, 0x73, 0x00, 0x74, 0x6f, 0x22, 0x00, 0x41, 0x6e, 0x65,
+0x63, 0x74, 0x48, 0x00, 0x04, 0x67, 0x00, 0xf2, 0x00, 0x74,
+0x6f, 0x67, 0x65, 0x74, 0x68, 0x65, 0x72, 0x00, 0x77, 0x69,
+0x74, 0x68, 0x00, 0x62, 0xae, 0x00, 0xf3, 0x0b, 0x2c, 0x00,
+0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61, 0x00,
+0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x3a, 0x00,
+0x00, 0x00, 0x2d, 0x00, 0xcf, 0x00, 0xa0, 0x00, 0x72, 0x75,
+0x6e, 0x00, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x75, 0x00, 0xd0,
+0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72, 0x00, 0x76, 0x65, 0x72,
+0x74, 0x69, 0x63, 0x0e, 0x00, 0x11, 0x2e, 0x2c, 0x00, 0x33,
+0x54, 0x68, 0x65, 0x8a, 0x00, 0x00, 0xd8, 0x00, 0x13, 0x62,
+0x3a, 0x00, 0x81, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
+0x74, 0xc5, 0x00, 0x54, 0x74, 0x00, 0x61, 0x6e, 0x79, 0xc1,
+0x00, 0x80, 0x69, 0x73, 0x00, 0x65, 0x71, 0x75, 0x61, 0x6c,
+0xab, 0x00, 0x16, 0x74, 0x3c, 0x00, 0x70, 0x77, 0x72, 0x69,
+0x74, 0x74, 0x65, 0x6e, 0x93, 0x00, 0x00, 0x88, 0x00, 0x03,
+0x2e, 0x00, 0x03, 0x63, 0x00, 0x25, 0x77, 0x6f, 0x59, 0x00,
+0x31, 0x6d, 0x61, 0x79, 0x97, 0x00, 0xf1, 0x04, 0x69, 0x6e,
+0x00, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x6c, 0x65, 0x6c, 0x00,
+0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x4f, 0x00, 0x84,
+0x73, 0x61, 0x6d, 0x65, 0x00, 0x74, 0x77, 0x6f, 0xfb, 0x00,
+0xd0, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x6e, 0x6f, 0x00,
+0x6d, 0x6f, 0x72, 0x65, 0x5b, 0x00, 0x11, 0x6e, 0x1e, 0x00,
+0x00, 0x47, 0x00, 0x52, 0x64, 0x6f, 0x00, 0x73, 0x6f, 0x62,
+0x00, 0x14, 0x4e, 0x61, 0x00, 0x11, 0x00, 0x84, 0x01, 0x61,
+0x65, 0x73, 0x00, 0x61, 0x6e, 0x6f, 0x31, 0x01, 0x02, 0x17,
+0x00, 0x02, 0x26, 0x00, 0x39, 0x41, 0x6c, 0x6c, 0x56, 0x01,
+0x34, 0x61, 0x72, 0x65, 0x6e, 0x01, 0x25, 0x65, 0x64, 0x64,
+0x01, 0x00, 0x2c, 0x00, 0x51, 0x54, 0x68, 0x65, 0x72, 0x65,
+0x20, 0x00, 0x31, 0x73, 0x6f, 0x6d, 0x25, 0x00, 0xf0, 0x00,
+0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x62, 0x6c, 0x65, 0x00,
+0x61, 0x6c, 0x74, 0x65, 0x72, 0x1b, 0x01, 0x60, 0x76, 0x65,
+0x00, 0x6d, 0x6f, 0x64, 0x88, 0x01, 0x30, 0x77, 0x68, 0x69,
+0xe2, 0x01, 0xc0, 0x6e, 0x76, 0x6f, 0x6c, 0x76, 0x65, 0x00,
+0x63, 0x68, 0x61, 0x6e, 0x67, 0x39, 0x01, 0x01, 0x0a, 0x02,
+0x03, 0xe5, 0x00, 0x13, 0x2d, 0xa0, 0x00, 0x50, 0x6c, 0x69,
+0x6d, 0x69, 0x74, 0x3c, 0x01, 0x00, 0x59, 0x00, 0x20, 0x74,
+0x68, 0x27, 0x00, 0x02, 0xa9, 0x00, 0x01, 0xdb, 0x00, 0x31,
+0x32, 0x2c, 0x00, 0x64, 0x01, 0x74, 0x6e, 0x74, 0x72, 0x6f,
+0x64, 0x75, 0x63, 0x45, 0x00, 0xa0, 0x61, 0x64, 0x64, 0x69,
+0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x8b, 0x00, 0x72, 0x73,
+0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x68, 0x01, 0xb8, 0x6e,
+0x6f, 0x00, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65,
+0xc0, 0x01, 0x00, 0x20, 0x01, 0xf4, 0x05, 0x66, 0x6f, 0x72,
+0x6d, 0x00, 0x61, 0x00, 0x6c, 0x6f, 0x6f, 0x70, 0x00, 0x66,
+0x72, 0x6f, 0x6d, 0x00, 0x6f, 0x6e, 0x65, 0xc6, 0x01, 0x44,
+0x62, 0x61, 0x63, 0x6b, 0xc2, 0x01, 0x01, 0x73, 0x01, 0x04,
+0xb0, 0x01, 0x00, 0x0f, 0x02, 0x91, 0x72, 0x75, 0x6c, 0x65,
+0x73, 0x00, 0x73, 0x74, 0x61, 0xd6, 0x02, 0x32, 0x62, 0x6f,
+0x76, 0x0b, 0x01, 0x00, 0x2c, 0x00, 0x70, 0x64, 0x65, 0x66,
+0x61, 0x75, 0x6c, 0x74, 0x4b, 0x00, 0x10, 0x73, 0x29, 0x01,
+0x60, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x6b, 0x00, 0xf1,
+0x01, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a,
+0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0xcc, 0x02, 0xb0,
+0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x32,
+0x5d, 0x2e, 0x00, 0x04, 0x98, 0x02, 0x31, 0x77, 0x61, 0x73,
+0x09, 0x03, 0x04, 0x3a, 0x03, 0x01, 0x89, 0x00, 0x10, 0x69,
+0x14, 0x00, 0x40, 0x6c, 0x6c, 0x65, 0x63, 0xea, 0x00, 0xf1,
+0x00, 0x00, 0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73,
+0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0xac, 0x02, 0x00, 0x46,
+0x00, 0xe1, 0x00, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f,
+0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x5e, 0x00, 0xa2, 0x2e,
+0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0x7d,
+0x00, 0xf5, 0x08, 0x73, 0x2f, 0x48, 0x61, 0x73, 0x68, 0x69,
+0x77, 0x6f, 0x6b, 0x61, 0x6b, 0x65, 0x72, 0x6f, 0x2f, 0x00,
+0x00, 0x00, 0x32, 0x36, 0x2e, 0x31, 0xe4, 0x03, 0x01, 0x79,
+0x00, 0x40, 0x6f, 0x6c, 0x73, 0x20, 0xe8, 0x01, 0x10, 0x6f,
+0xab, 0x03, 0x10, 0x63, 0xd9, 0x03, 0x03, 0xa0, 0x01, 0x05,
+0x8c, 0x02, 0x08, 0x83, 0x02, 0x30, 0x63, 0x6c, 0x69, 0x2f,
+0x01, 0x10, 0x68, 0xf1, 0x01, 0xb8, 0x75, 0x73, 0x65, 0x00,
+0x64, 0x6f, 0x77, 0x6e, 0x00, 0x6f, 0x6e, 0x51, 0x01, 0x00,
+0x04, 0x00, 0x51, 0x64, 0x72, 0x61, 0x67, 0x00, 0xde, 0x01,
+0x42, 0x77, 0x61, 0x72, 0x64, 0x0a, 0x04, 0x01, 0xdd, 0x01,
+0x01, 0xe4, 0x03, 0x00, 0xb0, 0x02, 0x62, 0x6e, 0x6f, 0x74,
+0x00, 0x6e, 0x65, 0xf2, 0x00, 0x01, 0x2e, 0x00, 0x13, 0x61,
+0x93, 0x02, 0x01, 0xc0, 0x03, 0x16, 0x6f, 0x32, 0x00, 0x03,
+0x57, 0x00, 0xa5, 0x3b, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x6f,
+0x6e, 0x6c, 0x79, 0x37, 0x00, 0x10, 0x6d, 0x8f, 0x01, 0x06,
+0x8b, 0x00, 0xa3, 0x66, 0x61, 0x72, 0x00, 0x65, 0x6e, 0x6f,
+0x75, 0x67, 0x68, 0x85, 0x01, 0x10, 0x65, 0x3e, 0x02, 0x54,
+0x65, 0x6e, 0x64, 0x65, 0x64, 0xd3, 0x00, 0x33, 0x64, 0x69,
+0x72, 0x55, 0x01, 0xf1, 0x07, 0x74, 0x6f, 0x00, 0x62, 0x65,
+0x00, 0x75, 0x6e, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75, 0x6f,
+0x75, 0x73, 0x2e, 0x00, 0x28, 0x53, 0x6f, 0x64, 0x00, 0x87,
+0x63, 0x61, 0x6e, 0x00, 0x6b, 0x65, 0x65, 0x70, 0x5b, 0x00,
+0x42, 0x6e, 0x65, 0x61, 0x72, 0x21, 0x02, 0x31, 0x74, 0x61,
+0x72, 0x0a, 0x04, 0x07, 0xec, 0x00, 0xb0, 0x63, 0x6f, 0x6e,
+0x76, 0x65, 0x6e, 0x69, 0x65, 0x6e, 0x74, 0x6c, 0x7a, 0x04,
+0x35, 0x72, 0x6f, 0x77, 0x7c, 0x02, 0x32, 0x6f, 0x75, 0x74,
+0x70, 0x02, 0x20, 0x69, 0x74, 0xe7, 0x03, 0x10, 0x6d, 0x3d,
+0x04, 0x05, 0x84, 0x00, 0x82, 0x73, 0x2e, 0x29, 0x00, 0x00,
+0x00, 0x44, 0x6f, 0xdb, 0x02, 0xd6, 0x69, 0x73, 0x00, 0x61,
+0x67, 0x61, 0x69, 0x6e, 0x00, 0x77, 0x68, 0x65, 0x6e, 0x85,
+0x01, 0x00, 0x17, 0x00, 0xf0, 0x04, 0x6c, 0x72, 0x65, 0x61,
+0x64, 0x79, 0x00, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74,
+0x00, 0x77, 0x69, 0x6c, 0x6c, 0x08, 0x03, 0x05, 0xd9, 0x03,
+0x06, 0x3e, 0x04, 0x03, 0xe2, 0x03, 0x45, 0x49, 0x66, 0x00,
+0x74, 0xb7, 0x03, 0x04, 0x3f, 0x00, 0x22, 0x61, 0x73, 0x80,
+0x00, 0x04, 0x9c, 0x00, 0x08, 0x6b, 0x04, 0x07, 0xe3, 0x01,
+0x00, 0x28, 0x00, 0x10, 0x70, 0xf3, 0x04, 0x20, 0x74, 0x74,
+0x38, 0x01, 0x11, 0x79, 0x20, 0x00, 0x40, 0x63, 0x75, 0x72,
+0x72, 0x7b, 0x00, 0x34, 0x67, 0x61, 0x6d, 0x14, 0x03, 0x51,
+0x28, 0x69, 0x2e, 0x65, 0x2e, 0x39, 0x00, 0x24, 0x62, 0x79,
+0x0c, 0x03, 0x26, 0x29, 0x2c, 0x46, 0x03, 0x00, 0xd4, 0x01,
+0x11, 0x67, 0x34, 0x05, 0x02, 0x71, 0x01, 0x01, 0xb6, 0x00,
+0x21, 0x72, 0x65, 0xb4, 0x01, 0x00, 0xeb, 0x01, 0x11, 0x6f,
+0xa4, 0x00, 0x10, 0x6d, 0xce, 0x02, 0x21, 0x49, 0x66, 0x78,
+0x01, 0x31, 0x77, 0x61, 0x6e, 0x0f, 0x04, 0x60, 0x72, 0x65,
+0x6d, 0x69, 0x6e, 0x64, 0x13, 0x00, 0x52, 0x72, 0x73, 0x65,
+0x6c, 0x66, 0xdd, 0x03, 0x08, 0xa2, 0x00, 0x90, 0x64, 0x65,
+0x66, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x6c, 0xf9, 0x04, 0x10,
+0x20, 0x49, 0x02, 0x03, 0x92, 0x06, 0x0c, 0xb9, 0x02, 0x45,
+0x68, 0x65, 0x6d, 0x2c, 0xd3, 0x01, 0x61, 0x72, 0x69, 0x67,
+0x68, 0x74, 0x2d, 0x6b, 0x02, 0x08, 0x21, 0x00, 0x27, 0x00,
+0x69, 0x6e, 0x05, 0x03, 0x7c, 0x02, 0xb3, 0x64, 0x72, 0x61,
+0x77, 0x00, 0x61, 0x00, 0x60, 0x6e, 0x6f, 0x6e, 0xad, 0x04,
+0x87, 0x27, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x72, 0xaf,
+0x00, 0x00, 0xb2, 0x04, 0x34, 0x6b, 0x00, 0x79, 0x10, 0x07,
+0x00, 0x93, 0x00, 0x42, 0x73, 0x68, 0x65, 0x64, 0x98, 0x06,
+0x24, 0x61, 0x6e, 0x22, 0x02, 0x02, 0x28, 0x01, 0x05, 0x27,
+0x00, 0x01, 0x64, 0x03, 0x11, 0x64, 0x02, 0x01, 0x35, 0x69,
+0x74, 0x73, 0x8d, 0x01, 0x01, 0x4c, 0x02, 0x13, 0x72, 0x5f,
+0x05, 0x24, 0x64, 0x65, 0xd3, 0x04, 0x41, 0x74, 0x68, 0x65,
+0x79, 0x18, 0x00, 0x03, 0xa5, 0x00, 0x01, 0xc4, 0x00, 0x02,
+0x44, 0x00, 0x26, 0x73, 0x29, 0xdb, 0x00, 0x00, 0x9c, 0x00,
+0x07, 0xcf, 0x05, 0x00, 0xc3, 0x01, 0x05, 0x8f, 0x00, 0x81,
+0x62, 0x79, 0x00, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0xb9, 0x03,
+0x01, 0x64, 0x05, 0x40, 0x6e, 0x00, 0x69, 0x74, 0xde, 0x04,
+0x22, 0x69, 0x73, 0x95, 0x01, 0x51, 0x68, 0x69, 0x67, 0x68,
+0x6c, 0x59, 0x00, 0x22, 0x69, 0x74, 0x89, 0x00, 0x03, 0x8a,
+0x03, 0x04, 0x9d, 0x00, 0x08, 0x19, 0x06, 0x32, 0x00, 0x69,
+0x74, 0x99, 0x05, 0x01, 0xb2, 0x01, 0x20, 0x69, 0x6c, 0xb3,
+0x06, 0x00, 0x9a, 0x02, 0x30, 0x76, 0x65, 0x6e, 0x21, 0x00,
+0x01, 0xed, 0x02, 0x31, 0x61, 0x63, 0x63, 0xc4, 0x00, 0x01,
+0x68, 0x07, 0x52, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x02, 0x08,
+0x22, 0x6e, 0x79, 0xf6, 0x01, 0x26, 0x6f, 0x73, 0x5c, 0x00,
+0xc9, 0x69, 0x6e, 0x00, 0x66, 0x75, 0x74, 0x75, 0x72, 0x65,
+0x2e, 0x00, 0x4c, 0xa7, 0x00, 0x02, 0x0d, 0x03, 0x10, 0x6f,
+0x0b, 0x03, 0x05, 0xa1, 0x00, 0x24, 0x65, 0x64, 0xe2, 0x00,
+0x01, 0x7a, 0x00, 0x21, 0x75, 0x6e, 0xf9, 0x00, 0x03, 0xb6,
+0x00, 0x40, 0x72, 0x65, 0x73, 0x74, 0x19, 0x07, 0x11, 0x79,
+0x44, 0x08, 0x51, 0x62, 0x69, 0x6c, 0x69, 0x74, 0xcd, 0x01,
+0x02, 0x81, 0x00, 0x01, 0xf4, 0x00, 0x02, 0xbf, 0x08, 0x00,
+0x32, 0x01, 0x50, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0xda, 0x03,
+0x03, 0xde, 0x02, 0x85, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65,
+0x79, 0x73, 0x57, 0x04, 0x61, 0x61, 0x72, 0x6f, 0x75, 0x6e,
+0x64, 0x1f, 0x00, 0xf9, 0x01, 0x67, 0x72, 0x69, 0x64, 0x3a,
+0x00, 0x69, 0x66, 0x00, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62,
+0x6c, 0x35, 0x00, 0x02, 0x8d, 0x03, 0x52, 0x6c, 0x77, 0x61,
+0x79, 0x73, 0x39, 0x00, 0x80, 0x6f, 0x72, 0x74, 0x68, 0x6f,
+0x67, 0x6f, 0x6e, 0xfd, 0x00, 0x12, 0x2c, 0xc2, 0x04, 0x63,
+0x77, 0x69, 0x73, 0x65, 0x00, 0x69, 0xb9, 0x03, 0x02, 0xb5,
+0x04, 0x07, 0x17, 0x05, 0x00, 0x5c, 0x04, 0x24, 0x65, 0x73,
+0x27, 0x08, 0x04, 0xfb, 0x04, 0x51, 0x69, 0x6e, 0x64, 0x69,
+0x63, 0x76, 0x06, 0x05, 0x30, 0x04, 0x60, 0x2e, 0x00, 0x48,
+0x6f, 0x6c, 0x64, 0x1c, 0x01, 0x12, 0x43, 0xb8, 0x05, 0x01,
+0xf7, 0x00, 0x00, 0x16, 0x04, 0x11, 0x73, 0x31, 0x01, 0x07,
+0xc8, 0x00, 0x02, 0x6b, 0x00, 0x37, 0x6c, 0x61, 0x79, 0x49,
+0x04, 0x03, 0x8e, 0x08, 0x06, 0x03, 0x05, 0x90, 0x28, 0x69,
+0x66, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0xcc, 0x07, 0x73,
+0x29, 0x3b, 0x00, 0x53, 0x68, 0x69, 0x66, 0x01, 0x02, 0x0f,
+0x4b, 0x00, 0x04, 0x01, 0x11, 0x03, 0x1c, 0x00, 0x12, 0x03,
+0x14, 0x50, 0x82, 0x00, 0x01, 0xa2, 0x02, 0x40, 0x65, 0x74,
+0x75, 0x72, 0x40, 0x05, 0x00, 0x75, 0x07, 0x42, 0x6c, 0x6c,
+0x6f, 0x77, 0x83, 0x02, 0x0e, 0x52, 0x00, 0x01, 0x82, 0x01,
+0x0f, 0xa2, 0x00, 0x0b, 0x08, 0xb1, 0x01, 0x01, 0xea, 0x01,
+0x2f, 0x61, 0x6e, 0xe2, 0x02, 0x04, 0x18, 0x70, 0x83, 0x00,
+0x20, 0x73, 0x70, 0xc7, 0x06, 0x30, 0x62, 0x61, 0x72, 0xe4,
+0x09, 0x0c, 0x1d, 0x00, 0x07, 0xa0, 0x00, 0x51, 0x74, 0x77,
+0x69, 0x63, 0x65, 0x8c, 0x07, 0x07, 0x24, 0x00, 0x04, 0x8c,
+0x0a, 0x00, 0x22, 0x00, 0x06, 0x61, 0x03, 0x45, 0x6a, 0x75,
+0x6d, 0x70, 0xe6, 0x09, 0x0a, 0xb0, 0x01, 0x01, 0xef, 0x03,
+0x02, 0x80, 0x08, 0x03, 0xc5, 0x0a, 0xf0, 0x0c, 0x4c, 0x65,
+0x74, 0x74, 0x65, 0x72, 0x73, 0x00, 0x60, 0x61, 0x27, 0x2c,
+0x00, 0x2e, 0x2e, 0x2e, 0x2c, 0x00, 0x60, 0x66, 0x27, 0x00,
+0x63, 0x6f, 0x75, 0x6e, 0x74, 0xb8, 0x00, 0x23, 0x31, 0x30,
+0x16, 0x00, 0x21, 0x31, 0x35, 0x6d, 0x01, 0x31, 0x60, 0x30,
+0x27, 0x17, 0x00, 0x13, 0x36, 0x6e, 0x09, 0x46, 0x00, 0x60,
+0x47, 0x27, 0x27, 0x01, 0x03, 0x8b, 0x04, 0x86, 0x67, 0x72,
+0x65, 0x79, 0x00, 0x6c, 0x69, 0x6e, 0xdd, 0x04, 0x10, 0x65,
+0x4a, 0x0b, 0x48, 0x70, 0x61, 0x69, 0x72, 0x84, 0x0b, 0x01,
+0x88, 0x00, 0x78, 0x63, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x62,
+0xd1, 0x09, 0x02, 0x94, 0x04, 0x04, 0x69, 0x01, 0x36, 0x6f,
+0x72, 0x00, 0xda, 0x04, 0x01, 0x55, 0x0a, 0x25, 0x61, 0x72,
+0xe4, 0x05, 0x00, 0x60, 0x07, 0x11, 0x6f, 0x2c, 0x03, 0x51,
+0x56, 0x69, 0x6f, 0x6c, 0x61, 0xa9, 0x06, 0x03, 0xad, 0x05,
+0x04, 0xd3, 0x08, 0x02, 0x01, 0x06, 0x04, 0xfd, 0x03, 0x01,
+0x07, 0x02, 0x10, 0x64, 0xbe, 0x01, 0x42, 0x72, 0x65, 0x64,
+0x3a, 0x5e, 0x0a, 0x1a, 0x6e, 0x1e, 0x01, 0x2a, 0x6f, 0x6f,
+0x7b, 0x06, 0x04, 0x3b, 0x00, 0x09, 0xd9, 0x03, 0x01, 0x40,
+0x00, 0x1f, 0x2e, 0x40, 0x00, 0x05, 0x3f, 0x66, 0x65, 0x77,
+0x3f, 0x00, 0x10, 0x00, 0xa6, 0x03, 0x00, 0x6b, 0x07, 0x09,
+0x24, 0x06, 0xf3, 0x03, 0x61, 0x6e, 0x00, 0x65, 0x72, 0x72,
+0x6f, 0x72, 0x00, 0x28, 0x61, 0x73, 0x00, 0x6f, 0x70, 0x70,
+0x6f, 0x73, 0x3f, 0x08, 0x32, 0x65, 0x72, 0x65, 0xee, 0x00,
+0x30, 0x00, 0x62, 0x65, 0xfc, 0x01, 0x05, 0x52, 0x02, 0x41,
+0x79, 0x65, 0x74, 0x29, 0xf2, 0x03, 0x21, 0x61, 0x64, 0x70,
+0x03, 0x03, 0x56, 0x08, 0x05, 0x80, 0x00, 0x01, 0x61, 0x01,
+0x04, 0xe4, 0x0a, 0x31, 0x68, 0x61, 0x76, 0x5d, 0x02, 0x12,
+0x6f, 0x71, 0x0b, 0x0b, 0x6f, 0x0b, 0x00, 0x6d, 0x01, 0x04,
+0xf6, 0x06, 0x08, 0x76, 0x01, 0x02, 0x3d, 0x03, 0x10, 0x2c,
+0x1f, 0x00, 0x28, 0x69, 0x66, 0xbc, 0x05, 0x20, 0x68, 0x61,
+0x9b, 0x07, 0x29, 0x65, 0x6e, 0xde, 0x00, 0x01, 0x25, 0x0a,
+0x54, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0xc0, 0x0b, 0x68, 0x00,
+0x67, 0x72, 0x6f, 0x75, 0x70, 0xfc, 0x01, 0x01, 0xcc, 0x0a,
+0x07, 0xf4, 0x0a, 0x0f, 0x21, 0x01, 0x0c, 0x41, 0x61, 0x00,
+0x63, 0x6c, 0x0a, 0x01, 0x33, 0x73, 0x75, 0x62, 0xca, 0x0d,
+0x07, 0xe3, 0x01, 0x01, 0x78, 0x01, 0x24, 0x6e, 0x6f, 0x11,
+0x07, 0x04, 0x89, 0x0d, 0x02, 0xb0, 0x0b, 0x02, 0x48, 0x03,
+0x15, 0x73, 0x34, 0x00, 0x03, 0x82, 0x00, 0x90, 0x2e, 0x00,
+0x46, 0x6f, 0x72, 0x00, 0x65, 0x78, 0x61, 0xa9, 0x00, 0x32,
+0x2c, 0x00, 0x69, 0x27, 0x07, 0x02, 0xce, 0x03, 0x26, 0x6c,
+0x79, 0xcd, 0x0d, 0x4c, 0x77, 0x6f, 0x00, 0x31, 0xc8, 0x0d,
+0x05, 0x9c, 0x02, 0x01, 0x03, 0x05, 0x04, 0xf6, 0x06, 0x22,
+0x6e, 0x6f, 0xfc, 0x0d, 0x01, 0xf6, 0x09, 0x08, 0x02, 0x08,
+0x25, 0x6f, 0x6e, 0x9a, 0x05, 0x01, 0x73, 0x08, 0x04, 0xa6,
+0x04, 0x01, 0xc6, 0x06, 0x43, 0x75, 0x70, 0x00, 0x72, 0xac,
+0x06, 0x03, 0x45, 0x05, 0x02, 0x18, 0x03, 0x03, 0x20, 0x0e,
+0x02, 0x39, 0x01, 0x32, 0x63, 0x61, 0x6e, 0xf9, 0x01, 0x04,
+0x87, 0x0e, 0x02, 0x23, 0x01, 0x00, 0xa6, 0x02, 0xa4, 0x76,
+0x61, 0x6c, 0x69, 0x64, 0x00, 0x73, 0x6f, 0x6c, 0x75, 0x85,
+0x04, 0x14, 0x2d, 0xf4, 0x07, 0x01, 0xc3, 0x07, 0x33, 0x73,
+0x65, 0x6c, 0x0e, 0x07, 0x40, 0x68, 0x65, 0x00, 0x28, 0xd4,
+0x01, 0x04, 0xff, 0x08, 0x34, 0x00, 0x6f, 0x70, 0x5d, 0x0a,
+0x40, 0x64, 0x69, 0x73, 0x61, 0xff, 0x04, 0x01, 0x74, 0x0c,
+0x15, 0x73, 0x65, 0x08, 0x03, 0x55, 0x00, 0x15, 0x2c, 0x88,
+0x00, 0x07, 0xa9, 0x0c, 0x02, 0x3b, 0x0d, 0x00, 0xab, 0x0c,
+0x14, 0x73, 0xac, 0x0c, 0x0e, 0xea, 0x02, 0x01, 0x22, 0x03,
+0x14, 0x28, 0xbf, 0x0d, 0x02, 0x5c, 0x09, 0x00, 0xee, 0x02,
+0x52, 0x73, 0x63, 0x72, 0x69, 0x62, 0xc4, 0x00, 0x13, 0x73,
+0xe0, 0x05, 0x33, 0x32, 0x2e, 0x31, 0x01, 0x0a, 0x26, 0x73,
+0x6f, 0xe9, 0x05, 0x22, 0x2e, 0x29, 0x06, 0x0c, 0x15, 0x32,
+0x06, 0x0c, 0x00, 0x3f, 0x0a, 0x20, 0x6d, 0x65, 0xb3, 0x04,
+0x12, 0x20, 0x82, 0x04, 0x36, 0x73, 0x65, 0x00, 0x14, 0x00,
+0x02, 0x43, 0x00, 0x04, 0x3e, 0x00, 0x02, 0xe1, 0x07, 0x10,
+0x74, 0xa6, 0x04, 0xa4, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0xf7, 0x00, 0x03, 0x96, 0x01, 0x40,
+0x60, 0x54, 0x79, 0x70, 0x1f, 0x06, 0x30, 0x65, 0x6e, 0x75,
+0xad, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
+0x48, 0x65, 0x9d, 0x01, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a,
+0xa0, 0x0d, 0x00, 0xbd, 0x01, 0x01, 0xaf, 0x00, 0x42, 0x71,
+0x75, 0x61, 0x72, 0x43, 0x0d, 0xaa, 0x44, 0x69, 0x66, 0x66,
+0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x0d, 0x00, 0x41, 0x6c,
+0x65, 0x76, 0x65, 0x32, 0x0a, 0x02, 0x9e, 0x02, 0x00, 0x2b,
+0x00, 0x10, 0x41, 0x5d, 0x01, 0x12, 0x20, 0x5d, 0x01, 0x12,
+0x00, 0xcd, 0x08, 0x21, 0x69, 0x73, 0x93, 0x10, 0x06, 0x8f,
+0x0a, 0x01, 0x09, 0x0b, 0x20, 0x63, 0x6c, 0xb0, 0x05, 0x23,
+0x64, 0x2c, 0x3c, 0x00, 0x06, 0x3e, 0x04, 0x51, 0x67, 0x65,
+0x6e, 0x65, 0x72, 0x62, 0x07, 0x0e, 0x3c, 0x10, 0x06, 0x83,
+0x02, 0x03, 0xdb, 0x07, 0x00, 0xb9, 0x01, 0x13, 0x62, 0x18,
+0x03, 0x00, 0xd5, 0x0b, 0x33, 0x63, 0x72, 0x65, 0x12, 0x10,
+0x01, 0xa9, 0x01, 0x02, 0x13, 0x09, 0x04, 0xde, 0x01, 0x04,
+0xcb, 0x01, 0x25, 0x64, 0x6f, 0x25, 0x04, 0x0b, 0xd0, 0x01,
+0x04, 0x1e, 0x02, 0x02, 0xcf, 0x01, 0x64, 0x4d, 0x61, 0x78,
+0x2e, 0x20, 0x62, 0x8e, 0x01, 0x36, 0x65, 0x72, 0x20, 0xa4,
+0x07, 0x01, 0x1d, 0x00, 0x4e, 0x69, 0x6d, 0x75, 0x6d, 0x99,
+0x10, 0x04, 0xaf, 0x02, 0x20, 0x70, 0x61, 0xc6, 0x10, 0x48,
+0x75, 0x6c, 0x61, 0x72, 0x3a, 0x07, 0x17, 0x54, 0xa2, 0x0e,
+0x42, 0x69, 0x73, 0x00, 0x32, 0x3d, 0x10, 0x04, 0xd0, 0x06,
+0x01, 0x98, 0x0f, 0x13, 0x65, 0xcf, 0x03, 0x40, 0x31, 0x2c,
+0x00, 0x33, 0x88, 0x04, 0x53, 0x34, 0x2e, 0x00, 0x49, 0x6e,
+0x17, 0x01, 0x20, 0x6c, 0x2c, 0x72, 0x05, 0x21, 0x65, 0x72,
+0xe4, 0x10, 0x32, 0x61, 0x73, 0x69, 0xfa, 0x0a, 0x82, 0x25,
+0x61, 0x67, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x87, 0x03, 0x13,
+0x20, 0xba, 0x01, 0x70, 0x00, 0x00, 0x00, 0x47, 0x69, 0x76,
+0x65, 0xb5, 0x02, 0x11, 0x72, 0x28, 0x05, 0x40, 0x70, 0x65,
+0x72, 0x63, 0xff, 0x09, 0x2a, 0x67, 0x65, 0x9c, 0x06, 0x05,
+0x74, 0x01, 0x04, 0x38, 0x09, 0x31, 0x74, 0x72, 0x79, 0x39,
+0x01, 0x11, 0x6c, 0xaf, 0x04, 0x34, 0x66, 0x6f, 0x72, 0x47,
+0x0b, 0x05, 0x33, 0x10, 0x03, 0xf0, 0x01, 0x30, 0x43, 0x65,
+0x72, 0xa4, 0x03, 0x00, 0x29, 0x00, 0x33, 0x6f, 0x75, 0x74,
+0xc4, 0x01, 0x00, 0xc0, 0x03, 0x30, 0x6d, 0x61, 0x6e, 0x67,
+0x00, 0x12, 0x74, 0x4b, 0x08, 0x03, 0xa8, 0x05, 0x03, 0x72,
+0x00, 0x12, 0x3b, 0x56, 0x0d, 0x10, 0x69, 0x1b, 0x05, 0x40,
+0x00, 0x75, 0x70, 0x70, 0x94, 0x05, 0x22, 0x6f, 0x75, 0x8a,
+0x11, 0xf0, 0x03, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x73, 0x69,
+0x6f, 0x6e, 0x20, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x20,
+0x28, 0xdc, 0x00, 0x13, 0x29, 0x82, 0x07, 0x01, 0x9b, 0x02,
+0x07, 0xac, 0x00, 0x41, 0x6f, 0x72, 0x6b, 0x73, 0x4a, 0x08,
+0x04, 0x9c, 0x0a, 0x69, 0x6e, 0x00, 0x65, 0x78, 0x69, 0x73,
+0x09, 0x0e, 0xf8, 0x05, 0x74, 0x00, 0x72, 0x61, 0x6e, 0x64,
+0x6f, 0x6d, 0x00, 0x28, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00,
+0x66, 0x69, 0x72, 0x73, 0x28, 0x02, 0x20, 0x6e, 0x00, 0x90,
+0x06, 0x34, 0x69, 0x61, 0x6c, 0x32, 0x00, 0x00, 0xf6, 0x10,
+0x10, 0x77, 0xa6, 0x0d, 0x41, 0x29, 0x2e, 0x00, 0x49, 0x72,
+0x02, 0x40, 0x6e, 0x00, 0x64, 0x65, 0x3a, 0x0b, 0x12, 0x73,
+0xf7, 0x0a, 0x07, 0xaa, 0x09, 0x05, 0x5e, 0x00, 0x24, 0x29,
+0x2c, 0x22, 0x05, 0x13, 0x6e, 0x97, 0x00, 0x00, 0x8e, 0x02,
+0x31, 0x68, 0x6f, 0x77, 0xfe, 0x0e, 0x14, 0x69, 0xfd, 0x07,
+0x20, 0x65, 0x78, 0xf8, 0x0e, 0x04, 0x54, 0x01, 0x07, 0x85,
+0x00, 0x08, 0x52, 0x0f, 0x03, 0x04, 0x0c, 0x05, 0xeb, 0x03,
+0x32, 0x00, 0x64, 0x65, 0xec, 0x12, 0x21, 0x65, 0x73, 0x52,
+0x00, 0x50, 0x6c, 0x69, 0x6b, 0x65, 0x6c, 0x39, 0x0b, 0x03,
+0x8e, 0x13, 0x03, 0x55, 0x00, 0x21, 0x61, 0x73, 0x6c, 0x00,
+0x21, 0x61, 0x73, 0x6f, 0x00, 0x66, 0x61, 0x6e, 0x2c, 0x00,
+0x72, 0x61, 0xb7, 0x11, 0x41, 0x63, 0x68, 0x6f, 0x6f, 0x49,
+0x09, 0x05, 0xdf, 0x00, 0x02, 0x68, 0x06, 0x01, 0x40, 0x02,
+0x64, 0x48, 0x69, 0x67, 0x68, 0x00, 0x65, 0x7b, 0x01, 0x12,
+0x00, 0x7b, 0x01, 0x52, 0x73, 0x00, 0x75, 0x73, 0x75, 0x2b,
+0x0c, 0x33, 0x65, 0x61, 0x6e, 0x6e, 0x02, 0x07, 0xae, 0x03,
+0x23, 0x74, 0x68, 0x8b, 0x02, 0x05, 0x7f, 0x0b, 0x05, 0xe0,
+0x01, 0x00, 0x60, 0x05, 0x0e, 0x4f, 0x00, 0x01, 0xe1, 0x02,
+0x20, 0x72, 0x65, 0xf8, 0x05, 0x32, 0x6c, 0x6f, 0x74, 0xbd,
+0x08, 0x00, 0x7c, 0x04, 0x61, 0x6c, 0x79, 0x2d, 0x70, 0x61,
+0x63, 0xac, 0x08, 0x04, 0xb1, 0x06, 0x01, 0x0a, 0x05, 0x15,
+0x33, 0x0a, 0x05, 0xb0, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70,
+0x72, 0x65, 0x66, 0x65, 0x72, 0x46, 0x12, 0x01, 0x10, 0x05,
+0x20, 0x4f, 0x6e, 0x70, 0x0d, 0x12, 0x74, 0x97, 0x05, 0x03,
+0x48, 0x06, 0x60, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e,
+0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0xfe, 0x04, 0x16,
+0x50, 0x12, 0x00, 0x0d, 0x1a, 0x05, 0x33, 0x47, 0x61, 0x6d,
+0x1a, 0x05, 0x03, 0xb1, 0x06, 0x13, 0x65, 0x94, 0x03, 0x03,
+0x56, 0x13, 0x10, 0x65, 0xfe, 0x0f, 0x28, 0x74, 0x68, 0xed,
+0x00, 0x04, 0x2d, 0x13, 0x23, 0x6f, 0x63, 0x8c, 0x09, 0x01,
+0x8b, 0x13, 0x80, 0x68, 0x6f, 0x77, 0x6e, 0x2e, 0x00, 0x55,
+0x6e, 0xa4, 0x01, 0x26, 0x00, 0x74, 0x35, 0x0a, 0x00, 0x84,
+0x00, 0x04, 0xd8, 0x0d, 0x75, 0x70, 0x65, 0x72, 0x73, 0x69,
+0x73, 0x74, 0x32, 0x0a, 0x70, 0x67, 0x61, 0x6d, 0x65, 0x73,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 5230;
-const unsigned short help_text_words = 963;
+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 6857cbf733..0e2fc94081 100644
--- a/apps/plugins/puzzles/help/cube.c
+++ b/apps/plugins/puzzles/help/cube.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,163 +6,165 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 207, TEXT_CENTER | C_RED },
- { 319, TEXT_CENTER | C_RED },
- { 336, TEXT_UNDERLINE },
- { 358, TEXT_UNDERLINE },
+ { 208, TEXT_CENTER | C_RED },
+ { 320, TEXT_CENTER | C_RED },
+ { 337, TEXT_UNDERLINE },
  { 359, TEXT_UNDERLINE },
+ { 360, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2055 comp 1444 ratio 0.702676 level 10 saved 611 */
+/* orig 2071 comp 1451 ratio 0.700628 level 10 saved 620 */
 const char help_text[] = {
-0xf2, 0x37, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
-0x34, 0x3a, 0x20, 0x43, 0x75, 0x62, 0x65, 0x20, 0x00, 0x00,
-0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x69, 0x73, 0x00, 0x61,
-0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x00, 0x6f, 0x6e, 0x65,
-0x00, 0x49, 0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
-0x6c, 0x6c, 0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x61, 0x73,
-0x00, 0x61, 0x00, 0x77, 0x65, 0x62, 0x00, 0x67, 0x61, 0x6d,
-0x65, 0x2e, 0x34, 0x00, 0x00, 0x29, 0x00, 0x11, 0x77, 0x19,
-0x00, 0x41, 0x4a, 0x61, 0x76, 0x61, 0x1a, 0x00, 0xf0, 0x28,
-0x00, 0x5b, 0x32, 0x5d, 0x2c, 0x00, 0x62, 0x79, 0x00, 0x50,
-0x61, 0x75, 0x6c, 0x00, 0x53, 0x63, 0x6f, 0x74, 0x74, 0x2e,
-0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
-0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00,
-0x31, 0x36, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73,
-0x2c, 0x00, 0x73, 0x69, 0x78, 0x13, 0x00, 0xf1, 0x03, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x00, 0x61, 0x72, 0x65, 0x00, 0x62,
-0x6c, 0x75, 0x65, 0x3b, 0x00, 0x6f, 0x6e, 0x61, 0x00, 0x02,
-0x27, 0x00, 0x50, 0x00, 0x72, 0x65, 0x73, 0x74, 0x6a, 0x00,
-0x41, 0x63, 0x75, 0x62, 0x65, 0x52, 0x00, 0x60, 0x72, 0x00,
-0x6d, 0x6f, 0x76, 0x65, 0xb8, 0x00, 0xf1, 0x05, 0x74, 0x6f,
-0x00, 0x75, 0x73, 0x65, 0x00, 0x74, 0x68, 0x65, 0x00, 0x61,
-0x72, 0x72, 0x6f, 0x77, 0x00, 0x6b, 0x65, 0x79, 0x16, 0x00,
-0x41, 0x72, 0x6f, 0x6c, 0x6c, 0x17, 0x00, 0x00, 0x35, 0x00,
-0xf1, 0x0f, 0x00, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68,
-0x00, 0x39, 0x30, 0x00, 0x64, 0x65, 0x67, 0x72, 0x65, 0x65,
-0x73, 0x00, 0x73, 0x6f, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00,
-0x69, 0x74, 0x4d, 0x00, 0x01, 0x35, 0x00, 0xb3, 0x61, 0x6e,
-0x00, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x7c,
-0x00, 0x8b, 0x2e, 0x00, 0x49, 0x66, 0x00, 0x79, 0x6f, 0x75,
-0x50, 0x00, 0x21, 0x6f, 0x6e, 0x2f, 0x00, 0x01, 0xae, 0x00,
-0x03, 0x2a, 0x00, 0x11, 0x2c, 0x1e, 0x00, 0x07, 0x11, 0x00,
-0x00, 0x9f, 0x00, 0x94, 0x70, 0x69, 0x63, 0x6b, 0x65, 0x64,
-0x00, 0x75, 0x70, 0xd2, 0x00, 0x40, 0x66, 0x61, 0x63, 0x65,
-0xf1, 0x00, 0x04, 0x4a, 0x00, 0x37, 0x3b, 0x00, 0x69, 0x60,
-0x00, 0x03, 0x51, 0x00, 0x0c, 0x25, 0x00, 0x05, 0x6f, 0x00,
-0x4f, 0x6e, 0x6f, 0x6e, 0x2d, 0x73, 0x00, 0x02, 0x41, 0x6e,
-0x65, 0x73, 0x73, 0x70, 0x00, 0xfe, 0x15, 0x75, 0x74, 0x00,
-0x64, 0x6f, 0x77, 0x6e, 0x00, 0x61, 0x67, 0x61, 0x69, 0x6e,
-0x2e, 0x00, 0x28, 0x49, 0x6e, 0x00, 0x67, 0x65, 0x6e, 0x65,
-0x72, 0x61, 0x6c, 0x2c, 0x00, 0x77, 0x68, 0x65, 0x6e, 0x65,
-0x76, 0x65, 0x72, 0xd0, 0x00, 0x02, 0x49, 0x00, 0x31, 0x74,
-0x77, 0x6f, 0x7b, 0x00, 0x12, 0x73, 0x19, 0x01, 0xf2, 0x11,
-0x63, 0x6f, 0x6d, 0x65, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00,
-0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x00, 0x73, 0x77,
-0x61, 0x70, 0x00, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73,
-0x2e, 0x29, 0x89, 0x01, 0x33, 0x6a, 0x6f, 0x62, 0x88, 0x01,
-0x71, 0x67, 0x65, 0x74, 0x00, 0x61, 0x6c, 0x6c, 0xd3, 0x01,
-0x07, 0xa5, 0x00, 0x13, 0x73, 0xbe, 0x00, 0x00, 0x62, 0x00,
-0x00, 0x1b, 0x00, 0x02, 0x62, 0x00, 0x08, 0xde, 0x00, 0x22,
-0x61, 0x74, 0x1d, 0x00, 0x00, 0x43, 0x02, 0x20, 0x74, 0x69,
-0x62, 0x02, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x00, 0x79,
-0xe9, 0x01, 0x00, 0x9f, 0x02, 0x50, 0x64, 0x00, 0x74, 0x72,
-0x79, 0x48, 0x00, 0x20, 0x64, 0x6f, 0xb3, 0x01, 0x20, 0x69,
-0x6e, 0x96, 0x02, 0x21, 0x66, 0x65, 0x9d, 0x02, 0xf2, 0x02,
-0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2e, 0x00,
-0x00, 0x00, 0x55, 0x6e, 0x6c, 0x69, 0x6b, 0x11, 0x02, 0x04,
-0xc6, 0x02, 0x06, 0xa2, 0x02, 0xf2, 0x01, 0x2c, 0x00, 0x6d,
-0x79, 0x00, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00,
-0x68, 0x61, 0x73, 0xf1, 0x01, 0x50, 0x64, 0x69, 0x74, 0x69,
-0x6f, 0x28, 0x00, 0xd0, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
-0x65, 0x3a, 0x00, 0x6f, 0x6e, 0x63, 0x65, 0x7f, 0x00, 0xc1,
-0x27, 0x76, 0x65, 0x00, 0x6d, 0x61, 0x73, 0x74, 0x65, 0x72,
-0x65, 0x64, 0x53, 0x00, 0x01, 0xe7, 0x02, 0x43, 0x77, 0x69,
-0x74, 0x68, 0x8e, 0x02, 0x01, 0x47, 0x01, 0x30, 0x69, 0x6e,
-0x67, 0xe4, 0x00, 0x14, 0x61, 0xf8, 0x01, 0x00, 0xe8, 0x02,
-0x11, 0x2c, 0x65, 0x01, 0xa2, 0x63, 0x61, 0x6e, 0x00, 0x63,
-0x68, 0x61, 0x6e, 0x67, 0x65, 0xc0, 0x01, 0xa2, 0x74, 0x72,
-0x69, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x0d, 0x03,
-0x00, 0xd7, 0x00, 0x02, 0xf9, 0x01, 0x20, 0x6e, 0x79, 0x13,
-0x01, 0xe0, 0x61, 0x00, 0x74, 0x65, 0x74, 0x72, 0x61, 0x68,
-0x65, 0x64, 0x72, 0x6f, 0x6e, 0x2c, 0x9e, 0x00, 0x33, 0x6f,
-0x63, 0x74, 0x0f, 0x00, 0x30, 0x00, 0x6f, 0x72, 0x11, 0x00,
-0x43, 0x69, 0x63, 0x6f, 0x73, 0x12, 0x00, 0x00, 0xef, 0x00,
-0xf0, 0x13, 0x5b, 0x32, 0x5d, 0x00, 0x68, 0x74, 0x74, 0x70,
-0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x33, 0x2e, 0x73, 0x79,
-0x6d, 0x70, 0x61, 0x74, 0x69, 0x63, 0x6f, 0x2e, 0x63, 0x61,
-0x2f, 0x70, 0x61, 0x75, 0x6c, 0x73, 0x87, 0x03, 0x10, 0x2f,
-0xac, 0x00, 0x11, 0x2f, 0x3f, 0x03, 0x92, 0x68, 0x74, 0x6d,
-0x00, 0x00, 0x00, 0x34, 0x2e, 0x31, 0x03, 0x04, 0x00, 0xdb,
-0x01, 0x45, 0x72, 0x6f, 0x6c, 0x73, 0x0c, 0x04, 0x01, 0xe2,
-0x00, 0x00, 0xb8, 0x00, 0x92, 0x62, 0x65, 0x00, 0x70, 0x6c,
-0x61, 0x79, 0x65, 0x64, 0xf0, 0x00, 0x21, 0x65, 0x69, 0x20,
-0x04, 0x00, 0x05, 0x01, 0xa2, 0x6b, 0x65, 0x79, 0x62, 0x6f,
-0x61, 0x72, 0x64, 0x00, 0x6f, 0x10, 0x00, 0x41, 0x6d, 0x6f,
-0x75, 0x73, 0x7c, 0x01, 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d,
-0x63, 0x6c, 0x69, 0x63, 0x6b, 0x13, 0x01, 0x72, 0x61, 0x6e,
-0x79, 0x77, 0x68, 0x65, 0x72, 0xbe, 0x02, 0x10, 0x68, 0x37,
-0x01, 0x92, 0x6e, 0x64, 0x6f, 0x77, 0x00, 0x77, 0x69, 0x6c,
-0x6c, 0xbf, 0x03, 0x05, 0x01, 0x02, 0x42, 0x28, 0x6f, 0x72,
-0x00, 0x7f, 0x04, 0xe6, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x29,
-0x00, 0x74, 0x6f, 0x77, 0x61, 0x72, 0x64, 0x73, 0x5e, 0x00,
-0x91, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2e,
-0xa7, 0x00, 0x09, 0xec, 0x03, 0x10, 0x63, 0xc4, 0x01, 0x21,
-0x6c, 0x73, 0x08, 0x04, 0x1e, 0x64, 0xfa, 0x03, 0x68, 0x6f,
-0x6e, 0x00, 0x69, 0x74, 0x73, 0x9b, 0x01, 0x22, 0x00, 0x69,
-0x90, 0x00, 0x10, 0x66, 0x5f, 0x02, 0x41, 0x63, 0x61, 0x72,
-0x64, 0x24, 0x02, 0x50, 0x64, 0x69, 0x72, 0x65, 0x63, 0x08,
-0x02, 0x42, 0x73, 0x2e, 0x00, 0x4f, 0x21, 0x00, 0x0b, 0xae,
-0x01, 0x22, 0x73, 0x2c, 0x90, 0x00, 0x31, 0x61, 0x70, 0x70,
-0xf2, 0x01, 0x1b, 0x66, 0x72, 0x04, 0x06, 0x42, 0x00, 0x00,
-0x11, 0x03, 0xf2, 0x0a, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x61,
-0x70, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74, 0x65,
-0x2e, 0x00, 0x56, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0xfd,
-0x00, 0x10, 0x6d, 0x63, 0x04, 0xb0, 0x69, 0x73, 0x00, 0x64,
-0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x67, 0x01, 0x01,
-0x2d, 0x01, 0x10, 0x69, 0xc1, 0x03, 0xe0, 0x65, 0x73, 0x6e,
-0x27, 0x74, 0x00, 0x6d, 0x61, 0x6b, 0x65, 0x00, 0x73, 0x65,
-0x6e, 0x5d, 0x01, 0x14, 0x54, 0xb1, 0x00, 0x01, 0x6e, 0x00,
-0x80, 0x73, 0x75, 0x72, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x88,
-0x00, 0x0b, 0xfb, 0x04, 0x03, 0x6d, 0x01, 0x70, 0x6e, 0x75,
-0x6d, 0x65, 0x72, 0x69, 0x63, 0x14, 0x00, 0xc0, 0x70, 0x61,
-0x64, 0x00, 0x28, 0x60, 0x37, 0x27, 0x2c, 0x00, 0x60, 0x39,
-0x05, 0x00, 0x10, 0x31, 0x05, 0x00, 0x34, 0x33, 0x27, 0x29,
-0xe6, 0x01, 0x01, 0x38, 0x01, 0xa7, 0x66, 0x6f, 0x72, 0x00,
-0x64, 0x69, 0x61, 0x67, 0x6f, 0x6e, 0xa1, 0x00, 0x00, 0x6e,
-0x01, 0x23, 0x28, 0x41, 0x4e, 0x01, 0x13, 0x61, 0xdc, 0x00,
-0x81, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x48,
-0x01, 0x12, 0x73, 0xf2, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31,
-0xbe, 0x05, 0x01, 0x89, 0x01, 0x60, 0x61, 0x76, 0x61, 0x69,
-0x6c, 0x61, 0x90, 0x03, 0x11, 0x29, 0x6b, 0x02, 0x12, 0x32,
-0x6b, 0x02, 0x93, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-0x65, 0x72, 0x6d, 0x02, 0x10, 0x65, 0xd7, 0x01, 0x05, 0x14,
-0x00, 0x02, 0x3f, 0x00, 0x04, 0x3a, 0x00, 0x51, 0x00, 0x66,
-0x72, 0x6f, 0x6d, 0x77, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73,
-0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70,
-0x6d, 0x00, 0x03, 0xe3, 0x00, 0xb1, 0x60, 0x54, 0x79, 0x70,
-0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x17, 0x02, 0x71,
-0x79, 0x70, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x43, 0x02, 0x92,
-0x00, 0x00, 0x00, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44,
-0x02, 0x02, 0x14, 0x00, 0x04, 0x1c, 0x02, 0x10, 0x28, 0x77,
-0x03, 0x20, 0x68, 0x65, 0xe4, 0x03, 0x01, 0x1d, 0x00, 0x35,
-0x68, 0x61, 0x70, 0x6f, 0x05, 0x00, 0xe9, 0x01, 0x2a, 0x29,
-0x3a, 0x87, 0x03, 0x02, 0x22, 0x05, 0x06, 0x8a, 0x03, 0x10,
-0x2c, 0xf9, 0x02, 0x0b, 0x88, 0x03, 0xf0, 0x0c, 0x57, 0x69,
-0x64, 0x74, 0x68, 0x20, 0x2f, 0x20, 0x74, 0x6f, 0x70, 0x2c,
-0x00, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x20, 0x2f, 0x20,
-0x62, 0x6f, 0x74, 0x74, 0x6f, 0x70, 0x03, 0x1d, 0x4f, 0x1f,
-0x04, 0x50, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x58, 0x05, 0x11,
-0x6c, 0x06, 0x04, 0x14, 0x76, 0x1d, 0x02, 0x65, 0x64, 0x69,
-0x6d, 0x65, 0x6e, 0x73, 0x88, 0x02, 0x0d, 0x34, 0x04, 0x14,
-0x2c, 0xdf, 0x01, 0x10, 0x62, 0xae, 0x07, 0x13, 0x66, 0x1f,
-0x00, 0x25, 0x6c, 0x65, 0xfa, 0x01, 0x31, 0x74, 0x6f, 0x70,
-0x52, 0x00, 0x03, 0x7c, 0x00, 0x40, 0x72, 0x6f, 0x77, 0x73,
-0x41, 0x07, 0xb0, 0x70, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65,
-0x6c, 0x79, 0x2e, 0x00,
+0xfa, 0x03, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0x34, 0x3a, 0x20, 0x43, 0x75, 0x62, 0x65, 0x20, 0x00, 0x2d,
+0x01, 0x00, 0xf2, 0x27, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69,
+0x73, 0x00, 0x69, 0x73, 0x00, 0x61, 0x6e, 0x6f, 0x74, 0x68,
+0x65, 0x72, 0x00, 0x6f, 0x6e, 0x65, 0x00, 0x49, 0x00, 0x6f,
+0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x00,
+0x73, 0x61, 0x77, 0x00, 0x61, 0x73, 0x00, 0x61, 0x00, 0x77,
+0x65, 0x62, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x2e, 0x34, 0x00,
+0x00, 0x29, 0x00, 0x11, 0x77, 0x19, 0x00, 0x41, 0x4a, 0x61,
+0x76, 0x61, 0x1a, 0x00, 0xf0, 0x28, 0x00, 0x5b, 0x32, 0x5d,
+0x2c, 0x00, 0x62, 0x79, 0x00, 0x50, 0x61, 0x75, 0x6c, 0x00,
+0x53, 0x63, 0x6f, 0x74, 0x74, 0x2e, 0x00, 0x59, 0x6f, 0x75,
+0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72,
+0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x31, 0x36, 0x00, 0x73,
+0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x69,
+0x78, 0x13, 0x00, 0xf1, 0x03, 0x77, 0x68, 0x69, 0x63, 0x68,
+0x00, 0x61, 0x72, 0x65, 0x00, 0x62, 0x6c, 0x75, 0x65, 0x3b,
+0x00, 0x6f, 0x6e, 0x61, 0x00, 0x02, 0x27, 0x00, 0x50, 0x00,
+0x72, 0x65, 0x73, 0x74, 0x6a, 0x00, 0x41, 0x63, 0x75, 0x62,
+0x65, 0x52, 0x00, 0x60, 0x72, 0x00, 0x6d, 0x6f, 0x76, 0x65,
+0xb8, 0x00, 0xf1, 0x05, 0x74, 0x6f, 0x00, 0x75, 0x73, 0x65,
+0x00, 0x74, 0x68, 0x65, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77,
+0x00, 0x6b, 0x65, 0x79, 0x16, 0x00, 0x41, 0x72, 0x6f, 0x6c,
+0x6c, 0x17, 0x00, 0x00, 0x35, 0x00, 0xf1, 0x0f, 0x00, 0x74,
+0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x00, 0x39, 0x30, 0x00,
+0x64, 0x65, 0x67, 0x72, 0x65, 0x65, 0x73, 0x00, 0x73, 0x6f,
+0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x69, 0x74, 0x4d, 0x00,
+0x01, 0x35, 0x00, 0xb3, 0x61, 0x6e, 0x00, 0x61, 0x64, 0x6a,
+0x61, 0x63, 0x65, 0x6e, 0x74, 0x7c, 0x00, 0x8b, 0x2e, 0x00,
+0x49, 0x66, 0x00, 0x79, 0x6f, 0x75, 0x50, 0x00, 0x21, 0x6f,
+0x6e, 0x2f, 0x00, 0x01, 0xae, 0x00, 0x03, 0x2a, 0x00, 0x11,
+0x2c, 0x1e, 0x00, 0x07, 0x11, 0x00, 0x00, 0x9f, 0x00, 0x94,
+0x70, 0x69, 0x63, 0x6b, 0x65, 0x64, 0x00, 0x75, 0x70, 0xd2,
+0x00, 0x40, 0x66, 0x61, 0x63, 0x65, 0xf1, 0x00, 0x04, 0x4a,
+0x00, 0x37, 0x3b, 0x00, 0x69, 0x60, 0x00, 0x03, 0x51, 0x00,
+0x0c, 0x25, 0x00, 0x05, 0x6f, 0x00, 0x4f, 0x6e, 0x6f, 0x6e,
+0x2d, 0x73, 0x00, 0x02, 0x41, 0x6e, 0x65, 0x73, 0x73, 0x70,
+0x00, 0xfe, 0x15, 0x75, 0x74, 0x00, 0x64, 0x6f, 0x77, 0x6e,
+0x00, 0x61, 0x67, 0x61, 0x69, 0x6e, 0x2e, 0x00, 0x28, 0x49,
+0x6e, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x2c,
+0x00, 0x77, 0x68, 0x65, 0x6e, 0x65, 0x76, 0x65, 0x72, 0xd0,
+0x00, 0x02, 0x49, 0x00, 0x31, 0x74, 0x77, 0x6f, 0x7b, 0x00,
+0x12, 0x73, 0x19, 0x01, 0xf2, 0x11, 0x63, 0x6f, 0x6d, 0x65,
+0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00, 0x63, 0x6f, 0x6e, 0x74,
+0x61, 0x63, 0x74, 0x00, 0x73, 0x77, 0x61, 0x70, 0x00, 0x63,
+0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x73, 0x2e, 0x29, 0x89, 0x01,
+0x33, 0x6a, 0x6f, 0x62, 0x88, 0x01, 0x71, 0x67, 0x65, 0x74,
+0x00, 0x61, 0x6c, 0x6c, 0xd3, 0x01, 0x07, 0xa5, 0x00, 0x13,
+0x73, 0xbe, 0x00, 0x00, 0x62, 0x00, 0x00, 0x1b, 0x00, 0x02,
+0x62, 0x00, 0x08, 0xde, 0x00, 0x22, 0x61, 0x74, 0x1d, 0x00,
+0x00, 0x43, 0x02, 0x20, 0x74, 0x69, 0x62, 0x02, 0x74, 0x43,
+0x6f, 0x75, 0x6e, 0x74, 0x00, 0x79, 0xe9, 0x01, 0x00, 0x9f,
+0x02, 0x50, 0x64, 0x00, 0x74, 0x72, 0x79, 0x48, 0x00, 0x20,
+0x64, 0x6f, 0xb3, 0x01, 0x20, 0x69, 0x6e, 0x96, 0x02, 0x21,
+0x66, 0x65, 0x9d, 0x02, 0xf2, 0x02, 0x70, 0x6f, 0x73, 0x73,
+0x69, 0x62, 0x6c, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x55, 0x6e,
+0x6c, 0x69, 0x6b, 0x11, 0x02, 0x04, 0xc6, 0x02, 0x06, 0xa2,
+0x02, 0xf2, 0x01, 0x2c, 0x00, 0x6d, 0x79, 0x00, 0x76, 0x65,
+0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x68, 0x61, 0x73, 0xf1,
+0x01, 0x50, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x28, 0x00, 0xd0,
+0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x3a, 0x00, 0x6f,
+0x6e, 0x63, 0x65, 0x7f, 0x00, 0xc1, 0x27, 0x76, 0x65, 0x00,
+0x6d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x53, 0x00,
+0x01, 0xe7, 0x02, 0x43, 0x77, 0x69, 0x74, 0x68, 0x8e, 0x02,
+0x01, 0x47, 0x01, 0x30, 0x69, 0x6e, 0x67, 0xe4, 0x00, 0x14,
+0x61, 0xf8, 0x01, 0x00, 0xe8, 0x02, 0x11, 0x2c, 0x65, 0x01,
+0xa2, 0x63, 0x61, 0x6e, 0x00, 0x63, 0x68, 0x61, 0x6e, 0x67,
+0x65, 0xc0, 0x01, 0xa2, 0x74, 0x72, 0x69, 0x61, 0x6e, 0x67,
+0x75, 0x6c, 0x61, 0x72, 0x0d, 0x03, 0x00, 0xd7, 0x00, 0x02,
+0xf9, 0x01, 0x20, 0x6e, 0x79, 0x13, 0x01, 0xe0, 0x61, 0x00,
+0x74, 0x65, 0x74, 0x72, 0x61, 0x68, 0x65, 0x64, 0x72, 0x6f,
+0x6e, 0x2c, 0x9e, 0x00, 0x33, 0x6f, 0x63, 0x74, 0x0f, 0x00,
+0x30, 0x00, 0x6f, 0x72, 0x11, 0x00, 0x43, 0x69, 0x63, 0x6f,
+0x73, 0x12, 0x00, 0x00, 0xef, 0x00, 0xf0, 0x13, 0x5b, 0x32,
+0x5d, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77,
+0x77, 0x77, 0x33, 0x2e, 0x73, 0x79, 0x6d, 0x70, 0x61, 0x74,
+0x69, 0x63, 0x6f, 0x2e, 0x63, 0x61, 0x2f, 0x70, 0x61, 0x75,
+0x6c, 0x73, 0x87, 0x03, 0x10, 0x2f, 0xac, 0x00, 0x11, 0x2f,
+0x3f, 0x03, 0x92, 0x68, 0x74, 0x6d, 0x00, 0x00, 0x00, 0x34,
+0x2e, 0x31, 0x13, 0x04, 0x00, 0xdb, 0x01, 0x54, 0x72, 0x6f,
+0x6c, 0x73, 0x20, 0x0c, 0x04, 0x01, 0xe2, 0x00, 0x00, 0xb8,
+0x00, 0x92, 0x62, 0x65, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x65,
+0x64, 0xf0, 0x00, 0x21, 0x65, 0x69, 0x20, 0x04, 0x00, 0x05,
+0x01, 0xa2, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64,
+0x00, 0x6f, 0x10, 0x00, 0x41, 0x6d, 0x6f, 0x75, 0x73, 0x7c,
+0x01, 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
+0x63, 0x6b, 0x13, 0x01, 0x72, 0x61, 0x6e, 0x79, 0x77, 0x68,
+0x65, 0x72, 0xbe, 0x02, 0x10, 0x68, 0x37, 0x01, 0x92, 0x6e,
+0x64, 0x6f, 0x77, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0xbf, 0x03,
+0x05, 0x01, 0x02, 0x42, 0x28, 0x6f, 0x72, 0x00, 0x7f, 0x04,
+0xe6, 0x73, 0x6f, 0x6c, 0x69, 0x64, 0x29, 0x00, 0x74, 0x6f,
+0x77, 0x61, 0x72, 0x64, 0x73, 0x5e, 0x00, 0x91, 0x00, 0x70,
+0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0xa7, 0x00, 0x09,
+0xec, 0x03, 0x10, 0x63, 0xc4, 0x01, 0x21, 0x6c, 0x73, 0x08,
+0x04, 0x1e, 0x64, 0xfa, 0x03, 0x68, 0x6f, 0x6e, 0x00, 0x69,
+0x74, 0x73, 0x9b, 0x01, 0x22, 0x00, 0x69, 0x90, 0x00, 0x10,
+0x66, 0x5f, 0x02, 0x41, 0x63, 0x61, 0x72, 0x64, 0x24, 0x02,
+0x50, 0x64, 0x69, 0x72, 0x65, 0x63, 0x08, 0x02, 0x42, 0x73,
+0x2e, 0x00, 0x4f, 0x21, 0x00, 0x0b, 0xae, 0x01, 0x22, 0x73,
+0x2c, 0x90, 0x00, 0x31, 0x61, 0x70, 0x70, 0xf2, 0x01, 0x1b,
+0x66, 0x72, 0x04, 0x06, 0x42, 0x00, 0x00, 0x11, 0x03, 0xf2,
+0x0a, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x61, 0x70, 0x70, 0x72,
+0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x2e, 0x00, 0x56,
+0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0xfd, 0x00, 0x10, 0x6d,
+0x63, 0x04, 0xb0, 0x69, 0x73, 0x00, 0x64, 0x69, 0x73, 0x61,
+0x6c, 0x6c, 0x6f, 0x77, 0x67, 0x01, 0x01, 0x2d, 0x01, 0x10,
+0x69, 0xc1, 0x03, 0xe0, 0x65, 0x73, 0x6e, 0x27, 0x74, 0x00,
+0x6d, 0x61, 0x6b, 0x65, 0x00, 0x73, 0x65, 0x6e, 0x5d, 0x01,
+0x14, 0x54, 0xb1, 0x00, 0x01, 0x6e, 0x00, 0x80, 0x73, 0x75,
+0x72, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x88, 0x00, 0x0b, 0xfb,
+0x04, 0x03, 0x6d, 0x01, 0x70, 0x6e, 0x75, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x14, 0x00, 0xc0, 0x70, 0x61, 0x64, 0x00, 0x28,
+0x60, 0x37, 0x27, 0x2c, 0x00, 0x60, 0x39, 0x05, 0x00, 0x10,
+0x31, 0x05, 0x00, 0x34, 0x33, 0x27, 0x29, 0xe6, 0x01, 0x01,
+0x38, 0x01, 0xa7, 0x66, 0x6f, 0x72, 0x00, 0x64, 0x69, 0x61,
+0x67, 0x6f, 0x6e, 0xa1, 0x00, 0x00, 0x6e, 0x01, 0x23, 0x28,
+0x41, 0x4e, 0x01, 0x13, 0x61, 0xdc, 0x00, 0x81, 0x64, 0x65,
+0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x48, 0x01, 0x12, 0x73,
+0xf2, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31, 0xbe, 0x05, 0x01,
+0x89, 0x01, 0x60, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x90,
+0x03, 0x11, 0x29, 0x6b, 0x02, 0x12, 0x32, 0x6b, 0x02, 0x93,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x6d,
+0x02, 0x10, 0x65, 0xd7, 0x01, 0x05, 0x14, 0x00, 0x02, 0x3f,
+0x00, 0x04, 0x3a, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d,
+0x77, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6d, 0x00, 0x03,
+0xe3, 0x00, 0xb1, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
+0x6d, 0x65, 0x6e, 0x75, 0x17, 0x02, 0x71, 0x79, 0x70, 0x65,
+0x20, 0x6f, 0x66, 0x20, 0x43, 0x02, 0x92, 0x00, 0x00, 0x00,
+0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x02, 0x02, 0x14,
+0x00, 0x04, 0x1c, 0x02, 0x10, 0x28, 0x77, 0x03, 0x20, 0x68,
+0x65, 0xe4, 0x03, 0x01, 0x1d, 0x00, 0x35, 0x68, 0x61, 0x70,
+0x6f, 0x05, 0x00, 0xe9, 0x01, 0x2a, 0x29, 0x3a, 0x87, 0x03,
+0x02, 0x22, 0x05, 0x06, 0x8a, 0x03, 0x10, 0x2c, 0xf9, 0x02,
+0x0b, 0x88, 0x03, 0xf0, 0x0c, 0x57, 0x69, 0x64, 0x74, 0x68,
+0x20, 0x2f, 0x20, 0x74, 0x6f, 0x70, 0x2c, 0x00, 0x48, 0x65,
+0x69, 0x67, 0x68, 0x74, 0x20, 0x2f, 0x20, 0x62, 0x6f, 0x74,
+0x74, 0x6f, 0x70, 0x03, 0x1d, 0x4f, 0x1f, 0x04, 0x50, 0x68,
+0x6f, 0x72, 0x69, 0x7a, 0x58, 0x05, 0x11, 0x6c, 0x06, 0x04,
+0x14, 0x76, 0x1d, 0x02, 0x65, 0x64, 0x69, 0x6d, 0x65, 0x6e,
+0x73, 0x88, 0x02, 0x0d, 0x34, 0x04, 0x14, 0x2c, 0xdf, 0x01,
+0x10, 0x62, 0xae, 0x07, 0x13, 0x66, 0x1f, 0x00, 0x25, 0x6c,
+0x65, 0xfa, 0x01, 0x31, 0x74, 0x6f, 0x70, 0x52, 0x00, 0x03,
+0x7c, 0x00, 0x40, 0x72, 0x6f, 0x77, 0x73, 0x41, 0x07, 0xb0,
+0x70, 0x65, 0x63, 0x74, 0x69, 0x76, 0x65, 0x6c, 0x79, 0x2e,
+0x00,
 };
 
-const unsigned short help_text_len = 2055;
-const unsigned short help_text_words = 385;
+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 388abb16d4..94d876794b 100644
--- a/apps/plugins/puzzles/help/dominosa.c
+++ b/apps/plugins/puzzles/help/dominosa.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,174 +6,175 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 88, TEXT_CENTER | C_RED },
- { 151, TEXT_UNDERLINE },
- { 267, TEXT_CENTER | C_RED },
- { 284, TEXT_UNDERLINE },
- { 336, TEXT_UNDERLINE },
- { 377, TEXT_UNDERLINE },
+ { 89, TEXT_CENTER | C_RED },
+ { 152, TEXT_UNDERLINE },
+ { 268, TEXT_CENTER | C_RED },
+ { 285, TEXT_UNDERLINE },
+ { 337, TEXT_UNDERLINE },
+ { 378, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2278 comp 1541 ratio 0.676471 level 10 saved 737 */
+/* orig 2299 comp 1550 ratio 0.674206 level 10 saved 749 */
 const char help_text[] = {
-0xf1, 0x1a, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x37, 0x3a, 0x20, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x6f,
-0x73, 0x61, 0x20, 0x00, 0x00, 0x00, 0x41, 0x00, 0x6e, 0x6f,
-0x72, 0x6d, 0x61, 0x6c, 0x00, 0x73, 0x65, 0x74, 0x00, 0x6f,
-0x66, 0x00, 0x64, 0x1c, 0x00, 0xf0, 0x0b, 0x65, 0x73, 0x00,
-0x2d, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x69, 0x73, 0x2c,
-0x00, 0x6f, 0x6e, 0x65, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x61,
-0x6e, 0x63, 0x65, 0x24, 0x00, 0xf0, 0x07, 0x65, 0x76, 0x65,
-0x72, 0x79, 0x00, 0x28, 0x75, 0x6e, 0x6f, 0x72, 0x64, 0x65,
-0x72, 0x65, 0x64, 0x29, 0x00, 0x70, 0x61, 0x69, 0x72, 0x1a,
-0x00, 0xf0, 0x3b, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73,
-0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x30, 0x00, 0x74, 0x6f,
-0x00, 0x36, 0x00, 0x2d, 0x00, 0x68, 0x61, 0x73, 0x00, 0x62,
-0x65, 0x65, 0x6e, 0x00, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x67,
-0x65, 0x64, 0x00, 0x69, 0x72, 0x72, 0x65, 0x67, 0x75, 0x6c,
-0x61, 0x72, 0x6c, 0x79, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00,
-0x61, 0x00, 0x72, 0x65, 0x63, 0x74, 0x61, 0x6e, 0x67, 0x6c,
-0x65, 0x3b, 0x00, 0x74, 0x68, 0x65, 0x6e, 0x05, 0x00, 0x03,
-0x4f, 0x00, 0xf6, 0x00, 0x00, 0x69, 0x6e, 0x00, 0x65, 0x61,
-0x63, 0x68, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x4f,
-0x00, 0xf1, 0x01, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e,
-0x00, 0x64, 0x6f, 0x77, 0x6e, 0x00, 0x61, 0x6e, 0x64, 0x34,
-0x00, 0x05, 0xc1, 0x00, 0xf0, 0x11, 0x74, 0x68, 0x65, 0x6d,
-0x73, 0x65, 0x6c, 0x76, 0x65, 0x73, 0x00, 0x72, 0x65, 0x6d,
-0x6f, 0x76, 0x65, 0x64, 0x2e, 0x00, 0x59, 0x6f, 0x75, 0x72,
-0x00, 0x74, 0x61, 0x73, 0x6b, 0x00, 0x69, 0x73, 0x9e, 0x00,
-0xb1, 0x72, 0x65, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75,
-0x63, 0x74, 0x3d, 0x00, 0xa3, 0x70, 0x61, 0x74, 0x74, 0x65,
-0x72, 0x6e, 0x00, 0x62, 0x79, 0xac, 0x00, 0x31, 0x69, 0x6e,
-0x67, 0x19, 0x00, 0x0c, 0x1e, 0x01, 0x82, 0x74, 0x6f, 0x00,
-0x6d, 0x61, 0x74, 0x63, 0x68, 0x36, 0x00, 0x71, 0x72, 0x6f,
-0x76, 0x69, 0x64, 0x65, 0x64, 0x34, 0x00, 0x17, 0x79, 0x08,
-0x01, 0xf0, 0x00, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69,
-0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x75, 0x00,
-0xf0, 0x00, 0x77, 0x69, 0x64, 0x65, 0x6c, 0x79, 0x00, 0x63,
-0x72, 0x65, 0x64, 0x69, 0x74, 0x65, 0x64, 0x49, 0x00, 0xc2,
-0x4f, 0x2e, 0x00, 0x53, 0x2e, 0x00, 0x41, 0x64, 0x6c, 0x65,
-0x72, 0x2c, 0xc7, 0x00, 0x81, 0x61, 0x6b, 0x65, 0x73, 0x00,
-0x70, 0x61, 0x72, 0x74, 0x00, 0x82, 0x69, 0x74, 0x73, 0x00,
-0x6e, 0x61, 0x6d, 0x65, 0x55, 0x01, 0x40, 0x74, 0x68, 0x6f,
-0x73, 0x8e, 0x01, 0x51, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x61,
-0x00, 0x46, 0x31, 0x37, 0x2e, 0x31, 0xd3, 0x01, 0x80, 0x63,
-0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0xdc, 0x01, 0xa0,
-0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b,
-0xc7, 0x00, 0x41, 0x62, 0x65, 0x74, 0x77, 0x85, 0x01, 0xf5,
-0x00, 0x6e, 0x79, 0x00, 0x74, 0x77, 0x6f, 0x00, 0x61, 0x64,
-0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0xb5, 0x01, 0x83, 0x70,
-0x6c, 0x61, 0x63, 0x65, 0x73, 0x00, 0x61, 0xe6, 0x00, 0x63,
-0x00, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x01, 0x01, 0x53, 0x6d,
-0x2c, 0x00, 0x6f, 0x72, 0x48, 0x01, 0x12, 0x73, 0x11, 0x02,
-0x00, 0x9a, 0x00, 0x00, 0xd2, 0x00, 0xf1, 0x05, 0x61, 0x6c,
-0x72, 0x65, 0x61, 0x64, 0x79, 0x00, 0x70, 0x72, 0x65, 0x73,
-0x65, 0x6e, 0x74, 0x2e, 0x00, 0x54, 0x72, 0x79, 0x36, 0x00,
-0x12, 0x6f, 0x52, 0x00, 0x06, 0x51, 0x00, 0x60, 0x77, 0x68,
-0x69, 0x63, 0x68, 0x00, 0x56, 0x00, 0xa0, 0x6c, 0x61, 0x70,
-0x73, 0x00, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2a, 0x00, 0x05,
-0x56, 0x01, 0x43, 0x77, 0x69, 0x6c, 0x6c, 0x65, 0x00, 0x01,
-0x59, 0x01, 0x40, 0x6f, 0x6e, 0x65, 0x73, 0x66, 0x00, 0x04,
-0x33, 0x00, 0x00, 0xef, 0x00, 0x4e, 0x52, 0x69, 0x67, 0x68,
-0xd6, 0x00, 0x0f, 0xd2, 0x00, 0x03, 0x40, 0x64, 0x72, 0x61,
-0x77, 0xd1, 0x00, 0x46, 0x6c, 0x69, 0x6e, 0x65, 0x2a, 0x00,
-0x01, 0xce, 0x00, 0x02, 0x8c, 0x00, 0xb2, 0x79, 0x6f, 0x75,
-0x00, 0x63, 0x61, 0x6e, 0x00, 0x75, 0x73, 0x65, 0x0f, 0x02,
-0x40, 0x6d, 0x69, 0x6e, 0x64, 0x16, 0x00, 0x52, 0x72, 0x73,
-0x65, 0x6c, 0x66, 0x02, 0x03, 0x00, 0x24, 0x00, 0x43, 0x6b,
-0x6e, 0x6f, 0x77, 0x7b, 0x01, 0x00, 0x69, 0x00, 0x04, 0x60,
-0x00, 0x00, 0x8e, 0x02, 0x32, 0x6e, 0x6f, 0x74, 0x2a, 0x01,
-0x21, 0x65, 0x64, 0x37, 0x02, 0x30, 0x00, 0x73, 0x69, 0xc6,
-0x02, 0x03, 0xd5, 0x00, 0x1c, 0x2e, 0xb0, 0x00, 0x55, 0x61,
-0x67, 0x61, 0x69, 0x6e, 0x49, 0x01, 0x00, 0xe5, 0x00, 0x00,
-0x9d, 0x00, 0x00, 0xd9, 0x00, 0x13, 0x59, 0x8c, 0x00, 0x42,
-0x61, 0x6c, 0x73, 0x6f, 0x91, 0x00, 0xd2, 0x68, 0x65, 0x00,
-0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79,
-0x74, 0x02, 0x00, 0x1a, 0x01, 0x14, 0x61, 0x16, 0x00, 0x43,
-0x61, 0x72, 0x6f, 0x75, 0xf6, 0x02, 0x74, 0x67, 0x72, 0x69,
-0x64, 0x2e, 0x00, 0x57, 0x39, 0x03, 0x03, 0x21, 0x00, 0xbf,
-0x69, 0x73, 0x00, 0x68, 0x61, 0x6c, 0x66, 0x00, 0x77, 0x61,
-0x79, 0x29, 0x01, 0x0a, 0x11, 0x2c, 0xbd, 0x01, 0x14, 0x73,
-0xed, 0x02, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x75,
-0x00, 0x02, 0x92, 0x01, 0x0b, 0xc7, 0x01, 0x07, 0x18, 0x02,
-0x00, 0x11, 0x01, 0x05, 0x44, 0x00, 0x2a, 0x6f, 0x72, 0x47,
-0x00, 0x20, 0x73, 0x70, 0x37, 0x00, 0x32, 0x62, 0x61, 0x72,
-0x46, 0x00, 0x3e, 0x6c, 0x61, 0x79, 0x8b, 0x01, 0x02, 0x50,
-0x01, 0x02, 0xd9, 0x03, 0x81, 0x73, 0x2e, 0x00, 0x52, 0x65,
-0x70, 0x65, 0x61, 0x14, 0x02, 0xca, 0x65, 0x69, 0x74, 0x68,
-0x65, 0x72, 0x00, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x30, 0x01,
-0x03, 0x86, 0x00, 0x25, 0x6f, 0x72, 0x3a, 0x01, 0x14, 0x50,
-0x76, 0x00, 0x14, 0x61, 0x32, 0x04, 0x05, 0xbb, 0x00, 0x50,
-0x68, 0x69, 0x67, 0x68, 0x6c, 0x82, 0x01, 0xe0, 0x00, 0x61,
-0x6c, 0x6c, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x72, 0x65,
-0x6e, 0x63, 0xc4, 0x02, 0x03, 0xdf, 0x01, 0x02, 0x32, 0x00,
-0x16, 0x2e, 0x45, 0x00, 0x07, 0x16, 0x00, 0x03, 0xae, 0x01,
-0x01, 0x4a, 0x00, 0x51, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x81,
-0x00, 0x05, 0x54, 0x00, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x00,
-0x55, 0x70, 0x99, 0x01, 0x00, 0xc6, 0x00, 0x68, 0x64, 0x69,
-0x66, 0x66, 0x65, 0x72, 0x80, 0x02, 0x00, 0xcf, 0x01, 0x17,
-0x62, 0x31, 0x00, 0x00, 0x23, 0x04, 0x11, 0x74, 0x81, 0x03,
-0x30, 0x67, 0x69, 0x76, 0x00, 0x01, 0x21, 0x69, 0x6d, 0xc1,
-0x00, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x5b, 0x00, 0x02, 0xef,
-0x00, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x65, 0x64, 0xfc, 0x04, 0x22, 0x73, 0x65, 0x05, 0x01,
-0x31, 0x32, 0x2e, 0x31, 0x72, 0x02, 0x01, 0x21, 0x02, 0xb2,
-0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-0x29, 0x04, 0x04, 0x16, 0x32, 0x04, 0x04, 0xb1, 0x70, 0x61,
-0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x81,
-0x04, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x44,
-0x00, 0x04, 0x3f, 0x00, 0x04, 0x56, 0x04, 0xf1, 0x01, 0x65,
-0x00, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
-0x2e, 0x27, 0x00, 0x6f, 0x70, 0x72, 0x00, 0x22, 0x6f, 0x6e,
-0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
-0x65, 0x6e, 0x75, 0xae, 0x00, 0x82, 0x4d, 0x61, 0x78, 0x69,
-0x6d, 0x75, 0x6d, 0x20, 0xe6, 0x00, 0x45, 0x20, 0x6f, 0x6e,
-0x20, 0xc1, 0x03, 0x33, 0x00, 0x00, 0x43, 0x80, 0x04, 0x02,
-0x02, 0x02, 0x32, 0x69, 0x7a, 0x65, 0x69, 0x01, 0x13, 0x65,
-0x03, 0x05, 0x10, 0x2c, 0x24, 0x03, 0x03, 0xa4, 0x04, 0x15,
-0x6c, 0x29, 0x02, 0x07, 0x27, 0x00, 0x0c, 0x69, 0x05, 0x42,
-0x75, 0x73, 0x65, 0x64, 0x6e, 0x05, 0x86, 0x6b, 0x65, 0x00,
-0x69, 0x74, 0x2e, 0x00, 0x44, 0x2d, 0x04, 0x25, 0x74, 0x68,
-0x6a, 0x01, 0x20, 0x67, 0x6f, 0x4d, 0x00, 0x11, 0x75, 0x8c,
-0x01, 0x12, 0x4e, 0xb1, 0x01, 0x00, 0x63, 0x01, 0x32, 0x00,
-0x72, 0x69, 0xda, 0x03, 0xa0, 0x61, 0x6e, 0x00, 0x28, 0x4e,
-0x2b, 0x32, 0x29, 0x00, 0x78, 0x08, 0x00, 0x28, 0x31, 0x29,
-0x6f, 0x06, 0x30, 0x73, 0x6f, 0x2c, 0x67, 0x01, 0x00, 0x70,
-0x05, 0x20, 0x69, 0x63, 0x95, 0x06, 0x12, 0x2c, 0x68, 0x02,
-0xb1, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x76, 0x61,
-0x6c, 0x75, 0x9f, 0x00, 0x11, 0x36, 0x53, 0x00, 0x10, 0x73,
-0x4c, 0x00, 0x33, 0x38, 0x78, 0x37, 0x73, 0x03, 0xf1, 0x05,
-0x00, 0x00, 0x45, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x75,
-0x6e, 0x69, 0x71, 0x75, 0x65, 0x20, 0x73, 0x6f, 0x6c, 0x75,
-0x3c, 0x01, 0x31, 0x00, 0x00, 0x4e, 0x59, 0x07, 0x44, 0x6c,
-0x79, 0x2c, 0x00, 0x9a, 0x01, 0x02, 0x99, 0x00, 0x01, 0xcb,
-0x00, 0x00, 0x34, 0x00, 0x02, 0x6b, 0x02, 0x06, 0x1d, 0x01,
-0x01, 0xec, 0x04, 0x03, 0x47, 0x05, 0x00, 0xba, 0x03, 0x10,
-0x76, 0x02, 0x05, 0x21, 0x6c, 0x79, 0x6f, 0x05, 0x04, 0x58,
-0x00, 0x33, 0x2e, 0x00, 0x50, 0x2c, 0x00, 0x01, 0x00, 0x01,
-0x94, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75, 0x6f, 0x75, 0x73,
-0x26, 0x02, 0x05, 0x75, 0x02, 0x41, 0x6d, 0x6f, 0x72, 0x65,
-0x93, 0x02, 0x00, 0xd4, 0x00, 0x11, 0x74, 0x58, 0x06, 0x40,
-0x73, 0x6f, 0x6d, 0x65, 0x73, 0x02, 0x12, 0x73, 0x1d, 0x00,
-0x40, 0x73, 0x75, 0x62, 0x74, 0x92, 0x01, 0x20, 0x73, 0x6f,
-0xcd, 0x05, 0x00, 0xe7, 0x04, 0x45, 0x6c, 0x69, 0x6b, 0x65,
-0x14, 0x05, 0x01, 0x04, 0x04, 0x20, 0x6f, 0x66, 0x97, 0x01,
-0xe0, 0x69, 0x73, 0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
-0x65, 0x2e, 0x00, 0x41, 0x6c, 0x30, 0x01, 0x41, 0x66, 0x69,
-0x6e, 0x64, 0x72, 0x03, 0x03, 0xb9, 0x02, 0x76, 0x70, 0x6f,
-0x73, 0x73, 0x69, 0x62, 0x6c, 0xa8, 0x00, 0x05, 0x88, 0x00,
-0x00, 0xd2, 0x04, 0x30, 0x64, 0x64, 0x69, 0x14, 0x00, 0xf2,
-0x01, 0x61, 0x6c, 0x00, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65,
-0x6e, 0x67, 0x65, 0x00, 0x66, 0x6f, 0x72, 0x1c, 0x00, 0x10,
-0x76, 0x57, 0x08, 0x10, 0x64, 0x65, 0x04, 0x10, 0x79, 0x88,
-0x03, 0x40, 0x54, 0x75, 0x72, 0x6e, 0x5a, 0x00, 0x05, 0x7a,
-0x00, 0x03, 0x8c, 0x02, 0x05, 0x1b, 0x05, 0x50, 0x73, 0x70,
-0x65, 0x65, 0x64, 0xeb, 0x01, 0x03, 0x55, 0x07, 0xc0, 0x67,
-0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-0x00,
+0x73, 0x61, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf1, 0x05,
+0x00, 0x00, 0x00, 0x41, 0x00, 0x6e, 0x6f, 0x72, 0x6d, 0x61,
+0x6c, 0x00, 0x73, 0x65, 0x74, 0x00, 0x6f, 0x66, 0x00, 0x64,
+0x31, 0x00, 0xf0, 0x0b, 0x65, 0x73, 0x00, 0x2d, 0x00, 0x74,
+0x68, 0x61, 0x74, 0x00, 0x69, 0x73, 0x2c, 0x00, 0x6f, 0x6e,
+0x65, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+0x24, 0x00, 0xf0, 0x07, 0x65, 0x76, 0x65, 0x72, 0x79, 0x00,
+0x28, 0x75, 0x6e, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x65, 0x64,
+0x29, 0x00, 0x70, 0x61, 0x69, 0x72, 0x1a, 0x00, 0xf0, 0x3b,
+0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x00, 0x66, 0x72,
+0x6f, 0x6d, 0x00, 0x30, 0x00, 0x74, 0x6f, 0x00, 0x36, 0x00,
+0x2d, 0x00, 0x68, 0x61, 0x73, 0x00, 0x62, 0x65, 0x65, 0x6e,
+0x00, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x00,
+0x69, 0x72, 0x72, 0x65, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x6c,
+0x79, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00, 0x61, 0x00, 0x72,
+0x65, 0x63, 0x74, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x3b, 0x00,
+0x74, 0x68, 0x65, 0x6e, 0x05, 0x00, 0x03, 0x4f, 0x00, 0xf6,
+0x00, 0x00, 0x69, 0x6e, 0x00, 0x65, 0x61, 0x63, 0x68, 0x00,
+0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x4f, 0x00, 0xf1, 0x01,
+0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x64, 0x6f,
+0x77, 0x6e, 0x00, 0x61, 0x6e, 0x64, 0x34, 0x00, 0x05, 0xc1,
+0x00, 0xf0, 0x11, 0x74, 0x68, 0x65, 0x6d, 0x73, 0x65, 0x6c,
+0x76, 0x65, 0x73, 0x00, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65,
+0x64, 0x2e, 0x00, 0x59, 0x6f, 0x75, 0x72, 0x00, 0x74, 0x61,
+0x73, 0x6b, 0x00, 0x69, 0x73, 0x9e, 0x00, 0xb1, 0x72, 0x65,
+0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x3d,
+0x00, 0xa3, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x00,
+0x62, 0x79, 0xac, 0x00, 0x31, 0x69, 0x6e, 0x67, 0x19, 0x00,
+0x0c, 0x1e, 0x01, 0x82, 0x74, 0x6f, 0x00, 0x6d, 0x61, 0x74,
+0x63, 0x68, 0x36, 0x00, 0x71, 0x72, 0x6f, 0x76, 0x69, 0x64,
+0x65, 0x64, 0x34, 0x00, 0x17, 0x79, 0x08, 0x01, 0xf0, 0x00,
+0x2e, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x75, 0x00, 0xf0, 0x00, 0x77,
+0x69, 0x64, 0x65, 0x6c, 0x79, 0x00, 0x63, 0x72, 0x65, 0x64,
+0x69, 0x74, 0x65, 0x64, 0x49, 0x00, 0xc2, 0x4f, 0x2e, 0x00,
+0x53, 0x2e, 0x00, 0x41, 0x64, 0x6c, 0x65, 0x72, 0x2c, 0xc7,
+0x00, 0x81, 0x61, 0x6b, 0x65, 0x73, 0x00, 0x70, 0x61, 0x72,
+0x74, 0x00, 0x82, 0x69, 0x74, 0x73, 0x00, 0x6e, 0x61, 0x6d,
+0x65, 0x55, 0x01, 0x40, 0x74, 0x68, 0x6f, 0x73, 0x8e, 0x01,
+0x51, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x61, 0x00, 0x46, 0x31,
+0x37, 0x2e, 0x31, 0xe8, 0x01, 0xf0, 0x07, 0x63, 0x6f, 0x6e,
+0x74, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x4c,
+0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xc7,
+0x00, 0x41, 0x62, 0x65, 0x74, 0x77, 0x85, 0x01, 0xf5, 0x00,
+0x6e, 0x79, 0x00, 0x74, 0x77, 0x6f, 0x00, 0x61, 0x64, 0x6a,
+0x61, 0x63, 0x65, 0x6e, 0x74, 0xb5, 0x01, 0x83, 0x70, 0x6c,
+0x61, 0x63, 0x65, 0x73, 0x00, 0x61, 0xe6, 0x00, 0x63, 0x00,
+0x63, 0x6f, 0x76, 0x65, 0x72, 0x01, 0x01, 0x53, 0x6d, 0x2c,
+0x00, 0x6f, 0x72, 0x48, 0x01, 0x12, 0x73, 0x11, 0x02, 0x00,
+0x9a, 0x00, 0x00, 0xd2, 0x00, 0xf1, 0x05, 0x61, 0x6c, 0x72,
+0x65, 0x61, 0x64, 0x79, 0x00, 0x70, 0x72, 0x65, 0x73, 0x65,
+0x6e, 0x74, 0x2e, 0x00, 0x54, 0x72, 0x79, 0x36, 0x00, 0x12,
+0x6f, 0x52, 0x00, 0x06, 0x51, 0x00, 0x60, 0x77, 0x68, 0x69,
+0x63, 0x68, 0x00, 0x56, 0x00, 0xa0, 0x6c, 0x61, 0x70, 0x73,
+0x00, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2a, 0x00, 0x05, 0x56,
+0x01, 0x43, 0x77, 0x69, 0x6c, 0x6c, 0x65, 0x00, 0x01, 0x59,
+0x01, 0x40, 0x6f, 0x6e, 0x65, 0x73, 0x66, 0x00, 0x04, 0x33,
+0x00, 0x00, 0xef, 0x00, 0x4e, 0x52, 0x69, 0x67, 0x68, 0xd6,
+0x00, 0x0f, 0xd2, 0x00, 0x03, 0x40, 0x64, 0x72, 0x61, 0x77,
+0xd1, 0x00, 0x46, 0x6c, 0x69, 0x6e, 0x65, 0x2a, 0x00, 0x01,
+0xce, 0x00, 0x02, 0x8c, 0x00, 0xb2, 0x79, 0x6f, 0x75, 0x00,
+0x63, 0x61, 0x6e, 0x00, 0x75, 0x73, 0x65, 0x0f, 0x02, 0x40,
+0x6d, 0x69, 0x6e, 0x64, 0x16, 0x00, 0x52, 0x72, 0x73, 0x65,
+0x6c, 0x66, 0x02, 0x03, 0x00, 0x24, 0x00, 0x43, 0x6b, 0x6e,
+0x6f, 0x77, 0x7b, 0x01, 0x00, 0x69, 0x00, 0x04, 0x60, 0x00,
+0x00, 0x8e, 0x02, 0x32, 0x6e, 0x6f, 0x74, 0x2a, 0x01, 0x21,
+0x65, 0x64, 0x37, 0x02, 0x30, 0x00, 0x73, 0x69, 0xc6, 0x02,
+0x03, 0xd5, 0x00, 0x1c, 0x2e, 0xb0, 0x00, 0x55, 0x61, 0x67,
+0x61, 0x69, 0x6e, 0x49, 0x01, 0x00, 0xe5, 0x00, 0x00, 0x9d,
+0x00, 0x00, 0xd9, 0x00, 0x13, 0x59, 0x8c, 0x00, 0x42, 0x61,
+0x6c, 0x73, 0x6f, 0x91, 0x00, 0xd2, 0x68, 0x65, 0x00, 0x63,
+0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x74,
+0x02, 0x00, 0x1a, 0x01, 0x14, 0x61, 0x16, 0x00, 0x43, 0x61,
+0x72, 0x6f, 0x75, 0xf6, 0x02, 0x74, 0x67, 0x72, 0x69, 0x64,
+0x2e, 0x00, 0x57, 0x39, 0x03, 0x03, 0x21, 0x00, 0xbf, 0x69,
+0x73, 0x00, 0x68, 0x61, 0x6c, 0x66, 0x00, 0x77, 0x61, 0x79,
+0x29, 0x01, 0x0a, 0x11, 0x2c, 0xbd, 0x01, 0x14, 0x73, 0xed,
+0x02, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x75, 0x00,
+0x02, 0x92, 0x01, 0x0b, 0xc7, 0x01, 0x07, 0x18, 0x02, 0x00,
+0x11, 0x01, 0x05, 0x44, 0x00, 0x2a, 0x6f, 0x72, 0x47, 0x00,
+0x20, 0x73, 0x70, 0x37, 0x00, 0x32, 0x62, 0x61, 0x72, 0x46,
+0x00, 0x3e, 0x6c, 0x61, 0x79, 0x8b, 0x01, 0x02, 0x50, 0x01,
+0x02, 0xd9, 0x03, 0x81, 0x73, 0x2e, 0x00, 0x52, 0x65, 0x70,
+0x65, 0x61, 0x14, 0x02, 0xca, 0x65, 0x69, 0x74, 0x68, 0x65,
+0x72, 0x00, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x30, 0x01, 0x03,
+0x86, 0x00, 0x25, 0x6f, 0x72, 0x3a, 0x01, 0x14, 0x50, 0x76,
+0x00, 0x14, 0x61, 0x32, 0x04, 0x05, 0xbb, 0x00, 0x50, 0x68,
+0x69, 0x67, 0x68, 0x6c, 0x82, 0x01, 0xe0, 0x00, 0x61, 0x6c,
+0x6c, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
+0x63, 0xc4, 0x02, 0x03, 0xdf, 0x01, 0x02, 0x32, 0x00, 0x16,
+0x2e, 0x45, 0x00, 0x07, 0x16, 0x00, 0x03, 0xae, 0x01, 0x01,
+0x4a, 0x00, 0x51, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x81, 0x00,
+0x05, 0x54, 0x00, 0x70, 0x69, 0x6e, 0x67, 0x2e, 0x00, 0x55,
+0x70, 0x99, 0x01, 0x00, 0xc6, 0x00, 0x68, 0x64, 0x69, 0x66,
+0x66, 0x65, 0x72, 0x80, 0x02, 0x00, 0xcf, 0x01, 0x17, 0x62,
+0x31, 0x00, 0x00, 0x23, 0x04, 0x11, 0x74, 0x81, 0x03, 0x30,
+0x67, 0x69, 0x76, 0x00, 0x01, 0x21, 0x69, 0x6d, 0xc1, 0x00,
+0x41, 0x28, 0x41, 0x6c, 0x6c, 0x5b, 0x00, 0x02, 0xef, 0x00,
+0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62,
+0x65, 0x64, 0xfc, 0x04, 0x22, 0x73, 0x65, 0x05, 0x01, 0x31,
+0x32, 0x2e, 0x31, 0x72, 0x02, 0x01, 0x21, 0x02, 0xb2, 0x61,
+0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
+0x04, 0x04, 0x16, 0x32, 0x04, 0x04, 0xb1, 0x70, 0x61, 0x72,
+0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x81, 0x04,
+0x46, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x44, 0x00,
+0x04, 0x3f, 0x00, 0x04, 0x56, 0x04, 0xf1, 0x01, 0x65, 0x00,
+0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e,
+0x27, 0x00, 0x6f, 0x70, 0x72, 0x00, 0x22, 0x6f, 0x6e, 0x1a,
+0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65,
+0x6e, 0x75, 0xae, 0x00, 0x82, 0x4d, 0x61, 0x78, 0x69, 0x6d,
+0x75, 0x6d, 0x20, 0xe6, 0x00, 0x45, 0x20, 0x6f, 0x6e, 0x20,
+0xc1, 0x03, 0x33, 0x00, 0x00, 0x43, 0x80, 0x04, 0x02, 0x02,
+0x02, 0x32, 0x69, 0x7a, 0x65, 0x69, 0x01, 0x13, 0x65, 0x03,
+0x05, 0x10, 0x2c, 0x24, 0x03, 0x03, 0xa4, 0x04, 0x15, 0x6c,
+0x29, 0x02, 0x07, 0x27, 0x00, 0x0c, 0x69, 0x05, 0x42, 0x75,
+0x73, 0x65, 0x64, 0x6e, 0x05, 0x86, 0x6b, 0x65, 0x00, 0x69,
+0x74, 0x2e, 0x00, 0x44, 0x2d, 0x04, 0x25, 0x74, 0x68, 0x6a,
+0x01, 0x20, 0x67, 0x6f, 0x4d, 0x00, 0x11, 0x75, 0x8c, 0x01,
+0x12, 0x4e, 0xb1, 0x01, 0x00, 0x63, 0x01, 0x32, 0x00, 0x72,
+0x69, 0xda, 0x03, 0xa0, 0x61, 0x6e, 0x00, 0x28, 0x4e, 0x2b,
+0x32, 0x29, 0x00, 0x78, 0x08, 0x00, 0x28, 0x31, 0x29, 0x6f,
+0x06, 0x30, 0x73, 0x6f, 0x2c, 0x67, 0x01, 0x00, 0x70, 0x05,
+0x20, 0x69, 0x63, 0x95, 0x06, 0x12, 0x2c, 0x68, 0x02, 0xb1,
+0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x76, 0x61, 0x6c,
+0x75, 0x9f, 0x00, 0x11, 0x36, 0x53, 0x00, 0x10, 0x73, 0x4c,
+0x00, 0x33, 0x38, 0x78, 0x37, 0x73, 0x03, 0xf1, 0x05, 0x00,
+0x00, 0x45, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x75, 0x6e,
+0x69, 0x71, 0x75, 0x65, 0x20, 0x73, 0x6f, 0x6c, 0x75, 0x3c,
+0x01, 0x31, 0x00, 0x00, 0x4e, 0x59, 0x07, 0x44, 0x6c, 0x79,
+0x2c, 0x00, 0x9a, 0x01, 0x02, 0x99, 0x00, 0x01, 0xcb, 0x00,
+0x00, 0x34, 0x00, 0x02, 0x6b, 0x02, 0x06, 0x1d, 0x01, 0x01,
+0xec, 0x04, 0x03, 0x47, 0x05, 0x00, 0xba, 0x03, 0x10, 0x76,
+0x02, 0x05, 0x21, 0x6c, 0x79, 0x6f, 0x05, 0x04, 0x58, 0x00,
+0x33, 0x2e, 0x00, 0x50, 0x2c, 0x00, 0x01, 0x00, 0x01, 0x94,
+0x61, 0x6d, 0x62, 0x69, 0x67, 0x75, 0x6f, 0x75, 0x73, 0x26,
+0x02, 0x05, 0x75, 0x02, 0x41, 0x6d, 0x6f, 0x72, 0x65, 0x93,
+0x02, 0x00, 0xd4, 0x00, 0x11, 0x74, 0x58, 0x06, 0x40, 0x73,
+0x6f, 0x6d, 0x65, 0x73, 0x02, 0x12, 0x73, 0x1d, 0x00, 0x40,
+0x73, 0x75, 0x62, 0x74, 0x92, 0x01, 0x20, 0x73, 0x6f, 0xcd,
+0x05, 0x00, 0xe7, 0x04, 0x45, 0x6c, 0x69, 0x6b, 0x65, 0x14,
+0x05, 0x01, 0x04, 0x04, 0x20, 0x6f, 0x66, 0x97, 0x01, 0xe0,
+0x69, 0x73, 0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65,
+0x2e, 0x00, 0x41, 0x6c, 0x30, 0x01, 0x41, 0x66, 0x69, 0x6e,
+0x64, 0x72, 0x03, 0x03, 0xb9, 0x02, 0x76, 0x70, 0x6f, 0x73,
+0x73, 0x69, 0x62, 0x6c, 0xa8, 0x00, 0x05, 0x88, 0x00, 0x00,
+0xd2, 0x04, 0x30, 0x64, 0x64, 0x69, 0x14, 0x00, 0xf2, 0x01,
+0x61, 0x6c, 0x00, 0x63, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e,
+0x67, 0x65, 0x00, 0x66, 0x6f, 0x72, 0x1c, 0x00, 0x10, 0x76,
+0x57, 0x08, 0x10, 0x64, 0x65, 0x04, 0x10, 0x79, 0x88, 0x03,
+0x40, 0x54, 0x75, 0x72, 0x6e, 0x5a, 0x00, 0x05, 0x7a, 0x00,
+0x03, 0x8c, 0x02, 0x05, 0x1b, 0x05, 0x50, 0x73, 0x70, 0x65,
+0x65, 0x64, 0xeb, 0x01, 0x03, 0x55, 0x07, 0xc0, 0x67, 0x65,
+0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2278;
-const unsigned short help_text_words = 400;
+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 467118b7d5..32c8cba399 100644
--- a/apps/plugins/puzzles/help/fifteen.c
+++ b/apps/plugins/puzzles/help/fifteen.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,112 +6,151 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 83, TEXT_UNDERLINE },
- { 86, TEXT_CENTER | C_RED },
- { 153, TEXT_UNDERLINE },
- { 195, TEXT_CENTER | C_RED },
- { 211, TEXT_UNDERLINE },
- { 213, TEXT_UNDERLINE },
+ { 89, TEXT_UNDERLINE },
+ { 92, TEXT_CENTER | C_RED },
+ { 161, TEXT_UNDERLINE },
+ { 203, TEXT_CENTER | C_RED },
+ { 219, TEXT_UNDERLINE },
+ { 221, TEXT_UNDERLINE },
+ { 239, TEXT_CENTER | C_RED },
+ { 343, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 1245 comp 925 ratio 0.742972 level 5 saved 320 */
+/* orig 1927 comp 1285 ratio 0.66684 level 10 saved 642 */
 const char help_text[] = {
-0xf1, 0x29, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x35, 0x3a, 0x20, 0x46, 0x69, 0x66, 0x74, 0x65, 0x65, 0x6e,
-0x20, 0x00, 0x00, 0x00, 0x54, 0x68, 0x65, 0x00, 0x6f, 0x6c,
-0x64, 0x00, 0x6f, 0x6e, 0x65, 0x73, 0x00, 0x61, 0x72, 0x65,
-0x00, 0x74, 0x68, 0x65, 0x00, 0x62, 0x65, 0x73, 0x74, 0x3a,
-0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x69, 0x73, 0x12, 0x00,
-0x41, 0x67, 0x6f, 0x6f, 0x64, 0x28, 0x00, 0xf0, 0x23, 0x60,
-0x31, 0x35, 0x2d, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x27,
-0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x73, 0x6c, 0x69, 0x64,
-0x69, 0x6e, 0x67, 0x00, 0x74, 0x69, 0x6c, 0x65, 0x73, 0x2e,
-0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
-0x61, 0x00, 0x34, 0x78, 0x34, 0x00, 0x73, 0x71, 0x75, 0x55,
-0x00, 0x83, 0x67, 0x72, 0x69, 0x64, 0x3b, 0x00, 0x31, 0x35,
-0x10, 0x00, 0xf2, 0x03, 0x73, 0x00, 0x63, 0x6f, 0x6e, 0x74,
-0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-0x65, 0x64, 0x3f, 0x00, 0x51, 0x2c, 0x00, 0x61, 0x6e, 0x64,
-0x70, 0x00, 0x30, 0x73, 0x69, 0x78, 0xa2, 0x00, 0x20, 0x74,
-0x68, 0x81, 0x00, 0x51, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5b,
-0x00, 0x61, 0x72, 0x00, 0x6d, 0x6f, 0x76, 0x65, 0x95, 0x00,
-0x70, 0x6f, 0x00, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x69, 0x00,
-0x00, 0x3c, 0x00, 0x50, 0x00, 0x6e, 0x65, 0x78, 0x74, 0x16,
-0x00, 0x00, 0x3e, 0x00, 0x01, 0x31, 0x00, 0x62, 0x00, 0x73,
-0x70, 0x61, 0x63, 0x65, 0x53, 0x00, 0x00, 0xa5, 0x00, 0x73,
-0x65, 0x00, 0x69, 0x74, 0x00, 0x69, 0x6e, 0x23, 0x00, 0x01,
-0x1d, 0x00, 0x11, 0x2e, 0xff, 0x00, 0x33, 0x61, 0x69, 0x6d,
-0x52, 0x00, 0x62, 0x65, 0x6e, 0x64, 0x00, 0x75, 0x70, 0xd8,
-0x00, 0x00, 0x25, 0x00, 0x01, 0x95, 0x00, 0x12, 0x00, 0xa7,
-0x00, 0xd6, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6c, 0x00, 0x6f,
-0x72, 0x64, 0x65, 0x72, 0x2c, 0x23, 0x00, 0x01, 0x48, 0x00,
-0x00, 0x23, 0x00, 0x01, 0x38, 0x01, 0xe0, 0x6f, 0x74, 0x74,
-0x6f, 0x6d, 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x28,
-0x73, 0x6a, 0x00, 0x22, 0x61, 0x74, 0x4a, 0x00, 0xf5, 0x05,
-0x6f, 0x70, 0x00, 0x72, 0x6f, 0x77, 0x00, 0x72, 0x65, 0x61,
-0x64, 0x73, 0x00, 0x31, 0x2c, 0x32, 0x2c, 0x33, 0x2c, 0x34,
-0xee, 0x00, 0x04, 0x38, 0x00, 0x06, 0x21, 0x00, 0x81, 0x33,
-0x2c, 0x31, 0x34, 0x2c, 0x31, 0x35, 0x2c, 0x5f, 0x00, 0x85,
-0x29, 0x2e, 0x00, 0x00, 0x00, 0x35, 0x2e, 0x31, 0xb8, 0x01,
-0x00, 0x3e, 0x01, 0x42, 0x72, 0x6f, 0x6c, 0x73, 0xc1, 0x01,
-0xf3, 0x00, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00,
-0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x1d, 0x00, 0x36,
-0x6c, 0x65, 0x64, 0xa6, 0x00, 0x81, 0x6d, 0x6f, 0x75, 0x73,
-0x65, 0x00, 0x6f, 0x72, 0x0d, 0x00, 0x80, 0x6b, 0x65, 0x79,
-0x62, 0x6f, 0x61, 0x72, 0x64, 0x56, 0x00, 0xcc, 0x41, 0x00,
-0x6c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b,
-0x2f, 0x00, 0x03, 0xd5, 0x00, 0x00, 0x96, 0x00, 0x94, 0x6f,
-0x72, 0x00, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0xb9, 0x01,
-0x01, 0xf2, 0x01, 0x0a, 0x6a, 0x01, 0x52, 0x00, 0x77, 0x69,
-0x6c, 0x6c, 0xa0, 0x01, 0x73, 0x61, 0x73, 0x00, 0x6d, 0x61,
-0x6e, 0x79, 0x40, 0x01, 0xc0, 0x61, 0x73, 0x00, 0x6e, 0x65,
-0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x66, 0x01, 0x01,
-0x23, 0x00, 0x06, 0x3c, 0x01, 0x27, 0x74, 0x6f, 0x74, 0x00,
-0x83, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x2e, 0x9a,
-0x02, 0x20, 0x61, 0x72, 0x7e, 0x00, 0x48, 0x6b, 0x65, 0x79,
-0x73, 0x5e, 0x00, 0x02, 0xf1, 0x01, 0x75, 0x61, 0x64, 0x6a,
-0x61, 0x63, 0x65, 0x6e, 0xf5, 0x01, 0x09, 0x8a, 0x01, 0xf4,
-0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-0x00, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64,
-0x00, 0x28, 0x6d, 0x6f, 0x76, 0xb8, 0x00, 0x09, 0x2d, 0x00,
-0x77, 0x6f, 0x70, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x36, 0x00,
-0x01, 0x72, 0x01, 0x50, 0x50, 0x72, 0x65, 0x73, 0x73, 0x31,
-0x00, 0x33, 0x60, 0x68, 0x27, 0x7f, 0x00, 0x20, 0x61, 0x6b,
-0x7f, 0x00, 0x60, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x53,
-0x00, 0x00, 0x90, 0x00, 0x1a, 0x2e, 0x29, 0x00, 0xb3, 0x65,
-0x6e, 0x6f, 0x75, 0x67, 0x68, 0x00, 0x74, 0x69, 0x6d, 0x65,
-0xb5, 0x00, 0x33, 0x73, 0x6f, 0x6c, 0xf1, 0x00, 0x00, 0xa7,
-0x01, 0x50, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x8b, 0x02, 0xe0,
-0x6d, 0x61, 0x79, 0x00, 0x73, 0x63, 0x72, 0x61, 0x6d, 0x62,
-0x6c, 0x65, 0x00, 0x79, 0xdc, 0x02, 0x40, 0x70, 0x72, 0x6f,
-0x67, 0x4b, 0x00, 0x30, 0x00, 0x77, 0x68, 0xe1, 0x00, 0x20,
-0x64, 0x6f, 0x54, 0x00, 0x20, 0x73, 0x6f, 0x8c, 0x00, 0x41,
-0x28, 0x41, 0x6c, 0x6c, 0x43, 0x00, 0x11, 0x61, 0xa0, 0x00,
-0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62,
-0x65, 0x64, 0xc5, 0x00, 0x13, 0x73, 0xec, 0x00, 0x31, 0x32,
-0x2e, 0x31, 0xc4, 0x03, 0xf1, 0x01, 0x61, 0x6c, 0x73, 0x6f,
-0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65,
-0x2e, 0x29, 0x3f, 0x02, 0x15, 0x32, 0x3f, 0x02, 0xa5, 0x70,
-0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x02,
-0x04, 0x62, 0x6e, 0x6c, 0x79, 0x00, 0x6f, 0x70, 0x5b, 0x00,
-0x05, 0x39, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x76,
-0x00, 0xb3, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e,
-0x2e, 0x2e, 0x27, 0x27, 0x00, 0x22, 0x00, 0x6f, 0x3c, 0x01,
-0xb1, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf1, 0x16, 0x00, 0x00, 0x00,
+0x54, 0x68, 0x65, 0x00, 0x6f, 0x6c, 0x64, 0x00, 0x6f, 0x6e,
+0x65, 0x73, 0x00, 0x61, 0x72, 0x65, 0x00, 0x74, 0x68, 0x65,
+0x00, 0x62, 0x65, 0x73, 0x74, 0x3a, 0x00, 0x74, 0x68, 0x69,
+0x73, 0x00, 0x69, 0x73, 0x12, 0x00, 0x41, 0x67, 0x6f, 0x6f,
+0x64, 0x28, 0x00, 0xf1, 0x21, 0x60, 0x31, 0x35, 0x2d, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x27, 0x00, 0x77, 0x69, 0x74,
+0x68, 0x00, 0x73, 0x6c, 0x69, 0x64, 0x69, 0x6e, 0x67, 0x00,
+0x74, 0x69, 0x6c, 0x65, 0x73, 0x2c, 0x00, 0x77, 0x68, 0x69,
+0x63, 0x68, 0x00, 0x64, 0x61, 0x74, 0x65, 0x73, 0x00, 0x66,
+0x72, 0x6f, 0x6d, 0x3e, 0x00, 0xf0, 0x0a, 0x31, 0x38, 0x37,
+0x30, 0x73, 0x2e, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61,
+0x76, 0x65, 0x00, 0x61, 0x00, 0x34, 0x78, 0x34, 0x00, 0x73,
+0x71, 0x75, 0x71, 0x00, 0x83, 0x67, 0x72, 0x69, 0x64, 0x3b,
+0x00, 0x31, 0x35, 0x10, 0x00, 0xf4, 0x03, 0x73, 0x00, 0x63,
+0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d,
+0x62, 0x65, 0x72, 0x65, 0x64, 0x5b, 0x00, 0x31, 0x61, 0x6e,
+0x64, 0x4e, 0x00, 0x30, 0x73, 0x69, 0x78, 0xd1, 0x00, 0x20,
+0x74, 0x68, 0x9d, 0x00, 0x51, 0x65, 0x6d, 0x70, 0x74, 0x79,
+0x5b, 0x00, 0x61, 0x72, 0x00, 0x6d, 0x6f, 0x76, 0x65, 0xb1,
+0x00, 0x70, 0x6f, 0x00, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x69,
+0x00, 0x00, 0x3c, 0x00, 0x50, 0x00, 0x6e, 0x65, 0x78, 0x74,
+0x16, 0x00, 0x00, 0x3e, 0x00, 0x01, 0x31, 0x00, 0x62, 0x00,
+0x73, 0x70, 0x61, 0x63, 0x65, 0x53, 0x00, 0x00, 0xc1, 0x00,
+0x73, 0x65, 0x00, 0x69, 0x74, 0x00, 0x69, 0x6e, 0x23, 0x00,
+0x01, 0x1d, 0x00, 0x11, 0x2e, 0x1b, 0x01, 0x33, 0x61, 0x69,
+0x6d, 0x52, 0x00, 0x62, 0x65, 0x6e, 0x64, 0x00, 0x75, 0x70,
+0xf4, 0x00, 0x00, 0x25, 0x00, 0x01, 0x95, 0x00, 0x12, 0x00,
+0xa7, 0x00, 0xd6, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6c, 0x00,
+0x6f, 0x72, 0x64, 0x65, 0x72, 0x2c, 0x23, 0x00, 0x01, 0x48,
+0x00, 0x00, 0x23, 0x00, 0x01, 0x54, 0x01, 0xe0, 0x6f, 0x74,
+0x74, 0x6f, 0x6d, 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00,
+0x28, 0x73, 0x6a, 0x00, 0x22, 0x61, 0x74, 0x4a, 0x00, 0xf5,
+0x05, 0x6f, 0x70, 0x00, 0x72, 0x6f, 0x77, 0x00, 0x72, 0x65,
+0x61, 0x64, 0x73, 0x00, 0x31, 0x2c, 0x32, 0x2c, 0x33, 0x2c,
+0x34, 0xee, 0x00, 0x04, 0x38, 0x00, 0x06, 0x21, 0x00, 0x81,
+0x33, 0x2c, 0x31, 0x34, 0x2c, 0x31, 0x35, 0x2c, 0x5f, 0x00,
+0x85, 0x29, 0x2e, 0x00, 0x00, 0x00, 0x35, 0x2e, 0x31, 0xe7,
+0x01, 0x00, 0x3e, 0x01, 0x51, 0x72, 0x6f, 0x6c, 0x73, 0x20,
+0xdd, 0x01, 0xf3, 0x00, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d,
+0x65, 0x00, 0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x1d,
+0x00, 0x36, 0x6c, 0x65, 0x64, 0xa6, 0x00, 0x81, 0x6d, 0x6f,
+0x75, 0x73, 0x65, 0x00, 0x6f, 0x72, 0x0d, 0x00, 0x80, 0x6b,
+0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x56, 0x00, 0xcc,
+0x41, 0x00, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
+0x63, 0x6b, 0x2f, 0x00, 0x03, 0xd5, 0x00, 0x00, 0x96, 0x00,
+0x94, 0x6f, 0x72, 0x00, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+0xb9, 0x01, 0x01, 0x0e, 0x02, 0x0a, 0x6a, 0x01, 0x52, 0x00,
+0x77, 0x69, 0x6c, 0x6c, 0xa0, 0x01, 0x73, 0x61, 0x73, 0x00,
+0x6d, 0x61, 0x6e, 0x79, 0x40, 0x01, 0xc0, 0x61, 0x73, 0x00,
+0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x66,
+0x01, 0x01, 0x23, 0x00, 0x06, 0x3c, 0x01, 0x27, 0x74, 0x6f,
+0x74, 0x00, 0x70, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72,
+0x9b, 0x00, 0xb1, 0x42, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61,
+0x75, 0x6c, 0x74, 0x2c, 0x21, 0x00, 0x20, 0x61, 0x72, 0x8a,
+0x00, 0x48, 0x6b, 0x65, 0x79, 0x73, 0x6a, 0x00, 0x02, 0xfd,
+0x01, 0x75, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x01,
+0x02, 0x09, 0x96, 0x01, 0xf4, 0x09, 0x64, 0x69, 0x72, 0x65,
+0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x69, 0x6e, 0x64, 0x69,
+0x63, 0x61, 0x74, 0x65, 0x64, 0x00, 0x28, 0x6d, 0x6f, 0x76,
+0xc4, 0x00, 0x09, 0x2d, 0x00, 0x77, 0x6f, 0x70, 0x70, 0x6f,
+0x73, 0x69, 0x74, 0x36, 0x00, 0x01, 0x7e, 0x01, 0x50, 0x50,
+0x72, 0x65, 0x73, 0x73, 0x31, 0x00, 0x33, 0x60, 0x68, 0x27,
+0x7f, 0x00, 0x20, 0x61, 0x6b, 0x7f, 0x00, 0x60, 0x73, 0x75,
+0x67, 0x67, 0x65, 0x73, 0x53, 0x00, 0x00, 0x90, 0x00, 0x1a,
+0x2e, 0x29, 0x00, 0xb3, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68,
+0x00, 0x74, 0x69, 0x6d, 0x65, 0xb5, 0x00, 0x33, 0x73, 0x6f,
+0x6c, 0xfd, 0x00, 0x00, 0xb3, 0x01, 0x50, 0x2c, 0x00, 0x62,
+0x75, 0x74, 0x97, 0x02, 0xe0, 0x6d, 0x61, 0x79, 0x00, 0x73,
+0x63, 0x72, 0x61, 0x6d, 0x62, 0x6c, 0x65, 0x00, 0x79, 0xe8,
+0x02, 0x40, 0x70, 0x72, 0x6f, 0x67, 0x4b, 0x00, 0x00, 0x6d,
+0x03, 0x50, 0x6c, 0x65, 0x00, 0x64, 0x6f, 0x54, 0x00, 0x20,
+0x73, 0x6f, 0x8c, 0x00, 0x42, 0x28, 0x41, 0x6c, 0x6c, 0x12,
+0x01, 0x01, 0xa0, 0x00, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73,
+0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0xc5, 0x00, 0x13, 0x73,
+0xec, 0x00, 0x31, 0x32, 0x2e, 0x31, 0xec, 0x03, 0xf1, 0x01,
+0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x4b, 0x02, 0x15, 0x32,
+0x4b, 0x02, 0xb4, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0x73, 0x20, 0x2a, 0x04, 0x62, 0x6e, 0x6c, 0x79,
+0x00, 0x6f, 0x70, 0x5b, 0x00, 0x05, 0x39, 0x00, 0x06, 0xe9,
+0x03, 0xb3, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e,
+0x2e, 0x2e, 0x27, 0x27, 0x00, 0x32, 0x00, 0x6f, 0x6e, 0x1a,
+0x00, 0xa1, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65,
 0x6e, 0x75, 0x7b, 0x00, 0x51, 0x57, 0x69, 0x64, 0x74, 0x68,
-0xd9, 0x02, 0x20, 0x48, 0x65, 0x07, 0x03, 0x10, 0x2c, 0xcd,
-0x00, 0x21, 0x63, 0x68, 0x1c, 0x00, 0xf1, 0x07, 0x73, 0x65,
-0x6c, 0x66, 0x2d, 0x65, 0x78, 0x70, 0x6c, 0x61, 0x6e, 0x61,
-0x74, 0x6f, 0x72, 0x79, 0x2e, 0x00, 0x28, 0x4f, 0x6e, 0x63,
-0xfd, 0x00, 0xa1, 0x27, 0x76, 0x65, 0x00, 0x63, 0x68, 0x61,
-0x6e, 0x67, 0x65, 0x12, 0x03, 0xe9, 0x73, 0x65, 0x2c, 0x00,
-0x69, 0x74, 0x27, 0x73, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x61,
-0x75, 0x04, 0x00, 0x58, 0x02, 0xf0, 0x03, 0x6d, 0x6f, 0x72,
-0x65, 0x2c, 0x00, 0x6f, 0x66, 0x00, 0x63, 0x6f, 0x75, 0x72,
-0x73, 0x65, 0x21, 0x29, 0x00,
+0xe5, 0x02, 0x20, 0x48, 0x65, 0x13, 0x03, 0x04, 0x3a, 0x04,
+0x00, 0x1c, 0x00, 0xf1, 0x07, 0x73, 0x65, 0x6c, 0x66, 0x2d,
+0x65, 0x78, 0x70, 0x6c, 0x61, 0x6e, 0x61, 0x74, 0x6f, 0x72,
+0x79, 0x2e, 0x00, 0x28, 0x4f, 0x6e, 0x63, 0xfd, 0x00, 0xa1,
+0x27, 0x76, 0x65, 0x00, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+0x1e, 0x03, 0xe9, 0x73, 0x65, 0x2c, 0x00, 0x69, 0x74, 0x27,
+0x73, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x61, 0x9d, 0x04, 0x00,
+0x64, 0x02, 0xf2, 0x01, 0x6d, 0x6f, 0x72, 0x65, 0x2c, 0x00,
+0x6f, 0x66, 0x00, 0x63, 0x6f, 0x75, 0x72, 0x73, 0x65, 0x21,
+0xe1, 0x00, 0x15, 0x33, 0xe1, 0x00, 0xf1, 0x00, 0x75, 0x73,
+0x65, 0x72, 0x20, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
+0x6e, 0x63, 0x65, 0xe7, 0x00, 0xc2, 0x4f, 0x6e, 0x00, 0x70,
+0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x73, 0xa4, 0x03,
+0x80, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e,
+0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0xd9, 0x00, 0x16,
+0x50, 0x12, 0x00, 0x0d, 0xf5, 0x00, 0x34, 0x47, 0x61, 0x6d,
+0xf5, 0x00, 0x01, 0xe3, 0x01, 0x30, 0x6c, 0x65, 0x74, 0xc6,
+0x00, 0x00, 0x2a, 0x03, 0x53, 0x66, 0x69, 0x67, 0x75, 0x72,
+0xec, 0x02, 0x20, 0x65, 0x6e, 0x82, 0x03, 0x1b, 0x66, 0xcb,
+0x02, 0x34, 0x2e, 0x00, 0x57, 0x75, 0x03, 0x03, 0xed, 0x02,
+0xc4, 0x00, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x2c,
+0x00, 0x60, 0x4d, 0x29, 0x03, 0x00, 0xe4, 0x02, 0x1b, 0x27,
+0x06, 0x03, 0x01, 0x64, 0x00, 0x11, 0x70, 0x23, 0x02, 0x04,
+0xd7, 0x02, 0x1b, 0x73, 0xef, 0x02, 0x01, 0xda, 0x00, 0x00,
+0x27, 0x00, 0x44, 0x77, 0x61, 0x6e, 0x74, 0x2b, 0x03, 0x03,
+0x81, 0x03, 0x24, 0x2c, 0x00, 0x9f, 0x04, 0xf6, 0x01, 0x28,
+0x66, 0x6f, 0x72, 0x00, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+0x65, 0x29, 0x00, 0x69, 0x66, 0x32, 0x00, 0x08, 0xac, 0x03,
+0x01, 0x3c, 0x00, 0x00, 0x2c, 0x04, 0x04, 0xc4, 0x00, 0x32,
+0x67, 0x61, 0x70, 0xe9, 0x04, 0x56, 0x77, 0x61, 0x72, 0x64,
+0x73, 0x59, 0x05, 0x41, 0x67, 0x61, 0x70, 0x2c, 0xc6, 0x01,
+0x13, 0x64, 0x9e, 0x00, 0x10, 0x52, 0x25, 0x00, 0x07, 0xe8,
+0x00, 0x05, 0x62, 0x03, 0x0e, 0xe9, 0x00, 0x00, 0x3d, 0x00,
+0x23, 0x27, 0x2c, 0x9f, 0x06, 0x40, 0x68, 0x61, 0x76, 0x69,
+0x0a, 0x03, 0x0d, 0x34, 0x01, 0x00, 0xad, 0x05, 0x82, 0x72,
+0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x64, 0xdf, 0x05, 0x01,
+0xb2, 0x00, 0x34, 0x6f, 0x75, 0x6c, 0x73, 0x00, 0x3f, 0x4c,
+0x65, 0x66, 0xbe, 0x00, 0x10, 0x0a, 0xb3, 0x00, 0x08, 0xae,
+0x05, 0x00, 0x1e, 0x00, 0x40, 0x65, 0x6e, 0x64, 0x73, 0x0d,
+0x06, 0x34, 0x6f, 0x6e, 0x65, 0xc6, 0x06, 0x04, 0x41, 0x00,
+0xe0, 0x77, 0x68, 0x65, 0x72, 0x65, 0x00, 0x69, 0x74, 0x00,
+0x77, 0x61, 0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1245;
-const unsigned short help_text_words = 229;
+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 19ffb97dee..785cfce815 100644
--- a/apps/plugins/puzzles/help/filling.c
+++ b/apps/plugins/puzzles/help/filling.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,140 +6,141 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 141, TEXT_CENTER | C_RED },
- { 306, TEXT_CENTER | C_RED },
+ { 142, TEXT_CENTER | C_RED },
+ { 307, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 1804 comp 1242 ratio 0.68847 level 10 saved 562 */
+/* orig 1821 comp 1245 ratio 0.68369 level 10 saved 576 */
 const char help_text[] = {
-0xf0, 0x28, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x39, 0x3a, 0x20, 0x46, 0x69, 0x6c, 0x6c, 0x69, 0x6e,
-0x67, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68,
-0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
-0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
-0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x11, 0x00, 0xf6,
-0x13, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e,
-0x74, 0x61, 0x69, 0x6e, 0x00, 0x64, 0x69, 0x67, 0x69, 0x74,
-0x73, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x74, 0x68, 0x65,
-0x00, 0x72, 0x65, 0x73, 0x74, 0x26, 0x00, 0xa0, 0x61, 0x72,
-0x65, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x5b, 0x00,
-0xf5, 0x02, 0x72, 0x00, 0x6a, 0x6f, 0x62, 0x00, 0x69, 0x73,
-0x00, 0x74, 0x6f, 0x00, 0x66, 0x69, 0x6c, 0x6c, 0x00, 0x40,
-0x00, 0x00, 0x0a, 0x00, 0x23, 0x74, 0x68, 0x2c, 0x00, 0x06,
-0x73, 0x00, 0x50, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x47, 0x00,
-0xc2, 0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74,
-0x00, 0x65, 0x61, 0x7d, 0x00, 0xd7, 0x6e, 0x65, 0x63, 0x74,
-0x65, 0x64, 0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0xa8,
-0x00, 0x44, 0x00, 0x61, 0x6c, 0x6c, 0x9d, 0x00, 0x31, 0x69,
-0x6e, 0x67, 0x56, 0x00, 0x42, 0x73, 0x61, 0x6d, 0x65, 0x69,
-0x00, 0x70, 0x00, 0x68, 0x61, 0x73, 0x00, 0x61, 0x6e, 0x98,
-0x00, 0x70, 0x61, 0x00, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x8c,
-0x00, 0x01, 0x59, 0x00, 0x01, 0x20, 0x00, 0x7b, 0x2e, 0x00,
-0x00, 0x00, 0x28, 0x60, 0x43, 0x5f, 0x00, 0x61, 0x27, 0x2c,
-0x00, 0x66, 0x6f, 0x72, 0x4b, 0x00, 0x80, 0x70, 0x75, 0x72,
-0x70, 0x6f, 0x73, 0x65, 0x73, 0x72, 0x00, 0xf0, 0x09, 0x74,
-0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x2c, 0x00,
-0x64, 0x6f, 0x65, 0x73, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x63,
-0x6f, 0x75, 0x6e, 0x4c, 0x00, 0xf0, 0x00, 0x61, 0x67, 0x6f,
-0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x65, 0x70, 0x61,
-0x72, 0x61, 0x4c, 0x00, 0x05, 0xa1, 0x00, 0xf2, 0x17, 0x73,
-0x00, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x2e,
-0x29, 0x00, 0x00, 0x00, 0x46, 0x6f, 0x72, 0x00, 0x65, 0x78,
-0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2c, 0x00, 0x69, 0x74, 0x00,
-0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x96, 0x00, 0x23,
-0x6e, 0x6f, 0x38, 0x00, 0x45, 0x00, 0x63, 0x61, 0x6e, 0x75,
-0x01, 0x64, 0x61, 0x00, 0x7a, 0x65, 0x72, 0x6f, 0x75, 0x01,
-0x65, 0x61, 0x74, 0x00, 0x74, 0x77, 0x6f, 0x55, 0x00, 0x05,
-0x69, 0x00, 0x00, 0x32, 0x00, 0x00, 0x94, 0x00, 0x47, 0x62,
-0x6f, 0x74, 0x68, 0x3b, 0x00, 0x74, 0x6f, 0x6e, 0x65, 0x2e,
-0x00, 0x4e, 0x6f, 0x3b, 0x01, 0x08, 0x12, 0x01, 0x70, 0x67,
-0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x54, 0x00, 0xc0, 0x6e,
-0x00, 0x39, 0x00, 0x28, 0x62, 0x65, 0x63, 0x61, 0x75, 0x73,
-0x65, 0xfa, 0x00, 0x20, 0x6e, 0x00, 0xa7, 0x01, 0x01, 0x26,
-0x00, 0x52, 0x77, 0x6f, 0x75, 0x6c, 0x64, 0x5a, 0x00, 0x00,
-0x29, 0x02, 0x53, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x60, 0x01,
-0x10, 0x29, 0x41, 0x01, 0x41, 0x43, 0x72, 0x65, 0x64, 0xc8,
-0x00, 0x12, 0x72, 0x23, 0x01, 0xa1, 0x70, 0x75, 0x7a, 0x7a,
-0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0xfa, 0x01, 0xb0, 0x4e,
-0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x34, 0x5d,
-0x2e, 0x00, 0x03, 0x7e, 0x02, 0x41, 0x00, 0x77, 0x61, 0x73,
-0xa5, 0x00, 0x40, 0x72, 0x69, 0x62, 0x75, 0x2f, 0x01, 0x01,
-0x98, 0x01, 0x10, 0x69, 0x14, 0x00, 0x50, 0x6c, 0x6c, 0x65,
-0x63, 0x74, 0xab, 0x00, 0xf0, 0x01, 0x62, 0x79, 0x00, 0x4a,
-0x6f, 0x6e, 0x61, 0x73, 0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b,
-0x65, 0x72, 0x3f, 0x00, 0x00, 0x47, 0x00, 0xd1, 0x00, 0x68,
-0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e,
-0x6e, 0x5e, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70,
-0x2f, 0x65, 0x6e, 0x2f, 0x7d, 0x00, 0x20, 0x73, 0x2f, 0x70,
-0x02, 0xf5, 0x02, 0x6f, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x68,
-0x74, 0x6d, 0x6c, 0x00, 0x00, 0x00, 0x32, 0x39, 0x2e, 0x31,
-0xfb, 0x02, 0x01, 0x79, 0x00, 0x30, 0x6f, 0x6c, 0x73, 0x04,
-0x03, 0x74, 0x54, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x99,
-0x00, 0xe1, 0x2c, 0x00, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x79,
-0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x05, 0x02, 0x20, 0x6d,
-0x6f, 0x15, 0x01, 0x00, 0x4d, 0x01, 0x29, 0x6e, 0x79, 0xb3,
-0x02, 0x04, 0x06, 0x03, 0x50, 0x6e, 0x00, 0x74, 0x79, 0x70,
-0x1c, 0x01, 0x02, 0x75, 0x02, 0x12, 0x6f, 0xdd, 0x02, 0x85,
-0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0xff, 0x02,
-0x01, 0xbb, 0x01, 0x02, 0x3a, 0x00, 0xa4, 0x2e, 0x00, 0x42,
-0x79, 0x00, 0x64, 0x72, 0x61, 0x67, 0x67, 0xb5, 0x02, 0x01,
-0x65, 0x00, 0x51, 0x2c, 0x00, 0x79, 0x6f, 0x75, 0xc9, 0x01,
-0x20, 0x73, 0x65, 0x06, 0x01, 0x95, 0x00, 0x6d, 0x75, 0x6c,
-0x74, 0x69, 0x70, 0x6c, 0x65, 0xe5, 0x01, 0x04, 0x4c, 0x00,
-0x46, 0x77, 0x69, 0x74, 0x68, 0x8d, 0x01, 0xc1, 0x6b, 0x65,
-0x79, 0x70, 0x72, 0x65, 0x73, 0x73, 0x2e, 0x00, 0x49, 0x66,
-0x43, 0x00, 0x30, 0x6d, 0x61, 0x6b, 0x90, 0x00, 0x8e, 0x6d,
-0x69, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x2c, 0xcd, 0x00, 0x02,
-0xa3, 0x00, 0x60, 0x69, 0x6e, 0x63, 0x6f, 0x72, 0x72, 0x69,
-0x00, 0x07, 0xd1, 0x00, 0x01, 0x4a, 0x00, 0xf0, 0x01, 0x00,
-0x30, 0x2c, 0x00, 0x53, 0x70, 0x61, 0x63, 0x65, 0x2c, 0x00,
-0x42, 0x61, 0x63, 0x6b, 0x73, 0x0b, 0x00, 0x61, 0x00, 0x6f,
-0x72, 0x00, 0x45, 0x6e, 0x31, 0x02, 0x70, 0x6f, 0x00, 0x63,
-0x6c, 0x65, 0x61, 0x72, 0xc0, 0x02, 0x20, 0x61, 0x67, 0x68,
-0x02, 0x43, 0x28, 0x6f, 0x72, 0x00, 0x3b, 0x02, 0xd1, 0x00,
-0x55, 0x6e, 0x64, 0x6f, 0x00, 0x66, 0x65, 0x61, 0x74, 0x75,
-0x72, 0x65, 0x22, 0x02, 0x13, 0x59, 0xd5, 0x00, 0x70, 0x61,
-0x6c, 0x73, 0x6f, 0x00, 0x6d, 0x6f, 0x70, 0x04, 0x33, 0x72,
-0x6f, 0x75, 0x42, 0x04, 0x01, 0x79, 0x04, 0x01, 0xcf, 0x00,
-0x00, 0x0e, 0x00, 0x60, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0xd1, 0x00, 0x20, 0x73, 0x3b, 0x56, 0x01, 0x00, 0x1f, 0x01,
-0x04, 0x58, 0x01, 0x10, 0x77, 0xf9, 0x00, 0x03, 0x4a, 0x01,
-0x04, 0x12, 0x01, 0x0c, 0xfc, 0x03, 0x03, 0x40, 0x00, 0x03,
-0x50, 0x00, 0x00, 0x52, 0x03, 0x55, 0x75, 0x6d, 0x62, 0x65,
-0x72, 0x4c, 0x00, 0x12, 0x30, 0x46, 0x00, 0x04, 0xbe, 0x00,
-0x1a, 0x2e, 0x9c, 0x00, 0x0f, 0x76, 0x01, 0x05, 0x00, 0xdc,
-0x02, 0x02, 0x49, 0x00, 0x00, 0x44, 0x00, 0x22, 0x6f, 0x72,
-0x40, 0x00, 0x01, 0xc7, 0x02, 0x04, 0xb9, 0x00, 0x61, 0x72,
-0x65, 0x74, 0x75, 0x72, 0x6e, 0x41, 0x01, 0x51, 0x61, 0x72,
-0x72, 0x6f, 0x77, 0xc3, 0x00, 0x8c, 0x2c, 0x00, 0x62, 0x65,
-0x66, 0x6f, 0x72, 0x65, 0xca, 0x00, 0x04, 0xc6, 0x01, 0x04,
-0x4a, 0x00, 0x01, 0x42, 0x00, 0x88, 0x68, 0x69, 0x67, 0x68,
-0x6c, 0x69, 0x67, 0x68, 0x3d, 0x04, 0x10, 0x28, 0xae, 0x03,
-0x30, 0x62, 0x6f, 0x76, 0x48, 0x01, 0x10, 0x54, 0xf5, 0x00,
-0x01, 0x88, 0x01, 0x70, 0x62, 0x61, 0x72, 0x00, 0x61, 0x64,
-0x64, 0xc9, 0x03, 0x00, 0xb4, 0x04, 0x00, 0x52, 0x01, 0x14,
-0x73, 0x0b, 0x02, 0x07, 0x29, 0x02, 0x00, 0x1e, 0x00, 0x42,
-0x66, 0x72, 0x6f, 0x6d, 0x2f, 0x01, 0x13, 0x65, 0x57, 0x03,
-0x17, 0x2e, 0xd1, 0x01, 0x00, 0x22, 0x00, 0x63, 0x65, 0x73,
-0x63, 0x61, 0x70, 0x65, 0x47, 0x00, 0x01, 0x4f, 0x05, 0x05,
-0xf6, 0x00, 0x0e, 0x3c, 0x00, 0x00, 0x30, 0x05, 0x13, 0x41,
-0x81, 0x01, 0x11, 0x61, 0x13, 0x00, 0xb1, 0x73, 0x00, 0x64,
-0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0xc0, 0x05,
-0x03, 0xbc, 0x03, 0x31, 0x32, 0x2e, 0x31, 0x0e, 0x06, 0x01,
-0x57, 0x01, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
-0x6c, 0x65, 0x2e, 0x29, 0x8a, 0x03, 0x15, 0x32, 0x8a, 0x03,
-0x00, 0x2e, 0x05, 0x77, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
-0x20, 0x1d, 0x04, 0x12, 0x61, 0x13, 0x05, 0x00, 0xca, 0x02,
-0x20, 0x74, 0x6f, 0xe3, 0x01, 0x52, 0x66, 0x69, 0x67, 0x75,
-0x72, 0x5e, 0x02, 0x02, 0x88, 0x01, 0x00, 0x91, 0x05, 0x32,
-0x72, 0x6f, 0x77, 0x03, 0x01, 0x63, 0x63, 0x6f, 0x6c, 0x75,
-0x6d, 0x6e, 0xa5, 0x05, 0x02, 0x52, 0x02, 0x82, 0x2c, 0x00,
-0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x9d, 0x01, 0xd0, 0x60,
-0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
-0x2e, 0x00,
+0x67, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x14, 0x00, 0x00,
+0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
+0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00,
+0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73,
+0x6f, 0x6d, 0x65, 0x11, 0x00, 0xf6, 0x13, 0x77, 0x68, 0x69,
+0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
+0x00, 0x64, 0x69, 0x67, 0x69, 0x74, 0x73, 0x2c, 0x00, 0x61,
+0x6e, 0x64, 0x00, 0x74, 0x68, 0x65, 0x00, 0x72, 0x65, 0x73,
+0x74, 0x26, 0x00, 0xa0, 0x61, 0x72, 0x65, 0x00, 0x65, 0x6d,
+0x70, 0x74, 0x79, 0x2e, 0x5b, 0x00, 0xf5, 0x02, 0x72, 0x00,
+0x6a, 0x6f, 0x62, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00,
+0x66, 0x69, 0x6c, 0x6c, 0x00, 0x40, 0x00, 0x00, 0x0a, 0x00,
+0x23, 0x74, 0x68, 0x2c, 0x00, 0x06, 0x73, 0x00, 0x50, 0x69,
+0x6e, 0x00, 0x73, 0x75, 0x47, 0x00, 0xc2, 0x00, 0x77, 0x61,
+0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x65, 0x61, 0x7d,
+0x00, 0xd7, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x00, 0x72,
+0x65, 0x67, 0x69, 0x6f, 0x6e, 0xa8, 0x00, 0x44, 0x00, 0x61,
+0x6c, 0x6c, 0x9d, 0x00, 0x31, 0x69, 0x6e, 0x67, 0x56, 0x00,
+0x42, 0x73, 0x61, 0x6d, 0x65, 0x69, 0x00, 0x70, 0x00, 0x68,
+0x61, 0x73, 0x00, 0x61, 0x6e, 0x98, 0x00, 0x70, 0x61, 0x00,
+0x65, 0x71, 0x75, 0x61, 0x6c, 0x8c, 0x00, 0x01, 0x59, 0x00,
+0x01, 0x20, 0x00, 0x7b, 0x2e, 0x00, 0x00, 0x00, 0x28, 0x60,
+0x43, 0x5f, 0x00, 0x61, 0x27, 0x2c, 0x00, 0x66, 0x6f, 0x72,
+0x4b, 0x00, 0x80, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65,
+0x73, 0x72, 0x00, 0xf0, 0x09, 0x74, 0x68, 0x69, 0x73, 0x00,
+0x67, 0x61, 0x6d, 0x65, 0x2c, 0x00, 0x64, 0x6f, 0x65, 0x73,
+0x00, 0x6e, 0x6f, 0x74, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x4c,
+0x00, 0xf0, 0x00, 0x61, 0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x6c,
+0x79, 0x00, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x4c, 0x00,
+0x05, 0xa1, 0x00, 0xf2, 0x17, 0x73, 0x00, 0x61, 0x64, 0x6a,
+0x61, 0x63, 0x65, 0x6e, 0x74, 0x2e, 0x29, 0x00, 0x00, 0x00,
+0x46, 0x6f, 0x72, 0x00, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+0x65, 0x2c, 0x00, 0x69, 0x74, 0x00, 0x66, 0x6f, 0x6c, 0x6c,
+0x6f, 0x77, 0x73, 0x96, 0x00, 0x23, 0x6e, 0x6f, 0x38, 0x00,
+0x45, 0x00, 0x63, 0x61, 0x6e, 0x75, 0x01, 0x64, 0x61, 0x00,
+0x7a, 0x65, 0x72, 0x6f, 0x75, 0x01, 0x65, 0x61, 0x74, 0x00,
+0x74, 0x77, 0x6f, 0x55, 0x00, 0x05, 0x69, 0x00, 0x00, 0x32,
+0x00, 0x00, 0x94, 0x00, 0x47, 0x62, 0x6f, 0x74, 0x68, 0x3b,
+0x00, 0x74, 0x6f, 0x6e, 0x65, 0x2e, 0x00, 0x4e, 0x6f, 0x3b,
+0x01, 0x08, 0x12, 0x01, 0x70, 0x67, 0x72, 0x65, 0x61, 0x74,
+0x65, 0x72, 0x54, 0x00, 0xc0, 0x6e, 0x00, 0x39, 0x00, 0x28,
+0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0xfa, 0x00, 0x20,
+0x6e, 0x00, 0xa7, 0x01, 0x01, 0x26, 0x00, 0x52, 0x77, 0x6f,
+0x75, 0x6c, 0x64, 0x5a, 0x00, 0x00, 0x29, 0x02, 0x53, 0x73,
+0x69, 0x6e, 0x67, 0x6c, 0x60, 0x01, 0x10, 0x29, 0x41, 0x01,
+0x41, 0x43, 0x72, 0x65, 0x64, 0xc8, 0x00, 0x12, 0x72, 0x23,
+0x01, 0xa1, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67,
+0x6f, 0x65, 0xfa, 0x01, 0xb0, 0x4e, 0x69, 0x6b, 0x6f, 0x6c,
+0x69, 0x00, 0x5b, 0x31, 0x34, 0x5d, 0x2e, 0x00, 0x03, 0x92,
+0x02, 0x41, 0x00, 0x77, 0x61, 0x73, 0xa5, 0x00, 0x40, 0x72,
+0x69, 0x62, 0x75, 0x2f, 0x01, 0x01, 0x98, 0x01, 0x10, 0x69,
+0x14, 0x00, 0x50, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0xab, 0x00,
+0xf0, 0x01, 0x62, 0x79, 0x00, 0x4a, 0x6f, 0x6e, 0x61, 0x73,
+0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b, 0x65, 0x72, 0x3f, 0x00,
+0x00, 0x47, 0x00, 0xe1, 0x00, 0x68, 0x74, 0x74, 0x70, 0x73,
+0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x5f, 0x00,
+0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e,
+0x2f, 0x7e, 0x00, 0x20, 0x73, 0x2f, 0x71, 0x02, 0xd5, 0x6f,
+0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x00, 0x00, 0x00, 0x32, 0x39,
+0x2e, 0x31, 0x0c, 0x03, 0x01, 0x76, 0x00, 0xe4, 0x6f, 0x6c,
+0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x00, 0x70, 0x6c,
+0x61, 0x79, 0x96, 0x00, 0xe1, 0x2c, 0x00, 0x73, 0x69, 0x6d,
+0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x02,
+0x02, 0x20, 0x6d, 0x6f, 0x12, 0x01, 0x00, 0x4a, 0x01, 0x29,
+0x6e, 0x79, 0xb0, 0x02, 0x04, 0x03, 0x03, 0x50, 0x6e, 0x00,
+0x74, 0x79, 0x70, 0x19, 0x01, 0x02, 0x72, 0x02, 0x12, 0x6f,
+0xda, 0x02, 0x85, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72,
+0x64, 0xfc, 0x02, 0x01, 0xb8, 0x01, 0x02, 0x3a, 0x00, 0xa4,
+0x2e, 0x00, 0x42, 0x79, 0x00, 0x64, 0x72, 0x61, 0x67, 0x67,
+0xb2, 0x02, 0x01, 0x65, 0x00, 0x51, 0x2c, 0x00, 0x79, 0x6f,
+0x75, 0xc6, 0x01, 0x20, 0x73, 0x65, 0x03, 0x01, 0x95, 0x00,
+0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0xe2, 0x01,
+0x04, 0x4c, 0x00, 0x46, 0x77, 0x69, 0x74, 0x68, 0x8a, 0x01,
+0xc1, 0x6b, 0x65, 0x79, 0x70, 0x72, 0x65, 0x73, 0x73, 0x2e,
+0x00, 0x49, 0x66, 0x43, 0x00, 0x30, 0x6d, 0x61, 0x6b, 0x90,
+0x00, 0x8e, 0x6d, 0x69, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x2c,
+0xcd, 0x00, 0x02, 0xa3, 0x00, 0x60, 0x69, 0x6e, 0x63, 0x6f,
+0x72, 0x72, 0x69, 0x00, 0x07, 0xd1, 0x00, 0x01, 0x4a, 0x00,
+0xf0, 0x01, 0x00, 0x30, 0x2c, 0x00, 0x53, 0x70, 0x61, 0x63,
+0x65, 0x2c, 0x00, 0x42, 0x61, 0x63, 0x6b, 0x73, 0x0b, 0x00,
+0x61, 0x00, 0x6f, 0x72, 0x00, 0x45, 0x6e, 0x2e, 0x02, 0x70,
+0x6f, 0x00, 0x63, 0x6c, 0x65, 0x61, 0x72, 0xbd, 0x02, 0x20,
+0x61, 0x67, 0x65, 0x02, 0x43, 0x28, 0x6f, 0x72, 0x00, 0x38,
+0x02, 0xd1, 0x00, 0x55, 0x6e, 0x64, 0x6f, 0x00, 0x66, 0x65,
+0x61, 0x74, 0x75, 0x72, 0x65, 0x1f, 0x02, 0x13, 0x59, 0xd5,
+0x00, 0x70, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x6d, 0x6f, 0x6d,
+0x04, 0x33, 0x72, 0x6f, 0x75, 0x3f, 0x04, 0x01, 0x76, 0x04,
+0x01, 0xcf, 0x00, 0x00, 0x0e, 0x00, 0x60, 0x63, 0x75, 0x72,
+0x73, 0x6f, 0x72, 0xd1, 0x00, 0x20, 0x73, 0x3b, 0x56, 0x01,
+0x00, 0x1f, 0x01, 0x04, 0x58, 0x01, 0x10, 0x77, 0xf9, 0x00,
+0x03, 0x4a, 0x01, 0x04, 0x12, 0x01, 0x0c, 0xf9, 0x03, 0x03,
+0x40, 0x00, 0x03, 0x50, 0x00, 0x00, 0x4f, 0x03, 0x55, 0x75,
+0x6d, 0x62, 0x65, 0x72, 0x4c, 0x00, 0x12, 0x30, 0x46, 0x00,
+0x04, 0xbe, 0x00, 0x1a, 0x2e, 0x9c, 0x00, 0x0f, 0x76, 0x01,
+0x05, 0x00, 0xd9, 0x02, 0x02, 0x49, 0x00, 0x00, 0x44, 0x00,
+0x22, 0x6f, 0x72, 0x40, 0x00, 0x01, 0xc4, 0x02, 0x04, 0xb9,
+0x00, 0x61, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x41, 0x01,
+0x51, 0x61, 0x72, 0x72, 0x6f, 0x77, 0xc3, 0x00, 0x8c, 0x2c,
+0x00, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x65, 0xca, 0x00, 0x04,
+0xc6, 0x01, 0x04, 0x4a, 0x00, 0x01, 0x42, 0x00, 0x88, 0x68,
+0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x3a, 0x04, 0x10,
+0x28, 0xab, 0x03, 0x30, 0x62, 0x6f, 0x76, 0x48, 0x01, 0x10,
+0x54, 0xf5, 0x00, 0x01, 0x88, 0x01, 0x70, 0x62, 0x61, 0x72,
+0x00, 0x61, 0x64, 0x64, 0xc6, 0x03, 0x00, 0xb1, 0x04, 0x00,
+0x52, 0x01, 0x14, 0x73, 0x0b, 0x02, 0x07, 0x29, 0x02, 0x00,
+0x1e, 0x00, 0x42, 0x66, 0x72, 0x6f, 0x6d, 0x2f, 0x01, 0x13,
+0x65, 0x54, 0x03, 0x17, 0x2e, 0xd1, 0x01, 0x00, 0x22, 0x00,
+0x63, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x47, 0x00, 0x01,
+0x4c, 0x05, 0x05, 0xf6, 0x00, 0x0e, 0x3c, 0x00, 0x00, 0x2d,
+0x05, 0x13, 0x41, 0x81, 0x01, 0x11, 0x61, 0x13, 0x00, 0xb1,
+0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+0x64, 0xbd, 0x05, 0x03, 0xb9, 0x03, 0x31, 0x32, 0x2e, 0x31,
+0x0b, 0x06, 0x01, 0x57, 0x01, 0xb2, 0x61, 0x76, 0x61, 0x69,
+0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x8a, 0x03, 0x15,
+0x32, 0x8a, 0x03, 0x00, 0x2b, 0x05, 0x77, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0x73, 0x20, 0x1a, 0x04, 0x12, 0x61, 0x10, 0x05,
+0x00, 0xca, 0x02, 0x20, 0x74, 0x6f, 0xe3, 0x01, 0x52, 0x66,
+0x69, 0x67, 0x75, 0x72, 0x5e, 0x02, 0x02, 0x88, 0x01, 0x00,
+0x8e, 0x05, 0x32, 0x72, 0x6f, 0x77, 0x03, 0x01, 0x63, 0x63,
+0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0xa2, 0x05, 0x02, 0x52, 0x02,
+0x82, 0x2c, 0x00, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x9d,
+0x01, 0xd0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
+0x65, 0x6e, 0x75, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1804;
-const unsigned short help_text_words = 327;
+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 e5ec994fdb..4f847069cc 100644
--- a/apps/plugins/puzzles/help/flip.c
+++ b/apps/plugins/puzzles/help/flip.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,129 +6,130 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 76, TEXT_CENTER | C_RED },
- { 164, TEXT_UNDERLINE },
- { 203, TEXT_CENTER | C_RED },
- { 220, TEXT_UNDERLINE },
+ { 77, TEXT_CENTER | C_RED },
+ { 165, TEXT_UNDERLINE },
+ { 204, TEXT_CENTER | C_RED },
  { 221, TEXT_UNDERLINE },
- { 231, TEXT_UNDERLINE },
+ { 222, TEXT_UNDERLINE },
+ { 232, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 1522 comp 1092 ratio 0.717477 level 10 saved 430 */
+/* orig 1539 comp 1099 ratio 0.7141 level 10 saved 440 */
 const char help_text[] = {
-0xf2, 0x2f, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfb, 0x04, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x34, 0x3a, 0x20, 0x46, 0x6c, 0x69, 0x70, 0x20, 0x00,
-0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65,
-0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66,
-0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00,
-0x73, 0x6f, 0x6d, 0x65, 0x00, 0x6c, 0x69, 0x67, 0x68, 0x74,
-0x00, 0x61, 0x6e, 0x64, 0x0f, 0x00, 0x50, 0x64, 0x61, 0x72,
-0x6b, 0x2e, 0x36, 0x00, 0xb4, 0x72, 0x00, 0x61, 0x69, 0x6d,
-0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x24, 0x00, 0x64, 0x6c,
-0x6c, 0x00, 0x74, 0x68, 0x65, 0x40, 0x00, 0x62, 0x00, 0x75,
-0x70, 0x00, 0x61, 0x74, 0x12, 0x00, 0x91, 0x61, 0x6d, 0x65,
-0x00, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x70, 0x00, 0xe3, 0x63,
-0x61, 0x6e, 0x00, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x00,
-0x61, 0x6e, 0x79, 0x30, 0x00, 0x01, 0x63, 0x00, 0xf3, 0x04,
-0x66, 0x6c, 0x69, 0x70, 0x00, 0x69, 0x74, 0x73, 0x00, 0x73,
-0x74, 0x61, 0x74, 0x65, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x5d,
-0x00, 0x21, 0x74, 0x6f, 0x7b, 0x00, 0x32, 0x00, 0x6f, 0x72,
-0x08, 0x00, 0x04, 0x76, 0x00, 0xf5, 0x0c, 0x2c, 0x00, 0x62,
-0x75, 0x74, 0x00, 0x77, 0x68, 0x65, 0x6e, 0x00, 0x79, 0x6f,
-0x75, 0x00, 0x64, 0x6f, 0x00, 0x73, 0x6f, 0x2c, 0x00, 0x6f,
-0x74, 0x68, 0x65, 0x72, 0x89, 0x00, 0xf3, 0x01, 0x61, 0x72,
-0x6f, 0x75, 0x6e, 0x64, 0x00, 0x69, 0x74, 0x00, 0x63, 0x68,
-0x61, 0x6e, 0x67, 0x65, 0x5e, 0x00, 0xf4, 0x00, 0x61, 0x73,
-0x00, 0x77, 0x65, 0x6c, 0x6c, 0x2e, 0x00, 0x00, 0x00, 0x45,
-0x61, 0x63, 0x68, 0x88, 0x00, 0xd0, 0x63, 0x6f, 0x6e, 0x74,
-0x61, 0x69, 0x6e, 0x73, 0x00, 0x61, 0x00, 0x73, 0x6d, 0xd4,
-0x00, 0xfb, 0x06, 0x64, 0x69, 0x61, 0x67, 0x72, 0x61, 0x6d,
-0x00, 0x73, 0x68, 0x6f, 0x77, 0x69, 0x6e, 0x67, 0x00, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x63, 0x00, 0x03, 0x59, 0x00, 0x05,
-0x88, 0x00, 0x03, 0xc9, 0x00, 0x00, 0x5c, 0x00, 0x42, 0x31,
-0x34, 0x2e, 0x31, 0x6f, 0x01, 0x00, 0x5a, 0x00, 0x40, 0x72,
-0x6f, 0x6c, 0x73, 0x78, 0x01, 0x60, 0x54, 0x68, 0x69, 0x73,
-0x00, 0x67, 0x18, 0x01, 0x00, 0x0e, 0x01, 0xf1, 0x02, 0x62,
-0x65, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x00, 0x77,
-0x69, 0x74, 0x68, 0x00, 0x65, 0x69, 0x5d, 0x00, 0x00, 0x3b,
-0x01, 0xa2, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64,
-0x00, 0x6f, 0x10, 0x00, 0x50, 0x6d, 0x6f, 0x75, 0x73, 0x65,
-0x57, 0x00, 0xf4, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63,
-0x6c, 0x69, 0x63, 0x6b, 0x00, 0x69, 0x6e, 0x00, 0x61, 0xbe,
-0x00, 0x24, 0x74, 0x6f, 0x7c, 0x00, 0x01, 0x51, 0x01, 0x00,
-0x4c, 0x01, 0xa6, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61,
-0x74, 0x65, 0x64, 0xdb, 0x01, 0x61, 0x6f, 0x72, 0x00, 0x75,
-0x73, 0x65, 0x52, 0x00, 0x60, 0x63, 0x75, 0x72, 0x73, 0x6f,
-0x72, 0x69, 0x00, 0x01, 0xcc, 0x01, 0x04, 0x99, 0x01, 0x08,
-0x97, 0x01, 0x01, 0xc4, 0x01, 0x80, 0x70, 0x61, 0x63, 0x65,
-0x00, 0x62, 0x61, 0x72, 0x3c, 0x00, 0x41, 0x45, 0x6e, 0x74,
-0x65, 0x33, 0x00, 0x04, 0x70, 0x00, 0x00, 0x92, 0x00, 0x21,
-0x49, 0x66, 0xfb, 0x00, 0x04, 0x58, 0x00, 0xf4, 0x06, 0x60,
-0x53, 0x6f, 0x6c, 0x76, 0x65, 0x27, 0x00, 0x66, 0x75, 0x6e,
-0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x6f, 0x6e, 0x00, 0x74,
-0xf6, 0x00, 0x10, 0x2c, 0xa1, 0x00, 0x60, 0x77, 0x69, 0x6c,
-0x6c, 0x00, 0x6d, 0xce, 0x01, 0x01, 0x5b, 0x02, 0x29, 0x6f,
-0x66, 0x3f, 0x02, 0x74, 0x69, 0x6e, 0x00, 0x72, 0x65, 0x64,
-0x2e, 0x57, 0x00, 0x02, 0xeb, 0x00, 0x40, 0x6f, 0x6e, 0x63,
-0x65, 0x1a, 0x00, 0x45, 0x65, 0x76, 0x65, 0x72, 0x3a, 0x02,
-0x01, 0x34, 0x01, 0x10, 0x61, 0x2e, 0x00, 0x01, 0x4e, 0x00,
-0x11, 0x2c, 0x47, 0x00, 0x01, 0x5c, 0x01, 0x60, 0x73, 0x68,
-0x6f, 0x75, 0x6c, 0x64, 0x5f, 0x01, 0x10, 0x73, 0x8d, 0x00,
-0x49, 0x64, 0x2e, 0x00, 0x28, 0x4f, 0x00, 0x08, 0x3a, 0x01,
-0x00, 0x46, 0x00, 0x39, 0x6f, 0x75, 0x74, 0x49, 0x00, 0x06,
-0x0c, 0x00, 0x02, 0xad, 0x00, 0x60, 0x61, 0x70, 0x70, 0x65,
-0x61, 0x72, 0x37, 0x00, 0x11, 0x69, 0x93, 0x02, 0x70, 0x69,
-0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0xf1, 0x00, 0x21, 0x61,
-0x74, 0x58, 0x00, 0x01, 0x27, 0x00, 0x40, 0x6e, 0x65, 0x65,
-0x64, 0x1f, 0x00, 0x10, 0x72, 0xa7, 0x00, 0x13, 0x73, 0x1e,
-0x00, 0x51, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x09, 0x01, 0x01,
-0x1a, 0x00, 0x00, 0x72, 0x02, 0x21, 0x74, 0x68, 0x99, 0x00,
-0x10, 0x75, 0x16, 0x00, 0x73, 0x2e, 0x29, 0x00, 0x00, 0x00,
-0x28, 0x41, 0x44, 0x03, 0x11, 0x61, 0x33, 0x01, 0xb0, 0x73,
-0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64,
-0x74, 0x00, 0x22, 0x73, 0x65, 0x49, 0x01, 0x41, 0x32, 0x2e,
-0x31, 0x00, 0x9b, 0x01, 0xf2, 0x00, 0x6c, 0x73, 0x6f, 0x00,
-0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-0x29, 0x6d, 0x02, 0x12, 0x32, 0x6d, 0x02, 0x93, 0x70, 0x61,
-0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x6f, 0x02, 0x46,
-0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x40, 0x00, 0x04,
-0x3b, 0x00, 0x02, 0x69, 0x03, 0x01, 0xb5, 0x01, 0xd6, 0x43,
-0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00,
-0x6f, 0x70, 0xb7, 0x01, 0xd0, 0x65, 0x00, 0x60, 0x54, 0x79,
-0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xed, 0x01,
-0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65,
-0x9e, 0x03, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xc2, 0x01,
-0x01, 0x45, 0x04, 0x24, 0x69, 0x6e, 0xc6, 0x01, 0x10, 0x2e,
-0x1b, 0x00, 0x94, 0x68, 0x61, 0x70, 0x65, 0x20, 0x74, 0x79,
-0x70, 0x65, 0xf8, 0x02, 0x03, 0x09, 0x03, 0x20, 0x00, 0x64,
-0x8c, 0x00, 0x52, 0x6d, 0x69, 0x6e, 0x65, 0x73, 0x0b, 0x01,
-0x00, 0x29, 0x00, 0x04, 0x07, 0x02, 0x30, 0x72, 0x65, 0x67,
-0x7e, 0x00, 0x02, 0x6d, 0x03, 0x21, 0x69, 0x73, 0x66, 0x02,
-0x62, 0x70, 0x65, 0x64, 0x00, 0x62, 0x79, 0xbc, 0x01, 0x00,
-0x8a, 0x03, 0x21, 0x69, 0x6e, 0x41, 0x04, 0x44, 0x67, 0x69,
-0x76, 0x65, 0x72, 0x00, 0x10, 0x2e, 0xeb, 0x00, 0xfa, 0x14,
-0x00, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x73,
-0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x2c, 0x00, 0x60, 0x43,
-0x72, 0x6f, 0x73, 0x73, 0x65, 0x73, 0x27, 0x2c, 0x00, 0x63,
-0x61, 0x75, 0x73, 0x65, 0x73, 0x42, 0x02, 0x06, 0x36, 0x03,
-0x45, 0x73, 0x65, 0x6c, 0x66, 0x3a, 0x03, 0x10, 0x66, 0xe7,
-0x04, 0x60, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0xe5, 0x01,
-0x10, 0x6e, 0xed, 0x00, 0x71, 0x62, 0x6f, 0x75, 0x72, 0x73,
-0x00, 0x28, 0x8f, 0x03, 0x31, 0x72, 0x65, 0x65, 0x98, 0x03,
-0xc0, 0x77, 0x6f, 0x00, 0x69, 0x66, 0x00, 0x69, 0x74, 0x27,
-0x73, 0x00, 0x61, 0x78, 0x03, 0x41, 0x00, 0x65, 0x64, 0x67,
-0x1a, 0x00, 0x72, 0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72, 0x29,
-0x95, 0x00, 0x03, 0x32, 0x04, 0x05, 0x93, 0x00, 0x66, 0x52,
-0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x92, 0x00, 0x31, 0x61, 0x00,
-0x72, 0x12, 0x00, 0x03, 0x08, 0x01, 0x20, 0x74, 0x6f, 0xb8,
-0x02, 0xa9, 0x63, 0x68, 0x6f, 0x73, 0x65, 0x6e, 0x00, 0x66,
-0x6f, 0x72, 0xb2, 0x00, 0x00, 0x9d, 0x05, 0x06, 0xe7, 0x02,
-0xc3, 0x69, 0x73, 0x00, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72,
-0x65, 0x6e, 0x74, 0x27, 0x00, 0x60, 0x74, 0x69, 0x6d, 0x65,
-0x2e, 0x00,
+0x2d, 0x01, 0x00, 0xf2, 0x1e, 0x00, 0x00, 0x00, 0x59, 0x6f,
+0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67,
+0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75,
+0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65,
+0x00, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x00, 0x61, 0x6e, 0x64,
+0x0f, 0x00, 0x50, 0x64, 0x61, 0x72, 0x6b, 0x2e, 0x36, 0x00,
+0xb4, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00,
+0x74, 0x6f, 0x24, 0x00, 0x64, 0x6c, 0x6c, 0x00, 0x74, 0x68,
+0x65, 0x40, 0x00, 0x62, 0x00, 0x75, 0x70, 0x00, 0x61, 0x74,
+0x12, 0x00, 0x91, 0x61, 0x6d, 0x65, 0x00, 0x74, 0x69, 0x6d,
+0x65, 0x2e, 0x70, 0x00, 0xe3, 0x63, 0x61, 0x6e, 0x00, 0x63,
+0x68, 0x6f, 0x6f, 0x73, 0x65, 0x00, 0x61, 0x6e, 0x79, 0x30,
+0x00, 0x01, 0x63, 0x00, 0xf3, 0x04, 0x66, 0x6c, 0x69, 0x70,
+0x00, 0x69, 0x74, 0x73, 0x00, 0x73, 0x74, 0x61, 0x74, 0x65,
+0x00, 0x66, 0x72, 0x6f, 0x6d, 0x5d, 0x00, 0x21, 0x74, 0x6f,
+0x7b, 0x00, 0x32, 0x00, 0x6f, 0x72, 0x08, 0x00, 0x04, 0x76,
+0x00, 0xf5, 0x0c, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x77,
+0x68, 0x65, 0x6e, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x64, 0x6f,
+0x00, 0x73, 0x6f, 0x2c, 0x00, 0x6f, 0x74, 0x68, 0x65, 0x72,
+0x89, 0x00, 0xf3, 0x01, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+0x00, 0x69, 0x74, 0x00, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65,
+0x5e, 0x00, 0xf4, 0x00, 0x61, 0x73, 0x00, 0x77, 0x65, 0x6c,
+0x6c, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x61, 0x63, 0x68, 0x88,
+0x00, 0xd0, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
+0x00, 0x61, 0x00, 0x73, 0x6d, 0xd4, 0x00, 0xfb, 0x06, 0x64,
+0x69, 0x61, 0x67, 0x72, 0x61, 0x6d, 0x00, 0x73, 0x68, 0x6f,
+0x77, 0x69, 0x6e, 0x67, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68,
+0x63, 0x00, 0x03, 0x59, 0x00, 0x05, 0x88, 0x00, 0x03, 0xc9,
+0x00, 0x00, 0x5c, 0x00, 0x42, 0x31, 0x34, 0x2e, 0x31, 0x80,
+0x01, 0x00, 0x5a, 0x00, 0xe0, 0x72, 0x6f, 0x6c, 0x73, 0x20,
+0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x67, 0x18,
+0x01, 0x00, 0x0e, 0x01, 0xf1, 0x02, 0x62, 0x65, 0x00, 0x70,
+0x6c, 0x61, 0x79, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74, 0x68,
+0x00, 0x65, 0x69, 0x5d, 0x00, 0x00, 0x3b, 0x01, 0xa2, 0x6b,
+0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x6f, 0x10,
+0x00, 0x50, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x57, 0x00, 0xf4,
+0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0x00, 0x69, 0x6e, 0x00, 0x61, 0xbe, 0x00, 0x24, 0x74,
+0x6f, 0x7c, 0x00, 0x01, 0x51, 0x01, 0x00, 0x4c, 0x01, 0xa6,
+0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x65, 0x64,
+0xdb, 0x01, 0x61, 0x6f, 0x72, 0x00, 0x75, 0x73, 0x65, 0x52,
+0x00, 0x60, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x69, 0x00,
+0x01, 0xcc, 0x01, 0x04, 0x99, 0x01, 0x08, 0x97, 0x01, 0x01,
+0xc4, 0x01, 0x80, 0x70, 0x61, 0x63, 0x65, 0x00, 0x62, 0x61,
+0x72, 0x3c, 0x00, 0x41, 0x45, 0x6e, 0x74, 0x65, 0x33, 0x00,
+0x04, 0x70, 0x00, 0x00, 0x92, 0x00, 0x21, 0x49, 0x66, 0xfb,
+0x00, 0x04, 0x58, 0x00, 0xf4, 0x06, 0x60, 0x53, 0x6f, 0x6c,
+0x76, 0x65, 0x27, 0x00, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69,
+0x6f, 0x6e, 0x00, 0x6f, 0x6e, 0x00, 0x74, 0xf6, 0x00, 0x10,
+0x2c, 0xa1, 0x00, 0x60, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x6d,
+0xce, 0x01, 0x01, 0x5b, 0x02, 0x29, 0x6f, 0x66, 0x3f, 0x02,
+0x74, 0x69, 0x6e, 0x00, 0x72, 0x65, 0x64, 0x2e, 0x57, 0x00,
+0x02, 0xeb, 0x00, 0x40, 0x6f, 0x6e, 0x63, 0x65, 0x1a, 0x00,
+0x45, 0x65, 0x76, 0x65, 0x72, 0x3a, 0x02, 0x01, 0x34, 0x01,
+0x10, 0x61, 0x2e, 0x00, 0x01, 0x4e, 0x00, 0x11, 0x2c, 0x47,
+0x00, 0x01, 0x5c, 0x01, 0x60, 0x73, 0x68, 0x6f, 0x75, 0x6c,
+0x64, 0x5f, 0x01, 0x10, 0x73, 0x8d, 0x00, 0x49, 0x64, 0x2e,
+0x00, 0x28, 0x4f, 0x00, 0x08, 0x3a, 0x01, 0x00, 0x46, 0x00,
+0x39, 0x6f, 0x75, 0x74, 0x49, 0x00, 0x06, 0x0c, 0x00, 0x02,
+0xad, 0x00, 0x60, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x37,
+0x00, 0x11, 0x69, 0x93, 0x02, 0x70, 0x69, 0x6e, 0x64, 0x69,
+0x63, 0x61, 0x74, 0xf1, 0x00, 0x21, 0x61, 0x74, 0x58, 0x00,
+0x01, 0x27, 0x00, 0x40, 0x6e, 0x65, 0x65, 0x64, 0x1f, 0x00,
+0x10, 0x72, 0xa7, 0x00, 0x13, 0x73, 0x1e, 0x00, 0x51, 0x6f,
+0x70, 0x65, 0x72, 0x61, 0x09, 0x01, 0x01, 0x1a, 0x00, 0x00,
+0x72, 0x02, 0x21, 0x74, 0x68, 0x99, 0x00, 0x10, 0x75, 0x16,
+0x00, 0x73, 0x2e, 0x29, 0x00, 0x00, 0x00, 0x28, 0x41, 0x44,
+0x03, 0x11, 0x61, 0x33, 0x01, 0xb0, 0x73, 0x00, 0x64, 0x65,
+0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0x74, 0x00, 0x22,
+0x73, 0x65, 0x49, 0x01, 0x41, 0x32, 0x2e, 0x31, 0x00, 0x9b,
+0x01, 0xf2, 0x00, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61,
+0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x6d, 0x02,
+0x12, 0x32, 0x6d, 0x02, 0x93, 0x70, 0x61, 0x72, 0x61, 0x6d,
+0x65, 0x74, 0x65, 0x72, 0x6f, 0x02, 0x46, 0x65, 0x73, 0x65,
+0x00, 0x14, 0x00, 0x02, 0x40, 0x00, 0x04, 0x3b, 0x00, 0x02,
+0x69, 0x03, 0x01, 0xb5, 0x01, 0xd6, 0x43, 0x75, 0x73, 0x74,
+0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0xb7,
+0x01, 0xd0, 0x65, 0x00, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27,
+0x00, 0x6d, 0x65, 0x6e, 0x75, 0xed, 0x01, 0x91, 0x57, 0x69,
+0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x9e, 0x03, 0x51,
+0x00, 0x00, 0x53, 0x69, 0x7a, 0xc2, 0x01, 0x01, 0x45, 0x04,
+0x24, 0x69, 0x6e, 0xc6, 0x01, 0x10, 0x2e, 0x1b, 0x00, 0x94,
+0x68, 0x61, 0x70, 0x65, 0x20, 0x74, 0x79, 0x70, 0x65, 0xf8,
+0x02, 0x03, 0x09, 0x03, 0x20, 0x00, 0x64, 0x8c, 0x00, 0x52,
+0x6d, 0x69, 0x6e, 0x65, 0x73, 0x0b, 0x01, 0x00, 0x29, 0x00,
+0x04, 0x07, 0x02, 0x30, 0x72, 0x65, 0x67, 0x7e, 0x00, 0x02,
+0x6d, 0x03, 0x21, 0x69, 0x73, 0x66, 0x02, 0x62, 0x70, 0x65,
+0x64, 0x00, 0x62, 0x79, 0xbc, 0x01, 0x00, 0x8a, 0x03, 0x21,
+0x69, 0x6e, 0x41, 0x04, 0x44, 0x67, 0x69, 0x76, 0x65, 0x72,
+0x00, 0x10, 0x2e, 0xeb, 0x00, 0xfa, 0x14, 0x00, 0x64, 0x65,
+0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x73, 0x65, 0x74, 0x74,
+0x69, 0x6e, 0x67, 0x2c, 0x00, 0x60, 0x43, 0x72, 0x6f, 0x73,
+0x73, 0x65, 0x73, 0x27, 0x2c, 0x00, 0x63, 0x61, 0x75, 0x73,
+0x65, 0x73, 0x42, 0x02, 0x06, 0x36, 0x03, 0x45, 0x73, 0x65,
+0x6c, 0x66, 0x3a, 0x03, 0x10, 0x66, 0xe7, 0x04, 0x60, 0x69,
+0x6d, 0x6d, 0x65, 0x64, 0x69, 0xe5, 0x01, 0x10, 0x6e, 0xed,
+0x00, 0x71, 0x62, 0x6f, 0x75, 0x72, 0x73, 0x00, 0x28, 0x8f,
+0x03, 0x31, 0x72, 0x65, 0x65, 0x98, 0x03, 0xc0, 0x77, 0x6f,
+0x00, 0x69, 0x66, 0x00, 0x69, 0x74, 0x27, 0x73, 0x00, 0x61,
+0x78, 0x03, 0x41, 0x00, 0x65, 0x64, 0x67, 0x1a, 0x00, 0x72,
+0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72, 0x29, 0x95, 0x00, 0x03,
+0x32, 0x04, 0x05, 0x93, 0x00, 0x66, 0x52, 0x61, 0x6e, 0x64,
+0x6f, 0x6d, 0x92, 0x00, 0x31, 0x61, 0x00, 0x72, 0x12, 0x00,
+0x03, 0x08, 0x01, 0x20, 0x74, 0x6f, 0xb8, 0x02, 0xa9, 0x63,
+0x68, 0x6f, 0x73, 0x65, 0x6e, 0x00, 0x66, 0x6f, 0x72, 0xb2,
+0x00, 0x00, 0x9d, 0x05, 0x06, 0xe7, 0x02, 0xc3, 0x69, 0x73,
+0x00, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74,
+0x27, 0x00, 0x60, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1522;
-const unsigned short help_text_words = 298;
+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 80e4383903..ad25a5cf34 100644
--- a/apps/plugins/puzzles/help/flood.c
+++ b/apps/plugins/puzzles/help/flood.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,180 +6,181 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 155, TEXT_CENTER | C_RED },
- { 261, TEXT_CENTER | C_RED },
- { 278, TEXT_UNDERLINE },
+ { 156, TEXT_CENTER | C_RED },
+ { 262, TEXT_CENTER | C_RED },
  { 279, TEXT_UNDERLINE },
- { 290, TEXT_UNDERLINE },
- { 332, TEXT_UNDERLINE },
- { 444, TEXT_UNDERLINE },
+ { 280, TEXT_UNDERLINE },
+ { 291, TEXT_UNDERLINE },
+ { 333, TEXT_UNDERLINE },
+ { 445, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2377 comp 1592 ratio 0.669752 level 10 saved 785 */
+/* orig 2395 comp 1600 ratio 0.668058 level 10 saved 795 */
 const char help_text[] = {
-0xf3, 0x45, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x39, 0x3a, 0x20, 0x46, 0x6c, 0x6f, 0x6f, 0x64, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65,
-0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67,
-0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75,
-0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x63, 0x6f, 0x6c, 0x6f,
-0x75, 0x72, 0x65, 0x64, 0x00, 0x61, 0x74, 0x00, 0x72, 0x61,
-0x6e, 0x64, 0x6f, 0x6d, 0x00, 0x69, 0x6e, 0x00, 0x6d, 0x75,
-0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x1f, 0x00, 0xf0, 0x0b,
-0x73, 0x2e, 0x00, 0x49, 0x6e, 0x00, 0x65, 0x61, 0x63, 0x68,
-0x00, 0x6d, 0x6f, 0x76, 0x65, 0x2c, 0x00, 0x79, 0x6f, 0x75,
-0x00, 0x63, 0x61, 0x6e, 0x00, 0x66, 0x68, 0x00, 0xf3, 0x03,
-0x2d, 0x66, 0x69, 0x6c, 0x6c, 0x00, 0x74, 0x68, 0x65, 0x00,
-0x74, 0x6f, 0x70, 0x00, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x00,
-0x00, 0x4a, 0x00, 0x13, 0x61, 0x43, 0x00, 0x00, 0x75, 0x00,
-0x10, 0x79, 0x08, 0x00, 0xf4, 0x03, 0x63, 0x68, 0x6f, 0x69,
-0x63, 0x65, 0x00, 0x28, 0x69, 0x2e, 0x65, 0x2e, 0x00, 0x65,
-0x76, 0x65, 0x72, 0x79, 0x2e, 0x00, 0x10, 0x72, 0x61, 0x00,
-0x91, 0x61, 0x62, 0x6c, 0x65, 0x00, 0x66, 0x72, 0x6f, 0x6d,
-0x51, 0x00, 0x84, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e,
-0x67, 0x23, 0x00, 0xf7, 0x12, 0x62, 0x79, 0x00, 0x61, 0x6e,
-0x00, 0x6f, 0x72, 0x74, 0x68, 0x6f, 0x67, 0x6f, 0x6e, 0x61,
-0x6c, 0x6c, 0x79, 0x00, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
-0x74, 0x65, 0x64, 0x00, 0x70, 0x61, 0x74, 0x68, 0xdc, 0x00,
-0x23, 0x00, 0x61, 0x96, 0x00, 0x44, 0x73, 0x61, 0x6d, 0x65,
-0x86, 0x00, 0x10, 0x77, 0xab, 0x00, 0x30, 0x62, 0x65, 0x00,
-0xb3, 0x00, 0x20, 0x65, 0x64, 0xa1, 0x00, 0x00, 0x22, 0x00,
-0x33, 0x6e, 0x65, 0x77, 0x21, 0x00, 0x51, 0x29, 0x2e, 0x00,
-0x41, 0x73, 0xdf, 0x00, 0xf2, 0x02, 0x64, 0x6f, 0x00, 0x74,
-0x68, 0x69, 0x73, 0x2c, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0x00,
-0x61, 0x6e, 0x64, 0x09, 0x00, 0x21, 0x6f, 0x66, 0x32, 0x00,
-0x01, 0x48, 0x01, 0x77, 0x62, 0x65, 0x63, 0x6f, 0x6d, 0x65,
-0x73, 0x83, 0x00, 0x2f, 0x74, 0x6f, 0xb7, 0x00, 0x01, 0x12,
-0x2e, 0x89, 0x01, 0x80, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00,
-0x69, 0x73, 0x26, 0x00, 0x41, 0x6d, 0x61, 0x6b, 0x65, 0x2b,
-0x00, 0x43, 0x77, 0x68, 0x6f, 0x6c, 0x4f, 0x00, 0x0b, 0xac,
-0x00, 0x11, 0x2c, 0x3f, 0x01, 0x51, 0x73, 0x00, 0x66, 0x65,
-0x77, 0x76, 0x01, 0x10, 0x73, 0x0d, 0x00, 0xb0, 0x70, 0x6f,
-0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2e, 0x00, 0x54, 0x86,
-0x00, 0x00, 0x2e, 0x00, 0x01, 0xd3, 0x00, 0xd3, 0x73, 0x65,
-0x74, 0x00, 0x61, 0x00, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x00,
-0x6f, 0xd5, 0x00, 0x41, 0x75, 0x6d, 0x62, 0x65, 0x78, 0x01,
-0x01, 0x3e, 0x00, 0x70, 0x2c, 0x00, 0x62, 0x61, 0x73, 0x65,
-0x64, 0x1e, 0x00, 0x40, 0x72, 0x75, 0x6e, 0x6e, 0x9e, 0x00,
-0xf1, 0x09, 0x69, 0x74, 0x73, 0x00, 0x6f, 0x77, 0x6e, 0x00,
-0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x00, 0x73,
-0x6f, 0x6c, 0x76, 0x65, 0x72, 0x2e, 0x36, 0x02, 0x65, 0x77,
-0x69, 0x6e, 0x00, 0x69, 0x66, 0xea, 0x01, 0x0f, 0xb1, 0x00,
-0x10, 0x02, 0x4e, 0x01, 0x73, 0x61, 0x74, 0x00, 0x6d, 0x61,
-0x6e, 0x79, 0xb3, 0x00, 0x20, 0x6f, 0x72, 0xc0, 0x00, 0x20,
-0x65, 0x72, 0x03, 0x01, 0x51, 0x49, 0x00, 0x73, 0x61, 0x77,
-0x55, 0x01, 0x02, 0xb9, 0x00, 0xd2, 0x28, 0x77, 0x69, 0x74,
-0x68, 0x00, 0x61, 0x00, 0x66, 0x69, 0x78, 0x65, 0x64, 0x52,
-0x00, 0x53, 0x73, 0x69, 0x7a, 0x65, 0x2c, 0x11, 0x00, 0x06,
-0xc0, 0x00, 0x03, 0x85, 0x02, 0x11, 0x2c, 0x86, 0x01, 0x02,
-0x1d, 0x00, 0x00, 0x5e, 0x00, 0x02, 0xef, 0x00, 0x10, 0x29,
-0xba, 0x02, 0x71, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-0x8f, 0x02, 0xf2, 0x0f, 0x69, 0x74, 0x2e, 0x61, 0x70, 0x70,
-0x73, 0x70, 0x6f, 0x74, 0x2e, 0x63, 0x6f, 0x6d, 0x00, 0x28,
-0x6e, 0x6f, 0x00, 0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x00,
-0x61, 0x63, 0x63, 0x65, 0x3f, 0x01, 0x10, 0x29, 0x90, 0x00,
-0x43, 0x33, 0x39, 0x2e, 0x31, 0x2a, 0x03, 0x80, 0x63, 0x6f,
-0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x33, 0x03, 0x81, 0x54,
-0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x00, 0x1a, 0x00, 0x71,
-0x2c, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xeb, 0x00, 0x43,
-0x6d, 0x6f, 0x75, 0x73, 0xd4, 0x02, 0x04, 0xd8, 0x01, 0x18,
-0x54, 0xf5, 0x02, 0x61, 0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72,
-0xa5, 0x00, 0x01, 0xd8, 0x02, 0x20, 0x74, 0x68, 0x65, 0x01,
-0x09, 0x1d, 0x02, 0x26, 0x69, 0x74, 0x82, 0x02, 0x05, 0x3b,
-0x03, 0x31, 0x65, 0x64, 0x00, 0x0a, 0x01, 0x25, 0x74, 0x68,
-0x4a, 0x01, 0x03, 0x66, 0x02, 0x03, 0xf6, 0x02, 0x01, 0x84,
-0x01, 0x00, 0x87, 0x00, 0x50, 0x65, 0x64, 0x2e, 0x00, 0x43,
-0x09, 0x00, 0x00, 0x59, 0x00, 0x04, 0x86, 0x00, 0x0d, 0x87,
-0x01, 0x4f, 0x61, 0x73, 0x00, 0x74, 0x98, 0x00, 0x00, 0xd2,
-0x68, 0x61, 0x73, 0x00, 0x6e, 0x6f, 0x00, 0x65, 0x66, 0x66,
-0x65, 0x63, 0x74, 0x4c, 0x01, 0x60, 0x74, 0x68, 0x65, 0x72,
-0x65, 0x66, 0xd7, 0x02, 0x30, 0x64, 0x6f, 0x65, 0x1e, 0x00,
-0x00, 0x2d, 0x00, 0x30, 0x75, 0x6e, 0x74, 0x43, 0x00, 0x11,
-0x61, 0x64, 0x01, 0x03, 0xbb, 0x02, 0x01, 0x03, 0x02, 0x50,
-0x61, 0x6c, 0x73, 0x6f, 0x00, 0x03, 0x01, 0x01, 0xa9, 0x00,
-0x92, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79,
-0xd0, 0x02, 0x00, 0x90, 0x01, 0x14, 0x61, 0x16, 0x00, 0xe3,
-0x28, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x00, 0x62,
-0x6c, 0x61, 0x63, 0x6b, 0xa8, 0x00, 0x85, 0x29, 0x00, 0x61,
-0x72, 0x6f, 0x75, 0x6e, 0x64, 0x40, 0x03, 0x40, 0x2e, 0x00,
-0x50, 0x72, 0x90, 0x01, 0x21, 0x6e, 0x67, 0x13, 0x00, 0x60,
-0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x52, 0x00, 0x02, 0x24,
-0x01, 0x0e, 0x56, 0x04, 0x03, 0xc9, 0x00, 0x2f, 0x69, 0x6e,
-0x2b, 0x01, 0x07, 0x57, 0x75, 0x6e, 0x64, 0x65, 0x72, 0xa1,
-0x00, 0x00, 0xc0, 0x00, 0x23, 0x28, 0x41, 0x49, 0x00, 0xf2,
-0x00, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x00, 0x64,
-0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x00, 0x04, 0x21, 0x73,
-0x65, 0x16, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31, 0x2a, 0x05,
-0x01, 0xe6, 0x00, 0x60, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
-0x68, 0x03, 0x12, 0x29, 0x29, 0x02, 0x13, 0x32, 0x29, 0x02,
-0x92, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-0x2b, 0x02, 0x56, 0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00,
-0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x06, 0xc7, 0x04, 0xe1,
-0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e,
-0x27, 0x00, 0x6f, 0x70, 0x6f, 0x00, 0x03, 0xa5, 0x03, 0xb0,
-0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
-0x75, 0xab, 0x00, 0xf9, 0x04, 0x57, 0x69, 0x64, 0x74, 0x68,
-0x2c, 0x00, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x00,
-0x00, 0x53, 0x69, 0x7a, 0x73, 0x04, 0x01, 0x14, 0x04, 0x03,
-0xe0, 0x04, 0x00, 0x30, 0x00, 0x12, 0x43, 0x1a, 0x03, 0x4c,
-0x00, 0x00, 0x00, 0x4e, 0x2e, 0x03, 0x00, 0xaa, 0x01, 0x01,
-0x74, 0x02, 0x05, 0x48, 0x01, 0x02, 0x74, 0x01, 0x40, 0x4d,
-0x75, 0x73, 0x74, 0x80, 0x02, 0xa3, 0x61, 0x74, 0x00, 0x6c,
-0x65, 0x61, 0x73, 0x74, 0x00, 0x33, 0x89, 0x03, 0x35, 0x74,
-0x77, 0x6f, 0x3c, 0x00, 0x01, 0x19, 0x02, 0x50, 0x00, 0x77,
-0x6f, 0x75, 0x6c, 0x31, 0x04, 0x20, 0x6c, 0x79, 0x31, 0x00,
-0x93, 0x6f, 0x6e, 0x65, 0x00, 0x6c, 0x65, 0x67, 0x61, 0x6c,
-0xed, 0x01, 0x20, 0x74, 0x00, 0xe7, 0x03, 0xc0, 0x73, 0x74,
-0x61, 0x67, 0x65, 0x2c, 0x00, 0x68, 0x65, 0x6e, 0x63, 0x65,
-0x5f, 0x02, 0x03, 0xdf, 0x05, 0x04, 0xe3, 0x04, 0x20, 0x61,
-0x74, 0x87, 0x05, 0x12, 0x29, 0x6f, 0x02, 0x00, 0x1b, 0x04,
-0x60, 0x6f, 0x73, 0x74, 0x00, 0x31, 0x30, 0xbc, 0x00, 0x61,
-0x45, 0x78, 0x74, 0x72, 0x61, 0x20, 0x27, 0x04, 0x70, 0x20,
-0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x25, 0x03, 0x00, 0xd4,
-0x00, 0x02, 0x8c, 0x03, 0x01, 0xb4, 0x00, 0xa4, 0x64, 0x69,
-0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x07, 0x01,
-0x70, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x0b, 0x06,
-0x65, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x61, 0x41, 0x02, 0x06,
-0x14, 0x04, 0x06, 0xaf, 0x06, 0x00, 0xda, 0x05, 0x02, 0x39,
-0x01, 0x01, 0xc0, 0x01, 0x02, 0x5a, 0x02, 0x5d, 0x72, 0x75,
-0x6e, 0x00, 0x61, 0xf7, 0x04, 0x00, 0xb4, 0x00, 0x85, 0x67,
-0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x1b, 0x05, 0x40,
-0x73, 0x6f, 0x6c, 0x75, 0xb0, 0x01, 0x05, 0x30, 0x03, 0x02,
-0xb7, 0x01, 0x41, 0x76, 0x61, 0x6c, 0x75, 0x0b, 0x04, 0x01,
-0xce, 0x04, 0x55, 0x66, 0x69, 0x65, 0x6c, 0x64, 0xd9, 0x03,
-0x36, 0x61, 0x64, 0x64, 0x0a, 0x06, 0x42, 0x6c, 0x65, 0x6e,
-0x67, 0x96, 0x06, 0x01, 0x80, 0x00, 0x25, 0x27, 0x73, 0x52,
-0x00, 0x09, 0x6f, 0x00, 0x13, 0x74, 0xcd, 0x05, 0x29, 0x27,
-0x73, 0xc6, 0x00, 0x43, 0x53, 0x6f, 0x00, 0x61, 0x6c, 0x00,
-0xc2, 0x6f, 0x66, 0x00, 0x30, 0x00, 0x72, 0x65, 0x71, 0x75,
-0x69, 0x72, 0x65, 0xa1, 0x06, 0x20, 0x74, 0x6f, 0x6e, 0x00,
-0x31, 0x6a, 0x75, 0x73, 0xaf, 0x03, 0x10, 0x65, 0x28, 0x01,
-0x22, 0x69, 0x65, 0xbc, 0x03, 0x04, 0x6c, 0x00, 0x60, 0x61,
-0x75, 0x74, 0x6f, 0x6d, 0x61, 0x57, 0x01, 0x02, 0xe3, 0x00,
-0x03, 0x87, 0x01, 0x40, 0x00, 0x6c, 0x61, 0x72, 0x10, 0x05,
-0x02, 0x5a, 0x00, 0x00, 0xa8, 0x01, 0x10, 0x73, 0x9a, 0x04,
-0x00, 0x4b, 0x01, 0x12, 0x65, 0x32, 0x03, 0x42, 0x4e, 0x6f,
-0x74, 0x65, 0xcc, 0x05, 0x04, 0x4b, 0x00, 0x0c, 0x2d, 0x01,
-0x01, 0xee, 0x00, 0x00, 0x31, 0x04, 0x20, 0x6e, 0x65, 0x55,
-0x05, 0x93, 0x61, 0x72, 0x69, 0x6c, 0x79, 0x00, 0x66, 0x69,
-0x6e, 0x16, 0x06, 0x75, 0x68, 0x6f, 0x72, 0x74, 0x65, 0x73,
-0x74, 0xb0, 0x06, 0x07, 0x49, 0x01, 0xf0, 0x00, 0x74, 0x68,
-0x6f, 0x75, 0x67, 0x68, 0x00, 0x49, 0x00, 0x62, 0x65, 0x6c,
-0x69, 0x65, 0x76, 0x6c, 0x01, 0xf0, 0x07, 0x27, 0x73, 0x00,
-0x70, 0x72, 0x65, 0x74, 0x74, 0x79, 0x00, 0x63, 0x6c, 0x6f,
-0x73, 0x65, 0x2e, 0x00, 0x46, 0x6f, 0x72, 0x00, 0x61, 0x11,
-0x08, 0x60, 0x6c, 0x00, 0x63, 0x68, 0x61, 0x6c, 0x46, 0x01,
-0x21, 0x65, 0x2c, 0xe5, 0x06, 0x01, 0x71, 0x01, 0x02, 0xb9,
-0x00, 0x47, 0x74, 0x6f, 0x00, 0x30, 0x97, 0x01, 0x20, 0x72,
-0x79, 0x12, 0x00, 0x01, 0x9f, 0x00, 0x04, 0xe9, 0x08, 0x00,
-0x2d, 0x03, 0x81, 0x74, 0x72, 0x69, 0x63, 0x74, 0x6c, 0x79,
-0x20, 0x87, 0x06, 0x03, 0x96, 0x06, 0x32, 0x74, 0x68, 0x61,
-0xc8, 0x01, 0x02, 0x31, 0x07, 0xf0, 0x00, 0x79, 0x6f, 0x75,
-0x27, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x21,
-0x29, 0x00,
+0x00, 0x2d, 0x01, 0x00, 0xf3, 0x33, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76,
+0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00,
+0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73,
+0x2c, 0x00, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x65, 0x64,
+0x00, 0x61, 0x74, 0x00, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
+0x00, 0x69, 0x6e, 0x00, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70,
+0x6c, 0x65, 0x1f, 0x00, 0xf0, 0x0b, 0x73, 0x2e, 0x00, 0x49,
+0x6e, 0x00, 0x65, 0x61, 0x63, 0x68, 0x00, 0x6d, 0x6f, 0x76,
+0x65, 0x2c, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x63, 0x61, 0x6e,
+0x00, 0x66, 0x7a, 0x00, 0xf3, 0x03, 0x2d, 0x66, 0x69, 0x6c,
+0x6c, 0x00, 0x74, 0x68, 0x65, 0x00, 0x74, 0x6f, 0x70, 0x00,
+0x6c, 0x65, 0x66, 0x74, 0x5f, 0x00, 0x00, 0x4a, 0x00, 0x13,
+0x61, 0x43, 0x00, 0x00, 0x75, 0x00, 0x10, 0x79, 0x08, 0x00,
+0xf4, 0x03, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65, 0x00, 0x28,
+0x69, 0x2e, 0x65, 0x2e, 0x00, 0x65, 0x76, 0x65, 0x72, 0x79,
+0x2e, 0x00, 0x10, 0x72, 0x61, 0x00, 0x91, 0x61, 0x62, 0x6c,
+0x65, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x51, 0x00, 0x84, 0x73,
+0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x23, 0x00, 0xf7,
+0x12, 0x62, 0x79, 0x00, 0x61, 0x6e, 0x00, 0x6f, 0x72, 0x74,
+0x68, 0x6f, 0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x00,
+0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x00,
+0x70, 0x61, 0x74, 0x68, 0xdc, 0x00, 0x23, 0x00, 0x61, 0x96,
+0x00, 0x44, 0x73, 0x61, 0x6d, 0x65, 0x86, 0x00, 0x10, 0x77,
+0xab, 0x00, 0x30, 0x62, 0x65, 0x00, 0xb3, 0x00, 0x20, 0x65,
+0x64, 0xa1, 0x00, 0x00, 0x22, 0x00, 0x33, 0x6e, 0x65, 0x77,
+0x21, 0x00, 0x51, 0x29, 0x2e, 0x00, 0x41, 0x73, 0xdf, 0x00,
+0xf2, 0x02, 0x64, 0x6f, 0x00, 0x74, 0x68, 0x69, 0x73, 0x2c,
+0x00, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x61, 0x6e, 0x64, 0x09,
+0x00, 0x21, 0x6f, 0x66, 0x32, 0x00, 0x01, 0x48, 0x01, 0x77,
+0x62, 0x65, 0x63, 0x6f, 0x6d, 0x65, 0x73, 0x83, 0x00, 0x2f,
+0x74, 0x6f, 0xb7, 0x00, 0x01, 0x12, 0x2e, 0x89, 0x01, 0x80,
+0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x26, 0x00,
+0x41, 0x6d, 0x61, 0x6b, 0x65, 0x2b, 0x00, 0x43, 0x77, 0x68,
+0x6f, 0x6c, 0x4f, 0x00, 0x0b, 0xac, 0x00, 0x11, 0x2c, 0x3f,
+0x01, 0x51, 0x73, 0x00, 0x66, 0x65, 0x77, 0x76, 0x01, 0x10,
+0x73, 0x0d, 0x00, 0xb0, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62,
+0x6c, 0x65, 0x2e, 0x00, 0x54, 0x86, 0x00, 0x00, 0x2e, 0x00,
+0x01, 0xd3, 0x00, 0xd3, 0x73, 0x65, 0x74, 0x00, 0x61, 0x00,
+0x6c, 0x69, 0x6d, 0x69, 0x74, 0x00, 0x6f, 0xd5, 0x00, 0x41,
+0x75, 0x6d, 0x62, 0x65, 0x78, 0x01, 0x01, 0x3e, 0x00, 0x70,
+0x2c, 0x00, 0x62, 0x61, 0x73, 0x65, 0x64, 0x1e, 0x00, 0x40,
+0x72, 0x75, 0x6e, 0x6e, 0x9e, 0x00, 0xf1, 0x09, 0x69, 0x74,
+0x73, 0x00, 0x6f, 0x77, 0x6e, 0x00, 0x69, 0x6e, 0x74, 0x65,
+0x72, 0x6e, 0x61, 0x6c, 0x00, 0x73, 0x6f, 0x6c, 0x76, 0x65,
+0x72, 0x2e, 0x36, 0x02, 0x65, 0x77, 0x69, 0x6e, 0x00, 0x69,
+0x66, 0xea, 0x01, 0x0f, 0xb1, 0x00, 0x10, 0x02, 0x4e, 0x01,
+0x73, 0x61, 0x74, 0x00, 0x6d, 0x61, 0x6e, 0x79, 0xb3, 0x00,
+0x20, 0x6f, 0x72, 0xc0, 0x00, 0x20, 0x65, 0x72, 0x03, 0x01,
+0x51, 0x49, 0x00, 0x73, 0x61, 0x77, 0x55, 0x01, 0x02, 0xb9,
+0x00, 0xd2, 0x28, 0x77, 0x69, 0x74, 0x68, 0x00, 0x61, 0x00,
+0x66, 0x69, 0x78, 0x65, 0x64, 0x52, 0x00, 0x53, 0x73, 0x69,
+0x7a, 0x65, 0x2c, 0x11, 0x00, 0x06, 0xc0, 0x00, 0x03, 0x85,
+0x02, 0x11, 0x2c, 0x86, 0x01, 0x02, 0x1d, 0x00, 0x00, 0x5e,
+0x00, 0x02, 0xef, 0x00, 0x10, 0x29, 0xba, 0x02, 0x71, 0x68,
+0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x8f, 0x02, 0xf2, 0x0f,
+0x69, 0x74, 0x2e, 0x61, 0x70, 0x70, 0x73, 0x70, 0x6f, 0x74,
+0x2e, 0x63, 0x6f, 0x6d, 0x00, 0x28, 0x6e, 0x6f, 0x00, 0x6c,
+0x6f, 0x6e, 0x67, 0x65, 0x72, 0x00, 0x61, 0x63, 0x63, 0x65,
+0x3f, 0x01, 0x10, 0x29, 0x90, 0x00, 0x43, 0x33, 0x39, 0x2e,
+0x31, 0x3c, 0x03, 0xf1, 0x05, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x00,
+0x70, 0x6c, 0x61, 0x79, 0x00, 0x1a, 0x00, 0x71, 0x2c, 0x00,
+0x63, 0x6c, 0x69, 0x63, 0x6b, 0xeb, 0x00, 0x43, 0x6d, 0x6f,
+0x75, 0x73, 0xd4, 0x02, 0x04, 0xd8, 0x01, 0x18, 0x54, 0xf5,
+0x02, 0x61, 0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72, 0xa5, 0x00,
+0x01, 0xd8, 0x02, 0x20, 0x74, 0x68, 0x65, 0x01, 0x09, 0x1d,
+0x02, 0x26, 0x69, 0x74, 0x82, 0x02, 0x05, 0x3b, 0x03, 0x31,
+0x65, 0x64, 0x00, 0x0a, 0x01, 0x25, 0x74, 0x68, 0x4a, 0x01,
+0x03, 0x66, 0x02, 0x03, 0xf6, 0x02, 0x01, 0x84, 0x01, 0x00,
+0x87, 0x00, 0x50, 0x65, 0x64, 0x2e, 0x00, 0x43, 0x09, 0x00,
+0x00, 0x59, 0x00, 0x04, 0x86, 0x00, 0x0d, 0x87, 0x01, 0x4f,
+0x61, 0x73, 0x00, 0x74, 0x98, 0x00, 0x00, 0xd2, 0x68, 0x61,
+0x73, 0x00, 0x6e, 0x6f, 0x00, 0x65, 0x66, 0x66, 0x65, 0x63,
+0x74, 0x4c, 0x01, 0x60, 0x74, 0x68, 0x65, 0x72, 0x65, 0x66,
+0xd7, 0x02, 0x30, 0x64, 0x6f, 0x65, 0x1e, 0x00, 0x00, 0x2d,
+0x00, 0x30, 0x75, 0x6e, 0x74, 0x43, 0x00, 0x11, 0x61, 0x64,
+0x01, 0x03, 0xbb, 0x02, 0x01, 0x03, 0x02, 0x50, 0x61, 0x6c,
+0x73, 0x6f, 0x00, 0x03, 0x01, 0x01, 0xa9, 0x00, 0x92, 0x75,
+0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0xd0, 0x02,
+0x00, 0x90, 0x01, 0x14, 0x61, 0x16, 0x00, 0xe3, 0x28, 0x6f,
+0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x00, 0x62, 0x6c, 0x61,
+0x63, 0x6b, 0xa8, 0x00, 0x85, 0x29, 0x00, 0x61, 0x72, 0x6f,
+0x75, 0x6e, 0x64, 0x40, 0x03, 0x40, 0x2e, 0x00, 0x50, 0x72,
+0x90, 0x01, 0x21, 0x6e, 0x67, 0x13, 0x00, 0x60, 0x72, 0x65,
+0x74, 0x75, 0x72, 0x6e, 0x52, 0x00, 0x02, 0x24, 0x01, 0x0e,
+0x56, 0x04, 0x03, 0xc9, 0x00, 0x2f, 0x69, 0x6e, 0x2b, 0x01,
+0x07, 0x57, 0x75, 0x6e, 0x64, 0x65, 0x72, 0xa1, 0x00, 0x00,
+0xc0, 0x00, 0x23, 0x28, 0x41, 0x49, 0x00, 0xf2, 0x00, 0x61,
+0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x00, 0x64, 0x65, 0x73,
+0x63, 0x72, 0x69, 0x62, 0x00, 0x04, 0x21, 0x73, 0x65, 0x16,
+0x00, 0x41, 0x00, 0x32, 0x2e, 0x31, 0x2a, 0x05, 0x01, 0xe6,
+0x00, 0x60, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x68, 0x03,
+0x12, 0x29, 0x29, 0x02, 0x13, 0x32, 0x29, 0x02, 0x92, 0x70,
+0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x2b, 0x02,
+0x56, 0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x41,
+0x00, 0x04, 0x3c, 0x00, 0x06, 0xc7, 0x04, 0xe1, 0x60, 0x43,
+0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00,
+0x6f, 0x70, 0x6f, 0x00, 0x03, 0xa5, 0x03, 0xb0, 0x60, 0x54,
+0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xab,
+0x00, 0xf9, 0x04, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
+0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x00, 0x00, 0x53,
+0x69, 0x7a, 0x73, 0x04, 0x01, 0x14, 0x04, 0x03, 0xe0, 0x04,
+0x00, 0x30, 0x00, 0x12, 0x43, 0x1a, 0x03, 0x4c, 0x00, 0x00,
+0x00, 0x4e, 0x2e, 0x03, 0x00, 0xaa, 0x01, 0x01, 0x74, 0x02,
+0x05, 0x48, 0x01, 0x02, 0x74, 0x01, 0x40, 0x4d, 0x75, 0x73,
+0x74, 0x80, 0x02, 0xa3, 0x61, 0x74, 0x00, 0x6c, 0x65, 0x61,
+0x73, 0x74, 0x00, 0x33, 0x89, 0x03, 0x35, 0x74, 0x77, 0x6f,
+0x3c, 0x00, 0x01, 0x19, 0x02, 0x50, 0x00, 0x77, 0x6f, 0x75,
+0x6c, 0x31, 0x04, 0x20, 0x6c, 0x79, 0x31, 0x00, 0x93, 0x6f,
+0x6e, 0x65, 0x00, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0xed, 0x01,
+0x20, 0x74, 0x00, 0xe7, 0x03, 0xc0, 0x73, 0x74, 0x61, 0x67,
+0x65, 0x2c, 0x00, 0x68, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x02,
+0x03, 0xdf, 0x05, 0x04, 0xe3, 0x04, 0x20, 0x61, 0x74, 0x87,
+0x05, 0x12, 0x29, 0x6f, 0x02, 0x00, 0x1b, 0x04, 0x60, 0x6f,
+0x73, 0x74, 0x00, 0x31, 0x30, 0xbc, 0x00, 0x61, 0x45, 0x78,
+0x74, 0x72, 0x61, 0x20, 0x27, 0x04, 0x70, 0x20, 0x70, 0x65,
+0x72, 0x6d, 0x69, 0x74, 0x25, 0x03, 0x00, 0xd4, 0x00, 0x02,
+0x8c, 0x03, 0x01, 0xb4, 0x00, 0xa4, 0x64, 0x69, 0x66, 0x66,
+0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x07, 0x01, 0x70, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x0b, 0x06, 0x65, 0x69,
+0x6e, 0x63, 0x72, 0x65, 0x61, 0x41, 0x02, 0x06, 0x14, 0x04,
+0x06, 0xaf, 0x06, 0x00, 0xda, 0x05, 0x02, 0x39, 0x01, 0x01,
+0xc0, 0x01, 0x02, 0x5a, 0x02, 0x5d, 0x72, 0x75, 0x6e, 0x00,
+0x61, 0xf7, 0x04, 0x00, 0xb4, 0x00, 0x85, 0x67, 0x65, 0x6e,
+0x65, 0x72, 0x61, 0x74, 0x65, 0x1b, 0x05, 0x40, 0x73, 0x6f,
+0x6c, 0x75, 0xb0, 0x01, 0x05, 0x30, 0x03, 0x02, 0xb7, 0x01,
+0x41, 0x76, 0x61, 0x6c, 0x75, 0x0b, 0x04, 0x01, 0xce, 0x04,
+0x55, 0x66, 0x69, 0x65, 0x6c, 0x64, 0xd9, 0x03, 0x36, 0x61,
+0x64, 0x64, 0x0a, 0x06, 0x42, 0x6c, 0x65, 0x6e, 0x67, 0x96,
+0x06, 0x01, 0x80, 0x00, 0x25, 0x27, 0x73, 0x52, 0x00, 0x09,
+0x6f, 0x00, 0x13, 0x74, 0xcd, 0x05, 0x29, 0x27, 0x73, 0xc6,
+0x00, 0x43, 0x53, 0x6f, 0x00, 0x61, 0x6c, 0x00, 0xc2, 0x6f,
+0x66, 0x00, 0x30, 0x00, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72,
+0x65, 0xa1, 0x06, 0x20, 0x74, 0x6f, 0x6e, 0x00, 0x31, 0x6a,
+0x75, 0x73, 0xaf, 0x03, 0x10, 0x65, 0x28, 0x01, 0x22, 0x69,
+0x65, 0xbc, 0x03, 0x04, 0x6c, 0x00, 0x60, 0x61, 0x75, 0x74,
+0x6f, 0x6d, 0x61, 0x57, 0x01, 0x02, 0xe3, 0x00, 0x03, 0x87,
+0x01, 0x40, 0x00, 0x6c, 0x61, 0x72, 0x10, 0x05, 0x02, 0x5a,
+0x00, 0x00, 0xa8, 0x01, 0x10, 0x73, 0x9a, 0x04, 0x00, 0x4b,
+0x01, 0x12, 0x65, 0x32, 0x03, 0x42, 0x4e, 0x6f, 0x74, 0x65,
+0xcc, 0x05, 0x04, 0x4b, 0x00, 0x0c, 0x2d, 0x01, 0x01, 0xee,
+0x00, 0x00, 0x31, 0x04, 0x20, 0x6e, 0x65, 0x55, 0x05, 0x93,
+0x61, 0x72, 0x69, 0x6c, 0x79, 0x00, 0x66, 0x69, 0x6e, 0x16,
+0x06, 0x75, 0x68, 0x6f, 0x72, 0x74, 0x65, 0x73, 0x74, 0xb0,
+0x06, 0x07, 0x49, 0x01, 0xf0, 0x00, 0x74, 0x68, 0x6f, 0x75,
+0x67, 0x68, 0x00, 0x49, 0x00, 0x62, 0x65, 0x6c, 0x69, 0x65,
+0x76, 0x6c, 0x01, 0xf0, 0x07, 0x27, 0x73, 0x00, 0x70, 0x72,
+0x65, 0x74, 0x74, 0x79, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65,
+0x2e, 0x00, 0x46, 0x6f, 0x72, 0x00, 0x61, 0x11, 0x08, 0x60,
+0x6c, 0x00, 0x63, 0x68, 0x61, 0x6c, 0x46, 0x01, 0x21, 0x65,
+0x2c, 0xe5, 0x06, 0x01, 0x71, 0x01, 0x02, 0xb9, 0x00, 0x47,
+0x74, 0x6f, 0x00, 0x30, 0x97, 0x01, 0x20, 0x72, 0x79, 0x12,
+0x00, 0x01, 0x9f, 0x00, 0x04, 0xe9, 0x08, 0x00, 0x2d, 0x03,
+0x81, 0x74, 0x72, 0x69, 0x63, 0x74, 0x6c, 0x79, 0x20, 0x87,
+0x06, 0x03, 0x96, 0x06, 0x32, 0x74, 0x68, 0x61, 0xc8, 0x01,
+0x02, 0x31, 0x07, 0xf0, 0x00, 0x79, 0x6f, 0x75, 0x27, 0x72,
+0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x21, 0x29, 0x00,
 };
 
-const unsigned short help_text_len = 2377;
-const unsigned short help_text_words = 451;
+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 3942832c52..10bcda7b3b 100644
--- a/apps/plugins/puzzles/help/galaxies.c
+++ b/apps/plugins/puzzles/help/galaxies.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,206 +6,207 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 132, TEXT_CENTER | C_RED },
- { 444, TEXT_CENTER | C_RED },
- { 461, TEXT_UNDERLINE },
+ { 133, TEXT_CENTER | C_RED },
+ { 445, TEXT_CENTER | C_RED },
  { 462, TEXT_UNDERLINE },
- { 472, TEXT_UNDERLINE },
+ { 463, TEXT_UNDERLINE },
+ { 473, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2754 comp 1877 ratio 0.681554 level 10 saved 877 */
+/* orig 2766 comp 1876 ratio 0.678236 level 10 saved 890 */
 const char help_text[] = {
-0xf0, 0x41, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x38, 0x3a, 0x20, 0x47, 0x61, 0x6c, 0x61, 0x78, 0x69,
-0x65, 0x73, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00,
-0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x72, 0x65, 0x63,
-0x74, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x00, 0x67,
-0x72, 0x69, 0x64, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
-0x6e, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d,
-0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74,
-0x73, 0x2e, 0x39, 0x00, 0xf4, 0x0a, 0x72, 0x00, 0x61, 0x69,
-0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x61,
-0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x74, 0x68,
-0x65, 0x4b, 0x00, 0x70, 0x6c, 0x65, 0x00, 0x69, 0x6e, 0x74,
-0x6f, 0x49, 0x00, 0xe0, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x47, 0x00,
-0xf3, 0x12, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c,
-0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61,
-0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00,
-0x65, 0x76, 0x65, 0x72, 0x79, 0x2d, 0x00, 0x00, 0x61, 0x00,
-0xf0, 0x00, 0x31, 0x38, 0x30, 0x2d, 0x64, 0x65, 0x67, 0x72,
-0x65, 0x65, 0x00, 0x72, 0x6f, 0x74, 0x61, 0x68, 0x00, 0xf5,
-0x03, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x79, 0x6d, 0x6d,
-0x65, 0x74, 0x72, 0x69, 0x63, 0x2c, 0x00, 0x61, 0x6e, 0xb1,
-0x00, 0xd0, 0x73, 0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c,
-0x79, 0x00, 0x6f, 0x6e, 0x65, 0xaf, 0x00, 0x60, 0x00, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x49, 0x00, 0x40, 0x6c, 0x6f, 0x63,
-0x61, 0x88, 0x00, 0xd1, 0x61, 0x74, 0x00, 0x69, 0x74, 0x73,
-0x00, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x8e, 0x00, 0x02,
-0x4a, 0x00, 0xf0, 0x00, 0x79, 0x2e, 0x00, 0x00, 0x00, 0x54,
-0x6f, 0x00, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x00, 0x79, 0xe4,
-0x00, 0x40, 0x73, 0x6f, 0x6c, 0x75, 0x71, 0x00, 0x10, 0x2c,
-0x0f, 0x00, 0xf1, 0x02, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00,
-0x6c, 0x69, 0x6e, 0x65, 0x73, 0x00, 0x61, 0x6c, 0x6f, 0x6e,
-0x67, 0xef, 0x00, 0x01, 0x2e, 0x01, 0x41, 0x65, 0x64, 0x67,
-0x65, 0x0b, 0x01, 0x41, 0x6d, 0x61, 0x72, 0x6b, 0x17, 0x00,
-0x91, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x69, 0x65,
-0xf0, 0x00, 0x02, 0x18, 0x01, 0x01, 0xff, 0x00, 0xc0, 0x2e,
-0x00, 0x54, 0x68, 0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
-0x65, 0x96, 0x00, 0xc2, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-0x74, 0x65, 0x00, 0x77, 0x68, 0x65, 0x41, 0x01, 0x00, 0x44,
-0x00, 0x23, 0x65, 0x64, 0x69, 0x00, 0x26, 0x6f, 0x6e, 0x66,
-0x00, 0xc0, 0x61, 0x72, 0x65, 0x00, 0x70, 0x72, 0x65, 0x63,
-0x69, 0x73, 0x65, 0x6c, 0x2d, 0x01, 0x32, 0x6f, 0x73, 0x65,
-0x33, 0x01, 0xc4, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74,
-0x65, 0x00, 0x74, 0x77, 0x6f, 0x5c, 0x01, 0x30, 0x00, 0x62,
-0x65, 0xa4, 0x00, 0x10, 0x69, 0xa7, 0x00, 0xb6, 0x6f, 0x00,
-0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x87,
-0x00, 0x64, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x8a, 0x00,
-0x90, 0x77, 0x61, 0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e,
-0x22, 0x01, 0xf1, 0x06, 0x62, 0x79, 0x00, 0x4e, 0x69, 0x6b,
-0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x33, 0x5d, 0x2c, 0x00,
-0x75, 0x6e, 0x64, 0x65, 0x72, 0x88, 0x00, 0x80, 0x6e, 0x61,
-0x6d, 0x65, 0x00, 0x60, 0x54, 0x65, 0x6c, 0x01, 0x71, 0x00,
-0x53, 0x68, 0x6f, 0x77, 0x27, 0x3b, 0x4d, 0x01, 0x01, 0x18,
-0x00, 0x02, 0xce, 0x00, 0x30, 0x6d, 0x6f, 0x6e, 0x9e, 0x00,
-0x51, 0x72, 0x61, 0x6e, 0x73, 0x6c, 0x70, 0x01, 0x01, 0x07,
-0x02, 0xf4, 0x04, 0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68,
-0x00, 0x61, 0x73, 0x00, 0x60, 0x53, 0x70, 0x69, 0x72, 0x61,
-0x6c, 0x00, 0x8b, 0x02, 0x10, 0x27, 0x8c, 0x00, 0x04, 0x0d,
-0x00, 0x01, 0x89, 0x00, 0x00, 0xcc, 0x01, 0x40, 0x72, 0x69,
-0x62, 0x75, 0x3e, 0x00, 0x51, 0x74, 0x6f, 0x00, 0x74, 0x68,
-0x5a, 0x00, 0x41, 0x6c, 0x6c, 0x65, 0x63, 0x66, 0x02, 0xe1,
-0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48,
-0x61, 0x72, 0x76, 0x65, 0xb7, 0x01, 0x00, 0xa8, 0x00, 0xd1,
-0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77,
-0x77, 0x2e, 0x6e, 0xbf, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e,
-0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0xe6, 0x00, 0xf6, 0x10,
-0x73, 0x2f, 0x61, 0x73, 0x74, 0x72, 0x6f, 0x6e, 0x6f, 0x6d,
-0x69, 0x63, 0x61, 0x6c, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x2e,
-0x68, 0x74, 0x6d, 0x6c, 0x00, 0x00, 0x00, 0x32, 0x38, 0x2e,
-0x31, 0x1d, 0x03, 0x01, 0x81, 0x00, 0x21, 0x6f, 0x6c, 0x26,
-0x03, 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
-0x63, 0x6b, 0x8d, 0x01, 0x32, 0x61, 0x6e, 0x79, 0x8d, 0x01,
-0x00, 0x9f, 0x01, 0x01, 0x5a, 0x01, 0x00, 0x15, 0x02, 0x21,
-0x61, 0x6e, 0x03, 0x02, 0x21, 0x00, 0x69, 0xeb, 0x01, 0x10,
-0x72, 0x0b, 0x01, 0x31, 0x6e, 0x27, 0x74, 0x83, 0x02, 0xb0,
-0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x2c, 0x00, 0x6f,
-0x72, 0x2f, 0x00, 0x61, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65,
-0x1a, 0x00, 0x07, 0x2d, 0x00, 0x30, 0x2e, 0x00, 0x57, 0xfe,
-0x01, 0x00, 0x65, 0x02, 0x50, 0x63, 0x72, 0x65, 0x61, 0x74,
-0x93, 0x03, 0x54, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x08, 0x03,
-0x10, 0x28, 0x31, 0x00, 0x05, 0xca, 0x02, 0x7f, 0x63, 0x6c,
-0x6f, 0x73, 0x65, 0x64, 0x2c, 0xf4, 0x02, 0x06, 0x1b, 0x2c,
-0x38, 0x03, 0x05, 0x2b, 0x03, 0x62, 0x00, 0x61, 0x62, 0x6f,
-0x75, 0x74, 0x35, 0x02, 0x01, 0x28, 0x00, 0x09, 0x3a, 0x03,
-0x50, 0x6e, 0x6f, 0x00, 0x65, 0x78, 0xb9, 0x01, 0x43, 0x65,
-0x6f, 0x75, 0x73, 0xd4, 0x02, 0x71, 0x62, 0x65, 0x74, 0x77,
-0x65, 0x65, 0x6e, 0x5a, 0x02, 0x21, 0x6f, 0x66, 0xec, 0x01,
-0x34, 0x6f, 0x77, 0x6e, 0x65, 0x02, 0xf1, 0x07, 0x29, 0x2c,
-0x00, 0x69, 0x74, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x62,
-0x65, 0x00, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68,
-0x65, 0x03, 0x80, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69,
-0x63, 0xac, 0x03, 0x6a, 0x3b, 0x00, 0x73, 0x6f, 0x00, 0x79,
-0x35, 0x04, 0x01, 0x79, 0x04, 0x20, 0x74, 0x68, 0xd6, 0x00,
-0x23, 0x6f, 0x6c, 0xe1, 0x02, 0x08, 0x41, 0x00, 0x22, 0x69,
-0x6e, 0xa7, 0x00, 0x21, 0x77, 0x61, 0xe1, 0x01, 0x30, 0x44,
-0x75, 0x72, 0xcb, 0x02, 0x72, 0x73, 0x6f, 0x6c, 0x76, 0x69,
-0x6e, 0x67, 0x90, 0x03, 0x10, 0x6d, 0x2b, 0x00, 0x52, 0x00,
-0x6b, 0x6e, 0x6f, 0x77, 0x2b, 0x00, 0x12, 0x61, 0x8a, 0x04,
-0x16, 0x63, 0xc6, 0x04, 0x02, 0xa7, 0x00, 0x03, 0x0b, 0x03,
-0x01, 0x77, 0x00, 0xa2, 0x61, 0x00, 0x73, 0x70, 0x65, 0x63,
-0x69, 0x66, 0x69, 0x63, 0x01, 0x01, 0x70, 0x62, 0x75, 0x74,
-0x00, 0x6e, 0x6f, 0x74, 0xbf, 0x00, 0x22, 0x73, 0x75, 0x0f,
-0x04, 0x11, 0x77, 0x95, 0x01, 0x00, 0x9b, 0x00, 0x02, 0x03,
-0x01, 0x21, 0x67, 0x6f, 0x27, 0x01, 0x02, 0x7e, 0x01, 0x10,
-0x6f, 0xb3, 0x01, 0x05, 0x64, 0x03, 0x00, 0x5d, 0x00, 0x06,
-0xe1, 0x04, 0x01, 0xab, 0x02, 0x01, 0x81, 0x01, 0x71, 0x2e,
-0x00, 0x49, 0x6e, 0x00, 0x6f, 0x72, 0x36, 0x03, 0x05, 0x15,
-0x04, 0x23, 0x69, 0x73, 0x07, 0x01, 0x30, 0x00, 0x64, 0x6f,
-0x1e, 0x02, 0x72, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x74, 0x2c,
-0xf6, 0x01, 0x40, 0x61, 0x6e, 0x00, 0x72, 0xcf, 0x00, 0x06,
-0x6a, 0x02, 0x03, 0x4b, 0x00, 0x01, 0x7c, 0x00, 0x53, 0x64,
-0x72, 0x61, 0x67, 0x2c, 0x82, 0x00, 0x01, 0x6e, 0x01, 0x04,
-0x26, 0x02, 0x72, 0x6e, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77,
-0x34, 0x04, 0x71, 0x72, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-0xb4, 0x05, 0x16, 0x74, 0x8b, 0x00, 0x42, 0x44, 0x72, 0x6f,
-0x70, 0x21, 0x01, 0x44, 0x69, 0x6e, 0x00, 0x61, 0x14, 0x01,
-0x22, 0x6f, 0x66, 0x92, 0x01, 0x61, 0x63, 0x68, 0x6f, 0x69,
-0x63, 0x65, 0x66, 0x00, 0x04, 0xcb, 0x01, 0x61, 0x72, 0x65,
-0x6d, 0x69, 0x6e, 0x64, 0x98, 0x00, 0x02, 0x73, 0x00, 0x20,
-0x64, 0x6f, 0x33, 0x05, 0x91, 0x27, 0x73, 0x00, 0x61, 0x73,
-0x73, 0x6f, 0x63, 0x69, 0xd6, 0x03, 0x41, 0x77, 0x69, 0x74,
-0x68, 0x0a, 0x06, 0x01, 0xbc, 0x00, 0x4c, 0x61, 0x6c, 0x73,
-0x6f, 0xc1, 0x00, 0x42, 0x65, 0x78, 0x69, 0x73, 0x8d, 0x00,
-0x00, 0xa3, 0x00, 0x02, 0x2a, 0x06, 0x21, 0x69, 0x63, 0x1f,
-0x05, 0x41, 0x6d, 0x00, 0x75, 0x70, 0x73, 0x00, 0x01, 0x0d,
-0x03, 0x00, 0x11, 0x00, 0x01, 0x20, 0x03, 0x20, 0x64, 0x65,
-0x9f, 0x03, 0x12, 0x79, 0x22, 0x00, 0x81, 0x62, 0x79, 0x00,
-0x64, 0x72, 0x6f, 0x70, 0x70, 0xc2, 0x04, 0x00, 0x11, 0x00,
-0x35, 0x6f, 0x66, 0x66, 0x96, 0x01, 0x04, 0x55, 0x05, 0x00,
-0xe6, 0x01, 0xa1, 0x2e, 0x00, 0x28, 0x41, 0x6c, 0x73, 0x6f,
-0x2c, 0x00, 0x69, 0xd3, 0x00, 0x31, 0x27, 0x72, 0x65, 0xd2,
-0x01, 0x01, 0xcf, 0x01, 0x06, 0xc0, 0x00, 0x05, 0x2b, 0x01,
-0x28, 0x69, 0x73, 0x27, 0x01, 0x06, 0x7f, 0x01, 0x01, 0x9c,
-0x00, 0x29, 0x69, 0x74, 0x9a, 0x00, 0x50, 0x69, 0x74, 0x00,
-0x61, 0x72, 0xca, 0x05, 0x02, 0xc7, 0x01, 0x11, 0x6b, 0x12,
-0x00, 0xa3, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x65, 0x72, 0x2e,
-0x00, 0x49, 0x30, 0x01, 0x60, 0x73, 0x77, 0x69, 0x76, 0x65,
-0x6c, 0x09, 0x02, 0x40, 0x73, 0x74, 0x61, 0x6e, 0x88, 0x03,
-0x24, 0x61, 0x73, 0x31, 0x06, 0x50, 0x67, 0x00, 0x69, 0x74,
-0x2c, 0x3e, 0x00, 0x42, 0x73, 0x74, 0x61, 0x79, 0x79, 0x00,
-0x06, 0x83, 0x06, 0x21, 0x70, 0x61, 0x93, 0x05, 0x00, 0xa6,
-0x01, 0x3a, 0x29, 0x00, 0x00, 0x4d, 0x01, 0x22, 0x75, 0x73,
-0x84, 0x02, 0xa2, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00,
-0x6b, 0x65, 0x79, 0x61, 0x06, 0x00, 0x97, 0x00, 0x04, 0x94,
-0x00, 0x04, 0x19, 0x06, 0x05, 0x8f, 0x02, 0x13, 0x6e, 0x37,
-0x06, 0x83, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x69,
-0xa4, 0x06, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x44,
-0x00, 0x02, 0x66, 0x06, 0x67, 0x6f, 0x76, 0x65, 0x72, 0x00,
-0x61, 0xc8, 0x04, 0x01, 0xc7, 0x00, 0x01, 0xca, 0x04, 0x22,
-0x6f, 0x72, 0xe0, 0x00, 0x01, 0xa0, 0x00, 0x00, 0x6a, 0x01,
-0x10, 0x2c, 0xcd, 0x00, 0x5f, 0x61, 0x62, 0x6f, 0x76, 0x65,
-0x55, 0x00, 0x13, 0x23, 0x64, 0x6f, 0x16, 0x01, 0x01, 0x50,
-0x01, 0x25, 0x75, 0x70, 0x79, 0x01, 0x01, 0x06, 0x01, 0x22,
-0x62, 0x65, 0xd5, 0x01, 0x22, 0x65, 0x64, 0x4f, 0x06, 0x8c,
-0x65, 0x78, 0x74, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x00,
-0x00, 0xa5, 0x01, 0x00, 0x6d, 0x00, 0x33, 0x65, 0x64, 0x3b,
-0xff, 0x05, 0x04, 0x18, 0x01, 0x20, 0x62, 0x65, 0x1b, 0x01,
-0x15, 0x64, 0x0c, 0x01, 0x0c, 0x66, 0x02, 0x02, 0x1c, 0x01,
-0x12, 0x2c, 0x69, 0x05, 0x05, 0x3c, 0x02, 0x0e, 0x4d, 0x02,
-0x13, 0x6e, 0xac, 0x00, 0x52, 0x6f, 0x72, 0x00, 0x61, 0x6e,
-0xd6, 0x03, 0x01, 0x42, 0x00, 0x00, 0x6d, 0x04, 0x41, 0x28,
-0x41, 0x6c, 0x6c, 0x92, 0x00, 0x11, 0x61, 0x71, 0x06, 0x10,
-0x73, 0x99, 0x02, 0x42, 0x63, 0x72, 0x69, 0x62, 0x97, 0x04,
-0x13, 0x73, 0x87, 0x06, 0x31, 0x32, 0x2e, 0x31, 0x01, 0x04,
-0x01, 0x97, 0x00, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
-0x62, 0x6c, 0x65, 0x2e, 0x29, 0x4e, 0x06, 0x16, 0x32, 0x4e,
-0x06, 0x00, 0x9d, 0x07, 0x71, 0x6d, 0x65, 0x74, 0x65, 0x72,
-0x73, 0x20, 0x76, 0x07, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14,
-0x00, 0x02, 0x44, 0x00, 0x04, 0x3f, 0x00, 0x51, 0x00, 0x66,
-0x72, 0x6f, 0x6d, 0x7c, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73,
-0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70,
-0x72, 0x00, 0x03, 0x16, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70,
-0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae, 0x00, 0x91,
-0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x0f,
-0x05, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x20, 0x03, 0x01,
-0xdf, 0x01, 0x15, 0x69, 0xac, 0x05, 0x01, 0x46, 0x05, 0x30,
-0x69, 0x66, 0x66, 0x20, 0x05, 0x63, 0x74, 0x79, 0x00, 0x00,
-0x00, 0x43, 0xe5, 0x06, 0x02, 0x2a, 0x04, 0x06, 0x1a, 0x00,
-0x04, 0x5b, 0x03, 0x41, 0x65, 0x6e, 0x65, 0x72, 0xeb, 0x03,
-0x02, 0x3d, 0x07, 0x57, 0x2e, 0x00, 0x4d, 0x6f, 0x72, 0x29,
-0x00, 0x13, 0x00, 0x54, 0x07, 0xa0, 0x00, 0x72, 0x65, 0x71,
-0x75, 0x69, 0x72, 0x65, 0x00, 0x6d, 0x1f, 0x00, 0x02, 0xcf,
-0x08, 0x62, 0x78, 0x00, 0x64, 0x65, 0x64, 0x75, 0x3d, 0x01,
-0x02, 0x65, 0x06, 0x01, 0xb8, 0x00, 0x80, 0x55, 0x6e, 0x72,
-0x65, 0x61, 0x73, 0x6f, 0x6e, 0xe9, 0x00, 0x18, 0x27, 0x73,
-0x00, 0x20, 0x6c, 0x65, 0x41, 0x03, 0x35, 0x6d, 0x61, 0x79,
-0x4d, 0x00, 0xe0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61,
-0x63, 0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x00,
+0x65, 0x73, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x2c,
+0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
+0x65, 0x00, 0x61, 0x00, 0x72, 0x65, 0x63, 0x74, 0x61, 0x6e,
+0x67, 0x75, 0x6c, 0x61, 0x72, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e,
+0x67, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+0x00, 0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74, 0x73, 0x2e, 0x39,
+0x00, 0xf4, 0x0a, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69,
+0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x61, 0x72, 0x74, 0x69,
+0x74, 0x69, 0x6f, 0x6e, 0x00, 0x74, 0x68, 0x65, 0x4b, 0x00,
+0x70, 0x6c, 0x65, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x49, 0x00,
+0xe0, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x00, 0x72, 0x65,
+0x67, 0x69, 0x6f, 0x6e, 0x73, 0x47, 0x00, 0xf3, 0x12, 0x73,
+0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x69, 0x6e,
+0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61, 0x00, 0x77, 0x61,
+0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x65, 0x76, 0x65,
+0x72, 0x79, 0x2d, 0x00, 0x00, 0x61, 0x00, 0xf0, 0x00, 0x31,
+0x38, 0x30, 0x2d, 0x64, 0x65, 0x67, 0x72, 0x65, 0x65, 0x00,
+0x72, 0x6f, 0x74, 0x61, 0x68, 0x00, 0xf5, 0x03, 0x61, 0x6c,
+0x6c, 0x79, 0x00, 0x73, 0x79, 0x6d, 0x6d, 0x65, 0x74, 0x72,
+0x69, 0x63, 0x2c, 0x00, 0x61, 0x6e, 0xb1, 0x00, 0xd0, 0x73,
+0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x00, 0x6f,
+0x6e, 0x65, 0xaf, 0x00, 0x60, 0x00, 0x77, 0x68, 0x69, 0x63,
+0x68, 0x49, 0x00, 0x40, 0x6c, 0x6f, 0x63, 0x61, 0x88, 0x00,
+0xd1, 0x61, 0x74, 0x00, 0x69, 0x74, 0x73, 0x00, 0x63, 0x65,
+0x6e, 0x74, 0x72, 0x65, 0x8e, 0x00, 0x02, 0x4a, 0x00, 0xf0,
+0x00, 0x79, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x00, 0x65,
+0x6e, 0x74, 0x65, 0x72, 0x00, 0x79, 0xe4, 0x00, 0x40, 0x73,
+0x6f, 0x6c, 0x75, 0x71, 0x00, 0x10, 0x2c, 0x0f, 0x00, 0xf1,
+0x02, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00, 0x6c, 0x69, 0x6e,
+0x65, 0x73, 0x00, 0x61, 0x6c, 0x6f, 0x6e, 0x67, 0xef, 0x00,
+0x01, 0x2e, 0x01, 0x41, 0x65, 0x64, 0x67, 0x65, 0x0b, 0x01,
+0x41, 0x6d, 0x61, 0x72, 0x6b, 0x17, 0x00, 0x91, 0x62, 0x6f,
+0x75, 0x6e, 0x64, 0x61, 0x72, 0x69, 0x65, 0xf0, 0x00, 0x02,
+0x18, 0x01, 0x01, 0xff, 0x00, 0xc0, 0x2e, 0x00, 0x54, 0x68,
+0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x96, 0x00,
+0xc2, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x00,
+0x77, 0x68, 0x65, 0x41, 0x01, 0x00, 0x44, 0x00, 0x23, 0x65,
+0x64, 0x69, 0x00, 0x26, 0x6f, 0x6e, 0x66, 0x00, 0xc0, 0x61,
+0x72, 0x65, 0x00, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x65,
+0x6c, 0x2d, 0x01, 0x32, 0x6f, 0x73, 0x65, 0x33, 0x01, 0xc4,
+0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x65, 0x00, 0x74,
+0x77, 0x6f, 0x5c, 0x01, 0x30, 0x00, 0x62, 0x65, 0xa4, 0x00,
+0x10, 0x69, 0xa7, 0x00, 0xb6, 0x6f, 0x00, 0x64, 0x69, 0x66,
+0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x87, 0x00, 0x64, 0x00,
+0x00, 0x54, 0x68, 0x69, 0x73, 0x8a, 0x00, 0x90, 0x77, 0x61,
+0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e, 0x22, 0x01, 0xf1,
+0x06, 0x62, 0x79, 0x00, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69,
+0x00, 0x5b, 0x31, 0x33, 0x5d, 0x2c, 0x00, 0x75, 0x6e, 0x64,
+0x65, 0x72, 0x88, 0x00, 0x80, 0x6e, 0x61, 0x6d, 0x65, 0x00,
+0x60, 0x54, 0x65, 0x6c, 0x01, 0x71, 0x00, 0x53, 0x68, 0x6f,
+0x77, 0x27, 0x3b, 0x4d, 0x01, 0x01, 0x18, 0x00, 0x02, 0xce,
+0x00, 0x30, 0x6d, 0x6f, 0x6e, 0x9e, 0x00, 0x51, 0x72, 0x61,
+0x6e, 0x73, 0x6c, 0x70, 0x01, 0x01, 0x07, 0x02, 0xf4, 0x04,
+0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x00, 0x61, 0x73,
+0x00, 0x60, 0x53, 0x70, 0x69, 0x72, 0x61, 0x6c, 0x00, 0xa0,
+0x02, 0x10, 0x27, 0x8c, 0x00, 0x04, 0x0d, 0x00, 0x01, 0x89,
+0x00, 0x00, 0xcc, 0x01, 0x40, 0x72, 0x69, 0x62, 0x75, 0x3e,
+0x00, 0x51, 0x74, 0x6f, 0x00, 0x74, 0x68, 0x5a, 0x00, 0x41,
+0x6c, 0x6c, 0x65, 0x63, 0x66, 0x02, 0xe1, 0x62, 0x79, 0x00,
+0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76,
+0x65, 0xb7, 0x01, 0x00, 0xa8, 0x00, 0xe1, 0x00, 0x68, 0x74,
+0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e,
+0x6e, 0xc0, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70,
+0x2f, 0x65, 0x6e, 0x2f, 0xe7, 0x00, 0x31, 0x73, 0x2f, 0x74,
+0xbb, 0x00, 0xd6, 0x5f, 0x73, 0x68, 0x6f, 0x77, 0x2f, 0x00,
+0x00, 0x00, 0x32, 0x38, 0x2e, 0x31, 0x29, 0x03, 0x01, 0x78,
+0x00, 0xf0, 0x02, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00,
+0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b,
+0x84, 0x01, 0x32, 0x61, 0x6e, 0x79, 0x84, 0x01, 0x00, 0x96,
+0x01, 0x01, 0x51, 0x01, 0x00, 0x0c, 0x02, 0x21, 0x61, 0x6e,
+0xfa, 0x01, 0x21, 0x00, 0x69, 0xe2, 0x01, 0x10, 0x72, 0x02,
+0x01, 0x31, 0x6e, 0x27, 0x74, 0x7a, 0x02, 0xb0, 0x61, 0x6c,
+0x72, 0x65, 0x61, 0x64, 0x79, 0x2c, 0x00, 0x6f, 0x72, 0x2f,
+0x00, 0x61, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x1a, 0x00,
+0x07, 0x2d, 0x00, 0x30, 0x2e, 0x00, 0x57, 0xf5, 0x01, 0x00,
+0x5c, 0x02, 0x50, 0x63, 0x72, 0x65, 0x61, 0x74, 0x8a, 0x03,
+0x54, 0x76, 0x61, 0x6c, 0x69, 0x64, 0xff, 0x02, 0x10, 0x28,
+0x31, 0x00, 0x05, 0xc1, 0x02, 0x7f, 0x63, 0x6c, 0x6f, 0x73,
+0x65, 0x64, 0x2c, 0xeb, 0x02, 0x06, 0x1b, 0x2c, 0x2f, 0x03,
+0x05, 0x22, 0x03, 0x62, 0x00, 0x61, 0x62, 0x6f, 0x75, 0x74,
+0x2c, 0x02, 0x01, 0x28, 0x00, 0x09, 0x31, 0x03, 0x50, 0x6e,
+0x6f, 0x00, 0x65, 0x78, 0xb0, 0x01, 0x43, 0x65, 0x6f, 0x75,
+0x73, 0xcb, 0x02, 0x71, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65,
+0x6e, 0x51, 0x02, 0x21, 0x6f, 0x66, 0xe3, 0x01, 0x34, 0x6f,
+0x77, 0x6e, 0x5c, 0x02, 0xf1, 0x07, 0x29, 0x2c, 0x00, 0x69,
+0x74, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x62, 0x65, 0x00,
+0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x5c, 0x03,
+0x80, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0xa3,
+0x03, 0x6a, 0x3b, 0x00, 0x73, 0x6f, 0x00, 0x79, 0x2c, 0x04,
+0x01, 0x70, 0x04, 0x20, 0x74, 0x68, 0xd6, 0x00, 0x23, 0x6f,
+0x6c, 0xd8, 0x02, 0x08, 0x41, 0x00, 0x22, 0x69, 0x6e, 0xa7,
+0x00, 0x21, 0x77, 0x61, 0xd8, 0x01, 0x30, 0x44, 0x75, 0x72,
+0xc2, 0x02, 0x72, 0x73, 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67,
+0x87, 0x03, 0x10, 0x6d, 0x2b, 0x00, 0x52, 0x00, 0x6b, 0x6e,
+0x6f, 0x77, 0x2b, 0x00, 0x12, 0x61, 0x81, 0x04, 0x16, 0x63,
+0xbd, 0x04, 0x02, 0xa7, 0x00, 0x03, 0x02, 0x03, 0x01, 0x77,
+0x00, 0xa2, 0x61, 0x00, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66,
+0x69, 0x63, 0x01, 0x01, 0x70, 0x62, 0x75, 0x74, 0x00, 0x6e,
+0x6f, 0x74, 0xbf, 0x00, 0x22, 0x73, 0x75, 0x06, 0x04, 0x11,
+0x77, 0x95, 0x01, 0x00, 0x9b, 0x00, 0x02, 0x03, 0x01, 0x21,
+0x67, 0x6f, 0x27, 0x01, 0x02, 0x7e, 0x01, 0x10, 0x6f, 0xb3,
+0x01, 0x05, 0x5b, 0x03, 0x00, 0x5d, 0x00, 0x06, 0xd8, 0x04,
+0x01, 0xa2, 0x02, 0x01, 0x81, 0x01, 0x71, 0x2e, 0x00, 0x49,
+0x6e, 0x00, 0x6f, 0x72, 0x2d, 0x03, 0x05, 0x0c, 0x04, 0x23,
+0x69, 0x73, 0x07, 0x01, 0x30, 0x00, 0x64, 0x6f, 0x1e, 0x02,
+0x72, 0x66, 0x6f, 0x72, 0x67, 0x65, 0x74, 0x2c, 0xf6, 0x01,
+0x40, 0x61, 0x6e, 0x00, 0x72, 0xcf, 0x00, 0x06, 0x6a, 0x02,
+0x03, 0x4b, 0x00, 0x01, 0x7c, 0x00, 0x53, 0x64, 0x72, 0x61,
+0x67, 0x2c, 0x82, 0x00, 0x01, 0x6e, 0x01, 0x04, 0x26, 0x02,
+0x72, 0x6e, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2b, 0x04,
+0x71, 0x72, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0xab, 0x05,
+0x16, 0x74, 0x8b, 0x00, 0x42, 0x44, 0x72, 0x6f, 0x70, 0x21,
+0x01, 0x44, 0x69, 0x6e, 0x00, 0x61, 0x14, 0x01, 0x22, 0x6f,
+0x66, 0x92, 0x01, 0x61, 0x63, 0x68, 0x6f, 0x69, 0x63, 0x65,
+0x66, 0x00, 0x04, 0xcb, 0x01, 0x61, 0x72, 0x65, 0x6d, 0x69,
+0x6e, 0x64, 0x98, 0x00, 0x02, 0x73, 0x00, 0x20, 0x64, 0x6f,
+0x2a, 0x05, 0x91, 0x27, 0x73, 0x00, 0x61, 0x73, 0x73, 0x6f,
+0x63, 0x69, 0xcd, 0x03, 0x41, 0x77, 0x69, 0x74, 0x68, 0x01,
+0x06, 0x01, 0xbc, 0x00, 0x4c, 0x61, 0x6c, 0x73, 0x6f, 0xc1,
+0x00, 0x42, 0x65, 0x78, 0x69, 0x73, 0x8d, 0x00, 0x00, 0xa3,
+0x00, 0x02, 0x21, 0x06, 0x21, 0x69, 0x63, 0x16, 0x05, 0x41,
+0x6d, 0x00, 0x75, 0x70, 0x73, 0x00, 0x01, 0x0d, 0x03, 0x00,
+0x11, 0x00, 0x01, 0x20, 0x03, 0x72, 0x64, 0x65, 0x73, 0x74,
+0x72, 0x6f, 0x79, 0x22, 0x00, 0x81, 0x62, 0x79, 0x00, 0x64,
+0x72, 0x6f, 0x70, 0x70, 0xb9, 0x04, 0x00, 0x11, 0x00, 0x35,
+0x6f, 0x66, 0x66, 0x96, 0x01, 0x04, 0x4c, 0x05, 0x00, 0xe6,
+0x01, 0xa1, 0x2e, 0x00, 0x28, 0x41, 0x6c, 0x73, 0x6f, 0x2c,
+0x00, 0x69, 0xd3, 0x00, 0x31, 0x27, 0x72, 0x65, 0xd2, 0x01,
+0x01, 0xcf, 0x01, 0x06, 0xc0, 0x00, 0x05, 0x2b, 0x01, 0x28,
+0x69, 0x73, 0x27, 0x01, 0x06, 0x7f, 0x01, 0x01, 0x9c, 0x00,
+0x29, 0x69, 0x74, 0x9a, 0x00, 0x50, 0x69, 0x74, 0x00, 0x61,
+0x72, 0xc1, 0x05, 0x02, 0xc7, 0x01, 0x11, 0x6b, 0x12, 0x00,
+0xa3, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x65, 0x72, 0x2e, 0x00,
+0x49, 0x30, 0x01, 0x60, 0x73, 0x77, 0x69, 0x76, 0x65, 0x6c,
+0x09, 0x02, 0x40, 0x73, 0x74, 0x61, 0x6e, 0x88, 0x03, 0x24,
+0x61, 0x73, 0x28, 0x06, 0x50, 0x67, 0x00, 0x69, 0x74, 0x2c,
+0x3e, 0x00, 0x42, 0x73, 0x74, 0x61, 0x79, 0x79, 0x00, 0x06,
+0x7a, 0x06, 0x21, 0x70, 0x61, 0x8a, 0x05, 0x00, 0xa6, 0x01,
+0x3a, 0x29, 0x00, 0x00, 0x4d, 0x01, 0x22, 0x75, 0x73, 0x84,
+0x02, 0xa2, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b,
+0x65, 0x79, 0x58, 0x06, 0x00, 0x97, 0x00, 0x04, 0x94, 0x00,
+0x04, 0x10, 0x06, 0x05, 0x8f, 0x02, 0x13, 0x6e, 0x2e, 0x06,
+0x83, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x69, 0x9b,
+0x06, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x44, 0x00,
+0x02, 0x5d, 0x06, 0x67, 0x6f, 0x76, 0x65, 0x72, 0x00, 0x61,
+0xc8, 0x04, 0x01, 0xc7, 0x00, 0x01, 0xca, 0x04, 0x22, 0x6f,
+0x72, 0xe0, 0x00, 0x01, 0xa0, 0x00, 0x00, 0x6a, 0x01, 0x10,
+0x2c, 0xcd, 0x00, 0x5f, 0x61, 0x62, 0x6f, 0x76, 0x65, 0x55,
+0x00, 0x13, 0x23, 0x64, 0x6f, 0x16, 0x01, 0x01, 0x50, 0x01,
+0x25, 0x75, 0x70, 0x79, 0x01, 0x01, 0x06, 0x01, 0x22, 0x62,
+0x65, 0xd5, 0x01, 0x22, 0x65, 0x64, 0x46, 0x06, 0x8c, 0x65,
+0x78, 0x74, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x00, 0x00,
+0xa5, 0x01, 0x00, 0x6d, 0x00, 0x33, 0x65, 0x64, 0x3b, 0xf6,
+0x05, 0x04, 0x18, 0x01, 0x20, 0x62, 0x65, 0x1b, 0x01, 0x15,
+0x64, 0x0c, 0x01, 0x0c, 0x66, 0x02, 0x02, 0x1c, 0x01, 0x12,
+0x2c, 0x69, 0x05, 0x05, 0x3c, 0x02, 0x0e, 0x4d, 0x02, 0x13,
+0x6e, 0xac, 0x00, 0x52, 0x6f, 0x72, 0x00, 0x61, 0x6e, 0xd6,
+0x03, 0x01, 0x42, 0x00, 0x00, 0x6d, 0x04, 0x41, 0x28, 0x41,
+0x6c, 0x6c, 0x92, 0x00, 0x11, 0x61, 0x68, 0x06, 0x10, 0x73,
+0x99, 0x02, 0x42, 0x63, 0x72, 0x69, 0x62, 0x97, 0x04, 0x13,
+0x73, 0x7e, 0x06, 0x31, 0x32, 0x2e, 0x31, 0x01, 0x04, 0x01,
+0x97, 0x00, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
+0x6c, 0x65, 0x2e, 0x29, 0x4e, 0x06, 0x16, 0x32, 0x4e, 0x06,
+0x00, 0x94, 0x07, 0x71, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
+0x20, 0x6d, 0x07, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00,
+0x02, 0x44, 0x00, 0x04, 0x3f, 0x00, 0x51, 0x00, 0x66, 0x72,
+0x6f, 0x6d, 0x7c, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74,
+0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x72,
+0x00, 0x03, 0x16, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65,
+0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae, 0x00, 0x91, 0x57,
+0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x0f, 0x05,
+0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x20, 0x03, 0x01, 0xdf,
+0x01, 0x15, 0x69, 0xac, 0x05, 0x01, 0x46, 0x05, 0x30, 0x69,
+0x66, 0x66, 0x20, 0x05, 0x63, 0x74, 0x79, 0x00, 0x00, 0x00,
+0x43, 0xe5, 0x06, 0x02, 0x2a, 0x04, 0x06, 0x1a, 0x00, 0x04,
+0x5b, 0x03, 0x41, 0x65, 0x6e, 0x65, 0x72, 0xeb, 0x03, 0x02,
+0x33, 0x07, 0x57, 0x2e, 0x00, 0x4d, 0x6f, 0x72, 0x29, 0x00,
+0x13, 0x00, 0x4a, 0x07, 0xa0, 0x00, 0x72, 0x65, 0x71, 0x75,
+0x69, 0x72, 0x65, 0x00, 0x6d, 0x1f, 0x00, 0x02, 0xc6, 0x08,
+0x62, 0x78, 0x00, 0x64, 0x65, 0x64, 0x75, 0x3d, 0x01, 0x02,
+0x65, 0x06, 0x01, 0xb8, 0x00, 0x80, 0x55, 0x6e, 0x72, 0x65,
+0x61, 0x73, 0x6f, 0x6e, 0xe9, 0x00, 0x18, 0x27, 0x73, 0x00,
+0x20, 0x6c, 0x65, 0x41, 0x03, 0x35, 0x6d, 0x61, 0x79, 0x4d,
+0x00, 0xe0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0x63,
+0x6b, 0x69, 0x6e, 0x67, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2754;
-const unsigned short help_text_words = 497;
+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 cdfc24e6b3..3c77344424 100644
--- a/apps/plugins/puzzles/help/guess.c
+++ b/apps/plugins/puzzles/help/guess.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,209 +6,237 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 123, TEXT_CENTER | C_RED },
- { 404, TEXT_CENTER | C_RED },
- { 432, TEXT_UNDERLINE },
- { 452, TEXT_UNDERLINE },
- { 465, TEXT_UNDERLINE },
- { 483, TEXT_UNDERLINE },
- { 543, TEXT_UNDERLINE },
+ { 124, TEXT_CENTER | C_RED },
+ { 444, TEXT_CENTER | C_RED },
+ { 472, TEXT_UNDERLINE },
+ { 492, TEXT_UNDERLINE },
+ { 505, TEXT_UNDERLINE },
+ { 523, TEXT_UNDERLINE },
+ { 583, TEXT_UNDERLINE },
+ { 614, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 3042 comp 1883 ratio 0.619001 level 10 saved 1159 */
+/* orig 3506 comp 2143 ratio 0.611238 level 10 saved 1363 */
 const char help_text[] = {
-0xf2, 0x2a, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x35, 0x3a, 0x20, 0x47, 0x75, 0x65, 0x73, 0x73, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
-0x65, 0x00, 0x61, 0x00, 0x73, 0x65, 0x74, 0x00, 0x6f, 0x66,
-0x00, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x65, 0x64, 0x00,
-0x70, 0x65, 0x67, 0x73, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x21,
-0x00, 0xb0, 0x74, 0x6f, 0x00, 0x72, 0x65, 0x70, 0x72, 0x6f,
-0x64, 0x75, 0x63, 0x2e, 0x00, 0xf0, 0x07, 0x70, 0x72, 0x65,
-0x64, 0x65, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x65, 0x64,
-0x00, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x41,
-0x00, 0xf0, 0x00, 0x74, 0x68, 0x65, 0x6d, 0x00, 0x28, 0x63,
-0x68, 0x6f, 0x73, 0x65, 0x6e, 0x00, 0x62, 0x79, 0x10, 0x00,
-0xf0, 0x13, 0x00, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-0x72, 0x29, 0x00, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e, 0x00,
-0x61, 0x00, 0x63, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x00,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x39, 0x00, 0x10, 0x67,
-0x95, 0x00, 0xa2, 0x65, 0x73, 0x2e, 0x00, 0x00, 0x00, 0x45,
-0x61, 0x63, 0x68, 0x10, 0x00, 0xc1, 0x00, 0x67, 0x65, 0x74,
-0x73, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x3d, 0x00,
-0x01, 0x50, 0x00, 0x06, 0x35, 0x00, 0xa9, 0x63, 0x6f, 0x72,
-0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x2d, 0xb9, 0x00, 0x33,
-0x00, 0x69, 0x6e, 0x79, 0x00, 0x01, 0x1f, 0x00, 0xf2, 0x03,
-0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x73, 0x00, 0x28, 0x69,
-0x6e, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x29, 0xda, 0x00,
-0x4f, 0x61, 0x6c, 0x73, 0x6f, 0x51, 0x00, 0x06, 0x1f, 0x00,
-0x52, 0x00, 0x02, 0x58, 0x77, 0x72, 0x6f, 0x6e, 0x67, 0x50,
-0x00, 0x60, 0x77, 0x68, 0x69, 0x74, 0x65, 0x29, 0xb6, 0x00,
-0xc2, 0x54, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65,
-0x00, 0x69, 0x73, 0x5b, 0x00, 0x70, 0x6b, 0x6e, 0x6f, 0x77,
-0x6e, 0x00, 0x28, 0x6b, 0x00, 0x01, 0xc3, 0x00, 0x40, 0x74,
-0x65, 0x64, 0x2c, 0x14, 0x01, 0xf2, 0x0b, 0x48, 0x61, 0x73,
-0x62, 0x72, 0x6f, 0x2c, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x6c,
-0x79, 0x29, 0x00, 0x61, 0x73, 0x00, 0x61, 0x00, 0x62, 0x6f,
-0x61, 0x72, 0x64, 0x40, 0x00, 0x42, 0x60, 0x4d, 0x61, 0x73,
-0x5d, 0x01, 0x32, 0x64, 0x27, 0x2c, 0xf7, 0x00, 0x13, 0x36,
-0x8f, 0x00, 0x42, 0x73, 0x2c, 0x00, 0x34, 0x91, 0x00, 0x72,
-0x70, 0x65, 0x72, 0x00, 0x72, 0x6f, 0x77, 0xca, 0x00, 0x26,
-0x31, 0x30, 0x40, 0x01, 0xa0, 0x48, 0x6f, 0x77, 0x65, 0x76,
-0x65, 0x72, 0x2c, 0x00, 0x74, 0x91, 0x00, 0xf0, 0x06, 0x76,
-0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x61, 0x6c, 0x6c,
-0x6f, 0x77, 0x73, 0x00, 0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-0xee, 0x01, 0x50, 0x74, 0x69, 0x6e, 0x67, 0x73, 0xf3, 0x00,
-0x08, 0xfd, 0x00, 0x01, 0x63, 0x00, 0x40, 0x00, 0x28, 0x75,
-0x70, 0xf1, 0x01, 0x47, 0x31, 0x30, 0x29, 0x2c, 0x1e, 0x00,
-0x0e, 0x76, 0x00, 0x0f, 0xbd, 0x01, 0x02, 0x11, 0x47, 0xb8,
-0x01, 0xf0, 0x00, 0x77, 0x61, 0x73, 0x00, 0x63, 0x6f, 0x6e,
-0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x4f, 0x00,
-0x01, 0x8f, 0x00, 0x91, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-0x74, 0x69, 0x6f, 0x1d, 0x02, 0xc0, 0x4a, 0x61, 0x6d, 0x65,
-0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0x79, 0x3c, 0x00,
-0x43, 0x31, 0x35, 0x2e, 0x31, 0x9e, 0x02, 0x01, 0x3d, 0x00,
-0x49, 0x6f, 0x6c, 0x73, 0x20, 0x5a, 0x01, 0x60, 0x63, 0x61,
-0x6e, 0x00, 0x62, 0x65, 0x80, 0x01, 0x14, 0x79, 0x11, 0x02,
-0x61, 0x65, 0x69, 0x74, 0x68, 0x65, 0x72, 0x9d, 0x01, 0x32,
-0x6b, 0x65, 0x79, 0x46, 0x01, 0x12, 0x6f, 0x10, 0x00, 0x50,
-0x6d, 0x6f, 0x75, 0x73, 0x65, 0x58, 0x00, 0x14, 0x57, 0x3a,
-0x02, 0x01, 0x12, 0x00, 0x89, 0x2c, 0x00, 0x64, 0x72, 0x61,
-0x67, 0x00, 0x61, 0xe2, 0x01, 0x51, 0x00, 0x66, 0x72, 0x6f,
-0x6d, 0x24, 0x00, 0x62, 0x74, 0x72, 0x61, 0x79, 0x00, 0x6f,
-0xef, 0x01, 0x60, 0x6c, 0x65, 0x66, 0x74, 0x2d, 0x68, 0xec,
-0x00, 0x31, 0x73, 0x69, 0x64, 0x06, 0x03, 0x91, 0x69, 0x74,
-0x73, 0x00, 0x72, 0x65, 0x71, 0x75, 0x69, 0x38, 0x00, 0x31,
-0x6f, 0x73, 0x69, 0xcc, 0x00, 0x04, 0x70, 0x02, 0x62, 0x75,
-0x72, 0x72, 0x65, 0x6e, 0x74, 0x0f, 0x01, 0x12, 0x3b, 0x32,
-0x01, 0x32, 0x6d, 0x61, 0x79, 0x0e, 0x02, 0x21, 0x62, 0x65,
-0x78, 0x00, 0x32, 0x67, 0x65, 0x64, 0x6c, 0x00, 0x04, 0x2d,
-0x00, 0x00, 0x5e, 0x00, 0x44, 0x70, 0x61, 0x73, 0x74, 0x45,
-0x01, 0x00, 0x66, 0x00, 0x42, 0x63, 0x6f, 0x70, 0x79, 0x4b,
-0x03, 0xc0, 0x65, 0x6c, 0x73, 0x65, 0x77, 0x68, 0x65, 0x72,
-0x65, 0x2e, 0x00, 0x54, 0x84, 0x03, 0x31, 0x6d, 0x6f, 0x76,
-0x81, 0x03, 0x23, 0x65, 0x67, 0xc7, 0x00, 0x10, 0x69, 0xb8,
-0x03, 0x11, 0x66, 0x98, 0x00, 0x04, 0x52, 0x00, 0x05, 0x97,
-0x00, 0x62, 0x74, 0x6f, 0x00, 0x73, 0x6f, 0x6d, 0x40, 0x00,
-0x80, 0x00, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10,
-0x01, 0xef, 0x52, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x63, 0x6c,
-0x69, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0xbe, 0x00, 0x02, 0x40,
-0x00, 0x61, 0x64, 0x64, 0x97, 0x02, 0x62, 0x60, 0x68, 0x6f,
-0x6c, 0x64, 0x27, 0xc0, 0x02, 0x13, 0x72, 0xd3, 0x00, 0x42,
-0x74, 0x68, 0x61, 0x74, 0x17, 0x04, 0x00, 0x1d, 0x00, 0x03,
-0x1c, 0x00, 0x60, 0x73, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0xe6,
-0x00, 0xd0, 0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69,
-0x63, 0x61, 0x6c, 0x6c, 0x79, 0x48, 0x00, 0x04, 0x00, 0x02,
-0x55, 0x65, 0x00, 0x6e, 0x65, 0x78, 0x60, 0x00, 0x41, 0x66,
-0x74, 0x65, 0x72, 0x3c, 0x00, 0x30, 0x69, 0x6e, 0x67, 0x95,
-0x00, 0xd3, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74,
-0x69, 0x76, 0x65, 0x6c, 0x79, 0xf7, 0x02, 0x08, 0xd6, 0x01,
-0x11, 0x2c, 0x0e, 0x00, 0x21, 0x75, 0x70, 0x31, 0x01, 0x10,
-0x64, 0x5a, 0x03, 0x60, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0x21, 0x00, 0x14, 0x73, 0x1a, 0x02, 0x22, 0x75, 0x73, 0x6d,
-0x00, 0x20, 0x73, 0x65, 0x67, 0x02, 0x02, 0x29, 0x01, 0x03,
-0xe8, 0x01, 0x15, 0x2c, 0xd2, 0x01, 0x01, 0x42, 0x00, 0x10,
-0x72, 0x04, 0x01, 0x02, 0x3c, 0x00, 0x0c, 0x30, 0x00, 0x04,
-0x40, 0x01, 0x02, 0xe6, 0x02, 0x00, 0x36, 0x00, 0x90, 0x73,
-0x70, 0x61, 0x63, 0x65, 0x00, 0x62, 0x61, 0x72, 0x5b, 0x02,
-0x41, 0x45, 0x6e, 0x74, 0x65, 0x76, 0x00, 0x00, 0x39, 0x00,
-0x01, 0x0b, 0x04, 0x03, 0x38, 0x00, 0x02, 0xff, 0x04, 0x03,
-0x4c, 0x00, 0x23, 0x65, 0x64, 0x78, 0x00, 0x05, 0x5f, 0x01,
-0x02, 0x14, 0x05, 0x04, 0x5d, 0x00, 0x50, 0x2e, 0x00, 0x60,
-0x44, 0x27, 0x4f, 0x00, 0x42, 0x42, 0x61, 0x63, 0x6b, 0x60,
-0x00, 0x02, 0xde, 0x01, 0x14, 0x73, 0xdf, 0x01, 0x00, 0x7d,
-0x00, 0x11, 0x53, 0x19, 0x00, 0x03, 0x8c, 0x01, 0x07, 0x6e,
-0x01, 0x00, 0x31, 0x01, 0x50, 0x50, 0x72, 0x65, 0x73, 0x73,
-0xc0, 0x01, 0x21, 0x60, 0x68, 0x49, 0x00, 0x32, 0x60, 0x3f,
-0x27, 0x84, 0x01, 0x10, 0x66, 0x05, 0x00, 0x0e, 0xd2, 0x01,
-0x01, 0x52, 0x01, 0x80, 0x61, 0x00, 0x73, 0x75, 0x67, 0x67,
-0x65, 0x73, 0xa0, 0x00, 0x01, 0x17, 0x00, 0x31, 0x2e, 0x00,
-0x55, 0x45, 0x00, 0x01, 0x9f, 0x03, 0xf0, 0x01, 0x69, 0x73,
+0x00, 0x2d, 0x01, 0x00, 0xf2, 0x18, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00,
+0x73, 0x65, 0x74, 0x00, 0x6f, 0x66, 0x00, 0x63, 0x6f, 0x6c,
+0x6f, 0x75, 0x72, 0x65, 0x64, 0x00, 0x70, 0x65, 0x67, 0x73,
+0x2c, 0x00, 0x61, 0x6e, 0x64, 0x21, 0x00, 0xb0, 0x74, 0x6f,
+0x00, 0x72, 0x65, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x2e,
+0x00, 0xf0, 0x07, 0x70, 0x72, 0x65, 0x64, 0x65, 0x74, 0x65,
+0x72, 0x6d, 0x69, 0x6e, 0x65, 0x64, 0x00, 0x73, 0x65, 0x71,
+0x75, 0x65, 0x6e, 0x63, 0x65, 0x41, 0x00, 0xf0, 0x00, 0x74,
+0x68, 0x65, 0x6d, 0x00, 0x28, 0x63, 0x68, 0x6f, 0x73, 0x65,
+0x6e, 0x00, 0x62, 0x79, 0x10, 0x00, 0xf0, 0x13, 0x00, 0x63,
+0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x29, 0x00, 0x77,
+0x69, 0x74, 0x68, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x63, 0x65,
+0x72, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, 0x62,
+0x65, 0x72, 0x39, 0x00, 0x10, 0x67, 0xa7, 0x00, 0xa2, 0x65,
+0x73, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x61, 0x63, 0x68, 0x10,
+0x00, 0xc1, 0x00, 0x67, 0x65, 0x74, 0x73, 0x00, 0x6d, 0x61,
+0x72, 0x6b, 0x65, 0x64, 0x3d, 0x00, 0x01, 0x50, 0x00, 0x06,
+0x35, 0x00, 0xa9, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74,
+0x6c, 0x79, 0x2d, 0xb9, 0x00, 0x33, 0x00, 0x69, 0x6e, 0x79,
+0x00, 0x01, 0x1f, 0x00, 0xf2, 0x03, 0x00, 0x70, 0x6c, 0x61,
+0x63, 0x65, 0x73, 0x00, 0x28, 0x69, 0x6e, 0x00, 0x62, 0x6c,
+0x61, 0x63, 0x6b, 0x29, 0xda, 0x00, 0x4f, 0x61, 0x6c, 0x73,
+0x6f, 0x51, 0x00, 0x06, 0x1f, 0x00, 0x52, 0x00, 0x02, 0x58,
+0x77, 0x72, 0x6f, 0x6e, 0x67, 0x50, 0x00, 0x60, 0x77, 0x68,
+0x69, 0x74, 0x65, 0x29, 0xb6, 0x00, 0xc2, 0x54, 0x68, 0x69,
+0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x69, 0x73, 0x5b,
+0x00, 0x70, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x00, 0x28, 0x6b,
+0x00, 0x01, 0xc3, 0x00, 0x40, 0x74, 0x65, 0x64, 0x2c, 0x14,
+0x01, 0xf2, 0x0b, 0x48, 0x61, 0x73, 0x62, 0x72, 0x6f, 0x2c,
+0x00, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x79, 0x29, 0x00, 0x61,
+0x73, 0x00, 0x61, 0x00, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x40,
+0x00, 0x42, 0x60, 0x4d, 0x61, 0x73, 0x5d, 0x01, 0x32, 0x64,
+0x27, 0x2c, 0xf7, 0x00, 0x13, 0x36, 0x8f, 0x00, 0x42, 0x73,
+0x2c, 0x00, 0x34, 0x91, 0x00, 0x72, 0x70, 0x65, 0x72, 0x00,
+0x72, 0x6f, 0x77, 0xca, 0x00, 0x26, 0x31, 0x30, 0x40, 0x01,
+0xa0, 0x48, 0x6f, 0x77, 0x65, 0x76, 0x65, 0x72, 0x2c, 0x00,
+0x74, 0x91, 0x00, 0xf0, 0x06, 0x76, 0x65, 0x72, 0x73, 0x69,
+0x6f, 0x6e, 0x00, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x73, 0x00,
+0x63, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0xee, 0x01, 0x50, 0x74,
+0x69, 0x6e, 0x67, 0x73, 0xf3, 0x00, 0x08, 0xfd, 0x00, 0x01,
+0x63, 0x00, 0x40, 0x00, 0x28, 0x75, 0x70, 0xf1, 0x01, 0x47,
+0x31, 0x30, 0x29, 0x2c, 0x1e, 0x00, 0x0e, 0x76, 0x00, 0x0f,
+0xbd, 0x01, 0x02, 0x11, 0x47, 0xb8, 0x01, 0xf0, 0x00, 0x77,
+0x61, 0x73, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x69, 0x62,
+0x75, 0x74, 0x65, 0x64, 0x4f, 0x00, 0x01, 0x8f, 0x00, 0x91,
+0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x1d,
+0x02, 0xc0, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61,
+0x72, 0x76, 0x65, 0x79, 0x3c, 0x00, 0x43, 0x31, 0x35, 0x2e,
+0x31, 0xb0, 0x02, 0x01, 0x3d, 0x00, 0x49, 0x6f, 0x6c, 0x73,
+0x20, 0x5a, 0x01, 0x60, 0x63, 0x61, 0x6e, 0x00, 0x62, 0x65,
+0x80, 0x01, 0x14, 0x79, 0x11, 0x02, 0x61, 0x65, 0x69, 0x74,
+0x68, 0x65, 0x72, 0x9d, 0x01, 0x32, 0x6b, 0x65, 0x79, 0x46,
+0x01, 0x12, 0x6f, 0x10, 0x00, 0x50, 0x6d, 0x6f, 0x75, 0x73,
+0x65, 0x58, 0x00, 0x14, 0x57, 0x3a, 0x02, 0x01, 0x12, 0x00,
+0x89, 0x2c, 0x00, 0x64, 0x72, 0x61, 0x67, 0x00, 0x61, 0xe2,
+0x01, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x24, 0x00, 0x62,
+0x74, 0x72, 0x61, 0x79, 0x00, 0x6f, 0xef, 0x01, 0x60, 0x6c,
+0x65, 0x66, 0x74, 0x2d, 0x68, 0xec, 0x00, 0x31, 0x73, 0x69,
+0x64, 0x06, 0x03, 0x91, 0x69, 0x74, 0x73, 0x00, 0x72, 0x65,
+0x71, 0x75, 0x69, 0x38, 0x00, 0x31, 0x6f, 0x73, 0x69, 0xcc,
+0x00, 0x04, 0x70, 0x02, 0x62, 0x75, 0x72, 0x72, 0x65, 0x6e,
+0x74, 0x0f, 0x01, 0x12, 0x3b, 0x32, 0x01, 0x32, 0x6d, 0x61,
+0x79, 0x0e, 0x02, 0x21, 0x62, 0x65, 0x78, 0x00, 0x32, 0x67,
+0x65, 0x64, 0x6c, 0x00, 0x04, 0x2d, 0x00, 0x00, 0x5e, 0x00,
+0x44, 0x70, 0x61, 0x73, 0x74, 0x45, 0x01, 0x00, 0x66, 0x00,
+0x42, 0x63, 0x6f, 0x70, 0x79, 0x4b, 0x03, 0xc0, 0x65, 0x6c,
+0x73, 0x65, 0x77, 0x68, 0x65, 0x72, 0x65, 0x2e, 0x00, 0x54,
+0x84, 0x03, 0x31, 0x6d, 0x6f, 0x76, 0x81, 0x03, 0x23, 0x65,
+0x67, 0xc7, 0x00, 0x10, 0x69, 0xb8, 0x03, 0x11, 0x66, 0x98,
+0x00, 0x04, 0x52, 0x00, 0x05, 0x97, 0x00, 0x62, 0x74, 0x6f,
+0x00, 0x73, 0x6f, 0x6d, 0x40, 0x00, 0x80, 0x00, 0x69, 0x6e,
+0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0x01, 0xef, 0x52, 0x69,
+0x67, 0x68, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x69,
+0x6e, 0x67, 0xbe, 0x00, 0x02, 0x40, 0x00, 0x61, 0x64, 0x64,
+0x97, 0x02, 0x62, 0x60, 0x68, 0x6f, 0x6c, 0x64, 0x27, 0xc0,
+0x02, 0x13, 0x72, 0xd3, 0x00, 0x42, 0x74, 0x68, 0x61, 0x74,
+0x17, 0x04, 0x00, 0x1d, 0x00, 0x03, 0x1c, 0x00, 0x60, 0x73,
+0x00, 0x77, 0x69, 0x6c, 0x6c, 0xe6, 0x00, 0xd0, 0x61, 0x75,
+0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c,
+0x79, 0x48, 0x00, 0x04, 0x00, 0x02, 0x55, 0x65, 0x00, 0x6e,
+0x65, 0x78, 0x60, 0x00, 0x41, 0x66, 0x74, 0x65, 0x72, 0x3c,
+0x00, 0x30, 0x69, 0x6e, 0x67, 0x95, 0x00, 0xd3, 0x41, 0x6c,
+0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x6c,
+0x79, 0xf7, 0x02, 0x08, 0xd6, 0x01, 0x11, 0x2c, 0x0e, 0x00,
+0x21, 0x75, 0x70, 0x31, 0x01, 0x10, 0x64, 0x5a, 0x03, 0x60,
+0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x21, 0x00, 0x14, 0x73,
+0x1a, 0x02, 0x22, 0x75, 0x73, 0x6d, 0x00, 0x20, 0x73, 0x65,
+0x67, 0x02, 0x02, 0x29, 0x01, 0x03, 0xe8, 0x01, 0x15, 0x2c,
+0xd2, 0x01, 0x01, 0x42, 0x00, 0x10, 0x72, 0x04, 0x01, 0x02,
+0x3c, 0x00, 0x0c, 0x30, 0x00, 0x04, 0x40, 0x01, 0x02, 0xe6,
+0x02, 0x00, 0x36, 0x00, 0x41, 0x45, 0x6e, 0x74, 0x65, 0x69,
+0x00, 0x00, 0x2c, 0x00, 0x01, 0xfe, 0x03, 0x03, 0x2b, 0x00,
+0x02, 0xf2, 0x04, 0x03, 0x3f, 0x00, 0x23, 0x65, 0x64, 0x6b,
+0x00, 0x05, 0x52, 0x01, 0x02, 0x07, 0x05, 0x04, 0x50, 0x00,
+0x50, 0x2e, 0x00, 0x60, 0x44, 0x27, 0x9d, 0x02, 0x60, 0x42,
+0x61, 0x63, 0x6b, 0x73, 0x70, 0x46, 0x00, 0x02, 0xd1, 0x01,
+0x14, 0x73, 0xd2, 0x01, 0x00, 0x70, 0x00, 0x11, 0x53, 0x19,
+0x00, 0x03, 0x7f, 0x01, 0x07, 0x61, 0x01, 0x02, 0x64, 0x04,
+0x05, 0xad, 0x04, 0x05, 0xf6, 0x00, 0x04, 0x5d, 0x02, 0x04,
+0xfb, 0x00, 0x61, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0xaa,
+0x01, 0x53, 0x3a, 0x00, 0x60, 0x31, 0x27, 0x11, 0x00, 0x12,
+0x73, 0xdd, 0x02, 0x75, 0x6f, 0x70, 0x2d, 0x6d, 0x6f, 0x73,
+0x74, 0x14, 0x01, 0x33, 0x60, 0x32, 0x27, 0xc2, 0x00, 0x82,
+0x63, 0x6f, 0x6e, 0x64, 0x00, 0x6f, 0x6e, 0x65, 0x86, 0x00,
+0x90, 0x73, 0x6f, 0x00, 0x66, 0x6f, 0x72, 0x74, 0x68, 0x2e,
+0x74, 0x00, 0x22, 0x73, 0x65, 0x66, 0x00, 0x01, 0x7d, 0x02,
+0x00, 0x2e, 0x00, 0x01, 0x56, 0x01, 0x02, 0x7e, 0x01, 0x03,
+0xda, 0x01, 0x01, 0x4f, 0x01, 0x70, 0x2e, 0x00, 0x50, 0x72,
+0x65, 0x73, 0x73, 0x54, 0x02, 0x32, 0x60, 0x4c, 0x27, 0x11,
+0x02, 0x54, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x35, 0x00, 0x15,
+0x73, 0xd7, 0x01, 0x23, 0x69, 0x72, 0xc9, 0x00, 0x01, 0x35,
+0x04, 0x06, 0x37, 0x00, 0x11, 0x68, 0x21, 0x01, 0x23, 0x60,
+0x3f, 0x3e, 0x00, 0x10, 0x66, 0x05, 0x00, 0x0e, 0x9d, 0x02,
+0x01, 0x46, 0x00, 0x80, 0x61, 0x00, 0x73, 0x75, 0x67, 0x67,
+0x65, 0x73, 0x78, 0x01, 0x01, 0x17, 0x00, 0x31, 0x2e, 0x00,
+0x55, 0x45, 0x00, 0x01, 0x6a, 0x04, 0xf0, 0x01, 0x69, 0x73,
 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x72, 0x65, 0x63, 0x6f, 0x6d,
-0x6d, 0x65, 0x6e, 0x64, 0xac, 0x02, 0x20, 0x6f, 0x72, 0x5f,
-0x04, 0x72, 0x6f, 0x72, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0x01,
-0x02, 0x20, 0x61, 0x73, 0x77, 0x02, 0x71, 0x69, 0x73, 0x00,
-0x73, 0x6c, 0x6f, 0x77, 0x61, 0x03, 0x22, 0x68, 0x65, 0xe5,
-0x00, 0x02, 0x6a, 0x00, 0x21, 0x69, 0x73, 0xf4, 0x05, 0x52,
-0x6c, 0x65, 0x74, 0x65, 0x2c, 0x13, 0x01, 0xf2, 0x00, 0x6d,
-0x61, 0x6c, 0x6c, 0x65, 0x72, 0x00, 0x66, 0x65, 0x65, 0x64,
-0x62, 0x61, 0x63, 0x6b, 0x47, 0x00, 0x04, 0x31, 0x02, 0x50,
-0x68, 0x69, 0x67, 0x68, 0x6c, 0x8f, 0x01, 0x45, 0x65, 0x64,
-0x3b, 0x00, 0x96, 0x02, 0x02, 0x83, 0x03, 0x41, 0x73, 0x65,
-0x00, 0x28, 0x7c, 0x00, 0x12, 0x76, 0xa5, 0x00, 0x01, 0x82,
-0x00, 0x04, 0xfa, 0x01, 0x02, 0x56, 0x02, 0x16, 0x6d, 0x2c,
-0x02, 0x52, 0x61, 0x72, 0x72, 0x6f, 0x77, 0xd5, 0x01, 0x01,
-0x57, 0x03, 0x04, 0x22, 0x01, 0x0f, 0xc4, 0x01, 0x07, 0x12,
-0x29, 0x86, 0x00, 0x00, 0x56, 0x01, 0x0e, 0x33, 0x01, 0x12,
-0x2c, 0x89, 0x03, 0x73, 0x61, 0x6e, 0x79, 0x00, 0x68, 0x65,
-0x6c, 0x0a, 0x06, 0x0d, 0xcb, 0x02, 0x02, 0xaa, 0x01, 0x01,
-0x99, 0x03, 0x00, 0x19, 0x00, 0x19, 0x60, 0x43, 0x00, 0x17,
-0x27, 0xb1, 0x01, 0x66, 0x49, 0x66, 0x00, 0x79, 0x6f, 0x75,
-0x64, 0x06, 0x06, 0xa9, 0x03, 0x13, 0x61, 0xb1, 0x01, 0x03,
-0x5f, 0x03, 0x61, 0x65, 0x00, 0x73, 0x6f, 0x6c, 0x75, 0x1a,
-0x00, 0x04, 0x24, 0x01, 0x33, 0x64, 0x69, 0x73, 0xf6, 0x04,
+0x6d, 0x65, 0x6e, 0x64, 0x77, 0x03, 0x20, 0x6f, 0x72, 0x2a,
+0x05, 0x63, 0x6f, 0x72, 0x00, 0x6d, 0x6f, 0x72, 0x90, 0x00,
+0x20, 0x61, 0x73, 0x42, 0x03, 0x71, 0x69, 0x73, 0x00, 0x73,
+0x6c, 0x6f, 0x77, 0x2c, 0x04, 0x22, 0x68, 0x65, 0xbd, 0x01,
+0x02, 0x6a, 0x00, 0x21, 0x69, 0x73, 0xbf, 0x06, 0x52, 0x6c,
+0x65, 0x74, 0x65, 0x2c, 0x29, 0x01, 0xf4, 0x00, 0x6d, 0x61,
+0x6c, 0x6c, 0x65, 0x72, 0x00, 0x66, 0x65, 0x65, 0x64, 0x62,
+0x61, 0x63, 0x6b, 0xd7, 0x00, 0x02, 0xfc, 0x02, 0x50, 0x68,
+0x69, 0x67, 0x68, 0x6c, 0x0b, 0x01, 0x45, 0x65, 0x64, 0x3b,
+0x00, 0x61, 0x03, 0x02, 0x4e, 0x04, 0x41, 0x73, 0x65, 0x00,
+0x28, 0x7c, 0x00, 0x12, 0x76, 0xa5, 0x00, 0x0f, 0x47, 0x01,
+0x00, 0x16, 0x6d, 0xf7, 0x02, 0x52, 0x61, 0x72, 0x72, 0x6f,
+0x77, 0xe6, 0x01, 0x01, 0x22, 0x04, 0x04, 0x22, 0x01, 0x01,
+0x84, 0x00, 0x01, 0x23, 0x02, 0x30, 0x62, 0x61, 0x72, 0xcc,
+0x00, 0x05, 0x9c, 0x02, 0x12, 0x29, 0x86, 0x00, 0x00, 0x2e,
+0x02, 0x0e, 0x33, 0x01, 0x12, 0x2c, 0x54, 0x04, 0x73, 0x61,
+0x6e, 0x79, 0x00, 0x68, 0x65, 0x6c, 0xd5, 0x06, 0x0d, 0x96,
+0x03, 0x02, 0xfc, 0x01, 0x05, 0xe7, 0x01, 0x19, 0x60, 0x43,
+0x00, 0x17, 0x27, 0x89, 0x02, 0x66, 0x49, 0x66, 0x00, 0x79,
+0x6f, 0x75, 0x2f, 0x07, 0x06, 0x74, 0x04, 0x27, 0x61, 0x6c,
+0xee, 0x01, 0x01, 0xad, 0x00, 0x31, 0x6f, 0x6c, 0x75, 0x1a,
+0x00, 0x04, 0x24, 0x01, 0x33, 0x64, 0x69, 0x73, 0xc1, 0x05,
 0x82, 0x62, 0x65, 0x6c, 0x6f, 0x77, 0x3b, 0x00, 0x69, 0x4d,
-0x00, 0x77, 0x72, 0x75, 0x6e, 0x00, 0x6f, 0x75, 0x74, 0x85,
-0x05, 0x01, 0x30, 0x01, 0x03, 0xd0, 0x02, 0xbe, 0x60, 0x53,
+0x00, 0x77, 0x72, 0x75, 0x6e, 0x00, 0x6f, 0x75, 0x74, 0x50,
+0x06, 0x01, 0x30, 0x01, 0x03, 0x9b, 0x03, 0xbe, 0x60, 0x53,
 0x6f, 0x6c, 0x76, 0x65, 0x2e, 0x2e, 0x2e, 0x27, 0x29, 0x57,
-0x00, 0x05, 0x97, 0x04, 0x71, 0x72, 0x65, 0x76, 0x65, 0x61,
-0x6c, 0x65, 0x1b, 0x04, 0x23, 0x28, 0x41, 0x8b, 0x00, 0x11,
-0x61, 0xa6, 0x05, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63,
-0x72, 0x69, 0x62, 0x65, 0x64, 0xc8, 0x02, 0x13, 0x73, 0xbc,
-0x05, 0x72, 0x32, 0x2e, 0x31, 0x00, 0x61, 0x72, 0x65, 0x42,
-0x00, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c,
-0x65, 0x2e, 0x29, 0xc4, 0x05, 0x13, 0x32, 0xc4, 0x05, 0x50,
-0x70, 0x61, 0x72, 0x61, 0x6d, 0x27, 0x08, 0x03, 0xc6, 0x05,
-0x00, 0xcd, 0x01, 0x06, 0x14, 0x00, 0x02, 0x41, 0x00, 0x04,
-0x3c, 0x00, 0x06, 0x80, 0x05, 0x21, 0x60, 0x43, 0xa4, 0x06,
-0x00, 0xb5, 0x00, 0x31, 0x00, 0x6f, 0x70, 0x6f, 0x00, 0x03,
-0x8e, 0x05, 0xc0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x4f, 0x00, 0x82, 0x00, 0x64,
-0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x1c, 0x06, 0x62, 0x6d,
-0x61, 0x74, 0x63, 0x68, 0x65, 0x3f, 0x01, 0x07, 0x66, 0x00,
-0x13, 0x66, 0x0d, 0x06, 0x0f, 0x60, 0x07, 0x04, 0x00, 0xf4,
-0x00, 0x13, 0x43, 0xf8, 0x06, 0x3d, 0x00, 0x00, 0x4e, 0x0c,
-0x07, 0x09, 0x36, 0x01, 0x24, 0x69, 0x73, 0xc6, 0x03, 0x00,
-0xae, 0x00, 0x12, 0x3b, 0xb4, 0x00, 0x12, 0x32, 0x2c, 0x07,
-0x21, 0x00, 0x28, 0x20, 0x03, 0xa1, 0x69, 0x73, 0x00, 0x68,
-0x61, 0x72, 0x64, 0x65, 0x72, 0x29, 0xa3, 0x03, 0x82, 0x65,
-0x67, 0x73, 0x20, 0x70, 0x65, 0x72, 0x20, 0x18, 0x03, 0x08,
-0x61, 0x00, 0x05, 0x4f, 0x07, 0x02, 0x1b, 0x00, 0x0e, 0x3e,
-0x00, 0x03, 0x4b, 0x07, 0x1a, 0x65, 0x37, 0x00, 0x04, 0xe5,
-0x01, 0x00, 0xfc, 0x01, 0x04, 0x9a, 0x09, 0x4b, 0x66, 0x69,
-0x6e, 0x64, 0xa9, 0x00, 0x8b, 0x6e, 0x00, 0x28, 0x66, 0x65,
-0x77, 0x65, 0x72, 0x52, 0x00, 0x10, 0x41, 0x06, 0x08, 0x74,
-0x20, 0x62, 0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x0f, 0x00, 0x21,
-0x73, 0x00, 0x10, 0x00, 0x05, 0xdd, 0x02, 0x80, 0x62, 0x65,
-0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0xe6, 0x03, 0x31, 0x70,
-0x61, 0x72, 0x5b, 0x02, 0x15, 0x61, 0xa6, 0x00, 0x31, 0x61,
-0x6b, 0x65, 0xfd, 0x03, 0x40, 0x65, 0x61, 0x73, 0x69, 0x65,
-0x08, 0x71, 0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0x90,
-0x00, 0x00, 0xf0, 0x08, 0x02, 0x1d, 0x06, 0x10, 0x74, 0x26,
-0x01, 0x02, 0x65, 0x02, 0x10, 0x6e, 0x8d, 0x08, 0x20, 0x00,
-0x62, 0x8d, 0x09, 0x20, 0x75, 0x6e, 0x76, 0x04, 0x07, 0x57,
-0x00, 0x08, 0xb4, 0x00, 0x10, 0x29, 0xd3, 0x01, 0x02, 0x83,
-0x04, 0x30, 0x74, 0x75, 0x72, 0x57, 0x0a, 0x00, 0xd7, 0x06,
-0x24, 0x62, 0x79, 0xe5, 0x01, 0x10, 0x2e, 0x07, 0x01, 0x34,
-0x6f, 0x74, 0x65, 0x61, 0x00, 0xa2, 0x69, 0x73, 0x00, 0x64,
-0x6f, 0x65, 0x73, 0x6e, 0x27, 0x74, 0xdc, 0x08, 0x08, 0xc6,
-0x00, 0x29, 0x69, 0x6e, 0x5b, 0x00, 0x06, 0x2d, 0x03, 0x11,
-0x65, 0x93, 0x06, 0x21, 0x77, 0x61, 0x89, 0x00, 0x00, 0x49,
-0x00, 0x20, 0x2c, 0x00, 0xbd, 0x00, 0x84, 0x6f, 0x6e, 0x65,
-0x00, 0x65, 0x78, 0x74, 0x72, 0x13, 0x08, 0x06, 0x2b, 0x01,
-0x97, 0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65,
-0x2f, 0x01, 0x09, 0x6a, 0x01, 0x14, 0x28, 0x23, 0x06, 0x03,
-0x99, 0x01, 0x12, 0x29, 0xbf, 0x07, 0x11, 0x6e, 0xde, 0x0a,
-0x04, 0x45, 0x02, 0x01, 0xdc, 0x01, 0x30, 0x74, 0x68, 0x61,
-0xca, 0x02, 0x33, 0x63, 0x65, 0x3b, 0x6c, 0x05, 0x51, 0x6e,
-0x63, 0x72, 0x65, 0x61, 0xf1, 0x07, 0x01, 0x35, 0x06, 0x43,
-0x61, 0x72, 0x63, 0x68, 0xa5, 0x04, 0x00, 0x67, 0x01, 0x03,
-0x94, 0x05, 0x25, 0x6e, 0x67, 0xc1, 0x01, 0x02, 0x68, 0x04,
-0x07, 0x20, 0x01, 0x14, 0x6e, 0x1f, 0x01, 0x50, 0x75, 0x6c,
-0x74, 0x2e, 0x00,
+0x00, 0x05, 0x05, 0x03, 0x71, 0x72, 0x65, 0x76, 0x65, 0x61,
+0x6c, 0x65, 0xe6, 0x04, 0x23, 0x28, 0x41, 0x8b, 0x00, 0x11,
+0x61, 0x71, 0x06, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63,
+0x72, 0x69, 0x62, 0x65, 0x64, 0xa0, 0x03, 0x13, 0x73, 0x87,
+0x06, 0x63, 0x32, 0x2e, 0x31, 0x00, 0x61, 0x72, 0xe1, 0x02,
+0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65,
+0x2e, 0x29, 0x8f, 0x06, 0x13, 0x32, 0x8f, 0x06, 0x50, 0x70,
+0x61, 0x72, 0x61, 0x6d, 0xf2, 0x08, 0x03, 0x91, 0x06, 0x00,
+0xcd, 0x01, 0x06, 0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c,
+0x00, 0x06, 0x4b, 0x06, 0x21, 0x60, 0x43, 0x6f, 0x07, 0x00,
+0xb5, 0x00, 0x31, 0x00, 0x6f, 0x70, 0x6f, 0x00, 0x03, 0x59,
+0x06, 0xc1, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
+0x65, 0x6e, 0x75, 0x2e, 0xd6, 0x03, 0x72, 0x64, 0x65, 0x66,
+0x61, 0x75, 0x6c, 0x74, 0xe7, 0x06, 0x62, 0x6d, 0x61, 0x74,
+0x63, 0x68, 0x65, 0x3f, 0x01, 0x07, 0x66, 0x00, 0x13, 0x66,
+0xd8, 0x06, 0x0f, 0x2b, 0x08, 0x04, 0x00, 0xf4, 0x00, 0x13,
+0x43, 0xc3, 0x07, 0x3d, 0x00, 0x00, 0x4e, 0xd7, 0x07, 0x09,
+0x36, 0x01, 0x24, 0x69, 0x73, 0x9e, 0x04, 0x00, 0xae, 0x00,
+0x12, 0x3b, 0xb4, 0x00, 0x12, 0x32, 0xf7, 0x07, 0x21, 0x00,
+0x28, 0x20, 0x03, 0xa1, 0x69, 0x73, 0x00, 0x68, 0x61, 0x72,
+0x64, 0x65, 0x72, 0x29, 0xa3, 0x03, 0x82, 0x65, 0x67, 0x73,
+0x20, 0x70, 0x65, 0x72, 0x20, 0x18, 0x03, 0x08, 0x61, 0x00,
+0x05, 0x1a, 0x08, 0x02, 0x1b, 0x00, 0x0e, 0x3e, 0x00, 0x03,
+0x16, 0x08, 0x1a, 0x65, 0x37, 0x00, 0x04, 0xe5, 0x01, 0x00,
+0xfc, 0x01, 0x04, 0x65, 0x0a, 0x4b, 0x66, 0x69, 0x6e, 0x64,
+0xa9, 0x00, 0x8b, 0x6e, 0x00, 0x28, 0x66, 0x65, 0x77, 0x65,
+0x72, 0x52, 0x00, 0x10, 0x41, 0xd1, 0x08, 0x74, 0x20, 0x62,
+0x6c, 0x61, 0x6e, 0x6b, 0x73, 0x0f, 0x00, 0x21, 0x73, 0x00,
+0x10, 0x00, 0x05, 0xdd, 0x02, 0x80, 0x62, 0x65, 0x00, 0x67,
+0x69, 0x76, 0x65, 0x6e, 0xe6, 0x03, 0x31, 0x70, 0x61, 0x72,
+0x5b, 0x02, 0x15, 0x61, 0xa6, 0x00, 0x31, 0x61, 0x6b, 0x65,
+0xfd, 0x03, 0x40, 0x65, 0x61, 0x73, 0x69, 0x30, 0x09, 0x71,
+0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0x90, 0x00, 0x00,
+0xbb, 0x09, 0x02, 0xe8, 0x06, 0x10, 0x74, 0x26, 0x01, 0x02,
+0x65, 0x02, 0x10, 0x6e, 0x58, 0x09, 0x20, 0x00, 0x62, 0x58,
+0x0a, 0x20, 0x75, 0x6e, 0x76, 0x04, 0x07, 0x57, 0x00, 0x08,
+0xb4, 0x00, 0x10, 0x29, 0xd3, 0x01, 0x02, 0x83, 0x04, 0x30,
+0x74, 0x75, 0x72, 0x22, 0x0b, 0x00, 0xa2, 0x07, 0x24, 0x62,
+0x79, 0xe5, 0x01, 0x10, 0x2e, 0x07, 0x01, 0x34, 0x6f, 0x74,
+0x65, 0x61, 0x00, 0xa2, 0x69, 0x73, 0x00, 0x64, 0x6f, 0x65,
+0x73, 0x6e, 0x27, 0x74, 0xa7, 0x09, 0x08, 0xc6, 0x00, 0x29,
+0x69, 0x6e, 0x5b, 0x00, 0x06, 0x2d, 0x03, 0x11, 0x65, 0x5e,
+0x07, 0x21, 0x77, 0x61, 0x89, 0x00, 0x00, 0x49, 0x00, 0x10,
+0x2c, 0x02, 0x06, 0x00, 0xc1, 0x05, 0x54, 0x00, 0x65, 0x78,
+0x74, 0x72, 0xde, 0x08, 0x06, 0x2b, 0x01, 0x97, 0x64, 0x75,
+0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x2f, 0x01, 0x09,
+0x6a, 0x01, 0x14, 0x28, 0xee, 0x06, 0x03, 0x99, 0x01, 0x12,
+0x29, 0x8a, 0x08, 0x11, 0x6e, 0xa9, 0x0b, 0x04, 0x45, 0x02,
+0x01, 0xdc, 0x01, 0x30, 0x74, 0x68, 0x61, 0xca, 0x02, 0x33,
+0x63, 0x65, 0x3b, 0x6c, 0x05, 0x51, 0x6e, 0x63, 0x72, 0x65,
+0x61, 0xbc, 0x08, 0x01, 0x4b, 0x06, 0x43, 0x61, 0x72, 0x63,
+0x68, 0xa5, 0x04, 0x00, 0x67, 0x01, 0x03, 0x94, 0x05, 0x25,
+0x6e, 0x67, 0xc1, 0x01, 0x02, 0x68, 0x04, 0x07, 0x20, 0x01,
+0x1b, 0x6e, 0x1f, 0x01, 0x43, 0x31, 0x35, 0x2e, 0x33, 0x7b,
+0x03, 0xb0, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70, 0x72, 0x65,
+0x66, 0x65, 0x72, 0x65, 0x0c, 0x01, 0x81, 0x03, 0x20, 0x4f,
+0x6e, 0x86, 0x07, 0x53, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x8f,
+0x08, 0x80, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x00,
+0x2e, 0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0x6f, 0x03,
+0x16, 0x50, 0x12, 0x00, 0x0d, 0x8b, 0x03, 0x33, 0x47, 0x61,
+0x6d, 0x8b, 0x03, 0x03, 0xb2, 0x06, 0x23, 0x65, 0x74, 0xdd,
+0x04, 0xb1, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x00,
+0x77, 0x68, 0x65, 0x65, 0x0a, 0x02, 0x32, 0x06, 0x22, 0x72,
+0x65, 0xd5, 0x06, 0x3f, 0x6c, 0x65, 0x64, 0xcf, 0x06, 0x02,
+0x53, 0x55, 0x6e, 0x6c, 0x69, 0x6b, 0x41, 0x05, 0x20, 0x4c,
+0x27, 0x9a, 0x05, 0x03, 0x8c, 0x0b, 0x01, 0x5e, 0x00, 0x10,
+0x70, 0x91, 0x0b, 0xf0, 0x03, 0x73, 0x74, 0x00, 0x62, 0x65,
+0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x67, 0x61, 0x6d, 0x65,
+0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3042;
-const unsigned short help_text_words = 572;
+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 956d133d44..a0f33a9dc3 100644
--- a/apps/plugins/puzzles/help/inertia.c
+++ b/apps/plugins/puzzles/help/inertia.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,176 +6,178 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 39, TEXT_UNDERLINE },
- { 110, TEXT_UNDERLINE },
- { 196, TEXT_CENTER | C_RED },
- { 404, TEXT_CENTER | C_RED },
- { 421, TEXT_UNDERLINE },
+ { 40, TEXT_UNDERLINE },
+ { 111, TEXT_UNDERLINE },
+ { 197, TEXT_CENTER | C_RED },
+ { 405, TEXT_CENTER | C_RED },
  { 422, TEXT_UNDERLINE },
+ { 423, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2266 comp 1565 ratio 0.690644 level 10 saved 701 */
+/* orig 2286 comp 1571 ratio 0.687227 level 10 saved 715 */
 const char help_text[] = {
-0xf0, 0x1f, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x34, 0x3a, 0x20, 0x49, 0x6e, 0x65, 0x72, 0x74, 0x69,
-0x61, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61,
-0x72, 0x65, 0x00, 0x61, 0x00, 0x73, 0x6d, 0x61, 0x6c, 0x6c,
-0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x00, 0x62, 0x0b, 0x00,
-0xf0, 0x15, 0x73, 0x69, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x00,
-0x69, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00,
-0x66, 0x75, 0x6c, 0x6c, 0x00, 0x6f, 0x66, 0x00, 0x6f, 0x62,
-0x73, 0x74, 0x61, 0x63, 0x6c, 0x65, 0x73, 0x2e, 0x40, 0x00,
-0xf0, 0x05, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73,
-0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-0x74, 0x00, 0x40, 0x00, 0xf2, 0x06, 0x74, 0x68, 0x65, 0x00,
-0x67, 0x65, 0x6d, 0x73, 0x00, 0x77, 0x69, 0x74, 0x68, 0x6f,
-0x75, 0x74, 0x00, 0x72, 0x75, 0x6e, 0x6e, 0x51, 0x00, 0xa0,
-0x74, 0x6f, 0x00, 0x61, 0x6e, 0x79, 0x00, 0x6d, 0x69, 0x6e,
-0x44, 0x00, 0x02, 0x86, 0x00, 0x81, 0x63, 0x61, 0x6e, 0x00,
-0x6d, 0x6f, 0x76, 0x65, 0x38, 0x00, 0x01, 0x81, 0x00, 0x21,
-0x69, 0x6e, 0x26, 0x00, 0xf2, 0x02, 0x6f, 0x72, 0x74, 0x68,
-0x6f, 0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x00, 0x6f, 0x72, 0x20,
-0x64, 0x69, 0x61, 0x0c, 0x00, 0xe7, 0x64, 0x69, 0x72, 0x65,
-0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x00, 0x4f, 0x6e, 0x63,
-0x37, 0x00, 0x60, 0x73, 0x74, 0x61, 0x72, 0x74, 0x73, 0x4c,
-0x00, 0xf0, 0x13, 0x69, 0x6e, 0x67, 0x2c, 0x00, 0x69, 0x74,
-0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x63, 0x6f, 0x6e, 0x74,
-0x69, 0x6e, 0x75, 0x65, 0x00, 0x75, 0x6e, 0x74, 0x69, 0x6c,
-0x00, 0x73, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x8f, 0x00, 0xf4,
-0x00, 0x73, 0x74, 0x6f, 0x70, 0x73, 0x00, 0x69, 0x74, 0x2e,
-0x00, 0x41, 0x00, 0x77, 0x61, 0x6c, 0x5a, 0x00, 0x20, 0x6c,
-0x79, 0x81, 0x00, 0x82, 0x69, 0x74, 0x73, 0x00, 0x70, 0x61,
-0x74, 0x68, 0x44, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x51, 0x00,
-0x70, 0x28, 0x62, 0x75, 0x74, 0x00, 0x69, 0x66, 0x0b, 0x00,
-0x14, 0x69, 0x6a, 0x00, 0x14, 0x00, 0x9a, 0x00, 0x26, 0x6c,
-0x79, 0x75, 0x00, 0x03, 0xd1, 0x00, 0x85, 0x72, 0x6f, 0x75,
-0x67, 0x68, 0x00, 0x61, 0x00, 0xbd, 0x00, 0x80, 0x67, 0x61,
-0x70, 0x00, 0x62, 0x65, 0x74, 0x77, 0x6d, 0x01, 0x91, 0x74,
-0x77, 0x6f, 0x00, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x7e, 0x00,
-0x06, 0x2f, 0x01, 0x00, 0x6d, 0x00, 0xc1, 0x70, 0x69, 0x6e,
-0x67, 0x29, 0x2e, 0x00, 0x41, 0x6c, 0x73, 0x6f, 0x2c, 0xb3,
-0x00, 0x00, 0x7f, 0x01, 0x00, 0xea, 0x00, 0x71, 0x73, 0x71,
-0x75, 0x61, 0x72, 0x65, 0x73, 0xbc, 0x01, 0x11, 0x60, 0xc2,
-0x00, 0x76, 0x27, 0x3b, 0x00, 0x77, 0x68, 0x65, 0x6e, 0x08,
-0x01, 0x00, 0x7c, 0x00, 0x50, 0x73, 0x00, 0x6f, 0x6e, 0x00,
-0x6e, 0x01, 0x01, 0x4e, 0x00, 0x06, 0x98, 0x00, 0x01, 0xc9,
-0x00, 0x03, 0xb8, 0x00, 0x70, 0x6e, 0x6f, 0x00, 0x6d, 0x61,
-0x74, 0x74, 0x80, 0x00, 0x36, 0x68, 0x61, 0x74, 0x58, 0x01,
-0x01, 0x2d, 0x00, 0x52, 0x61, 0x73, 0x00, 0x67, 0x6f, 0xb5,
-0x01, 0x30, 0x2e, 0x00, 0x47, 0xce, 0x01, 0x52, 0x64, 0x6f,
-0x00, 0x6e, 0x6f, 0x9e, 0x00, 0x05, 0x6c, 0x00, 0x10, 0x3b,
-0x2c, 0x00, 0x50, 0x70, 0x69, 0x63, 0x6b, 0x73, 0x13, 0x00,
-0xd1, 0x6d, 0x00, 0x75, 0x70, 0x00, 0x61, 0x6e, 0x64, 0x00,
-0x6b, 0x65, 0x65, 0x70, 0x82, 0x00, 0x01, 0x43, 0x00, 0x00,
-0xe9, 0x01, 0x19, 0x52, 0x03, 0x02, 0x01, 0x01, 0x02, 0x00,
-0x42, 0x01, 0xb0, 0x66, 0x61, 0x74, 0x61, 0x6c, 0x2e, 0x00,
-0x45, 0x76, 0x65, 0x6e, 0x57, 0x01, 0x31, 0x79, 0x6f, 0x75,
-0x4e, 0x00, 0x42, 0x65, 0x64, 0x00, 0x75, 0x65, 0x00, 0x40,
-0x6c, 0x61, 0x73, 0x74, 0x4d, 0x02, 0x00, 0x93, 0x01, 0x01,
-0xff, 0x00, 0x32, 0x61, 0x6d, 0x65, 0x5d, 0x01, 0x70, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x00, 0x74, 0xfa, 0x00, 0x33, 0x68,
-0x69, 0x74, 0x54, 0x00, 0x12, 0x2c, 0x7d, 0x02, 0x00, 0x25,
-0x00, 0x03, 0xfc, 0x01, 0x31, 0x75, 0x6e, 0x74, 0x57, 0x00,
-0xa1, 0x61, 0x73, 0x00, 0x64, 0x65, 0x61, 0x64, 0x00, 0x72,
-0x61, 0x72, 0x01, 0xe1, 0x74, 0x68, 0x61, 0x6e, 0x00, 0x76,
-0x69, 0x63, 0x74, 0x6f, 0x72, 0x69, 0x6f, 0x75, 0x8c, 0x02,
-0x43, 0x54, 0x68, 0x69, 0x73, 0x3b, 0x00, 0x81, 0x61, 0x73,
-0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0xd5, 0x01, 0xf0, 0x16,
-0x00, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-0x65, 0x64, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x57, 0x69, 0x6e,
-0x64, 0x6f, 0x77, 0x73, 0x00, 0x62, 0x79, 0x00, 0x42, 0x65,
-0x6e, 0x00, 0x4f, 0x6c, 0x6d, 0x73, 0x74, 0x5b, 0x00, 0x91,
-0x5b, 0x31, 0x31, 0x5d, 0x2c, 0x00, 0x77, 0x68, 0x6f, 0x41,
-0x00, 0x71, 0x6b, 0x69, 0x6e, 0x64, 0x00, 0x65, 0x6e, 0x01,
-0x02, 0xb0, 0x74, 0x6f, 0x00, 0x72, 0x65, 0x6c, 0x65, 0x61,
-0x73, 0x65, 0x00, 0x65, 0x00, 0xb0, 0x73, 0x6f, 0x75, 0x72,
-0x63, 0x65, 0x00, 0x63, 0x6f, 0x64, 0x65, 0x25, 0x01, 0xa0,
-0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x00, 0x73, 0x6f,
-0x97, 0x00, 0x10, 0x74, 0x53, 0x01, 0xcc, 0x63, 0x6f, 0x75,
-0x6c, 0x64, 0x00, 0x62, 0x65, 0x00, 0x72, 0x65, 0x2d, 0x7f,
-0x00, 0x10, 0x74, 0x43, 0x00, 0x03, 0x70, 0x03, 0x01, 0x06,
-0x03, 0x11, 0x00, 0x7a, 0x00, 0xf5, 0x09, 0x00, 0x68, 0x74,
-0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x78, 0x6e, 0x31, 0x33, 0x2e,
-0x63, 0x6f, 0x6d, 0x2f, 0x00, 0x00, 0x00, 0x32, 0x34, 0x2e,
-0x31, 0xf5, 0x03, 0x00, 0x08, 0x03, 0x5f, 0x72, 0x6f, 0x6c,
-0x73, 0x20, 0x78, 0x03, 0x0e, 0x02, 0x6a, 0x02, 0x47, 0x65,
-0x69, 0x67, 0x68, 0x16, 0x02, 0x40, 0x73, 0x00, 0x75, 0x73,
-0xc2, 0x01, 0x00, 0x1b, 0x00, 0xe0, 0x6e, 0x75, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x00, 0x6b, 0x65, 0x79, 0x70, 0x61, 0x64,
-0xa7, 0x02, 0x91, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69,
-0x76, 0x65, 0x05, 0x03, 0x02, 0xca, 0x01, 0x52, 0x63, 0x6c,
-0x69, 0x63, 0x6b, 0xc6, 0x01, 0xf2, 0x03, 0x65, 0x66, 0x74,
-0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x62, 0x75, 0x74,
-0x74, 0x6f, 0x6e, 0x00, 0x6f, 0xcf, 0x01, 0x00, 0x5e, 0x04,
-0x16, 0x2c, 0x81, 0x00, 0x01, 0xb4, 0x01, 0x31, 0x62, 0x65,
-0x67, 0x7a, 0x04, 0x01, 0x9c, 0x00, 0x23, 0x69, 0x6e, 0x4f,
-0x04, 0x38, 0x6e, 0x65, 0x72, 0xfc, 0x03, 0x00, 0xa5, 0x00,
-0x56, 0x77, 0x68, 0x65, 0x72, 0x65, 0x6a, 0x00, 0x20, 0x65,
-0x64, 0x0b, 0x01, 0x12, 0x49, 0x7c, 0x00, 0x22, 0x75, 0x73,
-0xd8, 0x00, 0xb3, 0x60, 0x53, 0x6f, 0x6c, 0x76, 0x65, 0x27,
-0x00, 0x66, 0x75, 0x6e, 0x38, 0x00, 0x00, 0x51, 0x00, 0x03,
-0xe9, 0x01, 0x02, 0x7a, 0x00, 0x74, 0x70, 0x72, 0x6f, 0x67,
-0x72, 0x61, 0x6d, 0x31, 0x02, 0x40, 0x6d, 0x70, 0x75, 0x74,
-0x17, 0x05, 0x01, 0xfd, 0x03, 0x04, 0xc2, 0x03, 0x04, 0xac,
-0x00, 0x03, 0x76, 0x02, 0x03, 0x7e, 0x01, 0x15, 0x73, 0xef,
-0x04, 0x51, 0x72, 0x65, 0x6d, 0x61, 0x69, 0xe1, 0x02, 0x01,
-0xf9, 0x04, 0x00, 0x04, 0x03, 0x61, 0x72, 0x65, 0x74, 0x75,
-0x72, 0x6e, 0x1d, 0x05, 0x00, 0x22, 0x00, 0xc2, 0x63, 0x75,
-0x72, 0x72, 0x65, 0x6e, 0x74, 0x00, 0x70, 0x6f, 0x73, 0x69,
-0xb7, 0x01, 0xc2, 0x41, 0x00, 0x68, 0x69, 0x6e, 0x74, 0x00,
-0x61, 0x72, 0x72, 0x6f, 0x77, 0x7d, 0x00, 0x64, 0x61, 0x70,
-0x70, 0x65, 0x61, 0x72, 0x1c, 0x01, 0x03, 0x93, 0x01, 0x54,
-0x64, 0x69, 0x63, 0x61, 0x74, 0x79, 0x01, 0x07, 0xa4, 0x03,
-0x13, 0x6e, 0x8c, 0x00, 0x00, 0xee, 0x00, 0x21, 0x73, 0x68,
-0x30, 0x02, 0x02, 0xce, 0x01, 0x13, 0x6f, 0x42, 0x01, 0x04,
-0xea, 0x00, 0x00, 0xc9, 0x00, 0x14, 0x2e, 0x18, 0x01, 0x01,
-0x30, 0x03, 0x06, 0x5a, 0x01, 0x08, 0xf7, 0x03, 0x02, 0x0e,
-0x01, 0x07, 0x8f, 0x00, 0x51, 0x75, 0x70, 0x64, 0x61, 0x74,
-0x51, 0x00, 0x03, 0x86, 0x00, 0x12, 0x65, 0xfd, 0x01, 0x28,
-0x65, 0x78, 0x2d, 0x04, 0x03, 0xae, 0x00, 0x02, 0x66, 0x00,
-0x04, 0x58, 0x02, 0xf1, 0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00,
-0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0x61, 0x63,
-0x65, 0x8b, 0x04, 0x81, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74,
-0x69, 0x63, 0x55, 0x03, 0x08, 0xde, 0x01, 0x09, 0xd6, 0x01,
-0x00, 0x11, 0x00, 0x06, 0x19, 0x01, 0x05, 0xb9, 0x00, 0x04,
-0x30, 0x00, 0x00, 0x4c, 0x05, 0x31, 0x66, 0x66, 0x65, 0x4c,
-0x01, 0x06, 0x38, 0x00, 0x41, 0x66, 0x72, 0x6f, 0x6d, 0x3a,
-0x00, 0x30, 0x6f, 0x6e, 0x65, 0x0e, 0x01, 0x20, 0x77, 0x6e,
-0x9e, 0x03, 0x05, 0xd0, 0x00, 0x12, 0x2c, 0x07, 0x00, 0x14,
-0x73, 0x61, 0x02, 0x03, 0x23, 0x00, 0x20, 0x6f, 0x6e, 0xde,
-0x03, 0x12, 0x66, 0xc0, 0x00, 0x41, 0x75, 0x7a, 0x7a, 0x6c,
-0x94, 0x04, 0x21, 0x73, 0x74, 0x29, 0x05, 0x70, 0x6f, 0x6c,
-0x76, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x02, 0x13, 0x41, 0xe6,
-0x01, 0x13, 0x61, 0x09, 0x03, 0x90, 0x64, 0x65, 0x73, 0x63,
-0x72, 0x69, 0x62, 0x65, 0x64, 0x91, 0x00, 0x13, 0x73, 0x83,
-0x00, 0x32, 0x32, 0x2e, 0x31, 0x51, 0x07, 0x00, 0xfb, 0x00,
-0x52, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x3f, 0x00, 0xd5, 0x49,
-0x6e, 0x00, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x75, 0x6c,
-0x61, 0x72, 0x1c, 0x03, 0x20, 0x64, 0x6f, 0x16, 0x07, 0x09,
-0x0f, 0x05, 0x00, 0x35, 0x02, 0x63, 0x64, 0x69, 0x65, 0x2c,
-0x00, 0x79, 0x45, 0x01, 0x04, 0xc4, 0x02, 0x46, 0x55, 0x6e,
-0x64, 0x6f, 0xc1, 0x02, 0x02, 0x5c, 0x02, 0x90, 0x73, 0x75,
-0x6d, 0x65, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x1a, 0x02, 0x01,
-0xfe, 0x00, 0x52, 0x62, 0x65, 0x66, 0x6f, 0x72, 0x31, 0x00,
-0x01, 0x56, 0x05, 0x01, 0x32, 0x01, 0x39, 0x2e, 0x00, 0x54,
-0x10, 0x05, 0x00, 0x99, 0x05, 0x64, 0x00, 0x74, 0x72, 0x61,
-0x63, 0x6b, 0x6b, 0x01, 0x61, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-0x72, 0x0e, 0x00, 0x41, 0x69, 0x6d, 0x65, 0x73, 0x7d, 0x00,
-0x60, 0x68, 0x61, 0x76, 0x65, 0x00, 0x64, 0x4b, 0x01, 0x00,
-0x41, 0x02, 0x12, 0x2e, 0x49, 0x04, 0x15, 0x32, 0x49, 0x04,
-0xb1, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-0x73, 0x20, 0x37, 0x05, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14,
-0x00, 0x02, 0x05, 0x01, 0x04, 0x00, 0x01, 0x06, 0x9a, 0x01,
-0xe8, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
-0x2e, 0x27, 0x00, 0x6f, 0x70, 0x3b, 0x02, 0xb0, 0x60, 0x54,
-0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x6c,
-0x00, 0x82, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48,
-0x80, 0x04, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xfe, 0x06,
-0x01, 0x80, 0x03, 0x00, 0x71, 0x01, 0x80, 0x71, 0x75, 0x61,
-0x72, 0x65, 0x73, 0x2e, 0x00,
+0x61, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x0b, 0x00, 0x00,
+0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x61,
+0x00, 0x73, 0x6d, 0x61, 0x6c, 0x6c, 0x00, 0x67, 0x72, 0x65,
+0x65, 0x6e, 0x00, 0x62, 0x0b, 0x00, 0xf0, 0x15, 0x73, 0x69,
+0x74, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x69, 0x6e, 0x00, 0x61,
+0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x66, 0x75, 0x6c, 0x6c,
+0x00, 0x6f, 0x66, 0x00, 0x6f, 0x62, 0x73, 0x74, 0x61, 0x63,
+0x6c, 0x65, 0x73, 0x2e, 0x40, 0x00, 0xf0, 0x05, 0x72, 0x00,
+0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00,
+0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x00, 0x40, 0x00,
+0xf2, 0x06, 0x74, 0x68, 0x65, 0x00, 0x67, 0x65, 0x6d, 0x73,
+0x00, 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x00, 0x72,
+0x75, 0x6e, 0x6e, 0x51, 0x00, 0xa0, 0x74, 0x6f, 0x00, 0x61,
+0x6e, 0x79, 0x00, 0x6d, 0x69, 0x6e, 0x44, 0x00, 0x02, 0x86,
+0x00, 0x81, 0x63, 0x61, 0x6e, 0x00, 0x6d, 0x6f, 0x76, 0x65,
+0x38, 0x00, 0x01, 0x81, 0x00, 0x21, 0x69, 0x6e, 0x26, 0x00,
+0xf2, 0x02, 0x6f, 0x72, 0x74, 0x68, 0x6f, 0x67, 0x6f, 0x6e,
+0x61, 0x6c, 0x00, 0x6f, 0x72, 0x20, 0x64, 0x69, 0x61, 0x0c,
+0x00, 0xe7, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f,
+0x6e, 0x2e, 0x00, 0x4f, 0x6e, 0x63, 0x37, 0x00, 0x60, 0x73,
+0x74, 0x61, 0x72, 0x74, 0x73, 0x4c, 0x00, 0xf0, 0x13, 0x69,
+0x6e, 0x67, 0x2c, 0x00, 0x69, 0x74, 0x00, 0x77, 0x69, 0x6c,
+0x6c, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65,
+0x00, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x00, 0x73, 0x6f, 0x6d,
+0x65, 0x74, 0x68, 0x8f, 0x00, 0xf4, 0x00, 0x73, 0x74, 0x6f,
+0x70, 0x73, 0x00, 0x69, 0x74, 0x2e, 0x00, 0x41, 0x00, 0x77,
+0x61, 0x6c, 0x5a, 0x00, 0x20, 0x6c, 0x79, 0x81, 0x00, 0x82,
+0x69, 0x74, 0x73, 0x00, 0x70, 0x61, 0x74, 0x68, 0x44, 0x00,
+0x00, 0x2b, 0x00, 0x00, 0x51, 0x00, 0x70, 0x28, 0x62, 0x75,
+0x74, 0x00, 0x69, 0x66, 0x0b, 0x00, 0x14, 0x69, 0x6a, 0x00,
+0x14, 0x00, 0x9a, 0x00, 0x26, 0x6c, 0x79, 0x75, 0x00, 0x03,
+0xd1, 0x00, 0x85, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x00, 0x61,
+0x00, 0xbd, 0x00, 0x80, 0x67, 0x61, 0x70, 0x00, 0x62, 0x65,
+0x74, 0x77, 0x6d, 0x01, 0x91, 0x74, 0x77, 0x6f, 0x00, 0x6f,
+0x74, 0x68, 0x65, 0x72, 0x7e, 0x00, 0x06, 0x2f, 0x01, 0x00,
+0x6d, 0x00, 0xc1, 0x70, 0x69, 0x6e, 0x67, 0x29, 0x2e, 0x00,
+0x41, 0x6c, 0x73, 0x6f, 0x2c, 0xb3, 0x00, 0x00, 0x7f, 0x01,
+0x00, 0xea, 0x00, 0x71, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
+0x73, 0xbc, 0x01, 0x11, 0x60, 0xc2, 0x00, 0x76, 0x27, 0x3b,
+0x00, 0x77, 0x68, 0x65, 0x6e, 0x08, 0x01, 0x00, 0x7c, 0x00,
+0x50, 0x73, 0x00, 0x6f, 0x6e, 0x00, 0x6e, 0x01, 0x01, 0x4e,
+0x00, 0x06, 0x98, 0x00, 0x01, 0xc9, 0x00, 0x03, 0xb8, 0x00,
+0x70, 0x6e, 0x6f, 0x00, 0x6d, 0x61, 0x74, 0x74, 0x80, 0x00,
+0x36, 0x68, 0x61, 0x74, 0x58, 0x01, 0x01, 0x2d, 0x00, 0x52,
+0x61, 0x73, 0x00, 0x67, 0x6f, 0xb5, 0x01, 0x30, 0x2e, 0x00,
+0x47, 0xce, 0x01, 0x52, 0x64, 0x6f, 0x00, 0x6e, 0x6f, 0x9e,
+0x00, 0x05, 0x6c, 0x00, 0x10, 0x3b, 0x2c, 0x00, 0x50, 0x70,
+0x69, 0x63, 0x6b, 0x73, 0x13, 0x00, 0xd1, 0x6d, 0x00, 0x75,
+0x70, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x6b, 0x65, 0x65, 0x70,
+0x82, 0x00, 0x01, 0x43, 0x00, 0x00, 0xe9, 0x01, 0x19, 0x52,
+0x03, 0x02, 0x01, 0x01, 0x02, 0x00, 0x42, 0x01, 0xb0, 0x66,
+0x61, 0x74, 0x61, 0x6c, 0x2e, 0x00, 0x45, 0x76, 0x65, 0x6e,
+0x57, 0x01, 0x31, 0x79, 0x6f, 0x75, 0x4e, 0x00, 0x42, 0x65,
+0x64, 0x00, 0x75, 0x65, 0x00, 0x40, 0x6c, 0x61, 0x73, 0x74,
+0x4d, 0x02, 0x00, 0x93, 0x01, 0x01, 0xff, 0x00, 0x32, 0x61,
+0x6d, 0x65, 0x5d, 0x01, 0x70, 0x77, 0x68, 0x69, 0x63, 0x68,
+0x00, 0x74, 0xfa, 0x00, 0x33, 0x68, 0x69, 0x74, 0x54, 0x00,
+0x12, 0x2c, 0x7d, 0x02, 0x00, 0x25, 0x00, 0x03, 0xfc, 0x01,
+0x31, 0x75, 0x6e, 0x74, 0x57, 0x00, 0xa1, 0x61, 0x73, 0x00,
+0x64, 0x65, 0x61, 0x64, 0x00, 0x72, 0x61, 0x72, 0x01, 0xe1,
+0x74, 0x68, 0x61, 0x6e, 0x00, 0x76, 0x69, 0x63, 0x74, 0x6f,
+0x72, 0x69, 0x6f, 0x75, 0x8c, 0x02, 0x43, 0x54, 0x68, 0x69,
+0x73, 0x3b, 0x00, 0x81, 0x61, 0x73, 0x00, 0x6f, 0x72, 0x69,
+0x67, 0x69, 0xd5, 0x01, 0xf0, 0x16, 0x00, 0x69, 0x6d, 0x70,
+0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x00, 0x66,
+0x6f, 0x72, 0x00, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73,
+0x00, 0x62, 0x79, 0x00, 0x42, 0x65, 0x6e, 0x00, 0x4f, 0x6c,
+0x6d, 0x73, 0x74, 0x5b, 0x00, 0x91, 0x5b, 0x31, 0x31, 0x5d,
+0x2c, 0x00, 0x77, 0x68, 0x6f, 0x41, 0x00, 0x71, 0x6b, 0x69,
+0x6e, 0x64, 0x00, 0x65, 0x6e, 0x01, 0x02, 0xb0, 0x74, 0x6f,
+0x00, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x00, 0x65,
+0x00, 0xb0, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x00, 0x63,
+0x6f, 0x64, 0x65, 0x25, 0x01, 0xa0, 0x72, 0x65, 0x71, 0x75,
+0x65, 0x73, 0x74, 0x00, 0x73, 0x6f, 0x97, 0x00, 0x10, 0x74,
+0x53, 0x01, 0xcc, 0x63, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x62,
+0x65, 0x00, 0x72, 0x65, 0x2d, 0x7f, 0x00, 0x10, 0x74, 0x43,
+0x00, 0x03, 0x70, 0x03, 0x01, 0x06, 0x03, 0x11, 0x00, 0x7a,
+0x00, 0xf5, 0x09, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f,
+0x2f, 0x78, 0x6e, 0x31, 0x33, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+0x00, 0x00, 0x00, 0x32, 0x34, 0x2e, 0x31, 0x09, 0x04, 0x00,
+0x08, 0x03, 0x5f, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x78, 0x03,
+0x0e, 0x02, 0x6a, 0x02, 0x47, 0x65, 0x69, 0x67, 0x68, 0x16,
+0x02, 0x40, 0x73, 0x00, 0x75, 0x73, 0xc2, 0x01, 0x00, 0x1b,
+0x00, 0xe0, 0x6e, 0x75, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x00,
+0x6b, 0x65, 0x79, 0x70, 0x61, 0x64, 0xa7, 0x02, 0x91, 0x74,
+0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x05, 0x03,
+0x02, 0xca, 0x01, 0x52, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xc6,
+0x01, 0xf2, 0x03, 0x65, 0x66, 0x74, 0x00, 0x6d, 0x6f, 0x75,
+0x73, 0x65, 0x00, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x00,
+0x6f, 0xcf, 0x01, 0x00, 0x5e, 0x04, 0x16, 0x2c, 0x81, 0x00,
+0x01, 0xb4, 0x01, 0x31, 0x62, 0x65, 0x67, 0x7a, 0x04, 0x01,
+0x9c, 0x00, 0x23, 0x69, 0x6e, 0x4f, 0x04, 0x38, 0x6e, 0x65,
+0x72, 0xfc, 0x03, 0x00, 0xa5, 0x00, 0x56, 0x77, 0x68, 0x65,
+0x72, 0x65, 0x6a, 0x00, 0x20, 0x65, 0x64, 0x0b, 0x01, 0x12,
+0x49, 0x7c, 0x00, 0x22, 0x75, 0x73, 0xd8, 0x00, 0xb3, 0x60,
+0x53, 0x6f, 0x6c, 0x76, 0x65, 0x27, 0x00, 0x66, 0x75, 0x6e,
+0x38, 0x00, 0x00, 0x51, 0x00, 0x03, 0xe9, 0x01, 0x02, 0x7a,
+0x00, 0x74, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x31,
+0x02, 0x40, 0x6d, 0x70, 0x75, 0x74, 0x17, 0x05, 0x01, 0xfd,
+0x03, 0x04, 0xc2, 0x03, 0x04, 0xac, 0x00, 0x03, 0x76, 0x02,
+0x03, 0x7e, 0x01, 0x15, 0x73, 0xef, 0x04, 0x51, 0x72, 0x65,
+0x6d, 0x61, 0x69, 0xe1, 0x02, 0x01, 0xf9, 0x04, 0x00, 0x04,
+0x03, 0x61, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x1d, 0x05,
+0x00, 0x22, 0x00, 0xc2, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
+0x74, 0x00, 0x70, 0x6f, 0x73, 0x69, 0xb7, 0x01, 0xc2, 0x41,
+0x00, 0x68, 0x69, 0x6e, 0x74, 0x00, 0x61, 0x72, 0x72, 0x6f,
+0x77, 0x7d, 0x00, 0x64, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72,
+0x1c, 0x01, 0x03, 0x93, 0x01, 0x54, 0x64, 0x69, 0x63, 0x61,
+0x74, 0x79, 0x01, 0x07, 0xa4, 0x03, 0x13, 0x6e, 0x8c, 0x00,
+0x00, 0xee, 0x00, 0x21, 0x73, 0x68, 0x30, 0x02, 0x02, 0xce,
+0x01, 0x13, 0x6f, 0x42, 0x01, 0x04, 0xea, 0x00, 0x00, 0xc9,
+0x00, 0x14, 0x2e, 0x18, 0x01, 0x01, 0x30, 0x03, 0x06, 0x5a,
+0x01, 0x08, 0xf7, 0x03, 0x02, 0x0e, 0x01, 0x07, 0x8f, 0x00,
+0x51, 0x75, 0x70, 0x64, 0x61, 0x74, 0x51, 0x00, 0x03, 0x86,
+0x00, 0x12, 0x65, 0xfd, 0x01, 0x28, 0x65, 0x78, 0x2d, 0x04,
+0x03, 0xae, 0x00, 0x02, 0x66, 0x00, 0x04, 0x58, 0x02, 0xf1,
+0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x70, 0x72, 0x65, 0x73,
+0x73, 0x00, 0x53, 0x70, 0x61, 0x63, 0x65, 0x8b, 0x04, 0x81,
+0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x55, 0x03,
+0x08, 0xde, 0x01, 0x09, 0xd6, 0x01, 0x00, 0x11, 0x00, 0x06,
+0x19, 0x01, 0x05, 0xb9, 0x00, 0x04, 0x30, 0x00, 0x00, 0x4c,
+0x05, 0x31, 0x66, 0x66, 0x65, 0x4c, 0x01, 0x06, 0x38, 0x00,
+0x41, 0x66, 0x72, 0x6f, 0x6d, 0x3a, 0x00, 0x30, 0x6f, 0x6e,
+0x65, 0x0e, 0x01, 0x20, 0x77, 0x6e, 0x9e, 0x03, 0x05, 0xd0,
+0x00, 0x12, 0x2c, 0x07, 0x00, 0x14, 0x73, 0x61, 0x02, 0x03,
+0x23, 0x00, 0x20, 0x6f, 0x6e, 0xde, 0x03, 0x12, 0x66, 0xc0,
+0x00, 0x41, 0x75, 0x7a, 0x7a, 0x6c, 0x94, 0x04, 0x21, 0x73,
+0x74, 0x29, 0x05, 0x70, 0x6f, 0x6c, 0x76, 0x61, 0x62, 0x6c,
+0x65, 0x54, 0x02, 0x13, 0x41, 0xe6, 0x01, 0x13, 0x61, 0x09,
+0x03, 0x90, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+0x64, 0x91, 0x00, 0x13, 0x73, 0x83, 0x00, 0x32, 0x32, 0x2e,
+0x31, 0x51, 0x07, 0x00, 0xfb, 0x00, 0x52, 0x61, 0x76, 0x61,
+0x69, 0x6c, 0x3f, 0x00, 0xd5, 0x49, 0x6e, 0x00, 0x70, 0x61,
+0x72, 0x74, 0x69, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x1c, 0x03,
+0x20, 0x64, 0x6f, 0x16, 0x07, 0x09, 0x0f, 0x05, 0x00, 0x35,
+0x02, 0x63, 0x64, 0x69, 0x65, 0x2c, 0x00, 0x79, 0x45, 0x01,
+0x04, 0xc4, 0x02, 0x46, 0x55, 0x6e, 0x64, 0x6f, 0xc1, 0x02,
+0x02, 0x5c, 0x02, 0x90, 0x73, 0x75, 0x6d, 0x65, 0x00, 0x70,
+0x6c, 0x61, 0x79, 0x1a, 0x02, 0x01, 0xfe, 0x00, 0x52, 0x62,
+0x65, 0x66, 0x6f, 0x72, 0x31, 0x00, 0x01, 0x56, 0x05, 0x01,
+0x32, 0x01, 0x39, 0x2e, 0x00, 0x54, 0x10, 0x05, 0x00, 0x99,
+0x05, 0x64, 0x00, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x6b, 0x01,
+0x61, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x0e, 0x00, 0x41,
+0x69, 0x6d, 0x65, 0x73, 0x7d, 0x00, 0x60, 0x68, 0x61, 0x76,
+0x65, 0x00, 0x64, 0x4b, 0x01, 0x00, 0x41, 0x02, 0x12, 0x2e,
+0x49, 0x04, 0x15, 0x32, 0x49, 0x04, 0xb1, 0x70, 0x61, 0x72,
+0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x37, 0x05,
+0x46, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x05, 0x01,
+0x04, 0x00, 0x01, 0x06, 0x9a, 0x01, 0xe8, 0x60, 0x43, 0x75,
+0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f,
+0x70, 0x3b, 0x02, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27,
+0x00, 0x6d, 0x65, 0x6e, 0x75, 0x6c, 0x00, 0x82, 0x57, 0x69,
+0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x80, 0x04, 0x51, 0x00,
+0x00, 0x53, 0x69, 0x7a, 0xfe, 0x06, 0x01, 0x80, 0x03, 0x00,
+0x71, 0x01, 0x80, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2e,
+0x00,
 };
 
-const unsigned short help_text_len = 2266;
-const unsigned short help_text_words = 430;
+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 58a5f0b2af..0c69aea0d6 100644
--- a/apps/plugins/puzzles/help/keen.c
+++ b/apps/plugins/puzzles/help/keen.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,257 +6,259 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 324, TEXT_CENTER | C_RED },
- { 391, TEXT_UNDERLINE },
- { 649, TEXT_CENTER | C_RED },
- { 666, TEXT_UNDERLINE },
- { 698, TEXT_UNDERLINE },
- { 737, TEXT_UNDERLINE },
+ { 325, TEXT_CENTER | C_RED },
+ { 392, TEXT_UNDERLINE },
+ { 650, TEXT_CENTER | C_RED },
+ { 667, TEXT_UNDERLINE },
+ { 699, TEXT_UNDERLINE },
+ { 738, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 3952 comp 2376 ratio 0.601215 level 10 saved 1576 */
+/* orig 3969 comp 2383 ratio 0.600403 level 10 saved 1586 */
 const char help_text[] = {
-0xf4, 0x21, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfb, 0x04, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x30, 0x3a, 0x20, 0x4b, 0x65, 0x65, 0x6e, 0x20, 0x00,
-0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65,
-0x00, 0x61, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x3b, 0x00, 0x65, 0x61, 0x63, 0x68,
-0x12, 0x00, 0xf1, 0x1a, 0x6d, 0x61, 0x79, 0x00, 0x63, 0x6f,
-0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x64, 0x69,
-0x67, 0x69, 0x74, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x31,
-0x00, 0x74, 0x6f, 0x00, 0x74, 0x68, 0x65, 0x00, 0x73, 0x69,
-0x7a, 0x65, 0x00, 0x6f, 0x66, 0x0c, 0x00, 0x00, 0x40, 0x00,
-0x33, 0x2e, 0x00, 0x54, 0x0a, 0x00, 0xf0, 0x08, 0x00, 0x69,
-0x73, 0x00, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x00,
-0x69, 0x6e, 0x74, 0x6f, 0x00, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
-0x73, 0x2d, 0x00, 0xf1, 0x02, 0x76, 0x61, 0x72, 0x79, 0x69,
-0x6e, 0x67, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65, 0x00, 0x61,
-0x6e, 0x64, 0x47, 0x00, 0xf0, 0x13, 0x2c, 0x00, 0x77, 0x69,
-0x74, 0x68, 0x00, 0x61, 0x72, 0x69, 0x74, 0x68, 0x6d, 0x65,
-0x74, 0x69, 0x63, 0x00, 0x63, 0x6c, 0x75, 0x65, 0x73, 0x00,
-0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x69, 0x6e,
-0x66, 0x00, 0x20, 0x6d, 0x2e, 0xba, 0x00, 0x50, 0x72, 0x00,
-0x61, 0x69, 0x6d, 0x62, 0x00, 0xf5, 0x02, 0x74, 0x6f, 0x00,
-0x66, 0x75, 0x6c, 0x6c, 0x79, 0x00, 0x70, 0x6f, 0x70, 0x75,
-0x6c, 0x61, 0x74, 0x65, 0x8a, 0x00, 0x02, 0x4e, 0x00, 0x01,
-0xb4, 0x00, 0xf0, 0x03, 0x73, 0x00, 0x73, 0x75, 0x63, 0x68,
-0x00, 0x74, 0x68, 0x61, 0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d,
-0x00, 0x45, 0xe4, 0x00, 0x34, 0x72, 0x6f, 0x77, 0xdd, 0x00,
-0xf1, 0x05, 0x73, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x6f,
-0x6e, 0x65, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x72, 0x65,
-0x6e, 0x63, 0xd7, 0x00, 0x01, 0x0d, 0x01, 0x02, 0xf8, 0x00,
-0x05, 0x38, 0x00, 0x6f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-0x3b, 0x00, 0x1d, 0x00, 0x17, 0x01, 0x03, 0x8d, 0x00, 0x22,
-0x69, 0x6e, 0x1d, 0x00, 0x01, 0x11, 0x01, 0xf1, 0x01, 0x00,
-0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x63, 0x6f, 0x6d,
-0x62, 0x69, 0x6e, 0x65, 0x64, 0xd2, 0x00, 0x31, 0x6f, 0x72,
-0x6d, 0xc8, 0x00, 0xd3, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-0x00, 0x73, 0x74, 0x61, 0x74, 0x65, 0x64, 0x01, 0x01, 0x01,
-0x16, 0x01, 0x40, 0x2c, 0x00, 0x75, 0x73, 0x42, 0x01, 0x00,
-0x10, 0x00, 0x07, 0x31, 0x01, 0xf8, 0x00, 0x6f, 0x70, 0x65,
-0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x67, 0x69, 0x76,
-0x65, 0x6e, 0x32, 0x00, 0x00, 0x99, 0x01, 0x52, 0x61, 0x74,
-0x00, 0x69, 0x73, 0x02, 0x01, 0x71, 0x41, 0x6e, 0x00, 0x61,
-0x64, 0x64, 0x69, 0x2c, 0x00, 0x00, 0x1f, 0x00, 0x61, 0x00,
-0x6d, 0x65, 0x61, 0x6e, 0x73, 0x23, 0x01, 0x02, 0xd8, 0x01,
-0x24, 0x75, 0x6d, 0xd7, 0x01, 0x06, 0xb6, 0x00, 0x00, 0x0e,
-0x00, 0x02, 0xb5, 0x00, 0x63, 0x6d, 0x75, 0x73, 0x74, 0x00,
-0x62, 0x6d, 0x01, 0x01, 0x6b, 0x00, 0x02, 0xab, 0x00, 0xf5,
-0x05, 0x2e, 0x00, 0x46, 0x6f, 0x72, 0x00, 0x65, 0x78, 0x61,
-0x6d, 0x70, 0x6c, 0x65, 0x2c, 0x00, 0x60, 0x31, 0x35, 0x2b,
-0x27, 0x5b, 0x00, 0x11, 0x65, 0x34, 0x01, 0x31, 0x65, 0x6e,
-0x74, 0x05, 0x02, 0x06, 0x4d, 0x00, 0x71, 0x61, 0x64, 0x64,
-0x73, 0x00, 0x75, 0x70, 0xfa, 0x00, 0x72, 0x69, 0x66, 0x74,
-0x65, 0x65, 0x6e, 0x2e, 0xa4, 0x00, 0xb6, 0x00, 0x6d, 0x75,
-0x6c, 0x74, 0x69, 0x70, 0x6c, 0x69, 0x63, 0x61, 0xa9, 0x00,
-0xfc, 0x09, 0x28, 0x65, 0x2e, 0x67, 0x2e, 0x00, 0x60, 0x36,
-0x30, 0x2a, 0x27, 0x29, 0x2c, 0x00, 0x73, 0x69, 0x6d, 0x69,
-0x6c, 0x61, 0x72, 0x6c, 0x79, 0x2c, 0xc2, 0x00, 0x7f, 0x70,
-0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0xc6, 0x00, 0x23, 0x02,
-0x7f, 0x00, 0x76, 0x73, 0x75, 0x62, 0x74, 0x72, 0x61, 0x63,
-0x7c, 0x00, 0xb0, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x61, 0x6c,
-0x77, 0x61, 0x79, 0x73, 0x38, 0x00, 0x07, 0x9a, 0x02, 0x13,
-0x61, 0x53, 0x00, 0x22, 0x6f, 0x66, 0x13, 0x03, 0x41, 0x74,
-0x77, 0x6f, 0x2c, 0xda, 0x02, 0x28, 0x69, 0x74, 0x99, 0x00,
-0x01, 0x27, 0x02, 0x0f, 0x91, 0x00, 0x07, 0xa0, 0x69, 0x73,
-0x00, 0x67, 0x72, 0x65, 0x61, 0x74, 0x65, 0x72, 0x2f, 0x00,
-0x02, 0x1a, 0x00, 0x87, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x00,
-0x62, 0x79, 0xa6, 0x00, 0x6c, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-0x74, 0x6c, 0x01, 0x3f, 0x32, 0x2d, 0x27, 0x6b, 0x00, 0x1b,
-0x6b, 0x32, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0x6a, 0x00, 0x20,
-0x2c, 0x00, 0x55, 0x00, 0xb6, 0x71, 0x75, 0x69, 0x76, 0x61,
-0x6c, 0x65, 0x6e, 0x74, 0x6c, 0x79, 0x4e, 0x00, 0x02, 0xcd,
-0x02, 0x57, 0x6d, 0x69, 0x6e, 0x75, 0x73, 0x9a, 0x00, 0x00,
-0x1a, 0x00, 0x00, 0x4d, 0x00, 0x02, 0xfa, 0x03, 0x34, 0x74,
-0x77, 0x6f, 0x6f, 0x00, 0x50, 0x63, 0x6f, 0x75, 0x6c, 0x64,
-0x27, 0x01, 0x21, 0x65, 0x69, 0x29, 0x00, 0xf4, 0x02, 0x77,
-0x61, 0x79, 0x00, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2c, 0x00,
-0x74, 0x68, 0x6f, 0x75, 0x67, 0x68, 0x67, 0x01, 0x00, 0x26,
-0x04, 0x1c, 0x73, 0xe0, 0x01, 0x2b, 0x33, 0x2f, 0xdf, 0x01,
-0x24, 0x69, 0x73, 0x7a, 0x01, 0x0f, 0x6f, 0x01, 0x03, 0x01,
-0x6e, 0x01, 0x0b, 0x00, 0x01, 0x02, 0xb2, 0x00, 0x04, 0x86,
-0x04, 0x27, 0x62, 0x79, 0xb7, 0x00, 0x20, 0x69, 0x73, 0xe6,
-0x00, 0x24, 0x61, 0x6c, 0xc9, 0x04, 0x0a, 0x5a, 0x01, 0x62,
-0x00, 0x00, 0x4e, 0x6f, 0x74, 0x65, 0x49, 0x00, 0x04, 0x6c,
-0x00, 0x08, 0x0d, 0x05, 0x01, 0x23, 0x03, 0x25, 0x61, 0x6d,
-0x14, 0x01, 0x05, 0x48, 0x01, 0x10, 0x6f, 0xfe, 0x03, 0x42,
-0x28, 0x70, 0x72, 0x6f, 0x73, 0x00, 0x00, 0x28, 0x00, 0x90,
-0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x93,
-0x00, 0x20, 0x73, 0x00, 0x58, 0x05, 0x48, 0x6e, 0x6f, 0x74,
-0x00, 0x46, 0x00, 0x00, 0x8b, 0x04, 0x00, 0xbf, 0x00, 0x02,
-0x5b, 0x04, 0x10, 0x29, 0x4b, 0x01, 0x61, 0x69, 0x73, 0x00,
-0x72, 0x75, 0x6c, 0x5b, 0x01, 0x83, 0x70, 0x72, 0x65, 0x63,
-0x69, 0x73, 0x65, 0x6c, 0xbf, 0x00, 0x65, 0x70, 0x70, 0x6f,
-0x73, 0x69, 0x74, 0xdd, 0x01, 0x02, 0x26, 0x00, 0xf2, 0x0e,
-0x6e, 0x00, 0x53, 0x6f, 0x6c, 0x6f, 0x27, 0x73, 0x00, 0x60,
-0x4b, 0x69, 0x6c, 0x6c, 0x65, 0x72, 0x27, 0x00, 0x6d, 0x6f,
-0x64, 0x65, 0x00, 0x28, 0x73, 0x65, 0x65, 0x00, 0x63, 0xfe,
-0x05, 0x40, 0x00, 0x31, 0x31, 0x29, 0xda, 0x00, 0x01, 0x5c,
-0x00, 0xd5, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x61,
-0x70, 0x70, 0x65, 0x61, 0x72, 0x1b, 0x02, 0xb2, 0x54, 0x69,
-0x6d, 0x65, 0x73, 0x00, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x80,
-0x04, 0x00, 0x9d, 0x00, 0x80, 0x60, 0x4b, 0x65, 0x6e, 0x4b,
-0x65, 0x6e, 0x27, 0x3c, 0x00, 0x42, 0x33, 0x30, 0x2e, 0x31,
-0x42, 0x06, 0x00, 0x0a, 0x01, 0x40, 0x72, 0x6f, 0x6c, 0x73,
-0x4b, 0x06, 0x00, 0x11, 0x00, 0x00, 0xcd, 0x05, 0x50, 0x72,
-0x65, 0x73, 0x00, 0x6d, 0x6a, 0x05, 0x32, 0x6f, 0x66, 0x00,
-0x02, 0x02, 0x01, 0x24, 0x00, 0x72, 0x00, 0x73, 0x79, 0x73,
-0x74, 0x65, 0x6d, 0x91, 0x05, 0x00, 0xa7, 0x00, 0x20, 0x00,
-0x28, 0xed, 0x00, 0x21, 0x55, 0x6e, 0x81, 0x01, 0x02, 0x94,
-0x00, 0x61, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x4a, 0x00,
-0x01, 0xf6, 0x01, 0x91, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c,
-0x69, 0x63, 0x6b, 0x88, 0x00, 0x51, 0x6d, 0x6f, 0x75, 0x73,
-0x65, 0xf8, 0x01, 0x84, 0x6e, 0x79, 0x00, 0x65, 0x6d, 0x70,
-0x74, 0x79, 0xa2, 0x06, 0x21, 0x61, 0x6e, 0x65, 0x01, 0x65,
-0x6e, 0x00, 0x74, 0x79, 0x70, 0x65, 0xa4, 0x06, 0x12, 0x6f,
-0xcf, 0x00, 0x72, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72,
-0x54, 0x05, 0x00, 0xbb, 0x03, 0x01, 0xd0, 0x01, 0x02, 0x3a,
-0x00, 0xc0, 0x2e, 0x00, 0x49, 0x66, 0x00, 0x79, 0x6f, 0x75,
-0x00, 0x6d, 0x61, 0x6b, 0x39, 0x00, 0x8f, 0x6d, 0x69, 0x73,
-0x74, 0x61, 0x6b, 0x65, 0x2c, 0x76, 0x00, 0x01, 0x01, 0xc6,
-0x01, 0x88, 0x6e, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74,
-0x7a, 0x00, 0xb0, 0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53,
-0x70, 0x61, 0x63, 0x65, 0x64, 0x00, 0x50, 0x63, 0x6c, 0x65,
-0x61, 0x72, 0xf2, 0x03, 0x20, 0x61, 0x67, 0x25, 0x02, 0x62,
-0x28, 0x6f, 0x72, 0x00, 0x75, 0x73, 0x5f, 0x04, 0xc1, 0x55,
-0x6e, 0x64, 0x6f, 0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72,
-0x65, 0xf2, 0x00, 0x03, 0x7e, 0x00, 0x62, 0x72, 0x69, 0x67,
-0x68, 0x74, 0x2d, 0x74, 0x00, 0x01, 0xd8, 0x02, 0x0f, 0xd8,
-0x00, 0x04, 0x02, 0x99, 0x04, 0x12, 0x2c, 0xc2, 0x00, 0x03,
-0x17, 0x06, 0x01, 0x8e, 0x04, 0x00, 0x60, 0x03, 0x46, 0x6e,
-0x74, 0x65, 0x72, 0x20, 0x06, 0x04, 0x42, 0x00, 0xf1, 0x02,
-0x73, 0x00, 0x61, 0x00, 0x60, 0x70, 0x65, 0x6e, 0x63, 0x69,
-0x6c, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x27, 0x3a, 0x07, 0x01,
-0x70, 0x06, 0x01, 0xf8, 0x07, 0x07, 0x1b, 0x00, 0x10, 0x73,
-0x73, 0x06, 0x04, 0x6e, 0x05, 0x04, 0x77, 0x06, 0x19, 0x73,
-0xa3, 0x02, 0x04, 0x36, 0x01, 0x11, 0x53, 0x08, 0x00, 0x14,
-0x73, 0x0a, 0x03, 0x00, 0x85, 0x06, 0x10, 0x66, 0x72, 0x02,
-0x45, 0x64, 0x2d, 0x69, 0x6e, 0x39, 0x00, 0x30, 0x63, 0x61,
-0x6e, 0xe3, 0x02, 0x45, 0x61, 0x6c, 0x73, 0x6f, 0x33, 0x03,
-0x08, 0x6f, 0x00, 0x02, 0x87, 0x02, 0x30, 0x65, 0x00, 0x67,
-0x5a, 0x00, 0x10, 0x70, 0xd4, 0x03, 0x40, 0x6e, 0x6f, 0x00,
-0x61, 0x4c, 0x05, 0x01, 0x6c, 0x05, 0x29, 0x74, 0x6f, 0x2e,
-0x00, 0x40, 0x2c, 0x00, 0x73, 0x6f, 0xe8, 0x04, 0x10, 0x63,
-0x8e, 0x04, 0x10, 0x77, 0x01, 0x01, 0x00, 0x3a, 0x01, 0x03,
-0x5a, 0x01, 0x11, 0x6d, 0xbb, 0x00, 0x14, 0x69, 0x41, 0x06,
-0x63, 0x79, 0x6f, 0x75, 0x3a, 0x00, 0x79, 0xe7, 0x00, 0x05,
-0x23, 0x00, 0x70, 0x61, 0x73, 0x00, 0x72, 0x65, 0x6d, 0x69,
-0xd8, 0x02, 0x14, 0x73, 0xd5, 0x03, 0xa4, 0x70, 0x61, 0x72,
-0x74, 0x69, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x32, 0x01, 0x41,
-0x6e, 0x65, 0x65, 0x64, 0x52, 0x08, 0x60, 0x62, 0x65, 0x00,
-0x72, 0x65, 0x2d, 0x5a, 0x05, 0x01, 0x92, 0x07, 0x01, 0xd4,
-0x03, 0x00, 0x54, 0x00, 0x42, 0x6b, 0x6e, 0x6f, 0x77, 0xec,
-0x03, 0x4b, 0x61, 0x62, 0x6f, 0x75, 0x45, 0x00, 0x04, 0xa2,
-0x01, 0x2f, 0x6f, 0x72, 0x80, 0x00, 0x02, 0x36, 0x6c, 0x69,
-0x73, 0xf8, 0x06, 0x6a, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62,
-0x6a, 0x01, 0x13, 0x61, 0x83, 0x04, 0x02, 0x8d, 0x00, 0x01,
-0x48, 0x00, 0x50, 0x61, 0x6e, 0x79, 0x74, 0x68, 0x62, 0x01,
-0x32, 0x65, 0x6c, 0x73, 0x82, 0x00, 0x93, 0x66, 0x65, 0x65,
-0x6c, 0x00, 0x6c, 0x69, 0x6b, 0x65, 0x35, 0x03, 0x41, 0x65,
-0x72, 0x61, 0x73, 0xc2, 0x09, 0x49, 0x69, 0x6e, 0x67, 0x6c,
-0xd3, 0x01, 0x1c, 0x2c, 0x5b, 0x02, 0x08, 0x1b, 0x02, 0x22,
-0x6e, 0x64, 0x58, 0x02, 0x05, 0xde, 0x01, 0x03, 0x52, 0x02,
-0x01, 0xb8, 0x02, 0x00, 0x5b, 0x00, 0x3a, 0x41, 0x6c, 0x6c,
-0x20, 0x02, 0x09, 0x9c, 0x02, 0x22, 0x72, 0x65, 0x79, 0x00,
-0x30, 0x64, 0x00, 0x77, 0xa3, 0x02, 0x00, 0x99, 0x00, 0x34,
-0x6c, 0x65, 0x66, 0x6c, 0x00, 0x05, 0x5e, 0x00, 0x18, 0x61,
-0x14, 0x01, 0x0f, 0x2a, 0x00, 0x05, 0x02, 0x43, 0x03, 0x10,
-0x73, 0x43, 0x03, 0x36, 0x2e, 0x00, 0x52, 0xb3, 0x00, 0x00,
-0xf7, 0x00, 0x05, 0x20, 0x00, 0x01, 0x2d, 0x0a, 0x01, 0x66,
-0x03, 0x03, 0x82, 0x07, 0x14, 0x73, 0xfb, 0x00, 0x0c, 0x56,
-0x02, 0x12, 0x41, 0xcb, 0x02, 0x00, 0x66, 0x04, 0x12, 0x2c,
-0x73, 0x08, 0x50, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x0b, 0x04,
-0x14, 0x73, 0x6b, 0x09, 0x22, 0x75, 0x73, 0x2d, 0x03, 0x62,
-0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0xdf, 0x07, 0x01, 0x9c,
-0x04, 0x05, 0x2c, 0x07, 0x02, 0x2f, 0x00, 0x65, 0x74, 0x6f,
-0x00, 0x73, 0x65, 0x74, 0xa4, 0x01, 0x2b, 0x6f, 0x72, 0x6e,
-0x00, 0x3d, 0x55, 0x73, 0x65, 0x63, 0x00, 0x51, 0x74, 0x6f,
-0x00, 0x6d, 0x6f, 0x55, 0x0b, 0x50, 0x68, 0x69, 0x67, 0x68,
-0x6c, 0xd0, 0x00, 0x21, 0x00, 0x61, 0xf6, 0x06, 0x05, 0x99,
-0x0a, 0x02, 0x18, 0x08, 0x09, 0xb0, 0x04, 0x22, 0x74, 0x6f,
-0xc5, 0x03, 0x25, 0x00, 0x69, 0x18, 0x06, 0x05, 0x3f, 0x00,
-0x25, 0x65, 0x64, 0x7c, 0x03, 0x14, 0x50, 0x0c, 0x01, 0x50,
-0x72, 0x65, 0x74, 0x75, 0x72, 0x28, 0x03, 0x5a, 0x67, 0x67,
-0x6c, 0x65, 0x73, 0x30, 0x00, 0x02, 0x6d, 0x0b, 0x12, 0x61,
-0x00, 0x06, 0x85, 0x69, 0x6e, 0x00, 0x77, 0x68, 0x69, 0x63,
-0x68, 0x93, 0x02, 0x02, 0x67, 0x00, 0x20, 0x6f, 0x72, 0x10,
-0x03, 0x2e, 0x6f, 0x76, 0x40, 0x01, 0x05, 0x63, 0x00, 0x12,
-0x4d, 0x6b, 0x01, 0x01, 0x37, 0x05, 0x01, 0xfd, 0x01, 0x00,
-0x67, 0x0b, 0x01, 0x10, 0x01, 0x2d, 0x6f, 0x66, 0x1b, 0x02,
-0x45, 0x65, 0x76, 0x65, 0x72, 0x93, 0x05, 0x01, 0x60, 0x03,
-0x41, 0x64, 0x6f, 0x65, 0x73, 0xe7, 0x06, 0x03, 0x63, 0x0c,
-0x10, 0x6d, 0x03, 0x04, 0x02, 0xed, 0x00, 0x41, 0x69, 0x6e,
-0x00, 0x69, 0x63, 0x07, 0x10, 0x28, 0x66, 0x02, 0x01, 0xc2,
-0x0a, 0x01, 0x84, 0x01, 0x92, 0x73, 0x00, 0x64, 0x65, 0x73,
-0x63, 0x72, 0x69, 0x62, 0x9e, 0x01, 0x22, 0x73, 0x65, 0x9a,
-0x01, 0x31, 0x32, 0x2e, 0x31, 0x72, 0x02, 0x01, 0xf5, 0x01,
-0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65,
-0x2e, 0x29, 0x8e, 0x06, 0x12, 0x32, 0x8e, 0x06, 0xb2, 0x70,
-0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20,
-0x5b, 0x04, 0x00, 0x1b, 0x02, 0x05, 0x14, 0x00, 0x02, 0x40,
-0x00, 0x04, 0x3b, 0x00, 0x02, 0xc2, 0x0c, 0x00, 0x78, 0x00,
-0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
-0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6e, 0x00, 0x03, 0x3a, 0x06,
-0x50, 0x60, 0x54, 0x79, 0x70, 0x65, 0x4f, 0x09, 0x20, 0x6e,
-0x75, 0xaa, 0x00, 0x51, 0x47, 0x72, 0x69, 0x64, 0x20, 0x69,
-0x08, 0xbf, 0x00, 0x00, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66,
-0x69, 0x65, 0x73, 0x00, 0x0d, 0x04, 0xb0, 0x4c, 0x6f, 0x77,
-0x65, 0x72, 0x00, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x97, 0x04,
-0x68, 0x33, 0x3b, 0x00, 0x75, 0x70, 0x70, 0x12, 0x00, 0x74,
-0x39, 0x00, 0x28, 0x62, 0x65, 0x63, 0x61, 0x1a, 0x06, 0x20,
-0x75, 0x73, 0xf8, 0x01, 0x00, 0x97, 0x01, 0x11, 0x66, 0xe1,
-0x02, 0x03, 0x36, 0x09, 0x42, 0x63, 0x6f, 0x6d, 0x65, 0x6c,
-0x04, 0x40, 0x64, 0x69, 0x66, 0x66, 0x64, 0x04, 0x12, 0x74,
-0xa5, 0x02, 0x12, 0x60, 0x5f, 0x09, 0x64, 0x27, 0x00, 0x62,
-0x69, 0x67, 0x67, 0x29, 0x0a, 0x21, 0x39, 0x21, 0x55, 0x06,
-0x14, 0x44, 0x2b, 0x00, 0x53, 0x79, 0x00, 0x00, 0x00, 0x43,
-0xa2, 0x07, 0x03, 0xd7, 0x02, 0x05, 0x1a, 0x00, 0x04, 0xae,
-0x00, 0x41, 0x65, 0x6e, 0x65, 0x72, 0x58, 0x0c, 0x02, 0x0c,
-0x08, 0xd1, 0x2e, 0x00, 0x41, 0x74, 0x00, 0x55, 0x6e, 0x72,
-0x65, 0x61, 0x73, 0x6f, 0x6e, 0x28, 0x01, 0x50, 0x6c, 0x65,
-0x76, 0x65, 0x6c, 0x7d, 0x05, 0x70, 0x6d, 0x65, 0x00, 0x62,
-0x61, 0x63, 0x6b, 0x0c, 0x0b, 0x01, 0x98, 0x03, 0x04, 0x79,
-0x06, 0x10, 0x72, 0x28, 0x0a, 0x73, 0x72, 0x65, 0x64, 0x2c,
-0x00, 0x62, 0x75, 0x37, 0x0c, 0x31, 0x6f, 0x6c, 0x75, 0x48,
-0x01, 0x21, 0x73, 0x68, 0xc8, 0x00, 0x23, 0x73, 0x74, 0x2b,
-0x00, 0x42, 0x75, 0x6e, 0x69, 0x71, 0x85, 0x0c, 0x10, 0x65,
-0x7b, 0x02, 0x03, 0x3a, 0x06, 0x01, 0x62, 0x00, 0x14, 0x73,
-0x48, 0x00, 0x00, 0x64, 0x07, 0x00, 0x7f, 0x00, 0x00, 0xcc,
-0x04, 0x00, 0x6b, 0x09, 0x00, 0xd8, 0x0a, 0x22, 0x78, 0x00,
-0x91, 0x00, 0x01, 0xed, 0x0c, 0x00, 0x00, 0x02, 0x30, 0x6f,
-0x69, 0x64, 0x54, 0x02, 0x03, 0x10, 0x00, 0x05, 0x97, 0x00,
-0x00, 0xfe, 0x00, 0x19, 0x4d, 0x2e, 0x0c, 0x11, 0x20, 0x98,
-0x0d, 0x01, 0x69, 0x07, 0x10, 0x74, 0xf2, 0x08, 0x00, 0xf1,
-0x09, 0x01, 0xd8, 0x00, 0x00, 0x81, 0x03, 0x00, 0x95, 0x00,
-0x45, 0x6f, 0x78, 0x65, 0x73, 0xcb, 0x00, 0x0b, 0x6a, 0x0c,
-0x01, 0x1d, 0x00, 0x32, 0x2e, 0x00, 0x57, 0x16, 0x04, 0x03,
-0x8c, 0x09, 0x02, 0x51, 0x04, 0x03, 0x3a, 0x09, 0x21, 0x69,
-0x73, 0x0f, 0x06, 0x10, 0x6e, 0xdc, 0x05, 0xf0, 0x02, 0x60,
-0x49, 0x6e, 0x73, 0x68, 0x69, 0x00, 0x4e, 0x6f, 0x00, 0x48,
-0x65, 0x79, 0x61, 0x27, 0x2e, 0x00,
+0x2d, 0x01, 0x00, 0xf4, 0x10, 0x00, 0x00, 0x00, 0x59, 0x6f,
+0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x73,
+0x71, 0x75, 0x61, 0x72, 0x65, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x3b, 0x00, 0x65, 0x61, 0x63, 0x68, 0x12, 0x00, 0xf1, 0x1a,
+0x6d, 0x61, 0x79, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
+0x6e, 0x00, 0x61, 0x00, 0x64, 0x69, 0x67, 0x69, 0x74, 0x00,
+0x66, 0x72, 0x6f, 0x6d, 0x00, 0x31, 0x00, 0x74, 0x6f, 0x00,
+0x74, 0x68, 0x65, 0x00, 0x73, 0x69, 0x7a, 0x65, 0x00, 0x6f,
+0x66, 0x0c, 0x00, 0x00, 0x40, 0x00, 0x33, 0x2e, 0x00, 0x54,
+0x0a, 0x00, 0xf0, 0x08, 0x00, 0x69, 0x73, 0x00, 0x64, 0x69,
+0x76, 0x69, 0x64, 0x65, 0x64, 0x00, 0x69, 0x6e, 0x74, 0x6f,
+0x00, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x2d, 0x00, 0xf1,
+0x02, 0x76, 0x61, 0x72, 0x79, 0x69, 0x6e, 0x67, 0x00, 0x73,
+0x68, 0x61, 0x70, 0x65, 0x00, 0x61, 0x6e, 0x64, 0x47, 0x00,
+0xf0, 0x13, 0x2c, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x61,
+0x72, 0x69, 0x74, 0x68, 0x6d, 0x65, 0x74, 0x69, 0x63, 0x00,
+0x63, 0x6c, 0x75, 0x65, 0x73, 0x00, 0x77, 0x72, 0x69, 0x74,
+0x74, 0x65, 0x6e, 0x00, 0x69, 0x6e, 0x66, 0x00, 0x20, 0x6d,
+0x2e, 0xba, 0x00, 0x50, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x62,
+0x00, 0xf5, 0x02, 0x74, 0x6f, 0x00, 0x66, 0x75, 0x6c, 0x6c,
+0x79, 0x00, 0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61, 0x74, 0x65,
+0x8a, 0x00, 0x02, 0x4e, 0x00, 0x01, 0xb4, 0x00, 0xf0, 0x03,
+0x73, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x74, 0x68, 0x61,
+0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x45, 0xe4, 0x00,
+0x34, 0x72, 0x6f, 0x77, 0xdd, 0x00, 0xf1, 0x05, 0x73, 0x00,
+0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x65, 0x00, 0x6f,
+0x63, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0xd7, 0x00,
+0x01, 0x0d, 0x01, 0x02, 0xf8, 0x00, 0x05, 0x38, 0x00, 0x6f,
+0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x3b, 0x00, 0x1d, 0x00,
+0x17, 0x01, 0x03, 0x8d, 0x00, 0x22, 0x69, 0x6e, 0x1d, 0x00,
+0x01, 0x11, 0x01, 0xf1, 0x01, 0x00, 0x63, 0x61, 0x6e, 0x00,
+0x62, 0x65, 0x00, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65,
+0x64, 0xd2, 0x00, 0x31, 0x6f, 0x72, 0x6d, 0xc8, 0x00, 0xd3,
+0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x73, 0x74, 0x61,
+0x74, 0x65, 0x64, 0x01, 0x01, 0x01, 0x16, 0x01, 0x40, 0x2c,
+0x00, 0x75, 0x73, 0x42, 0x01, 0x00, 0x10, 0x00, 0x07, 0x31,
+0x01, 0xf8, 0x00, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
+0x6f, 0x6e, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x32, 0x00,
+0x00, 0x99, 0x01, 0x52, 0x61, 0x74, 0x00, 0x69, 0x73, 0x02,
+0x01, 0x71, 0x41, 0x6e, 0x00, 0x61, 0x64, 0x64, 0x69, 0x2c,
+0x00, 0x00, 0x1f, 0x00, 0x61, 0x00, 0x6d, 0x65, 0x61, 0x6e,
+0x73, 0x23, 0x01, 0x02, 0xd8, 0x01, 0x24, 0x75, 0x6d, 0xd7,
+0x01, 0x06, 0xb6, 0x00, 0x00, 0x0e, 0x00, 0x02, 0xb5, 0x00,
+0x63, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x62, 0x6d, 0x01, 0x01,
+0x6b, 0x00, 0x02, 0xab, 0x00, 0xf5, 0x05, 0x2e, 0x00, 0x46,
+0x6f, 0x72, 0x00, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+0x2c, 0x00, 0x60, 0x31, 0x35, 0x2b, 0x27, 0x5b, 0x00, 0x11,
+0x65, 0x34, 0x01, 0x31, 0x65, 0x6e, 0x74, 0x05, 0x02, 0x06,
+0x4d, 0x00, 0x71, 0x61, 0x64, 0x64, 0x73, 0x00, 0x75, 0x70,
+0xfa, 0x00, 0x72, 0x69, 0x66, 0x74, 0x65, 0x65, 0x6e, 0x2e,
+0xa4, 0x00, 0xb6, 0x00, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70,
+0x6c, 0x69, 0x63, 0x61, 0xa9, 0x00, 0xfc, 0x09, 0x28, 0x65,
+0x2e, 0x67, 0x2e, 0x00, 0x60, 0x36, 0x30, 0x2a, 0x27, 0x29,
+0x2c, 0x00, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x6c,
+0x79, 0x2c, 0xc2, 0x00, 0x7f, 0x70, 0x72, 0x6f, 0x64, 0x75,
+0x63, 0x74, 0xc6, 0x00, 0x23, 0x02, 0x7f, 0x00, 0x76, 0x73,
+0x75, 0x62, 0x74, 0x72, 0x61, 0x63, 0x7c, 0x00, 0xb0, 0x77,
+0x69, 0x6c, 0x6c, 0x00, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73,
+0x38, 0x00, 0x07, 0x9a, 0x02, 0x13, 0x61, 0x53, 0x00, 0x22,
+0x6f, 0x66, 0x13, 0x03, 0x41, 0x74, 0x77, 0x6f, 0x2c, 0xda,
+0x02, 0x28, 0x69, 0x74, 0x99, 0x00, 0x01, 0x27, 0x02, 0x0f,
+0x91, 0x00, 0x07, 0xa0, 0x69, 0x73, 0x00, 0x67, 0x72, 0x65,
+0x61, 0x74, 0x65, 0x72, 0x2f, 0x00, 0x02, 0x1a, 0x00, 0x87,
+0x6f, 0x74, 0x68, 0x65, 0x72, 0x00, 0x62, 0x79, 0xa6, 0x00,
+0x6c, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x6c, 0x01, 0x3f,
+0x32, 0x2d, 0x27, 0x6b, 0x00, 0x1b, 0x6b, 0x32, 0x00, 0x6d,
+0x6f, 0x72, 0x65, 0x6a, 0x00, 0x20, 0x2c, 0x00, 0x55, 0x00,
+0xb6, 0x71, 0x75, 0x69, 0x76, 0x61, 0x6c, 0x65, 0x6e, 0x74,
+0x6c, 0x79, 0x4e, 0x00, 0x02, 0xcd, 0x02, 0x57, 0x6d, 0x69,
+0x6e, 0x75, 0x73, 0x9a, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x4d,
+0x00, 0x02, 0xfa, 0x03, 0x34, 0x74, 0x77, 0x6f, 0x6f, 0x00,
+0x50, 0x63, 0x6f, 0x75, 0x6c, 0x64, 0x27, 0x01, 0x21, 0x65,
+0x69, 0x29, 0x00, 0xf4, 0x02, 0x77, 0x61, 0x79, 0x00, 0x72,
+0x6f, 0x75, 0x6e, 0x64, 0x2c, 0x00, 0x74, 0x68, 0x6f, 0x75,
+0x67, 0x68, 0x67, 0x01, 0x00, 0x26, 0x04, 0x1c, 0x73, 0xe0,
+0x01, 0x2b, 0x33, 0x2f, 0xdf, 0x01, 0x24, 0x69, 0x73, 0x7a,
+0x01, 0x0f, 0x6f, 0x01, 0x03, 0x01, 0x6e, 0x01, 0x0b, 0x00,
+0x01, 0x02, 0xb2, 0x00, 0x04, 0x86, 0x04, 0x27, 0x62, 0x79,
+0xb7, 0x00, 0x20, 0x69, 0x73, 0xe6, 0x00, 0x24, 0x61, 0x6c,
+0xc9, 0x04, 0x0a, 0x5a, 0x01, 0x62, 0x00, 0x00, 0x4e, 0x6f,
+0x74, 0x65, 0x49, 0x00, 0x04, 0x6c, 0x00, 0x08, 0x0d, 0x05,
+0x01, 0x23, 0x03, 0x25, 0x61, 0x6d, 0x14, 0x01, 0x05, 0x48,
+0x01, 0x10, 0x6f, 0xfe, 0x03, 0x42, 0x28, 0x70, 0x72, 0x6f,
+0x73, 0x00, 0x00, 0x28, 0x00, 0x90, 0x69, 0x64, 0x65, 0x6e,
+0x74, 0x69, 0x63, 0x61, 0x6c, 0x93, 0x00, 0x20, 0x73, 0x00,
+0x58, 0x05, 0x48, 0x6e, 0x6f, 0x74, 0x00, 0x46, 0x00, 0x00,
+0x8b, 0x04, 0x00, 0xbf, 0x00, 0x02, 0x5b, 0x04, 0x10, 0x29,
+0x4b, 0x01, 0x61, 0x69, 0x73, 0x00, 0x72, 0x75, 0x6c, 0x5b,
+0x01, 0x83, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x65, 0x6c,
+0xbf, 0x00, 0x65, 0x70, 0x70, 0x6f, 0x73, 0x69, 0x74, 0xdd,
+0x01, 0x02, 0x26, 0x00, 0xf2, 0x0e, 0x6e, 0x00, 0x53, 0x6f,
+0x6c, 0x6f, 0x27, 0x73, 0x00, 0x60, 0x4b, 0x69, 0x6c, 0x6c,
+0x65, 0x72, 0x27, 0x00, 0x6d, 0x6f, 0x64, 0x65, 0x00, 0x28,
+0x73, 0x65, 0x65, 0x00, 0x63, 0x0f, 0x06, 0x40, 0x00, 0x31,
+0x31, 0x29, 0xda, 0x00, 0x01, 0x5c, 0x00, 0xd5, 0x70, 0x75,
+0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x61, 0x70, 0x70, 0x65, 0x61,
+0x72, 0x1b, 0x02, 0xb2, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x00,
+0x75, 0x6e, 0x64, 0x65, 0x72, 0x80, 0x04, 0x00, 0x9d, 0x00,
+0x80, 0x60, 0x4b, 0x65, 0x6e, 0x4b, 0x65, 0x6e, 0x27, 0x3c,
+0x00, 0x42, 0x33, 0x30, 0x2e, 0x31, 0x53, 0x06, 0x00, 0x0a,
+0x01, 0x80, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00,
+0x11, 0x00, 0x00, 0xcd, 0x05, 0x50, 0x72, 0x65, 0x73, 0x00,
+0x6d, 0x6a, 0x05, 0x32, 0x6f, 0x66, 0x00, 0x02, 0x02, 0x01,
+0x24, 0x00, 0x72, 0x00, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d,
+0x91, 0x05, 0x00, 0xa7, 0x00, 0x20, 0x00, 0x28, 0xed, 0x00,
+0x21, 0x55, 0x6e, 0x81, 0x01, 0x02, 0x94, 0x00, 0x61, 0x6f,
+0x00, 0x70, 0x6c, 0x61, 0x79, 0x4a, 0x00, 0x01, 0xf6, 0x01,
+0x91, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b,
+0x88, 0x00, 0x51, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0xf8, 0x01,
+0x84, 0x6e, 0x79, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0xa2,
+0x06, 0x21, 0x61, 0x6e, 0x65, 0x01, 0x65, 0x6e, 0x00, 0x74,
+0x79, 0x70, 0x65, 0xa4, 0x06, 0x12, 0x6f, 0xcf, 0x00, 0x72,
+0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x54, 0x05, 0x00,
+0xbb, 0x03, 0x01, 0xd0, 0x01, 0x02, 0x3a, 0x00, 0xc0, 0x2e,
+0x00, 0x49, 0x66, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x6d, 0x61,
+0x6b, 0x39, 0x00, 0x8f, 0x6d, 0x69, 0x73, 0x74, 0x61, 0x6b,
+0x65, 0x2c, 0x76, 0x00, 0x01, 0x01, 0xc6, 0x01, 0x88, 0x6e,
+0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74, 0x7a, 0x00, 0xb0,
+0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0x61, 0x63,
+0x65, 0x64, 0x00, 0x50, 0x63, 0x6c, 0x65, 0x61, 0x72, 0xf2,
+0x03, 0x20, 0x61, 0x67, 0x25, 0x02, 0x62, 0x28, 0x6f, 0x72,
+0x00, 0x75, 0x73, 0x5f, 0x04, 0xc1, 0x55, 0x6e, 0x64, 0x6f,
+0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0xf2, 0x00,
+0x03, 0x7e, 0x00, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d,
+0x74, 0x00, 0x01, 0xd8, 0x02, 0x0f, 0xd8, 0x00, 0x04, 0x02,
+0x99, 0x04, 0x12, 0x2c, 0xc2, 0x00, 0x03, 0x17, 0x06, 0x01,
+0x8e, 0x04, 0x00, 0x60, 0x03, 0x46, 0x6e, 0x74, 0x65, 0x72,
+0x20, 0x06, 0x04, 0x42, 0x00, 0xf1, 0x02, 0x73, 0x00, 0x61,
+0x00, 0x60, 0x70, 0x65, 0x6e, 0x63, 0x69, 0x6c, 0x00, 0x6d,
+0x61, 0x72, 0x6b, 0x27, 0x3a, 0x07, 0x01, 0x70, 0x06, 0x01,
+0xf8, 0x07, 0x07, 0x1b, 0x00, 0x10, 0x73, 0x73, 0x06, 0x04,
+0x6e, 0x05, 0x04, 0x77, 0x06, 0x19, 0x73, 0xa3, 0x02, 0x04,
+0x36, 0x01, 0x11, 0x53, 0x08, 0x00, 0x14, 0x73, 0x0a, 0x03,
+0x00, 0x85, 0x06, 0x10, 0x66, 0x72, 0x02, 0x45, 0x64, 0x2d,
+0x69, 0x6e, 0x39, 0x00, 0x30, 0x63, 0x61, 0x6e, 0xe3, 0x02,
+0x45, 0x61, 0x6c, 0x73, 0x6f, 0x33, 0x03, 0x08, 0x6f, 0x00,
+0x02, 0x87, 0x02, 0x30, 0x65, 0x00, 0x67, 0x5a, 0x00, 0x10,
+0x70, 0xd4, 0x03, 0x40, 0x6e, 0x6f, 0x00, 0x61, 0x4c, 0x05,
+0x01, 0x6c, 0x05, 0x29, 0x74, 0x6f, 0x2e, 0x00, 0x40, 0x2c,
+0x00, 0x73, 0x6f, 0xe8, 0x04, 0x10, 0x63, 0x8e, 0x04, 0x10,
+0x77, 0x01, 0x01, 0x00, 0x3a, 0x01, 0x03, 0x5a, 0x01, 0x11,
+0x6d, 0xbb, 0x00, 0x14, 0x69, 0x41, 0x06, 0x63, 0x79, 0x6f,
+0x75, 0x3a, 0x00, 0x79, 0xe7, 0x00, 0x05, 0x23, 0x00, 0x70,
+0x61, 0x73, 0x00, 0x72, 0x65, 0x6d, 0x69, 0xd8, 0x02, 0x14,
+0x73, 0xd5, 0x03, 0xa4, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63,
+0x75, 0x6c, 0x61, 0x72, 0x32, 0x01, 0x41, 0x6e, 0x65, 0x65,
+0x64, 0x52, 0x08, 0x60, 0x62, 0x65, 0x00, 0x72, 0x65, 0x2d,
+0x5a, 0x05, 0x01, 0x92, 0x07, 0x01, 0xd4, 0x03, 0x00, 0x54,
+0x00, 0x42, 0x6b, 0x6e, 0x6f, 0x77, 0xec, 0x03, 0x4b, 0x61,
+0x62, 0x6f, 0x75, 0x45, 0x00, 0x04, 0xa2, 0x01, 0x2f, 0x6f,
+0x72, 0x80, 0x00, 0x02, 0x36, 0x6c, 0x69, 0x73, 0xf8, 0x06,
+0x6a, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6a, 0x01, 0x13,
+0x61, 0x83, 0x04, 0x02, 0x8d, 0x00, 0x01, 0x48, 0x00, 0x50,
+0x61, 0x6e, 0x79, 0x74, 0x68, 0x62, 0x01, 0x32, 0x65, 0x6c,
+0x73, 0x82, 0x00, 0x93, 0x66, 0x65, 0x65, 0x6c, 0x00, 0x6c,
+0x69, 0x6b, 0x65, 0x35, 0x03, 0x41, 0x65, 0x72, 0x61, 0x73,
+0xc2, 0x09, 0x49, 0x69, 0x6e, 0x67, 0x6c, 0xd3, 0x01, 0x1c,
+0x2c, 0x5b, 0x02, 0x08, 0x1b, 0x02, 0x22, 0x6e, 0x64, 0x58,
+0x02, 0x05, 0xde, 0x01, 0x03, 0x52, 0x02, 0x01, 0xb8, 0x02,
+0x00, 0x5b, 0x00, 0x3a, 0x41, 0x6c, 0x6c, 0x20, 0x02, 0x09,
+0x9c, 0x02, 0x22, 0x72, 0x65, 0x79, 0x00, 0x30, 0x64, 0x00,
+0x77, 0xa3, 0x02, 0x00, 0x99, 0x00, 0x34, 0x6c, 0x65, 0x66,
+0x6c, 0x00, 0x05, 0x5e, 0x00, 0x18, 0x61, 0x14, 0x01, 0x0f,
+0x2a, 0x00, 0x05, 0x02, 0x43, 0x03, 0x10, 0x73, 0x43, 0x03,
+0x36, 0x2e, 0x00, 0x52, 0xb3, 0x00, 0x00, 0xf7, 0x00, 0x05,
+0x20, 0x00, 0x01, 0x2d, 0x0a, 0x01, 0x66, 0x03, 0x03, 0x82,
+0x07, 0x14, 0x73, 0xfb, 0x00, 0x0c, 0x56, 0x02, 0x12, 0x41,
+0xcb, 0x02, 0x00, 0x66, 0x04, 0x12, 0x2c, 0x73, 0x08, 0x50,
+0x75, 0x72, 0x73, 0x6f, 0x72, 0x0b, 0x04, 0x14, 0x73, 0x6b,
+0x09, 0x22, 0x75, 0x73, 0x2d, 0x03, 0x62, 0x63, 0x6f, 0x6e,
+0x6a, 0x75, 0x6e, 0xdf, 0x07, 0x01, 0x9c, 0x04, 0x05, 0x2c,
+0x07, 0x02, 0x2f, 0x00, 0x65, 0x74, 0x6f, 0x00, 0x73, 0x65,
+0x74, 0xa4, 0x01, 0x2b, 0x6f, 0x72, 0x6e, 0x00, 0x3d, 0x55,
+0x73, 0x65, 0x63, 0x00, 0x51, 0x74, 0x6f, 0x00, 0x6d, 0x6f,
+0x55, 0x0b, 0x50, 0x68, 0x69, 0x67, 0x68, 0x6c, 0xd0, 0x00,
+0x21, 0x00, 0x61, 0xf6, 0x06, 0x05, 0x99, 0x0a, 0x02, 0x18,
+0x08, 0x09, 0xb0, 0x04, 0x22, 0x74, 0x6f, 0xc5, 0x03, 0x25,
+0x00, 0x69, 0x18, 0x06, 0x05, 0x3f, 0x00, 0x25, 0x65, 0x64,
+0x7c, 0x03, 0x14, 0x50, 0x0c, 0x01, 0x50, 0x72, 0x65, 0x74,
+0x75, 0x72, 0x28, 0x03, 0x5a, 0x67, 0x67, 0x6c, 0x65, 0x73,
+0x30, 0x00, 0x02, 0x6d, 0x0b, 0x12, 0x61, 0x00, 0x06, 0x85,
+0x69, 0x6e, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x93, 0x02,
+0x02, 0x67, 0x00, 0x20, 0x6f, 0x72, 0x10, 0x03, 0x2e, 0x6f,
+0x76, 0x40, 0x01, 0x05, 0x63, 0x00, 0x12, 0x4d, 0x6b, 0x01,
+0x01, 0x37, 0x05, 0x01, 0xfd, 0x01, 0x00, 0x67, 0x0b, 0x01,
+0x10, 0x01, 0x2d, 0x6f, 0x66, 0x1b, 0x02, 0x45, 0x65, 0x76,
+0x65, 0x72, 0x93, 0x05, 0x01, 0x60, 0x03, 0x41, 0x64, 0x6f,
+0x65, 0x73, 0xe7, 0x06, 0x03, 0x63, 0x0c, 0x10, 0x6d, 0x03,
+0x04, 0x02, 0xed, 0x00, 0x41, 0x69, 0x6e, 0x00, 0x69, 0x63,
+0x07, 0x10, 0x28, 0x66, 0x02, 0x01, 0xc2, 0x0a, 0x01, 0x84,
+0x01, 0x92, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
+0x62, 0x9e, 0x01, 0x22, 0x73, 0x65, 0x9a, 0x01, 0x31, 0x32,
+0x2e, 0x31, 0x72, 0x02, 0x01, 0xf5, 0x01, 0xb2, 0x61, 0x76,
+0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x8e,
+0x06, 0x12, 0x32, 0x8e, 0x06, 0xb2, 0x70, 0x61, 0x72, 0x61,
+0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x5b, 0x04, 0x00,
+0x1b, 0x02, 0x05, 0x14, 0x00, 0x02, 0x40, 0x00, 0x04, 0x3b,
+0x00, 0x02, 0xc2, 0x0c, 0x00, 0x78, 0x00, 0xe1, 0x60, 0x43,
+0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00,
+0x6f, 0x70, 0x6e, 0x00, 0x03, 0x3a, 0x06, 0x50, 0x60, 0x54,
+0x79, 0x70, 0x65, 0x4f, 0x09, 0x20, 0x6e, 0x75, 0xaa, 0x00,
+0x51, 0x47, 0x72, 0x69, 0x64, 0x20, 0x69, 0x08, 0xbf, 0x00,
+0x00, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x73,
+0x00, 0x0d, 0x04, 0xb0, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x00,
+0x6c, 0x69, 0x6d, 0x69, 0x74, 0x97, 0x04, 0x68, 0x33, 0x3b,
+0x00, 0x75, 0x70, 0x70, 0x12, 0x00, 0x74, 0x39, 0x00, 0x28,
+0x62, 0x65, 0x63, 0x61, 0x1a, 0x06, 0x20, 0x75, 0x73, 0xf8,
+0x01, 0x00, 0x97, 0x01, 0x11, 0x66, 0xe1, 0x02, 0x03, 0x36,
+0x09, 0x42, 0x63, 0x6f, 0x6d, 0x65, 0x6c, 0x04, 0x40, 0x64,
+0x69, 0x66, 0x66, 0x64, 0x04, 0x12, 0x74, 0xa5, 0x02, 0x12,
+0x60, 0x5f, 0x09, 0x64, 0x27, 0x00, 0x62, 0x69, 0x67, 0x67,
+0x29, 0x0a, 0x21, 0x39, 0x21, 0x55, 0x06, 0x14, 0x44, 0x2b,
+0x00, 0x53, 0x79, 0x00, 0x00, 0x00, 0x43, 0xa2, 0x07, 0x03,
+0xd7, 0x02, 0x05, 0x1a, 0x00, 0x04, 0xae, 0x00, 0x41, 0x65,
+0x6e, 0x65, 0x72, 0x58, 0x0c, 0x02, 0x0c, 0x08, 0xd1, 0x2e,
+0x00, 0x41, 0x74, 0x00, 0x55, 0x6e, 0x72, 0x65, 0x61, 0x73,
+0x6f, 0x6e, 0x28, 0x01, 0x50, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+0x7d, 0x05, 0x70, 0x6d, 0x65, 0x00, 0x62, 0x61, 0x63, 0x6b,
+0x0c, 0x0b, 0x01, 0x98, 0x03, 0x04, 0x79, 0x06, 0x10, 0x72,
+0x28, 0x0a, 0x73, 0x72, 0x65, 0x64, 0x2c, 0x00, 0x62, 0x75,
+0x37, 0x0c, 0x31, 0x6f, 0x6c, 0x75, 0x48, 0x01, 0x21, 0x73,
+0x68, 0xc8, 0x00, 0x23, 0x73, 0x74, 0x2b, 0x00, 0x42, 0x75,
+0x6e, 0x69, 0x71, 0x85, 0x0c, 0x10, 0x65, 0x7b, 0x02, 0x03,
+0x3a, 0x06, 0x01, 0x62, 0x00, 0x14, 0x73, 0x48, 0x00, 0x00,
+0x64, 0x07, 0x00, 0x7f, 0x00, 0x00, 0xcc, 0x04, 0x00, 0x6b,
+0x09, 0x00, 0xd8, 0x0a, 0x22, 0x78, 0x00, 0x91, 0x00, 0x01,
+0xed, 0x0c, 0x00, 0x00, 0x02, 0x30, 0x6f, 0x69, 0x64, 0x54,
+0x02, 0x03, 0x10, 0x00, 0x05, 0x97, 0x00, 0x00, 0xfe, 0x00,
+0x19, 0x4d, 0x2e, 0x0c, 0x11, 0x20, 0x98, 0x0d, 0x01, 0x69,
+0x07, 0x10, 0x74, 0xf2, 0x08, 0x00, 0xf1, 0x09, 0x01, 0xd8,
+0x00, 0x00, 0x81, 0x03, 0x00, 0x95, 0x00, 0x45, 0x6f, 0x78,
+0x65, 0x73, 0xcb, 0x00, 0x0b, 0x6a, 0x0c, 0x01, 0x1d, 0x00,
+0x32, 0x2e, 0x00, 0x57, 0x16, 0x04, 0x03, 0x8c, 0x09, 0x02,
+0x51, 0x04, 0x03, 0x3a, 0x09, 0x21, 0x69, 0x73, 0x0f, 0x06,
+0x10, 0x6e, 0xdc, 0x05, 0xf0, 0x02, 0x60, 0x49, 0x6e, 0x73,
+0x68, 0x69, 0x00, 0x4e, 0x6f, 0x00, 0x48, 0x65, 0x79, 0x61,
+0x27, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3952;
-const unsigned short help_text_words = 761;
+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 5562b954b7..c109773bf6 100644
--- a/apps/plugins/puzzles/help/lightup.c
+++ b/apps/plugins/puzzles/help/lightup.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,176 +6,190 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 169, TEXT_CENTER | C_RED },
- { 304, TEXT_CENTER | C_RED },
- { 321, TEXT_UNDERLINE },
- { 322, TEXT_UNDERLINE },
- { 332, TEXT_UNDERLINE },
- { 380, TEXT_UNDERLINE },
- { 409, TEXT_UNDERLINE },
+ { 167, TEXT_CENTER | C_RED },
+ { 302, TEXT_CENTER | C_RED },
+ { 319, TEXT_UNDERLINE },
+ { 320, TEXT_UNDERLINE },
+ { 330, TEXT_UNDERLINE },
+ { 378, TEXT_UNDERLINE },
+ { 407, TEXT_UNDERLINE },
+ { 433, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 2327 comp 1558 ratio 0.669532 level 10 saved 769 */
+/* orig 2549 comp 1677 ratio 0.657905 level 10 saved 872 */
 const char help_text[] = {
-0xf0, 0x40, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x31, 0x3a, 0x20, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x20,
-0x55, 0x70, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00,
-0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69,
-0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72,
-0x65, 0x73, 0x2e, 0x00, 0x53, 0x6f, 0x6d, 0x65, 0x00, 0x61,
-0x72, 0x65, 0x00, 0x66, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00,
-0x69, 0x6e, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x3b, 0x00,
-0x73, 0x1a, 0x00, 0x62, 0x6f, 0x66, 0x00, 0x74, 0x68, 0x65,
-0x13, 0x00, 0x04, 0x35, 0x00, 0x01, 0x2f, 0x00, 0x90, 0x6e,
-0x75, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x64, 0x2e, 0x5e, 0x00,
-0xe0, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00,
-0x74, 0x6f, 0x00, 0x60, 0x6c, 0x7a, 0x00, 0x81, 0x00, 0x75,
-0x70, 0x27, 0x00, 0x61, 0x6c, 0x6c, 0x3e, 0x00, 0x55, 0x65,
-0x6d, 0x70, 0x74, 0x79, 0x3e, 0x00, 0xb2, 0x62, 0x79, 0x00,
-0x70, 0x6c, 0x61, 0x63, 0x69, 0x6e, 0x67, 0x00, 0x2b, 0x00,
-0x50, 0x62, 0x75, 0x6c, 0x62, 0x73, 0x79, 0x00, 0x07, 0x72,
-0x00, 0x97, 0x6d, 0x2e, 0x00, 0x00, 0x00, 0x45, 0x61, 0x63,
-0x68, 0x24, 0x00, 0xc1, 0x00, 0x69, 0x6c, 0x6c, 0x75, 0x6d,
-0x69, 0x6e, 0x61, 0x74, 0x65, 0x73, 0x58, 0x00, 0x02, 0x52,
-0x00, 0x30, 0x00, 0x69, 0x74, 0x7b, 0x00, 0x81, 0x6f, 0x6e,
-0x2c, 0x00, 0x70, 0x6c, 0x75, 0x73, 0x76, 0x00, 0x04, 0x6c,
-0x00, 0xc0, 0x69, 0x6e, 0x00, 0x6c, 0x69, 0x6e, 0x65, 0x00,
-0x77, 0x69, 0x74, 0x68, 0x28, 0x00, 0xf1, 0x07, 0x68, 0x6f,
-0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x6c, 0x79,
-0x00, 0x6f, 0x72, 0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63,
-0x0e, 0x00, 0x89, 0x75, 0x6e, 0x6c, 0x65, 0x73, 0x73, 0x00,
-0x61, 0xec, 0x00, 0x00, 0x59, 0x00, 0x50, 0x62, 0x6c, 0x6f,
-0x63, 0x6b, 0xae, 0x00, 0x00, 0x73, 0x00, 0x30, 0x77, 0x61,
-0x79, 0x9a, 0x00, 0x61, 0x54, 0x6f, 0x00, 0x77, 0x69, 0x6e,
-0x12, 0x00, 0xf1, 0x07, 0x67, 0x61, 0x6d, 0x65, 0x2c, 0x00,
-0x79, 0x6f, 0x75, 0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x73,
-0x61, 0x74, 0x69, 0x73, 0x66, 0x79, 0x1b, 0x00, 0x60, 0x66,
-0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x3b, 0x00, 0xfe, 0x09, 0x63,
-0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a,
-0x00, 0x00, 0x00, 0x2d, 0x00, 0x41, 0x6c, 0x6c, 0x00, 0x6e,
-0x6f, 0x6e, 0x2d, 0x58, 0x01, 0x41, 0x6c, 0x69, 0x74, 0x2e,
-0x23, 0x00, 0x23, 0x4e, 0x6f, 0xfb, 0x00, 0x20, 0x69, 0x73,
-0x15, 0x00, 0x00, 0x37, 0x01, 0x72, 0x61, 0x6e, 0x6f, 0x74,
-0x68, 0x65, 0x72, 0x18, 0x00, 0x16, 0x2e, 0x49, 0x00, 0x03,
-0x8b, 0x01, 0x0b, 0xa6, 0x01, 0x01, 0xf2, 0x01, 0x60, 0x65,
-0x78, 0x61, 0x63, 0x74, 0x6c, 0x8f, 0x00, 0x23, 0x61, 0x74,
-0x29, 0x00, 0x00, 0x62, 0x01, 0x01, 0x42, 0x00, 0xa0, 0x73,
-0x00, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0xb8,
-0x01, 0x00, 0x75, 0x01, 0x23, 0x00, 0x28, 0xd5, 0x00, 0x10,
-0x66, 0xd4, 0x01, 0x05, 0x97, 0x00, 0xf3, 0x01, 0x62, 0x6f,
-0x76, 0x65, 0x2c, 0x00, 0x62, 0x65, 0x6c, 0x6f, 0x77, 0x2c,
-0x00, 0x61, 0x6e, 0x64, 0x2f, 0x00, 0x60, 0x00, 0x73, 0x69,
-0x64, 0x65, 0x29, 0x88, 0x00, 0x4f, 0x4e, 0x6f, 0x6e, 0x2d,
-0x86, 0x00, 0x04, 0x33, 0x6d, 0x61, 0x79, 0x7c, 0x02, 0x2f,
-0x6e, 0x79, 0x81, 0x00, 0x0f, 0x00, 0x4d, 0x00, 0xf1, 0x0b,
-0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f, 0x72,
-0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a,
-0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0x60, 0x02, 0xa0, 0x4e,
-0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x39, 0x5d, 0x2d,
-0x00, 0x11, 0x4c, 0x23, 0x01, 0x60, 0x55, 0x70, 0x00, 0x77,
-0x61, 0x73, 0x66, 0x01, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75,
-0x74, 0x65, 0xa3, 0x00, 0x10, 0x69, 0x14, 0x00, 0x40, 0x6c,
-0x6c, 0x65, 0x63, 0x7b, 0x01, 0x00, 0x42, 0x01, 0xb1, 0x4a,
-0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65,
-0xc8, 0x01, 0xf1, 0x01, 0x5b, 0x39, 0x5d, 0x00, 0x68, 0x74,
-0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e,
-0x5c, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f,
-0x65, 0x6e, 0x2f, 0x7b, 0x00, 0xf1, 0x04, 0x73, 0x2f, 0x61,
-0x6b, 0x61, 0x72, 0x69, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00,
-0x28, 0x62, 0x65, 0x77, 0x61, 0x72, 0xa7, 0x02, 0xd6, 0x46,
-0x6c, 0x61, 0x73, 0x68, 0x29, 0x00, 0x00, 0x00, 0x32, 0x31,
-0x2e, 0x31, 0x71, 0x03, 0x01, 0x86, 0x00, 0x40, 0x6f, 0x6c,
-0x73, 0x20, 0x9f, 0x00, 0x72, 0x65, 0x66, 0x74, 0x2d, 0x63,
-0x6c, 0x69, 0x41, 0x02, 0x4d, 0x69, 0x6e, 0x00, 0x61, 0xf7,
-0x01, 0x30, 0x00, 0x77, 0x69, 0x27, 0x03, 0x51, 0x6f, 0x67,
-0x67, 0x6c, 0x65, 0x56, 0x01, 0x71, 0x70, 0x72, 0x65, 0x73,
-0x65, 0x6e, 0x63, 0x63, 0x00, 0x14, 0x61, 0x04, 0x02, 0x12,
-0x6e, 0xc2, 0x01, 0x02, 0x33, 0x00, 0x30, 0x2e, 0x00, 0x52,
-0x16, 0x00, 0x0f, 0x59, 0x00, 0x0d, 0x02, 0x54, 0x00, 0x00,
-0xd3, 0x02, 0x40, 0x6d, 0x61, 0x72, 0x6b, 0x5c, 0x00, 0x01,
-0x15, 0x00, 0xd0, 0x00, 0x61, 0x69, 0x64, 0x00, 0x73, 0x6f,
-0x6c, 0x76, 0x69, 0x6e, 0x67, 0x3b, 0x15, 0x03, 0x92, 0x63,
-0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x75, 0x73, 0x37, 0x01,
-0x42, 0x68, 0x69, 0x67, 0x68, 0x76, 0x00, 0x04, 0xc4, 0x01,
-0x01, 0x7b, 0x00, 0x81, 0x63, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
-0x00, 0x62, 0xa3, 0x02, 0x11, 0x2c, 0x9f, 0x01, 0x83, 0x65,
-0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x63, 0x04, 0x00,
-0xeb, 0x01, 0x00, 0x23, 0x00, 0x00, 0xde, 0x03, 0x18, 0x65,
-0xbb, 0x00, 0x02, 0x81, 0x00, 0x23, 0x65, 0x64, 0x51, 0x00,
-0x55, 0x2c, 0x00, 0x6e, 0x6f, 0x72, 0x26, 0x00, 0x01, 0x9c,
-0x00, 0x21, 0x69, 0x6e, 0x30, 0x00, 0x06, 0xe1, 0x00, 0x33,
-0x00, 0x00, 0x54, 0x5c, 0x03, 0x02, 0x20, 0x01, 0x06, 0x95,
-0x00, 0xd1, 0x6f, 0x62, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x00,
-0x65, 0x72, 0x72, 0x6f, 0x72, 0xe2, 0x03, 0x01, 0x86, 0x04,
-0x01, 0x7f, 0x01, 0x05, 0x2a, 0x03, 0x07, 0x28, 0x03, 0x02,
-0x57, 0x03, 0x05, 0x40, 0x00, 0x02, 0xe3, 0x04, 0x01, 0x1b,
-0x02, 0x6a, 0x77, 0x61, 0x79, 0x2c, 0x00, 0x61, 0xcf, 0x04,
-0x05, 0xf4, 0x00, 0x81, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00,
-0x64, 0x6f, 0xd2, 0x00, 0x33, 0x28, 0x6f, 0x72, 0x00, 0x01,
-0x12, 0x29, 0xcd, 0x02, 0x00, 0xa8, 0x01, 0x11, 0x72, 0x8f,
-0x00, 0x0d, 0xd3, 0x02, 0x39, 0x6e, 0x65, 0x78, 0xcf, 0x02,
-0x52, 0x54, 0x68, 0x75, 0x73, 0x2c, 0x2a, 0x04, 0x00, 0x7c,
-0x05, 0x21, 0x69, 0x73, 0x7c, 0x01, 0x9e, 0x65, 0x64, 0x00,
-0x77, 0x68, 0x65, 0x6e, 0x00, 0x61, 0x09, 0x04, 0x04, 0xbb,
-0x03, 0x20, 0x79, 0x65, 0x3e, 0x04, 0x06, 0xba, 0x00, 0x12,
-0x73, 0x7b, 0x03, 0x01, 0xc6, 0x01, 0x01, 0xb3, 0x00, 0x10,
-0x6f, 0xfa, 0x00, 0x03, 0x77, 0x00, 0x00, 0x6a, 0x00, 0x23,
-0x28, 0x41, 0x70, 0x05, 0x21, 0x61, 0x63, 0x6b, 0x04, 0x82,
-0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0xf3, 0x00,
-0x13, 0x73, 0x06, 0x03, 0x31, 0x32, 0x2e, 0x31, 0x3f, 0x00,
-0xf3, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61,
-0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0xc8, 0x02, 0x16,
-0x32, 0xc8, 0x02, 0xb2, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-0x74, 0x65, 0x72, 0x73, 0x20, 0x8f, 0x01, 0x36, 0x73, 0x65,
-0x00, 0x14, 0x00, 0x02, 0x44, 0x00, 0x04, 0x3f, 0x00, 0x51,
-0x00, 0x66, 0x72, 0x6f, 0x6d, 0x7c, 0x00, 0xe1, 0x60, 0x43,
-0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00,
-0x6f, 0x70, 0x72, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00, 0xa0,
-0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
-0xae, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
-0x48, 0x65, 0x47, 0x01, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a,
-0xf3, 0x02, 0x02, 0x26, 0x01, 0x16, 0x6e, 0xa2, 0x06, 0xa1,
-0x00, 0x00, 0x25, 0x61, 0x67, 0x65, 0x20, 0x6f, 0x66, 0x20,
-0x25, 0x01, 0x14, 0x20, 0x25, 0x01, 0xb0, 0x00, 0x00, 0x52,
-0x6f, 0x75, 0x67, 0x68, 0x00, 0x70, 0x65, 0x72, 0x43, 0x04,
-0x21, 0x61, 0x67, 0x3f, 0x00, 0x0a, 0x49, 0x01, 0x25, 0x69,
-0x6e, 0x7a, 0x01, 0x02, 0x8c, 0x01, 0x40, 0x69, 0x73, 0x00,
-0x69, 0x12, 0x03, 0x71, 0x68, 0x69, 0x6e, 0x74, 0x00, 0x72,
-0x61, 0x27, 0x02, 0xe1, 0x74, 0x68, 0x61, 0x6e, 0x00, 0x61,
-0x6e, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x26, 0x01,
-0x46, 0x2e, 0x00, 0x49, 0x66, 0xb4, 0x01, 0x90, 0x67, 0x65,
-0x6e, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x00, 0x21,
-0x75, 0x6e, 0xf1, 0x00, 0x24, 0x74, 0x6f, 0x17, 0x00, 0x00,
-0xc5, 0x02, 0x03, 0xa4, 0x04, 0x04, 0x75, 0x04, 0xf0, 0x02,
-0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x65, 0x00, 0x73, 0x70,
-0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x54, 0x00, 0x10,
-0x2c, 0x6c, 0x03, 0x01, 0xcd, 0x02, 0x74, 0x69, 0x6e, 0x63,
-0x72, 0x65, 0x61, 0x73, 0xef, 0x03, 0x42, 0x6f, 0x70, 0x6f,
-0x72, 0x29, 0x01, 0x0c, 0xbf, 0x00, 0x53, 0x75, 0x6e, 0x74,
-0x69, 0x6c, 0xa3, 0x03, 0x10, 0x2e, 0x24, 0x01, 0xb0, 0x79,
-0x6d, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x00, 0x00, 0x00, 0x41,
-0x1d, 0x02, 0x11, 0x73, 0x78, 0x06, 0x23, 0x74, 0x6f, 0x69,
-0x00, 0x12, 0x79, 0x98, 0x02, 0x41, 0x65, 0x71, 0x75, 0x69,
-0xcb, 0x02, 0x04, 0x2e, 0x00, 0x0e, 0xc5, 0x07, 0x0c, 0x1b,
-0x01, 0x11, 0x28, 0x1a, 0x01, 0x10, 0x64, 0x63, 0x05, 0x00,
-0xf0, 0x02, 0x61, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x20,
-0x00, 0x95, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c,
-0x74, 0x47, 0x00, 0x03, 0x15, 0x05, 0x00, 0x29, 0x00, 0x71,
-0x69, 0x63, 0x65, 0x61, 0x62, 0x6c, 0x79, 0x3d, 0x02, 0x16,
-0x44, 0x29, 0x00, 0x70, 0x00, 0x00, 0x60, 0x45, 0x61, 0x73,
-0x79, 0xec, 0x01, 0x23, 0x61, 0x6e, 0x3f, 0x04, 0x08, 0x3a,
-0x00, 0x60, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x4b, 0x04,
-0x62, 0x73, 0x6f, 0x6c, 0x75, 0x62, 0x6c, 0xa0, 0x07, 0xb2,
-0x6f, 0x75, 0x74, 0x00, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72,
-0x61, 0xd6, 0x04, 0xf9, 0x03, 0x6f, 0x72, 0x00, 0x67, 0x75,
-0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x2c, 0x00, 0x60, 0x48,
-0x61, 0x72, 0x64, 0x52, 0x00, 0x01, 0x2e, 0x08, 0x01, 0x21,
-0x00, 0x22, 0x65, 0x73, 0x58, 0x01, 0x40, 0x70, 0x72, 0x6f,
-0x62, 0x90, 0x00, 0x00, 0x5a, 0x00, 0xb0, 0x6e, 0x65, 0x63,
-0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x2e, 0x00,
+0x55, 0x70, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x2b,
+0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
+0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
+0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2e,
+0x00, 0x53, 0x6f, 0x6d, 0x65, 0x00, 0x61, 0x72, 0x65, 0x00,
+0x66, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x69, 0x6e, 0x00,
+0x62, 0x6c, 0x61, 0x63, 0x6b, 0x3b, 0x00, 0x73, 0x1a, 0x00,
+0x62, 0x6f, 0x66, 0x00, 0x74, 0x68, 0x65, 0x13, 0x00, 0x04,
+0x35, 0x00, 0x01, 0x2f, 0x00, 0x90, 0x6e, 0x75, 0x6d, 0x62,
+0x65, 0x72, 0x65, 0x64, 0x2e, 0x5e, 0x00, 0xe0, 0x72, 0x00,
+0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00,
+0x60, 0x6c, 0x8f, 0x00, 0x81, 0x00, 0x75, 0x70, 0x27, 0x00,
+0x61, 0x6c, 0x6c, 0x3e, 0x00, 0x55, 0x65, 0x6d, 0x70, 0x74,
+0x79, 0x3e, 0x00, 0xb2, 0x62, 0x79, 0x00, 0x70, 0x6c, 0x61,
+0x63, 0x69, 0x6e, 0x67, 0x00, 0x2b, 0x00, 0x50, 0x62, 0x75,
+0x6c, 0x62, 0x73, 0x79, 0x00, 0x07, 0x72, 0x00, 0x97, 0x6d,
+0x2e, 0x00, 0x00, 0x00, 0x45, 0x61, 0x63, 0x68, 0x24, 0x00,
+0xc1, 0x00, 0x69, 0x6c, 0x6c, 0x75, 0x6d, 0x69, 0x6e, 0x61,
+0x74, 0x65, 0x73, 0x58, 0x00, 0x02, 0x52, 0x00, 0x30, 0x00,
+0x69, 0x74, 0x7b, 0x00, 0x81, 0x6f, 0x6e, 0x2c, 0x00, 0x70,
+0x6c, 0x75, 0x73, 0x76, 0x00, 0x04, 0x6c, 0x00, 0xc0, 0x69,
+0x6e, 0x00, 0x6c, 0x69, 0x6e, 0x65, 0x00, 0x77, 0x69, 0x74,
+0x68, 0x28, 0x00, 0xf1, 0x07, 0x68, 0x6f, 0x72, 0x69, 0x7a,
+0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72,
+0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e, 0x00, 0x89,
+0x75, 0x6e, 0x6c, 0x65, 0x73, 0x73, 0x00, 0x61, 0xec, 0x00,
+0x00, 0x59, 0x00, 0x50, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0xae,
+0x00, 0x00, 0x73, 0x00, 0x30, 0x77, 0x61, 0x79, 0x9a, 0x00,
+0x61, 0x54, 0x6f, 0x00, 0x77, 0x69, 0x6e, 0x12, 0x00, 0xf1,
+0x07, 0x67, 0x61, 0x6d, 0x65, 0x2c, 0x00, 0x79, 0x6f, 0x75,
+0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x73, 0x61, 0x74, 0x69,
+0x73, 0x66, 0x79, 0x1b, 0x00, 0x60, 0x66, 0x6f, 0x6c, 0x6c,
+0x6f, 0x77, 0x3b, 0x00, 0xfe, 0x09, 0x63, 0x6f, 0x6e, 0x64,
+0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x00, 0x00, 0x00,
+0x2d, 0x00, 0x41, 0x6c, 0x6c, 0x00, 0x6e, 0x6f, 0x6e, 0x2d,
+0x58, 0x01, 0x41, 0x6c, 0x69, 0x74, 0x2e, 0x23, 0x00, 0x23,
+0x4e, 0x6f, 0xfb, 0x00, 0x20, 0x69, 0x73, 0x15, 0x00, 0x00,
+0x37, 0x01, 0x72, 0x61, 0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72,
+0x18, 0x00, 0x16, 0x2e, 0x49, 0x00, 0x03, 0x8b, 0x01, 0x0b,
+0xa6, 0x01, 0x01, 0xf2, 0x01, 0x60, 0x65, 0x78, 0x61, 0x63,
+0x74, 0x6c, 0x8f, 0x00, 0x23, 0x61, 0x74, 0x29, 0x00, 0x00,
+0x62, 0x01, 0x01, 0x42, 0x00, 0xa0, 0x73, 0x00, 0x61, 0x64,
+0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0xb8, 0x01, 0x00, 0x75,
+0x01, 0x23, 0x00, 0x28, 0xd5, 0x00, 0x10, 0x66, 0xd4, 0x01,
+0x05, 0x97, 0x00, 0xf3, 0x01, 0x62, 0x6f, 0x76, 0x65, 0x2c,
+0x00, 0x62, 0x65, 0x6c, 0x6f, 0x77, 0x2c, 0x00, 0x61, 0x6e,
+0x64, 0x2f, 0x00, 0x60, 0x00, 0x73, 0x69, 0x64, 0x65, 0x29,
+0x88, 0x00, 0x4f, 0x4e, 0x6f, 0x6e, 0x2d, 0x86, 0x00, 0x04,
+0x33, 0x6d, 0x61, 0x79, 0x7c, 0x02, 0x2f, 0x6e, 0x79, 0x81,
+0x00, 0x0f, 0x00, 0x4d, 0x00, 0xf1, 0x0b, 0x43, 0x72, 0x65,
+0x64, 0x69, 0x74, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x74, 0x68,
+0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00,
+0x67, 0x6f, 0x65, 0x60, 0x02, 0xa0, 0x4e, 0x69, 0x6b, 0x6f,
+0x6c, 0x69, 0x00, 0x5b, 0x39, 0x5d, 0x2d, 0x00, 0x11, 0x4c,
+0x23, 0x01, 0x60, 0x55, 0x70, 0x00, 0x77, 0x61, 0x73, 0x66,
+0x01, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0xa3,
+0x00, 0x10, 0x69, 0x14, 0x00, 0x40, 0x6c, 0x6c, 0x65, 0x63,
+0x7b, 0x01, 0x00, 0x42, 0x01, 0xb1, 0x4a, 0x61, 0x6d, 0x65,
+0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0xc8, 0x01, 0xf1,
+0x02, 0x5b, 0x39, 0x5d, 0x00, 0x68, 0x74, 0x74, 0x70, 0x73,
+0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x5d, 0x00,
+0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e,
+0x2f, 0x7c, 0x00, 0xf6, 0x00, 0x73, 0x2f, 0x61, 0x6b, 0x61,
+0x72, 0x69, 0x2f, 0x00, 0x00, 0x00, 0x32, 0x31, 0x2e, 0x31,
+0x71, 0x03, 0x01, 0x71, 0x00, 0x40, 0x6f, 0x6c, 0x73, 0x20,
+0x8a, 0x00, 0x72, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
+0x2c, 0x02, 0x4d, 0x69, 0x6e, 0x00, 0x61, 0xe2, 0x01, 0x30,
+0x00, 0x77, 0x69, 0x12, 0x03, 0x51, 0x6f, 0x67, 0x67, 0x6c,
+0x65, 0x41, 0x01, 0x71, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e,
+0x63, 0xf5, 0x02, 0x14, 0x61, 0xef, 0x01, 0x12, 0x6e, 0xad,
+0x01, 0x02, 0x33, 0x00, 0x30, 0x2e, 0x00, 0x52, 0x16, 0x00,
+0x0f, 0x59, 0x00, 0x0d, 0x02, 0x54, 0x00, 0x00, 0xbe, 0x02,
+0x40, 0x6d, 0x61, 0x72, 0x6b, 0x5c, 0x00, 0x01, 0x15, 0x00,
+0xd0, 0x00, 0x61, 0x69, 0x64, 0x00, 0x73, 0x6f, 0x6c, 0x76,
+0x69, 0x6e, 0x67, 0x3b, 0x00, 0x03, 0x92, 0x63, 0x61, 0x6e,
+0x00, 0x62, 0x65, 0x00, 0x75, 0x73, 0x22, 0x01, 0x42, 0x68,
+0x69, 0x67, 0x68, 0x76, 0x00, 0x04, 0xaf, 0x01, 0x01, 0x7b,
+0x00, 0x81, 0x63, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x00, 0x62,
+0x8e, 0x02, 0x11, 0x2c, 0x8a, 0x01, 0x83, 0x65, 0x78, 0x61,
+0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x4e, 0x04, 0x00, 0xd6, 0x01,
+0x00, 0x23, 0x00, 0x00, 0xc9, 0x03, 0x18, 0x65, 0xbb, 0x00,
+0x02, 0x81, 0x00, 0x23, 0x65, 0x64, 0x51, 0x00, 0x55, 0x2c,
+0x00, 0x6e, 0x6f, 0x72, 0x26, 0x00, 0x01, 0x9c, 0x00, 0x21,
+0x69, 0x6e, 0x30, 0x00, 0x06, 0xe1, 0x00, 0x33, 0x00, 0x00,
+0x54, 0x47, 0x03, 0x02, 0x20, 0x01, 0x06, 0x95, 0x00, 0xd1,
+0x6f, 0x62, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x65, 0x72,
+0x72, 0x6f, 0x72, 0xcd, 0x03, 0x01, 0x71, 0x04, 0x01, 0x7f,
+0x01, 0x05, 0x15, 0x03, 0x07, 0x13, 0x03, 0x02, 0x42, 0x03,
+0x05, 0x40, 0x00, 0x02, 0xce, 0x04, 0x01, 0x06, 0x02, 0x6a,
+0x77, 0x61, 0x79, 0x2c, 0x00, 0x61, 0xba, 0x04, 0x05, 0xf4,
+0x00, 0x81, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x64, 0x6f,
+0xd2, 0x00, 0x33, 0x28, 0x6f, 0x72, 0x00, 0x01, 0x12, 0x29,
+0xb8, 0x02, 0x00, 0xa8, 0x01, 0x11, 0x72, 0x8f, 0x00, 0x0d,
+0xbe, 0x02, 0x39, 0x6e, 0x65, 0x78, 0xba, 0x02, 0x52, 0x54,
+0x68, 0x75, 0x73, 0x2c, 0x15, 0x04, 0x00, 0x67, 0x05, 0x21,
+0x69, 0x73, 0x7c, 0x01, 0x9e, 0x65, 0x64, 0x00, 0x77, 0x68,
+0x65, 0x6e, 0x00, 0x61, 0xf4, 0x03, 0x04, 0xa6, 0x03, 0x20,
+0x79, 0x65, 0x29, 0x04, 0x06, 0xba, 0x00, 0x12, 0x73, 0x66,
+0x03, 0x01, 0xc6, 0x01, 0x01, 0xb3, 0x00, 0x10, 0x6f, 0xfa,
+0x00, 0x03, 0x77, 0x00, 0x00, 0x6a, 0x00, 0x23, 0x28, 0x41,
+0x5b, 0x05, 0x21, 0x61, 0x63, 0x56, 0x04, 0x82, 0x00, 0x64,
+0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0xf3, 0x00, 0x13, 0x73,
+0xf1, 0x02, 0x31, 0x32, 0x2e, 0x31, 0x3f, 0x00, 0xf2, 0x01,
+0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0xc8, 0x02, 0x16, 0x32,
+0xc8, 0x02, 0xb2, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0x73, 0x20, 0x8f, 0x01, 0x36, 0x73, 0x65, 0x00,
+0x14, 0x00, 0x02, 0x44, 0x00, 0x04, 0x3f, 0x00, 0x51, 0x00,
+0x66, 0x72, 0x6f, 0x6d, 0x7c, 0x00, 0xe1, 0x60, 0x43, 0x75,
+0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f,
+0x70, 0x72, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00, 0xa0, 0x54,
+0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae,
+0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48,
+0x65, 0x47, 0x01, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xf3,
+0x02, 0x02, 0x26, 0x01, 0x16, 0x6e, 0x8d, 0x06, 0xa1, 0x00,
+0x00, 0x25, 0x61, 0x67, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x25,
+0x01, 0x14, 0x20, 0x25, 0x01, 0xb0, 0x00, 0x00, 0x52, 0x6f,
+0x75, 0x67, 0x68, 0x00, 0x70, 0x65, 0x72, 0x2e, 0x04, 0x21,
+0x61, 0x67, 0x3f, 0x00, 0x0a, 0x49, 0x01, 0x25, 0x69, 0x6e,
+0x7a, 0x01, 0x02, 0x8c, 0x01, 0x40, 0x69, 0x73, 0x00, 0x69,
+0x12, 0x03, 0x71, 0x68, 0x69, 0x6e, 0x74, 0x00, 0x72, 0x61,
+0x27, 0x02, 0xe1, 0x74, 0x68, 0x61, 0x6e, 0x00, 0x61, 0x6e,
+0x00, 0x69, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x26, 0x01, 0x46,
+0x2e, 0x00, 0x49, 0x66, 0xb4, 0x01, 0x90, 0x67, 0x65, 0x6e,
+0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x3c, 0x00, 0x21, 0x75,
+0x6e, 0xf1, 0x00, 0x24, 0x74, 0x6f, 0x17, 0x00, 0x00, 0xc5,
+0x02, 0x03, 0x8f, 0x04, 0x04, 0x60, 0x04, 0xf0, 0x02, 0x70,
+0x72, 0x65, 0x63, 0x69, 0x73, 0x65, 0x00, 0x73, 0x70, 0x65,
+0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x54, 0x00, 0x10, 0x2c,
+0x6c, 0x03, 0x01, 0xcd, 0x02, 0x74, 0x69, 0x6e, 0x63, 0x72,
+0x65, 0x61, 0x73, 0xef, 0x03, 0x42, 0x6f, 0x70, 0x6f, 0x72,
+0x29, 0x01, 0x0c, 0xbf, 0x00, 0x53, 0x75, 0x6e, 0x74, 0x69,
+0x6c, 0xa3, 0x03, 0x10, 0x2e, 0x24, 0x01, 0xb0, 0x79, 0x6d,
+0x6d, 0x65, 0x74, 0x72, 0x79, 0x00, 0x00, 0x00, 0x41, 0x1d,
+0x02, 0x11, 0x73, 0x63, 0x06, 0x23, 0x74, 0x6f, 0x69, 0x00,
+0x12, 0x79, 0x98, 0x02, 0x41, 0x65, 0x71, 0x75, 0x69, 0xcb,
+0x02, 0x04, 0x2e, 0x00, 0x0e, 0xb0, 0x07, 0x0c, 0x1b, 0x01,
+0x11, 0x28, 0x1a, 0x01, 0x10, 0x64, 0x4e, 0x05, 0x00, 0xf0,
+0x02, 0x61, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x20, 0x00,
+0x95, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
+0x47, 0x00, 0x03, 0xff, 0x04, 0x00, 0x29, 0x00, 0x71, 0x69,
+0x63, 0x65, 0x61, 0x62, 0x6c, 0x79, 0x3d, 0x02, 0x16, 0x44,
+0x29, 0x00, 0x70, 0x00, 0x00, 0x60, 0x45, 0x61, 0x73, 0x79,
+0xec, 0x01, 0x23, 0x61, 0x6e, 0x3f, 0x04, 0x08, 0x3a, 0x00,
+0x60, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x4b, 0x04, 0x62,
+0x73, 0x6f, 0x6c, 0x75, 0x62, 0x6c, 0x8b, 0x07, 0xb2, 0x6f,
+0x75, 0x74, 0x00, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61,
+0xd6, 0x04, 0xf9, 0x03, 0x6f, 0x72, 0x00, 0x67, 0x75, 0x65,
+0x73, 0x73, 0x69, 0x6e, 0x67, 0x2c, 0x00, 0x60, 0x48, 0x61,
+0x72, 0x64, 0x52, 0x00, 0x01, 0x19, 0x08, 0x01, 0x21, 0x00,
+0x22, 0x65, 0x73, 0x58, 0x01, 0x40, 0x70, 0x72, 0x6f, 0x62,
+0x90, 0x00, 0x00, 0x5a, 0x00, 0xa2, 0x6e, 0x65, 0x63, 0x65,
+0x73, 0x73, 0x61, 0x72, 0x79, 0x2e, 0xd9, 0x02, 0x16, 0x33,
+0xd9, 0x02, 0xb0, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70, 0x72,
+0x65, 0x66, 0x65, 0x72, 0x68, 0x05, 0x01, 0xdf, 0x02, 0x20,
+0x4f, 0x6e, 0x91, 0x04, 0x54, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+0x5f, 0x00, 0x20, 0x75, 0x70, 0x98, 0x01, 0x10, 0x00, 0x2e,
+0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0xcd, 0x02, 0x16,
+0x50, 0x12, 0x00, 0x0d, 0xe9, 0x02, 0x33, 0x47, 0x61, 0x6d,
+0xe9, 0x02, 0x02, 0x98, 0x00, 0x31, 0x6c, 0x65, 0x74, 0xa9,
+0x01, 0x90, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
+0x65, 0xfc, 0x03, 0x01, 0x7b, 0x02, 0x23, 0x60, 0x74, 0x92,
+0x02, 0x01, 0x76, 0x01, 0x02, 0xcc, 0x03, 0x11, 0x27, 0x13,
+0x05, 0x02, 0x61, 0x03, 0x52, 0x73, 0x68, 0x6f, 0x77, 0x6e,
+0x2a, 0x04, 0x08, 0xdc, 0x08, 0x00, 0xd0, 0x08, 0x80, 0x73,
+0x6f, 0x00, 0x6c, 0x69, 0x74, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2327;
-const unsigned short help_text_words = 433;
+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 425b157107..76c441511c 100644
--- a/apps/plugins/puzzles/help/loopy.c
+++ b/apps/plugins/puzzles/help/loopy.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,184 +6,263 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 169, TEXT_CENTER | C_RED },
- { 220, TEXT_UNDERLINE },
- { 262, TEXT_CENTER | C_RED },
- { 279, TEXT_UNDERLINE },
- { 280, TEXT_UNDERLINE },
- { 324, TEXT_UNDERLINE },
+ { 167, TEXT_CENTER | C_RED },
+ { 218, TEXT_UNDERLINE },
+ { 260, TEXT_CENTER | C_RED },
+ { 277, TEXT_UNDERLINE },
+ { 278, TEXT_UNDERLINE },
+ { 322, TEXT_UNDERLINE },
+ { 353, TEXT_UNDERLINE },
  { 355, TEXT_UNDERLINE },
- { 357, TEXT_UNDERLINE },
- { 375, TEXT_UNDERLINE },
- { 390, TEXT_UNDERLINE },
- { 404, TEXT_UNDERLINE },
+ { 373, TEXT_UNDERLINE },
+ { 388, TEXT_UNDERLINE },
+ { 402, TEXT_UNDERLINE },
+ { 414, TEXT_CENTER | C_RED },
+ { 618, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2260 comp 1600 ratio 0.707965 level 10 saved 660 */
+/* orig 3584 comp 2352 ratio 0.65625 level 10 saved 1232 */
 const char help_text[] = {
-0xf1, 0x4e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x33, 0x3a, 0x20, 0x4c, 0x6f, 0x6f, 0x70, 0x79, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65,
-0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67,
-0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74,
-0x73, 0x2c, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x65, 0x64, 0x00,
-0x77, 0x69, 0x74, 0x68, 0x00, 0x79, 0x65, 0x6c, 0x6c, 0x6f,
-0x77, 0x00, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x00, 0x74, 0x6f,
-0x00, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00,
-0x77, 0x68, 0x69, 0x63, 0x68, 0x31, 0x00, 0x23, 0x00, 0x79,
-0x4e, 0x00, 0x10, 0x61, 0x2b, 0x00, 0x20, 0x65, 0x64, 0x27,
-0x00, 0xf0, 0x0b, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
-0x00, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x00,
-0x74, 0x6f, 0x67, 0x65, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x7c,
-0x00, 0x71, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x51,
-0x00, 0xf0, 0x00, 0x75, 0x73, 0x65, 0x00, 0x73, 0x6f, 0x6d,
-0x65, 0x00, 0x73, 0x75, 0x62, 0x73, 0x65, 0x74, 0x86, 0x00,
-0x5d, 0x74, 0x68, 0x6f, 0x73, 0x65, 0x7a, 0x00, 0xf0, 0x11,
-0x64, 0x72, 0x61, 0x77, 0x00, 0x61, 0x00, 0x73, 0x69, 0x6e,
-0x67, 0x6c, 0x65, 0x00, 0x75, 0x6e, 0x62, 0x72, 0x6f, 0x6b,
-0x65, 0x6e, 0x00, 0x6c, 0x6f, 0x6f, 0x70, 0x00, 0x66, 0x72,
-0x6f, 0x6d, 0x8c, 0x00, 0x01, 0x28, 0x00, 0x21, 0x6f, 0x74,
-0xbb, 0x00, 0x61, 0x69, 0x6e, 0x00, 0x74, 0x68, 0x65, 0xdb,
-0x00, 0x50, 0x2e, 0x00, 0x00, 0x00, 0x53, 0x64, 0x00, 0x21,
-0x6f, 0x66, 0x14, 0x00, 0xd2, 0x73, 0x70, 0x61, 0x63, 0x65,
-0x73, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x27, 0x00,
-0x02, 0x67, 0x00, 0xf4, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73,
-0x2e, 0x00, 0x54, 0x68, 0x65, 0x73, 0x65, 0x0f, 0x00, 0x06,
-0xfd, 0x00, 0x84, 0x68, 0x6f, 0x77, 0x00, 0x6d, 0x61, 0x6e,
-0x79, 0x51, 0x00, 0x02, 0x3e, 0x00, 0xb2, 0x61, 0x72, 0x6f,
-0x75, 0x6e, 0x64, 0x00, 0x74, 0x68, 0x61, 0x74, 0x63, 0x00,
-0xa5, 0x00, 0x66, 0x6f, 0x72, 0x6d, 0x00, 0x70, 0x61, 0x72,
-0x74, 0x29, 0x00, 0x31, 0x6f, 0x6f, 0x70, 0x56, 0x00, 0x02,
-0xb8, 0x00, 0x00, 0x3a, 0x01, 0x01, 0xd8, 0x00, 0x83, 0x6d,
-0x75, 0x73, 0x74, 0x00, 0x63, 0x6f, 0x72, 0x2e, 0x01, 0x70,
-0x73, 0x61, 0x74, 0x69, 0x73, 0x66, 0x79, 0x52, 0x01, 0x03,
-0x3a, 0x00, 0x62, 0x73, 0x65, 0x00, 0x63, 0x6c, 0x75, 0x0a,
-0x01, 0x20, 0x62, 0x65, 0xa9, 0x00, 0x94, 0x73, 0x69, 0x64,
-0x65, 0x72, 0x65, 0x64, 0x00, 0x61, 0x38, 0x00, 0x90, 0x00,
-0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0xef, 0x00,
-0x12, 0x49, 0xd7, 0x00, 0xd2, 0x64, 0x65, 0x66, 0x61, 0x75,
-0x6c, 0x74, 0x00, 0x6d, 0x6f, 0x64, 0x65, 0x2c, 0x12, 0x00,
-0x00, 0xb2, 0x01, 0x01, 0xae, 0x01, 0x98, 0x72, 0x72, 0x61,
-0x6e, 0x67, 0x65, 0x64, 0x00, 0x69, 0x02, 0x02, 0x80, 0x73,
-0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x3b, 0xe3, 0x00, 0x51,
-0x65, 0x76, 0x65, 0x72, 0x2c, 0xa4, 0x00, 0xf1, 0x19, 0x63,
-0x61, 0x6e, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x70, 0x6c,
-0x61, 0x79, 0x00, 0x6f, 0x6e, 0x00, 0x74, 0x72, 0x69, 0x61,
-0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x00, 0x6f, 0x72, 0x00,
-0x68, 0x65, 0x78, 0x61, 0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x47,
-0x00, 0x20, 0x73, 0x2c, 0x14, 0x00, 0x10, 0x65, 0x5a, 0x02,
-0xf0, 0x01, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x65, 0x78, 0x6f,
-0x74, 0x69, 0x63, 0x00, 0x6f, 0x6e, 0x65, 0x73, 0x9a, 0x00,
-0x60, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x1b, 0x01, 0x01,
-0x90, 0x00, 0xf2, 0x05, 0x62, 0x61, 0x73, 0x69, 0x63, 0x00,
-0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x69, 0x64, 0x65,
-0x61, 0x00, 0x67, 0x6f, 0xe7, 0x00, 0xb0, 0x4e, 0x69, 0x6b,
-0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x30, 0x5d, 0x38, 0x00,
-0x01, 0xbd, 0x02, 0xf1, 0x00, 0x00, 0x77, 0x61, 0x73, 0x00,
-0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x6c, 0x79,
-0xb1, 0x01, 0x52, 0x72, 0x69, 0x62, 0x75, 0x74, 0x77, 0x02,
-0x30, 0x74, 0x68, 0x69, 0xc5, 0x01, 0x40, 0x6c, 0x6c, 0x65,
-0x63, 0x09, 0x01, 0xf2, 0x04, 0x00, 0x62, 0x79, 0x00, 0x4d,
-0x69, 0x6b, 0x65, 0x00, 0x50, 0x69, 0x6e, 0x6e, 0x61, 0x2c,
-0x00, 0x61, 0x6e, 0x64, 0x67, 0x02, 0x40, 0x71, 0x75, 0x65,
-0x6e, 0x68, 0x01, 0x62, 0x65, 0x6e, 0x68, 0x61, 0x6e, 0x63,
-0x3c, 0x00, 0xf0, 0x05, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65,
-0x00, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x74,
-0x79, 0x70, 0x65, 0x73, 0x12, 0x01, 0x42, 0x6e, 0x6f, 0x6e,
-0x2d, 0x16, 0x01, 0x02, 0x25, 0x01, 0xa3, 0x62, 0x79, 0x00,
-0x4c, 0x61, 0x6d, 0x62, 0x72, 0x6f, 0x73, 0x08, 0x00, 0x10,
-0x75, 0x9e, 0x00, 0x00, 0xa6, 0x00, 0xd1, 0x00, 0x68, 0x74,
-0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e,
-0xbd, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f,
-0x65, 0x6e, 0x2f, 0xe1, 0x00, 0x50, 0x73, 0x2f, 0x73, 0x6c,
-0x69, 0x07, 0x03, 0xf1, 0x01, 0x6c, 0x69, 0x6e, 0x6b, 0x2e,
-0x68, 0x74, 0x6d, 0x6c, 0x00, 0x28, 0x62, 0x65, 0x77, 0x61,
-0x72, 0x9b, 0x02, 0xd3, 0x46, 0x6c, 0x61, 0x73, 0x68, 0x29,
-0x00, 0x00, 0x00, 0x32, 0x33, 0x2e, 0x31, 0xad, 0x03, 0x01,
-0xe1, 0x00, 0x40, 0x6f, 0x6c, 0x73, 0x20, 0x3a, 0x01, 0x42,
-0x6c, 0x69, 0x63, 0x6b, 0x47, 0x02, 0x20, 0x65, 0x66, 0xd4,
-0x01, 0x00, 0x3c, 0x03, 0x60, 0x62, 0x75, 0x74, 0x74, 0x6f,
-0x6e, 0x94, 0x01, 0x18, 0x61, 0x33, 0x03, 0x01, 0x0e, 0x01,
-0xd4, 0x75, 0x72, 0x6e, 0x00, 0x69, 0x74, 0x00, 0x62, 0x6c,
-0x61, 0x63, 0x6b, 0x2c, 0xbe, 0x02, 0x32, 0x69, 0x6e, 0x67,
-0xa3, 0x02, 0x00, 0xd9, 0x01, 0x00, 0x27, 0x03, 0x10, 0x6b,
-0x24, 0x00, 0x2e, 0x69, 0x73, 0xa8, 0x02, 0x03, 0x71, 0x00,
-0x20, 0x61, 0x67, 0x13, 0x03, 0x04, 0x50, 0x00, 0x04, 0xef,
-0x02, 0x04, 0x6d, 0x00, 0x02, 0x1e, 0x00, 0x50, 0x28, 0x6d,
-0x65, 0x61, 0x6e, 0x5a, 0x00, 0x03, 0x0c, 0x04, 0x70, 0x6e,
-0x27, 0x74, 0x00, 0x73, 0x75, 0x72, 0x26, 0x00, 0x21, 0x74,
-0x29, 0x90, 0x02, 0x15, 0x66, 0x27, 0x04, 0x01, 0x18, 0x00,
-0x01, 0x82, 0x00, 0x11, 0x61, 0x74, 0x00, 0x21, 0x69, 0x63,
-0x48, 0x02, 0x01, 0x55, 0x00, 0x61, 0x73, 0x65, 0x67, 0x6d,
-0x65, 0x6e, 0x8f, 0x00, 0x3d, 0x6e, 0x6f, 0x74, 0x93, 0x00,
-0x06, 0x8e, 0x02, 0x15, 0x63, 0x0c, 0x01, 0x4b, 0x72, 0x69,
-0x67, 0x68, 0x0d, 0x01, 0xb0, 0x74, 0x6f, 0x00, 0x72, 0x65,
-0x6d, 0x6f, 0x76, 0x65, 0x00, 0x69, 0x56, 0x03, 0xb0, 0x6d,
-0x70, 0x6c, 0x65, 0x74, 0x65, 0x6c, 0x79, 0x2e, 0x00, 0x41,
-0xad, 0x00, 0x12, 0x2c, 0x3d, 0x00, 0x00, 0xae, 0x00, 0x60,
-0x61, 0x00, 0x73, 0x65, 0x63, 0x6f, 0xb4, 0x03, 0x8b, 0x69,
-0x6d, 0x65, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0xe5, 0x00, 0x20,
-0x62, 0x61, 0x66, 0x00, 0x13, 0x6f, 0xed, 0x00, 0x00, 0xc9,
-0x00, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x20, 0x00, 0x11, 0x61,
-0x63, 0x02, 0x92, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72,
-0x69, 0x62, 0x49, 0x03, 0x13, 0x73, 0x79, 0x02, 0x33, 0x32,
-0x2e, 0x31, 0x13, 0x05, 0xd3, 0x73, 0x6f, 0x00, 0x61, 0x76,
-0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0xdd, 0x01,
-0x13, 0x32, 0xdd, 0x01, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d,
-0x65, 0x74, 0x65, 0x72, 0xdf, 0x01, 0x02, 0x6c, 0x04, 0x06,
-0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x02, 0xe4,
-0x04, 0x00, 0x79, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74,
-0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6f,
-0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00, 0x91, 0x54, 0x79, 0x70,
-0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x94, 0x02, 0x91, 0x57,
-0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x22, 0x01,
-0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x68, 0x02, 0x00, 0xc7,
-0x02, 0x70, 0x2c, 0x00, 0x6d, 0x65, 0x61, 0x73, 0x75, 0x41,
-0x04, 0x05, 0xf0, 0x04, 0x00, 0x1c, 0x00, 0x31, 0x72, 0x65,
-0x67, 0xd6, 0x00, 0x61, 0x61, 0x63, 0x72, 0x6f, 0x73, 0x73,
-0x32, 0x03, 0x93, 0x64, 0x6f, 0x77, 0x6e, 0x2e, 0x00, 0x46,
-0x6f, 0x72, 0x1d, 0x04, 0x04, 0xe5, 0x03, 0xa1, 0x69, 0x74,
-0x27, 0x73, 0x00, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x10, 0x05,
-0x01, 0x7c, 0x03, 0x01, 0x7f, 0x03, 0x61, 0x75, 0x6e, 0x74,
-0x65, 0x64, 0x3b, 0xe2, 0x03, 0x10, 0x6f, 0xed, 0x02, 0x06,
-0x4c, 0x03, 0x01, 0x41, 0x03, 0x00, 0xc3, 0x01, 0x72, 0x6d,
-0x61, 0x79, 0x00, 0x68, 0x61, 0x76, 0xa7, 0x02, 0x01, 0x84,
-0x02, 0x41, 0x61, 0x00, 0x62, 0x69, 0xc0, 0x05, 0x22, 0x73,
-0x65, 0x60, 0x05, 0x01, 0xad, 0x04, 0x52, 0x69, 0x6d, 0x65,
-0x6e, 0x73, 0x91, 0x00, 0x25, 0x72, 0x65, 0xb3, 0x00, 0x00,
-0xdd, 0x00, 0x50, 0x47, 0x72, 0x69, 0x64, 0x20, 0x59, 0x00,
-0x40, 0x00, 0x00, 0x00, 0x41, 0x9d, 0x01, 0x02, 0x88, 0x06,
-0x00, 0x7c, 0x06, 0x20, 0x68, 0x6f, 0x40, 0x06, 0x04, 0xde,
-0x05, 0x00, 0xe4, 0x01, 0x04, 0x10, 0x04, 0x26, 0x6f, 0x66,
-0x8c, 0x00, 0x72, 0x74, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x2e,
-0x19, 0x06, 0x01, 0x8c, 0x00, 0x13, 0x61, 0xda, 0x01, 0x11,
-0x66, 0x1e, 0x06, 0x01, 0x29, 0x06, 0x21, 0x61, 0x6d, 0x55,
-0x02, 0x06, 0xb0, 0x00, 0x70, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-0x70, 0x6c, 0x9b, 0x00, 0x40, 0x66, 0x66, 0x65, 0x72, 0xac,
-0x02, 0x05, 0x52, 0x00, 0xc1, 0x76, 0x65, 0x72, 0x74, 0x65,
-0x78, 0x00, 0x28, 0x65, 0x2e, 0x67, 0x2e, 0x3f, 0x00, 0x50,
-0x43, 0x61, 0x69, 0x72, 0x6f, 0x0d, 0x05, 0x51, 0x4b, 0x69,
-0x74, 0x65, 0x73, 0x85, 0x05, 0x22, 0x29, 0x3b, 0x14, 0x01,
-0x1a, 0x73, 0x73, 0x00, 0x00, 0x3b, 0x00, 0x1f, 0x69, 0x76,
-0x00, 0x07, 0x0e, 0x6d, 0x00, 0x01, 0xa5, 0x00, 0x07, 0x6b,
-0x00, 0x74, 0x47, 0x72, 0x65, 0x61, 0x74, 0x20, 0x48, 0x89,
-0x05, 0x12, 0x29, 0x65, 0x06, 0x02, 0xb1, 0x01, 0x18, 0x2c,
-0xaf, 0x05, 0x00, 0xd2, 0x01, 0x92, 0x68, 0x6f, 0x6e, 0x65,
-0x79, 0x63, 0x6f, 0x6d, 0x62, 0xcb, 0x01, 0x01, 0x5c, 0x01,
-0x20, 0x66, 0x75, 0x50, 0x05, 0x21, 0x72, 0x65, 0x26, 0x00,
-0x02, 0x2b, 0x05, 0x08, 0xa2, 0x00, 0x26, 0x69, 0x72, 0xa4,
-0x00, 0x00, 0x1c, 0x00, 0x0a, 0x24, 0x01, 0x12, 0x3b, 0xfe,
-0x01, 0x32, 0x6d, 0x61, 0x6b, 0x15, 0x00, 0x13, 0x6d, 0xa6,
-0x04, 0x11, 0x61, 0xd6, 0x06, 0x41, 0x6e, 0x66, 0x75, 0x73,
-0x76, 0x04, 0x02, 0x40, 0x06, 0x00, 0xbe, 0x01, 0x40, 0x44,
-0x69, 0x66, 0x66, 0xf8, 0x03, 0x20, 0x74, 0x79, 0xd8, 0x04,
-0x03, 0xe4, 0x04, 0x03, 0xf3, 0x01, 0x05, 0x1a, 0x00, 0x03,
-0xf9, 0x03, 0x60, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0xe2,
-0x05, 0x80, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2e, 0x00,
+0x00, 0x2d, 0x01, 0x00, 0xf1, 0x3c, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76,
+0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00,
+0x6f, 0x66, 0x00, 0x64, 0x6f, 0x74, 0x73, 0x2c, 0x00, 0x6d,
+0x61, 0x72, 0x6b, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74, 0x68,
+0x00, 0x79, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x00, 0x6c, 0x69,
+0x6e, 0x65, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x69, 0x6e, 0x64,
+0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x77, 0x68, 0x69, 0x63,
+0x68, 0x31, 0x00, 0x23, 0x00, 0x79, 0x4e, 0x00, 0x10, 0x61,
+0x2b, 0x00, 0x20, 0x65, 0x64, 0x27, 0x00, 0xf0, 0x0b, 0x63,
+0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x00, 0x64, 0x69, 0x72,
+0x65, 0x63, 0x74, 0x6c, 0x79, 0x00, 0x74, 0x6f, 0x67, 0x65,
+0x74, 0x68, 0x65, 0x72, 0x2e, 0x7c, 0x00, 0x71, 0x72, 0x00,
+0x61, 0x69, 0x6d, 0x00, 0x69, 0x51, 0x00, 0xf0, 0x00, 0x75,
+0x73, 0x65, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x00, 0x73, 0x75,
+0x62, 0x73, 0x65, 0x74, 0x86, 0x00, 0x5d, 0x74, 0x68, 0x6f,
+0x73, 0x65, 0x7a, 0x00, 0xf0, 0x11, 0x64, 0x72, 0x61, 0x77,
+0x00, 0x61, 0x00, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x00,
+0x75, 0x6e, 0x62, 0x72, 0x6f, 0x6b, 0x65, 0x6e, 0x00, 0x6c,
+0x6f, 0x6f, 0x70, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x8c, 0x00,
+0x01, 0x28, 0x00, 0x21, 0x6f, 0x74, 0xbb, 0x00, 0x61, 0x69,
+0x6e, 0x00, 0x74, 0x68, 0x65, 0xdb, 0x00, 0x50, 0x2e, 0x00,
+0x00, 0x00, 0x53, 0x64, 0x00, 0x21, 0x6f, 0x66, 0x14, 0x00,
+0xd2, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x00, 0x62, 0x65,
+0x74, 0x77, 0x65, 0x65, 0x27, 0x00, 0x02, 0x67, 0x00, 0xf4,
+0x07, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e,
+0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x00, 0x54, 0x68,
+0x65, 0x73, 0x65, 0x0f, 0x00, 0x06, 0xfd, 0x00, 0x84, 0x68,
+0x6f, 0x77, 0x00, 0x6d, 0x61, 0x6e, 0x79, 0x51, 0x00, 0x02,
+0x3e, 0x00, 0xb2, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x00,
+0x74, 0x68, 0x61, 0x74, 0x63, 0x00, 0xa5, 0x00, 0x66, 0x6f,
+0x72, 0x6d, 0x00, 0x70, 0x61, 0x72, 0x74, 0x29, 0x00, 0x31,
+0x6f, 0x6f, 0x70, 0x56, 0x00, 0x02, 0xb8, 0x00, 0x00, 0x3a,
+0x01, 0x01, 0xd8, 0x00, 0x83, 0x6d, 0x75, 0x73, 0x74, 0x00,
+0x63, 0x6f, 0x72, 0x2e, 0x01, 0x70, 0x73, 0x61, 0x74, 0x69,
+0x73, 0x66, 0x79, 0x52, 0x01, 0x03, 0x3a, 0x00, 0x62, 0x73,
+0x65, 0x00, 0x63, 0x6c, 0x75, 0x0a, 0x01, 0x20, 0x62, 0x65,
+0xa9, 0x00, 0x94, 0x73, 0x69, 0x64, 0x65, 0x72, 0x65, 0x64,
+0x00, 0x61, 0x38, 0x00, 0x90, 0x00, 0x73, 0x6f, 0x6c, 0x75,
+0x74, 0x69, 0x6f, 0x6e, 0xef, 0x00, 0x12, 0x49, 0xd7, 0x00,
+0xd2, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x6d,
+0x6f, 0x64, 0x65, 0x2c, 0x12, 0x00, 0x00, 0xb2, 0x01, 0x01,
+0xae, 0x01, 0x98, 0x72, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x64,
+0x00, 0x69, 0x02, 0x02, 0x80, 0x73, 0x71, 0x75, 0x61, 0x72,
+0x65, 0x73, 0x3b, 0xe3, 0x00, 0x51, 0x65, 0x76, 0x65, 0x72,
+0x2c, 0xa4, 0x00, 0xf1, 0x19, 0x63, 0x61, 0x6e, 0x00, 0x61,
+0x6c, 0x73, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x00, 0x6f,
+0x6e, 0x00, 0x74, 0x72, 0x69, 0x61, 0x6e, 0x67, 0x75, 0x6c,
+0x61, 0x72, 0x00, 0x6f, 0x72, 0x00, 0x68, 0x65, 0x78, 0x61,
+0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x47, 0x00, 0x20, 0x73, 0x2c,
+0x14, 0x00, 0x10, 0x65, 0x5a, 0x02, 0xf0, 0x01, 0x6d, 0x6f,
+0x72, 0x65, 0x00, 0x65, 0x78, 0x6f, 0x74, 0x69, 0x63, 0x00,
+0x6f, 0x6e, 0x65, 0x73, 0x9a, 0x00, 0x60, 0x43, 0x72, 0x65,
+0x64, 0x69, 0x74, 0x1b, 0x01, 0x01, 0x90, 0x00, 0xf2, 0x05,
+0x62, 0x61, 0x73, 0x69, 0x63, 0x00, 0x70, 0x75, 0x7a, 0x7a,
+0x6c, 0x65, 0x00, 0x69, 0x64, 0x65, 0x61, 0x00, 0x67, 0x6f,
+0xe7, 0x00, 0xb0, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00,
+0x5b, 0x31, 0x30, 0x5d, 0x38, 0x00, 0x01, 0xcf, 0x02, 0xf1,
+0x00, 0x00, 0x77, 0x61, 0x73, 0x00, 0x6f, 0x72, 0x69, 0x67,
+0x69, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0xb1, 0x01, 0x52, 0x72,
+0x69, 0x62, 0x75, 0x74, 0x77, 0x02, 0x30, 0x74, 0x68, 0x69,
+0xc5, 0x01, 0x40, 0x6c, 0x6c, 0x65, 0x63, 0x09, 0x01, 0xf2,
+0x04, 0x00, 0x62, 0x79, 0x00, 0x4d, 0x69, 0x6b, 0x65, 0x00,
+0x50, 0x69, 0x6e, 0x6e, 0x61, 0x2c, 0x00, 0x61, 0x6e, 0x64,
+0x67, 0x02, 0x40, 0x71, 0x75, 0x65, 0x6e, 0x68, 0x01, 0x62,
+0x65, 0x6e, 0x68, 0x61, 0x6e, 0x63, 0x3c, 0x00, 0xf0, 0x05,
+0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x00, 0x76, 0x61, 0x72,
+0x69, 0x6f, 0x75, 0x73, 0x00, 0x74, 0x79, 0x70, 0x65, 0x73,
+0x12, 0x01, 0x42, 0x6e, 0x6f, 0x6e, 0x2d, 0x16, 0x01, 0x02,
+0x25, 0x01, 0xa3, 0x62, 0x79, 0x00, 0x4c, 0x61, 0x6d, 0x62,
+0x72, 0x6f, 0x73, 0x08, 0x00, 0x10, 0x75, 0x9e, 0x00, 0x00,
+0xa6, 0x00, 0xe1, 0x00, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a,
+0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0xbe, 0x00, 0xa2,
+0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f,
+0xe2, 0x00, 0x50, 0x73, 0x2f, 0x73, 0x6c, 0x69, 0x08, 0x03,
+0xc3, 0x6c, 0x69, 0x6e, 0x6b, 0x2f, 0x00, 0x00, 0x00, 0x32,
+0x33, 0x2e, 0x31, 0xaa, 0x03, 0x01, 0xcc, 0x00, 0x40, 0x6f,
+0x6c, 0x73, 0x20, 0x25, 0x01, 0x42, 0x6c, 0x69, 0x63, 0x6b,
+0x32, 0x02, 0x20, 0x65, 0x66, 0xbf, 0x01, 0x00, 0x27, 0x03,
+0x60, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x7f, 0x01, 0x18,
+0x61, 0x1e, 0x03, 0x01, 0xf9, 0x00, 0xd4, 0x75, 0x72, 0x6e,
+0x00, 0x69, 0x74, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x2c,
+0xa9, 0x02, 0x32, 0x69, 0x6e, 0x67, 0x8e, 0x02, 0x00, 0xc4,
+0x01, 0x00, 0x12, 0x03, 0x10, 0x6b, 0x24, 0x00, 0x2e, 0x69,
+0x73, 0x93, 0x02, 0x03, 0x71, 0x00, 0x20, 0x61, 0x67, 0xfe,
+0x02, 0x04, 0x50, 0x00, 0x04, 0xda, 0x02, 0x04, 0x6d, 0x00,
+0x02, 0x1e, 0x00, 0x50, 0x28, 0x6d, 0x65, 0x61, 0x6e, 0x5a,
+0x00, 0x03, 0xf7, 0x03, 0x70, 0x6e, 0x27, 0x74, 0x00, 0x73,
+0x75, 0x72, 0x26, 0x00, 0x21, 0x74, 0x29, 0x7b, 0x02, 0x15,
+0x66, 0x12, 0x04, 0x01, 0x18, 0x00, 0x01, 0x82, 0x00, 0x11,
+0x61, 0x74, 0x00, 0x21, 0x69, 0x63, 0x33, 0x02, 0x01, 0x55,
+0x00, 0x61, 0x73, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x8f, 0x00,
+0x3d, 0x6e, 0x6f, 0x74, 0x93, 0x00, 0x06, 0x79, 0x02, 0x15,
+0x63, 0x0c, 0x01, 0x4b, 0x72, 0x69, 0x67, 0x68, 0x0d, 0x01,
+0xb0, 0x74, 0x6f, 0x00, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65,
+0x00, 0x69, 0x41, 0x03, 0xb0, 0x6d, 0x70, 0x6c, 0x65, 0x74,
+0x65, 0x6c, 0x79, 0x2e, 0x00, 0x41, 0xad, 0x00, 0x12, 0x2c,
+0x3d, 0x00, 0x00, 0xae, 0x00, 0x60, 0x61, 0x00, 0x73, 0x65,
+0x63, 0x6f, 0x9f, 0x03, 0x8b, 0x69, 0x6d, 0x65, 0x00, 0x77,
+0x69, 0x6c, 0x6c, 0xe5, 0x00, 0x20, 0x62, 0x61, 0x66, 0x00,
+0x13, 0x6f, 0xed, 0x00, 0x00, 0xc9, 0x00, 0x41, 0x28, 0x41,
+0x6c, 0x6c, 0x20, 0x00, 0x11, 0x61, 0x4e, 0x02, 0x92, 0x73,
+0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x34, 0x03,
+0x13, 0x73, 0x64, 0x02, 0x33, 0x32, 0x2e, 0x31, 0xfe, 0x04,
+0xe2, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
+0x62, 0x6c, 0x65, 0x2e, 0x29, 0xdd, 0x01, 0x13, 0x32, 0xdd,
+0x01, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+0x72, 0xdf, 0x01, 0x02, 0x57, 0x04, 0x06, 0x14, 0x00, 0x02,
+0x41, 0x00, 0x04, 0x3c, 0x00, 0x02, 0xcf, 0x04, 0x00, 0x79,
+0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e,
+0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6f, 0x00, 0x22, 0x6f,
+0x6e, 0x1a, 0x00, 0x91, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
+0x6d, 0x65, 0x6e, 0x7f, 0x02, 0x91, 0x57, 0x69, 0x64, 0x74,
+0x68, 0x2c, 0x00, 0x48, 0x65, 0x22, 0x01, 0x51, 0x00, 0x00,
+0x53, 0x69, 0x7a, 0xee, 0x04, 0x00, 0xb2, 0x02, 0x70, 0x2c,
+0x00, 0x6d, 0x65, 0x61, 0x73, 0x75, 0x2c, 0x04, 0x05, 0xdb,
+0x04, 0x00, 0x1c, 0x00, 0x31, 0x72, 0x65, 0x67, 0xd6, 0x00,
+0x61, 0x61, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x1d, 0x03, 0x93,
+0x64, 0x6f, 0x77, 0x6e, 0x2e, 0x00, 0x46, 0x6f, 0x72, 0x08,
+0x04, 0x04, 0xd0, 0x03, 0xa1, 0x69, 0x74, 0x27, 0x73, 0x00,
+0x63, 0x6c, 0x65, 0x61, 0x72, 0xfb, 0x04, 0x01, 0x67, 0x03,
+0x01, 0x6a, 0x03, 0x61, 0x75, 0x6e, 0x74, 0x65, 0x64, 0x3b,
+0xcd, 0x03, 0x10, 0x6f, 0xd7, 0x02, 0x06, 0x37, 0x03, 0x01,
+0x2c, 0x03, 0x00, 0xc3, 0x01, 0x72, 0x6d, 0x61, 0x79, 0x00,
+0x68, 0x61, 0x76, 0xa7, 0x02, 0x01, 0x84, 0x02, 0x41, 0x61,
+0x00, 0x62, 0x69, 0xab, 0x05, 0x22, 0x73, 0x65, 0x4b, 0x05,
+0x01, 0x98, 0x04, 0x52, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x91,
+0x00, 0x25, 0x72, 0x65, 0xb3, 0x00, 0x00, 0xdd, 0x00, 0x50,
+0x47, 0x72, 0x69, 0x64, 0x20, 0x59, 0x00, 0x40, 0x00, 0x00,
+0x00, 0x41, 0x9d, 0x01, 0x02, 0x73, 0x06, 0x00, 0x67, 0x06,
+0x20, 0x68, 0x6f, 0x2b, 0x06, 0x04, 0xc9, 0x05, 0x00, 0xe4,
+0x01, 0x04, 0xfb, 0x03, 0x26, 0x6f, 0x66, 0x8c, 0x00, 0x72,
+0x74, 0x69, 0x6c, 0x69, 0x6e, 0x67, 0x2e, 0x04, 0x06, 0x01,
+0x8c, 0x00, 0x13, 0x61, 0xda, 0x01, 0x11, 0x66, 0x09, 0x06,
+0x01, 0x14, 0x06, 0x21, 0x61, 0x6d, 0x55, 0x02, 0x06, 0xb0,
+0x00, 0x70, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x9b,
+0x00, 0x40, 0x66, 0x66, 0x65, 0x72, 0xac, 0x02, 0x05, 0x52,
+0x00, 0xc1, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x00, 0x28,
+0x65, 0x2e, 0x67, 0x2e, 0x3f, 0x00, 0x50, 0x43, 0x61, 0x69,
+0x72, 0x6f, 0xf8, 0x04, 0x51, 0x4b, 0x69, 0x74, 0x65, 0x73,
+0x70, 0x05, 0x22, 0x29, 0x3b, 0x14, 0x01, 0x1a, 0x73, 0x73,
+0x00, 0x00, 0x3b, 0x00, 0x1f, 0x69, 0x76, 0x00, 0x07, 0x0e,
+0x6d, 0x00, 0x01, 0xa5, 0x00, 0x07, 0x6b, 0x00, 0x74, 0x47,
+0x72, 0x65, 0x61, 0x74, 0x20, 0x48, 0x74, 0x05, 0x12, 0x29,
+0x50, 0x06, 0x02, 0xb1, 0x01, 0x18, 0x2c, 0x9a, 0x05, 0x00,
+0xd2, 0x01, 0x92, 0x68, 0x6f, 0x6e, 0x65, 0x79, 0x63, 0x6f,
+0x6d, 0x62, 0xcb, 0x01, 0x01, 0x5c, 0x01, 0x20, 0x66, 0x75,
+0x3b, 0x05, 0x21, 0x72, 0x65, 0x26, 0x00, 0x02, 0x16, 0x05,
+0x08, 0xa2, 0x00, 0x26, 0x69, 0x72, 0xa4, 0x00, 0x00, 0x1c,
+0x00, 0x0a, 0x24, 0x01, 0x12, 0x3b, 0xfe, 0x01, 0x32, 0x6d,
+0x61, 0x6b, 0x15, 0x00, 0x13, 0x6d, 0xa6, 0x04, 0x11, 0x61,
+0xc1, 0x06, 0x41, 0x6e, 0x66, 0x75, 0x73, 0x76, 0x04, 0x02,
+0x2b, 0x06, 0x00, 0xbe, 0x01, 0x40, 0x44, 0x69, 0x66, 0x66,
+0xf8, 0x03, 0x20, 0x74, 0x79, 0xd8, 0x04, 0x03, 0xe4, 0x04,
+0x03, 0xf3, 0x01, 0x05, 0x1a, 0x00, 0x03, 0xf9, 0x03, 0x60,
+0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0xcd, 0x05, 0x02, 0x2f,
+0x05, 0x12, 0x2e, 0x45, 0x03, 0x13, 0x33, 0x45, 0x03, 0x81,
+0x75, 0x73, 0x65, 0x72, 0x20, 0x70, 0x72, 0x65, 0x21, 0x01,
+0x21, 0x63, 0x65, 0x4b, 0x03, 0x20, 0x4f, 0x6e, 0x6a, 0x00,
+0x10, 0x74, 0x6a, 0x07, 0x13, 0x73, 0x7b, 0x07, 0x70, 0x75,
+0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e, 0x00, 0x17, 0x00,
+0x2e, 0x00, 0x12, 0x2c, 0x39, 0x03, 0x16, 0x50, 0x12, 0x00,
+0x0d, 0x55, 0x03, 0x33, 0x47, 0x61, 0x6d, 0x55, 0x03, 0x02,
+0x22, 0x04, 0x22, 0x6c, 0x65, 0x3c, 0x05, 0x00, 0xd9, 0x00,
+0x22, 0x69, 0x67, 0xcd, 0x04, 0x00, 0xd6, 0x07, 0x00, 0x85,
+0x02, 0x02, 0x5d, 0x05, 0xa0, 0x69, 0x6e, 0x67, 0x73, 0x3a,
+0x00, 0x00, 0x00, 0x60, 0x44, 0xc7, 0x07, 0x82, 0x65, 0x78,
+0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0xfe, 0x02, 0x02, 0x16,
+0x08, 0x30, 0x66, 0x61, 0x69, 0x6c, 0x06, 0x10, 0x27, 0xa7,
+0x01, 0x02, 0x37, 0x03, 0x02, 0x99, 0x06, 0x03, 0x9b, 0x07,
+0x41, 0x3a, 0x00, 0x77, 0x68, 0xbb, 0x02, 0x01, 0x85, 0x04,
+0x04, 0x08, 0x01, 0x00, 0x3f, 0x00, 0x20, 0x68, 0x61, 0xa3,
+0x08, 0xa1, 0x65, 0x6e, 0x00, 0x65, 0x78, 0x70, 0x6c, 0x69,
+0x63, 0x69, 0xb1, 0x06, 0x04, 0x61, 0x00, 0x05, 0x23, 0x04,
+0x04, 0xf5, 0x07, 0x00, 0x53, 0x00, 0x01, 0x20, 0x05, 0x15,
+0x2d, 0xf3, 0x04, 0x36, 0x69, 0x74, 0x2c, 0xdf, 0x04, 0x50,
+0x69, 0x73, 0x00, 0x73, 0x74, 0xd4, 0x00, 0x00, 0x70, 0x08,
+0x40, 0x6e, 0x2c, 0x00, 0x6a, 0x72, 0x08, 0x01, 0xfb, 0x07,
+0x01, 0xa1, 0x00, 0x50, 0x00, 0x67, 0x72, 0x65, 0x79, 0x3b,
+0x07, 0x44, 0x6f, 0x75, 0x72, 0x2e, 0xc3, 0x05, 0x03, 0x21,
+0x05, 0x25, 0x69, 0x73, 0x28, 0x01, 0x36, 0x66, 0x66, 0x2c,
+0x84, 0x00, 0x04, 0xf6, 0x08, 0x11, 0x65, 0xc1, 0x05, 0x01,
+0x58, 0x00, 0x30, 0x00, 0x61, 0x74, 0x47, 0x02, 0x10, 0x2e,
+0x12, 0x01, 0x52, 0x41, 0x75, 0x74, 0x6f, 0x2d, 0x2c, 0x01,
+0x60, 0x00, 0x75, 0x6e, 0x69, 0x71, 0x75, 0xf2, 0x04, 0x21,
+0x74, 0x68, 0xd3, 0x02, 0x58, 0x65, 0x64, 0x67, 0x65, 0x73,
+0x13, 0x01, 0x27, 0x66, 0x66, 0x14, 0x01, 0x30, 0x2e, 0x00,
+0x57, 0x14, 0x01, 0x01, 0x76, 0x04, 0x18, 0x6f, 0xc5, 0x05,
+0x01, 0xf3, 0x03, 0x00, 0xb6, 0x08, 0x02, 0xfb, 0x00, 0x41,
+0x74, 0x61, 0x74, 0x75, 0x4f, 0x00, 0x05, 0x17, 0x0a, 0x05,
+0x78, 0x01, 0x02, 0xc0, 0x01, 0x71, 0x70, 0x6f, 0x74, 0x65,
+0x6e, 0x74, 0x69, 0x2b, 0x08, 0x82, 0x70, 0x72, 0x6f, 0x70,
+0x61, 0x67, 0x61, 0x74, 0x3c, 0x00, 0x03, 0x47, 0x00, 0x56,
+0x61, 0x6c, 0x6f, 0x6e, 0x67, 0xea, 0x03, 0x01, 0xd2, 0x00,
+0x40, 0x2c, 0x00, 0x69, 0x66, 0xae, 0x08, 0x00, 0xce, 0x03,
+0x98, 0x62, 0x6f, 0x74, 0x68, 0x00, 0x65, 0x6e, 0x64, 0x73,
+0xea, 0x09, 0x02, 0x13, 0x02, 0x00, 0x94, 0x00, 0x25, 0x65,
+0x64, 0xea, 0x0a, 0x72, 0x74, 0x6f, 0x00, 0x6f, 0x6e, 0x6c,
+0x79, 0x39, 0x00, 0x01, 0x0b, 0x05, 0x00, 0x2b, 0x00, 0x53,
+0x2e, 0x00, 0x28, 0x54, 0x68, 0xd8, 0x08, 0x13, 0x69, 0xa0,
+0x02, 0x63, 0x69, 0x66, 0x00, 0x74, 0x77, 0x6f, 0x3e, 0x01,
+0x41, 0x6d, 0x65, 0x65, 0x74, 0x35, 0x01, 0x04, 0x53, 0x04,
+0x00, 0x72, 0x03, 0x27, 0x6e, 0x6f, 0x43, 0x00, 0x43, 0x73,
+0x00, 0x64, 0x6f, 0x57, 0x01, 0x01, 0xcf, 0x01, 0x13, 0x6e,
+0x20, 0x0b, 0x06, 0x7e, 0x01, 0x11, 0x65, 0x52, 0x08, 0x02,
+0xac, 0x00, 0x0c, 0x47, 0x07, 0x00, 0xc5, 0x00, 0x12, 0x6e,
+0x21, 0x00, 0x50, 0x2c, 0x00, 0x73, 0x6f, 0x00, 0x09, 0x00,
+0x30, 0x65, 0x27, 0x73, 0x63, 0x00, 0x61, 0x72, 0x65, 0x61,
+0x73, 0x6f, 0x6e, 0xcd, 0x00, 0x65, 0x73, 0x68, 0x6f, 0x75,
+0x6c, 0x64, 0xa7, 0x05, 0x02, 0x72, 0x07, 0x40, 0x73, 0x65,
+0x70, 0x61, 0x8d, 0x03, 0x01, 0xbe, 0x0b, 0x00, 0xc1, 0x0b,
+0x00, 0x61, 0x01, 0x40, 0x65, 0x61, 0x63, 0x68, 0xe4, 0x00,
+0x26, 0x2e, 0x29, 0x65, 0x0a, 0x00, 0xed, 0x04, 0x70, 0x00,
+0x60, 0x42, 0x61, 0x73, 0x65, 0x64, 0xdc, 0x02, 0x02, 0x4b,
+0x0a, 0x42, 0x6e, 0x6c, 0x79, 0x27, 0x7f, 0x02, 0x63, 0x65,
+0x66, 0x66, 0x65, 0x63, 0x74, 0xa8, 0x01, 0x02, 0x5b, 0x00,
+0x01, 0x9d, 0x01, 0x29, 0x6f, 0x6e, 0x96, 0x01, 0x03, 0x87,
+0x06, 0x07, 0x1f, 0x05, 0x23, 0x61, 0x74, 0x13, 0x05, 0x83,
+0x65, 0x67, 0x72, 0x65, 0x65, 0x00, 0x32, 0x00, 0xd3, 0x0b,
+0x70, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x6c, 0x79, 0x11, 0x02,
+0x02, 0xde, 0x0b, 0x10, 0x46, 0x70, 0x0a, 0x20, 0x78, 0x61,
+0xfd, 0x07, 0x14, 0x2c, 0x25, 0x00, 0x07, 0xc1, 0x06, 0x08,
+0x87, 0x00, 0x07, 0x7b, 0x00, 0x30, 0x6f, 0x63, 0x63, 0x8a,
+0x0c, 0x13, 0x74, 0xd4, 0x03, 0x22, 0x75, 0x72, 0xba, 0x00,
+0x41, 0x63, 0x6f, 0x72, 0x6e, 0xfc, 0x0b, 0x0f, 0xe0, 0x00,
+0x0a, 0x00, 0xa7, 0x01, 0x32, 0x67, 0x61, 0x6d, 0x85, 0x02,
+0x13, 0x65, 0xea, 0x00, 0x04, 0xcd, 0x00, 0x00, 0x2b, 0x03,
+0x01, 0x68, 0x00, 0x01, 0x14, 0x08, 0x30, 0x74, 0x61, 0x6b,
+0xde, 0x00, 0x01, 0x2d, 0x07, 0x05, 0xfc, 0x02, 0x00, 0x77,
+0x01, 0x11, 0x27, 0x74, 0x05, 0x4f, 0x72, 0x65, 0x61, 0x64,
+0xd9, 0x03, 0x09, 0x03, 0xb7, 0x01, 0x00, 0x39, 0x02, 0x03,
+0xbe, 0x00, 0x27, 0x64, 0x6f, 0x5e, 0x0b, 0xe0, 0x77, 0x6f,
+0x72, 0x6b, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x79, 0x6f, 0x75,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2260;
-const unsigned short help_text_words = 414;
+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 8c53b2f127..aaaa3bcdad 100644
--- a/apps/plugins/puzzles/help/magnets.c
+++ b/apps/plugins/puzzles/help/magnets.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,187 +6,189 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 143, TEXT_CENTER | C_RED },
- { 323, TEXT_CENTER | C_RED },
- { 340, TEXT_UNDERLINE },
+ { 144, TEXT_CENTER | C_RED },
+ { 324, TEXT_CENTER | C_RED },
  { 341, TEXT_UNDERLINE },
- { 353, TEXT_UNDERLINE },
- { 355, TEXT_UNDERLINE },
- { 388, TEXT_UNDERLINE },
- { 416, TEXT_UNDERLINE },
+ { 342, TEXT_UNDERLINE },
+ { 354, TEXT_UNDERLINE },
+ { 356, TEXT_UNDERLINE },
+ { 389, TEXT_UNDERLINE },
+ { 417, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2502 comp 1653 ratio 0.660671 level 10 saved 849 */
+/* orig 2522 comp 1662 ratio 0.659001 level 10 saved 860 */
 const char help_text[] = {
-0xf2, 0x3e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x33, 0x3a, 0x20, 0x4d, 0x61, 0x67, 0x6e, 0x65, 0x74,
-0x73, 0x20, 0x00, 0x00, 0x00, 0x41, 0x00, 0x72, 0x65, 0x63,
-0x74, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72, 0x00, 0x67,
-0x72, 0x69, 0x64, 0x00, 0x68, 0x61, 0x73, 0x00, 0x62, 0x65,
-0x65, 0x6e, 0x00, 0x66, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00,
-0x77, 0x69, 0x74, 0x68, 0x00, 0x61, 0x00, 0x6d, 0x69, 0x78,
-0x74, 0x75, 0x72, 0x65, 0x00, 0x6f, 0x66, 0x00, 0x6d, 0x40,
-0x00, 0xf2, 0x04, 0x00, 0x28, 0x74, 0x68, 0x61, 0x74, 0x00,
-0x69, 0x73, 0x2c, 0x00, 0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x6f,
-0x65, 0x73, 0x2d, 0x00, 0xf1, 0x05, 0x6f, 0x6e, 0x65, 0x00,
-0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x00, 0x65,
-0x6e, 0x64, 0x00, 0x61, 0x6e, 0x64, 0x15, 0x00, 0x44, 0x6e,
-0x65, 0x67, 0x61, 0x15, 0x00, 0x11, 0x29, 0x16, 0x00, 0x56,
-0x62, 0x6c, 0x61, 0x6e, 0x6b, 0x3f, 0x00, 0x0f, 0x52, 0x00,
-0x05, 0xf6, 0x0a, 0x74, 0x77, 0x6f, 0x00, 0x6e, 0x65, 0x75,
-0x74, 0x72, 0x61, 0x6c, 0x00, 0x70, 0x6f, 0x6c, 0x65, 0x73,
-0x29, 0x2e, 0x00, 0x54, 0x68, 0x65, 0x73, 0x65, 0x28, 0x00,
-0xf0, 0x05, 0x61, 0x72, 0x65, 0x00, 0x69, 0x6e, 0x69, 0x74,
-0x69, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x6c, 0x79,
-0x00, 0x73, 0xc6, 0x00, 0xf2, 0x0a, 0x69, 0x6e, 0x00, 0x73,
-0x69, 0x6c, 0x68, 0x6f, 0x75, 0x65, 0x74, 0x74, 0x65, 0x2e,
-0x00, 0x41, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x00, 0x74, 0x68,
-0x65, 0xee, 0x00, 0x00, 0x37, 0x00, 0xf0, 0x00, 0x70, 0x6c,
-0x61, 0x63, 0x65, 0x64, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d,
-0x62, 0x65, 0x72, 0xe3, 0x00, 0xf1, 0x01, 0x63, 0x6c, 0x75,
-0x65, 0x73, 0x00, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74,
-0x69, 0x6e, 0x67, 0x31, 0x00, 0x06, 0x1f, 0x00, 0x05, 0xde,
-0x00, 0x00, 0xc4, 0x00, 0x05, 0xd6, 0x00, 0x01, 0x9a, 0x00,
-0xa0, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65,
-0x64, 0x7b, 0x00, 0x50, 0x63, 0x65, 0x72, 0x74, 0x61, 0x08,
-0x00, 0x61, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x30, 0x00,
-0xf0, 0x0b, 0x72, 0x6f, 0x77, 0x73, 0x2e, 0x00, 0x00, 0x00,
-0x59, 0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69,
-0x73, 0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f, 0x72, 0x8c, 0x01,
-0x22, 0x6c, 0x79, 0x90, 0x00, 0x01, 0x72, 0x00, 0x04, 0x6a,
-0x01, 0x0f, 0x2b, 0x01, 0x00, 0x51, 0x73, 0x75, 0x63, 0x68,
-0x00, 0x2f, 0x01, 0x31, 0x61, 0x6c, 0x6c, 0x2d, 0x00, 0x02,
-0xb4, 0x00, 0x00, 0xd1, 0x00, 0xa3, 0x73, 0x61, 0x74, 0x69,
-0x73, 0x66, 0x69, 0x65, 0x64, 0x2c, 0x3f, 0x01, 0xd0, 0x68,
-0x65, 0x00, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-0x61, 0x6c, 0xa2, 0x00, 0x72, 0x73, 0x74, 0x72, 0x61, 0x69,
-0x6e, 0x74, 0x41, 0x00, 0x21, 0x6e, 0x6f, 0x61, 0x01, 0x40,
-0x73, 0x69, 0x6d, 0x69, 0x06, 0x02, 0x02, 0x75, 0x00, 0x23,
-0x69, 0x63, 0xd0, 0x00, 0xf1, 0x00, 0x6d, 0x61, 0x79, 0x00,
-0x62, 0x65, 0x00, 0x6f, 0x72, 0x74, 0x68, 0x6f, 0x67, 0x6f,
-0x6e, 0x5f, 0x01, 0xd2, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65,
-0x6e, 0x74, 0x00, 0x28, 0x73, 0x69, 0x6e, 0xac, 0x00, 0xb8,
-0x79, 0x00, 0x72, 0x65, 0x70, 0x65, 0x6c, 0x29, 0x2e, 0x00,
-0x4e, 0xa9, 0x01, 0x72, 0x00, 0x64, 0x6f, 0x00, 0x6e, 0x6f,
-0x74, 0x1d, 0x00, 0x11, 0x2c, 0xc9, 0x00, 0x30, 0x63, 0x61,
-0x6e, 0x51, 0x00, 0x05, 0x44, 0x00, 0xc1, 0x74, 0x6f, 0x00,
-0x61, 0x6e, 0x79, 0x00, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x35,
-0x00, 0x00, 0x1d, 0x01, 0xf1, 0x0b, 0x43, 0x72, 0x65, 0x64,
-0x69, 0x74, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x74, 0x68, 0x69,
-0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67,
-0x6f, 0x65, 0x2d, 0x01, 0xa0, 0x4a, 0x61, 0x6e, 0x6b, 0x6f,
-0x00, 0x5b, 0x31, 0x36, 0x5d, 0x2d, 0x00, 0x13, 0x4d, 0x27,
-0x01, 0x22, 0x77, 0x61, 0x7f, 0x01, 0x70, 0x72, 0x69, 0x62,
-0x75, 0x74, 0x65, 0x64, 0x29, 0x00, 0x01, 0x3d, 0x00, 0x60,
-0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0xfe, 0x00, 0xf0, 0x01,
-0x00, 0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00,
-0x48, 0x61, 0x72, 0x76, 0x65, 0x79, 0x3e, 0x00, 0x00, 0x46,
-0x00, 0xd0, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-0x77, 0x77, 0x77, 0x2e, 0x6a, 0x5c, 0x00, 0xc2, 0x2e, 0x61,
-0x74, 0x2f, 0x52, 0x61, 0x65, 0x74, 0x73, 0x65, 0x6c, 0x2f,
-0x5f, 0x00, 0xf5, 0x03, 0x65, 0x2f, 0x69, 0x6e, 0x64, 0x65,
-0x78, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0x00, 0x00, 0x33, 0x33,
-0x2e, 0x31, 0x49, 0x03, 0x01, 0x74, 0x00, 0x21, 0x6f, 0x6c,
-0x52, 0x03, 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c,
-0x69, 0x63, 0x6b, 0x37, 0x02, 0xf5, 0x00, 0x6f, 0x6e, 0x00,
-0x61, 0x6e, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x00, 0x73,
-0x71, 0x75, 0x6e, 0x02, 0x33, 0x73, 0x00, 0x61, 0x68, 0x01,
-0x23, 0x00, 0x61, 0x86, 0x01, 0x02, 0x54, 0x02, 0x26, 0x6f,
-0x6e, 0xb3, 0x01, 0x05, 0x66, 0x02, 0x00, 0x15, 0x01, 0x00,
-0x4b, 0x00, 0x00, 0x15, 0x00, 0x03, 0x46, 0x00, 0x13, 0x61,
-0xc5, 0x02, 0x09, 0x7d, 0x02, 0x04, 0x24, 0x00, 0x02, 0x4b,
-0x01, 0x40, 0x68, 0x61, 0x6c, 0x66, 0xad, 0x02, 0x06, 0x49,
-0x02, 0x39, 0x3b, 0x00, 0x6c, 0x9e, 0x00, 0x20, 0x61, 0x67,
-0x9c, 0x02, 0x83, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65,
-0x73, 0x74, 0x00, 0x62, 0x6c, 0x61, 0x72, 0x69, 0x74, 0x79,
-0xab, 0x01, 0x10, 0x61, 0x40, 0x01, 0x31, 0x72, 0x64, 0x00,
-0x32, 0x00, 0x87, 0x00, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65,
-0x73, 0x51, 0x00, 0x00, 0x3f, 0x01, 0x4f, 0x52, 0x69, 0x67,
-0x68, 0xf2, 0x00, 0x14, 0x08, 0xc3, 0x02, 0x10, 0x00, 0xa4,
-0x00, 0x2c, 0x65, 0x2e, 0x3f, 0x00, 0x02, 0x93, 0x00, 0x03,
-0x32, 0x00, 0x00, 0x96, 0x02, 0x41, 0x71, 0x75, 0x65, 0x73,
-0x17, 0x01, 0x54, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0xe2, 0x00,
-0x02, 0x44, 0x00, 0x90, 0x2c, 0x00, 0x73, 0x69, 0x67, 0x6e,
-0x69, 0x66, 0x79, 0x3a, 0x00, 0x12, 0x60, 0xeb, 0x01, 0x20,
-0x61, 0x6e, 0x6f, 0x02, 0x22, 0x62, 0x65, 0x6d, 0x00, 0x84,
-0x27, 0x00, 0x28, 0x77, 0x68, 0x69, 0x63, 0x68, 0x75, 0x02,
-0x81, 0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x00, 0x74, 0x95,
-0x02, 0x61, 0x65, 0x00, 0x64, 0x65, 0x64, 0x75, 0x18, 0x02,
-0xf2, 0x02, 0x73, 0x00, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x00,
-0x73, 0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x29, 0x2c, 0xaa,
-0x03, 0x0e, 0x9c, 0x00, 0x02, 0xdb, 0x00, 0x37, 0x69, 0x65,
-0x73, 0x87, 0x00, 0x1d, 0x2e, 0xf7, 0x01, 0x11, 0x61, 0x8d,
-0x03, 0x51, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0xb8, 0x00, 0x50,
-0x00, 0x69, 0x74, 0x00, 0x61, 0x0c, 0x03, 0x80, 0x6e, 0x65,
-0x00, 0x28, 0x67, 0x72, 0x65, 0x79, 0x11, 0x00, 0xb4, 0x6f,
-0x75, 0x74, 0x29, 0x2c, 0x00, 0x6f, 0x72, 0x00, 0x75, 0x6e,
-0x24, 0x00, 0x21, 0x69, 0x66, 0x06, 0x00, 0x91, 0x73, 0x00,
-0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x3d, 0x00, 0x23,
-0x65, 0x64, 0x2e, 0x04, 0x01, 0xc5, 0x00, 0x40, 0x61, 0x6c,
-0x73, 0x6f, 0xc7, 0x00, 0x02, 0xf3, 0x03, 0x91, 0x75, 0x72,
-0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x16, 0x03, 0x20,
-0x6d, 0x6f, 0x93, 0x04, 0x04, 0x16, 0x00, 0x1a, 0x61, 0xeb,
-0x04, 0x74, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0xcd,
-0x04, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x3b, 0x00,
-0x02, 0xa7, 0x00, 0x54, 0x6c, 0x61, 0x79, 0x00, 0x61, 0x9c,
-0x01, 0x03, 0xf4, 0x05, 0x0a, 0x81, 0x02, 0x0c, 0xa9, 0x02,
-0x34, 0x3b, 0x00, 0x70, 0x51, 0x00, 0x0f, 0x49, 0x02, 0x08,
-0x04, 0xaa, 0x02, 0x19, 0x6e, 0x3f, 0x02, 0x04, 0xc0, 0x01,
-0x13, 0x61, 0xe1, 0x05, 0x09, 0x98, 0x02, 0x35, 0x2e, 0x00,
-0x55, 0xa7, 0x00, 0x20, 0x73, 0x70, 0x0c, 0x05, 0x30, 0x62,
-0x61, 0x72, 0xe7, 0x04, 0x32, 0x6f, 0x77, 0x73, 0x1b, 0x02,
-0x10, 0x6d, 0x38, 0x04, 0x2c, 0x6f, 0x66, 0x14, 0x05, 0x03,
-0x5e, 0x04, 0x72, 0x6e, 0x6f, 0x74, 0x2d, 0x62, 0x65, 0x2d,
-0x1d, 0x00, 0x51, 0x68, 0x69, 0x6e, 0x74, 0x73, 0x69, 0x00,
-0x00, 0x4c, 0x04, 0x02, 0xd2, 0x01, 0x16, 0x00, 0x6a, 0x00,
-0x43, 0x00, 0x00, 0x28, 0x41, 0x40, 0x05, 0x13, 0x61, 0x0a,
-0x02, 0x72, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0xc1,
-0x05, 0x13, 0x73, 0x38, 0x04, 0x31, 0x32, 0x2e, 0x31, 0x5b,
-0x05, 0x01, 0x7f, 0x01, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c,
-0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x0b, 0x04, 0x15, 0x32,
-0x0b, 0x04, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-0x65, 0x72, 0x0d, 0x04, 0x02, 0xa4, 0x06, 0x06, 0x14, 0x00,
-0x02, 0x43, 0x00, 0x04, 0x3e, 0x00, 0x51, 0x00, 0x66, 0x72,
-0x6f, 0x6d, 0x7b, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74,
-0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x71,
-0x00, 0x03, 0xe9, 0x02, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65,
-0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xad, 0x00, 0x90, 0x57,
-0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xc8, 0x00,
-0x61, 0x00, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x93, 0x07, 0x01,
-0xcc, 0x06, 0x23, 0x69, 0x6e, 0x72, 0x03, 0x11, 0x73, 0x1e,
-0x07, 0x13, 0x72, 0x81, 0x02, 0x22, 0x62, 0x65, 0x0b, 0x04,
-0x01, 0x3c, 0x00, 0x24, 0x00, 0x78, 0x3d, 0x00, 0x05, 0x36,
-0x01, 0x25, 0x69, 0x6e, 0x24, 0x02, 0x10, 0x3a, 0x82, 0x02,
-0x01, 0x48, 0x03, 0x03, 0xec, 0x06, 0x53, 0x69, 0x73, 0x00,
-0x6f, 0x64, 0xc0, 0x01, 0x25, 0x6f, 0x6e, 0x7e, 0x04, 0x04,
-0x58, 0x00, 0x01, 0x63, 0x01, 0x01, 0x45, 0x01, 0x53, 0x47,
-0x72, 0x69, 0x64, 0x73, 0x38, 0x02, 0x71, 0x74, 0x00, 0x6c,
-0x65, 0x61, 0x73, 0x74, 0x31, 0x00, 0x00, 0x3e, 0x00, 0x70,
-0x64, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0xd2, 0x00, 0x21,
-0x65, 0x6e, 0x96, 0x05, 0x90, 0x62, 0x65, 0x00, 0x65, 0x61,
-0x73, 0x69, 0x65, 0x72, 0x0d, 0x00, 0x00, 0x74, 0x03, 0x02,
-0x4a, 0x01, 0xa0, 0x44, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
-0x6c, 0x74, 0x79, 0x02, 0x06, 0x03, 0x55, 0x05, 0x02, 0x30,
-0x02, 0x06, 0x1a, 0x00, 0x03, 0xd2, 0x04, 0x60, 0x67, 0x65,
-0x6e, 0x65, 0x72, 0x61, 0xe6, 0x05, 0x02, 0x1b, 0x06, 0xf0,
-0x00, 0x2e, 0x00, 0x41, 0x74, 0x00, 0x54, 0x72, 0x69, 0x63,
-0x6b, 0x79, 0x00, 0x6c, 0x65, 0x76, 0x6d, 0x06, 0x31, 0x79,
-0x6f, 0x75, 0x71, 0x01, 0x62, 0x72, 0x65, 0x71, 0x75, 0x69,
-0x72, 0x10, 0x06, 0x89, 0x6d, 0x61, 0x6b, 0x65, 0x00, 0x6d,
-0x6f, 0x72, 0xfc, 0x03, 0x53, 0x61, 0x62, 0x6f, 0x75, 0x74,
-0xb4, 0x04, 0x09, 0x4d, 0x02, 0x42, 0x72, 0x6f, 0x77, 0x2f,
-0xbb, 0x07, 0x61, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0xb8,
-0x07, 0x62, 0x53, 0x74, 0x72, 0x69, 0x70, 0x20, 0x6e, 0x07,
-0xe1, 0x00, 0x00, 0x49, 0x66, 0x00, 0x74, 0x72, 0x75, 0x65,
-0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x8b, 0x01, 0x08, 0x8b, 0x07,
-0x0e, 0x6c, 0x08, 0x02, 0x05, 0x03, 0x10, 0x64, 0x25, 0x01,
-0x03, 0xc2, 0x00, 0x01, 0x18, 0x01, 0x40, 0x69, 0x6d, 0x65,
-0x2c, 0x9c, 0x00, 0x04, 0xf7, 0x02, 0x03, 0xef, 0x06, 0x02,
-0xa9, 0x00, 0xa0, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c,
-0x74, 0x2e, 0x00,
+0x73, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf2, 0x2a, 0x00, 0x00,
+0x00, 0x41, 0x00, 0x72, 0x65, 0x63, 0x74, 0x61, 0x6e, 0x67,
+0x75, 0x6c, 0x61, 0x72, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00,
+0x68, 0x61, 0x73, 0x00, 0x62, 0x65, 0x65, 0x6e, 0x00, 0x66,
+0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74, 0x68,
+0x00, 0x61, 0x00, 0x6d, 0x69, 0x78, 0x74, 0x75, 0x72, 0x65,
+0x00, 0x6f, 0x66, 0x00, 0x6d, 0x54, 0x00, 0xf2, 0x04, 0x00,
+0x28, 0x74, 0x68, 0x61, 0x74, 0x00, 0x69, 0x73, 0x2c, 0x00,
+0x64, 0x6f, 0x6d, 0x69, 0x6e, 0x6f, 0x65, 0x73, 0x2d, 0x00,
+0xf1, 0x05, 0x6f, 0x6e, 0x65, 0x00, 0x70, 0x6f, 0x73, 0x69,
+0x74, 0x69, 0x76, 0x65, 0x00, 0x65, 0x6e, 0x64, 0x00, 0x61,
+0x6e, 0x64, 0x15, 0x00, 0x44, 0x6e, 0x65, 0x67, 0x61, 0x15,
+0x00, 0x11, 0x29, 0x16, 0x00, 0x56, 0x62, 0x6c, 0x61, 0x6e,
+0x6b, 0x3f, 0x00, 0x0f, 0x52, 0x00, 0x05, 0xf6, 0x0a, 0x74,
+0x77, 0x6f, 0x00, 0x6e, 0x65, 0x75, 0x74, 0x72, 0x61, 0x6c,
+0x00, 0x70, 0x6f, 0x6c, 0x65, 0x73, 0x29, 0x2e, 0x00, 0x54,
+0x68, 0x65, 0x73, 0x65, 0x28, 0x00, 0xf0, 0x05, 0x61, 0x72,
+0x65, 0x00, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x6c,
+0x79, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x73, 0xc6, 0x00,
+0xf2, 0x0a, 0x69, 0x6e, 0x00, 0x73, 0x69, 0x6c, 0x68, 0x6f,
+0x75, 0x65, 0x74, 0x74, 0x65, 0x2e, 0x00, 0x41, 0x72, 0x6f,
+0x75, 0x6e, 0x64, 0x00, 0x74, 0x68, 0x65, 0xee, 0x00, 0x00,
+0x37, 0x00, 0xf0, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64,
+0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0xe3,
+0x00, 0xf1, 0x01, 0x63, 0x6c, 0x75, 0x65, 0x73, 0x00, 0x69,
+0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x31,
+0x00, 0x06, 0x1f, 0x00, 0x05, 0xde, 0x00, 0x00, 0xc4, 0x00,
+0x05, 0xd6, 0x00, 0x01, 0x9a, 0x00, 0xa0, 0x00, 0x63, 0x6f,
+0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x64, 0x7b, 0x00, 0x50,
+0x63, 0x65, 0x72, 0x74, 0x61, 0x08, 0x00, 0x61, 0x6f, 0x6c,
+0x75, 0x6d, 0x6e, 0x73, 0x30, 0x00, 0xf0, 0x0b, 0x72, 0x6f,
+0x77, 0x73, 0x2e, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x72,
+0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f,
+0x00, 0x63, 0x6f, 0x72, 0x8c, 0x01, 0x22, 0x6c, 0x79, 0x90,
+0x00, 0x01, 0x72, 0x00, 0x04, 0x6a, 0x01, 0x0f, 0x2b, 0x01,
+0x00, 0x51, 0x73, 0x75, 0x63, 0x68, 0x00, 0x2f, 0x01, 0x31,
+0x61, 0x6c, 0x6c, 0x2d, 0x00, 0x02, 0xb4, 0x00, 0x00, 0xd1,
+0x00, 0xa3, 0x73, 0x61, 0x74, 0x69, 0x73, 0x66, 0x69, 0x65,
+0x64, 0x2c, 0x3f, 0x01, 0xd0, 0x68, 0x65, 0x00, 0x61, 0x64,
+0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0xa2, 0x00,
+0x72, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74, 0x41, 0x00,
+0x21, 0x6e, 0x6f, 0x61, 0x01, 0x40, 0x73, 0x69, 0x6d, 0x69,
+0x06, 0x02, 0x02, 0x75, 0x00, 0x23, 0x69, 0x63, 0xd0, 0x00,
+0xf1, 0x00, 0x6d, 0x61, 0x79, 0x00, 0x62, 0x65, 0x00, 0x6f,
+0x72, 0x74, 0x68, 0x6f, 0x67, 0x6f, 0x6e, 0x5f, 0x01, 0xd2,
+0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x00, 0x28,
+0x73, 0x69, 0x6e, 0xac, 0x00, 0xb8, 0x79, 0x00, 0x72, 0x65,
+0x70, 0x65, 0x6c, 0x29, 0x2e, 0x00, 0x4e, 0xa9, 0x01, 0x72,
+0x00, 0x64, 0x6f, 0x00, 0x6e, 0x6f, 0x74, 0x1d, 0x00, 0x11,
+0x2c, 0xc9, 0x00, 0x30, 0x63, 0x61, 0x6e, 0x51, 0x00, 0x05,
+0x44, 0x00, 0xc1, 0x74, 0x6f, 0x00, 0x61, 0x6e, 0x79, 0x00,
+0x6f, 0x74, 0x68, 0x65, 0x72, 0x35, 0x00, 0x00, 0x1d, 0x01,
+0xf1, 0x0b, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x66,
+0x6f, 0x72, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75,
+0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0x2d, 0x01,
+0xa0, 0x4a, 0x61, 0x6e, 0x6b, 0x6f, 0x00, 0x5b, 0x31, 0x36,
+0x5d, 0x2d, 0x00, 0x13, 0x4d, 0x27, 0x01, 0x22, 0x77, 0x61,
+0x7f, 0x01, 0x70, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64,
+0x29, 0x00, 0x01, 0x3d, 0x00, 0x60, 0x63, 0x6f, 0x6c, 0x6c,
+0x65, 0x63, 0xfe, 0x00, 0xf0, 0x01, 0x00, 0x62, 0x79, 0x00,
+0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76,
+0x65, 0x79, 0x3e, 0x00, 0x00, 0x46, 0x00, 0xd0, 0x00, 0x68,
+0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e,
+0x6a, 0x5c, 0x00, 0xc2, 0x2e, 0x61, 0x74, 0x2f, 0x52, 0x61,
+0x65, 0x74, 0x73, 0x65, 0x6c, 0x2f, 0x5f, 0x00, 0xf5, 0x03,
+0x65, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74,
+0x6d, 0x00, 0x00, 0x00, 0x33, 0x33, 0x2e, 0x31, 0x5d, 0x03,
+0x01, 0x74, 0x00, 0xf0, 0x02, 0x6f, 0x6c, 0x73, 0x20, 0x00,
+0x00, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
+0x63, 0x6b, 0x37, 0x02, 0xf5, 0x00, 0x6f, 0x6e, 0x00, 0x61,
+0x6e, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x00, 0x73, 0x71,
+0x75, 0x6e, 0x02, 0x33, 0x73, 0x00, 0x61, 0x68, 0x01, 0x23,
+0x00, 0x61, 0x86, 0x01, 0x02, 0x54, 0x02, 0x26, 0x6f, 0x6e,
+0xb3, 0x01, 0x05, 0x66, 0x02, 0x00, 0x15, 0x01, 0x00, 0x4b,
+0x00, 0x00, 0x15, 0x00, 0x03, 0x46, 0x00, 0x13, 0x61, 0xc5,
+0x02, 0x09, 0x7d, 0x02, 0x04, 0x24, 0x00, 0x02, 0x4b, 0x01,
+0x40, 0x68, 0x61, 0x6c, 0x66, 0xad, 0x02, 0x06, 0x49, 0x02,
+0x39, 0x3b, 0x00, 0x6c, 0x9e, 0x00, 0x20, 0x61, 0x67, 0x9c,
+0x02, 0x83, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x73,
+0x74, 0x00, 0x62, 0x6c, 0x61, 0x72, 0x69, 0x74, 0x79, 0xab,
+0x01, 0x10, 0x61, 0x40, 0x01, 0x31, 0x72, 0x64, 0x00, 0x32,
+0x00, 0x87, 0x00, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x73,
+0x51, 0x00, 0x00, 0x3f, 0x01, 0x4f, 0x52, 0x69, 0x67, 0x68,
+0xf2, 0x00, 0x14, 0x08, 0xc3, 0x02, 0x10, 0x00, 0xa4, 0x00,
+0x2c, 0x65, 0x2e, 0x3f, 0x00, 0x02, 0x93, 0x00, 0x03, 0x32,
+0x00, 0x00, 0x96, 0x02, 0x41, 0x71, 0x75, 0x65, 0x73, 0x17,
+0x01, 0x54, 0x6d, 0x61, 0x72, 0x6b, 0x73, 0xe2, 0x00, 0x02,
+0x44, 0x00, 0x90, 0x2c, 0x00, 0x73, 0x69, 0x67, 0x6e, 0x69,
+0x66, 0x79, 0x3a, 0x00, 0x12, 0x60, 0xeb, 0x01, 0x20, 0x61,
+0x6e, 0x6f, 0x02, 0x22, 0x62, 0x65, 0x6d, 0x00, 0x84, 0x27,
+0x00, 0x28, 0x77, 0x68, 0x69, 0x63, 0x68, 0x75, 0x02, 0x81,
+0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x00, 0x74, 0x95, 0x02,
+0x61, 0x65, 0x00, 0x64, 0x65, 0x64, 0x75, 0x18, 0x02, 0xf2,
+0x02, 0x73, 0x00, 0x77, 0x68, 0x69, 0x6c, 0x65, 0x00, 0x73,
+0x6f, 0x6c, 0x76, 0x69, 0x6e, 0x67, 0x29, 0x2c, 0xaa, 0x03,
+0x0e, 0x9c, 0x00, 0x02, 0xdb, 0x00, 0x37, 0x69, 0x65, 0x73,
+0x87, 0x00, 0x1d, 0x2e, 0xf7, 0x01, 0x11, 0x61, 0x8d, 0x03,
+0x51, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0xb8, 0x00, 0x50, 0x00,
+0x69, 0x74, 0x00, 0x61, 0x0c, 0x03, 0x80, 0x6e, 0x65, 0x00,
+0x28, 0x67, 0x72, 0x65, 0x79, 0x11, 0x00, 0xb4, 0x6f, 0x75,
+0x74, 0x29, 0x2c, 0x00, 0x6f, 0x72, 0x00, 0x75, 0x6e, 0x24,
+0x00, 0x21, 0x69, 0x66, 0x06, 0x00, 0x91, 0x73, 0x00, 0x61,
+0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x3d, 0x00, 0x23, 0x65,
+0x64, 0x2e, 0x04, 0x01, 0xc5, 0x00, 0x40, 0x61, 0x6c, 0x73,
+0x6f, 0xc7, 0x00, 0x02, 0xf3, 0x03, 0x91, 0x75, 0x72, 0x73,
+0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x16, 0x03, 0x20, 0x6d,
+0x6f, 0x93, 0x04, 0x04, 0x16, 0x00, 0x1a, 0x61, 0xeb, 0x04,
+0x74, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0xcd, 0x04,
+0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x3b, 0x00, 0x02,
+0xa7, 0x00, 0x54, 0x6c, 0x61, 0x79, 0x00, 0x61, 0x9c, 0x01,
+0x03, 0xf4, 0x05, 0x0a, 0x81, 0x02, 0x0c, 0xa9, 0x02, 0x34,
+0x3b, 0x00, 0x70, 0x51, 0x00, 0x0f, 0x49, 0x02, 0x08, 0x04,
+0xaa, 0x02, 0x19, 0x6e, 0x3f, 0x02, 0x04, 0xc0, 0x01, 0x13,
+0x61, 0xe1, 0x05, 0x09, 0x98, 0x02, 0x35, 0x2e, 0x00, 0x55,
+0xa7, 0x00, 0x20, 0x73, 0x70, 0x0c, 0x05, 0x30, 0x62, 0x61,
+0x72, 0xe7, 0x04, 0x32, 0x6f, 0x77, 0x73, 0x1b, 0x02, 0x10,
+0x6d, 0x38, 0x04, 0x2c, 0x6f, 0x66, 0x14, 0x05, 0x03, 0x5e,
+0x04, 0x72, 0x6e, 0x6f, 0x74, 0x2d, 0x62, 0x65, 0x2d, 0x1d,
+0x00, 0x51, 0x68, 0x69, 0x6e, 0x74, 0x73, 0x69, 0x00, 0x00,
+0x4c, 0x04, 0x02, 0xd2, 0x01, 0x16, 0x00, 0x6a, 0x00, 0x43,
+0x00, 0x00, 0x28, 0x41, 0x40, 0x05, 0x13, 0x61, 0x0a, 0x02,
+0x72, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0xc1, 0x05,
+0x13, 0x73, 0x38, 0x04, 0x31, 0x32, 0x2e, 0x31, 0x5b, 0x05,
+0x01, 0x7f, 0x01, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
+0x62, 0x6c, 0x65, 0x2e, 0x29, 0x0b, 0x04, 0x15, 0x32, 0x0b,
+0x04, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+0x72, 0x0d, 0x04, 0x02, 0xa4, 0x06, 0x06, 0x14, 0x00, 0x02,
+0x43, 0x00, 0x04, 0x3e, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f,
+0x6d, 0x7b, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f,
+0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x71, 0x00,
+0x03, 0xe9, 0x02, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27,
+0x00, 0x6d, 0x65, 0x6e, 0x75, 0xad, 0x00, 0x90, 0x57, 0x69,
+0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xc8, 0x00, 0x61,
+0x00, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x93, 0x07, 0x01, 0xcc,
+0x06, 0x23, 0x69, 0x6e, 0x72, 0x03, 0x11, 0x73, 0x1e, 0x07,
+0x13, 0x72, 0x81, 0x02, 0x22, 0x62, 0x65, 0x0b, 0x04, 0x01,
+0x3c, 0x00, 0x24, 0x00, 0x78, 0x3d, 0x00, 0x05, 0x36, 0x01,
+0x25, 0x69, 0x6e, 0x24, 0x02, 0x10, 0x3a, 0x82, 0x02, 0x01,
+0x48, 0x03, 0x03, 0xec, 0x06, 0x53, 0x69, 0x73, 0x00, 0x6f,
+0x64, 0xc0, 0x01, 0x25, 0x6f, 0x6e, 0x7e, 0x04, 0x04, 0x58,
+0x00, 0x01, 0x63, 0x01, 0x01, 0x45, 0x01, 0x53, 0x47, 0x72,
+0x69, 0x64, 0x73, 0x38, 0x02, 0x71, 0x74, 0x00, 0x6c, 0x65,
+0x61, 0x73, 0x74, 0x31, 0x00, 0x00, 0x3e, 0x00, 0x70, 0x64,
+0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0xd2, 0x00, 0x21, 0x65,
+0x6e, 0x96, 0x05, 0x90, 0x62, 0x65, 0x00, 0x65, 0x61, 0x73,
+0x69, 0x65, 0x72, 0x0d, 0x00, 0x00, 0x74, 0x03, 0x02, 0x4a,
+0x01, 0xa0, 0x44, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c,
+0x74, 0x79, 0x02, 0x06, 0x03, 0x55, 0x05, 0x02, 0x30, 0x02,
+0x06, 0x1a, 0x00, 0x03, 0xd2, 0x04, 0x60, 0x67, 0x65, 0x6e,
+0x65, 0x72, 0x61, 0xe6, 0x05, 0x02, 0x1b, 0x06, 0xf0, 0x00,
+0x2e, 0x00, 0x41, 0x74, 0x00, 0x54, 0x72, 0x69, 0x63, 0x6b,
+0x79, 0x00, 0x6c, 0x65, 0x76, 0x6d, 0x06, 0x31, 0x79, 0x6f,
+0x75, 0x71, 0x01, 0x62, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72,
+0x10, 0x06, 0x89, 0x6d, 0x61, 0x6b, 0x65, 0x00, 0x6d, 0x6f,
+0x72, 0xfc, 0x03, 0x53, 0x61, 0x62, 0x6f, 0x75, 0x74, 0xb4,
+0x04, 0x09, 0x4d, 0x02, 0x42, 0x72, 0x6f, 0x77, 0x2f, 0xbb,
+0x07, 0x61, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0xb8, 0x07,
+0x62, 0x53, 0x74, 0x72, 0x69, 0x70, 0x20, 0x6e, 0x07, 0xe1,
+0x00, 0x00, 0x49, 0x66, 0x00, 0x74, 0x72, 0x75, 0x65, 0x2c,
+0x00, 0x73, 0x6f, 0x6d, 0x8b, 0x01, 0x08, 0x8b, 0x07, 0x0e,
+0x6c, 0x08, 0x02, 0x05, 0x03, 0x10, 0x64, 0x25, 0x01, 0x03,
+0xc2, 0x00, 0x01, 0x18, 0x01, 0x40, 0x69, 0x6d, 0x65, 0x2c,
+0x9c, 0x00, 0x04, 0xf7, 0x02, 0x03, 0xef, 0x06, 0x02, 0xa9,
+0x00, 0xa0, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2502;
-const unsigned short help_text_words = 438;
+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 2f577ae6b2..05474e3181 100644
--- a/apps/plugins/puzzles/help/map.c
+++ b/apps/plugins/puzzles/help/map.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,251 +6,270 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 81, TEXT_UNDERLINE },
- { 157, TEXT_CENTER | C_RED },
- { 244, TEXT_UNDERLINE },
- { 268, TEXT_UNDERLINE },
- { 507, TEXT_CENTER | C_RED },
- { 524, TEXT_UNDERLINE },
- { 525, TEXT_UNDERLINE },
- { 535, TEXT_UNDERLINE },
- { 547, TEXT_UNDERLINE },
+ { 87, TEXT_UNDERLINE },
+ { 163, TEXT_CENTER | C_RED },
+ { 250, TEXT_UNDERLINE },
+ { 274, TEXT_UNDERLINE },
+ { 513, TEXT_CENTER | C_RED },
+ { 530, TEXT_UNDERLINE },
+ { 531, TEXT_UNDERLINE },
+ { 541, TEXT_UNDERLINE },
+ { 553, TEXT_UNDERLINE },
+ { 650, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 3466 comp 2283 ratio 0.658684 level 10 saved 1183 */
+/* orig 3752 comp 2460 ratio 0.65565 level 10 saved 1292 */
 const char help_text[] = {
-0xf0, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
-0x32, 0x32, 0x3a, 0x20, 0x4d, 0x61, 0x70, 0x20, 0x00, 0x00,
-0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67,
-0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x6d, 0x61, 0x70,
-0x00, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x69, 0x6e,
-0x67, 0x00, 0x6f, 0x66, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d,
-0x62, 0x65, 0x72, 0x0c, 0x00, 0x80, 0x72, 0x65, 0x67, 0x69,
-0x6f, 0x6e, 0x73, 0x2e, 0x37, 0x00, 0xf0, 0x01, 0x72, 0x00,
-0x74, 0x61, 0x73, 0x6b, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f,
-0x00, 0x63, 0x6f, 0x6c, 0x12, 0x00, 0x43, 0x65, 0x61, 0x63,
-0x68, 0x25, 0x00, 0x90, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00,
-0x6f, 0x6e, 0x65, 0x38, 0x00, 0x10, 0x66, 0x1d, 0x00, 0x02,
-0x24, 0x00, 0xf4, 0x0d, 0x73, 0x2c, 0x00, 0x69, 0x6e, 0x00,
-0x73, 0x75, 0x63, 0x68, 0x00, 0x61, 0x00, 0x77, 0x61, 0x79,
-0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x6e, 0x6f, 0x00, 0x74,
-0x77, 0x6f, 0x60, 0x00, 0x50, 0x00, 0x73, 0x68, 0x61, 0x72,
-0x7f, 0x00, 0xf3, 0x09, 0x61, 0x00, 0x62, 0x6f, 0x75, 0x6e,
-0x64, 0x61, 0x72, 0x79, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
-0x74, 0x68, 0x65, 0x00, 0x73, 0x61, 0x6d, 0x65, 0x4c, 0x00,
-0x15, 0x2e, 0xbf, 0x00, 0x82, 0x70, 0x72, 0x6f, 0x76, 0x69,
-0x64, 0x65, 0x64, 0x76, 0x00, 0x45, 0x73, 0x6f, 0x6d, 0x65,
-0x4c, 0x00, 0x73, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79,
-0x33, 0x00, 0xe0, 0x65, 0x64, 0x2c, 0x00, 0x73, 0x75, 0x66,
-0x66, 0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0xbb, 0x00, 0x32,
-0x6d, 0x61, 0x6b, 0x59, 0x00, 0x72, 0x72, 0x65, 0x6d, 0x61,
-0x69, 0x6e, 0x64, 0xea, 0x00, 0x01, 0x6a, 0x00, 0x40, 0x6f,
-0x6c, 0x75, 0x74, 0xcb, 0x00, 0xe5, 0x75, 0x6e, 0x69, 0x71,
-0x75, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x4f, 0x6e, 0x6c, 0x79,
-0x5a, 0x00, 0x51, 0x77, 0x68, 0x69, 0x63, 0x68, 0xac, 0x00,
-0xa0, 0x65, 0x00, 0x61, 0x00, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-0x68, 0x3c, 0x00, 0x30, 0x62, 0x6f, 0x72, 0x46, 0x00, 0x20,
-0x61, 0x72, 0x54, 0x00, 0x60, 0x71, 0x75, 0x69, 0x72, 0x65,
-0x64, 0x69, 0x00, 0x90, 0x62, 0x65, 0x00, 0x64, 0x69, 0x66,
-0x66, 0x65, 0x72, 0x79, 0x00, 0x03, 0x0d, 0x01, 0x5b, 0x2e,
-0x00, 0x54, 0x77, 0x6f, 0x51, 0x00, 0x90, 0x6d, 0x65, 0x65,
-0x74, 0x00, 0x61, 0x74, 0x00, 0x6f, 0x6c, 0x00, 0x00, 0x41,
-0x01, 0xb1, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x00, 0x28, 0x69,
-0x2e, 0x65, 0x2e, 0x55, 0x00, 0xff, 0x0c, 0x64, 0x69, 0x61,
-0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x65,
-0x70, 0x61, 0x72, 0x61, 0x74, 0x65, 0x64, 0x29, 0x00, 0x6d,
-0x61, 0x79, 0x00, 0x62, 0x23, 0x01, 0x00, 0x91, 0x00, 0x00,
-0x49, 0x00, 0x62, 0x65, 0x6c, 0x69, 0x65, 0x40, 0x01, 0x90,
-0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0xb9,
-0x01, 0xf0, 0x08, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
-0x6c, 0x3b, 0x00, 0x49, 0x27, 0x76, 0x65, 0x00, 0x6e, 0x65,
-0x76, 0x65, 0x72, 0x00, 0x73, 0x65, 0x09, 0x02, 0xc1, 0x6e,
-0x00, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-0x61, 0x04, 0x01, 0xf0, 0x09, 0x6f, 0x66, 0x00, 0x69, 0x74,
-0x00, 0x61, 0x6e, 0x79, 0x77, 0x68, 0x65, 0x72, 0x65, 0x00,
-0x65, 0x6c, 0x73, 0x65, 0x2e, 0x00, 0x54, 0x68, 0x65, 0x2e,
-0x02, 0x42, 0x63, 0x65, 0x70, 0x74, 0x2b, 0x02, 0x00, 0xe9,
-0x01, 0x12, 0x2d, 0x7a, 0x00, 0x00, 0xc0, 0x01, 0x03, 0x6b,
-0x00, 0xf0, 0x20, 0x77, 0x61, 0x73, 0x00, 0x73, 0x75, 0x67,
-0x67, 0x65, 0x73, 0x74, 0x65, 0x64, 0x00, 0x62, 0x79, 0x00,
-0x4f, 0x77, 0x65, 0x6e, 0x00, 0x44, 0x75, 0x6e, 0x6e, 0x3b,
-0x00, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x6d, 0x75,
-0x73, 0x74, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x67, 0x6f,
-0x2d, 0x01, 0x91, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00,
-0x61, 0x6e, 0x3b, 0x01, 0xf1, 0x07, 0x56, 0x65, 0x72, 0x69,
-0x74, 0x79, 0x00, 0x41, 0x6c, 0x6c, 0x61, 0x6e, 0x00, 0x66,
-0x6f, 0x72, 0x00, 0x69, 0x6e, 0x73, 0x70, 0x69, 0x63, 0x00,
-0x00, 0xf0, 0x00, 0x52, 0x74, 0x72, 0x61, 0x69, 0x6e, 0xb6,
-0x01, 0x52, 0x6f, 0x75, 0x67, 0x68, 0x74, 0x54, 0x02, 0x12,
-0x6c, 0x77, 0x01, 0x01, 0x0b, 0x02, 0x40, 0x61, 0x6c, 0x69,
-0x73, 0x2e, 0x00, 0x00, 0x79, 0x00, 0x15, 0x27, 0x8d, 0x00,
-0x01, 0xa7, 0x02, 0xb3, 0x61, 0x73, 0x00, 0x61, 0x00, 0x76,
-0x69, 0x61, 0x62, 0x6c, 0x65, 0xb0, 0x00, 0x00, 0xd8, 0x00,
-0x42, 0x61, 0x6e, 0x6b, 0x73, 0x90, 0x00, 0xf1, 0x01, 0x74,
-0x6f, 0x00, 0x47, 0x61, 0x72, 0x65, 0x74, 0x68, 0x00, 0x54,
-0x61, 0x79, 0x6c, 0x6f, 0x72, 0x80, 0x00, 0xa0, 0x6d, 0x61,
-0x6e, 0x79, 0x00, 0x64, 0x65, 0x74, 0x61, 0x69, 0x66, 0x00,
-0x06, 0x4f, 0x00, 0x10, 0x73, 0x70, 0x01, 0x41, 0x32, 0x32,
-0x2e, 0x31, 0x60, 0x03, 0x80, 0x63, 0x6f, 0x6e, 0x74, 0x72,
-0x6f, 0x6c, 0x73, 0x69, 0x03, 0x15, 0x54, 0x25, 0x03, 0x13,
-0x61, 0xf0, 0x01, 0x71, 0x2c, 0x00, 0x63, 0x6c, 0x69, 0x63,
-0x6b, 0xc2, 0x00, 0xf0, 0x00, 0x6c, 0x65, 0x66, 0x74, 0x00,
-0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x62, 0x75, 0x74, 0x74,
-0x70, 0x01, 0x01, 0x85, 0x01, 0x23, 0x65, 0x78, 0x89, 0x03,
-0x03, 0x55, 0x03, 0x03, 0x9a, 0x02, 0x31, 0x64, 0x65, 0x73,
-0x56, 0x02, 0x04, 0x52, 0x00, 0x72, 0x6e, 0x64, 0x00, 0x64,
-0x72, 0x61, 0x67, 0xf8, 0x00, 0x03, 0x15, 0x00, 0x41, 0x69,
-0x6e, 0x74, 0x6f, 0x2d, 0x00, 0x33, 0x6e, 0x65, 0x77, 0x3f,
-0x00, 0x00, 0x9d, 0x00, 0x31, 0x28, 0x54, 0x68, 0x2f, 0x03,
-0xf3, 0x07, 0x67, 0x72, 0x61, 0x6d, 0x00, 0x77, 0x69, 0x6c,
-0x6c, 0x00, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x00, 0x65,
-0x6e, 0x73, 0x75, 0x72, 0x40, 0x02, 0x47, 0x74, 0x61, 0x72,
-0x74, 0xc0, 0x01, 0x10, 0x68, 0x24, 0x01, 0x00, 0x51, 0x01,
-0x31, 0x61, 0x73, 0x74, 0x92, 0x02, 0x06, 0x8e, 0x00, 0x01,
-0xf2, 0x03, 0x02, 0x72, 0x00, 0x42, 0x2c, 0x00, 0x73, 0x6f,
-0x82, 0x00, 0x01, 0x67, 0x02, 0x24, 0x69, 0x73, 0x5a, 0x00,
-0xa0, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x21,
-0x29, 0x8d, 0x02, 0x82, 0x66, 0x00, 0x79, 0x6f, 0x75, 0x00,
-0x6e, 0x65, 0x9e, 0x01, 0x48, 0x63, 0x6c, 0x65, 0x61, 0x13,
-0x01, 0x00, 0x1c, 0x00, 0x32, 0x63, 0x61, 0x6e, 0xcf, 0x00,
-0x41, 0x66, 0x72, 0x6f, 0x6d, 0x06, 0x01, 0x45, 0x6d, 0x70,
-0x74, 0x79, 0x23, 0x00, 0x22, 0x6f, 0x72, 0x19, 0x00, 0x24,
-0x74, 0x68, 0xb1, 0x01, 0x06, 0x26, 0x04, 0x11, 0x69, 0x20,
-0x01, 0x21, 0x72, 0x65, 0x28, 0x03, 0x29, 0x6e, 0x6f, 0x3a,
-0x00, 0x11, 0x73, 0x66, 0x01, 0x00, 0x04, 0x01, 0x52, 0x44,
-0x72, 0x61, 0x67, 0x67, 0x60, 0x04, 0x03, 0x2d, 0x01, 0x24,
-0x75, 0x73, 0x4c, 0x02, 0x4b, 0x72, 0x69, 0x67, 0x68, 0x8b,
-0x01, 0x01, 0x26, 0x01, 0x64, 0x73, 0x74, 0x69, 0x70, 0x70,
-0x6c, 0x2a, 0x04, 0x01, 0xff, 0x00, 0x28, 0x69, 0x6e, 0x71,
-0x01, 0x13, 0x2c, 0xbf, 0x03, 0x04, 0xc2, 0x00, 0x00, 0x41,
-0x00, 0x01, 0x5c, 0x02, 0x40, 0x6e, 0x6f, 0x74, 0x65, 0xeb,
-0x00, 0x10, 0x79, 0xf1, 0x03, 0x32, 0x65, 0x6c, 0x66, 0x35,
-0x00, 0x00, 0x27, 0x00, 0x58, 0x74, 0x68, 0x69, 0x6e, 0x6b,
-0x52, 0x00, 0x11, 0x6d, 0x7d, 0x00, 0x28, 0x62, 0x65, 0x58,
-0x00, 0x34, 0x2e, 0x00, 0x41, 0x1f, 0x00, 0x00, 0x57, 0x00,
-0x00, 0x54, 0x02, 0x00, 0xee, 0x02, 0x03, 0x90, 0x00, 0x10,
-0x73, 0x86, 0x00, 0x74, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70,
-0x6c, 0xf4, 0x03, 0x01, 0xad, 0x01, 0x00, 0x96, 0x03, 0x10,
-0x2e, 0xee, 0x01, 0x02, 0x8b, 0x01, 0x41, 0x6f, 0x66, 0x74,
-0x65, 0x94, 0x00, 0x41, 0x66, 0x75, 0x6c, 0x00, 0xa3, 0x01,
-0x00, 0xd7, 0x01, 0x01, 0xa8, 0x04, 0x20, 0x64, 0x69, 0x0f,
-0x05, 0xd3, 0x75, 0x6c, 0x74, 0x79, 0x00, 0x6c, 0x65, 0x76,
-0x65, 0x6c, 0x73, 0x2e, 0x29, 0x19, 0x06, 0x00, 0x70, 0x00,
-0x01, 0x04, 0x03, 0x22, 0x75, 0x73, 0xf9, 0x00, 0xb1, 0x63,
-0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73,
-0x5b, 0x03, 0x20, 0x6f, 0x76, 0x6a, 0x01, 0x00, 0x7d, 0x01,
-0x01, 0x1f, 0x00, 0x42, 0x6d, 0x61, 0x70, 0x3a, 0x28, 0x00,
-0x02, 0x56, 0x01, 0x28, 0x6f, 0x66, 0x36, 0x00, 0x92, 0x69,
-0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0xba, 0x01,
-0x34, 0x6f, 0x73, 0x69, 0x59, 0x04, 0x07, 0x33, 0x00, 0x00,
-0x17, 0x01, 0x43, 0x77, 0x6f, 0x75, 0x6c, 0xd1, 0x02, 0x12,
-0x28, 0x54, 0x01, 0x20, 0x69, 0x73, 0x46, 0x01, 0xa1, 0x00,
-0x6f, 0x62, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x69, 0x44,
-0x02, 0x31, 0x27, 0x72, 0x65, 0x26, 0x03, 0x03, 0x1e, 0x01,
-0x25, 0x27, 0x73, 0x07, 0x02, 0x70, 0x2c, 0x00, 0x73, 0x69,
-0x6e, 0x63, 0x65, 0xb1, 0x04, 0x70, 0x64, 0x65, 0x70, 0x65,
-0x6e, 0x64, 0x73, 0x29, 0x00, 0x01, 0x39, 0x03, 0x41, 0x69,
-0x72, 0x65, 0x63, 0x77, 0x00, 0x01, 0x43, 0x02, 0x06, 0xb2,
-0x01, 0x92, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x61, 0x63, 0x68,
-0x65, 0xca, 0x00, 0x04, 0x4a, 0x00, 0x76, 0x29, 0x2e, 0x00,
-0x50, 0x72, 0x65, 0x73, 0x1e, 0x02, 0x50, 0x65, 0x74, 0x75,
-0x72, 0x6e, 0x01, 0x01, 0x02, 0x25, 0x03, 0x00, 0xe0, 0x01,
-0x01, 0xa9, 0x00, 0x2a, 0x6f, 0x66, 0x0c, 0x02, 0x00, 0xfa,
-0x01, 0x49, 0x62, 0x6f, 0x76, 0x65, 0x16, 0x02, 0x02, 0x0f,
-0x04, 0x02, 0xa4, 0x06, 0x0b, 0x4f, 0x01, 0x3f, 0x3b, 0x00,
-0x70, 0x68, 0x00, 0x04, 0x20, 0x61, 0x67, 0xef, 0x01, 0x63,
-0x66, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x3c, 0x01, 0x00, 0x72,
-0x00, 0x02, 0x7d, 0x05, 0x91, 0x73, 0x70, 0x61, 0x63, 0x65,
-0x00, 0x62, 0x61, 0x72, 0xac, 0x01, 0x20, 0x62, 0x65, 0xaa,
-0x01, 0xb1, 0x64, 0x00, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61,
-0x72, 0x6c, 0x79, 0x62, 0x03, 0x40, 0x72, 0x65, 0x61, 0x74,
-0xa1, 0x06, 0x03, 0x32, 0x02, 0x15, 0x64, 0x0d, 0x04, 0x7f,
-0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x2d, 0x79, 0x00, 0x05,
-0x30, 0x28, 0x77, 0x69, 0x50, 0x05, 0x10, 0x74, 0xe7, 0x01,
-0x04, 0x1f, 0x00, 0x02, 0xb2, 0x00, 0x12, 0x29, 0x13, 0x03,
-0x02, 0xbc, 0x03, 0x06, 0xbf, 0x02, 0x02, 0xf6, 0x00, 0x0f,
-0xbb, 0x03, 0x07, 0x65, 0x00, 0x64, 0x6f, 0x65, 0x73, 0x3a,
-0x1e, 0x04, 0x03, 0x8d, 0x02, 0x0c, 0x0e, 0x01, 0x43, 0x6d,
-0x6f, 0x64, 0x65, 0xe2, 0x01, 0x02, 0xf5, 0x07, 0x43, 0x66,
-0x69, 0x6c, 0x6c, 0x97, 0x01, 0x51, 0x65, 0x6e, 0x74, 0x69,
-0x72, 0x68, 0x02, 0x00, 0xf7, 0x02, 0x36, 0x62, 0x75, 0x74,
-0x48, 0x04, 0x20, 0x6f, 0x72, 0xda, 0x01, 0x02, 0x4d, 0x05,
-0x66, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x2e, 0x6d, 0x04, 0x01,
-0xe2, 0x00, 0x43, 0x00, 0x4c, 0x00, 0x64, 0x96, 0x06, 0x41,
-0x6c, 0x61, 0x79, 0x2c, 0x2a, 0x00, 0x10, 0x67, 0x29, 0x07,
-0x01, 0xcc, 0x00, 0x50, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x20,
-0x02, 0x10, 0x73, 0x1e, 0x00, 0x09, 0xf8, 0x08, 0x29, 0x69,
-0x6e, 0xd8, 0x08, 0x24, 0x6f, 0x66, 0xec, 0x02, 0x00, 0x83,
-0x01, 0x09, 0xcb, 0x00, 0x03, 0xb6, 0x00, 0x22, 0x77, 0x61,
-0x5a, 0x08, 0x60, 0x64, 0x69, 0x73, 0x63, 0x75, 0x73, 0x13,
-0x01, 0x10, 0x70, 0x50, 0x05, 0x55, 0x63, 0x75, 0x6c, 0x61,
-0x72, 0x7e, 0x07, 0x40, 0x6e, 0x73, 0x74, 0x61, 0xa4, 0x02,
-0x01, 0xff, 0x00, 0xa0, 0x61, 0x00, 0x66, 0x72, 0x69, 0x65,
-0x6e, 0x64, 0x00, 0x2d, 0xf3, 0x00, 0x01, 0x9a, 0x04, 0x00,
-0x76, 0x08, 0x60, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75, 0xf2,
-0x02, 0x10, 0x6e, 0xa9, 0x00, 0x2a, 0x66, 0x6f, 0x62, 0x09,
-0x40, 0x69, 0x73, 0x00, 0x6d, 0x48, 0x09, 0x60, 0x65, 0x61,
-0x73, 0x69, 0x65, 0x72, 0x80, 0x02, 0x51, 0x6e, 0x00, 0x74,
-0x72, 0x79, 0xac, 0x01, 0x00, 0x55, 0x08, 0x10, 0x66, 0x15,
-0x00, 0x01, 0x04, 0x06, 0x50, 0x6d, 0x00, 0x61, 0x6c, 0x6c,
-0x79, 0x07, 0x00, 0x48, 0x00, 0x13, 0x73, 0x7e, 0x09, 0x30,
-0x73, 0x00, 0x60, 0xc9, 0x00, 0x00, 0xd0, 0x05, 0x41, 0x64,
-0x6f, 0x77, 0x6e, 0x46, 0x06, 0x02, 0xfe, 0x04, 0x03, 0xe3,
-0x00, 0x20, 0x62, 0x72, 0x17, 0x00, 0x01, 0xc3, 0x09, 0x12,
-0x6e, 0x68, 0x07, 0x23, 0x6f, 0x70, 0xdd, 0x08, 0x11, 0x27,
-0x4b, 0x06, 0x31, 0x41, 0x6c, 0x6c, 0x18, 0x00, 0x21, 0x61,
-0x63, 0xfc, 0x06, 0x00, 0x97, 0x06, 0x61, 0x63, 0x72, 0x69,
-0x62, 0x65, 0x64, 0xe3, 0x09, 0x03, 0x69, 0x03, 0x31, 0x32,
-0x2e, 0x31, 0x8e, 0x05, 0x01, 0x49, 0x04, 0x50, 0x61, 0x76,
-0x61, 0x69, 0x6c, 0x6b, 0x07, 0x22, 0x2e, 0x29, 0x29, 0x07,
-0x11, 0x32, 0x29, 0x07, 0x00, 0xc5, 0x08, 0x52, 0x6d, 0x65,
-0x74, 0x65, 0x72, 0x2b, 0x07, 0x56, 0x68, 0x65, 0x73, 0x65,
-0x00, 0x14, 0x00, 0x02, 0x3f, 0x00, 0x04, 0x3a, 0x00, 0x06,
-0xfd, 0x05, 0xe2, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x4d, 0x04, 0x12,
-0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0xa9, 0x00, 0x91, 0x57, 0x69, 0x64,
-0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xde, 0x00, 0x51, 0x00,
-0x00, 0x53, 0x69, 0x7a, 0x97, 0x0a, 0x32, 0x67, 0x72, 0x69,
-0xab, 0x00, 0x51, 0x71, 0x75, 0x61, 0x72, 0x65, 0xbc, 0x07,
-0x13, 0x52, 0x2b, 0x06, 0x3c, 0x00, 0x00, 0x4e, 0xf6, 0x0a,
-0x22, 0x00, 0x69, 0x5d, 0x00, 0x41, 0x67, 0x65, 0x6e, 0x65,
-0x74, 0x09, 0x02, 0x04, 0x02, 0x36, 0x00, 0x00, 0x44, 0x41,
-0x05, 0xb1, 0x00, 0x00, 0x49, 0x6e, 0x00, 0x60, 0x45, 0x61,
-0x73, 0x79, 0x27, 0xc9, 0x02, 0x13, 0x2c, 0x8f, 0x06, 0x21,
-0x73, 0x68, 0xd4, 0x04, 0x03, 0x11, 0x07, 0x2f, 0x62, 0x65,
-0x4f, 0x07, 0x02, 0x45, 0x77, 0x68, 0x6f, 0x73, 0x09, 0x05,
-0x03, 0xd0, 0x03, 0x10, 0x64, 0x02, 0x01, 0x30, 0x6d, 0x69,
-0x6e, 0xe6, 0x02, 0x40, 0x72, 0x69, 0x76, 0x69, 0xf6, 0x09,
-0x11, 0x2e, 0x65, 0x00, 0x71, 0x4e, 0x6f, 0x72, 0x6d, 0x61,
-0x6c, 0x27, 0xb7, 0x01, 0x52, 0x60, 0x48, 0x61, 0x72, 0x64,
-0x72, 0x00, 0x12, 0x73, 0x44, 0x07, 0x01, 0xd5, 0x02, 0x02,
-0x34, 0x0b, 0x02, 0xbf, 0x05, 0x20, 0x69, 0x6e, 0x09, 0x04,
-0x00, 0xe8, 0x03, 0x10, 0x6c, 0x0c, 0x0b, 0x00, 0xdd, 0x09,
-0x71, 0x78, 0x00, 0x6c, 0x6f, 0x67, 0x69, 0x63, 0xab, 0x02,
-0x5b, 0x65, 0x64, 0x75, 0x63, 0x65, 0xbc, 0x05, 0x08, 0x47,
-0x0b, 0x50, 0x2e, 0x00, 0x48, 0x6f, 0x77, 0x20, 0x0a, 0x10,
-0x2c, 0x56, 0x05, 0x08, 0x38, 0x08, 0x25, 0x62, 0x65, 0xe1,
-0x07, 0x14, 0x00, 0x32, 0x04, 0x03, 0xc5, 0x02, 0x70, 0x74,
-0x6f, 0x00, 0x67, 0x75, 0x65, 0x73, 0x69, 0x0a, 0xb3, 0x00,
-0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x2e,
-0x25, 0x01, 0x20, 0x55, 0x6e, 0x90, 0x00, 0x20, 0x6f, 0x6e,
-0xd4, 0x01, 0x07, 0x2d, 0x01, 0x0a, 0x9c, 0x08, 0x81, 0x66,
-0x65, 0x65, 0x6c, 0x00, 0x66, 0x72, 0x65, 0xc7, 0x00, 0x04,
-0x79, 0x01, 0x03, 0x44, 0x03, 0x04, 0x30, 0x0b, 0x01, 0x1e,
-0x02, 0x11, 0x73, 0xce, 0x06, 0x00, 0x08, 0x00, 0x21, 0x69,
-0x74, 0x3c, 0x01, 0x03, 0x94, 0x00, 0x15, 0x79, 0xe0, 0x0b,
-0x12, 0x6d, 0x9b, 0x06, 0x01, 0x56, 0x0b, 0x00, 0xe2, 0x0c,
-0x01, 0x35, 0x0a, 0x11, 0x74, 0xc0, 0x0c, 0x12, 0x68, 0x11,
-0x07, 0x14, 0x79, 0xa7, 0x01, 0x25, 0x73, 0x74, 0x3e, 0x01,
-0x13, 0x61, 0xfd, 0x0b, 0x05, 0x0d, 0x0c, 0x51, 0x2e, 0x00,
-0x53, 0x6f, 0x6c, 0xde, 0x00, 0x08, 0xc1, 0x00, 0x05, 0x93,
-0x00, 0x00, 0x86, 0x0b, 0x03, 0xf5, 0x0b, 0x02, 0xfc, 0x00,
-0x02, 0xcd, 0x03, 0x16, 0x64, 0x00, 0x01, 0x50, 0x69, 0x6e,
-0x67, 0x2e, 0x00,
+0xfa, 0x03, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0x32, 0x32, 0x3a, 0x20, 0x4d, 0x61, 0x70, 0x20, 0x00, 0x2d,
+0x01, 0x00, 0xf0, 0x1e, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75,
+0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e,
+0x00, 0x61, 0x00, 0x6d, 0x61, 0x70, 0x00, 0x63, 0x6f, 0x6e,
+0x73, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x6f, 0x66,
+0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x0c,
+0x00, 0x80, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x2e,
+0x37, 0x00, 0xf0, 0x01, 0x72, 0x00, 0x74, 0x61, 0x73, 0x6b,
+0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f, 0x6c,
+0x12, 0x00, 0x43, 0x65, 0x61, 0x63, 0x68, 0x25, 0x00, 0x90,
+0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x6f, 0x6e, 0x65, 0x38,
+0x00, 0x10, 0x66, 0x1d, 0x00, 0x02, 0x24, 0x00, 0xf4, 0x0d,
+0x73, 0x2c, 0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68,
+0x00, 0x61, 0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61,
+0x74, 0x00, 0x6e, 0x6f, 0x00, 0x74, 0x77, 0x6f, 0x60, 0x00,
+0x50, 0x00, 0x73, 0x68, 0x61, 0x72, 0x7f, 0x00, 0xf3, 0x09,
+0x61, 0x00, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x79,
+0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x74, 0x68, 0x65, 0x00,
+0x73, 0x61, 0x6d, 0x65, 0x4c, 0x00, 0x15, 0x2e, 0xbf, 0x00,
+0x82, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x76,
+0x00, 0x45, 0x73, 0x6f, 0x6d, 0x65, 0x4c, 0x00, 0x73, 0x61,
+0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x33, 0x00, 0xe0, 0x65,
+0x64, 0x2c, 0x00, 0x73, 0x75, 0x66, 0x66, 0x69, 0x63, 0x69,
+0x65, 0x6e, 0x74, 0xbb, 0x00, 0x32, 0x6d, 0x61, 0x6b, 0x59,
+0x00, 0x72, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x64, 0xea,
+0x00, 0x01, 0x6a, 0x00, 0x40, 0x6f, 0x6c, 0x75, 0x74, 0xcb,
+0x00, 0xb0, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x2c, 0x00,
+0x61, 0x6e, 0x64, 0x19, 0x00, 0xf5, 0x0d, 0x73, 0x65, 0x00,
+0x63, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x00, 0x62, 0x65, 0x00,
+0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x2e, 0x00, 0x00,
+0x00, 0x4f, 0x6e, 0x6c, 0x79, 0x77, 0x00, 0x51, 0x77, 0x68,
+0x69, 0x63, 0x68, 0xc9, 0x00, 0xa0, 0x65, 0x00, 0x61, 0x00,
+0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x59, 0x00, 0x30, 0x62,
+0x6f, 0x72, 0x63, 0x00, 0x20, 0x61, 0x72, 0x71, 0x00, 0x60,
+0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x86, 0x00, 0x90, 0x62,
+0x65, 0x00, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x96, 0x00,
+0x03, 0x2a, 0x01, 0x5b, 0x2e, 0x00, 0x54, 0x77, 0x6f, 0x51,
+0x00, 0x90, 0x6d, 0x65, 0x65, 0x74, 0x00, 0x61, 0x74, 0x00,
+0x6f, 0x6c, 0x00, 0x00, 0x5e, 0x01, 0xb1, 0x70, 0x6f, 0x69,
+0x6e, 0x74, 0x00, 0x28, 0x69, 0x2e, 0x65, 0x2e, 0x55, 0x00,
+0xff, 0x0c, 0x64, 0x69, 0x61, 0x67, 0x6f, 0x6e, 0x61, 0x6c,
+0x6c, 0x79, 0x00, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74,
+0x65, 0x64, 0x29, 0x00, 0x6d, 0x61, 0x79, 0x00, 0x62, 0x40,
+0x01, 0x00, 0x91, 0x00, 0x00, 0x49, 0x00, 0x62, 0x65, 0x6c,
+0x69, 0x65, 0x5d, 0x01, 0x90, 0x69, 0x73, 0x00, 0x70, 0x75,
+0x7a, 0x7a, 0x6c, 0x65, 0xd6, 0x01, 0xf0, 0x08, 0x6f, 0x72,
+0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x3b, 0x00, 0x49, 0x27,
+0x76, 0x65, 0x00, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x00, 0x73,
+0x65, 0x26, 0x02, 0xc1, 0x6e, 0x00, 0x69, 0x6d, 0x70, 0x6c,
+0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x21, 0x01, 0xf0, 0x09,
+0x6f, 0x66, 0x00, 0x69, 0x74, 0x00, 0x61, 0x6e, 0x79, 0x77,
+0x68, 0x65, 0x72, 0x65, 0x00, 0x65, 0x6c, 0x73, 0x65, 0x2e,
+0x00, 0x54, 0x68, 0x65, 0x4b, 0x02, 0x42, 0x63, 0x65, 0x70,
+0x74, 0x48, 0x02, 0x00, 0x06, 0x02, 0x12, 0x2d, 0x7a, 0x00,
+0x00, 0xdd, 0x01, 0x03, 0x6b, 0x00, 0xf0, 0x26, 0x77, 0x61,
+0x73, 0x00, 0x73, 0x75, 0x67, 0x67, 0x65, 0x73, 0x74, 0x65,
+0x64, 0x00, 0x62, 0x79, 0x00, 0x41, 0x6c, 0x65, 0x78, 0x61,
+0x6e, 0x64, 0x72, 0x61, 0x00, 0x4c, 0x61, 0x6e, 0x65, 0x73,
+0x3b, 0x00, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x6d,
+0x75, 0x73, 0x74, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x67,
+0x6f, 0x33, 0x01, 0x62, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69,
+0x95, 0x01, 0x70, 0x6f, 0x00, 0x56, 0x65, 0x72, 0x69, 0x74,
+0x3d, 0x00, 0xd1, 0x6c, 0x61, 0x6e, 0x00, 0x66, 0x6f, 0x72,
+0x00, 0x69, 0x6e, 0x73, 0x70, 0x69, 0x69, 0x00, 0x00, 0xf6,
+0x00, 0x52, 0x74, 0x72, 0x61, 0x69, 0x6e, 0xd9, 0x01, 0x52,
+0x6f, 0x75, 0x67, 0x68, 0x74, 0x77, 0x02, 0x12, 0x6c, 0x7d,
+0x01, 0x01, 0x2e, 0x02, 0x40, 0x61, 0x6c, 0x69, 0x73, 0x2e,
+0x00, 0x00, 0x7f, 0x00, 0x15, 0x27, 0x93, 0x00, 0x01, 0xca,
+0x02, 0xb3, 0x61, 0x73, 0x00, 0x61, 0x00, 0x76, 0x69, 0x61,
+0x62, 0x6c, 0x65, 0xb6, 0x00, 0x00, 0xde, 0x00, 0x42, 0x61,
+0x6e, 0x6b, 0x73, 0x90, 0x00, 0xf1, 0x01, 0x74, 0x6f, 0x00,
+0x47, 0x61, 0x72, 0x65, 0x74, 0x68, 0x00, 0x54, 0x61, 0x79,
+0x6c, 0x6f, 0x72, 0x80, 0x00, 0xa0, 0x6d, 0x61, 0x6e, 0x79,
+0x00, 0x64, 0x65, 0x74, 0x61, 0x69, 0x66, 0x00, 0x06, 0x4f,
+0x00, 0x10, 0x73, 0x76, 0x01, 0x41, 0x32, 0x32, 0x2e, 0x31,
+0x93, 0x03, 0xd5, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x48, 0x03, 0x13, 0x61,
+0xf6, 0x01, 0x71, 0x2c, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b,
+0xc2, 0x00, 0xf0, 0x00, 0x6c, 0x65, 0x66, 0x74, 0x00, 0x6d,
+0x6f, 0x75, 0x73, 0x65, 0x00, 0x62, 0x75, 0x74, 0x74, 0x76,
+0x01, 0x01, 0x8b, 0x01, 0x23, 0x65, 0x78, 0xac, 0x03, 0x03,
+0x78, 0x03, 0x03, 0xbd, 0x02, 0x31, 0x64, 0x65, 0x73, 0x5c,
+0x02, 0x04, 0x52, 0x00, 0x72, 0x6e, 0x64, 0x00, 0x64, 0x72,
+0x61, 0x67, 0xf8, 0x00, 0x03, 0x15, 0x00, 0x41, 0x69, 0x6e,
+0x74, 0x6f, 0x2d, 0x00, 0x33, 0x6e, 0x65, 0x77, 0x3f, 0x00,
+0x00, 0x9d, 0x00, 0x31, 0x28, 0x54, 0x68, 0x52, 0x03, 0xf3,
+0x07, 0x67, 0x72, 0x61, 0x6d, 0x00, 0x77, 0x69, 0x6c, 0x6c,
+0x00, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x00, 0x65, 0x6e,
+0x73, 0x75, 0x72, 0x46, 0x02, 0x47, 0x74, 0x61, 0x72, 0x74,
+0xc6, 0x01, 0x10, 0x68, 0x24, 0x01, 0x00, 0x51, 0x01, 0x31,
+0x61, 0x73, 0x74, 0x98, 0x02, 0x06, 0x8e, 0x00, 0x01, 0x15,
+0x04, 0x02, 0x72, 0x00, 0x42, 0x2c, 0x00, 0x73, 0x6f, 0x82,
+0x00, 0x01, 0x6d, 0x02, 0x24, 0x69, 0x73, 0x5a, 0x00, 0xa0,
+0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x21, 0x29,
+0x93, 0x02, 0x82, 0x66, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x6e,
+0x65, 0x9e, 0x01, 0x48, 0x63, 0x6c, 0x65, 0x61, 0x13, 0x01,
+0x00, 0x1c, 0x00, 0x32, 0x63, 0x61, 0x6e, 0xcf, 0x00, 0x41,
+0x66, 0x72, 0x6f, 0x6d, 0x06, 0x01, 0x45, 0x6d, 0x70, 0x74,
+0x79, 0x23, 0x00, 0x22, 0x6f, 0x72, 0x19, 0x00, 0x24, 0x74,
+0x68, 0xb1, 0x01, 0x06, 0x49, 0x04, 0x11, 0x69, 0x20, 0x01,
+0x21, 0x72, 0x65, 0x2e, 0x03, 0x29, 0x6e, 0x6f, 0x3a, 0x00,
+0x11, 0x73, 0x66, 0x01, 0x00, 0x04, 0x01, 0x52, 0x44, 0x72,
+0x61, 0x67, 0x67, 0x83, 0x04, 0x03, 0x2d, 0x01, 0x24, 0x75,
+0x73, 0x4c, 0x02, 0x4b, 0x72, 0x69, 0x67, 0x68, 0x8b, 0x01,
+0x01, 0x26, 0x01, 0x64, 0x73, 0x74, 0x69, 0x70, 0x70, 0x6c,
+0x4d, 0x04, 0x01, 0xff, 0x00, 0x28, 0x69, 0x6e, 0x71, 0x01,
+0x13, 0x2c, 0xc5, 0x03, 0x04, 0xc2, 0x00, 0x00, 0x41, 0x00,
+0x01, 0x5c, 0x02, 0x40, 0x6e, 0x6f, 0x74, 0x65, 0xeb, 0x00,
+0x10, 0x79, 0xf7, 0x03, 0x32, 0x65, 0x6c, 0x66, 0x35, 0x00,
+0x00, 0x27, 0x00, 0x58, 0x74, 0x68, 0x69, 0x6e, 0x6b, 0x52,
+0x00, 0x11, 0x6d, 0x7d, 0x00, 0x28, 0x62, 0x65, 0x58, 0x00,
+0x34, 0x2e, 0x00, 0x41, 0x1f, 0x00, 0x00, 0x57, 0x00, 0x00,
+0x54, 0x02, 0x00, 0xee, 0x02, 0x03, 0x90, 0x00, 0x10, 0x73,
+0x86, 0x00, 0x74, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c,
+0xfa, 0x03, 0x01, 0xad, 0x01, 0x00, 0x9c, 0x03, 0x10, 0x2e,
+0xee, 0x01, 0x02, 0x8b, 0x01, 0x41, 0x6f, 0x66, 0x74, 0x65,
+0x94, 0x00, 0x41, 0x66, 0x75, 0x6c, 0x00, 0xa3, 0x01, 0x00,
+0xd7, 0x01, 0x01, 0xae, 0x04, 0x20, 0x64, 0x69, 0x32, 0x05,
+0xd3, 0x75, 0x6c, 0x74, 0x79, 0x00, 0x6c, 0x65, 0x76, 0x65,
+0x6c, 0x73, 0x2e, 0x29, 0x3c, 0x06, 0x00, 0x70, 0x00, 0x01,
+0x04, 0x03, 0x22, 0x75, 0x73, 0xf9, 0x00, 0xb1, 0x63, 0x75,
+0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x5b,
+0x03, 0x20, 0x6f, 0x76, 0x6a, 0x01, 0x22, 0x6f, 0x75, 0x3b,
+0x05, 0x00, 0x60, 0x06, 0x12, 0x3a, 0x28, 0x00, 0x02, 0x56,
+0x01, 0x28, 0x6f, 0x66, 0x36, 0x00, 0x92, 0x69, 0x6e, 0x64,
+0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0xba, 0x01, 0x34, 0x6f,
+0x73, 0x69, 0x5f, 0x04, 0x07, 0x33, 0x00, 0x00, 0x17, 0x01,
+0x43, 0x77, 0x6f, 0x75, 0x6c, 0xd1, 0x02, 0x12, 0x28, 0x54,
+0x01, 0x30, 0x69, 0x73, 0x00, 0x92, 0x05, 0x91, 0x6f, 0x62,
+0x76, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x69, 0x44, 0x02, 0x31,
+0x27, 0x72, 0x65, 0x26, 0x03, 0x03, 0x1e, 0x01, 0x25, 0x27,
+0x73, 0x07, 0x02, 0x70, 0x2c, 0x00, 0x73, 0x69, 0x6e, 0x63,
+0x65, 0xb7, 0x04, 0x70, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64,
+0x73, 0x29, 0x00, 0x01, 0x39, 0x03, 0x41, 0x69, 0x72, 0x65,
+0x63, 0x77, 0x00, 0x01, 0x43, 0x02, 0x06, 0xb2, 0x01, 0x92,
+0x61, 0x70, 0x70, 0x72, 0x6f, 0x61, 0x63, 0x68, 0x65, 0xca,
+0x00, 0x04, 0x4a, 0x00, 0x76, 0x29, 0x2e, 0x00, 0x50, 0x72,
+0x65, 0x73, 0x1e, 0x02, 0x50, 0x65, 0x74, 0x75, 0x72, 0x6e,
+0x01, 0x01, 0x02, 0x25, 0x03, 0x00, 0xe0, 0x01, 0x01, 0xa9,
+0x00, 0x2a, 0x6f, 0x66, 0x0c, 0x02, 0x00, 0xfa, 0x01, 0x49,
+0x62, 0x6f, 0x76, 0x65, 0x16, 0x02, 0x02, 0x0f, 0x04, 0x02,
+0xc7, 0x06, 0x0b, 0x4f, 0x01, 0x3f, 0x3b, 0x00, 0x70, 0x68,
+0x00, 0x04, 0x20, 0x61, 0x67, 0xef, 0x01, 0x63, 0x66, 0x69,
+0x6e, 0x69, 0x73, 0x68, 0x3c, 0x01, 0x00, 0x72, 0x00, 0x02,
+0x83, 0x05, 0x91, 0x73, 0x70, 0x61, 0x63, 0x65, 0x00, 0x62,
+0x61, 0x72, 0xac, 0x01, 0x20, 0x62, 0x65, 0xaa, 0x01, 0xb1,
+0x64, 0x00, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x6c,
+0x79, 0x62, 0x03, 0x40, 0x72, 0x65, 0x61, 0x74, 0xa7, 0x06,
+0x03, 0x32, 0x02, 0x15, 0x64, 0x0d, 0x04, 0x7f, 0x44, 0x6f,
+0x75, 0x62, 0x6c, 0x65, 0x2d, 0x79, 0x00, 0x05, 0x30, 0x28,
+0x77, 0x69, 0x50, 0x05, 0x10, 0x74, 0xe7, 0x01, 0x04, 0x1f,
+0x00, 0x02, 0xb2, 0x00, 0x12, 0x29, 0x13, 0x03, 0x02, 0xbc,
+0x03, 0x06, 0xbf, 0x02, 0x02, 0xf6, 0x00, 0x0f, 0xbb, 0x03,
+0x07, 0x65, 0x00, 0x64, 0x6f, 0x65, 0x73, 0x3a, 0x1e, 0x04,
+0x03, 0x8d, 0x02, 0x0c, 0x0e, 0x01, 0x43, 0x6d, 0x6f, 0x64,
+0x65, 0xe2, 0x01, 0x02, 0x18, 0x08, 0x43, 0x66, 0x69, 0x6c,
+0x6c, 0x97, 0x01, 0x51, 0x65, 0x6e, 0x74, 0x69, 0x72, 0x68,
+0x02, 0x00, 0xf7, 0x02, 0x36, 0x62, 0x75, 0x74, 0x48, 0x04,
+0x20, 0x6f, 0x72, 0xda, 0x01, 0x02, 0x4d, 0x05, 0x66, 0x61,
+0x79, 0x6f, 0x75, 0x74, 0x2e, 0x6d, 0x04, 0x01, 0xe2, 0x00,
+0x43, 0x00, 0x4c, 0x00, 0x64, 0x9c, 0x06, 0x41, 0x6c, 0x61,
+0x79, 0x2c, 0x2a, 0x00, 0x10, 0x67, 0x2f, 0x07, 0x01, 0xcc,
+0x00, 0x50, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x20, 0x02, 0x10,
+0x73, 0x1e, 0x00, 0x09, 0x1b, 0x09, 0x29, 0x69, 0x6e, 0xfb,
+0x08, 0x24, 0x6f, 0x66, 0xec, 0x02, 0x00, 0x83, 0x01, 0x09,
+0xcb, 0x00, 0x03, 0xb6, 0x00, 0x22, 0x77, 0x61, 0x7d, 0x08,
+0x60, 0x64, 0x69, 0x73, 0x63, 0x75, 0x73, 0x13, 0x01, 0x10,
+0x70, 0x50, 0x05, 0x55, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x84,
+0x07, 0x40, 0x6e, 0x73, 0x74, 0x61, 0xa4, 0x02, 0x01, 0xff,
+0x00, 0xa0, 0x61, 0x00, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
+0x00, 0x2d, 0xf3, 0x00, 0x01, 0x9a, 0x04, 0x00, 0x99, 0x08,
+0x60, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75, 0xf2, 0x02, 0x10,
+0x6e, 0xa9, 0x00, 0x2a, 0x66, 0x6f, 0x85, 0x09, 0x40, 0x69,
+0x73, 0x00, 0x6d, 0x6b, 0x09, 0x60, 0x65, 0x61, 0x73, 0x69,
+0x65, 0x72, 0x80, 0x02, 0x51, 0x6e, 0x00, 0x74, 0x72, 0x79,
+0xac, 0x01, 0x00, 0x5b, 0x08, 0x10, 0x66, 0x15, 0x00, 0x01,
+0x04, 0x06, 0x50, 0x6d, 0x00, 0x61, 0x6c, 0x6c, 0x7f, 0x07,
+0x00, 0x48, 0x00, 0x13, 0x73, 0xa1, 0x09, 0x30, 0x73, 0x00,
+0x60, 0xc9, 0x00, 0x00, 0xd0, 0x05, 0x41, 0x64, 0x6f, 0x77,
+0x6e, 0x46, 0x06, 0x02, 0xfe, 0x04, 0x03, 0xe3, 0x00, 0x20,
+0x62, 0x72, 0x17, 0x00, 0x01, 0xe6, 0x09, 0x12, 0x6e, 0x68,
+0x07, 0x23, 0x6f, 0x70, 0xe3, 0x08, 0x11, 0x27, 0x4b, 0x06,
+0x31, 0x41, 0x6c, 0x6c, 0x18, 0x00, 0x21, 0x61, 0x63, 0xfc,
+0x06, 0x00, 0x97, 0x06, 0x61, 0x63, 0x72, 0x69, 0x62, 0x65,
+0x64, 0x06, 0x0a, 0x03, 0x69, 0x03, 0x31, 0x32, 0x2e, 0x31,
+0x8e, 0x05, 0x01, 0x49, 0x04, 0x50, 0x61, 0x76, 0x61, 0x69,
+0x6c, 0x6b, 0x07, 0x22, 0x2e, 0x29, 0x29, 0x07, 0x11, 0x32,
+0x29, 0x07, 0x00, 0xcb, 0x08, 0x52, 0x6d, 0x65, 0x74, 0x65,
+0x72, 0x2b, 0x07, 0x01, 0x86, 0x09, 0x06, 0x14, 0x00, 0x02,
+0x3f, 0x00, 0x04, 0x3a, 0x00, 0x06, 0xfd, 0x05, 0xe2, 0x60,
+0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
+0x00, 0x6f, 0x70, 0x4d, 0x04, 0x12, 0x6e, 0x1a, 0x00, 0xa0,
+0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
+0xa9, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
+0x48, 0x65, 0xde, 0x00, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a,
+0xba, 0x0a, 0x32, 0x67, 0x72, 0x69, 0xab, 0x00, 0x51, 0x71,
+0x75, 0x61, 0x72, 0x65, 0xbc, 0x07, 0x13, 0x52, 0x2b, 0x06,
+0x3c, 0x00, 0x00, 0x4e, 0x19, 0x0b, 0x22, 0x00, 0x69, 0x5d,
+0x00, 0x41, 0x67, 0x65, 0x6e, 0x65, 0x7a, 0x09, 0x02, 0x04,
+0x02, 0x36, 0x00, 0x00, 0x44, 0x41, 0x05, 0xb1, 0x00, 0x00,
+0x49, 0x6e, 0x00, 0x60, 0x45, 0x61, 0x73, 0x79, 0x27, 0xc9,
+0x02, 0x13, 0x2c, 0x8f, 0x06, 0x21, 0x73, 0x68, 0xd4, 0x04,
+0x03, 0x11, 0x07, 0x2f, 0x62, 0x65, 0x4f, 0x07, 0x02, 0x45,
+0x77, 0x68, 0x6f, 0x73, 0x09, 0x05, 0x03, 0xd0, 0x03, 0x10,
+0x64, 0x02, 0x01, 0x30, 0x6d, 0x69, 0x6e, 0xe6, 0x02, 0x40,
+0x72, 0x69, 0x76, 0x69, 0xfc, 0x09, 0x11, 0x2e, 0x65, 0x00,
+0x71, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x27, 0xb7, 0x01,
+0x52, 0x60, 0x48, 0x61, 0x72, 0x64, 0x72, 0x00, 0x12, 0x73,
+0x44, 0x07, 0x01, 0xd5, 0x02, 0x02, 0x57, 0x0b, 0x02, 0xbf,
+0x05, 0x20, 0x69, 0x6e, 0x09, 0x04, 0x00, 0xe8, 0x03, 0x10,
+0x6c, 0x2f, 0x0b, 0x00, 0xe3, 0x09, 0x71, 0x78, 0x00, 0x6c,
+0x6f, 0x67, 0x69, 0x63, 0xab, 0x02, 0x5b, 0x65, 0x64, 0x75,
+0x63, 0x65, 0xbc, 0x05, 0x08, 0x6a, 0x0b, 0x50, 0x2e, 0x00,
+0x48, 0x6f, 0x77, 0x26, 0x0a, 0x10, 0x2c, 0x56, 0x05, 0x08,
+0x38, 0x08, 0x25, 0x62, 0x65, 0xe1, 0x07, 0x14, 0x00, 0x32,
+0x04, 0x03, 0xc5, 0x02, 0x70, 0x74, 0x6f, 0x00, 0x67, 0x75,
+0x65, 0x73, 0x6f, 0x0a, 0xb3, 0x00, 0x62, 0x61, 0x63, 0x6b,
+0x74, 0x72, 0x61, 0x63, 0x6b, 0x2e, 0x25, 0x01, 0x20, 0x55,
+0x6e, 0x90, 0x00, 0x20, 0x6f, 0x6e, 0xd4, 0x01, 0x07, 0x2d,
+0x01, 0x0a, 0x9c, 0x08, 0x81, 0x66, 0x65, 0x65, 0x6c, 0x00,
+0x66, 0x72, 0x65, 0xc7, 0x00, 0x04, 0x79, 0x01, 0x03, 0x44,
+0x03, 0x04, 0x36, 0x0b, 0x01, 0x1e, 0x02, 0x11, 0x73, 0xce,
+0x06, 0x00, 0x08, 0x00, 0x21, 0x69, 0x74, 0x3c, 0x01, 0x03,
+0x94, 0x00, 0x15, 0x79, 0x03, 0x0c, 0x12, 0x6d, 0x9b, 0x06,
+0x01, 0x5c, 0x0b, 0x00, 0x05, 0x0d, 0x01, 0x35, 0x0a, 0x11,
+0x74, 0xe3, 0x0c, 0x12, 0x68, 0x11, 0x07, 0x14, 0x79, 0xa7,
+0x01, 0x25, 0x73, 0x74, 0x3e, 0x01, 0x13, 0x61, 0x20, 0x0c,
+0x05, 0x30, 0x0c, 0x51, 0x2e, 0x00, 0x53, 0x6f, 0x6c, 0xde,
+0x00, 0x08, 0xc1, 0x00, 0x05, 0x93, 0x00, 0x00, 0x8c, 0x0b,
+0x03, 0xfb, 0x0b, 0x02, 0xfc, 0x00, 0x02, 0xcd, 0x03, 0x16,
+0x64, 0x00, 0x01, 0x33, 0x69, 0x6e, 0x67, 0x25, 0x0a, 0x11,
+0x33, 0xfc, 0x02, 0x81, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70,
+0x72, 0x65, 0x1f, 0x0c, 0x41, 0x63, 0x65, 0x73, 0x20, 0x6d,
+0x0c, 0x00, 0xa5, 0x04, 0x53, 0x74, 0x66, 0x6f, 0x72, 0x6d,
+0x9f, 0x00, 0x80, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
+0x00, 0x2e, 0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0xf0,
+0x02, 0x16, 0x50, 0x12, 0x00, 0x0d, 0x0c, 0x03, 0x33, 0x47,
+0x61, 0x6d, 0x0c, 0x03, 0x02, 0x54, 0x01, 0x34, 0x6c, 0x65,
+0x74, 0x8f, 0x06, 0x36, 0x66, 0x69, 0x67, 0xf4, 0x09, 0x34,
+0x79, 0x6c, 0x65, 0xfa, 0x03, 0xd1, 0x76, 0x69, 0x63, 0x74,
+0x6f, 0x72, 0x79, 0x00, 0x66, 0x6c, 0x61, 0x73, 0x68, 0xbf,
+0x00, 0x01, 0xbe, 0x03, 0x30, 0x77, 0x68, 0x65, 0xcf, 0x02,
+0x07, 0xf3, 0x05, 0x12, 0x73, 0x07, 0x07, 0x10, 0x00, 0xf5,
+0x01, 0x64, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x6c, 0xa7, 0x0d,
+0x90, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3466;
-const unsigned short help_text_words = 642;
+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 c2f73d4b54..80cd81ed3f 100644
--- a/apps/plugins/puzzles/help/mines.c
+++ b/apps/plugins/puzzles/help/mines.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,258 +6,259 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 29, TEXT_UNDERLINE },
- { 119, TEXT_UNDERLINE },
- { 171, TEXT_CENTER | C_RED },
- { 248, TEXT_UNDERLINE },
- { 283, TEXT_UNDERLINE },
- { 334, TEXT_UNDERLINE },
- { 583, TEXT_CENTER | C_RED },
- { 600, TEXT_UNDERLINE },
+ { 30, TEXT_UNDERLINE },
+ { 120, TEXT_UNDERLINE },
+ { 172, TEXT_CENTER | C_RED },
+ { 249, TEXT_UNDERLINE },
+ { 284, TEXT_UNDERLINE },
+ { 335, TEXT_UNDERLINE },
+ { 584, TEXT_CENTER | C_RED },
  { 601, TEXT_UNDERLINE },
- { 611, TEXT_UNDERLINE },
- { 685, TEXT_UNDERLINE },
+ { 602, TEXT_UNDERLINE },
+ { 612, TEXT_UNDERLINE },
+ { 686, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 3796 comp 2333 ratio 0.614594 level 10 saved 1463 */
+/* orig 3814 comp 2339 ratio 0.613267 level 10 saved 1475 */
 const char help_text[] = {
-0xf0, 0x2e, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x32, 0x3a, 0x20, 0x4d, 0x69, 0x6e, 0x65, 0x73, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
-0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
-0x66, 0x00, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x65, 0x64, 0x00,
-0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73,
-0x6f, 0x6d, 0x65, 0x19, 0x00, 0xf0, 0x02, 0x77, 0x68, 0x69,
-0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e,
-0x00, 0x6d, 0x69, 0x6e, 0x1d, 0x00, 0xf2, 0x03, 0x62, 0x75,
-0x74, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x64, 0x6f, 0x6e, 0x27,
-0x74, 0x00, 0x6b, 0x6e, 0x6f, 0x77, 0x28, 0x00, 0x10, 0x2e,
-0x5b, 0x00, 0xe1, 0x72, 0x00, 0x6a, 0x6f, 0x62, 0x00, 0x69,
-0x73, 0x00, 0x74, 0x6f, 0x00, 0x75, 0x6e, 0x59, 0x00, 0x63,
-0x00, 0x65, 0x76, 0x65, 0x72, 0x79, 0x5d, 0x00, 0x03, 0x53,
-0x00, 0x85, 0x64, 0x6f, 0x65, 0x73, 0x00, 0x6e, 0x6f, 0x74,
-0x5c, 0x00, 0x11, 0x61, 0x5e, 0x00, 0x41, 0x2e, 0x00, 0x49,
-0x66, 0x5c, 0x00, 0x04, 0x3b, 0x00, 0x14, 0x61, 0x37, 0x00,
-0x03, 0x28, 0x00, 0x33, 0x69, 0x6e, 0x67, 0x2b, 0x00, 0x11,
-0x2c, 0x28, 0x00, 0x3f, 0x6c, 0x6f, 0x73, 0x35, 0x00, 0x08,
-0x0f, 0x6c, 0x00, 0x0a, 0x02, 0x41, 0x00, 0x00, 0x27, 0x00,
-0xd2, 0x74, 0x6f, 0x6c, 0x64, 0x00, 0x68, 0x6f, 0x77, 0x00,
-0x6d, 0x61, 0x6e, 0x79, 0xe6, 0x00, 0x17, 0x00, 0x74, 0x00,
-0xf0, 0x0d, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74, 0x68, 0x69,
-0x6e, 0x00, 0x74, 0x68, 0x65, 0x00, 0x65, 0x69, 0x67, 0x68,
-0x74, 0x00, 0x73, 0x75, 0x72, 0x72, 0x6f, 0x75, 0x6e, 0x64,
-0x90, 0x00, 0x03, 0x36, 0x01, 0xf0, 0x03, 0x2e, 0x00, 0x00,
-0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65,
-0x00, 0x6e, 0x65, 0x65, 0x64, 0x76, 0x00, 0xf0, 0x1a, 0x00,
-0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69,
-0x6f, 0x6e, 0x3b, 0x00, 0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61,
-0x72, 0x69, 0x73, 0x65, 0x64, 0x00, 0x62, 0x79, 0x00, 0x57,
-0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x2c, 0x00, 0x69, 0x74,
-0x34, 0x01, 0x71, 0x70, 0x65, 0x72, 0x68, 0x61, 0x70, 0x73,
-0x68, 0x00, 0xa2, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x00,
-0x62, 0x65, 0x73, 0x64, 0x01, 0xf2, 0x01, 0x6e, 0x00, 0x64,
-0x65, 0x73, 0x6b, 0x74, 0x6f, 0x70, 0x00, 0x70, 0x75, 0x7a,
-0x7a, 0x6c, 0x65, 0x67, 0x00, 0xc5, 0x69, 0x6e, 0x00, 0x65,
-0x78, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x81, 0x00,
-0x70, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0xc1, 0x01,
-0xf1, 0x17, 0x69, 0x74, 0x00, 0x68, 0x61, 0x73, 0x00, 0x61,
-0x6e, 0x00, 0x75, 0x6e, 0x75, 0x73, 0x75, 0x61, 0x6c, 0x00,
-0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x00,
-0x42, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-0x80, 0x00, 0xf1, 0x02, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x67,
-0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x00, 0x69, 0x74,
-0x73, 0x0a, 0x01, 0x50, 0x00, 0x70, 0x6f, 0x73, 0x69, 0xbc,
-0x00, 0x10, 0x73, 0x6c, 0x00, 0xc1, 0x73, 0x75, 0x63, 0x68,
-0x00, 0x61, 0x00, 0x77, 0x61, 0x79, 0x00, 0x61, 0xe3, 0x01,
-0x40, 0x65, 0x6e, 0x73, 0x75, 0x42, 0x01, 0x22, 0x68, 0x61,
-0x14, 0x02, 0x10, 0x6e, 0xec, 0x01, 0x01, 0xfd, 0x00, 0x00,
-0x1e, 0x00, 0xb3, 0x67, 0x75, 0x65, 0x73, 0x73, 0x00, 0x77,
-0x68, 0x65, 0x72, 0x65, 0x75, 0x01, 0x41, 0x00, 0x69, 0x73,
-0x3a, 0x29, 0x00, 0x01, 0x6e, 0x00, 0xe0, 0x61, 0x6c, 0x77,
-0x61, 0x79, 0x73, 0x00, 0x62, 0x65, 0x00, 0x61, 0x62, 0x6c,
-0x65, 0x32, 0x00, 0x50, 0x64, 0x65, 0x64, 0x75, 0x63, 0x7e,
-0x00, 0x01, 0x83, 0x02, 0x76, 0x68, 0x6f, 0x77, 0x2e, 0x00,
-0x53, 0x6f, 0x31, 0x00, 0x01, 0x5f, 0x00, 0x10, 0x2c, 0x7c,
-0x00, 0xa0, 0x63, 0x61, 0x6e, 0x00, 0x68, 0x61, 0x70, 0x70,
-0x65, 0x6e, 0x98, 0x00, 0x54, 0x6f, 0x74, 0x68, 0x65, 0x72,
-0xf8, 0x00, 0x60, 0x73, 0x2c, 0x00, 0x67, 0x65, 0x74, 0x4e,
-0x00, 0x00, 0x48, 0x01, 0x60, 0x6c, 0x61, 0x73, 0x74, 0x00,
-0x66, 0x99, 0x02, 0x03, 0xa8, 0x01, 0x82, 0x00, 0x61, 0x6e,
-0x64, 0x00, 0x64, 0x69, 0x73, 0x2c, 0x02, 0x01, 0xba, 0x00,
-0x12, 0x74, 0xa2, 0x00, 0x00, 0xc9, 0x00, 0x23, 0x77, 0x6f,
-0x01, 0x02, 0x45, 0x6c, 0x65, 0x66, 0x74, 0xeb, 0x02, 0x01,
-0x30, 0x03, 0x21, 0x6e, 0x6f, 0xf9, 0x00, 0x21, 0x6f, 0x66,
-0x90, 0x01, 0x00, 0xfa, 0x01, 0x41, 0x66, 0x6f, 0x72, 0x00,
-0x00, 0x01, 0x02, 0xe3, 0x00, 0x40, 0x74, 0x68, 0x65, 0x79,
-0x46, 0x00, 0x00, 0x89, 0x01, 0x43, 0x31, 0x32, 0x2e, 0x31,
-0x74, 0x03, 0x20, 0x63, 0x6f, 0x03, 0x02, 0x39, 0x6c, 0x73,
-0x20, 0x21, 0x02, 0x00, 0xef, 0x01, 0x33, 0x6c, 0x61, 0x79,
-0x5d, 0x02, 0x01, 0xab, 0x00, 0x41, 0x6d, 0x6f, 0x75, 0x73,
-0x3d, 0x00, 0x03, 0xd0, 0x02, 0x00, 0x83, 0x00, 0x71, 0x2d,
-0x63, 0x6c, 0x69, 0x63, 0x6b, 0x00, 0xb6, 0x02, 0x0a, 0xa7,
-0x03, 0x06, 0xb5, 0x01, 0x24, 0x62, 0x65, 0xfb, 0x02, 0x27,
-0x65, 0x64, 0x3f, 0x00, 0x10, 0x72, 0xaa, 0x02, 0x0f, 0x40,
-0x00, 0x11, 0x40, 0x70, 0x6c, 0x61, 0x63, 0xa1, 0x01, 0x43,
-0x66, 0x6c, 0x61, 0x67, 0x34, 0x03, 0x95, 0x69, 0x6e, 0x64,
-0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x21, 0x01, 0x04, 0x54,
-0x03, 0x10, 0x69, 0xb0, 0x01, 0x42, 0x6c, 0x69, 0x65, 0x76,
-0xe3, 0x01, 0x25, 0x62, 0x65, 0xbb, 0x03, 0x15, 0x4c, 0xaf,
-0x00, 0x00, 0x1c, 0x01, 0x02, 0x68, 0x03, 0x35, 0x61, 0x72,
-0x6b, 0x71, 0x00, 0x03, 0xc3, 0x01, 0x25, 0x6f, 0x74, 0xa9,
-0x03, 0x32, 0x69, 0x74, 0x2c, 0x44, 0x01, 0x51, 0x61, 0x66,
-0x65, 0x74, 0x79, 0x40, 0x04, 0x01, 0xd9, 0x01, 0x08, 0xba,
-0x00, 0x30, 0x61, 0x67, 0x61, 0x7a, 0x03, 0x83, 0x6f, 0x00,
-0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x55, 0x00, 0x02, 0xb4,
-0x00, 0x11, 0x64, 0x00, 0x03, 0x4f, 0x72, 0x72, 0x6f, 0x72,
-0x36, 0x01, 0x07, 0x00, 0xfa, 0x02, 0x0f, 0xf9, 0x00, 0x05,
-0x81, 0x60, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x00, 0x61, 0xcb,
-0x03, 0x17, 0x27, 0xe6, 0x00, 0x12, 0x2e, 0xa9, 0x01, 0x98,
-0x6d, 0x65, 0x61, 0x6e, 0x73, 0x3a, 0x00, 0x69, 0x66, 0x01,
-0x01, 0x00, 0x50, 0x03, 0x61, 0x65, 0x78, 0x61, 0x63, 0x74,
-0x6c, 0x05, 0x03, 0x01, 0x34, 0x04, 0x00, 0x3a, 0x01, 0x19,
-0x73, 0x15, 0x04, 0x20, 0x69, 0x74, 0x1d, 0x00, 0x00, 0xc8,
-0x02, 0x52, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x42, 0x02, 0x03,
-0x41, 0x05, 0x81, 0x74, 0x68, 0x65, 0x6e, 0x00, 0x61, 0x6c,
-0x6c, 0x56, 0x00, 0x0b, 0x7c, 0x05, 0x41, 0x00, 0x6e, 0x65,
-0x78, 0xbc, 0x02, 0x23, 0x69, 0x74, 0x8b, 0x01, 0x00, 0x74,
-0x00, 0x00, 0x35, 0x01, 0x00, 0x64, 0x00, 0x3e, 0x67, 0x65,
-0x64, 0xf3, 0x01, 0x01, 0x23, 0x03, 0x41, 0x6f, 0x6e, 0x63,
-0x65, 0xff, 0x00, 0x00, 0xa9, 0x04, 0x11, 0x6b, 0x0a, 0x00,
-0x01, 0x9a, 0x05, 0x01, 0x03, 0x03, 0x43, 0x6f, 0x63, 0x61,
-0x74, 0x11, 0x04, 0x04, 0x77, 0x00, 0x04, 0xe6, 0x04, 0x00,
-0xb0, 0x00, 0x05, 0x31, 0x05, 0x02, 0x13, 0x05, 0x10, 0x63,
-0x34, 0x01, 0x20, 0x73, 0x65, 0x4a, 0x00, 0x61, 0x73, 0x00,
-0x66, 0x75, 0x6e, 0x63, 0x3c, 0x00, 0x00, 0x46, 0x04, 0x00,
-0xcd, 0x00, 0x41, 0x72, 0x74, 0x63, 0x75, 0xa1, 0x00, 0x41,
-0x61, 0x76, 0x6f, 0x69, 0xd8, 0x00, 0x00, 0xef, 0x00, 0x32,
-0x74, 0x6f, 0x00, 0x73, 0x01, 0x92, 0x6f, 0x6e, 0x00, 0x65,
-0x61, 0x63, 0x68, 0x00, 0x6f, 0x34, 0x01, 0x33, 0x72, 0x65,
-0x6d, 0xb6, 0x05, 0x04, 0xe0, 0x00, 0x30, 0x6f, 0x6e, 0x65,
-0xfa, 0x04, 0x28, 0x6f, 0x6e, 0xea, 0x02, 0x0f, 0xba, 0x05,
-0x04, 0x00, 0x6b, 0x01, 0x14, 0x6e, 0x91, 0x03, 0x03, 0x80,
-0x05, 0x08, 0x65, 0x01, 0x03, 0x8c, 0x05, 0x04, 0xb6, 0x06,
-0x01, 0x58, 0x01, 0x02, 0x4a, 0x05, 0x91, 0x6f, 0x62, 0x76,
-0x69, 0x6f, 0x75, 0x73, 0x6c, 0x79, 0x5c, 0x02, 0x08, 0x8d,
-0x06, 0x44, 0x74, 0x68, 0x6f, 0x73, 0xcc, 0x01, 0x02, 0x55,
-0x00, 0x41, 0x75, 0x72, 0x6e, 0x2c, 0x15, 0x04, 0x10, 0x73,
-0x47, 0x01, 0x00, 0xee, 0x01, 0x00, 0xd3, 0x01, 0x02, 0xc1,
-0x00, 0x64, 0x6d, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x89, 0x00,
-0x08, 0x7c, 0x00, 0x01, 0x95, 0x00, 0x03, 0x28, 0x02, 0x04,
-0x93, 0x01, 0x10, 0x64, 0xdd, 0x00, 0x00, 0xd1, 0x02, 0x01,
-0x5a, 0x06, 0xd0, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69,
-0x63, 0x61, 0x6c, 0x6c, 0x79, 0x3b, 0x5d, 0x00, 0x00, 0xd3,
-0x04, 0x41, 0x74, 0x69, 0x6d, 0x65, 0x13, 0x05, 0x1f, 0x6e,
-0xf9, 0x00, 0x02, 0x10, 0x2c, 0x5e, 0x05, 0x30, 0x68, 0x6f,
-0x6c, 0x41, 0x06, 0x10, 0x77, 0xfb, 0x01, 0x12, 0x61, 0x5d,
-0x00, 0x10, 0x6f, 0xe9, 0x04, 0x23, 0x75, 0x70, 0x72, 0x03,
-0x53, 0x65, 0x78, 0x70, 0x6c, 0x6f, 0xed, 0x03, 0x04, 0x34,
-0x03, 0x01, 0xa8, 0x00, 0x02, 0xb7, 0x01, 0xc1, 0x65, 0x00,
-0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79,
-0xa6, 0x05, 0x02, 0x39, 0x03, 0x02, 0xec, 0x01, 0x04, 0xfd,
-0x01, 0xb0, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x2e, 0x00, 0x50,
-0x72, 0x65, 0x73, 0x6b, 0x06, 0x03, 0xae, 0x01, 0x00, 0x0d,
-0x01, 0x00, 0x37, 0x00, 0x0f, 0x31, 0x04, 0x01, 0x04, 0xad,
-0x00, 0x00, 0xd7, 0x02, 0x02, 0x31, 0x01, 0x0e, 0x60, 0x03,
-0x06, 0xe8, 0x03, 0x08, 0x5b, 0x03, 0x00, 0x95, 0x01, 0x31,
-0x28, 0x73, 0x6f, 0x15, 0x03, 0x52, 0x63, 0x74, 0x73, 0x00,
-0x61, 0xe3, 0x06, 0x04, 0x63, 0x05, 0x78, 0x74, 0x6f, 0x6e,
-0x29, 0x2c, 0x00, 0x70, 0x8a, 0x00, 0x20, 0x73, 0x70, 0x93,
-0x04, 0x3f, 0x62, 0x61, 0x72, 0x89, 0x00, 0x02, 0x0e, 0xb6,
-0x04, 0xbc, 0x28, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72,
-0x6c, 0x79, 0x2c, 0x66, 0x00, 0x01, 0x4d, 0x04, 0x04, 0x67,
-0x00, 0x00, 0x32, 0x01, 0x13, 0x41, 0x03, 0x03, 0x22, 0x61,
-0x63, 0xd8, 0x06, 0x72, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x4e, 0x04, 0x22, 0x73, 0x65, 0xef, 0x02, 0x31, 0x32,
-0x2e, 0x31, 0x7a, 0x03, 0x01, 0x57, 0x01, 0x50, 0x61, 0x76,
-0x61, 0x69, 0x6c, 0xa3, 0x06, 0x00, 0x3f, 0x00, 0x90, 0x45,
-0x76, 0x65, 0x6e, 0x00, 0x55, 0x6e, 0x64, 0x6f, 0x68, 0x02,
-0x05, 0x1a, 0x00, 0xa1, 0x2c, 0x00, 0x61, 0x6c, 0x74, 0x68,
-0x6f, 0x75, 0x67, 0x68, 0xd8, 0x01, 0x11, 0x6d, 0x75, 0x00,
-0x61, 0x63, 0x6f, 0x6e, 0x73, 0x69, 0x64, 0xe9, 0x04, 0x63,
-0x00, 0x63, 0x68, 0x65, 0x61, 0x74, 0x2b, 0x03, 0x20, 0x75,
-0x73, 0xe3, 0x06, 0x05, 0xb8, 0x08, 0x66, 0x73, 0x74, 0x65,
-0x70, 0x00, 0x6f, 0x98, 0x08, 0x00, 0x9d, 0x00, 0x73, 0x70,
-0x72, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0xfe, 0x01, 0x96, 0x6e,
-0x6c, 0x79, 0x00, 0x72, 0x65, 0x76, 0x65, 0x61, 0xbd, 0x03,
-0x00, 0xad, 0x00, 0x41, 0x71, 0x75, 0x65, 0x73, 0xae, 0x00,
-0x60, 0x28, 0x75, 0x6e, 0x6c, 0x69, 0x6b, 0x42, 0x06, 0x23,
-0x73, 0x74, 0x0d, 0x07, 0xb2, 0x69, 0x6d, 0x70, 0x6c, 0x65,
-0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x14, 0x07, 0x02, 0x53,
-0x03, 0x03, 0x46, 0x00, 0x00, 0x07, 0x04, 0x03, 0xe2, 0x02,
-0x16, 0x29, 0x78, 0x05, 0x24, 0x74, 0x68, 0xdb, 0x00, 0x10,
-0x79, 0x31, 0x07, 0x53, 0x66, 0x61, 0x74, 0x61, 0x6c, 0x3d,
-0x02, 0x21, 0x6e, 0x64, 0x0f, 0x09, 0x41, 0x69, 0x6e, 0x75,
-0x65, 0xb8, 0x06, 0x01, 0xe4, 0x04, 0x03, 0x71, 0x05, 0x21,
-0x69, 0x6b, 0x31, 0x05, 0x0b, 0xb5, 0x00, 0x51, 0x74, 0x72,
-0x61, 0x63, 0x6b, 0xaf, 0x00, 0x61, 0x6e, 0x75, 0x6d, 0x62,
-0x65, 0x72, 0x70, 0x00, 0x01, 0xfe, 0x02, 0x01, 0x3d, 0x0a,
-0x50, 0x69, 0x65, 0x64, 0x00, 0x28, 0x57, 0x00, 0x01, 0x70,
-0x00, 0x05, 0x1b, 0x06, 0x12, 0x72, 0x01, 0x08, 0x01, 0x76,
-0x06, 0x80, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x29,
-0x90, 0x0a, 0x06, 0x33, 0x03, 0x07, 0xdc, 0x07, 0x34, 0x65,
-0x6e, 0x64, 0x69, 0x04, 0x01, 0x54, 0x07, 0x05, 0xf6, 0x04,
-0x31, 0x77, 0x68, 0x65, 0x05, 0x01, 0x21, 0x6f, 0x72, 0x55,
-0x00, 0x02, 0x71, 0x00, 0x12, 0x64, 0xf8, 0x05, 0x00, 0xa6,
-0x01, 0x41, 0x74, 0x00, 0x6d, 0x61, 0xa6, 0x06, 0x00, 0xea,
-0x03, 0x01, 0x41, 0x06, 0x01, 0xbf, 0x09, 0x14, 0x28, 0x3a,
-0x07, 0x10, 0x65, 0xb4, 0x03, 0x41, 0x00, 0x77, 0x61, 0x6e,
-0x6b, 0x00, 0x05, 0x49, 0x05, 0x80, 0x66, 0x75, 0x6c, 0x6c,
-0x00, 0x6c, 0x61, 0x79, 0x41, 0x00, 0x04, 0x78, 0x00, 0x34,
-0x72, 0x69, 0x64, 0x5c, 0x01, 0x0f, 0x79, 0x01, 0x02, 0x02,
-0xdb, 0x00, 0x10, 0x73, 0x5f, 0x0a, 0x01, 0x16, 0x04, 0x44,
-0x66, 0x74, 0x65, 0x72, 0x02, 0x01, 0x06, 0x70, 0x05, 0x03,
-0x0a, 0x09, 0x04, 0xc0, 0x03, 0x30, 0x53, 0x6f, 0x6c, 0x2f,
-0x06, 0x60, 0x65, 0x6e, 0x75, 0x00, 0x6f, 0x70, 0x47, 0x00,
-0x22, 0x2e, 0x29, 0x54, 0x08, 0x13, 0x32, 0x54, 0x08, 0x93,
-0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x56,
-0x08, 0x13, 0x65, 0x28, 0x00, 0x07, 0x92, 0x02, 0x51, 0x00,
-0x66, 0x72, 0x6f, 0x6d, 0x4e, 0x00, 0xb3, 0x60, 0x43, 0x75,
-0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x27, 0x00,
-0x00, 0x6e, 0x02, 0x01, 0x1a, 0x00, 0x52, 0x54, 0x79, 0x70,
-0x65, 0x27, 0x69, 0x00, 0xf2, 0x00, 0x61, 0x72, 0x65, 0x3a,
-0x00, 0x00, 0x00, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
-0x48, 0x5c, 0x05, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x0b,
-0x0c, 0x01, 0x2c, 0x0c, 0x28, 0x69, 0x6e, 0xee, 0x0a, 0x11,
-0x4d, 0x98, 0x05, 0x35, 0x00, 0x00, 0x4e, 0xe0, 0x01, 0x09,
-0xaa, 0x05, 0x00, 0x32, 0x00, 0x06, 0x5c, 0x02, 0x10, 0x65,
-0xcb, 0x01, 0x02, 0x54, 0x06, 0x02, 0x91, 0x0a, 0x73, 0x61,
-0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0xce, 0x02, 0x01, 0xec,
-0x01, 0x10, 0x2c, 0xb1, 0x01, 0xd5, 0x61, 0x6c, 0x74, 0x65,
-0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x6c, 0x79, 0x21,
-0x01, 0xb5, 0x70, 0x75, 0x74, 0x00, 0x61, 0x00, 0x25, 0x00,
-0x73, 0x69, 0x67, 0xbe, 0x00, 0x12, 0x65, 0x83, 0x04, 0x03,
-0xa5, 0x0c, 0x36, 0x61, 0x73, 0x65, 0x0a, 0x02, 0x02, 0x5f,
-0x0a, 0x52, 0x72, 0x72, 0x61, 0x6e, 0x67, 0x92, 0x05, 0x01,
-0x51, 0x02, 0x00, 0xfc, 0x0a, 0x24, 0x6f, 0x72, 0x0b, 0x07,
-0x06, 0xd4, 0x07, 0x09, 0xb3, 0x00, 0x03, 0x64, 0x05, 0x03,
-0xe0, 0x05, 0x71, 0x00, 0x00, 0x42, 0x65, 0x77, 0x61, 0x72,
-0x03, 0x01, 0x44, 0x73, 0x65, 0x74, 0x74, 0xa1, 0x04, 0x06,
-0xb5, 0x00, 0xe1, 0x00, 0x74, 0x6f, 0x6f, 0x00, 0x68, 0x69,
-0x67, 0x68, 0x2e, 0x00, 0x41, 0x74, 0x00, 0xeb, 0x0c, 0x00,
-0x0e, 0x00, 0x40, 0x00, 0x64, 0x65, 0x6e, 0x3a, 0x0b, 0x2a,
-0x65, 0x73, 0xd1, 0x03, 0x60, 0x6d, 0x61, 0x79, 0x00, 0x73,
-0x70, 0xbb, 0x00, 0x31, 0x66, 0x6f, 0x72, 0x2e, 0x0b, 0x64,
-0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x50, 0x0a, 0x61, 0x61,
-0x00, 0x73, 0x6f, 0x6c, 0x76, 0xc1, 0x01, 0x02, 0x41, 0x01,
-0x31, 0x00, 0x00, 0x45, 0x65, 0x0b, 0x10, 0x20, 0x2f, 0x01,
-0x60, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0xa7, 0x01, 0x00,
-0x0f, 0x03, 0x01, 0x4e, 0x01, 0x03, 0xd2, 0x01, 0x50, 0x69,
-0x73, 0x00, 0x65, 0x6e, 0x37, 0x00, 0x00, 0x57, 0x03, 0x13,
-0x73, 0x07, 0x07, 0x15, 0x62, 0xe3, 0x0b, 0x23, 0x29, 0x2c,
-0xaf, 0x01, 0x01, 0x1a, 0x01, 0x08, 0xb7, 0x0b, 0x02, 0x4a,
-0x01, 0x33, 0x74, 0x69, 0x72, 0xff, 0x00, 0x00, 0x6e, 0x01,
-0x12, 0x62, 0xec, 0x02, 0x13, 0x79, 0x90, 0x0b, 0x61, 0x64,
-0x00, 0x73, 0x74, 0x61, 0x72, 0xfc, 0x00, 0x05, 0x55, 0x02,
-0x63, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x9a, 0x06, 0x01,
-0xaf, 0x05, 0x05, 0xd0, 0x04, 0x63, 0x70, 0x72, 0x65, 0x66,
-0x65, 0x72, 0x7d, 0x05, 0x51, 0x73, 0x6b, 0x69, 0x65, 0x72,
-0x5a, 0x00, 0x15, 0x73, 0x5e, 0x0c, 0x01, 0xfc, 0x0c, 0x0f,
-0xa7, 0x04, 0x04, 0x04, 0xf1, 0x01, 0x41, 0x73, 0x77, 0x69,
-0x74, 0x48, 0x08, 0x15, 0x66, 0xe7, 0x00, 0x50, 0x69, 0x6f,
-0x6e, 0x2e, 0x00,
+0x00, 0x2d, 0x01, 0x00, 0xf0, 0x1c, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00,
+0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x63, 0x6f,
+0x76, 0x65, 0x72, 0x65, 0x64, 0x00, 0x73, 0x71, 0x75, 0x61,
+0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x19,
+0x00, 0xf0, 0x02, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x63,
+0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6d, 0x69, 0x6e,
+0x1d, 0x00, 0xf2, 0x03, 0x62, 0x75, 0x74, 0x00, 0x79, 0x6f,
+0x75, 0x00, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x00, 0x6b, 0x6e,
+0x6f, 0x77, 0x28, 0x00, 0x10, 0x2e, 0x5b, 0x00, 0xe1, 0x72,
+0x00, 0x6a, 0x6f, 0x62, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f,
+0x00, 0x75, 0x6e, 0x59, 0x00, 0x63, 0x00, 0x65, 0x76, 0x65,
+0x72, 0x79, 0x5d, 0x00, 0x03, 0x53, 0x00, 0x85, 0x64, 0x6f,
+0x65, 0x73, 0x00, 0x6e, 0x6f, 0x74, 0x5c, 0x00, 0x11, 0x61,
+0x5e, 0x00, 0x41, 0x2e, 0x00, 0x49, 0x66, 0x5c, 0x00, 0x04,
+0x3b, 0x00, 0x14, 0x61, 0x37, 0x00, 0x03, 0x28, 0x00, 0x33,
+0x69, 0x6e, 0x67, 0x2b, 0x00, 0x11, 0x2c, 0x28, 0x00, 0x3f,
+0x6c, 0x6f, 0x73, 0x35, 0x00, 0x08, 0x0f, 0x6c, 0x00, 0x0a,
+0x02, 0x41, 0x00, 0x00, 0x27, 0x00, 0xd2, 0x74, 0x6f, 0x6c,
+0x64, 0x00, 0x68, 0x6f, 0x77, 0x00, 0x6d, 0x61, 0x6e, 0x79,
+0xe6, 0x00, 0x17, 0x00, 0x74, 0x00, 0xf0, 0x0d, 0x65, 0x64,
+0x00, 0x77, 0x69, 0x74, 0x68, 0x69, 0x6e, 0x00, 0x74, 0x68,
+0x65, 0x00, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x73, 0x75,
+0x72, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x90, 0x00, 0x03, 0x36,
+0x01, 0xf0, 0x03, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69,
+0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x6e, 0x65, 0x65,
+0x64, 0x76, 0x00, 0xf0, 0x1a, 0x00, 0x69, 0x6e, 0x74, 0x72,
+0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x00,
+0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61, 0x72, 0x69, 0x73, 0x65,
+0x64, 0x00, 0x62, 0x79, 0x00, 0x57, 0x69, 0x6e, 0x64, 0x6f,
+0x77, 0x73, 0x2c, 0x00, 0x69, 0x74, 0x34, 0x01, 0x71, 0x70,
+0x65, 0x72, 0x68, 0x61, 0x70, 0x73, 0x68, 0x00, 0xa2, 0x73,
+0x69, 0x6e, 0x67, 0x6c, 0x65, 0x00, 0x62, 0x65, 0x73, 0x64,
+0x01, 0xf2, 0x01, 0x6e, 0x00, 0x64, 0x65, 0x73, 0x6b, 0x74,
+0x6f, 0x70, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x67,
+0x00, 0xc5, 0x69, 0x6e, 0x00, 0x65, 0x78, 0x69, 0x73, 0x74,
+0x65, 0x6e, 0x63, 0x65, 0x81, 0x00, 0x70, 0x76, 0x65, 0x72,
+0x73, 0x69, 0x6f, 0x6e, 0xc1, 0x01, 0xf1, 0x17, 0x69, 0x74,
+0x00, 0x68, 0x61, 0x73, 0x00, 0x61, 0x6e, 0x00, 0x75, 0x6e,
+0x75, 0x73, 0x75, 0x61, 0x6c, 0x00, 0x70, 0x72, 0x6f, 0x70,
+0x65, 0x72, 0x74, 0x79, 0x2e, 0x00, 0x42, 0x79, 0x00, 0x64,
+0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x80, 0x00, 0xf1, 0x02,
+0x77, 0x69, 0x6c, 0x6c, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72,
+0x61, 0x74, 0x65, 0x00, 0x69, 0x74, 0x73, 0x0a, 0x01, 0x50,
+0x00, 0x70, 0x6f, 0x73, 0x69, 0xbc, 0x00, 0x10, 0x73, 0x6c,
+0x00, 0xc1, 0x73, 0x75, 0x63, 0x68, 0x00, 0x61, 0x00, 0x77,
+0x61, 0x79, 0x00, 0x61, 0xe3, 0x01, 0x40, 0x65, 0x6e, 0x73,
+0x75, 0x42, 0x01, 0x22, 0x68, 0x61, 0x14, 0x02, 0x10, 0x6e,
+0xec, 0x01, 0x01, 0xfd, 0x00, 0x00, 0x1e, 0x00, 0xb3, 0x67,
+0x75, 0x65, 0x73, 0x73, 0x00, 0x77, 0x68, 0x65, 0x72, 0x65,
+0x75, 0x01, 0x41, 0x00, 0x69, 0x73, 0x3a, 0x29, 0x00, 0x01,
+0x6e, 0x00, 0xe0, 0x61, 0x6c, 0x77, 0x61, 0x79, 0x73, 0x00,
+0x62, 0x65, 0x00, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x00, 0x50,
+0x64, 0x65, 0x64, 0x75, 0x63, 0x7e, 0x00, 0x01, 0x83, 0x02,
+0x76, 0x68, 0x6f, 0x77, 0x2e, 0x00, 0x53, 0x6f, 0x31, 0x00,
+0x01, 0x5f, 0x00, 0x10, 0x2c, 0x7c, 0x00, 0xa0, 0x63, 0x61,
+0x6e, 0x00, 0x68, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x98, 0x00,
+0x54, 0x6f, 0x74, 0x68, 0x65, 0x72, 0xf8, 0x00, 0x60, 0x73,
+0x2c, 0x00, 0x67, 0x65, 0x74, 0x4e, 0x00, 0x00, 0x48, 0x01,
+0x60, 0x6c, 0x61, 0x73, 0x74, 0x00, 0x66, 0x99, 0x02, 0x03,
+0xa8, 0x01, 0x82, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x64, 0x69,
+0x73, 0x2c, 0x02, 0x01, 0xba, 0x00, 0x12, 0x74, 0xa2, 0x00,
+0x00, 0xc9, 0x00, 0x23, 0x77, 0x6f, 0x01, 0x02, 0x45, 0x6c,
+0x65, 0x66, 0x74, 0xeb, 0x02, 0x01, 0x30, 0x03, 0x21, 0x6e,
+0x6f, 0xf9, 0x00, 0x21, 0x6f, 0x66, 0x90, 0x01, 0x00, 0xfa,
+0x01, 0x41, 0x66, 0x6f, 0x72, 0x00, 0x00, 0x01, 0x02, 0xe3,
+0x00, 0x40, 0x74, 0x68, 0x65, 0x79, 0x46, 0x00, 0x00, 0x89,
+0x01, 0x43, 0x31, 0x32, 0x2e, 0x31, 0x86, 0x03, 0x20, 0x63,
+0x6f, 0x03, 0x02, 0x39, 0x6c, 0x73, 0x20, 0x21, 0x02, 0x00,
+0xef, 0x01, 0x33, 0x6c, 0x61, 0x79, 0x5d, 0x02, 0x01, 0xab,
+0x00, 0x41, 0x6d, 0x6f, 0x75, 0x73, 0x3d, 0x00, 0x03, 0xd0,
+0x02, 0x00, 0x83, 0x00, 0x71, 0x2d, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0x00, 0xb6, 0x02, 0x0a, 0xa7, 0x03, 0x06, 0xb5, 0x01,
+0x24, 0x62, 0x65, 0xfb, 0x02, 0x27, 0x65, 0x64, 0x3f, 0x00,
+0x10, 0x72, 0xaa, 0x02, 0x0f, 0x40, 0x00, 0x11, 0x40, 0x70,
+0x6c, 0x61, 0x63, 0xa1, 0x01, 0x43, 0x66, 0x6c, 0x61, 0x67,
+0x34, 0x03, 0x95, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74,
+0x65, 0x73, 0x21, 0x01, 0x04, 0x54, 0x03, 0x10, 0x69, 0xb0,
+0x01, 0x42, 0x6c, 0x69, 0x65, 0x76, 0xe3, 0x01, 0x25, 0x62,
+0x65, 0xbb, 0x03, 0x15, 0x4c, 0xaf, 0x00, 0x00, 0x1c, 0x01,
+0x02, 0x68, 0x03, 0x35, 0x61, 0x72, 0x6b, 0x71, 0x00, 0x03,
+0xc3, 0x01, 0x25, 0x6f, 0x74, 0xa9, 0x03, 0x32, 0x69, 0x74,
+0x2c, 0x44, 0x01, 0x51, 0x61, 0x66, 0x65, 0x74, 0x79, 0x40,
+0x04, 0x01, 0xd9, 0x01, 0x08, 0xba, 0x00, 0x30, 0x61, 0x67,
+0x61, 0x7a, 0x03, 0x83, 0x6f, 0x00, 0x72, 0x65, 0x6d, 0x6f,
+0x76, 0x65, 0x55, 0x00, 0x02, 0xb4, 0x00, 0x11, 0x64, 0x00,
+0x03, 0x4f, 0x72, 0x72, 0x6f, 0x72, 0x36, 0x01, 0x07, 0x00,
+0xfa, 0x02, 0x0f, 0xf9, 0x00, 0x05, 0x81, 0x60, 0x63, 0x6c,
+0x65, 0x61, 0x72, 0x00, 0x61, 0xcb, 0x03, 0x17, 0x27, 0xe6,
+0x00, 0x12, 0x2e, 0xa9, 0x01, 0x98, 0x6d, 0x65, 0x61, 0x6e,
+0x73, 0x3a, 0x00, 0x69, 0x66, 0x01, 0x01, 0x00, 0x50, 0x03,
+0x61, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x05, 0x03, 0x01,
+0x34, 0x04, 0x00, 0x3a, 0x01, 0x19, 0x73, 0x15, 0x04, 0x20,
+0x69, 0x74, 0x1d, 0x00, 0x00, 0xc8, 0x02, 0x52, 0x68, 0x6f,
+0x75, 0x6c, 0x64, 0x42, 0x02, 0x03, 0x41, 0x05, 0x81, 0x74,
+0x68, 0x65, 0x6e, 0x00, 0x61, 0x6c, 0x6c, 0x56, 0x00, 0x0b,
+0x7c, 0x05, 0x41, 0x00, 0x6e, 0x65, 0x78, 0xbc, 0x02, 0x23,
+0x69, 0x74, 0x8b, 0x01, 0x00, 0x74, 0x00, 0x00, 0x35, 0x01,
+0x00, 0x64, 0x00, 0x3e, 0x67, 0x65, 0x64, 0xf3, 0x01, 0x01,
+0x23, 0x03, 0x41, 0x6f, 0x6e, 0x63, 0x65, 0xff, 0x00, 0x00,
+0xa9, 0x04, 0x11, 0x6b, 0x0a, 0x00, 0x01, 0x9a, 0x05, 0x01,
+0x03, 0x03, 0x43, 0x6f, 0x63, 0x61, 0x74, 0x11, 0x04, 0x04,
+0x77, 0x00, 0x04, 0xe6, 0x04, 0x00, 0xb0, 0x00, 0x05, 0x31,
+0x05, 0x02, 0x13, 0x05, 0x10, 0x63, 0x34, 0x01, 0x20, 0x73,
+0x65, 0x4a, 0x00, 0x61, 0x73, 0x00, 0x66, 0x75, 0x6e, 0x63,
+0x3c, 0x00, 0x00, 0x46, 0x04, 0x00, 0xcd, 0x00, 0x41, 0x72,
+0x74, 0x63, 0x75, 0xa1, 0x00, 0x41, 0x61, 0x76, 0x6f, 0x69,
+0xd8, 0x00, 0x00, 0xef, 0x00, 0x32, 0x74, 0x6f, 0x00, 0x73,
+0x01, 0x92, 0x6f, 0x6e, 0x00, 0x65, 0x61, 0x63, 0x68, 0x00,
+0x6f, 0x34, 0x01, 0x33, 0x72, 0x65, 0x6d, 0xb6, 0x05, 0x04,
+0xe0, 0x00, 0x30, 0x6f, 0x6e, 0x65, 0xfa, 0x04, 0x28, 0x6f,
+0x6e, 0xea, 0x02, 0x0f, 0xba, 0x05, 0x04, 0x00, 0x6b, 0x01,
+0x14, 0x6e, 0x91, 0x03, 0x03, 0x80, 0x05, 0x08, 0x65, 0x01,
+0x03, 0x8c, 0x05, 0x04, 0xb6, 0x06, 0x01, 0x58, 0x01, 0x02,
+0x4a, 0x05, 0x91, 0x6f, 0x62, 0x76, 0x69, 0x6f, 0x75, 0x73,
+0x6c, 0x79, 0x5c, 0x02, 0x08, 0x8d, 0x06, 0x44, 0x74, 0x68,
+0x6f, 0x73, 0xcc, 0x01, 0x02, 0x55, 0x00, 0x41, 0x75, 0x72,
+0x6e, 0x2c, 0x15, 0x04, 0x10, 0x73, 0x47, 0x01, 0x00, 0xee,
+0x01, 0x00, 0xd3, 0x01, 0x02, 0xc1, 0x00, 0x64, 0x6d, 0x00,
+0x61, 0x6c, 0x73, 0x6f, 0x89, 0x00, 0x08, 0x7c, 0x00, 0x01,
+0x95, 0x00, 0x03, 0x28, 0x02, 0x04, 0x93, 0x01, 0x10, 0x64,
+0xdd, 0x00, 0x00, 0xd1, 0x02, 0x01, 0x5a, 0x06, 0xd0, 0x75,
+0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x6c,
+0x79, 0x3b, 0x5d, 0x00, 0x00, 0xd3, 0x04, 0x41, 0x74, 0x69,
+0x6d, 0x65, 0x13, 0x05, 0x1f, 0x6e, 0xf9, 0x00, 0x02, 0x10,
+0x2c, 0x5e, 0x05, 0x30, 0x68, 0x6f, 0x6c, 0x41, 0x06, 0x10,
+0x77, 0xfb, 0x01, 0x12, 0x61, 0x5d, 0x00, 0x10, 0x6f, 0xe9,
+0x04, 0x23, 0x75, 0x70, 0x72, 0x03, 0x53, 0x65, 0x78, 0x70,
+0x6c, 0x6f, 0xed, 0x03, 0x04, 0x34, 0x03, 0x01, 0xa8, 0x00,
+0x02, 0xb7, 0x01, 0xc1, 0x65, 0x00, 0x63, 0x75, 0x72, 0x73,
+0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0xa6, 0x05, 0x02, 0x39,
+0x03, 0x02, 0xec, 0x01, 0x04, 0xfd, 0x01, 0xb0, 0x66, 0x69,
+0x65, 0x6c, 0x64, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x6b,
+0x06, 0x03, 0xae, 0x01, 0x00, 0x0d, 0x01, 0x00, 0x37, 0x00,
+0x0f, 0x31, 0x04, 0x01, 0x04, 0xad, 0x00, 0x00, 0xd7, 0x02,
+0x02, 0x31, 0x01, 0x0e, 0x60, 0x03, 0x06, 0xe8, 0x03, 0x08,
+0x5b, 0x03, 0x00, 0x95, 0x01, 0x31, 0x28, 0x73, 0x6f, 0x15,
+0x03, 0x52, 0x63, 0x74, 0x73, 0x00, 0x61, 0xe3, 0x06, 0x04,
+0x63, 0x05, 0x78, 0x74, 0x6f, 0x6e, 0x29, 0x2c, 0x00, 0x70,
+0x8a, 0x00, 0x20, 0x73, 0x70, 0x93, 0x04, 0x3f, 0x62, 0x61,
+0x72, 0x89, 0x00, 0x02, 0x0e, 0xb6, 0x04, 0xbc, 0x28, 0x73,
+0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x6c, 0x79, 0x2c, 0x66,
+0x00, 0x01, 0x4d, 0x04, 0x04, 0x67, 0x00, 0x00, 0x32, 0x01,
+0x13, 0x41, 0x03, 0x03, 0x22, 0x61, 0x63, 0xd8, 0x06, 0x72,
+0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x4e, 0x04, 0x22,
+0x73, 0x65, 0xef, 0x02, 0x31, 0x32, 0x2e, 0x31, 0x7a, 0x03,
+0x01, 0x57, 0x01, 0x50, 0x61, 0x76, 0x61, 0x69, 0x6c, 0xa3,
+0x06, 0x00, 0x3f, 0x00, 0x90, 0x45, 0x76, 0x65, 0x6e, 0x00,
+0x55, 0x6e, 0x64, 0x6f, 0x68, 0x02, 0x05, 0x1a, 0x00, 0xa1,
+0x2c, 0x00, 0x61, 0x6c, 0x74, 0x68, 0x6f, 0x75, 0x67, 0x68,
+0xd8, 0x01, 0x11, 0x6d, 0x75, 0x00, 0x61, 0x63, 0x6f, 0x6e,
+0x73, 0x69, 0x64, 0xe9, 0x04, 0x63, 0x00, 0x63, 0x68, 0x65,
+0x61, 0x74, 0x2b, 0x03, 0x20, 0x75, 0x73, 0xe3, 0x06, 0x05,
+0xb8, 0x08, 0x66, 0x73, 0x74, 0x65, 0x70, 0x00, 0x6f, 0x98,
+0x08, 0x00, 0x9d, 0x00, 0x73, 0x70, 0x72, 0x6f, 0x67, 0x72,
+0x61, 0x6d, 0xfe, 0x01, 0x96, 0x6e, 0x6c, 0x79, 0x00, 0x72,
+0x65, 0x76, 0x65, 0x61, 0xbd, 0x03, 0x00, 0xad, 0x00, 0x41,
+0x71, 0x75, 0x65, 0x73, 0xae, 0x00, 0x60, 0x28, 0x75, 0x6e,
+0x6c, 0x69, 0x6b, 0x42, 0x06, 0x23, 0x73, 0x74, 0x0d, 0x07,
+0xb2, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
+0x61, 0x74, 0x14, 0x07, 0x02, 0x53, 0x03, 0x03, 0x46, 0x00,
+0x00, 0x07, 0x04, 0x03, 0xe2, 0x02, 0x16, 0x29, 0x78, 0x05,
+0x24, 0x74, 0x68, 0xdb, 0x00, 0x10, 0x79, 0x31, 0x07, 0x53,
+0x66, 0x61, 0x74, 0x61, 0x6c, 0x3d, 0x02, 0x21, 0x6e, 0x64,
+0x0f, 0x09, 0x41, 0x69, 0x6e, 0x75, 0x65, 0xb8, 0x06, 0x01,
+0xe4, 0x04, 0x03, 0x71, 0x05, 0x21, 0x69, 0x6b, 0x31, 0x05,
+0x0b, 0xb5, 0x00, 0x51, 0x74, 0x72, 0x61, 0x63, 0x6b, 0xaf,
+0x00, 0x61, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x70, 0x00,
+0x01, 0xfe, 0x02, 0x01, 0x3d, 0x0a, 0x50, 0x69, 0x65, 0x64,
+0x00, 0x28, 0x57, 0x00, 0x01, 0x70, 0x00, 0x05, 0x1b, 0x06,
+0x12, 0x72, 0x01, 0x08, 0x01, 0x76, 0x06, 0x80, 0x63, 0x6f,
+0x75, 0x6e, 0x74, 0x65, 0x72, 0x29, 0x90, 0x0a, 0x06, 0x33,
+0x03, 0x07, 0xdc, 0x07, 0x34, 0x65, 0x6e, 0x64, 0x69, 0x04,
+0x01, 0x54, 0x07, 0x05, 0xf6, 0x04, 0x31, 0x77, 0x68, 0x65,
+0x05, 0x01, 0x21, 0x6f, 0x72, 0x55, 0x00, 0x02, 0x71, 0x00,
+0x12, 0x64, 0xf8, 0x05, 0x00, 0xa6, 0x01, 0x41, 0x74, 0x00,
+0x6d, 0x61, 0xa6, 0x06, 0x00, 0xea, 0x03, 0x01, 0x41, 0x06,
+0x01, 0xbf, 0x09, 0x14, 0x28, 0x3a, 0x07, 0x10, 0x65, 0xb4,
+0x03, 0x41, 0x00, 0x77, 0x61, 0x6e, 0x6b, 0x00, 0x05, 0x49,
+0x05, 0x80, 0x66, 0x75, 0x6c, 0x6c, 0x00, 0x6c, 0x61, 0x79,
+0x41, 0x00, 0x04, 0x78, 0x00, 0x34, 0x72, 0x69, 0x64, 0x5c,
+0x01, 0x0f, 0x79, 0x01, 0x02, 0x02, 0xdb, 0x00, 0x10, 0x73,
+0x5f, 0x0a, 0x01, 0x16, 0x04, 0x44, 0x66, 0x74, 0x65, 0x72,
+0x02, 0x01, 0x06, 0x70, 0x05, 0x03, 0x0a, 0x09, 0x04, 0xc0,
+0x03, 0x30, 0x53, 0x6f, 0x6c, 0x2f, 0x06, 0x60, 0x65, 0x6e,
+0x75, 0x00, 0x6f, 0x70, 0x47, 0x00, 0x22, 0x2e, 0x29, 0x54,
+0x08, 0x13, 0x32, 0x54, 0x08, 0x93, 0x70, 0x61, 0x72, 0x61,
+0x6d, 0x65, 0x74, 0x65, 0x72, 0x56, 0x08, 0x13, 0x65, 0x28,
+0x00, 0x07, 0x92, 0x02, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d,
+0x4e, 0x00, 0xb3, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0x27, 0x00, 0x00, 0x6e, 0x02, 0x01,
+0x1a, 0x00, 0x52, 0x54, 0x79, 0x70, 0x65, 0x27, 0x69, 0x00,
+0xf2, 0x00, 0x61, 0x72, 0x65, 0x3a, 0x00, 0x00, 0x00, 0x57,
+0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x5c, 0x05, 0x51,
+0x00, 0x00, 0x53, 0x69, 0x7a, 0x0b, 0x0c, 0x01, 0x2c, 0x0c,
+0x28, 0x69, 0x6e, 0xee, 0x0a, 0x11, 0x4d, 0x98, 0x05, 0x35,
+0x00, 0x00, 0x4e, 0xe0, 0x01, 0x09, 0xaa, 0x05, 0x00, 0x32,
+0x00, 0x06, 0x5c, 0x02, 0x10, 0x65, 0xcb, 0x01, 0x02, 0x54,
+0x06, 0x02, 0x91, 0x0a, 0x73, 0x61, 0x62, 0x73, 0x6f, 0x6c,
+0x75, 0x74, 0xce, 0x02, 0x01, 0xec, 0x01, 0x10, 0x2c, 0xb1,
+0x01, 0xd5, 0x61, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74,
+0x69, 0x76, 0x65, 0x6c, 0x79, 0x21, 0x01, 0xb5, 0x70, 0x75,
+0x74, 0x00, 0x61, 0x00, 0x25, 0x00, 0x73, 0x69, 0x67, 0xbe,
+0x00, 0x12, 0x65, 0x83, 0x04, 0x03, 0xa5, 0x0c, 0x36, 0x61,
+0x73, 0x65, 0x0a, 0x02, 0x02, 0x5f, 0x0a, 0x52, 0x72, 0x72,
+0x61, 0x6e, 0x67, 0x92, 0x05, 0x01, 0x51, 0x02, 0x00, 0xfc,
+0x0a, 0x24, 0x6f, 0x72, 0x0b, 0x07, 0x06, 0xd4, 0x07, 0x09,
+0xb3, 0x00, 0x03, 0x64, 0x05, 0x03, 0xe0, 0x05, 0x71, 0x00,
+0x00, 0x42, 0x65, 0x77, 0x61, 0x72, 0x03, 0x01, 0x44, 0x73,
+0x65, 0x74, 0x74, 0xa1, 0x04, 0x06, 0xb5, 0x00, 0xe1, 0x00,
+0x74, 0x6f, 0x6f, 0x00, 0x68, 0x69, 0x67, 0x68, 0x2e, 0x00,
+0x41, 0x74, 0x00, 0xeb, 0x0c, 0x00, 0x0e, 0x00, 0x40, 0x00,
+0x64, 0x65, 0x6e, 0x3a, 0x0b, 0x2a, 0x65, 0x73, 0xd1, 0x03,
+0x60, 0x6d, 0x61, 0x79, 0x00, 0x73, 0x70, 0xbb, 0x00, 0x31,
+0x66, 0x6f, 0x72, 0x2e, 0x0b, 0x64, 0x73, 0x65, 0x61, 0x72,
+0x63, 0x68, 0x50, 0x0a, 0x61, 0x61, 0x00, 0x73, 0x6f, 0x6c,
+0x76, 0xc1, 0x01, 0x02, 0x41, 0x01, 0x31, 0x00, 0x00, 0x45,
+0x65, 0x0b, 0x10, 0x20, 0x2f, 0x01, 0x60, 0x62, 0x69, 0x6c,
+0x69, 0x74, 0x79, 0xa7, 0x01, 0x00, 0x0f, 0x03, 0x01, 0x4e,
+0x01, 0x03, 0xd2, 0x01, 0x50, 0x69, 0x73, 0x00, 0x65, 0x6e,
+0x37, 0x00, 0x00, 0x57, 0x03, 0x13, 0x73, 0x07, 0x07, 0x15,
+0x62, 0xe3, 0x0b, 0x23, 0x29, 0x2c, 0xaf, 0x01, 0x01, 0x1a,
+0x01, 0x08, 0xb7, 0x0b, 0x02, 0x4a, 0x01, 0x33, 0x74, 0x69,
+0x72, 0xff, 0x00, 0x00, 0x6e, 0x01, 0x12, 0x62, 0xec, 0x02,
+0x13, 0x79, 0x90, 0x0b, 0x61, 0x64, 0x00, 0x73, 0x74, 0x61,
+0x72, 0xfc, 0x00, 0x05, 0x55, 0x02, 0x63, 0x69, 0x6e, 0x69,
+0x74, 0x69, 0x61, 0x9a, 0x06, 0x01, 0xaf, 0x05, 0x05, 0xd0,
+0x04, 0x63, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x7d, 0x05,
+0x51, 0x73, 0x6b, 0x69, 0x65, 0x72, 0x5a, 0x00, 0x15, 0x73,
+0x5e, 0x0c, 0x01, 0xfc, 0x0c, 0x0f, 0xa7, 0x04, 0x04, 0x04,
+0xf1, 0x01, 0x41, 0x73, 0x77, 0x69, 0x74, 0x48, 0x08, 0x15,
+0x66, 0xe7, 0x00, 0x50, 0x69, 0x6f, 0x6e, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3796;
-const unsigned short help_text_words = 731;
+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
new file mode 100644
index 0000000000..eb0c52c0bf
--- /dev/null
+++ b/apps/plugins/puzzles/help/mosaic.c
@@ -0,0 +1,151 @@
+/* auto-generated by genhelp.sh */
+/* help text is compressed using LZ4; see compress.c for details */
+/* DO NOT EDIT! */
+
+#include "lib/display_text.h"
+
+struct style_text help_text_style[] = {
+ { 0, TEXT_CENTER | C_RED },
+ { 43, TEXT_UNDERLINE },
+ { 105, TEXT_CENTER | C_RED },
+ { 223, TEXT_CENTER | C_RED },
+ { 240, TEXT_UNDERLINE },
+ { 241, TEXT_UNDERLINE },
+ { 251, TEXT_UNDERLINE },
+ LAST_STYLE_ITEM
+};
+
+/* orig 1673 comp 1259 ratio 0.75254 level 10 saved 414 */
+const char help_text[] = {
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0x34, 0x32, 0x3a, 0x20, 0x4d, 0x6f, 0x73, 0x61, 0x69, 0x63,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x3a, 0x00, 0x00, 0x00,
+0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69,
+0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
+0x73, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x79,
+0x6f, 0x75, 0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x63, 0x6f,
+0x6c, 0x6f, 0x75, 0x72, 0x00, 0x65, 0x69, 0x74, 0x68, 0x65,
+0x72, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x00, 0x6f, 0x72,
+0x26, 0x00, 0xa4, 0x74, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x53,
+0x6f, 0x6d, 0x65, 0x3d, 0x00, 0xf2, 0x0c, 0x00, 0x63, 0x6f,
+0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x63, 0x6c, 0x75, 0x65,
+0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x00,
+0x45, 0x61, 0x63, 0x68, 0x13, 0x00, 0x51, 0x74, 0x65, 0x6c,
+0x6c, 0x73, 0x5c, 0x00, 0x24, 0x74, 0x68, 0x21, 0x00, 0x00,
+0x7d, 0x00, 0x02, 0x57, 0x00, 0x04, 0x46, 0x00, 0x21, 0x69,
+0x6e, 0x1f, 0x00, 0xf1, 0x07, 0x33, 0x2a, 0x33, 0x00, 0x72,
+0x65, 0x67, 0x69, 0x6f, 0x6e, 0x00, 0x73, 0x75, 0x72, 0x72,
+0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x1b, 0x00, 0x01,
+0x4d, 0x00, 0x7a, 0x2d, 0x00, 0x69, 0x6e, 0x63, 0x6c, 0x75,
+0x15, 0x00, 0x02, 0x44, 0x00, 0x70, 0x00, 0x69, 0x74, 0x73,
+0x65, 0x6c, 0x66, 0xa0, 0x00, 0xf0, 0x0d, 0x54, 0x68, 0x69,
+0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x69, 0x73, 0x00,
+0x76, 0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x6c, 0x79, 0x00,
+0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x6a, 0x00, 0x11, 0x6f, 0xd8,
+0x00, 0xf2, 0x02, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f,
+0x6e, 0x73, 0x00, 0x61, 0x73, 0x3a, 0x00, 0x41, 0x72, 0x74,
+0x44, 0x01, 0xf0, 0x0e, 0x6f, 0x2c, 0x00, 0x43, 0x6f, 0x75,
+0x6e, 0x74, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x44, 0x61, 0x72,
+0x6b, 0x65, 0x6e, 0x2c, 0x00, 0x43, 0x75, 0x65, 0x6e, 0x74,
+0x61, 0x00, 0x59, 0xfb, 0x00, 0xf3, 0x01, 0x62, 0x72, 0x65,
+0x61, 0x2c, 0x00, 0x46, 0x69, 0x6c, 0x6c, 0x2d, 0x61, 0x2d,
+0x50, 0x69, 0x78, 0x0c, 0x00, 0xf0, 0x0a, 0x49, 0x6e, 0x2c,
+0x00, 0x4b, 0x6f, 0x6d, 0x73, 0x75, 0x00, 0x4b, 0x61, 0x72,
+0x61, 0x6c, 0x61, 0x2c, 0x00, 0x4d, 0x61, 0x67, 0x69, 0x70,
+0x69, 0x63, 0x09, 0x00, 0x85, 0x6a, 0x69, 0x70, 0x69, 0x6b,
+0x75, 0x2c, 0x00, 0x63, 0x00, 0x01, 0x09, 0x00, 0x10, 0x6b,
+0x08, 0x00, 0xf4, 0x0d, 0x7a, 0x61, 0x69, 0x65, 0x6b, 0x2c,
+0x00, 0x4e, 0x61, 0x6d, 0x70, 0x72, 0x65, 0x00, 0x50, 0x75,
+0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x00, 0x4e, 0x75, 0x72, 0x69,
+0x65, 0x2d, 0x0e, 0x00, 0x62, 0x4f, 0x65, 0x6b, 0x61, 0x6b,
+0x69, 0x6d, 0x00, 0x81, 0x56, 0x6f, 0x69, 0x73, 0x69, 0x6d,
+0x61, 0x67, 0x8a, 0x01, 0x02, 0x50, 0x00, 0x32, 0x00, 0x77,
+0x61, 0x88, 0x01, 0xe0, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65,
+0x64, 0x00, 0x74, 0x6f, 0x00, 0x74, 0x68, 0x69, 0x14, 0x00,
+0x50, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x01, 0xf2, 0x01,
+0x62, 0x79, 0x00, 0x44, 0x69, 0x64, 0x69, 0x00, 0x4b, 0x6f,
+0x68, 0x65, 0x6e, 0x2e, 0x00, 0x43, 0xe3, 0x01, 0x51, 0x64,
+0x65, 0x73, 0x69, 0x67, 0x1d, 0x00, 0xf0, 0x0a, 0x4d, 0x69,
+0x63, 0x68, 0x61, 0x6c, 0x00, 0x53, 0x68, 0x6f, 0x6d, 0x65,
+0x72, 0x2e, 0x00, 0x54, 0x68, 0x65, 0x00, 0x69, 0x6d, 0x70,
+0x6c, 0x65, 0x6d, 0xf9, 0x00, 0x01, 0x42, 0x00, 0xf2, 0x1b,
+0x69, 0x73, 0x00, 0x6c, 0x6f, 0x6f, 0x73, 0x65, 0x6c, 0x79,
+0x00, 0x62, 0x61, 0x73, 0x65, 0x64, 0x00, 0x6f, 0x6e, 0x00,
+0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+0x2f, 0x6d, 0x6f, 0x72, 0x64, 0x65, 0x63, 0x68, 0x61, 0x69,
+0x6d, 0x2f, 0x96, 0x00, 0x00, 0xa0, 0x00, 0x44, 0x34, 0x32,
+0x2e, 0x31, 0x9c, 0x02, 0x01, 0xa1, 0x00, 0x40, 0x6f, 0x6c,
+0x73, 0x20, 0xa2, 0x01, 0x63, 0x6f, 0x00, 0x70, 0x6c, 0x61,
+0x79, 0xc0, 0x00, 0x71, 0x2c, 0x00, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0xd2, 0x01, 0x50, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0xa5,
+0x01, 0x14, 0x61, 0xd8, 0x01, 0x81, 0x74, 0x6f, 0x00, 0x63,
+0x68, 0x61, 0x6e, 0x67, 0xe2, 0x01, 0x03, 0x9c, 0x02, 0x71,
+0x2e, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x37, 0x00, 0x00,
+0x0c, 0x02, 0x84, 0x61, 0x6e, 0x00, 0x65, 0x6d, 0x70, 0x74,
+0x79, 0x34, 0x00, 0xc2, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x74,
+0x75, 0x72, 0x6e, 0x00, 0x69, 0x74, 0x6a, 0x02, 0x11, 0x2c,
+0xd0, 0x01, 0x47, 0x72, 0x69, 0x67, 0x68, 0x37, 0x00, 0x09,
+0x27, 0x00, 0x03, 0xdf, 0x02, 0x42, 0x4b, 0x65, 0x65, 0x70,
+0x90, 0x00, 0x04, 0x65, 0x02, 0x10, 0x73, 0x4a, 0x02, 0x61,
+0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x8d, 0x00, 0xc1, 0x79,
+0x63, 0x6c, 0x65, 0x00, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67,
+0x68, 0x21, 0x00, 0xf2, 0x0a, 0x74, 0x68, 0x72, 0x65, 0x65,
+0x00, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x00,
+0x73, 0x74, 0x61, 0x74, 0x65, 0x73, 0x00, 0x66, 0x6f, 0x72,
+0x3f, 0x00, 0x01, 0x93, 0x00, 0x00, 0x0e, 0x01, 0x21, 0x49,
+0x66, 0x08, 0x03, 0x60, 0x68, 0x6f, 0x6c, 0x64, 0x00, 0x64,
+0x8c, 0x02, 0x06, 0xf1, 0x00, 0x03, 0x5f, 0x00, 0x00, 0xa4,
+0x00, 0x51, 0x64, 0x72, 0x61, 0x67, 0x2c, 0x29, 0x00, 0x34,
+0x63, 0x61, 0x6e, 0x8c, 0x03, 0xa1, 0x6d, 0x75, 0x6c, 0x74,
+0x69, 0x70, 0x6c, 0x65, 0x00, 0x63, 0x4f, 0x03, 0x02, 0x20,
+0x01, 0x71, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x00, 0x61, 0xe1,
+0x01, 0x13, 0x2e, 0xe8, 0x03, 0x00, 0x34, 0x00, 0x50, 0x61,
+0x6c, 0x73, 0x6f, 0x00, 0x56, 0x00, 0x01, 0x23, 0x03, 0xa0,
+0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73,
+0xbe, 0x00, 0x61, 0x6d, 0x6f, 0x76, 0x65, 0x00, 0x61, 0x5a,
+0x03, 0x01, 0x1f, 0x00, 0x00, 0x0c, 0x04, 0x74, 0x2e, 0x00,
+0x50, 0x72, 0x65, 0x73, 0x73, 0xf0, 0x00, 0x21, 0x72, 0x65,
+0x13, 0x01, 0x82, 0x6f, 0x72, 0x00, 0x73, 0x70, 0x61, 0x63,
+0x65, 0x3b, 0x00, 0x06, 0x2b, 0x01, 0x0c, 0x6c, 0x01, 0x0a,
+0x20, 0x04, 0x50, 0x00, 0x72, 0x65, 0x73, 0x70, 0x74, 0x02,
+0x10, 0x76, 0x29, 0x02, 0x22, 0x28, 0x61, 0x67, 0x00, 0x15,
+0x6e, 0x36, 0x01, 0x13, 0x65, 0xd2, 0x00, 0x05, 0xf3, 0x03,
+0x01, 0x5e, 0x01, 0x6d, 0x77, 0x61, 0x79, 0x00, 0x61, 0x73,
+0x10, 0x01, 0x22, 0x73, 0x29, 0xb7, 0x01, 0x14, 0x70, 0x9f,
+0x00, 0x42, 0x42, 0x61, 0x63, 0x6b, 0x95, 0x00, 0x01, 0x90,
+0x00, 0x59, 0x72, 0x65, 0x73, 0x65, 0x74, 0x2a, 0x02, 0x01,
+0x9a, 0x00, 0x03, 0x7a, 0x02, 0x14, 0x32, 0x7a, 0x02, 0x92,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x7c,
+0x02, 0x56, 0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x01,
+0x1b, 0x05, 0x60, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0xbe,
+0x01, 0x41, 0x66, 0x72, 0x6f, 0x6d, 0x89, 0x00, 0xe1, 0x60,
+0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
+0x00, 0x6f, 0x70, 0x03, 0x03, 0x22, 0x6f, 0x6e, 0x1a, 0x00,
+0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
+0x75, 0x6b, 0x00, 0x90, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c,
+0x00, 0x48, 0x65, 0x5d, 0x02, 0x00, 0x1f, 0x05, 0x30, 0x69,
+0x7a, 0x65, 0xe2, 0x04, 0x01, 0x67, 0x05, 0x24, 0x69, 0x6e,
+0xe4, 0x04, 0x00, 0x2b, 0x00, 0x31, 0x41, 0x67, 0x67, 0xcb,
+0x00, 0x82, 0x76, 0x65, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72,
+0x5a, 0x03, 0x00, 0x43, 0x00, 0x22, 0x74, 0x68, 0xb3, 0x03,
+0x03, 0x6a, 0x00, 0x42, 0x73, 0x65, 0x74, 0x2c, 0xa0, 0x01,
+0x00, 0x1f, 0x01, 0x03, 0x2c, 0x00, 0x23, 0x6f, 0x72, 0x87,
+0x01, 0x91, 0x72, 0x79, 0x00, 0x68, 0x61, 0x72, 0x64, 0x65,
+0x72, 0xf3, 0x00, 0xf1, 0x05, 0x6c, 0x69, 0x6d, 0x69, 0x6e,
+0x61, 0x74, 0x65, 0x00, 0x75, 0x6e, 0x6e, 0x65, 0x63, 0x65,
+0x73, 0x73, 0x61, 0x72, 0x79, 0x1a, 0x05, 0x14, 0x73, 0xb1,
+0x00, 0x62, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2e, 0x18, 0x05,
+0x52, 0x73, 0x6c, 0x6f, 0x77, 0x73, 0x7f, 0x02, 0x06, 0x83,
+0x00, 0xf1, 0x0a, 0x2c, 0x00, 0x73, 0x6f, 0x00, 0x69, 0x74,
+0x27, 0x73, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x72, 0x65, 0x63,
+0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x65, 0x64, 0xc6, 0x02,
+0x01, 0x3f, 0x00, 0x70, 0x73, 0x00, 0x6c, 0x61, 0x72, 0x67,
+0x65, 0xd4, 0x02, 0x10, 0x61, 0x30, 0x00, 0xb0, 0x61, 0x79,
+0x2c, 0x00, 0x33, 0x30, 0x2a, 0x33, 0x30, 0x2e, 0x00,
+};
+
+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 b0224838cf..de528b53bc 100644
--- a/apps/plugins/puzzles/help/net.c
+++ b/apps/plugins/puzzles/help/net.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,268 +6,296 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 3, TEXT_UNDERLINE },
- { 120, TEXT_CENTER | C_RED },
- { 140, TEXT_UNDERLINE },
- { 147, TEXT_UNDERLINE },
- { 155, TEXT_UNDERLINE },
- { 163, TEXT_UNDERLINE },
- { 168, TEXT_UNDERLINE },
- { 221, TEXT_UNDERLINE },
- { 257, TEXT_UNDERLINE },
- { 313, TEXT_UNDERLINE },
- { 344, TEXT_CENTER | C_RED },
- { 361, TEXT_UNDERLINE },
+ { 4, TEXT_UNDERLINE },
+ { 121, TEXT_CENTER | C_RED },
+ { 141, TEXT_UNDERLINE },
+ { 148, TEXT_UNDERLINE },
+ { 156, TEXT_UNDERLINE },
+ { 164, TEXT_UNDERLINE },
+ { 169, TEXT_UNDERLINE },
+ { 222, TEXT_UNDERLINE },
+ { 258, TEXT_UNDERLINE },
+ { 314, TEXT_UNDERLINE },
+ { 345, TEXT_CENTER | C_RED },
  { 362, TEXT_UNDERLINE },
- { 372, TEXT_UNDERLINE },
- { 398, TEXT_UNDERLINE },
- { 485, TEXT_UNDERLINE },
- { 553, TEXT_UNDERLINE },
- { 598, TEXT_UNDERLINE },
+ { 363, TEXT_UNDERLINE },
+ { 373, TEXT_UNDERLINE },
+ { 399, TEXT_UNDERLINE },
+ { 486, TEXT_UNDERLINE },
+ { 554, TEXT_UNDERLINE },
+ { 599, TEXT_UNDERLINE },
+ { 614, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 3439 comp 2361 ratio 0.686537 level 10 saved 1078 */
+/* orig 3919 comp 2622 ratio 0.669048 level 10 saved 1297 */
 const char help_text[] = {
-0xf4, 0x57, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
-0x33, 0x3a, 0x20, 0x4e, 0x65, 0x74, 0x20, 0x00, 0x00, 0x00,
-0x28, 0x4e, 0x6f, 0x74, 0x65, 0x3a, 0x00, 0x74, 0x68, 0x65,
-0x00, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x73, 0x00, 0x76,
-0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x00, 0x6f, 0x66, 0x00,
-0x74, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00,
-0x69, 0x73, 0x00, 0x63, 0x61, 0x6c, 0x6c, 0x65, 0x64, 0x00,
-0x4e, 0x45, 0x54, 0x47, 0x41, 0x4d, 0x45, 0x2e, 0x45, 0x58,
-0x45, 0x00, 0x74, 0x6f, 0x00, 0x61, 0x76, 0x6f, 0x69, 0x64,
-0x00, 0x63, 0x6c, 0x61, 0x73, 0x68, 0x69, 0x6e, 0x67, 0x00,
-0x77, 0x69, 0x74, 0x68, 0x4a, 0x00, 0x60, 0x27, 0x73, 0x00,
-0x6f, 0x77, 0x6e, 0x31, 0x00, 0x00, 0x2d, 0x00, 0xf2, 0x06,
-0x2e, 0x29, 0x00, 0x00, 0x00, 0x49, 0x00, 0x6f, 0x72, 0x69,
-0x67, 0x69, 0x6e, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x61,
-0x77, 0x62, 0x00, 0x21, 0x69, 0x6e, 0x81, 0x00, 0x40, 0x66,
-0x6f, 0x72, 0x6d, 0x76, 0x00, 0x30, 0x61, 0x00, 0x46, 0x4f,
-0x00, 0x02, 0x79, 0x00, 0x03, 0x76, 0x00, 0xf0, 0x18, 0x46,
-0x72, 0x65, 0x65, 0x4e, 0x65, 0x74, 0x00, 0x5b, 0x31, 0x5d,
-0x2c, 0x00, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x00,
-0x62, 0x79, 0x00, 0x50, 0x61, 0x76, 0x69, 0x6c, 0x73, 0x00,
-0x4a, 0x75, 0x72, 0x6a, 0x61, 0x6e, 0x73, 0x3b, 0x48, 0x00,
-0xf0, 0x01, 0x72, 0x65, 0x00, 0x61, 0x72, 0x65, 0x00, 0x73,
-0x65, 0x76, 0x65, 0x72, 0x61, 0x6c, 0x00, 0x6f, 0x13, 0x00,
-0xf1, 0x07, 0x00, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65,
-0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x00, 0x75,
-0x6e, 0x64, 0x65, 0x72, 0x76, 0x00, 0x10, 0x6e, 0x66, 0x00,
-0xf0, 0x19, 0x4e, 0x65, 0x74, 0x57, 0x61, 0x6c, 0x6b, 0x2e,
-0x00, 0x54, 0x68, 0x65, 0x00, 0x63, 0x6f, 0x6d, 0x70, 0x75,
-0x74, 0x65, 0x72, 0x00, 0x70, 0x72, 0x65, 0x70, 0x61, 0x72,
-0x65, 0x73, 0x00, 0x61, 0x00, 0x6e, 0x65, 0x74, 0x77, 0x6f,
-0x72, 0x6b, 0x73, 0x00, 0x70, 0x63, 0x6f, 0x6e, 0x6e, 0x65,
-0x63, 0x74, 0xee, 0x00, 0x21, 0x75, 0x70, 0x43, 0x00, 0x40,
-0x63, 0x65, 0x6e, 0x74, 0x27, 0x00, 0x61, 0x6f, 0x66, 0x00,
-0x73, 0x71, 0x75, 0x32, 0x00, 0xe0, 0x69, 0x6e, 0x00, 0x61,
-0x00, 0x67, 0x72, 0x69, 0x64, 0x2c, 0x00, 0x61, 0x6e, 0x64,
-0x26, 0x00, 0xa2, 0x6e, 0x00, 0x73, 0x68, 0x75, 0x66, 0x66,
-0x6c, 0x65, 0x73, 0x77, 0x00, 0x06, 0x51, 0x00, 0x41, 0x72,
-0x6f, 0x74, 0x61, 0x4f, 0x00, 0x00, 0xb2, 0x00, 0xf0, 0x0a,
-0x79, 0x00, 0x74, 0x69, 0x6c, 0x65, 0x00, 0x72, 0x61, 0x6e,
-0x64, 0x6f, 0x6d, 0x6c, 0x79, 0x2e, 0x00, 0x59, 0x6f, 0x75,
-0x72, 0x00, 0x6a, 0x6f, 0x62, 0x83, 0x01, 0x22, 0x74, 0x6f,
-0x2d, 0x00, 0xf2, 0x09, 0x65, 0x00, 0x69, 0x74, 0x00, 0x61,
-0x6c, 0x6c, 0x00, 0x62, 0x61, 0x63, 0x6b, 0x00, 0x69, 0x6e,
-0x74, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0xc0, 0x00,
-0xf0, 0x01, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66,
-0x75, 0x6c, 0x00, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0xcd, 0x01,
-0x20, 0x77, 0x69, 0x2e, 0x00, 0xc5, 0x65, 0x00, 0x61, 0x6e,
-0x00, 0x65, 0x6e, 0x74, 0x69, 0x72, 0x65, 0x6c, 0xc9, 0x00,
-0x24, 0x65, 0x64, 0x8d, 0x00, 0x12, 0x2c, 0xbf, 0x01, 0xf0,
-0x03, 0x6e, 0x6f, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64,
-0x00, 0x6c, 0x6f, 0x6f, 0x70, 0x73, 0x2e, 0x00, 0x41, 0x02,
-0x01, 0x81, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x00, 0x61,
-0xd3, 0x00, 0x21, 0x6c, 0x6c, 0xa7, 0x00, 0x71, 0x73, 0x00,
-0x77, 0x68, 0x69, 0x63, 0x68, 0x70, 0x01, 0x06, 0x4e, 0x00,
-0x21, 0x74, 0x6f, 0xe2, 0x00, 0x34, 0x6f, 0x6e, 0x65, 0xda,
-0x01, 0x52, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x97, 0x01, 0xe0,
-0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x65,
-0x64, 0x2e, 0x00, 0x00, 0xd0, 0x01, 0xd2, 0x00, 0x68, 0x74,
-0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6a,
-0xc8, 0x01, 0xe3, 0x2e, 0x6c, 0x76, 0x2f, 0x73, 0x74, 0x75,
-0x66, 0x66, 0x2f, 0x6e, 0x65, 0x74, 0x2f, 0xfc, 0x01, 0xa1,
-0x2e, 0x68, 0x74, 0x6d, 0x00, 0x00, 0x00, 0x33, 0x2e, 0x31,
-0xbd, 0x02, 0x80, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
-0x73, 0xc6, 0x02, 0x15, 0x54, 0xa8, 0x02, 0x30, 0x63, 0x61,
-0x6e, 0xe7, 0x00, 0x62, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64,
-0xcf, 0x00, 0x43, 0x65, 0x69, 0x74, 0x68, 0xec, 0x01, 0xb2,
-0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x6f,
-0x72, 0x98, 0x00, 0x33, 0x6f, 0x75, 0x73, 0x35, 0x01, 0x04,
-0x4f, 0x00, 0x00, 0xa5, 0x00, 0xb0, 0x3a, 0x00, 0x00, 0x00,
-0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x20, 0xe6, 0x00, 0x12,
-0x3a, 0x28, 0x00, 0xf0, 0x00, 0x00, 0x70, 0x6f, 0x69, 0x6e,
-0x74, 0x65, 0x72, 0x2c, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77,
-0x4d, 0x00, 0x51, 0x73, 0x00, 0x00, 0x00, 0x52, 0x91, 0x01,
-0x01, 0x29, 0x00, 0xf3, 0x05, 0x20, 0x61, 0x6e, 0x74, 0x69,
-0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x3a,
-0x00, 0x6c, 0x65, 0x66, 0x74, 0x3c, 0x00, 0xb0, 0x62, 0x75,
-0x74, 0x74, 0x6f, 0x6e, 0x2c, 0x00, 0x60, 0x41, 0x27, 0x39,
-0x00, 0x0b, 0x38, 0x00, 0x07, 0x34, 0x00, 0x10, 0x72, 0x1c,
-0x01, 0x0c, 0x35, 0x00, 0x1f, 0x44, 0x35, 0x00, 0x01, 0xf4,
-0x03, 0x62, 0x79, 0x20, 0x31, 0x38, 0x30, 0x20, 0x64, 0x65,
-0x67, 0x72, 0x65, 0x65, 0x73, 0x3a, 0x00, 0x60, 0x46, 0x26,
-0x00, 0xb0, 0x4c, 0x6f, 0x63, 0x6b, 0x20, 0x28, 0x6f, 0x72,
-0x20, 0x75, 0x6e, 0x59, 0x00, 0x14, 0x29, 0xc6, 0x00, 0x02,
-0x86, 0x01, 0x0a, 0x5c, 0x00, 0xf4, 0x00, 0x73, 0x68, 0x69,
-0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x2c, 0x00,
-0x60, 0x53, 0x43, 0x00, 0x31, 0x59, 0x6f, 0x75, 0x4c, 0x01,
-0x00, 0x40, 0x00, 0x22, 0x00, 0x61, 0x94, 0x02, 0xa0, 0x6f,
-0x6e, 0x63, 0x65, 0x00, 0x79, 0x6f, 0x75, 0x27, 0x72, 0x64,
-0x02, 0x20, 0x72, 0x65, 0xf0, 0x02, 0x30, 0x69, 0x74, 0x73,
-0xd3, 0x03, 0x04, 0x59, 0x03, 0x15, 0x2e, 0x39, 0x00, 0x52,
-0x61, 0x6c, 0x73, 0x6f, 0x00, 0x80, 0x00, 0x01, 0xad, 0x02,
-0x50, 0x67, 0x61, 0x69, 0x6e, 0x2c, 0x76, 0x00, 0x00, 0x33,
-0x02, 0x10, 0x6c, 0xc1, 0x02, 0x21, 0x27, 0x73, 0x5e, 0x00,
-0x42, 0x65, 0x64, 0x00, 0x79, 0x34, 0x00, 0x80, 0x27, 0x74,
-0x00, 0x61, 0x63, 0x63, 0x69, 0x64, 0x4d, 0x00, 0x00, 0x20,
-0x04, 0x81, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x69, 0x74, 0x2e,
-0xe1, 0x01, 0x00, 0x1f, 0x04, 0x40, 0x6c, 0x6c, 0x6f, 0x77,
-0x28, 0x03, 0x08, 0xac, 0x01, 0x70, 0x00, 0x6e, 0x6f, 0x74,
-0x00, 0x6e, 0x65, 0xf1, 0x02, 0x10, 0x61, 0x3d, 0x03, 0x11,
-0x6f, 0xbf, 0x03, 0x41, 0x6c, 0x65, 0x74, 0x65, 0xe2, 0x01,
-0x00, 0x15, 0x02, 0x02, 0x77, 0x00, 0x30, 0x6d, 0x61, 0x79,
-0x1a, 0x02, 0x61, 0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0xe2,
-0x01, 0x00, 0xfa, 0x00, 0x10, 0x20, 0xa4, 0x03, 0x12, 0x3a,
-0x0c, 0x00, 0x2a, 0x00, 0x2b, 0xda, 0x01, 0x21, 0x4f, 0x6e,
-0xc2, 0x03, 0x00, 0xb0, 0x03, 0x84, 0x61, 0x74, 0x00, 0x77,
-0x72, 0x61, 0x70, 0x2c, 0xab, 0x00, 0x42, 0x00, 0x6d, 0x6f,
-0x76, 0x61, 0x00, 0x02, 0xd0, 0x04, 0x02, 0x2d, 0x05, 0x13,
-0x65, 0xf2, 0x03, 0x22, 0x73, 0x6f, 0x33, 0x00, 0x02, 0x23,
-0x03, 0x02, 0x3e, 0x00, 0x00, 0x97, 0x04, 0x00, 0x55, 0x05,
-0xd8, 0x70, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x65, 0x00, 0x73,
-0x69, 0x64, 0x65, 0x73, 0x37, 0x00, 0x04, 0xbb, 0x02, 0x90,
-0x73, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x6f, 0x67, 0x65, 0xb6,
-0x02, 0x00, 0xfc, 0x00, 0x52, 0x4d, 0x6f, 0x76, 0x65, 0x20,
-0x63, 0x04, 0x6c, 0x3a, 0x00, 0x43, 0x74, 0x72, 0x6c, 0xa8,
-0x00, 0x04, 0x73, 0x01, 0x63, 0x63, 0x68, 0x61, 0x6e, 0x67,
-0x65, 0x93, 0x03, 0x11, 0x74, 0x65, 0x01, 0x30, 0x73, 0x00,
-0x75, 0xc8, 0x03, 0x12, 0x61, 0x74, 0x04, 0x51, 0x73, 0x6f,
-0x75, 0x72, 0x63, 0xb7, 0x01, 0x05, 0x86, 0x03, 0xd0, 0x69,
-0x6e, 0x67, 0x2e, 0x00, 0x28, 0x49, 0x74, 0x00, 0x64, 0x6f,
-0x65, 0x73, 0x82, 0x01, 0x70, 0x75, 0x6c, 0x74, 0x69, 0x6d,
-0x61, 0x74, 0x20, 0x04, 0x30, 0x6d, 0x61, 0x74, 0x06, 0x05,
-0x07, 0x50, 0x00, 0x02, 0xae, 0x05, 0x20, 0x73, 0x2c, 0x51,
-0x00, 0x07, 0xad, 0x04, 0x04, 0x5d, 0x04, 0x09, 0x03, 0x04,
-0x02, 0x20, 0x00, 0x02, 0x7e, 0x05, 0x02, 0x8d, 0x00, 0x00,
-0x13, 0x05, 0x75, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74,
-0x99, 0x04, 0x02, 0x9c, 0x01, 0x15, 0x69, 0x9f, 0x01, 0x40,
-0x68, 0x65, 0x6c, 0x70, 0xb9, 0x04, 0x03, 0x39, 0x04, 0x01,
-0x71, 0x03, 0x50, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x33, 0x01,
-0x33, 0x74, 0x61, 0x67, 0x66, 0x05, 0x30, 0x6f, 0x6c, 0x76,
-0x09, 0x02, 0x00, 0x23, 0x00, 0x61, 0x70, 0x75, 0x7a, 0x7a,
-0x6c, 0x65, 0x5e, 0x06, 0x52, 0x4a, 0x75, 0x6d, 0x62, 0x6c,
-0x1e, 0x03, 0x00, 0x10, 0x03, 0x14, 0x4a, 0xcd, 0x02, 0x01,
-0x1f, 0x04, 0x22, 0x6b, 0x65, 0x52, 0x02, 0x17, 0x73, 0xbe,
-0x04, 0x01, 0x9b, 0x01, 0x04, 0x45, 0x02, 0x03, 0x8d, 0x02,
-0x23, 0x74, 0x6f, 0x7d, 0x05, 0x08, 0xd8, 0x02, 0x20, 0x73,
-0x2e, 0x2c, 0x07, 0x31, 0x41, 0x6c, 0x6c, 0x73, 0x00, 0x22,
-0x61, 0x63, 0x45, 0x06, 0x90, 0x64, 0x65, 0x73, 0x63, 0x72,
-0x69, 0x62, 0x65, 0x64, 0xaf, 0x00, 0x31, 0x73, 0x65, 0x63,
-0x6a, 0x05, 0x31, 0x32, 0x2e, 0x31, 0x53, 0x00, 0x01, 0x01,
-0x03, 0x73, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0xa0,
-0x00, 0x31, 0x33, 0x2e, 0x32, 0xbb, 0x04, 0x93, 0x70, 0x61,
-0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0xbd, 0x04, 0x10,
-0x65, 0x5d, 0x04, 0x05, 0x14, 0x00, 0x02, 0x3e, 0x00, 0x04,
-0x39, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x76, 0x00,
-0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
-0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6c, 0x00, 0x22, 0x6f, 0x6e,
-0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
-0x65, 0x6e, 0x75, 0xa8, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74,
-0x68, 0x2c, 0x00, 0x48, 0x65, 0x4b, 0x04, 0x51, 0x00, 0x00,
-0x53, 0x69, 0x7a, 0xf5, 0x01, 0x01, 0x66, 0x02, 0x22, 0x69,
-0x6e, 0xfc, 0x00, 0x01, 0x29, 0x00, 0x50, 0x61, 0x6c, 0x6c,
-0x73, 0x20, 0xd9, 0x02, 0x70, 0x20, 0x61, 0x72, 0x6f, 0x75,
-0x6e, 0x64, 0xa2, 0x07, 0x50, 0x66, 0x00, 0x63, 0x68, 0x65,
-0x0a, 0x01, 0x61, 0x2c, 0x00, 0x66, 0x6c, 0x6f, 0x77, 0x5a,
-0x02, 0x46, 0x70, 0x61, 0x73, 0x73, 0x89, 0x00, 0x01, 0xd7,
-0x04, 0x44, 0x65, 0x64, 0x67, 0x65, 0xea, 0x05, 0x02, 0xb4,
-0x04, 0x00, 0x12, 0x00, 0x02, 0xee, 0x06, 0x02, 0x2a, 0x00,
-0x20, 0x6f, 0x70, 0x20, 0x00, 0x62, 0x62, 0x6f, 0x74, 0x74,
-0x6f, 0x6d, 0x18, 0x00, 0x41, 0x76, 0x69, 0x63, 0x65, 0x5f,
-0x08, 0x10, 0x61, 0x7e, 0x00, 0xf0, 0x03, 0x42, 0x61, 0x72,
-0x72, 0x69, 0x65, 0x72, 0x20, 0x70, 0x72, 0x6f, 0x62, 0x61,
-0x62, 0x69, 0x6c, 0x69, 0x74, 0xac, 0x01, 0xd0, 0x41, 0x00,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x62, 0x65, 0x74,
-0x77, 0x0b, 0x03, 0x31, 0x30, 0x2e, 0x30, 0x3d, 0x00, 0x34,
-0x31, 0x2e, 0x30, 0xf9, 0x03, 0x11, 0x6c, 0x6a, 0x08, 0x11,
-0x68, 0x22, 0x03, 0x00, 0xd2, 0x06, 0x51, 0x69, 0x6d, 0x6d,
-0x6f, 0x76, 0x2d, 0x01, 0x12, 0x62, 0x54, 0x00, 0x00, 0xf9,
-0x02, 0x01, 0x11, 0x07, 0x15, 0x64, 0x47, 0x00, 0x34, 0x74,
-0x77, 0x6f, 0xf5, 0x01, 0x10, 0x6f, 0xd9, 0x07, 0x42, 0x76,
-0x65, 0x6e, 0x74, 0xe1, 0x00, 0x05, 0x22, 0x00, 0x61, 0x68,
-0x65, 0x6d, 0x00, 0x28, 0x61, 0x1c, 0x03, 0x24, 0x65, 0x72,
-0x87, 0x00, 0x95, 0x67, 0x69, 0x76, 0x65, 0x73, 0x00, 0x6d,
-0x6f, 0x72, 0x5d, 0x00, 0x86, 0x73, 0x29, 0x2e, 0x00, 0x53,
-0x69, 0x6e, 0x63, 0x11, 0x00, 0x01, 0xb2, 0x01, 0x05, 0x85,
-0x00, 0x10, 0x2c, 0x4a, 0x00, 0x10, 0x79, 0x25, 0x02, 0x00,
-0x27, 0x03, 0xb4, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61,
-0x69, 0x6e, 0x74, 0x73, 0xaf, 0x01, 0x05, 0x95, 0x07, 0x80,
-0x28, 0x69, 0x2e, 0x65, 0x2e, 0x2c, 0x00, 0x68, 0x1d, 0x00,
-0x14, 0x29, 0xe7, 0x04, 0x01, 0xa6, 0x01, 0x51, 0x67, 0x65,
-0x6e, 0x65, 0x72, 0x7a, 0x02, 0x00, 0xb1, 0x01, 0x00, 0xf9,
-0x08, 0x50, 0x68, 0x61, 0x73, 0x00, 0x62, 0xa7, 0x00, 0x30,
-0x63, 0x61, 0x72, 0xc2, 0x04, 0x20, 0x6c, 0x79, 0x05, 0x04,
-0x00, 0xf1, 0x03, 0x16, 0x64, 0x70, 0x04, 0x1c, 0x68, 0x94,
-0x00, 0x60, 0x6e, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x52, 0x05,
-0x04, 0x6b, 0x04, 0x48, 0x72, 0x65, 0x73, 0x74, 0x77, 0x04,
-0x12, 0x2e, 0x1e, 0x03, 0x43, 0x6d, 0x65, 0x61, 0x6e, 0x10,
-0x03, 0x21, 0x69, 0x66, 0xe6, 0x04, 0x82, 0x6e, 0x6f, 0x74,
-0x65, 0x00, 0x64, 0x6f, 0x77, 0xb4, 0x00, 0x03, 0x13, 0x03,
-0x42, 0x73, 0x65, 0x65, 0x64, 0x53, 0x04, 0x24, 0x74, 0x6f,
-0xa5, 0x00, 0x12, 0x65, 0x04, 0x09, 0x30, 0x75, 0x72, 0x72,
-0x67, 0x00, 0x02, 0x8f, 0x03, 0x57, 0x00, 0x28, 0x73, 0x65,
-0x65, 0x13, 0x03, 0x34, 0x32, 0x29, 0x2c, 0x9f, 0x04, 0x00,
-0x2d, 0x00, 0x0f, 0xfb, 0x01, 0x01, 0x05, 0x01, 0x03, 0x07,
-0x32, 0x09, 0x40, 0x72, 0x65, 0x2d, 0x65, 0x02, 0x04, 0x02,
-0x37, 0x01, 0x29, 0x61, 0x6d, 0x88, 0x00, 0x02, 0x8d, 0x05,
-0x70, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x6f, 0x00,
-0x76, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x2d, 0x00,
-0x41, 0x73, 0x74, 0x61, 0x72, 0x59, 0x09, 0x02, 0x97, 0x05,
-0x01, 0x0e, 0x08, 0x02, 0x9a, 0x08, 0x24, 0x6c, 0x79, 0x8f,
-0x00, 0x24, 0x62, 0x65, 0x49, 0x04, 0x03, 0xf1, 0x01, 0x25,
-0x6f, 0x66, 0x44, 0x01, 0x43, 0x2e, 0x00, 0x53, 0x6f, 0x0f,
-0x01, 0x01, 0xf4, 0x06, 0x60, 0x74, 0x75, 0x63, 0x6b, 0x00,
-0x6f, 0xc7, 0x04, 0x10, 0x70, 0x59, 0x00, 0x52, 0x63, 0x75,
-0x6c, 0x61, 0x72, 0xb0, 0x01, 0x20, 0x61, 0x6e, 0x45, 0x09,
-0x00, 0x6a, 0x05, 0x01, 0xce, 0x01, 0x03, 0x28, 0x06, 0x02,
-0x9a, 0x00, 0x00, 0x85, 0x00, 0x00, 0x2a, 0x0a, 0x23, 0x61,
-0x6e, 0x8b, 0x0a, 0x52, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x88,
-0x05, 0x71, 0x4e, 0x65, 0x74, 0x2c, 0x00, 0x73, 0x65, 0x20,
-0x00, 0x05, 0xb7, 0x00, 0x07, 0x0b, 0x04, 0x00, 0x1d, 0x05,
-0x05, 0x92, 0x02, 0x04, 0xdd, 0x02, 0x07, 0x36, 0x01, 0x02,
-0x2c, 0x01, 0x06, 0x24, 0x01, 0x01, 0x04, 0x09, 0x01, 0xa5,
-0x01, 0x05, 0xae, 0x03, 0x04, 0x71, 0x0b, 0x01, 0x46, 0x02,
-0x11, 0x77, 0x9a, 0x0b, 0x00, 0x6b, 0x02, 0x20, 0x45, 0x6e,
-0xc3, 0x07, 0x85, 0x20, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65,
-0x20, 0x93, 0x02, 0x60, 0x00, 0x00, 0x4e, 0x6f, 0x72, 0x6d,
-0x7f, 0x07, 0x13, 0x2c, 0x31, 0x00, 0x63, 0x6c, 0x6c, 0x00,
-0x6d, 0x61, 0x6b, 0xf2, 0x07, 0x05, 0x67, 0x02, 0x02, 0xe7,
-0x01, 0x10, 0x73, 0xba, 0x05, 0x50, 0x70, 0x72, 0x65, 0x73,
-0x65, 0xdf, 0x02, 0x33, 0x68, 0x61, 0x76, 0x5c, 0x01, 0x26,
-0x6f, 0x6e, 0xe6, 0x02, 0x33, 0x2e, 0x00, 0x50, 0x2c, 0x00,
-0x01, 0x80, 0x01, 0x94, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75,
-0x6f, 0x75, 0x73, 0x1e, 0x02, 0x14, 0x73, 0xf9, 0x06, 0x01,
-0x64, 0x03, 0x40, 0x64, 0x69, 0x66, 0x66, 0x59, 0x01, 0x11,
-0x74, 0xd9, 0x00, 0x21, 0x6d, 0x6f, 0x6b, 0x08, 0x41, 0x62,
-0x74, 0x6c, 0x65, 0x56, 0x07, 0x03, 0x9b, 0x02, 0x45, 0x6c,
-0x69, 0x6b, 0x65, 0x8a, 0x07, 0x01, 0x26, 0x08, 0x23, 0x6f,
-0x66, 0xad, 0x0c, 0x40, 0x66, 0x65, 0x61, 0x74, 0xa9, 0x00,
-0x00, 0x3e, 0x00, 0x40, 0x72, 0x69, 0x73, 0x6b, 0x95, 0x00,
-0x00, 0xe1, 0x01, 0x06, 0x77, 0x00, 0x03, 0xba, 0x00, 0x10,
-0x2e, 0xcf, 0x05, 0x81, 0x73, 0x6f, 0x2c, 0x00, 0x66, 0x69,
-0x6e, 0x64, 0x22, 0x00, 0x03, 0xdd, 0x05, 0x76, 0x70, 0x6f,
-0x73, 0x73, 0x69, 0x62, 0x6c, 0xc1, 0x00, 0x05, 0xa1, 0x00,
-0x00, 0xd6, 0x08, 0x30, 0x64, 0x64, 0x69, 0x14, 0x00, 0x20,
-0x61, 0x6c, 0x40, 0x02, 0x51, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
-0xb8, 0x0c, 0x02, 0x1c, 0x00, 0x30, 0x76, 0x61, 0x6e, 0x73,
-0x04, 0x90, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, 0x29,
-0x00,
+0xf9, 0x02, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0x33, 0x3a, 0x20, 0x4e, 0x65, 0x74, 0x20, 0x00, 0x2d, 0x01,
+0x00, 0xf4, 0x48, 0x00, 0x00, 0x00, 0x28, 0x4e, 0x6f, 0x74,
+0x65, 0x3a, 0x00, 0x74, 0x68, 0x65, 0x00, 0x57, 0x69, 0x6e,
+0x64, 0x6f, 0x77, 0x73, 0x00, 0x76, 0x65, 0x72, 0x73, 0x69,
+0x6f, 0x6e, 0x00, 0x6f, 0x66, 0x00, 0x74, 0x68, 0x69, 0x73,
+0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x69, 0x73, 0x00, 0x63,
+0x61, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x4e, 0x45, 0x54, 0x47,
+0x41, 0x4d, 0x45, 0x2e, 0x45, 0x58, 0x45, 0x00, 0x74, 0x6f,
+0x00, 0x61, 0x76, 0x6f, 0x69, 0x64, 0x00, 0x63, 0x6c, 0x61,
+0x73, 0x68, 0x69, 0x6e, 0x67, 0x00, 0x77, 0x69, 0x74, 0x68,
+0x4a, 0x00, 0x60, 0x27, 0x73, 0x00, 0x6f, 0x77, 0x6e, 0x31,
+0x00, 0x00, 0x2d, 0x00, 0xf2, 0x06, 0x2e, 0x29, 0x00, 0x00,
+0x00, 0x49, 0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61,
+0x6c, 0x6c, 0x79, 0x00, 0x73, 0x61, 0x77, 0x62, 0x00, 0x21,
+0x69, 0x6e, 0x81, 0x00, 0x40, 0x66, 0x6f, 0x72, 0x6d, 0x76,
+0x00, 0x30, 0x61, 0x00, 0x46, 0x4f, 0x00, 0x02, 0x79, 0x00,
+0x03, 0x76, 0x00, 0xf0, 0x18, 0x46, 0x72, 0x65, 0x65, 0x4e,
+0x65, 0x74, 0x00, 0x5b, 0x31, 0x5d, 0x2c, 0x00, 0x77, 0x72,
+0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x50,
+0x61, 0x76, 0x69, 0x6c, 0x73, 0x00, 0x4a, 0x75, 0x72, 0x6a,
+0x61, 0x6e, 0x73, 0x3b, 0x48, 0x00, 0xf0, 0x01, 0x72, 0x65,
+0x00, 0x61, 0x72, 0x65, 0x00, 0x73, 0x65, 0x76, 0x65, 0x72,
+0x61, 0x6c, 0x00, 0x6f, 0x13, 0x00, 0xf1, 0x07, 0x00, 0x69,
+0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74,
+0x69, 0x6f, 0x6e, 0x73, 0x00, 0x75, 0x6e, 0x64, 0x65, 0x72,
+0x76, 0x00, 0x10, 0x6e, 0x66, 0x00, 0xf0, 0x19, 0x4e, 0x65,
+0x74, 0x57, 0x61, 0x6c, 0x6b, 0x2e, 0x00, 0x54, 0x68, 0x65,
+0x00, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x72, 0x00,
+0x70, 0x72, 0x65, 0x70, 0x61, 0x72, 0x65, 0x73, 0x00, 0x61,
+0x00, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x00,
+0x70, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0xee, 0x00,
+0x21, 0x75, 0x70, 0x43, 0x00, 0x40, 0x63, 0x65, 0x6e, 0x74,
+0x27, 0x00, 0x61, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x32,
+0x00, 0xe0, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69,
+0x64, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x26, 0x00, 0xa2, 0x6e,
+0x00, 0x73, 0x68, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x73, 0x77,
+0x00, 0x06, 0x51, 0x00, 0x41, 0x72, 0x6f, 0x74, 0x61, 0x4f,
+0x00, 0x00, 0xb2, 0x00, 0xf0, 0x0a, 0x79, 0x00, 0x74, 0x69,
+0x6c, 0x65, 0x00, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x6c,
+0x79, 0x2e, 0x00, 0x59, 0x6f, 0x75, 0x72, 0x00, 0x6a, 0x6f,
+0x62, 0x83, 0x01, 0x22, 0x74, 0x6f, 0x2d, 0x00, 0xf2, 0x09,
+0x65, 0x00, 0x69, 0x74, 0x00, 0x61, 0x6c, 0x6c, 0x00, 0x62,
+0x61, 0x63, 0x6b, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00, 0x70,
+0x6c, 0x61, 0x63, 0x65, 0xc0, 0x00, 0xf0, 0x01, 0x73, 0x75,
+0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x00, 0x73,
+0x6f, 0x6c, 0x75, 0x74, 0xcd, 0x01, 0x20, 0x77, 0x69, 0x2e,
+0x00, 0xc5, 0x65, 0x00, 0x61, 0x6e, 0x00, 0x65, 0x6e, 0x74,
+0x69, 0x72, 0x65, 0x6c, 0xc9, 0x00, 0x24, 0x65, 0x64, 0x8d,
+0x00, 0x12, 0x2c, 0xbf, 0x01, 0xf0, 0x03, 0x6e, 0x6f, 0x00,
+0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, 0x00, 0x6c, 0x6f, 0x6f,
+0x70, 0x73, 0x2e, 0x00, 0x41, 0x02, 0x01, 0x81, 0x76, 0x69,
+0x73, 0x75, 0x61, 0x6c, 0x00, 0x61, 0xd3, 0x00, 0x21, 0x6c,
+0x6c, 0xa7, 0x00, 0x71, 0x73, 0x00, 0x77, 0x68, 0x69, 0x63,
+0x68, 0x70, 0x01, 0x06, 0x4e, 0x00, 0x21, 0x74, 0x6f, 0xe2,
+0x00, 0x34, 0x6f, 0x6e, 0x65, 0xda, 0x01, 0x52, 0x6d, 0x69,
+0x64, 0x64, 0x6c, 0x97, 0x01, 0xe0, 0x68, 0x69, 0x67, 0x68,
+0x6c, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x2e, 0x00, 0x00,
+0xd0, 0x01, 0xd2, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f,
+0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6a, 0xc8, 0x01, 0xe3, 0x2e,
+0x6c, 0x76, 0x2f, 0x73, 0x74, 0x75, 0x66, 0x66, 0x2f, 0x6e,
+0x65, 0x74, 0x2f, 0xfc, 0x01, 0xa1, 0x2e, 0x68, 0x74, 0x6d,
+0x00, 0x00, 0x00, 0x33, 0x2e, 0x31, 0xcc, 0x02, 0xd5, 0x63,
+0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00,
+0x00, 0x54, 0xa8, 0x02, 0x30, 0x63, 0x61, 0x6e, 0xe7, 0x00,
+0x62, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0xcf, 0x00, 0x43,
+0x65, 0x69, 0x74, 0x68, 0xec, 0x01, 0xb2, 0x6b, 0x65, 0x79,
+0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x6f, 0x72, 0x98, 0x00,
+0x33, 0x6f, 0x75, 0x73, 0x35, 0x01, 0x04, 0x4f, 0x00, 0x00,
+0xa5, 0x00, 0xb0, 0x3a, 0x00, 0x00, 0x00, 0x53, 0x65, 0x6c,
+0x65, 0x63, 0x74, 0x20, 0xe6, 0x00, 0x12, 0x3a, 0x28, 0x00,
+0xf0, 0x00, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x65, 0x72,
+0x2c, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x4d, 0x00, 0x51,
+0x73, 0x00, 0x00, 0x00, 0x52, 0x91, 0x01, 0x01, 0x29, 0x00,
+0xf3, 0x05, 0x20, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x6c, 0x6f,
+0x63, 0x6b, 0x77, 0x69, 0x73, 0x65, 0x3a, 0x00, 0x6c, 0x65,
+0x66, 0x74, 0x3c, 0x00, 0xb0, 0x62, 0x75, 0x74, 0x74, 0x6f,
+0x6e, 0x2c, 0x00, 0x60, 0x41, 0x27, 0x39, 0x00, 0x0b, 0x38,
+0x00, 0x07, 0x34, 0x00, 0x10, 0x72, 0x1c, 0x01, 0x0c, 0x35,
+0x00, 0x1f, 0x44, 0x35, 0x00, 0x01, 0xf4, 0x03, 0x62, 0x79,
+0x20, 0x31, 0x38, 0x30, 0x20, 0x64, 0x65, 0x67, 0x72, 0x65,
+0x65, 0x73, 0x3a, 0x00, 0x60, 0x46, 0x26, 0x00, 0xb0, 0x4c,
+0x6f, 0x63, 0x6b, 0x20, 0x28, 0x6f, 0x72, 0x20, 0x75, 0x6e,
+0x59, 0x00, 0x14, 0x29, 0xc6, 0x00, 0x02, 0x86, 0x01, 0x0a,
+0x5c, 0x00, 0xf4, 0x00, 0x73, 0x68, 0x69, 0x66, 0x74, 0x2d,
+0x63, 0x6c, 0x69, 0x63, 0x6b, 0x2c, 0x00, 0x60, 0x53, 0x43,
+0x00, 0x31, 0x59, 0x6f, 0x75, 0x4c, 0x01, 0x00, 0x40, 0x00,
+0x22, 0x00, 0x61, 0x94, 0x02, 0xa0, 0x6f, 0x6e, 0x63, 0x65,
+0x00, 0x79, 0x6f, 0x75, 0x27, 0x72, 0x64, 0x02, 0x20, 0x72,
+0x65, 0xf0, 0x02, 0x30, 0x69, 0x74, 0x73, 0xd3, 0x03, 0x04,
+0x59, 0x03, 0x15, 0x2e, 0x39, 0x00, 0x52, 0x61, 0x6c, 0x73,
+0x6f, 0x00, 0x80, 0x00, 0x01, 0xad, 0x02, 0x50, 0x67, 0x61,
+0x69, 0x6e, 0x2c, 0x76, 0x00, 0x00, 0x33, 0x02, 0x10, 0x6c,
+0xc1, 0x02, 0x21, 0x27, 0x73, 0x5e, 0x00, 0x42, 0x65, 0x64,
+0x00, 0x79, 0x34, 0x00, 0x80, 0x27, 0x74, 0x00, 0x61, 0x63,
+0x63, 0x69, 0x64, 0x4d, 0x00, 0x00, 0x20, 0x04, 0x81, 0x74,
+0x75, 0x72, 0x6e, 0x00, 0x69, 0x74, 0x2e, 0xe1, 0x01, 0x00,
+0x1f, 0x04, 0x40, 0x6c, 0x6c, 0x6f, 0x77, 0x28, 0x03, 0x08,
+0xac, 0x01, 0x70, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x6e, 0x65,
+0xf1, 0x02, 0x10, 0x61, 0x3d, 0x03, 0x11, 0x6f, 0xbf, 0x03,
+0x41, 0x6c, 0x65, 0x74, 0x65, 0xe2, 0x01, 0x00, 0x15, 0x02,
+0x02, 0x77, 0x00, 0x30, 0x6d, 0x61, 0x79, 0x1a, 0x02, 0x61,
+0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0xe2, 0x01, 0x00, 0xfa,
+0x00, 0x10, 0x20, 0xa4, 0x03, 0x12, 0x3a, 0x0c, 0x00, 0x2a,
+0x00, 0x2b, 0xda, 0x01, 0x21, 0x4f, 0x6e, 0xc2, 0x03, 0x00,
+0xb0, 0x03, 0x84, 0x61, 0x74, 0x00, 0x77, 0x72, 0x61, 0x70,
+0x2c, 0xab, 0x00, 0x42, 0x00, 0x6d, 0x6f, 0x76, 0x61, 0x00,
+0x02, 0xd0, 0x04, 0x02, 0x2d, 0x05, 0x13, 0x65, 0xf2, 0x03,
+0x22, 0x73, 0x6f, 0x33, 0x00, 0x02, 0x23, 0x03, 0x02, 0x3e,
+0x00, 0x00, 0x97, 0x04, 0x00, 0x55, 0x05, 0xd8, 0x70, 0x70,
+0x6f, 0x73, 0x69, 0x74, 0x65, 0x00, 0x73, 0x69, 0x64, 0x65,
+0x73, 0x37, 0x00, 0x04, 0xbb, 0x02, 0x90, 0x73, 0x65, 0x65,
+0x6e, 0x00, 0x74, 0x6f, 0x67, 0x65, 0xb6, 0x02, 0x00, 0xfc,
+0x00, 0x52, 0x4d, 0x6f, 0x76, 0x65, 0x20, 0x63, 0x04, 0x6c,
+0x3a, 0x00, 0x43, 0x74, 0x72, 0x6c, 0xa8, 0x00, 0x04, 0x73,
+0x01, 0x63, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x93, 0x03,
+0x11, 0x74, 0x65, 0x01, 0x30, 0x73, 0x00, 0x75, 0xc8, 0x03,
+0x12, 0x61, 0x74, 0x04, 0x51, 0x73, 0x6f, 0x75, 0x72, 0x63,
+0xb7, 0x01, 0x05, 0x86, 0x03, 0xd0, 0x69, 0x6e, 0x67, 0x2e,
+0x00, 0x28, 0x49, 0x74, 0x00, 0x64, 0x6f, 0x65, 0x73, 0x82,
+0x01, 0x70, 0x75, 0x6c, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x20,
+0x04, 0x30, 0x6d, 0x61, 0x74, 0x06, 0x05, 0x07, 0x50, 0x00,
+0x02, 0xae, 0x05, 0x20, 0x73, 0x2c, 0x51, 0x00, 0x07, 0xad,
+0x04, 0x04, 0x5d, 0x04, 0x09, 0x03, 0x04, 0x02, 0x20, 0x00,
+0x02, 0x7e, 0x05, 0x02, 0x8d, 0x00, 0x00, 0x13, 0x05, 0x75,
+0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74, 0x99, 0x04, 0x02,
+0x9c, 0x01, 0x15, 0x69, 0x9f, 0x01, 0x40, 0x68, 0x65, 0x6c,
+0x70, 0xb9, 0x04, 0x03, 0x39, 0x04, 0x01, 0x71, 0x03, 0x50,
+0x6d, 0x65, 0x64, 0x69, 0x61, 0x33, 0x01, 0x33, 0x74, 0x61,
+0x67, 0x66, 0x05, 0x30, 0x6f, 0x6c, 0x76, 0x09, 0x02, 0x00,
+0x23, 0x00, 0x61, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x5e,
+0x06, 0x52, 0x4a, 0x75, 0x6d, 0x62, 0x6c, 0x1e, 0x03, 0x00,
+0x10, 0x03, 0x14, 0x4a, 0xcd, 0x02, 0x01, 0x1f, 0x04, 0x22,
+0x6b, 0x65, 0x52, 0x02, 0x17, 0x73, 0xbe, 0x04, 0x01, 0x9b,
+0x01, 0x04, 0x45, 0x02, 0x03, 0x8d, 0x02, 0x23, 0x74, 0x6f,
+0x7d, 0x05, 0x08, 0xd8, 0x02, 0x20, 0x73, 0x2e, 0x2c, 0x07,
+0x31, 0x41, 0x6c, 0x6c, 0x73, 0x00, 0x22, 0x61, 0x63, 0x45,
+0x06, 0x90, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+0x64, 0xaf, 0x00, 0x31, 0x73, 0x65, 0x63, 0x6a, 0x05, 0x31,
+0x32, 0x2e, 0x31, 0x53, 0x00, 0x01, 0x01, 0x03, 0x73, 0x61,
+0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0xa0, 0x00, 0x31, 0x33,
+0x2e, 0x32, 0xbb, 0x04, 0x93, 0x70, 0x61, 0x72, 0x61, 0x6d,
+0x65, 0x74, 0x65, 0x72, 0xbd, 0x04, 0x10, 0x65, 0x5d, 0x04,
+0x05, 0x14, 0x00, 0x02, 0x3e, 0x00, 0x04, 0x39, 0x00, 0x51,
+0x00, 0x66, 0x72, 0x6f, 0x6d, 0x76, 0x00, 0xe1, 0x60, 0x43,
+0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00,
+0x6f, 0x70, 0x6c, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00, 0xa0,
+0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
+0xa8, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
+0x48, 0x65, 0x4b, 0x04, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a,
+0xf5, 0x01, 0x01, 0x66, 0x02, 0x22, 0x69, 0x6e, 0xfc, 0x00,
+0x01, 0x29, 0x00, 0x50, 0x61, 0x6c, 0x6c, 0x73, 0x20, 0xd9,
+0x02, 0x70, 0x20, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0xa2,
+0x07, 0x50, 0x66, 0x00, 0x63, 0x68, 0x65, 0x0a, 0x01, 0x61,
+0x2c, 0x00, 0x66, 0x6c, 0x6f, 0x77, 0x5a, 0x02, 0x46, 0x70,
+0x61, 0x73, 0x73, 0x89, 0x00, 0x01, 0xd7, 0x04, 0x44, 0x65,
+0x64, 0x67, 0x65, 0xea, 0x05, 0x02, 0xb4, 0x04, 0x00, 0x12,
+0x00, 0x02, 0xee, 0x06, 0x02, 0x2a, 0x00, 0x20, 0x6f, 0x70,
+0x20, 0x00, 0x62, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x18,
+0x00, 0x41, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x08, 0x10, 0x61,
+0x7e, 0x00, 0xf0, 0x03, 0x42, 0x61, 0x72, 0x72, 0x69, 0x65,
+0x72, 0x20, 0x70, 0x72, 0x6f, 0x62, 0x61, 0x62, 0x69, 0x6c,
+0x69, 0x74, 0xac, 0x01, 0xd0, 0x41, 0x00, 0x6e, 0x75, 0x6d,
+0x62, 0x65, 0x72, 0x00, 0x62, 0x65, 0x74, 0x77, 0x0b, 0x03,
+0x31, 0x30, 0x2e, 0x30, 0x3d, 0x00, 0x34, 0x31, 0x2e, 0x30,
+0xf9, 0x03, 0x11, 0x6c, 0x6a, 0x08, 0x11, 0x68, 0x22, 0x03,
+0x00, 0xd2, 0x06, 0x51, 0x69, 0x6d, 0x6d, 0x6f, 0x76, 0x2d,
+0x01, 0x12, 0x62, 0x54, 0x00, 0x00, 0xf9, 0x02, 0x01, 0x11,
+0x07, 0x15, 0x64, 0x47, 0x00, 0x34, 0x74, 0x77, 0x6f, 0xf5,
+0x01, 0x10, 0x6f, 0xd9, 0x07, 0x42, 0x76, 0x65, 0x6e, 0x74,
+0xe1, 0x00, 0x05, 0x22, 0x00, 0x61, 0x68, 0x65, 0x6d, 0x00,
+0x28, 0x61, 0x1c, 0x03, 0x24, 0x65, 0x72, 0x87, 0x00, 0x95,
+0x67, 0x69, 0x76, 0x65, 0x73, 0x00, 0x6d, 0x6f, 0x72, 0x5d,
+0x00, 0x86, 0x73, 0x29, 0x2e, 0x00, 0x53, 0x69, 0x6e, 0x63,
+0x11, 0x00, 0x01, 0xb2, 0x01, 0x05, 0x85, 0x00, 0x10, 0x2c,
+0x4a, 0x00, 0x10, 0x79, 0x25, 0x02, 0x00, 0x27, 0x03, 0xb4,
+0x63, 0x6f, 0x6e, 0x73, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x74,
+0x73, 0xaf, 0x01, 0x05, 0x95, 0x07, 0x80, 0x28, 0x69, 0x2e,
+0x65, 0x2e, 0x2c, 0x00, 0x68, 0x1d, 0x00, 0x14, 0x29, 0xe7,
+0x04, 0x01, 0xa6, 0x01, 0x51, 0x67, 0x65, 0x6e, 0x65, 0x72,
+0x7a, 0x02, 0x00, 0xb1, 0x01, 0x00, 0xf9, 0x08, 0x50, 0x68,
+0x61, 0x73, 0x00, 0x62, 0xa7, 0x00, 0x30, 0x63, 0x61, 0x72,
+0xc2, 0x04, 0x20, 0x6c, 0x79, 0x05, 0x04, 0x00, 0xf1, 0x03,
+0x16, 0x64, 0x70, 0x04, 0x1c, 0x68, 0x94, 0x00, 0x60, 0x6e,
+0x64, 0x65, 0x70, 0x65, 0x6e, 0x52, 0x05, 0x04, 0x6b, 0x04,
+0x48, 0x72, 0x65, 0x73, 0x74, 0x77, 0x04, 0x12, 0x2e, 0x1e,
+0x03, 0x43, 0x6d, 0x65, 0x61, 0x6e, 0x10, 0x03, 0x21, 0x69,
+0x66, 0xe6, 0x04, 0x82, 0x6e, 0x6f, 0x74, 0x65, 0x00, 0x64,
+0x6f, 0x77, 0xb4, 0x00, 0x03, 0x13, 0x03, 0x42, 0x73, 0x65,
+0x65, 0x64, 0x53, 0x04, 0x24, 0x74, 0x6f, 0xa5, 0x00, 0x12,
+0x65, 0x04, 0x09, 0x30, 0x75, 0x72, 0x72, 0x67, 0x00, 0x02,
+0x8f, 0x03, 0x57, 0x00, 0x28, 0x73, 0x65, 0x65, 0x13, 0x03,
+0x34, 0x32, 0x29, 0x2c, 0x9f, 0x04, 0x00, 0x2d, 0x00, 0x0f,
+0xfb, 0x01, 0x01, 0x05, 0x01, 0x03, 0x07, 0x32, 0x09, 0x40,
+0x72, 0x65, 0x2d, 0x65, 0x02, 0x04, 0x02, 0x37, 0x01, 0x29,
+0x61, 0x6d, 0x88, 0x00, 0x02, 0x8d, 0x05, 0x70, 0x73, 0x68,
+0x6f, 0x75, 0x6c, 0x64, 0x00, 0x6f, 0x00, 0x76, 0x65, 0x78,
+0x61, 0x63, 0x74, 0x6c, 0x79, 0x2d, 0x00, 0x41, 0x73, 0x74,
+0x61, 0x72, 0x59, 0x09, 0x02, 0x97, 0x05, 0x01, 0x0e, 0x08,
+0x02, 0x9a, 0x08, 0x24, 0x6c, 0x79, 0x8f, 0x00, 0x24, 0x62,
+0x65, 0x49, 0x04, 0x03, 0xf1, 0x01, 0x25, 0x6f, 0x66, 0x44,
+0x01, 0x43, 0x2e, 0x00, 0x53, 0x6f, 0x0f, 0x01, 0x01, 0xf4,
+0x06, 0x60, 0x74, 0x75, 0x63, 0x6b, 0x00, 0x6f, 0xc7, 0x04,
+0x10, 0x70, 0x59, 0x00, 0x52, 0x63, 0x75, 0x6c, 0x61, 0x72,
+0xb0, 0x01, 0x20, 0x61, 0x6e, 0x45, 0x09, 0x00, 0x6a, 0x05,
+0x01, 0xce, 0x01, 0x03, 0x28, 0x06, 0x02, 0x9a, 0x00, 0x00,
+0x85, 0x00, 0x00, 0x2a, 0x0a, 0x23, 0x61, 0x6e, 0x8b, 0x0a,
+0x52, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x88, 0x05, 0x71, 0x4e,
+0x65, 0x74, 0x2c, 0x00, 0x73, 0x65, 0x20, 0x00, 0x05, 0xb7,
+0x00, 0x07, 0x0b, 0x04, 0x00, 0x1d, 0x05, 0x05, 0x92, 0x02,
+0x04, 0xdd, 0x02, 0x07, 0x36, 0x01, 0x02, 0x2c, 0x01, 0x06,
+0x24, 0x01, 0x01, 0x04, 0x09, 0x01, 0xa5, 0x01, 0x05, 0xae,
+0x03, 0x04, 0x71, 0x0b, 0x01, 0x46, 0x02, 0x11, 0x77, 0x9a,
+0x0b, 0x00, 0x6b, 0x02, 0x20, 0x45, 0x6e, 0xc3, 0x07, 0x85,
+0x20, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x20, 0x93, 0x02,
+0x60, 0x00, 0x00, 0x4e, 0x6f, 0x72, 0x6d, 0x7f, 0x07, 0x13,
+0x2c, 0x31, 0x00, 0x63, 0x6c, 0x6c, 0x00, 0x6d, 0x61, 0x6b,
+0xf2, 0x07, 0x05, 0x67, 0x02, 0x02, 0xe7, 0x01, 0x10, 0x73,
+0xba, 0x05, 0x50, 0x70, 0x72, 0x65, 0x73, 0x65, 0xdf, 0x02,
+0x33, 0x68, 0x61, 0x76, 0x5c, 0x01, 0x26, 0x6f, 0x6e, 0xe6,
+0x02, 0x33, 0x2e, 0x00, 0x50, 0x2c, 0x00, 0x01, 0x80, 0x01,
+0x94, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75, 0x6f, 0x75, 0x73,
+0x1e, 0x02, 0x14, 0x73, 0xf9, 0x06, 0x01, 0x64, 0x03, 0x40,
+0x64, 0x69, 0x66, 0x66, 0x59, 0x01, 0x11, 0x74, 0xd9, 0x00,
+0x21, 0x6d, 0x6f, 0x6b, 0x08, 0x41, 0x62, 0x74, 0x6c, 0x65,
+0x56, 0x07, 0x03, 0x9b, 0x02, 0x45, 0x6c, 0x69, 0x6b, 0x65,
+0x8a, 0x07, 0x01, 0x26, 0x08, 0x23, 0x6f, 0x66, 0xad, 0x0c,
+0x40, 0x66, 0x65, 0x61, 0x74, 0xa9, 0x00, 0x00, 0x3e, 0x00,
+0x40, 0x72, 0x69, 0x73, 0x6b, 0x95, 0x00, 0x00, 0xe1, 0x01,
+0x06, 0x77, 0x00, 0x03, 0xba, 0x00, 0x10, 0x2e, 0xcf, 0x05,
+0x81, 0x73, 0x6f, 0x2c, 0x00, 0x66, 0x69, 0x6e, 0x64, 0x22,
+0x00, 0x03, 0xdd, 0x05, 0x76, 0x70, 0x6f, 0x73, 0x73, 0x69,
+0x62, 0x6c, 0xc1, 0x00, 0x05, 0xa1, 0x00, 0x00, 0xd6, 0x08,
+0x30, 0x64, 0x64, 0x69, 0x14, 0x00, 0x20, 0x61, 0x6c, 0x40,
+0x02, 0x51, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0xb8, 0x0c, 0x02,
+0x1c, 0x00, 0x10, 0x76, 0xd7, 0x01, 0x12, 0x64, 0x7d, 0x0a,
+0x13, 0x72, 0xf2, 0x05, 0x11, 0x33, 0xf2, 0x05, 0x21, 0x75,
+0x73, 0xee, 0x02, 0xa2, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+0x63, 0x65, 0x73, 0x20, 0x5f, 0x08, 0x40, 0x70, 0x6c, 0x61,
+0x74, 0xf6, 0x0c, 0x03, 0x7a, 0x03, 0x50, 0x73, 0x75, 0x70,
+0x70, 0x6f, 0x2d, 0x02, 0x12, 0x73, 0x7d, 0x0c, 0x04, 0x2e,
+0x00, 0x12, 0x2c, 0xe6, 0x05, 0x16, 0x50, 0x12, 0x00, 0x0d,
+0x02, 0x06, 0x33, 0x47, 0x61, 0x6d, 0x02, 0x06, 0x02, 0xb3,
+0x01, 0x33, 0x6c, 0x65, 0x74, 0x84, 0x02, 0x40, 0x6e, 0x66,
+0x69, 0x67, 0x12, 0x01, 0x10, 0x77, 0x51, 0x03, 0x01, 0xd1,
+0x0b, 0x0c, 0x88, 0x0b, 0x01, 0xce, 0x07, 0x30, 0x72, 0x72,
+0x6f, 0xf1, 0x02, 0xa2, 0x42, 0x79, 0x00, 0x64, 0x65, 0x66,
+0x61, 0x75, 0x6c, 0x74, 0xc7, 0x04, 0x11, 0x27, 0xca, 0x06,
+0x48, 0x77, 0x61, 0x79, 0x73, 0x32, 0x00, 0x33, 0x3b, 0x00,
+0x62, 0x41, 0x03, 0x02, 0x3d, 0x03, 0x23, 0x69, 0x73, 0x90,
+0x00, 0x06, 0x21, 0x09, 0x32, 0x61, 0x73, 0x6b, 0x19, 0x01,
+0x01, 0x74, 0x00, 0x01, 0x0a, 0x06, 0x0a, 0x75, 0x00, 0x01,
+0x29, 0x02, 0x28, 0x69, 0x66, 0x48, 0x08, 0x00, 0x0b, 0x01,
+0x00, 0x51, 0x00, 0x00, 0x5e, 0x03, 0x04, 0xa4, 0x04, 0x01,
+0x3e, 0x00, 0x14, 0x69, 0x2b, 0x0a, 0x03, 0xae, 0x04, 0x01,
+0x75, 0x0e, 0x16, 0x73, 0x20, 0x00, 0x08, 0xcf, 0x08, 0x01,
+0x9e, 0x07, 0x00, 0x07, 0x00, 0x00, 0xb5, 0x0c, 0x72, 0x73,
+0x70, 0x6f, 0x69, 0x6c, 0x65, 0x72, 0x8a, 0x00, 0x05, 0x53,
+0x07, 0x43, 0x64, 0x65, 0x64, 0x75, 0x7c, 0x02, 0x55, 0x61,
+0x62, 0x6f, 0x75, 0x74, 0xb6, 0x0d, 0x00, 0xbd, 0x00, 0x00,
+0xc6, 0x02, 0x00, 0x09, 0x09, 0x22, 0x65, 0x76, 0x30, 0x01,
+0x00, 0x14, 0x08, 0x80, 0x61, 0x74, 0x00, 0x79, 0x65, 0x74,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3439;
-const unsigned short help_text_words = 611;
+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 0035c6e3e1..17ec9ec440 100644
--- a/apps/plugins/puzzles/help/netslide.c
+++ b/apps/plugins/puzzles/help/netslide.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -9,52 +9,54 @@ struct style_text help_text_style[] = {
  LAST_STYLE_ITEM
 };
 
-/* orig 526 comp 419 ratio 0.796578 level 3 saved 107 */
+/* orig 546 comp 425 ratio 0.778388 level 3 saved 121 */
 const char help_text[] = {
-0xf2, 0x3c, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x39, 0x3a, 0x20, 0x4e, 0x65, 0x74, 0x73, 0x6c, 0x69, 0x64,
-0x65, 0x20, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00,
-0x67, 0x61, 0x6d, 0x65, 0x00, 0x63, 0x6f, 0x6d, 0x62, 0x69,
-0x6e, 0x65, 0x73, 0x00, 0x74, 0x68, 0x65, 0x00, 0x67, 0x72,
-0x69, 0x64, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
-0x69, 0x6f, 0x6e, 0x00, 0x6f, 0x66, 0x00, 0x4e, 0x65, 0x74,
-0x00, 0x28, 0x73, 0x65, 0x65, 0x00, 0x63, 0x4a, 0x00, 0x81,
-0x00, 0x33, 0x29, 0x00, 0x77, 0x69, 0x74, 0x68, 0x30, 0x00,
-0x80, 0x6d, 0x6f, 0x76, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x29,
-0x00, 0x7a, 0x53, 0x69, 0x78, 0x74, 0x65, 0x65, 0x6e, 0x2d,
-0x00, 0xe1, 0x36, 0x29, 0x3a, 0x00, 0x79, 0x6f, 0x75, 0x00,
-0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x4d, 0x00, 0x00, 0x64,
-0x00, 0xd0, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x69, 0x6e,
-0x73, 0x74, 0x65, 0x61, 0x64, 0x3d, 0x00, 0xf6, 0x0f, 0x72,
-0x6f, 0x74, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x74, 0x69,
-0x6c, 0x65, 0x73, 0x00, 0x62, 0x61, 0x63, 0x6b, 0x00, 0x69,
-0x6e, 0x74, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x43,
-0x00, 0x31, 0x74, 0x6f, 0x00, 0xc4, 0x00, 0x00, 0x7e, 0x00,
-0x18, 0x6d, 0x22, 0x00, 0x20, 0x62, 0x79, 0x8d, 0x00, 0x00,
-0x42, 0x00, 0xf4, 0x0f, 0x61, 0x00, 0x77, 0x68, 0x6f, 0x6c,
-0x65, 0x00, 0x72, 0x6f, 0x77, 0x00, 0x61, 0x74, 0x00, 0x61,
-0x00, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x41,
-0x73, 0x00, 0x69, 0x6e, 0xa7, 0x00, 0xc8, 0x2c, 0x00, 0x63,
-0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x00, 0x69, 0x73, 0xd0,
-0x00, 0xf1, 0x0c, 0x75, 0x73, 0x65, 0x00, 0x6f, 0x72, 0x00,
-0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79,
-0x73, 0x2e, 0x00, 0x53, 0x65, 0x65, 0x00, 0x73, 0x65, 0x63,
-0x12, 0x01, 0x41, 0x36, 0x2e, 0x31, 0x2e, 0x40, 0x01, 0xb2,
-0x65, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c,
-0x65, 0x49, 0x01, 0xa2, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-0x74, 0x65, 0x72, 0x73, 0xab, 0x00, 0xf0, 0x01, 0x73, 0x69,
-0x6d, 0x69, 0x6c, 0x61, 0x72, 0x00, 0x6d, 0x65, 0x61, 0x6e,
-0x69, 0x6e, 0x67, 0x73, 0xbc, 0x00, 0x50, 0x74, 0x68, 0x6f,
-0x73, 0x65, 0x86, 0x00, 0x05, 0x56, 0x01, 0x04, 0x58, 0x00,
-0x8a, 0x33, 0x2e, 0x32, 0x29, 0x00, 0x61, 0x6e, 0x64, 0x47,
-0x01, 0x06, 0x76, 0x00, 0x20, 0x32, 0x29, 0x77, 0x00, 0x04,
-0xc3, 0x01, 0x42, 0x00, 0x77, 0x61, 0x73, 0xc1, 0x00, 0x62,
-0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x5c, 0x00, 0x10, 0x69,
-0x14, 0x00, 0x23, 0x6c, 0x6c, 0x34, 0x00, 0xf0, 0x05, 0x62,
-0x79, 0x00, 0x52, 0x69, 0x63, 0x68, 0x61, 0x72, 0x64, 0x00,
-0x42, 0x6f, 0x75, 0x6c, 0x74, 0x6f, 0x6e, 0x2e, 0x00,
+0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf2, 0x28, 0x00, 0x00,
+0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65,
+0x00, 0x63, 0x6f, 0x6d, 0x62, 0x69, 0x6e, 0x65, 0x73, 0x00,
+0x74, 0x68, 0x65, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x67,
+0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00,
+0x6f, 0x66, 0x00, 0x4e, 0x65, 0x74, 0x00, 0x28, 0x73, 0x65,
+0x65, 0x00, 0x63, 0x5e, 0x00, 0x81, 0x00, 0x33, 0x29, 0x00,
+0x77, 0x69, 0x74, 0x68, 0x30, 0x00, 0x80, 0x6d, 0x6f, 0x76,
+0x65, 0x6d, 0x65, 0x6e, 0x74, 0x29, 0x00, 0x7a, 0x53, 0x69,
+0x78, 0x74, 0x65, 0x65, 0x6e, 0x2d, 0x00, 0xe1, 0x36, 0x29,
+0x3a, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65,
+0x00, 0x61, 0x4d, 0x00, 0x00, 0x64, 0x00, 0xd0, 0x2c, 0x00,
+0x62, 0x75, 0x74, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x65, 0x61,
+0x64, 0x3d, 0x00, 0xf6, 0x0f, 0x72, 0x6f, 0x74, 0x61, 0x74,
+0x69, 0x6e, 0x67, 0x00, 0x74, 0x69, 0x6c, 0x65, 0x73, 0x00,
+0x62, 0x61, 0x63, 0x6b, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00,
+0x70, 0x6c, 0x61, 0x63, 0x65, 0x43, 0x00, 0x31, 0x74, 0x6f,
+0x00, 0xd8, 0x00, 0x00, 0x7e, 0x00, 0x18, 0x6d, 0x22, 0x00,
+0x20, 0x62, 0x79, 0x8d, 0x00, 0x00, 0x42, 0x00, 0xf4, 0x0f,
+0x61, 0x00, 0x77, 0x68, 0x6f, 0x6c, 0x65, 0x00, 0x72, 0x6f,
+0x77, 0x00, 0x61, 0x74, 0x00, 0x61, 0x00, 0x74, 0x69, 0x6d,
+0x65, 0x2e, 0x00, 0x00, 0x00, 0x41, 0x73, 0x00, 0x69, 0x6e,
+0xa7, 0x00, 0xc8, 0x2c, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x72,
+0x6f, 0x6c, 0x00, 0x69, 0x73, 0xd0, 0x00, 0xf1, 0x0c, 0x75,
+0x73, 0x65, 0x00, 0x6f, 0x72, 0x00, 0x63, 0x75, 0x72, 0x73,
+0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x2e, 0x00, 0x53,
+0x65, 0x65, 0x00, 0x73, 0x65, 0x63, 0x12, 0x01, 0x41, 0x36,
+0x2e, 0x31, 0x2e, 0x40, 0x01, 0xb2, 0x65, 0x00, 0x61, 0x76,
+0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x01, 0xa2,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
+0xab, 0x00, 0xf0, 0x01, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61,
+0x72, 0x00, 0x6d, 0x65, 0x61, 0x6e, 0x69, 0x6e, 0x67, 0x73,
+0xbc, 0x00, 0x50, 0x74, 0x68, 0x6f, 0x73, 0x65, 0x86, 0x00,
+0x05, 0x56, 0x01, 0x04, 0x58, 0x00, 0x8a, 0x33, 0x2e, 0x32,
+0x29, 0x00, 0x61, 0x6e, 0x64, 0x47, 0x01, 0x06, 0x76, 0x00,
+0x20, 0x32, 0x29, 0x77, 0x00, 0x04, 0xd7, 0x01, 0x42, 0x00,
+0x77, 0x61, 0x73, 0xc1, 0x00, 0x62, 0x69, 0x62, 0x75, 0x74,
+0x65, 0x64, 0x5c, 0x00, 0x10, 0x69, 0x14, 0x00, 0x23, 0x6c,
+0x6c, 0x34, 0x00, 0xf0, 0x05, 0x62, 0x79, 0x00, 0x52, 0x69,
+0x63, 0x68, 0x61, 0x72, 0x64, 0x00, 0x42, 0x6f, 0x75, 0x6c,
+0x74, 0x6f, 0x6e, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 526;
-const unsigned short help_text_words = 98;
+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/nullgame.c b/apps/plugins/puzzles/help/nullgame.c
new file mode 100644
index 0000000000..219a68c7e8
--- /dev/null
+++ b/apps/plugins/puzzles/help/nullgame.c
@@ -0,0 +1 @@
+const char quick_help_text[] = "";
diff --git a/apps/plugins/puzzles/help/palisade.c b/apps/plugins/puzzles/help/palisade.c
index 1094502ea7..36d3c65248 100644
--- a/apps/plugins/puzzles/help/palisade.c
+++ b/apps/plugins/puzzles/help/palisade.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,108 +6,139 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 87, TEXT_CENTER | C_RED },
- { 149, TEXT_CENTER | C_RED },
- { 166, TEXT_UNDERLINE },
- { 167, TEXT_UNDERLINE },
- { 177, TEXT_UNDERLINE },
+ { 88, TEXT_CENTER | C_RED },
+ { 199, TEXT_CENTER | C_RED },
+ { 216, TEXT_UNDERLINE },
+ { 217, TEXT_UNDERLINE },
+ { 227, TEXT_UNDERLINE },
+ { 244, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 1113 comp 892 ratio 0.801438 level 3 saved 221 */
+/* orig 1672 comp 1186 ratio 0.70933 level 4 saved 486 */
 const char help_text[] = {
-0xf0, 0x2d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x34, 0x31, 0x3a, 0x20, 0x50, 0x61, 0x6c, 0x69, 0x73, 0x61,
-0x64, 0x65, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x27,
-0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61,
-0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73,
-0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f,
-0x6d, 0x65, 0x11, 0x00, 0xf0, 0x07, 0x77, 0x68, 0x69, 0x63,
-0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x3f, 0x00,
-0xf2, 0x0b, 0x72, 0x00, 0x67, 0x6f, 0x61, 0x6c, 0x00, 0x69,
-0x73, 0x00, 0x74, 0x6f, 0x00, 0x73, 0x75, 0x62, 0x64, 0x69,
-0x76, 0x69, 0x64, 0x65, 0x00, 0x74, 0x68, 0x65, 0x4e, 0x00,
-0x41, 0x69, 0x6e, 0x74, 0x6f, 0x39, 0x00, 0xf0, 0x04, 0x69,
-0x67, 0x75, 0x6f, 0x75, 0x73, 0x00, 0x72, 0x65, 0x67, 0x69,
-0x6f, 0x6e, 0x73, 0x2c, 0x00, 0x61, 0x6c, 0x6c, 0x5a, 0x00,
-0x00, 0x29, 0x00, 0x61, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x28,
-0x85, 0x00, 0xf3, 0x07, 0x29, 0x00, 0x73, 0x69, 0x7a, 0x65,
-0x2c, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x74, 0x68, 0x61,
-0x74, 0x00, 0x65, 0x61, 0x63, 0x68, 0x91, 0x00, 0x04, 0x81,
-0x00, 0x53, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x86, 0x00, 0x00,
-0x7a, 0x00, 0x80, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e,
-0x74, 0x83, 0x00, 0x72, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c,
-0x79, 0x3c, 0x00, 0xf0, 0x03, 0x6d, 0x61, 0x6e, 0x79, 0x00,
-0x65, 0x64, 0x67, 0x65, 0x73, 0x00, 0x28, 0x69, 0x6e, 0x63,
-0x6c, 0x75, 0x64, 0x3b, 0x00, 0xd1, 0x74, 0x68, 0x6f, 0x73,
-0x65, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x81,
-0x00, 0x30, 0x69, 0x6e, 0x73, 0xb5, 0x00, 0x31, 0x61, 0x6e,
-0x64, 0x0f, 0x00, 0x31, 0x6f, 0x75, 0x74, 0x10, 0x00, 0x25,
-0x6f, 0x66, 0xc8, 0x00, 0xf1, 0x10, 0x29, 0x2e, 0x00, 0x00,
-0x00, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f,
-0x72, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a,
-0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0xfe, 0x00, 0xd0,
-0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x2c, 0x00, 0x77, 0x68,
-0x6f, 0x00, 0x63, 0xdf, 0x00, 0xf0, 0x06, 0x69, 0x74, 0x00,
-0x60, 0x46, 0x69, 0x76, 0x65, 0x00, 0x43, 0x65, 0x6c, 0x6c,
-0x73, 0x27, 0x2e, 0x00, 0x5b, 0x32, 0x32, 0x5d, 0x49, 0x00,
-0x04, 0x83, 0x01, 0x41, 0x00, 0x77, 0x61, 0x73, 0xd5, 0x00,
-0x70, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x46, 0x00,
-0x01, 0x5a, 0x00, 0xf0, 0x0c, 0x63, 0x6f, 0x6c, 0x6c, 0x65,
-0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a,
-0x6f, 0x6e, 0x61, 0x73, 0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b,
-0x65, 0x72, 0x40, 0x00, 0x00, 0x48, 0x00, 0x91, 0x00, 0x68,
-0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6e, 0x76, 0x00, 0xa2,
-0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f,
-0x95, 0x00, 0x80, 0x73, 0x2f, 0x66, 0x69, 0x76, 0x65, 0x5f,
-0x63, 0x79, 0x00, 0xc6, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00,
-0x00, 0x00, 0x34, 0x31, 0x2e, 0x31, 0xfe, 0x01, 0x01, 0x77,
-0x00, 0x30, 0x6f, 0x6c, 0x73, 0x07, 0x02, 0xa0, 0x4c, 0x65,
-0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x82, 0x00,
-0x40, 0x70, 0x6c, 0x61, 0x63, 0x0d, 0x01, 0x01, 0x3a, 0x01,
+0x64, 0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x18,
+0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x27, 0x72, 0x65, 0x00,
+0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72,
+0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61,
+0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x11,
+0x00, 0xf0, 0x07, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x63,
+0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d,
+0x62, 0x65, 0x72, 0x73, 0x2e, 0x3f, 0x00, 0xf2, 0x0b, 0x72,
+0x00, 0x67, 0x6f, 0x61, 0x6c, 0x00, 0x69, 0x73, 0x00, 0x74,
+0x6f, 0x00, 0x73, 0x75, 0x62, 0x64, 0x69, 0x76, 0x69, 0x64,
+0x65, 0x00, 0x74, 0x68, 0x65, 0x4e, 0x00, 0x41, 0x69, 0x6e,
+0x74, 0x6f, 0x39, 0x00, 0xf0, 0x04, 0x69, 0x67, 0x75, 0x6f,
+0x75, 0x73, 0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73,
+0x2c, 0x00, 0x61, 0x6c, 0x6c, 0x5a, 0x00, 0x00, 0x29, 0x00,
+0x61, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x28, 0x85, 0x00, 0xf3,
+0x07, 0x29, 0x00, 0x73, 0x69, 0x7a, 0x65, 0x2c, 0x00, 0x73,
+0x75, 0x63, 0x68, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x65,
+0x61, 0x63, 0x68, 0x91, 0x00, 0x04, 0x81, 0x00, 0x53, 0x69,
+0x6e, 0x67, 0x00, 0x61, 0x86, 0x00, 0x00, 0x7a, 0x00, 0x80,
+0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x83, 0x00,
+0x72, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x3c, 0x00,
+0xf0, 0x03, 0x6d, 0x61, 0x6e, 0x79, 0x00, 0x65, 0x64, 0x67,
+0x65, 0x73, 0x00, 0x28, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+0x3b, 0x00, 0xd1, 0x74, 0x68, 0x6f, 0x73, 0x65, 0x00, 0x62,
+0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x81, 0x00, 0x30, 0x69,
+0x6e, 0x73, 0xb5, 0x00, 0x31, 0x61, 0x6e, 0x64, 0x0f, 0x00,
+0x31, 0x6f, 0x75, 0x74, 0x10, 0x00, 0x25, 0x6f, 0x66, 0xc8,
+0x00, 0xf1, 0x10, 0x29, 0x2e, 0x00, 0x00, 0x00, 0x43, 0x72,
+0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x74,
+0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
+0x00, 0x67, 0x6f, 0x65, 0xfe, 0x00, 0xd0, 0x4e, 0x69, 0x6b,
+0x6f, 0x6c, 0x69, 0x2c, 0x00, 0x77, 0x68, 0x6f, 0x00, 0x63,
+0xdf, 0x00, 0xf0, 0x06, 0x69, 0x74, 0x00, 0x60, 0x46, 0x69,
+0x76, 0x65, 0x00, 0x43, 0x65, 0x6c, 0x6c, 0x73, 0x27, 0x2e,
+0x00, 0x5b, 0x32, 0x32, 0x5d, 0x49, 0x00, 0x04, 0x98, 0x01,
+0x41, 0x00, 0x77, 0x61, 0x73, 0xd5, 0x00, 0x70, 0x72, 0x69,
+0x62, 0x75, 0x74, 0x65, 0x64, 0x46, 0x00, 0x01, 0x5a, 0x00,
+0xf0, 0x0c, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69,
+0x6f, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a, 0x6f, 0x6e, 0x61,
+0x73, 0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b, 0x65, 0x72, 0x40,
+0x00, 0x00, 0x48, 0x00, 0xe1, 0x00, 0x68, 0x74, 0x74, 0x70,
+0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x7b,
+0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65,
+0x6e, 0x2f, 0x9a, 0x00, 0x80, 0x73, 0x2f, 0x66, 0x69, 0x76,
+0x65, 0x5f, 0x63, 0x7e, 0x00, 0x86, 0x2f, 0x00, 0x00, 0x00,
+0x34, 0x31, 0x2e, 0x31, 0x14, 0x02, 0x01, 0x78, 0x00, 0xf0,
+0x02, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x4c, 0x65,
+0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x83, 0x00,
+0x40, 0x70, 0x6c, 0x61, 0x63, 0x0e, 0x01, 0x01, 0x3b, 0x01,
 0x67, 0x2e, 0x00, 0x52, 0x69, 0x67, 0x68, 0x1e, 0x00, 0xc1,
 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00, 0x60,
-0x6e, 0x6f, 0x22, 0x00, 0xf1, 0x02, 0x27, 0x2e, 0x00, 0x41,
+0x6e, 0x6f, 0x22, 0x00, 0x10, 0x27, 0x93, 0x00, 0xe1, 0x41,
 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65,
-0x6c, 0x79, 0x2c, 0x35, 0x01, 0xf0, 0x07, 0x61, 0x72, 0x72,
+0x6c, 0x79, 0x2c, 0x38, 0x01, 0xf0, 0x07, 0x61, 0x72, 0x72,
 0x6f, 0x77, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x00, 0x77, 0x69,
 0x6c, 0x6c, 0x00, 0x6d, 0x6f, 0x76, 0x65, 0x00, 0x61, 0x11,
-0x00, 0xf1, 0x02, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x63,
-0x75, 0x72, 0x73, 0x6f, 0x72, 0x2e, 0x00, 0x48, 0x6f, 0x6c,
-0x95, 0x01, 0x12, 0x43, 0x8f, 0x00, 0x00, 0x6a, 0x02, 0x81,
-0x6c, 0x65, 0x00, 0x70, 0x72, 0x65, 0x73, 0x73, 0xe7, 0x01,
-0x16, 0x6e, 0x4a, 0x00, 0x02, 0x49, 0x00, 0x0b, 0x9e, 0x00,
-0x10, 0x50, 0x2a, 0x00, 0x72, 0x00, 0x53, 0x68, 0x69, 0x66,
-0x74, 0x2d, 0x2b, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x8c, 0x02,
-0x97, 0x77, 0x69, 0x74, 0x63, 0x68, 0x00, 0x6f, 0x66, 0x66,
-0xcb, 0x00, 0x51, 0x65, 0x70, 0x65, 0x61, 0x74, 0x55, 0x00,
-0x02, 0x5d, 0x01, 0x00, 0xee, 0x00, 0xf0, 0x03, 0x65, 0x72,
-0x66, 0x6f, 0x72, 0x6d, 0x00, 0x69, 0x74, 0x73, 0x00, 0x69,
-0x6e, 0x76, 0x65, 0x72, 0x73, 0x65, 0x63, 0x01, 0x42, 0x28,
-0x41, 0x6c, 0x6c, 0xc9, 0x00, 0x01, 0x2a, 0x00, 0xa0, 0x73,
-0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0xd3,
-0x02, 0x23, 0x00, 0x73, 0x9d, 0x01, 0x40, 0x32, 0x2e, 0x31,
-0x00, 0x99, 0x02, 0xf2, 0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00,
-0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e,
-0x29, 0x6e, 0x01, 0x16, 0x32, 0x6e, 0x01, 0x91, 0x70, 0x61,
-0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x70, 0x01, 0x66,
-0x54, 0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x44,
-0x00, 0x04, 0x3f, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d,
-0x7c, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x72, 0x00, 0x22,
-0x6f, 0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27,
-0x00, 0x6d, 0x65, 0x6e, 0x75, 0xae, 0x00, 0x90, 0x57, 0x69,
-0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xac, 0x01, 0x61,
-0x00, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xbf, 0x02, 0x03, 0x83,
-0x03, 0x04, 0xd1, 0x03, 0x00, 0x2b, 0x00, 0x11, 0x52, 0x81,
-0x03, 0x10, 0x20, 0x67, 0x03, 0x02, 0x8a, 0x00, 0x01, 0x72,
-0x03, 0x04, 0xec, 0x02, 0x03, 0x9f, 0x03, 0x02, 0xb7, 0x03,
-0x02, 0xf6, 0x03, 0x05, 0xcb, 0x03, 0x74, 0x6d, 0x75, 0x73,
-0x74, 0x00, 0x62, 0x65, 0xe6, 0x03, 0x50, 0x64, 0x65, 0x64,
-0x2e, 0x00,
+0x00, 0xf1, 0x04, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x63,
+0x75, 0x72, 0x73, 0x6f, 0x72, 0x2e, 0x00, 0x44, 0x65, 0x70,
+0x65, 0x6e, 0x9a, 0x01, 0x12, 0x6f, 0x8f, 0x01, 0x21, 0x60,
+0x43, 0x1a, 0x00, 0xf3, 0x09, 0x00, 0x6d, 0x6f, 0x64, 0x65,
+0x27, 0x00, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
+0x63, 0x65, 0x00, 0x28, 0x73, 0x65, 0x65, 0x00, 0x73, 0x19,
+0x01, 0x52, 0x34, 0x31, 0x2e, 0x33, 0x29, 0x6a, 0x00, 0x02,
+0x4a, 0x00, 0x02, 0x66, 0x00, 0xc0, 0x65, 0x69, 0x74, 0x68,
+0x65, 0x72, 0x00, 0x6e, 0x61, 0x76, 0x69, 0x67, 0xa6, 0x00,
+0x56, 0x61, 0x6d, 0x6f, 0x6e, 0x67, 0x90, 0x02, 0x05, 0xdb,
+0x02, 0x53, 0x6f, 0x72, 0x00, 0x61, 0x6c, 0x1b, 0x00, 0x71,
+0x69, 0x72, 0x00, 0x62, 0x6f, 0x72, 0x64, 0xd4, 0x02, 0x90,
+0x49, 0x6e, 0x00, 0x60, 0x46, 0x75, 0x6c, 0x6c, 0x2d, 0x2f,
+0x00, 0x11, 0x27, 0x84, 0x00, 0x82, 0x2c, 0x00, 0x68, 0x6f,
+0x6c, 0x64, 0x00, 0x43, 0x31, 0x01, 0x00, 0x0d, 0x03, 0x20,
+0x6c, 0x65, 0x97, 0x00, 0x21, 0x73, 0x73, 0x8a, 0x02, 0x16,
+0x6e, 0xea, 0x00, 0x0d, 0x3e, 0x01, 0x11, 0x2c, 0x55, 0x02,
+0x01, 0x2c, 0x00, 0x71, 0x00, 0x53, 0x68, 0x69, 0x66, 0x74,
+0x2d, 0x2c, 0x00, 0x03, 0x2b, 0x00, 0xa6, 0x73, 0x77, 0x69,
+0x74, 0x63, 0x68, 0x00, 0x6f, 0x66, 0x66, 0x6e, 0x01, 0x00,
+0x80, 0x00, 0x68, 0x48, 0x61, 0x6c, 0x66, 0x2d, 0x00, 0x81,
+0x00, 0x02, 0x42, 0x00, 0x5f, 0x45, 0x6e, 0x74, 0x65, 0x72,
+0x64, 0x00, 0x04, 0x20, 0x53, 0x70, 0x13, 0x00, 0x0f, 0x55,
+0x00, 0x07, 0x03, 0x18, 0x01, 0x02, 0x4f, 0x00, 0xe1, 0x79,
+0x6f, 0x75, 0x00, 0x63, 0x61, 0x6e, 0x00, 0x72, 0x65, 0x70,
+0x65, 0x61, 0x74, 0xc3, 0x00, 0x02, 0x55, 0x01, 0x00, 0x5c,
+0x00, 0xf0, 0x03, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x6d, 0x00,
+0x69, 0x74, 0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x73,
+0x65, 0xe1, 0x01, 0x42, 0x28, 0x41, 0x6c, 0x6c, 0xd7, 0x01,
+0x01, 0x2a, 0x00, 0xa0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63,
+0x72, 0x69, 0x62, 0x65, 0xe4, 0x03, 0x05, 0x95, 0x01, 0x40,
+0x32, 0x2e, 0x31, 0x00, 0xaa, 0x03, 0xf2, 0x01, 0x61, 0x6c,
+0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
+0x6c, 0x65, 0x2e, 0x29, 0x7e, 0x02, 0x16, 0x32, 0x7e, 0x02,
+0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+0x80, 0x02, 0x66, 0x54, 0x68, 0x65, 0x73, 0x65, 0x00, 0x14,
+0x00, 0x02, 0x44, 0x00, 0x04, 0x3f, 0x00, 0x54, 0x00, 0x66,
+0x72, 0x6f, 0x6d, 0x1a, 0x02, 0xb1, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x72, 0x00, 0x04,
+0x34, 0x02, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
+0x65, 0x6e, 0x75, 0xae, 0x00, 0x90, 0x57, 0x69, 0x64, 0x74,
+0x68, 0x2c, 0x00, 0x48, 0x65, 0xbc, 0x02, 0x61, 0x00, 0x00,
+0x00, 0x53, 0x69, 0x7a, 0xd0, 0x03, 0x03, 0x94, 0x04, 0x04,
+0x07, 0x02, 0x00, 0x2b, 0x00, 0x11, 0x52, 0x92, 0x04, 0x10,
+0x20, 0x78, 0x04, 0x02, 0x8a, 0x00, 0x01, 0x83, 0x04, 0x04,
+0xfd, 0x03, 0x03, 0xb0, 0x04, 0x02, 0xc8, 0x04, 0x02, 0x07,
+0x05, 0x05, 0x4c, 0x02, 0x76, 0x6d, 0x75, 0x73, 0x74, 0x00,
+0x62, 0x65, 0xf7, 0x04, 0x22, 0x64, 0x2e, 0xe8, 0x00, 0x16,
+0x33, 0xe8, 0x00, 0x56, 0x75, 0x73, 0x65, 0x72, 0x20, 0xc3,
+0x02, 0x01, 0xee, 0x00, 0x20, 0x4f, 0x6e, 0xc1, 0x01, 0x10,
+0x74, 0x66, 0x01, 0x12, 0x73, 0xa9, 0x04, 0x80, 0x73, 0x75,
+0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e, 0x00, 0x07, 0xf1,
+0x02, 0x12, 0x73, 0xdf, 0x02, 0x26, 0x60, 0x50, 0x12, 0x00,
+0x0d, 0xf8, 0x00, 0x33, 0x47, 0x61, 0x6d, 0xf8, 0x00, 0x02,
+0x00, 0x03, 0x32, 0x6c, 0x65, 0x74, 0xdf, 0x01, 0x72, 0x6f,
+0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x8c, 0x05, 0x84, 0x62,
+0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0xd7, 0x00, 0x03,
+0x32, 0x03, 0x01, 0x9d, 0x03, 0x2f, 0x74, 0x6f, 0x35, 0x03,
+0x04, 0x4f, 0x66, 0x75, 0x6c, 0x6c, 0x36, 0x03, 0x08, 0x04,
+0x34, 0x03, 0x08, 0x28, 0x05, 0xa0, 0x00, 0x73, 0x71, 0x75,
+0x61, 0x72, 0x65, 0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1113;
-const unsigned short help_text_words = 192;
+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 2b43a878bd..fae35c0f64 100644
--- a/apps/plugins/puzzles/help/pattern.c
+++ b/apps/plugins/puzzles/help/pattern.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,92 +6,94 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 137, TEXT_UNDERLINE },
- { 173, TEXT_CENTER | C_RED },
- { 362, TEXT_CENTER | C_RED },
- { 378, TEXT_UNDERLINE },
- { 380, TEXT_UNDERLINE },
+ { 142, TEXT_UNDERLINE },
+ { 178, TEXT_CENTER | C_RED },
+ { 367, TEXT_CENTER | C_RED },
+ { 383, TEXT_UNDERLINE },
+ { 385, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2125 comp 1459 ratio 0.686588 level 4 saved 666 */
+/* orig 2167 comp 1479 ratio 0.68251 level 4 saved 688 */
 const char help_text[] = {
-0xf0, 0x4f, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x30, 0x3a, 0x20, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72,
-0x6e, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68,
-0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
-0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
-0x73, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x6d,
-0x75, 0x73, 0x74, 0x00, 0x61, 0x6c, 0x6c, 0x00, 0x62, 0x65,
-0x00, 0x66, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x69, 0x6e,
-0x00, 0x65, 0x69, 0x74, 0x68, 0x65, 0x72, 0x00, 0x62, 0x6c,
-0x61, 0x63, 0x6b, 0x00, 0x6f, 0x72, 0x2c, 0x00, 0xf0, 0x04,
-0x74, 0x65, 0x2e, 0x00, 0x42, 0x65, 0x73, 0x69, 0x64, 0x65,
-0x00, 0x65, 0x61, 0x63, 0x68, 0x00, 0x72, 0x6f, 0x77, 0x4f,
-0x00, 0x32, 0x74, 0x68, 0x65, 0x5b, 0x00, 0xa1, 0x61, 0x72,
-0x65, 0x00, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x64, 0x14, 0x00,
-0x74, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x73, 0x23, 0x00,
-0x31, 0x72, 0x75, 0x6e, 0x0c, 0x00, 0x02, 0x52, 0x00, 0x03,
-0x84, 0x00, 0x80, 0x00, 0x6f, 0x6e, 0x00, 0x74, 0x68, 0x61,
-0x74, 0x4c, 0x00, 0x63, 0x3b, 0x00, 0x61, 0x62, 0x6f, 0x76,
-0x5c, 0x00, 0x6f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53,
-0x00, 0x22, 0x13, 0x69, 0x53, 0x00, 0x02, 0x43, 0x00, 0x10,
-0x2e, 0x02, 0x01, 0xb1, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00,
-0x69, 0x73, 0x00, 0x74, 0x6f, 0xe3, 0x00, 0x02, 0x24, 0x00,
-0x73, 0x65, 0x00, 0x65, 0x6e, 0x74, 0x69, 0x72, 0xbe, 0x00,
-0x0c, 0xea, 0x00, 0xf1, 0x22, 0x00, 0x00, 0x49, 0x00, 0x66,
-0x69, 0x72, 0x73, 0x74, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74,
-0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
-0x00, 0x66, 0x6f, 0x72, 0x6d, 0x00, 0x61, 0x72, 0x6f, 0x75,
-0x6e, 0x64, 0x00, 0x31, 0x39, 0x39, 0x35, 0x2c, 0x00, 0x75,
-0x6e, 0x64, 0x65, 0x72, 0x52, 0x00, 0xf0, 0x0f, 0x6e, 0x61,
-0x6d, 0x65, 0x00, 0x60, 0x6e, 0x6f, 0x6e, 0x6f, 0x67, 0x72,
-0x61, 0x6d, 0x73, 0x27, 0x2e, 0x00, 0x49, 0x27, 0x76, 0x65,
-0x00, 0x73, 0x65, 0x65, 0x6e, 0x00, 0x69, 0x74, 0x78, 0x00,
-0xf0, 0x05, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x00,
-0x70, 0x6c, 0x61, 0x63, 0x65, 0x73, 0x00, 0x73, 0x69, 0x6e,
-0x63, 0x65, 0x3b, 0x00, 0x14, 0x6e, 0x47, 0x00, 0x91, 0x64,
-0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74, 0x4d, 0x00,
-0x10, 0x73, 0x8a, 0x00, 0x93, 0x4e, 0x6f, 0x72, 0x6d, 0x61,
-0x6c, 0x6c, 0x79, 0x2c, 0x83, 0x00, 0x03, 0x02, 0x01, 0x00,
-0xd1, 0x00, 0xc0, 0x79, 0x70, 0x65, 0x00, 0x74, 0x75, 0x72,
-0x6e, 0x00, 0x6f, 0x75, 0x74, 0xdf, 0x00, 0x10, 0x62, 0xea,
-0x01, 0xf1, 0x03, 0x6d, 0x65, 0x61, 0x6e, 0x69, 0x6e, 0x67,
-0x66, 0x75, 0x6c, 0x00, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72,
-0x65, 0xf8, 0x01, 0xa0, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69,
-0x6e, 0x67, 0x00, 0x6f, 0x74, 0x00, 0x31, 0x79, 0x6f, 0x75,
-0x9b, 0x00, 0x32, 0x6f, 0x6c, 0x76, 0x5f, 0x01, 0xb5, 0x6d,
-0x2e, 0x00, 0x48, 0x6f, 0x77, 0x65, 0x76, 0x65, 0x72, 0x2c,
-0x97, 0x00, 0xf1, 0x05, 0x69, 0x73, 0x00, 0x76, 0x65, 0x72,
-0x73, 0x69, 0x6f, 0x6e, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72,
-0x61, 0x74, 0x65, 0x73, 0xe9, 0x00, 0x04, 0x89, 0x00, 0x92,
-0x61, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0xa0,
-0x00, 0x60, 0x74, 0x68, 0x65, 0x79, 0x00, 0x77, 0x63, 0x01,
-0x10, 0x6a, 0x57, 0x02, 0xf7, 0x0b, 0x6c, 0x6f, 0x6f, 0x6b,
-0x00, 0x6c, 0x69, 0x6b, 0x65, 0x00, 0x72, 0x61, 0x6e, 0x64,
-0x6f, 0x6d, 0x00, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x6e,
-0x67, 0x73, 0x89, 0x02, 0xf3, 0x06, 0x2e, 0x00, 0x28, 0x4f,
-0x6e, 0x65, 0x00, 0x75, 0x73, 0x65, 0x72, 0x00, 0x68, 0x61,
-0x73, 0x00, 0x73, 0x75, 0x67, 0x67, 0x65, 0xf4, 0x01, 0x22,
-0x61, 0x74, 0x85, 0x00, 0x70, 0x69, 0x73, 0x00, 0x61, 0x63,
-0x74, 0x75, 0x65, 0x00, 0x00, 0xca, 0x02, 0x41, 0x6f, 0x6f,
-0x64, 0x00, 0xcb, 0x00, 0x04, 0xaa, 0x00, 0xb0, 0x69, 0x74,
-0x00, 0x70, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xd9,
-0x00, 0x30, 0x00, 0x66, 0x72, 0x6d, 0x00, 0x40, 0x75, 0x65,
-0x73, 0x73, 0xf0, 0x00, 0x00, 0xb1, 0x00, 0x30, 0x63, 0x6f,
-0x6c, 0x09, 0x02, 0x06, 0x77, 0x00, 0x62, 0x00, 0x62, 0x61,
-0x73, 0x65, 0x64, 0x82, 0x02, 0x14, 0x65, 0x28, 0x01, 0x50,
-0x2c, 0x00, 0x61, 0x6e, 0x64, 0xe2, 0x01, 0x22, 0x63, 0x65,
-0x49, 0x00, 0x20, 0x74, 0x6f, 0x99, 0x00, 0xf0, 0x0f, 0x00,
-0x6c, 0x6f, 0x67, 0x69, 0x63, 0x00, 0x69, 0x6e, 0x73, 0x74,
-0x65, 0x61, 0x64, 0x2e, 0x29, 0x00, 0x54, 0x68, 0x65, 0x00,
-0x61, 0x64, 0x76, 0x61, 0x6e, 0x74, 0x61, 0x67, 0x65, 0xf7,
-0x00, 0x51, 0x6f, 0x75, 0x67, 0x68, 0x2c, 0x63, 0x02, 0x00,
-0xb4, 0x00, 0x00, 0x3a, 0x00, 0x10, 0x6e, 0x4a, 0x01, 0x00,
-0xa4, 0x02, 0x01, 0x9b, 0x01, 0x23, 0x6f, 0x66, 0x63, 0x01,
-0x65, 0x00, 0x00, 0x31, 0x30, 0x2e, 0x31, 0xa3, 0x03, 0x80,
-0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0xac, 0x03,
-0x10, 0x54, 0xea, 0x00, 0x10, 0x67, 0x42, 0x02, 0x11, 0x69,
+0x6e, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x3b, 0x00, 0x00,
+0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
+0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00,
+0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x77,
+0x68, 0x69, 0x63, 0x68, 0x00, 0x6d, 0x75, 0x73, 0x74, 0x00,
+0x61, 0x6c, 0x6c, 0x00, 0x62, 0x65, 0x00, 0x66, 0x69, 0x6c,
+0x6c, 0x65, 0x64, 0x00, 0x69, 0x6e, 0x00, 0x65, 0x69, 0x74,
+0x68, 0x65, 0x72, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x00,
+0x6f, 0x72, 0x2c, 0x00, 0xf0, 0x04, 0x74, 0x65, 0x2e, 0x00,
+0x42, 0x65, 0x73, 0x69, 0x64, 0x65, 0x00, 0x65, 0x61, 0x63,
+0x68, 0x00, 0x72, 0x6f, 0x77, 0x4f, 0x00, 0x32, 0x74, 0x68,
+0x65, 0x5b, 0x00, 0xb0, 0x61, 0x72, 0x65, 0x00, 0x6c, 0x69,
+0x73, 0x74, 0x65, 0x64, 0x2c, 0x42, 0x00, 0x61, 0x6f, 0x72,
+0x64, 0x65, 0x72, 0x2c, 0x1f, 0x00, 0x74, 0x6c, 0x65, 0x6e,
+0x67, 0x74, 0x68, 0x73, 0x2e, 0x00, 0x31, 0x72, 0x75, 0x6e,
+0x0c, 0x00, 0x02, 0x5d, 0x00, 0x03, 0x8f, 0x00, 0x80, 0x00,
+0x6f, 0x6e, 0x00, 0x74, 0x68, 0x61, 0x74, 0x57, 0x00, 0x63,
+0x3b, 0x00, 0x61, 0x62, 0x6f, 0x76, 0x67, 0x00, 0x6f, 0x63,
+0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5e, 0x00, 0x2d, 0x13, 0x69,
+0x5e, 0x00, 0x02, 0x4e, 0x00, 0x10, 0x2e, 0x18, 0x01, 0xb1,
+0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74,
+0x6f, 0xf9, 0x00, 0x02, 0x24, 0x00, 0x73, 0x65, 0x00, 0x65,
+0x6e, 0x74, 0x69, 0x72, 0xd4, 0x00, 0x0c, 0x00, 0x01, 0xf1,
+0x22, 0x00, 0x00, 0x49, 0x00, 0x66, 0x69, 0x72, 0x73, 0x74,
+0x00, 0x73, 0x61, 0x77, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00,
+0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x66, 0x6f, 0x72,
+0x6d, 0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x00, 0x31,
+0x39, 0x39, 0x35, 0x2c, 0x00, 0x75, 0x6e, 0x64, 0x65, 0x72,
+0x52, 0x00, 0xf0, 0x0f, 0x6e, 0x61, 0x6d, 0x65, 0x00, 0x60,
+0x6e, 0x6f, 0x6e, 0x6f, 0x67, 0x72, 0x61, 0x6d, 0x73, 0x27,
+0x2e, 0x00, 0x49, 0x27, 0x76, 0x65, 0x00, 0x73, 0x65, 0x65,
+0x6e, 0x00, 0x69, 0x74, 0x78, 0x00, 0xf0, 0x05, 0x76, 0x61,
+0x72, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x70, 0x6c, 0x61, 0x63,
+0x65, 0x73, 0x00, 0x73, 0x69, 0x6e, 0x63, 0x65, 0x3b, 0x00,
+0x14, 0x6e, 0x47, 0x00, 0x91, 0x64, 0x69, 0x66, 0x66, 0x65,
+0x72, 0x65, 0x6e, 0x74, 0x4d, 0x00, 0x10, 0x73, 0x8a, 0x00,
+0x93, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x6c, 0x79, 0x2c,
+0x83, 0x00, 0x03, 0x02, 0x01, 0x00, 0xd1, 0x00, 0xc0, 0x79,
+0x70, 0x65, 0x00, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x6f, 0x75,
+0x74, 0xdf, 0x00, 0x10, 0x62, 0x00, 0x02, 0xf1, 0x03, 0x6d,
+0x65, 0x61, 0x6e, 0x69, 0x6e, 0x67, 0x66, 0x75, 0x6c, 0x00,
+0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x0e, 0x02, 0xa0,
+0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x00, 0x6f,
+0x74, 0x00, 0x31, 0x79, 0x6f, 0x75, 0x9b, 0x00, 0x50, 0x6f,
+0x6c, 0x76, 0x65, 0x64, 0x82, 0x00, 0x80, 0x6d, 0x2e, 0x00,
+0x48, 0x6f, 0x77, 0x65, 0x76, 0x6e, 0x01, 0x04, 0x97, 0x00,
+0xf1, 0x05, 0x69, 0x73, 0x00, 0x76, 0x65, 0x72, 0x73, 0x69,
+0x6f, 0x6e, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74,
+0x65, 0x73, 0xe9, 0x00, 0x04, 0x89, 0x00, 0x92, 0x61, 0x75,
+0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0xa0, 0x00, 0x60,
+0x74, 0x68, 0x65, 0x79, 0x00, 0x77, 0x63, 0x01, 0x10, 0x6a,
+0x6d, 0x02, 0xf7, 0x0b, 0x6c, 0x6f, 0x6f, 0x6b, 0x00, 0x6c,
+0x69, 0x6b, 0x65, 0x00, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
+0x00, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x69, 0x6e, 0x67, 0x73,
+0x9f, 0x02, 0xf0, 0x06, 0x2e, 0x00, 0x28, 0x4f, 0x6e, 0x65,
+0x00, 0x75, 0x73, 0x65, 0x72, 0x00, 0x68, 0x61, 0x73, 0x00,
+0x73, 0x75, 0x67, 0x67, 0x65, 0xff, 0x01, 0x02, 0xc8, 0x01,
+0x01, 0x85, 0x00, 0x70, 0x69, 0x73, 0x00, 0x61, 0x63, 0x74,
+0x75, 0x65, 0x00, 0x00, 0xe0, 0x02, 0x41, 0x6f, 0x6f, 0x64,
+0x00, 0xcb, 0x00, 0x04, 0xaa, 0x00, 0xb0, 0x69, 0x74, 0x00,
+0x70, 0x72, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0xd9, 0x00,
+0x30, 0x00, 0x66, 0x72, 0x6d, 0x00, 0x40, 0x75, 0x65, 0x73,
+0x73, 0xf0, 0x00, 0x00, 0xb1, 0x00, 0x30, 0x63, 0x6f, 0x6c,
+0x09, 0x02, 0x06, 0x77, 0x00, 0x62, 0x00, 0x62, 0x61, 0x73,
+0x65, 0x64, 0x8d, 0x02, 0x14, 0x65, 0x28, 0x01, 0x50, 0x2c,
+0x00, 0x61, 0x6e, 0x64, 0xe2, 0x01, 0x22, 0x63, 0x65, 0x49,
+0x00, 0x20, 0x74, 0x6f, 0x99, 0x00, 0xf0, 0x0f, 0x00, 0x6c,
+0x6f, 0x67, 0x69, 0x63, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x65,
+0x61, 0x64, 0x2e, 0x29, 0x00, 0x54, 0x68, 0x65, 0x00, 0x61,
+0x64, 0x76, 0x61, 0x6e, 0x74, 0x61, 0x67, 0x65, 0xf7, 0x00,
+0x51, 0x6f, 0x75, 0x67, 0x68, 0x2c, 0x63, 0x02, 0x00, 0xb4,
+0x00, 0x00, 0x3a, 0x00, 0x10, 0x6e, 0x4a, 0x01, 0x00, 0xa4,
+0x02, 0x01, 0x9b, 0x01, 0x23, 0x6f, 0x66, 0x63, 0x01, 0x65,
+0x00, 0x00, 0x31, 0x30, 0x2e, 0x31, 0xcd, 0x03, 0xd0, 0x63,
+0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00,
+0x00, 0x54, 0xea, 0x00, 0x10, 0x67, 0x42, 0x02, 0x11, 0x69,
 0x20, 0x02, 0x81, 0x79, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74,
 0x68, 0xa1, 0x00, 0x41, 0x6d, 0x6f, 0x75, 0x73, 0x97, 0x02,
 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63,
@@ -111,7 +113,7 @@ const char help_text[] = {
 0x74, 0x00, 0x67, 0x72, 0x65, 0x79, 0x00, 0x28, 0xb2, 0x02,
 0x20, 0x00, 0x60, 0x04, 0x03, 0xe3, 0x63, 0x69, 0x64, 0x65,
 0x64, 0x27, 0x29, 0x00, 0x61, 0x67, 0x61, 0x69, 0x6e, 0x2e,
-0xc5, 0x04, 0x00, 0x91, 0x00, 0x02, 0xca, 0x00, 0x00, 0xa2,
+0xdb, 0x04, 0x00, 0x91, 0x00, 0x02, 0xca, 0x00, 0x00, 0xa2,
 0x01, 0x46, 0x64, 0x72, 0x61, 0x67, 0x1c, 0x01, 0x40, 0x6c,
 0x65, 0x66, 0x74, 0xa0, 0x00, 0x10, 0x72, 0xf0, 0x00, 0x02,
 0x2a, 0x01, 0x03, 0x84, 0x00, 0x07, 0x83, 0x00, 0x10, 0x61,
@@ -126,8 +128,8 @@ const char help_text[] = {
 0x6f, 0x01, 0x05, 0xa8, 0x00, 0xe9, 0x77, 0x68, 0x6f, 0x6c,
 0x65, 0x00, 0x72, 0x65, 0x63, 0x74, 0x61, 0x6e, 0x67, 0x6c,
 0x9c, 0x00, 0x00, 0x2e, 0x01, 0x08, 0x12, 0x01, 0x60, 0x61,
-0x6c, 0x73, 0x6f, 0x00, 0x6d, 0x37, 0x05, 0x03, 0x91, 0x04,
-0x05, 0x8e, 0x05, 0x05, 0x39, 0x02, 0xf7, 0x00, 0x63, 0x75,
+0x6c, 0x73, 0x6f, 0x00, 0x6d, 0x42, 0x05, 0x03, 0x91, 0x04,
+0x05, 0xa4, 0x05, 0x05, 0x39, 0x02, 0xf7, 0x00, 0x63, 0x75,
 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x2e,
 0x00, 0x50, 0x72, 0x13, 0x03, 0x21, 0x72, 0x65, 0x3a, 0x04,
 0x14, 0x6b, 0xb3, 0x03, 0x54, 0x63, 0x79, 0x63, 0x6c, 0x65,
@@ -148,8 +150,8 @@ const char help_text[] = {
 0x6f, 0x74, 0x68, 0x3b, 0x00, 0x15, 0x6d, 0x87, 0x01, 0x21,
 0x28, 0x41, 0x20, 0x01, 0x10, 0x65, 0x9d, 0x04, 0xc2, 0x69,
 0x6f, 0x6e, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x44, 0x07, 0x21, 0x73, 0x65, 0x16, 0x00, 0x41, 0x00,
-0x32, 0x2e, 0x31, 0xca, 0x06, 0x01, 0xad, 0x01, 0xb2, 0x61,
+0x62, 0x5a, 0x07, 0x21, 0x73, 0x65, 0x16, 0x00, 0x41, 0x00,
+0x32, 0x2e, 0x31, 0xd5, 0x06, 0x01, 0xad, 0x01, 0xb2, 0x61,
 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
 0x0c, 0x04, 0x15, 0x32, 0x0c, 0x04, 0x93, 0x70, 0x61, 0x72,
 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x0e, 0x04, 0x92, 0x65,
@@ -159,11 +161,12 @@ const char help_text[] = {
 0x27, 0x27, 0x00, 0x04, 0xd0, 0x04, 0xb1, 0x60, 0x54, 0x79,
 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x7c, 0x00,
 0x31, 0x57, 0x69, 0x64, 0x9d, 0x03, 0x40, 0x64, 0x00, 0x48,
-0x65, 0x26, 0x03, 0x04, 0xfe, 0x07, 0x00, 0x1c, 0x00, 0xf0,
+0x65, 0x26, 0x03, 0x04, 0x14, 0x08, 0x00, 0x1c, 0x00, 0xf0,
 0x03, 0x73, 0x65, 0x6c, 0x66, 0x2d, 0x65, 0x78, 0x70, 0x6c,
 0x61, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2125;
-const unsigned short help_text_words = 384;
+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 353c541d47..033aca17fa 100644
--- a/apps/plugins/puzzles/help/pearl.c
+++ b/apps/plugins/puzzles/help/pearl.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,180 +6,248 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 138, TEXT_UNDERLINE },
- { 164, TEXT_UNDERLINE },
- { 185, TEXT_UNDERLINE },
- { 223, TEXT_CENTER | C_RED },
- { 369, TEXT_UNDERLINE },
- { 460, TEXT_CENTER | C_RED },
+ { 139, TEXT_UNDERLINE },
+ { 165, TEXT_UNDERLINE },
+ { 186, TEXT_UNDERLINE },
+ { 221, TEXT_CENTER | C_RED },
+ { 367, TEXT_UNDERLINE },
+ { 458, TEXT_CENTER | C_RED },
+ { 475, TEXT_UNDERLINE },
+ { 476, TEXT_UNDERLINE },
+ { 486, TEXT_UNDERLINE },
+ { 498, TEXT_UNDERLINE },
+ { 586, TEXT_CENTER | C_RED },
+ { 652, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2570 comp 1610 ratio 0.626459 level 10 saved 960 */
+/* orig 3598 comp 2217 ratio 0.616176 level 10 saved 1381 */
 const char help_text[] = {
-0xf0, 0x21, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x36, 0x3a, 0x20, 0x50, 0x65, 0x61, 0x72, 0x6c, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
-0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
-0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2e,
-0x1c, 0x00, 0xf0, 0x1b, 0x72, 0x00, 0x6a, 0x6f, 0x62, 0x00,
-0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x64, 0x72, 0x61, 0x77,
-0x00, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x00, 0x62, 0x65, 0x74,
-0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x68, 0x65, 0x00, 0x63,
-0x65, 0x6e, 0x74, 0x72, 0x65, 0x73, 0x3a, 0x00, 0xf1, 0x07,
-0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c,
-0x6c, 0x79, 0x00, 0x6f, 0x72, 0x00, 0x76, 0x65, 0x72, 0x74,
-0x69, 0x63, 0x0e, 0x00, 0x40, 0x61, 0x64, 0x6a, 0x61, 0x2a,
-0x00, 0x04, 0x5e, 0x00, 0x91, 0x2c, 0x00, 0x73, 0x6f, 0x00,
-0x74, 0x68, 0x61, 0x74, 0x44, 0x00, 0x02, 0x56, 0x00, 0xf2,
-0x0d, 0x66, 0x6f, 0x72, 0x6d, 0x00, 0x61, 0x00, 0x73, 0x69,
-0x6e, 0x67, 0x6c, 0x65, 0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65,
-0x64, 0x00, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x00, 0x49, 0x6c,
-0x00, 0x91, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x69, 0x6e,
-0x67, 0xad, 0x00, 0x00, 0x44, 0x00, 0x20, 0x6d, 0x65, 0x79,
-0x00, 0x00, 0x1c, 0x00, 0x03, 0x59, 0x00, 0x07, 0x55, 0x00,
-0x81, 0x6f, 0x6f, 0x70, 0x00, 0x70, 0x61, 0x73, 0x73, 0x15,
-0x00, 0xc0, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x00, 0x77, 0x69,
-0x6c, 0x6c, 0x00, 0x63, 0xa3, 0x00, 0xf2, 0x00, 0x69, 0x6e,
-0x00, 0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72, 0x73, 0x2c, 0x00,
-0x61, 0x6e, 0x64, 0x4b, 0x00, 0x01, 0x1f, 0x00, 0xb7, 0x62,
-0x65, 0x00, 0x73, 0x74, 0x72, 0x61, 0x69, 0x67, 0x68, 0x74,
-0xd2, 0x00, 0x08, 0xd0, 0x00, 0x02, 0xb0, 0x00, 0x44, 0x2e,
-0x00, 0x28, 0x41, 0x39, 0x00, 0x04, 0x7d, 0x00, 0x30, 0x63,
-0x61, 0x6e, 0x40, 0x00, 0xf6, 0x03, 0x63, 0x6f, 0x6d, 0x70,
-0x6c, 0x65, 0x74, 0x65, 0x6c, 0x79, 0x00, 0x65, 0x6d, 0x70,
-0x74, 0x79, 0x00, 0x2d, 0x92, 0x00, 0x72, 0x64, 0x6f, 0x65,
-0x73, 0x6e, 0x27, 0x74, 0x76, 0x01, 0x21, 0x74, 0x6f, 0xa2,
-0x00, 0x05, 0xa0, 0x00, 0x53, 0x65, 0x76, 0x65, 0x72, 0x79,
-0x4e, 0x00, 0x6e, 0x2e, 0x29, 0x00, 0x00, 0x00, 0x53, 0xe2,
-0x00, 0x05, 0xc0, 0x00, 0x51, 0x62, 0x6c, 0x61, 0x63, 0x6b,
-0xbd, 0x00, 0xb0, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00, 0x63,
-0x69, 0x72, 0x63, 0x6c, 0x5b, 0x01, 0x80, 0x77, 0x68, 0x69,
-0x63, 0x68, 0x00, 0x61, 0x72, 0x45, 0x01, 0x1d, 0x75, 0x13,
-0x01, 0xf3, 0x02, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x73, 0x61,
-0x74, 0x69, 0x73, 0x66, 0x79, 0x2e, 0x00, 0x00, 0x00, 0x41,
-0x49, 0x00, 0x02, 0x3f, 0x00, 0x53, 0x00, 0x69, 0x6e, 0x00,
-0x61, 0x6b, 0x00, 0x86, 0x00, 0x69, 0x6e, 0x64, 0x69, 0x63,
-0x61, 0x74, 0x43, 0x00, 0x14, 0x61, 0xc1, 0x01, 0x00, 0x14,
-0x02, 0x13, 0x61, 0x42, 0x01, 0xdc, 0x2c, 0x00, 0x62, 0x75,
-0x74, 0x00, 0x6e, 0x65, 0x69, 0x74, 0x68, 0x65, 0x72, 0xad,
-0x00, 0x05, 0xf9, 0x01, 0x50, 0x74, 0x6f, 0x00, 0x69, 0x74,
-0x5e, 0x00, 0x05, 0x89, 0x00, 0x00, 0x43, 0x00, 0x35, 0x6c,
-0x73, 0x6f, 0x48, 0x00, 0x02, 0x8d, 0x00, 0x08, 0xcc, 0x00,
-0x0e, 0x81, 0x00, 0x19, 0x65, 0x80, 0x00, 0x05, 0xa8, 0x01,
-0x42, 0x65, 0x64, 0x67, 0x65, 0x87, 0x00, 0xcf, 0x61, 0x74,
-0x20, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x20, 0x6f, 0x6e, 0x65,
-0x8c, 0x00, 0x1c, 0x07, 0x87, 0x00, 0xc0, 0x28, 0x49, 0x6e,
-0x00, 0x62, 0x6f, 0x74, 0x68, 0x00, 0x63, 0x61, 0x73, 0x52,
-0x01, 0x22, 0x74, 0x68, 0x4c, 0x01, 0x50, 0x00, 0x6f, 0x6e,
-0x6c, 0x79, 0x81, 0x01, 0x01, 0x7a, 0x00, 0x21, 0x6e, 0x73,
-0x19, 0x00, 0x3e, 0x74, 0x77, 0x6f, 0x63, 0x00, 0x70, 0x69,
-0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x5d, 0x00, 0x12, 0x2c,
-0xbd, 0x00, 0x3f, 0x69, 0x73, 0x2c, 0xa9, 0x02, 0x0f, 0xf0,
-0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00, 0x61, 0x66, 0x74, 0x65,
-0x72, 0x00, 0x6c, 0x65, 0x61, 0x76, 0xeb, 0x02, 0x05, 0x7c,
-0x00, 0x03, 0x17, 0x02, 0x2c, 0x00, 0x54, 0x45, 0x00, 0x23,
-0x61, 0x72, 0x99, 0x00, 0x0c, 0x7e, 0x00, 0x01, 0xd3, 0x03,
-0x00, 0x1e, 0x00, 0x36, 0x6e, 0x6f, 0x74, 0xb6, 0x00, 0x21,
-0x65, 0x64, 0x5b, 0x02, 0x60, 0x43, 0x72, 0x65, 0x64, 0x69,
-0x74, 0x76, 0x03, 0xf1, 0x01, 0x00, 0x74, 0x68, 0x69, 0x73,
-0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f,
-0x65, 0xef, 0x03, 0x60, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69,
-0x4d, 0x02, 0x20, 0x6f, 0x00, 0xc4, 0x03, 0x00, 0x32, 0x01,
-0xf1, 0x06, 0x60, 0x4d, 0x61, 0x73, 0x79, 0x75, 0x27, 0x2e,
-0x00, 0x5b, 0x31, 0x39, 0x5d, 0x00, 0x00, 0x00, 0x54, 0x68,
-0x61, 0x6e, 0x6b, 0x2e, 0x00, 0xc1, 0x4a, 0x61, 0x6d, 0x65,
-0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0x79, 0x53, 0x00,
-0x90, 0x61, 0x73, 0x73, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63,
-0x56, 0x03, 0x21, 0x74, 0x68, 0xc6, 0x00, 0x10, 0x69, 0x16,
-0x03, 0x90, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
-0x6e, 0x68, 0x01, 0x01, 0x48, 0x00, 0xc1, 0x68, 0x74, 0x74,
-0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x75,
-0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65,
-0x6e, 0x2f, 0x94, 0x00, 0x30, 0x73, 0x2f, 0x6d, 0x78, 0x00,
-0xc1, 0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0x28, 0x62, 0x65,
-0x77, 0x61, 0x72, 0xdc, 0x01, 0x50, 0x46, 0x6c, 0x61, 0x73,
-0x68, 0xcb, 0x00, 0x43, 0x33, 0x36, 0x2e, 0x31, 0xd4, 0x04,
-0x00, 0x1d, 0x03, 0x50, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0xe2,
-0x00, 0x46, 0x6c, 0x69, 0x63, 0x6b, 0x7f, 0x00, 0x40, 0x6c,
-0x65, 0x66, 0x74, 0x24, 0x02, 0x64, 0x74, 0x6f, 0x6e, 0x00,
-0x6f, 0x6e, 0xf2, 0x04, 0x00, 0x3b, 0x02, 0x05, 0xdf, 0x04,
-0x50, 0x61, 0x00, 0x73, 0x65, 0x67, 0xa2, 0x00, 0x04, 0x3b,
-0x02, 0x01, 0x9c, 0x01, 0x04, 0x9e, 0x03, 0x01, 0x6d, 0x01,
-0x02, 0x6b, 0x02, 0x20, 0x6f, 0x72, 0x34, 0x00, 0x68, 0x72,
-0x65, 0x6d, 0x6f, 0x76, 0x65, 0x36, 0x00, 0x00, 0xf0, 0x00,
-0x10, 0x69, 0xec, 0x01, 0x01, 0x50, 0x00, 0x01, 0xe4, 0x00,
-0x4f, 0x44, 0x72, 0x61, 0x67, 0x85, 0x00, 0x03, 0x04, 0x58,
-0x00, 0x00, 0x40, 0x00, 0x47, 0x72, 0x69, 0x65, 0x73, 0x7e,
-0x05, 0x05, 0x92, 0x00, 0x40, 0x6d, 0x6f, 0x72, 0x65, 0x79,
-0x00, 0x00, 0xb3, 0x00, 0x1f, 0x65, 0x9e, 0x00, 0x02, 0x12,
-0x69, 0x1b, 0x00, 0xf0, 0x05, 0x67, 0x6f, 0x2e, 0x00, 0x41,
-0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65,
-0x6c, 0x79, 0x2c, 0x00, 0x64, 0x7a, 0x00, 0xc1, 0x6f, 0x76,
-0x65, 0x72, 0x00, 0x61, 0x6e, 0x00, 0x65, 0x78, 0x69, 0x73,
-0x3b, 0x05, 0x3b, 0x70, 0x61, 0x72, 0xdf, 0x00, 0x41, 0x6f,
-0x00, 0x75, 0x6e, 0x6d, 0x00, 0x24, 0x69, 0x74, 0xda, 0x00,
-0x03, 0x11, 0x00, 0x04, 0x2c, 0x00, 0x21, 0x69, 0x74, 0x68,
-0x04, 0x72, 0x74, 0x68, 0x65, 0x6e, 0x00, 0x67, 0x6f, 0x24,
-0x04, 0x60, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x8e, 0x00,
-0x54, 0x64, 0x69, 0x72, 0x65, 0x63, 0xd3, 0x01, 0x0b, 0x75,
-0x01, 0x11, 0x72, 0xa0, 0x03, 0x0f, 0x76, 0x01, 0x06, 0x40,
-0x6d, 0x61, 0x72, 0x6b, 0x5e, 0x00, 0x01, 0x30, 0x00, 0x84,
-0x61, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x2c, 0xf7, 0x03,
-0x02, 0xfe, 0x02, 0x61, 0x61, 0x74, 0x00, 0x79, 0x6f, 0x75,
-0xc7, 0x02, 0x4a, 0x73, 0x75, 0x72, 0x65, 0x4a, 0x05, 0x01,
-0xda, 0x02, 0x2e, 0x67, 0x6f, 0xa3, 0x01, 0x92, 0x2e, 0x00,
-0x28, 0x46, 0x6f, 0x72, 0x00, 0x69, 0x6e, 0x85, 0x02, 0x64,
-0x2c, 0x00, 0x69, 0x66, 0x00, 0x79, 0xed, 0x06, 0x73, 0x64,
-0x65, 0x63, 0x69, 0x64, 0x65, 0x64, 0x29, 0x05, 0x0f, 0x26,
-0x04, 0x08, 0x14, 0x61, 0x8f, 0x04, 0x00, 0x80, 0x03, 0x21,
-0x68, 0x61, 0x97, 0x01, 0x2b, 0x62, 0x65, 0xfa, 0x04, 0x20,
-0x64, 0x6f, 0xd0, 0x05, 0x83, 0x79, 0x65, 0x74, 0x00, 0x6b,
-0x6e, 0x6f, 0x77, 0x55, 0x00, 0x32, 0x77, 0x61, 0x79, 0xba,
-0x03, 0x01, 0x29, 0x00, 0x71, 0x00, 0x74, 0x75, 0x72, 0x6e,
-0x73, 0x2c, 0x82, 0x00, 0x11, 0x6d, 0x12, 0x01, 0x01, 0xf9,
-0x00, 0x00, 0x21, 0x00, 0x00, 0xbc, 0x01, 0x00, 0x2d, 0x00,
-0x20, 0x69, 0x74, 0x3e, 0x06, 0x11, 0x27, 0xce, 0x00, 0x08,
-0x0e, 0x01, 0x01, 0xac, 0x03, 0x0b, 0xd9, 0x01, 0x32, 0x75,
-0x73, 0x65, 0x5d, 0x00, 0x91, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0x00, 0x6b, 0x65, 0x79, 0x9a, 0x00, 0x01, 0x8d, 0x02, 0x06,
-0x18, 0x00, 0x33, 0x2e, 0x00, 0x55, 0x28, 0x00, 0x41, 0x45,
-0x6e, 0x74, 0x65, 0x27, 0x00, 0x02, 0xc0, 0x00, 0x31, 0x67,
-0x69, 0x6e, 0xcf, 0x01, 0x30, 0x65, 0x6e, 0x64, 0x15, 0x00,
-0x70, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x00, 0x60, 0x2e, 0x02,
-0x61, 0x27, 0x00, 0x6f, 0x70, 0x65, 0x72, 0x9f, 0x03, 0x16,
-0x73, 0x3f, 0x00, 0x30, 0x53, 0x70, 0x61, 0x42, 0x01, 0x60,
-0x45, 0x73, 0x63, 0x61, 0x70, 0x65, 0x21, 0x02, 0x50, 0x42,
-0x61, 0x63, 0x6b, 0x73, 0x15, 0x00, 0x05, 0x7b, 0x00, 0x10,
-0x63, 0x65, 0x01, 0x11, 0x6c, 0x2e, 0x00, 0x00, 0x48, 0x00,
-0xc2, 0x2e, 0x00, 0x4f, 0x72, 0x2c, 0x00, 0x68, 0x6f, 0x6c,
-0x64, 0x00, 0x43, 0x91, 0x03, 0x00, 0x17, 0x01, 0x12, 0x6c,
-0x1d, 0x00, 0x37, 0x67, 0x69, 0x6e, 0x11, 0x03, 0x0b, 0xc4,
-0x00, 0x55, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0xe9, 0x02, 0x42,
-0x73, 0x00, 0x61, 0x73, 0x35, 0x01, 0x00, 0xdb, 0x00, 0x04,
-0x77, 0x08, 0x05, 0xa2, 0x08, 0x60, 0x00, 0x00, 0x50, 0x72,
-0x65, 0x73, 0x31, 0x08, 0x04, 0x67, 0x00, 0xe1, 0x2d, 0x53,
-0x68, 0x69, 0x66, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x6f, 0x77,
-0x6b, 0x65, 0x86, 0x08, 0x0b, 0x12, 0x00, 0x51, 0x73, 0x69,
-0x6d, 0x75, 0x6c, 0x53, 0x06, 0x12, 0x61, 0x8d, 0x03, 0x23,
-0x6f, 0x72, 0xa5, 0x02, 0x10, 0x63, 0xba, 0x02, 0x10, 0x2c,
-0x65, 0x08, 0x34, 0x70, 0x65, 0x63, 0x6b, 0x01, 0x12, 0x6f,
-0x25, 0x06, 0x01, 0xb0, 0x02, 0x03, 0x31, 0x06, 0x05, 0xef,
-0x02, 0x04, 0x3a, 0x02, 0x31, 0x6b, 0x65, 0x79, 0x35, 0x06,
-0x22, 0x41, 0x6c, 0x02, 0x01, 0x21, 0x61, 0x63, 0x41, 0x01,
-0xa0, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
-0x64, 0x3a, 0x00, 0x13, 0x73, 0x34, 0x00, 0x31, 0x32, 0x2e,
-0x31, 0xcc, 0x02, 0x02, 0xfb, 0x06, 0x93, 0x76, 0x61, 0x69,
-0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0xc7, 0x04, 0x13, 0x32,
-0xc7, 0x04, 0xb1, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-0x65, 0x72, 0x73, 0x20, 0x68, 0x05, 0x46, 0x65, 0x73, 0x65,
-0x00, 0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x51,
-0x00, 0x66, 0x72, 0x6f, 0x6d, 0x79, 0x00, 0xa0, 0x60, 0x43,
-0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0xc9, 0x01,
-0x02, 0xa3, 0x00, 0x12, 0x6e, 0x1a, 0x00, 0xc0, 0x54, 0x79,
-0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x00,
+0x00, 0x2d, 0x01, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00,
+0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
+0x75, 0x61, 0x72, 0x65, 0x73, 0x2e, 0x1c, 0x00, 0xf0, 0x1b,
+0x72, 0x00, 0x6a, 0x6f, 0x62, 0x00, 0x69, 0x73, 0x00, 0x74,
+0x6f, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00, 0x6c, 0x69, 0x6e,
+0x65, 0x73, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e,
+0x00, 0x74, 0x68, 0x65, 0x00, 0x63, 0x65, 0x6e, 0x74, 0x72,
+0x65, 0x73, 0x3a, 0x00, 0xf1, 0x07, 0x68, 0x6f, 0x72, 0x69,
+0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x6f,
+0x72, 0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e, 0x00,
+0x40, 0x61, 0x64, 0x6a, 0x61, 0x2a, 0x00, 0x04, 0x5e, 0x00,
+0x91, 0x2c, 0x00, 0x73, 0x6f, 0x00, 0x74, 0x68, 0x61, 0x74,
+0x44, 0x00, 0x02, 0x56, 0x00, 0xf2, 0x0d, 0x66, 0x6f, 0x72,
+0x6d, 0x00, 0x61, 0x00, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65,
+0x00, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x64, 0x00, 0x6c, 0x6f,
+0x6f, 0x70, 0x2e, 0x00, 0x49, 0x6c, 0x00, 0x91, 0x72, 0x65,
+0x73, 0x75, 0x6c, 0x74, 0x69, 0x6e, 0x67, 0xad, 0x00, 0x00,
+0x44, 0x00, 0x20, 0x6d, 0x65, 0x79, 0x00, 0x00, 0x1c, 0x00,
+0x03, 0x59, 0x00, 0x07, 0x55, 0x00, 0x81, 0x6f, 0x6f, 0x70,
+0x00, 0x70, 0x61, 0x73, 0x73, 0x15, 0x00, 0xc0, 0x72, 0x6f,
+0x75, 0x67, 0x68, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x63,
+0xa3, 0x00, 0xf2, 0x00, 0x69, 0x6e, 0x00, 0x63, 0x6f, 0x72,
+0x6e, 0x65, 0x72, 0x73, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x4b,
+0x00, 0x01, 0x1f, 0x00, 0xb7, 0x62, 0x65, 0x00, 0x73, 0x74,
+0x72, 0x61, 0x69, 0x67, 0x68, 0x74, 0xd2, 0x00, 0x08, 0xd0,
+0x00, 0x02, 0xb0, 0x00, 0x44, 0x2e, 0x00, 0x28, 0x41, 0x39,
+0x00, 0x04, 0x7d, 0x00, 0x30, 0x63, 0x61, 0x6e, 0x40, 0x00,
+0xf6, 0x03, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
+0x6c, 0x79, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x00, 0x2d,
+0x92, 0x00, 0x72, 0x64, 0x6f, 0x65, 0x73, 0x6e, 0x27, 0x74,
+0x76, 0x01, 0x21, 0x74, 0x6f, 0xa2, 0x00, 0x05, 0xa0, 0x00,
+0x53, 0x65, 0x76, 0x65, 0x72, 0x79, 0x4e, 0x00, 0x6e, 0x2e,
+0x29, 0x00, 0x00, 0x00, 0x53, 0xe2, 0x00, 0x05, 0xc0, 0x00,
+0x51, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0xbd, 0x00, 0xb0, 0x77,
+0x68, 0x69, 0x74, 0x65, 0x00, 0x63, 0x69, 0x72, 0x63, 0x6c,
+0x5b, 0x01, 0x80, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x61,
+0x72, 0x45, 0x01, 0x1d, 0x75, 0x13, 0x01, 0xf3, 0x02, 0x6d,
+0x75, 0x73, 0x74, 0x00, 0x73, 0x61, 0x74, 0x69, 0x73, 0x66,
+0x79, 0x2e, 0x00, 0x00, 0x00, 0x41, 0x49, 0x00, 0x02, 0x3f,
+0x00, 0x53, 0x00, 0x69, 0x6e, 0x00, 0x61, 0x6b, 0x00, 0x86,
+0x00, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x43, 0x00,
+0x14, 0x61, 0xc1, 0x01, 0x00, 0x14, 0x02, 0x13, 0x61, 0x42,
+0x01, 0xdc, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x6e, 0x65,
+0x69, 0x74, 0x68, 0x65, 0x72, 0xad, 0x00, 0x05, 0xf9, 0x01,
+0x50, 0x74, 0x6f, 0x00, 0x69, 0x74, 0x5e, 0x00, 0x05, 0x89,
+0x00, 0x00, 0x43, 0x00, 0x35, 0x6c, 0x73, 0x6f, 0x48, 0x00,
+0x02, 0x8d, 0x00, 0x08, 0xcc, 0x00, 0x0e, 0x81, 0x00, 0x19,
+0x65, 0x80, 0x00, 0x05, 0xa8, 0x01, 0x42, 0x65, 0x64, 0x67,
+0x65, 0x87, 0x00, 0xcf, 0x61, 0x74, 0x20, 0x6c, 0x65, 0x61,
+0x73, 0x74, 0x20, 0x6f, 0x6e, 0x65, 0x8c, 0x00, 0x1c, 0x07,
+0x87, 0x00, 0xc0, 0x28, 0x49, 0x6e, 0x00, 0x62, 0x6f, 0x74,
+0x68, 0x00, 0x63, 0x61, 0x73, 0x52, 0x01, 0x22, 0x74, 0x68,
+0x4c, 0x01, 0x50, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x81, 0x01,
+0x01, 0x7a, 0x00, 0x21, 0x6e, 0x73, 0x19, 0x00, 0x3e, 0x74,
+0x77, 0x6f, 0x63, 0x00, 0x70, 0x69, 0x6e, 0x20, 0x74, 0x68,
+0x65, 0x20, 0x5d, 0x00, 0x12, 0x2c, 0xbd, 0x00, 0x3f, 0x69,
+0x73, 0x2c, 0xa9, 0x02, 0x0f, 0xf0, 0x00, 0x69, 0x6e, 0x74,
+0x6f, 0x00, 0x61, 0x66, 0x74, 0x65, 0x72, 0x00, 0x6c, 0x65,
+0x61, 0x76, 0xeb, 0x02, 0x05, 0x7c, 0x00, 0x03, 0x17, 0x02,
+0x2c, 0x00, 0x54, 0x45, 0x00, 0x23, 0x61, 0x72, 0x99, 0x00,
+0x0c, 0x7e, 0x00, 0x01, 0xd3, 0x03, 0x00, 0x1e, 0x00, 0x36,
+0x6e, 0x6f, 0x74, 0xb6, 0x00, 0x21, 0x65, 0x64, 0x5b, 0x02,
+0x60, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x76, 0x03, 0xf1,
+0x01, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a,
+0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0xef, 0x03, 0x60,
+0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x4d, 0x02, 0x20, 0x6f,
+0x00, 0xc4, 0x03, 0x00, 0x32, 0x01, 0xf1, 0x06, 0x60, 0x4d,
+0x61, 0x73, 0x79, 0x75, 0x27, 0x2e, 0x00, 0x5b, 0x31, 0x39,
+0x5d, 0x00, 0x00, 0x00, 0x54, 0x68, 0x61, 0x6e, 0x6b, 0x2e,
+0x00, 0xc1, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61,
+0x72, 0x76, 0x65, 0x79, 0x53, 0x00, 0x90, 0x61, 0x73, 0x73,
+0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x56, 0x03, 0x21, 0x74,
+0x68, 0xc6, 0x00, 0x10, 0x69, 0x16, 0x03, 0x90, 0x6d, 0x65,
+0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x68, 0x01, 0x01,
+0x48, 0x00, 0xd1, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f,
+0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x76, 0x00, 0xa2, 0x2e,
+0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0x95,
+0x00, 0x30, 0x73, 0x2f, 0x6d, 0x79, 0x00, 0x83, 0x2f, 0x00,
+0x00, 0x00, 0x33, 0x36, 0x2e, 0x31, 0xd1, 0x04, 0x00, 0x08,
+0x03, 0x50, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0xcd, 0x00, 0x46,
+0x6c, 0x69, 0x63, 0x6b, 0x6a, 0x00, 0x40, 0x6c, 0x65, 0x66,
+0x74, 0x0f, 0x02, 0x64, 0x74, 0x6f, 0x6e, 0x00, 0x6f, 0x6e,
+0xdd, 0x04, 0x00, 0x26, 0x02, 0x05, 0xca, 0x04, 0x50, 0x61,
+0x00, 0x73, 0x65, 0x67, 0x8d, 0x00, 0x04, 0x26, 0x02, 0x01,
+0x87, 0x01, 0x04, 0x89, 0x03, 0x01, 0x58, 0x01, 0x02, 0x56,
+0x02, 0x20, 0x6f, 0x72, 0x34, 0x00, 0x68, 0x72, 0x65, 0x6d,
+0x6f, 0x76, 0x65, 0x36, 0x00, 0x00, 0xdb, 0x00, 0x10, 0x69,
+0xd7, 0x01, 0x01, 0x50, 0x00, 0x01, 0xcf, 0x00, 0x4f, 0x44,
+0x72, 0x61, 0x67, 0x85, 0x00, 0x03, 0x04, 0x58, 0x00, 0x00,
+0x40, 0x00, 0x47, 0x72, 0x69, 0x65, 0x73, 0x69, 0x05, 0x05,
+0x92, 0x00, 0x40, 0x6d, 0x6f, 0x72, 0x65, 0x79, 0x00, 0x00,
+0xb3, 0x00, 0x1f, 0x65, 0x9e, 0x00, 0x02, 0x12, 0x69, 0x1b,
+0x00, 0xf0, 0x05, 0x67, 0x6f, 0x2e, 0x00, 0x41, 0x6c, 0x74,
+0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x6c, 0x79,
+0x2c, 0x00, 0x64, 0x7a, 0x00, 0xc1, 0x6f, 0x76, 0x65, 0x72,
+0x00, 0x61, 0x6e, 0x00, 0x65, 0x78, 0x69, 0x73, 0x26, 0x05,
+0x3b, 0x70, 0x61, 0x72, 0xdf, 0x00, 0x41, 0x6f, 0x00, 0x75,
+0x6e, 0x6d, 0x00, 0x24, 0x69, 0x74, 0xda, 0x00, 0x03, 0x11,
+0x00, 0x04, 0x2c, 0x00, 0x21, 0x69, 0x74, 0x53, 0x04, 0x72,
+0x74, 0x68, 0x65, 0x6e, 0x00, 0x67, 0x6f, 0x0f, 0x04, 0x60,
+0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x8e, 0x00, 0x54, 0x64,
+0x69, 0x72, 0x65, 0x63, 0xbe, 0x01, 0x0b, 0x75, 0x01, 0x11,
+0x72, 0x8b, 0x03, 0x0f, 0x76, 0x01, 0x06, 0x40, 0x6d, 0x61,
+0x72, 0x6b, 0x5e, 0x00, 0x01, 0x30, 0x00, 0x84, 0x61, 0x00,
+0x63, 0x72, 0x6f, 0x73, 0x73, 0x2c, 0xe2, 0x03, 0x02, 0xe9,
+0x02, 0x61, 0x61, 0x74, 0x00, 0x79, 0x6f, 0x75, 0xb2, 0x02,
+0x4a, 0x73, 0x75, 0x72, 0x65, 0x35, 0x05, 0x01, 0xc5, 0x02,
+0x2e, 0x67, 0x6f, 0xa3, 0x01, 0x92, 0x2e, 0x00, 0x28, 0x46,
+0x6f, 0x72, 0x00, 0x69, 0x6e, 0x70, 0x02, 0x64, 0x2c, 0x00,
+0x69, 0x66, 0x00, 0x79, 0xd8, 0x06, 0x73, 0x64, 0x65, 0x63,
+0x69, 0x64, 0x65, 0x64, 0x14, 0x05, 0x0f, 0x11, 0x04, 0x08,
+0x14, 0x61, 0x7a, 0x04, 0x00, 0x6b, 0x03, 0x21, 0x68, 0x61,
+0x97, 0x01, 0x2b, 0x62, 0x65, 0xe5, 0x04, 0x20, 0x64, 0x6f,
+0xbb, 0x05, 0x83, 0x79, 0x65, 0x74, 0x00, 0x6b, 0x6e, 0x6f,
+0x77, 0x55, 0x00, 0x32, 0x77, 0x61, 0x79, 0xa5, 0x03, 0x01,
+0x29, 0x00, 0x71, 0x00, 0x74, 0x75, 0x72, 0x6e, 0x73, 0x2c,
+0x82, 0x00, 0x11, 0x6d, 0x12, 0x01, 0x01, 0xf9, 0x00, 0x00,
+0x21, 0x00, 0x00, 0xbc, 0x01, 0x00, 0x2d, 0x00, 0x20, 0x69,
+0x74, 0x29, 0x06, 0x11, 0x27, 0xce, 0x00, 0x08, 0x0e, 0x01,
+0x01, 0x97, 0x03, 0x0b, 0xd9, 0x01, 0x32, 0x75, 0x73, 0x65,
+0x5d, 0x00, 0x91, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b,
+0x65, 0x79, 0x9a, 0x00, 0x01, 0x8d, 0x02, 0x06, 0x18, 0x00,
+0x33, 0x2e, 0x00, 0x55, 0x28, 0x00, 0x41, 0x45, 0x6e, 0x74,
+0x65, 0x27, 0x00, 0x02, 0xc0, 0x00, 0x31, 0x67, 0x69, 0x6e,
+0xcf, 0x01, 0x30, 0x65, 0x6e, 0x64, 0x15, 0x00, 0x70, 0x62,
+0x6f, 0x61, 0x72, 0x64, 0x00, 0x60, 0x2e, 0x02, 0x61, 0x27,
+0x00, 0x6f, 0x70, 0x65, 0x72, 0x8a, 0x03, 0x16, 0x73, 0x3f,
+0x00, 0x30, 0x53, 0x70, 0x61, 0x42, 0x01, 0x60, 0x45, 0x73,
+0x63, 0x61, 0x70, 0x65, 0x21, 0x02, 0x50, 0x42, 0x61, 0x63,
+0x6b, 0x73, 0x15, 0x00, 0x05, 0x7b, 0x00, 0x10, 0x63, 0x65,
+0x01, 0x11, 0x6c, 0x2e, 0x00, 0x00, 0x48, 0x00, 0xc2, 0x2e,
+0x00, 0x4f, 0x72, 0x2c, 0x00, 0x68, 0x6f, 0x6c, 0x64, 0x00,
+0x43, 0x91, 0x03, 0x00, 0x17, 0x01, 0x12, 0x6c, 0x1d, 0x00,
+0x37, 0x67, 0x69, 0x6e, 0x11, 0x03, 0x0b, 0xc4, 0x00, 0x55,
+0x74, 0x6f, 0x67, 0x67, 0x6c, 0xe9, 0x02, 0x42, 0x73, 0x00,
+0x61, 0x73, 0x35, 0x01, 0x00, 0xdb, 0x00, 0x04, 0x62, 0x08,
+0x05, 0x8d, 0x08, 0x60, 0x00, 0x00, 0x50, 0x72, 0x65, 0x73,
+0x1c, 0x08, 0x04, 0x67, 0x00, 0xe1, 0x2d, 0x53, 0x68, 0x69,
+0x66, 0x74, 0x2d, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x6b, 0x65,
+0x71, 0x08, 0x0b, 0x12, 0x00, 0x51, 0x73, 0x69, 0x6d, 0x75,
+0x6c, 0x3e, 0x06, 0x12, 0x61, 0x8d, 0x03, 0x23, 0x6f, 0x72,
+0xa5, 0x02, 0x10, 0x63, 0xba, 0x02, 0x10, 0x2c, 0x50, 0x08,
+0x34, 0x70, 0x65, 0x63, 0x6b, 0x01, 0x12, 0x6f, 0x10, 0x06,
+0x01, 0xb0, 0x02, 0x03, 0x1c, 0x06, 0x05, 0xef, 0x02, 0x04,
+0x3a, 0x02, 0x31, 0x6b, 0x65, 0x79, 0x20, 0x06, 0x22, 0x41,
+0x6c, 0x02, 0x01, 0x21, 0x61, 0x63, 0x41, 0x01, 0xa0, 0x00,
+0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0x3a,
+0x00, 0x13, 0x73, 0x34, 0x00, 0x31, 0x32, 0x2e, 0x31, 0xcc,
+0x02, 0x02, 0xe6, 0x06, 0x72, 0x76, 0x61, 0x69, 0x6c, 0x61,
+0x62, 0x6c, 0xd8, 0x07, 0x43, 0x33, 0x36, 0x2e, 0x32, 0xc7,
+0x04, 0xb1, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+0x72, 0x73, 0x20, 0x53, 0x05, 0x46, 0x65, 0x73, 0x65, 0x00,
+0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x51, 0x00,
+0x66, 0x72, 0x6f, 0x6d, 0x79, 0x00, 0xa0, 0x60, 0x43, 0x75,
+0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0xc9, 0x01, 0x02,
+0xa3, 0x00, 0x12, 0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70,
+0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xab, 0x00, 0x91,
+0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xf9,
+0x00, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x19, 0x07, 0x01,
+0x9c, 0x03, 0x19, 0x69, 0x62, 0x01, 0xa0, 0x44, 0x69, 0x66,
+0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0xdd, 0x03, 0x03,
+0x5e, 0x05, 0x03, 0x08, 0x01, 0x05, 0x1a, 0x00, 0x03, 0x09,
+0x01, 0x30, 0x67, 0x65, 0x6e, 0x3e, 0x02, 0x23, 0x65, 0x64,
+0x38, 0x06, 0x11, 0x2e, 0xbb, 0x02, 0xa0, 0x6c, 0x6f, 0x77,
+0x20, 0x75, 0x6e, 0x73, 0x6f, 0x6c, 0x75, 0xad, 0x00, 0x42,
+0x00, 0x00, 0x49, 0x66, 0x5c, 0x06, 0x72, 0x69, 0x73, 0x00,
+0x73, 0x65, 0x74, 0x2c, 0x56, 0x04, 0x01, 0x3f, 0x00, 0x17,
+0x61, 0x6f, 0x09, 0x06, 0x4c, 0x00, 0x03, 0x77, 0x01, 0x11,
+0x73, 0x2a, 0x06, 0x20, 0x73, 0x74, 0x2e, 0x03, 0x13, 0x3a,
+0x15, 0x09, 0x07, 0x03, 0x07, 0x02, 0xfb, 0x03, 0x00, 0x6c,
+0x09, 0x80, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x79,
+0x46, 0x00, 0x42, 0x70, 0x72, 0x6f, 0x76, 0xeb, 0x03, 0x04,
+0xc6, 0x09, 0x42, 0x68, 0x6f, 0x77, 0x6e, 0xde, 0x09, 0x07,
+0xb2, 0x00, 0x22, 0x6f, 0x72, 0x21, 0x00, 0x01, 0x13, 0x07,
+0x20, 0x68, 0x65, 0xc1, 0x04, 0x21, 0x68, 0x65, 0xba, 0x08,
+0x00, 0x25, 0x00, 0x03, 0x05, 0x07, 0x03, 0xc8, 0x09, 0x50,
+0x75, 0x6e, 0x69, 0x71, 0x75, 0xc6, 0x09, 0x71, 0x73, 0x6f,
+0x6c, 0x76, 0x65, 0x64, 0x2e, 0xa0, 0x01, 0x00, 0xcc, 0x00,
+0x82, 0x70, 0x65, 0x65, 0x64, 0x73, 0x00, 0x75, 0x70, 0xc8,
+0x00, 0x03, 0x5a, 0x00, 0x23, 0x69, 0x6f, 0x6e, 0x00, 0x10,
+0x61, 0x08, 0x01, 0xd1, 0x73, 0x00, 0x6d, 0x75, 0x63, 0x68,
+0x00, 0x6c, 0x61, 0x72, 0x67, 0x65, 0x72, 0x6e, 0x01, 0x04,
+0x53, 0x04, 0x40, 0x70, 0x6c, 0x61, 0x79, 0x4d, 0x00, 0x31,
+0x41, 0x74, 0x00, 0xab, 0x08, 0x01, 0x18, 0x04, 0x03, 0xca,
+0x00, 0x20, 0x65, 0x00, 0x3d, 0x01, 0x01, 0xcf, 0x01, 0x01,
+0xa6, 0x00, 0x20, 0x73, 0x74, 0x06, 0x00, 0x62, 0x61, 0x6c,
+0x77, 0x61, 0x79, 0x73, 0xd8, 0x05, 0x02, 0x89, 0x04, 0x00,
+0xb1, 0x00, 0x20, 0x65, 0x27, 0x14, 0x05, 0xa3, 0x00, 0x67,
+0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x65, 0x67, 0x08,
+0x15, 0x74, 0x01, 0x01, 0x02, 0xbf, 0x00, 0x02, 0xe8, 0x05,
+0x0b, 0x1b, 0x00, 0x05, 0x6f, 0x00, 0x00, 0x7d, 0x06, 0x32,
+0x65, 0x64, 0x75, 0xcc, 0x06, 0x71, 0x73, 0x74, 0x65, 0x70,
+0x00, 0x62, 0x79, 0x08, 0x00, 0x12, 0x2e, 0xa6, 0x02, 0x13,
+0x33, 0xa6, 0x02, 0x81, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70,
+0x72, 0x65, 0x08, 0x06, 0x21, 0x63, 0x65, 0xac, 0x02, 0x20,
+0x4f, 0x6e, 0xcc, 0x00, 0x10, 0x74, 0xb8, 0x0b, 0x13, 0x73,
+0x1d, 0x0a, 0x70, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x00,
+0x2e, 0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0x9a, 0x02,
+0x16, 0x50, 0x12, 0x00, 0x0d, 0xb6, 0x02, 0x33, 0x47, 0x61,
+0x6d, 0xb6, 0x02, 0x02, 0xa5, 0x00, 0x22, 0x6c, 0x65, 0x0d,
+0x06, 0x64, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x0e, 0x06,
+0x45, 0x73, 0x74, 0x79, 0x6c, 0xd8, 0x09, 0x01, 0x7d, 0x01,
+0x30, 0x64, 0x69, 0x73, 0x51, 0x01, 0x80, 0x2e, 0x00, 0x60,
+0x54, 0x72, 0x61, 0x64, 0x69, 0x54, 0x00, 0x53, 0x61, 0x6c,
+0x27, 0x00, 0x69, 0xb9, 0x02, 0xb0, 0x65, 0x66, 0x61, 0x75,
+0x6c, 0x74, 0x00, 0x6d, 0x6f, 0x64, 0x65, 0x6d, 0x06, 0x03,
+0xb3, 0x05, 0x05, 0x59, 0x06, 0x36, 0x72, 0x75, 0x6e, 0xcf,
+0x0c, 0x07, 0xcb, 0x0c, 0x01, 0x1e, 0x03, 0x05, 0xac, 0x0c,
+0x01, 0x42, 0x05, 0x33, 0x61, 0x63, 0x68, 0x04, 0x0a, 0x51,
+0x63, 0x63, 0x75, 0x70, 0x69, 0x56, 0x04, 0x04, 0x93, 0x09,
+0x71, 0x60, 0x4c, 0x6f, 0x6f, 0x70, 0x79, 0x2d, 0x9e, 0x00,
+0x11, 0x27, 0x4d, 0x0a, 0x36, 0x6e, 0x00, 0x61, 0xc9, 0x05,
+0x01, 0x7f, 0x00, 0x02, 0x22, 0x01, 0x52, 0x6c, 0x6f, 0x6f,
+0x6b, 0x73, 0xeb, 0x07, 0x51, 0x6c, 0x69, 0x6b, 0x65, 0x00,
+0x39, 0x00, 0x32, 0x00, 0x28, 0x63, 0xaf, 0x0d, 0x4f, 0x00,
+0x32, 0x33, 0x29, 0xa7, 0x00, 0x0e, 0x01, 0x9c, 0x00, 0x02,
+0x8c, 0x0c, 0x04, 0x9d, 0x00, 0x04, 0x24, 0x0a, 0x03, 0x52,
+0x0b, 0x01, 0xa2, 0x00, 0xc0, 0x79, 0x00, 0x76, 0x65, 0x72,
+0x74, 0x69, 0x63, 0x65, 0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2570;
-const unsigned short help_text_words = 475;
+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 14cbbf7f94..32552a87fd 100644
--- a/apps/plugins/puzzles/help/pegs.c
+++ b/apps/plugins/puzzles/help/pegs.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,143 +6,147 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 72, TEXT_CENTER | C_RED },
- { 228, TEXT_CENTER | C_RED },
- { 245, TEXT_UNDERLINE },
+ { 73, TEXT_CENTER | C_RED },
+ { 229, TEXT_CENTER | C_RED },
  { 246, TEXT_UNDERLINE },
- { 256, TEXT_UNDERLINE },
+ { 247, TEXT_UNDERLINE },
+ { 257, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 1689 comp 1250 ratio 0.740083 level 3 saved 439 */
+/* orig 1734 comp 1272 ratio 0.733564 level 4 saved 462 */
 const char help_text[] = {
-0xf0, 0x46, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfb, 0x04, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x36, 0x3a, 0x20, 0x50, 0x65, 0x67, 0x73, 0x20, 0x00,
-0x00, 0x00, 0x41, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-0x00, 0x6f, 0x66, 0x00, 0x70, 0x65, 0x67, 0x73, 0x00, 0x61,
-0x72, 0x65, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x64, 0x00,
-0x69, 0x6e, 0x00, 0x68, 0x6f, 0x6c, 0x65, 0x73, 0x00, 0x6f,
-0x6e, 0x00, 0x61, 0x00, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x2e,
-0x00, 0x59, 0x6f, 0x75, 0x00, 0x63, 0x61, 0x6e, 0x00, 0x72,
-0x65, 0x6d, 0x6f, 0x76, 0x65, 0x00, 0x61, 0x36, 0x00, 0xf1,
-0x08, 0x00, 0x62, 0x79, 0x00, 0x6a, 0x75, 0x6d, 0x70, 0x69,
-0x6e, 0x67, 0x00, 0x61, 0x6e, 0x00, 0x61, 0x64, 0x6a, 0x61,
-0x63, 0x65, 0x6e, 0x74, 0x1b, 0x00, 0xf0, 0x10, 0x6f, 0x76,
-0x65, 0x72, 0x00, 0x69, 0x74, 0x00, 0x28, 0x68, 0x6f, 0x72,
-0x69, 0x7a, 0x6f, 0x6e, 0x74, 0x61, 0x6c, 0x6c, 0x79, 0x00,
-0x6f, 0x72, 0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e,
-0x00, 0xd1, 0x29, 0x00, 0x74, 0x6f, 0x00, 0x61, 0x00, 0x76,
-0x61, 0x63, 0x61, 0x6e, 0x74, 0x73, 0x00, 0x00, 0x72, 0x00,
-0xe1, 0x74, 0x68, 0x65, 0x00, 0x6f, 0x74, 0x68, 0x65, 0x72,
-0x00, 0x73, 0x69, 0x64, 0x65, 0x79, 0x00, 0x80, 0x72, 0x00,
-0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x30, 0x00, 0x04, 0x80,
-0x00, 0xa0, 0x6c, 0x6c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x6f,
-0x6e, 0x65, 0xc3, 0x00, 0x00, 0x35, 0x00, 0x01, 0xc7, 0x00,
-0x51, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6b, 0x00, 0xf0, 0x25,
-0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x2e, 0x00, 0x00,
-0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d, 0x65,
-0x2c, 0x00, 0x62, 0x65, 0x73, 0x74, 0x00, 0x6b, 0x6e, 0x6f,
-0x77, 0x6e, 0x00, 0x61, 0x73, 0x00, 0x60, 0x50, 0x65, 0x67,
-0x00, 0x53, 0x6f, 0x6c, 0x69, 0x74, 0x61, 0x69, 0x72, 0x65,
-0x27, 0x2c, 0x64, 0x00, 0x88, 0x70, 0x6f, 0x73, 0x73, 0x69,
-0x62, 0x6c, 0x79, 0x5b, 0x00, 0x30, 0x6f, 0x6c, 0x64, 0x38,
-0x00, 0x61, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x4a, 0x00,
-0xf2, 0x01, 0x73, 0x00, 0x73, 0x74, 0x69, 0x6c, 0x6c, 0x00,
-0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x6c, 0x79, 0x54, 0x00,
-0x00, 0x6d, 0x00, 0x42, 0x31, 0x36, 0x2e, 0x31, 0x67, 0x01,
-0x71, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x70, 0x01,
-0x36, 0x54, 0x6f, 0x00, 0x38, 0x01, 0x60, 0x2c, 0x00, 0x64,
-0x72, 0x61, 0x67, 0x1e, 0x01, 0x41, 0x77, 0x69, 0x74, 0x68,
-0x62, 0x00, 0xf1, 0x04, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00,
-0x66, 0x72, 0x6f, 0x6d, 0x00, 0x69, 0x74, 0x73, 0x00, 0x63,
-0x75, 0x72, 0x72, 0x4a, 0x01, 0x50, 0x6f, 0x73, 0x69, 0x74,
-0x69, 0x16, 0x01, 0x11, 0x6f, 0x18, 0x00, 0x55, 0x66, 0x69,
-0x6e, 0x61, 0x6c, 0x16, 0x00, 0x32, 0x2e, 0x00, 0x49, 0xa0,
-0x00, 0x0a, 0x17, 0x00, 0x00, 0xc6, 0x00, 0xb3, 0x65, 0x78,
-0x61, 0x63, 0x74, 0x6c, 0x79, 0x00, 0x74, 0x77, 0x6f, 0xcd,
-0x01, 0x42, 0x61, 0x77, 0x61, 0x79, 0x61, 0x00, 0x00, 0x32,
-0x00, 0x03, 0x28, 0x01, 0x05, 0x34, 0x00, 0x01, 0xfb, 0x00,
-0x03, 0x76, 0x00, 0xd0, 0x6c, 0x79, 0x00, 0x75, 0x6e, 0x6f,
-0x63, 0x63, 0x75, 0x70, 0x69, 0x65, 0x64, 0xe4, 0x01, 0x03,
-0xb5, 0x00, 0x30, 0x61, 0x6e, 0x64, 0x3c, 0x00, 0x20, 0x72,
-0x65, 0x2c, 0x00, 0x02, 0x01, 0x02, 0x23, 0x69, 0x6e, 0x4e,
-0x00, 0x60, 0x74, 0x65, 0x72, 0x76, 0x65, 0x6e, 0x09, 0x02,
-0x73, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x2c, 0xd6, 0x00,
-0x40, 0x76, 0x65, 0x00, 0x77, 0x28, 0x01, 0x10, 0x62, 0xa0,
-0x01, 0x74, 0x72, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x49,
-0x00, 0x09, 0x37, 0x00, 0x00, 0x4e, 0x00, 0x04, 0x2a, 0x00,
-0x02, 0xe4, 0x01, 0x10, 0x64, 0x4e, 0x01, 0x12, 0x56, 0x1d,
-0x02, 0xe3, 0x73, 0x70, 0x61, 0x63, 0x65, 0x73, 0x00, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x00, 0x79, 0x8b, 0x02, 0x06, 0x51,
-0x01, 0x00, 0x4a, 0x00, 0x11, 0x6f, 0xc3, 0x02, 0x62, 0x6d,
-0x61, 0x72, 0x6b, 0x65, 0x64, 0x58, 0x01, 0x01, 0xf8, 0x00,
-0x32, 0x2e, 0x00, 0x41, 0x3e, 0x00, 0x02, 0x14, 0x00, 0x21,
-0x6e, 0x6f, 0x30, 0x00, 0x00, 0x82, 0x00, 0x12, 0x6e, 0x1a,
-0x01, 0x00, 0xcd, 0x00, 0xf0, 0x02, 0x6e, 0x6f, 0x74, 0x00,
-0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x00,
-0x66, 0x6f, 0x72, 0x5c, 0x00, 0x01, 0xd6, 0x02, 0x10, 0x74,
-0x6a, 0x02, 0x10, 0x3a, 0xab, 0x01, 0x00, 0xf4, 0x00, 0xa7,
-0x6e, 0x00, 0x6f, 0x62, 0x73, 0x74, 0x61, 0x63, 0x6c, 0x65,
-0x8b, 0x00, 0xf1, 0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x77,
-0x6f, 0x72, 0x6b, 0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0xb7,
-0x00, 0x04, 0x2e, 0x03, 0x50, 0x61, 0x6c, 0x73, 0x6f, 0x00,
-0xda, 0x01, 0x00, 0xef, 0x00, 0xa1, 0x63, 0x75, 0x72, 0x73,
-0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0xca, 0x02, 0x04, 0x10,
-0x02, 0x05, 0xb6, 0x01, 0x83, 0x6e, 0x64, 0x69, 0x63, 0x61,
-0x74, 0x6f, 0x72, 0x48, 0x00, 0x01, 0x34, 0x00, 0x03, 0x7e,
-0x03, 0x50, 0x50, 0x72, 0x65, 0x73, 0x73, 0x91, 0x00, 0x00,
-0x14, 0x00, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x48,
-0x00, 0x00, 0x86, 0x00, 0x22, 0x6c, 0x65, 0x6c, 0x03, 0x03,
-0xa5, 0x01, 0x64, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0xb8,
-0x01, 0x06, 0x73, 0x00, 0x12, 0x2c, 0x5e, 0x01, 0x00, 0xaf,
-0x03, 0x04, 0x2e, 0x03, 0x02, 0xbe, 0x01, 0x81, 0x61, 0x74,
-0x00, 0x64, 0x69, 0x72, 0x65, 0x63, 0x84, 0x00, 0x32, 0x28,
-0x69, 0x66, 0x13, 0x00, 0x01, 0xe2, 0x01, 0x51, 0x6c, 0x65,
-0x67, 0x61, 0x6c, 0xa8, 0x00, 0x10, 0x29, 0xd5, 0x00, 0x41,
-0x28, 0x41, 0x6c, 0x6c, 0x3c, 0x00, 0x11, 0x61, 0x2d, 0x00,
-0x92, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62,
-0x33, 0x04, 0x13, 0x73, 0x43, 0x00, 0x31, 0x32, 0x2e, 0x31,
-0x8a, 0x01, 0x01, 0xfb, 0x00, 0x05, 0x55, 0x01, 0x22, 0x2e,
-0x29, 0x1b, 0x03, 0x12, 0x32, 0x1b, 0x03, 0x92, 0x70, 0x61,
-0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x1d, 0x03, 0x56,
-0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x40, 0x00,
-0x06, 0x90, 0x01, 0x04, 0xb5, 0x02, 0xe1, 0x60, 0x43, 0x75,
-0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f,
-0x70, 0x6e, 0x00, 0x03, 0x31, 0x04, 0xb0, 0x60, 0x54, 0x79,
-0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xaa, 0x00,
-0xf1, 0x04, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48,
-0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x00, 0x00, 0x53, 0x69,
-0x7a, 0xcc, 0x03, 0x36, 0x67, 0x72, 0x69, 0xdf, 0x04, 0x00,
-0x29, 0x00, 0x10, 0x42, 0x5f, 0x01, 0x93, 0x20, 0x74, 0x79,
-0x70, 0x65, 0x00, 0x00, 0x00, 0x43, 0xb0, 0x03, 0x41, 0x00,
-0x77, 0x68, 0x65, 0x81, 0x04, 0x00, 0xde, 0x01, 0x00, 0x8b,
-0x00, 0x45, 0x67, 0x69, 0x76, 0x65, 0x0b, 0x05, 0x00, 0x48,
-0x00, 0x70, 0x61, 0x00, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x0e,
-0x00, 0x50, 0x73, 0x68, 0x61, 0x70, 0x65, 0xd8, 0x04, 0xf3,
-0x04, 0x61, 0x00, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x6c,
-0x79, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65,
-0x1e, 0x00, 0x10, 0x2e, 0xe1, 0x00, 0x01, 0x8a, 0x03, 0x0a,
-0x36, 0x00, 0x08, 0x71, 0x03, 0x61, 0x73, 0x75, 0x70, 0x70,
-0x6f, 0x72, 0x1d, 0x03, 0x10, 0x72, 0xe9, 0x00, 0x51, 0x72,
-0x6f, 0x73, 0x73, 0x27, 0xa7, 0x02, 0xb1, 0x60, 0x4f, 0x63,
-0x74, 0x61, 0x67, 0x6f, 0x6e, 0x27, 0x00, 0x28, 0x53, 0x01,
-0x0a, 0x72, 0x04, 0x00, 0xc6, 0x04, 0x00, 0x01, 0x01, 0x71,
-0x45, 0x6e, 0x67, 0x6c, 0x69, 0x73, 0x68, 0x32, 0x00, 0xd1,
-0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x61, 0x6e, 0x00, 0x74,
-0x72, 0x61, 0x64, 0x5c, 0x02, 0x23, 0x61, 0x6c, 0xbc, 0x00,
-0xc0, 0x6c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x73, 0x00, 0x72,
-0x65, 0x73, 0x70, 0xb0, 0x01, 0xa0, 0x76, 0x65, 0x6c, 0x79,
-0x29, 0x2e, 0x00, 0x53, 0x65, 0x6c, 0x0e, 0x00, 0x51, 0x6e,
-0x67, 0x00, 0x60, 0x52, 0xc5, 0x00, 0x12, 0x27, 0x2e, 0x02,
-0x00, 0xf9, 0x00, 0x02, 0x06, 0x01, 0x61, 0x00, 0x64, 0x69,
-0x66, 0x66, 0x65, 0x94, 0x04, 0x26, 0x62, 0x6f, 0xf8, 0x00,
-0xc0, 0x65, 0x76, 0x65, 0x72, 0x79, 0x00, 0x74, 0x69, 0x6d,
-0x65, 0x00, 0x28, 0x8f, 0x05, 0x61, 0x61, 0x6c, 0x77, 0x61,
-0x79, 0x73, 0x3b, 0x05, 0x04, 0x47, 0x02, 0x02, 0xa7, 0x00,
-0x51, 0x74, 0x6f, 0x00, 0x68, 0x61, 0xf0, 0x02, 0xb0, 0x73,
-0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x29, 0x2e, 0x00,
+0x2d, 0x01, 0x00, 0xf0, 0x35, 0x00, 0x00, 0x00, 0x41, 0x00,
+0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00,
+0x70, 0x65, 0x67, 0x73, 0x00, 0x61, 0x72, 0x65, 0x00, 0x70,
+0x6c, 0x61, 0x63, 0x65, 0x64, 0x00, 0x69, 0x6e, 0x00, 0x68,
+0x6f, 0x6c, 0x65, 0x73, 0x00, 0x6f, 0x6e, 0x00, 0x61, 0x00,
+0x62, 0x6f, 0x61, 0x72, 0x64, 0x2e, 0x00, 0x59, 0x6f, 0x75,
+0x00, 0x63, 0x61, 0x6e, 0x00, 0x72, 0x65, 0x6d, 0x6f, 0x76,
+0x65, 0x00, 0x61, 0x36, 0x00, 0xf1, 0x08, 0x00, 0x62, 0x79,
+0x00, 0x6a, 0x75, 0x6d, 0x70, 0x69, 0x6e, 0x67, 0x00, 0x61,
+0x6e, 0x00, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74,
+0x1b, 0x00, 0xf0, 0x10, 0x6f, 0x76, 0x65, 0x72, 0x00, 0x69,
+0x74, 0x00, 0x28, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x6f, 0x6e,
+0x74, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72, 0x00, 0x76,
+0x65, 0x72, 0x74, 0x69, 0x63, 0x0e, 0x00, 0xd1, 0x29, 0x00,
+0x74, 0x6f, 0x00, 0x61, 0x00, 0x76, 0x61, 0x63, 0x61, 0x6e,
+0x74, 0x73, 0x00, 0x00, 0x72, 0x00, 0xe1, 0x74, 0x68, 0x65,
+0x00, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x00, 0x73, 0x69, 0x64,
+0x65, 0x79, 0x00, 0x80, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00,
+0x69, 0x73, 0x30, 0x00, 0x04, 0x80, 0x00, 0xa0, 0x6c, 0x6c,
+0x00, 0x62, 0x75, 0x74, 0x00, 0x6f, 0x6e, 0x65, 0xc3, 0x00,
+0x00, 0x35, 0x00, 0x01, 0xc7, 0x00, 0x51, 0x69, 0x6e, 0x69,
+0x74, 0x69, 0x6b, 0x00, 0xf0, 0x25, 0x70, 0x72, 0x65, 0x73,
+0x65, 0x6e, 0x74, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69,
+0x73, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x2c, 0x00, 0x62, 0x65,
+0x73, 0x74, 0x00, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x00, 0x61,
+0x73, 0x00, 0x60, 0x50, 0x65, 0x67, 0x00, 0x53, 0x6f, 0x6c,
+0x69, 0x74, 0x61, 0x69, 0x72, 0x65, 0x27, 0x2c, 0x64, 0x00,
+0x88, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x79, 0x5b,
+0x00, 0x30, 0x6f, 0x6c, 0x64, 0x38, 0x00, 0x61, 0x70, 0x75,
+0x7a, 0x7a, 0x6c, 0x65, 0x4a, 0x00, 0xf2, 0x01, 0x73, 0x00,
+0x73, 0x74, 0x69, 0x6c, 0x6c, 0x00, 0x63, 0x6f, 0x6d, 0x6d,
+0x6f, 0x6e, 0x6c, 0x79, 0x54, 0x00, 0x00, 0x6d, 0x00, 0x42,
+0x31, 0x36, 0x2e, 0x31, 0x78, 0x01, 0x90, 0x63, 0x6f, 0x6e,
+0x74, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x83, 0x00, 0x26, 0x6f,
+0x00, 0x38, 0x01, 0x60, 0x2c, 0x00, 0x64, 0x72, 0x61, 0x67,
+0x1e, 0x01, 0x41, 0x77, 0x69, 0x74, 0x68, 0x62, 0x00, 0xf1,
+0x04, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x66, 0x72, 0x6f,
+0x6d, 0x00, 0x69, 0x74, 0x73, 0x00, 0x63, 0x75, 0x72, 0x72,
+0x4a, 0x01, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x16, 0x01,
+0x11, 0x6f, 0x18, 0x00, 0x55, 0x66, 0x69, 0x6e, 0x61, 0x6c,
+0x16, 0x00, 0x32, 0x2e, 0x00, 0x49, 0xa0, 0x00, 0x0a, 0x17,
+0x00, 0x00, 0xc6, 0x00, 0xb3, 0x65, 0x78, 0x61, 0x63, 0x74,
+0x6c, 0x79, 0x00, 0x74, 0x77, 0x6f, 0xcd, 0x01, 0x42, 0x61,
+0x77, 0x61, 0x79, 0x61, 0x00, 0x00, 0x32, 0x00, 0x03, 0x28,
+0x01, 0x05, 0x34, 0x00, 0x01, 0xfb, 0x00, 0x03, 0x76, 0x00,
+0xd0, 0x6c, 0x79, 0x00, 0x75, 0x6e, 0x6f, 0x63, 0x63, 0x75,
+0x70, 0x69, 0x65, 0x64, 0xe4, 0x01, 0x03, 0xb5, 0x00, 0x30,
+0x61, 0x6e, 0x64, 0x3c, 0x00, 0x20, 0x72, 0x65, 0x2c, 0x00,
+0x02, 0x01, 0x02, 0x23, 0x69, 0x6e, 0x4e, 0x00, 0x60, 0x74,
+0x65, 0x72, 0x76, 0x65, 0x6e, 0x09, 0x02, 0x73, 0x73, 0x71,
+0x75, 0x61, 0x72, 0x65, 0x2c, 0xd6, 0x00, 0x40, 0x76, 0x65,
+0x00, 0x77, 0x28, 0x01, 0x10, 0x62, 0xa0, 0x01, 0x74, 0x72,
+0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x49, 0x00, 0x09, 0x37,
+0x00, 0x00, 0x4e, 0x00, 0x04, 0x2a, 0x00, 0x02, 0xe4, 0x01,
+0x10, 0x64, 0x4e, 0x01, 0x12, 0x56, 0x1d, 0x02, 0xe3, 0x73,
+0x70, 0x61, 0x63, 0x65, 0x73, 0x00, 0x77, 0x68, 0x69, 0x63,
+0x68, 0x00, 0x79, 0x8b, 0x02, 0x07, 0x89, 0x02, 0x41, 0x69,
+0x6e, 0x74, 0x6f, 0xc3, 0x02, 0x62, 0x6d, 0x61, 0x72, 0x6b,
+0x65, 0x64, 0x58, 0x01, 0x01, 0xf8, 0x00, 0x32, 0x2e, 0x00,
+0x41, 0x3e, 0x00, 0x02, 0x14, 0x00, 0x21, 0x6e, 0x6f, 0x30,
+0x00, 0x00, 0x82, 0x00, 0x12, 0x6e, 0x1a, 0x01, 0x00, 0xcd,
+0x00, 0xf0, 0x02, 0x6e, 0x6f, 0x74, 0x00, 0x61, 0x76, 0x61,
+0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x00, 0x66, 0x6f, 0x72,
+0x5c, 0x00, 0x01, 0xd6, 0x02, 0x10, 0x74, 0x6a, 0x02, 0x10,
+0x3a, 0xab, 0x01, 0x00, 0xf4, 0x00, 0xa7, 0x6e, 0x00, 0x6f,
+0x62, 0x73, 0x74, 0x61, 0x63, 0x6c, 0x65, 0x8b, 0x00, 0xf1,
+0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x77, 0x6f, 0x72, 0x6b,
+0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0xb7, 0x00, 0x04, 0x2e,
+0x03, 0x50, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0xda, 0x01, 0x00,
+0xef, 0x00, 0xa1, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00,
+0x6b, 0x65, 0x79, 0xca, 0x02, 0x04, 0x10, 0x02, 0x05, 0xb6,
+0x01, 0x83, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x6f, 0x72,
+0x48, 0x00, 0x01, 0x34, 0x00, 0x03, 0x7e, 0x03, 0x50, 0x50,
+0x72, 0x65, 0x73, 0x73, 0x91, 0x00, 0x00, 0x14, 0x00, 0x60,
+0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x48, 0x00, 0x00, 0x86,
+0x00, 0x22, 0x6c, 0x65, 0x6c, 0x03, 0x03, 0xa5, 0x01, 0x64,
+0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0xb8, 0x01, 0x06, 0x73,
+0x00, 0x12, 0x2c, 0x5e, 0x01, 0x00, 0xaf, 0x03, 0x04, 0x2e,
+0x03, 0x02, 0xbe, 0x01, 0x81, 0x61, 0x74, 0x00, 0x64, 0x69,
+0x72, 0x65, 0x63, 0x84, 0x00, 0x32, 0x28, 0x69, 0x66, 0x13,
+0x00, 0x01, 0xe2, 0x01, 0x51, 0x6c, 0x65, 0x67, 0x61, 0x6c,
+0xa8, 0x00, 0x10, 0x29, 0xd5, 0x00, 0x41, 0x28, 0x41, 0x6c,
+0x6c, 0x3c, 0x00, 0x11, 0x61, 0x2d, 0x00, 0x92, 0x73, 0x00,
+0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x33, 0x04, 0x13,
+0x73, 0x43, 0x00, 0x31, 0x32, 0x2e, 0x31, 0x8a, 0x01, 0x01,
+0xfb, 0x00, 0x05, 0x55, 0x01, 0x22, 0x2e, 0x29, 0x1b, 0x03,
+0x12, 0x32, 0x1b, 0x03, 0x92, 0x70, 0x61, 0x72, 0x61, 0x6d,
+0x65, 0x74, 0x65, 0x72, 0x1d, 0x03, 0x56, 0x68, 0x65, 0x73,
+0x65, 0x00, 0x14, 0x00, 0x02, 0x40, 0x00, 0x06, 0x90, 0x01,
+0x04, 0xb5, 0x02, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f,
+0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6e, 0x00,
+0x03, 0x31, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27,
+0x00, 0x6d, 0x65, 0x6e, 0x75, 0xaa, 0x00, 0xf1, 0x04, 0x57,
+0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x69, 0x67,
+0x68, 0x74, 0x00, 0x00, 0x00, 0x53, 0x69, 0x7a, 0xcc, 0x03,
+0x36, 0x67, 0x72, 0x69, 0xdf, 0x04, 0x00, 0x29, 0x00, 0x10,
+0x42, 0x5f, 0x01, 0x93, 0x20, 0x74, 0x79, 0x70, 0x65, 0x00,
+0x00, 0x00, 0x43, 0xb0, 0x03, 0x41, 0x00, 0x77, 0x68, 0x65,
+0x81, 0x04, 0x00, 0xde, 0x01, 0x00, 0x8b, 0x00, 0x45, 0x67,
+0x69, 0x76, 0x65, 0x0b, 0x05, 0x00, 0x48, 0x00, 0x70, 0x61,
+0x00, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x0e, 0x00, 0x50, 0x73,
+0x68, 0x61, 0x70, 0x65, 0xd8, 0x04, 0xf3, 0x04, 0x61, 0x00,
+0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x6c, 0x79, 0x00, 0x67,
+0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x1e, 0x00, 0x10,
+0x2e, 0xe1, 0x00, 0x01, 0x8a, 0x03, 0x0a, 0x36, 0x00, 0x08,
+0x71, 0x03, 0x61, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x1d,
+0x03, 0x10, 0x72, 0xe9, 0x00, 0xf1, 0x09, 0x72, 0x6f, 0x73,
+0x73, 0x27, 0x00, 0x28, 0x69, 0x6e, 0x00, 0x76, 0x61, 0x72,
+0x69, 0x6f, 0x75, 0x73, 0x00, 0x73, 0x69, 0x7a, 0x65, 0x73,
+0x29, 0xba, 0x02, 0x92, 0x60, 0x4f, 0x63, 0x74, 0x61, 0x67,
+0x6f, 0x6e, 0x27, 0x5a, 0x00, 0x41, 0x37, 0x78, 0x37, 0x00,
+0x31, 0x00, 0x01, 0x23, 0x05, 0x00, 0x6b, 0x00, 0x31, 0x72,
+0x61, 0x64, 0x54, 0x02, 0xa3, 0x61, 0x6c, 0x00, 0x45, 0x6e,
+0x67, 0x6c, 0x69, 0x73, 0x68, 0xbc, 0x00, 0x62, 0x6c, 0x61,
+0x79, 0x6f, 0x75, 0x74, 0x37, 0x00, 0x03, 0x45, 0x00, 0x0f,
+0x35, 0x00, 0x01, 0x60, 0x46, 0x72, 0x65, 0x6e, 0x63, 0x68,
+0x02, 0x05, 0x50, 0x2e, 0x00, 0x53, 0x65, 0x6c, 0xda, 0x01,
+0x51, 0x6e, 0x67, 0x00, 0x60, 0x52, 0xe1, 0x00, 0x12, 0x27,
+0x4a, 0x02, 0x00, 0x15, 0x01, 0x02, 0x22, 0x01, 0x61, 0x00,
+0x64, 0x69, 0x66, 0x66, 0x65, 0xb0, 0x04, 0x26, 0x62, 0x6f,
+0x14, 0x01, 0xc0, 0x65, 0x76, 0x65, 0x72, 0x79, 0x00, 0x74,
+0x69, 0x6d, 0x65, 0x00, 0x28, 0xab, 0x05, 0x61, 0x61, 0x6c,
+0x77, 0x61, 0x79, 0x73, 0x57, 0x05, 0x04, 0x63, 0x02, 0x02,
+0x89, 0x05, 0x51, 0x74, 0x6f, 0x00, 0x68, 0x61, 0x0c, 0x03,
+0xb0, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x29,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1689;
-const unsigned short help_text_words = 318;
+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 1ce92c05d1..65495dc3c1 100644
--- a/apps/plugins/puzzles/help/range.c
+++ b/apps/plugins/puzzles/help/range.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,157 +6,169 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 212, TEXT_CENTER | C_RED },
- { 245, TEXT_UNDERLINE },
- { 339, TEXT_CENTER | C_RED },
- { 356, TEXT_UNDERLINE },
+ { 213, TEXT_CENTER | C_RED },
+ { 246, TEXT_UNDERLINE },
+ { 340, TEXT_CENTER | C_RED },
  { 357, TEXT_UNDERLINE },
+ { 358, TEXT_UNDERLINE },
+ { 368, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 2036 comp 1387 ratio 0.681238 level 4 saved 649 */
+/* orig 2223 comp 1486 ratio 0.668466 level 10 saved 737 */
 const char help_text[] = {
-0xf4, 0x26, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x35, 0x3a, 0x20, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
-0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
-0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x3b,
-0x00, 0x73, 0x6f, 0x6d, 0x65, 0x0e, 0x00, 0xf0, 0x02, 0x00,
-0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75,
-0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x3a, 0x00, 0xf0, 0x00,
-0x72, 0x00, 0x6a, 0x6f, 0x62, 0x00, 0x69, 0x73, 0x00, 0x74,
-0x6f, 0x00, 0x63, 0x6f, 0x6c, 0x11, 0x00, 0x01, 0x34, 0x00,
-0x56, 0x6f, 0x66, 0x00, 0x74, 0x68, 0x3b, 0x00, 0xf3, 0x28,
-0x62, 0x6c, 0x61, 0x63, 0x6b, 0x2c, 0x00, 0x73, 0x75, 0x63,
-0x68, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x73, 0x65, 0x76,
-0x65, 0x72, 0x61, 0x6c, 0x00, 0x63, 0x72, 0x69, 0x74, 0x65,
-0x72, 0x69, 0x61, 0x00, 0x61, 0x72, 0x65, 0x00, 0x73, 0x61,
-0x74, 0x69, 0x73, 0x66, 0x69, 0x65, 0x64, 0x3a, 0x00, 0x00,
-0x00, 0x2d, 0x00, 0x6e, 0x6f, 0x40, 0x00, 0x73, 0x00, 0x77,
-0x69, 0x74, 0x68, 0x00, 0x61, 0x79, 0x00, 0x00, 0x6e, 0x00,
-0x02, 0x6b, 0x00, 0x22, 0x65, 0x64, 0x59, 0x00, 0x14, 0x2e,
-0x2f, 0x00, 0x32, 0x74, 0x77, 0x6f, 0x12, 0x00, 0x05, 0x79,
-0x00, 0x00, 0x3e, 0x00, 0xf0, 0x00, 0x61, 0x64, 0x6a, 0x61,
-0x63, 0x65, 0x6e, 0x74, 0x00, 0x28, 0x68, 0x6f, 0x72, 0x69,
-0x7a, 0xc6, 0x00, 0xd0, 0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72,
-0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e, 0x00, 0x12,
-0x29, 0x44, 0x00, 0x71, 0x66, 0x6f, 0x72, 0x00, 0x61, 0x6e,
-0x79, 0x49, 0x00, 0x45, 0x77, 0x68, 0x69, 0x74, 0xc2, 0x00,
-0x10, 0x2c, 0xcf, 0x00, 0x20, 0x72, 0x65, 0x7c, 0x00, 0xe0,
-0x61, 0x00, 0x70, 0x61, 0x74, 0x68, 0x00, 0x62, 0x65, 0x74,
-0x77, 0x65, 0x65, 0x6e, 0x18, 0x00, 0xca, 0x6d, 0x00, 0x75,
-0x73, 0x69, 0x6e, 0x67, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x37,
-0x00, 0x06, 0x56, 0x00, 0x4f, 0x65, 0x61, 0x63, 0x68, 0xcf,
-0x00, 0x02, 0x12, 0x2c, 0x11, 0x01, 0x03, 0xdc, 0x00, 0x71,
-0x64, 0x65, 0x6e, 0x6f, 0x74, 0x65, 0x73, 0x3d, 0x01, 0x54,
-0x74, 0x6f, 0x74, 0x61, 0x6c, 0x19, 0x00, 0x2a, 0x6f, 0x66,
-0x5a, 0x00, 0x20, 0x00, 0x72, 0x52, 0x00, 0x93, 0x61, 0x62,
-0x6c, 0x65, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x56, 0x01, 0x02,
-0x60, 0x00, 0x20, 0x67, 0x6f, 0x8e, 0x00, 0xf1, 0x03, 0x69,
-0x6e, 0x00, 0x61, 0x00, 0x73, 0x74, 0x72, 0x61, 0x69, 0x67,
-0x68, 0x74, 0x00, 0x6c, 0x69, 0x6e, 0x65, 0x13, 0x00, 0x36,
-0x6e, 0x79, 0x00, 0x07, 0x01, 0x08, 0x05, 0x01, 0xf0, 0x06,
-0x00, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
-0x00, 0x75, 0x6e, 0x74, 0x69, 0x6c, 0x00, 0x68, 0x69, 0x74,
-0x74, 0x49, 0x00, 0x51, 0x61, 0x00, 0x77, 0x61, 0x6c, 0x2b,
-0x00, 0x19, 0x61, 0x5e, 0x01, 0x17, 0x3b, 0xe3, 0x01, 0x02,
-0xd4, 0x00, 0x00, 0x10, 0x00, 0x06, 0xa5, 0x01, 0x80, 0x69,
-0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x64, 0x77, 0x00, 0x06,
-0xd0, 0x00, 0x51, 0x28, 0x6f, 0x6e, 0x63, 0x65, 0x6f, 0x01,
-0xf4, 0x00, 0x46, 0x6f, 0x72, 0x00, 0x69, 0x6e, 0x73, 0x74,
-0x61, 0x6e, 0x63, 0x65, 0x2c, 0x00, 0x61, 0x4a, 0x00, 0x03,
-0x67, 0x02, 0x00, 0x7a, 0x00, 0x07, 0x50, 0x00, 0x82, 0x6f,
-0x6e, 0x65, 0x00, 0x6d, 0x75, 0x73, 0x74, 0xab, 0x02, 0x10,
-0x66, 0x69, 0x02, 0x0b, 0xea, 0x01, 0xf1, 0x04, 0x73, 0x00,
-0x69, 0x74, 0x73, 0x00, 0x6e, 0x65, 0x69, 0x67, 0x68, 0x62,
-0x6f, 0x75, 0x72, 0x73, 0x00, 0x62, 0x79, 0x41, 0x00, 0x44,
-0x6c, 0x61, 0x73, 0x74, 0x68, 0x02, 0x70, 0x6f, 0x6e, 0x3b,
-0x00, 0x62, 0x75, 0x74, 0x18, 0x00, 0xe1, 0x6e, 0x00, 0x69,
-0x74, 0x27, 0x73, 0x00, 0x69, 0x6d, 0x70, 0x6f, 0x73, 0x73,
-0x69, 0x48, 0x01, 0x00, 0x90, 0x00, 0x10, 0x74, 0xca, 0x02,
-0x11, 0x62, 0x86, 0x00, 0x60, 0x6e, 0x65, 0x63, 0x74, 0x65,
-0x64, 0x10, 0x00, 0x00, 0x35, 0x01, 0x79, 0x6f, 0x75, 0x74,
-0x73, 0x69, 0x64, 0x65, 0x86, 0x01, 0x10, 0x2c, 0x0e, 0x00,
-0x84, 0x63, 0x68, 0x00, 0x76, 0x69, 0x6f, 0x6c, 0x61, 0xb7,
-0x01, 0x51, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x37, 0x00, 0x0a,
-0x7a, 0x00, 0x49, 0x2e, 0x00, 0x53, 0x6f, 0xd4, 0x02, 0x25,
-0x6c, 0x6c, 0x53, 0x03, 0x0a, 0xe9, 0x00, 0x00, 0x1d, 0x01,
-0x61, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x94, 0x00, 0xa0,
-0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
-0xdb, 0x01, 0x11, 0x65, 0x6c, 0x03, 0x60, 0x4e, 0x69, 0x6b,
-0x6f, 0x6c, 0x69, 0x80, 0x00, 0x12, 0x6f, 0x12, 0x01, 0xa0,
-0x76, 0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x6c, 0x79, 0x00,
-0xd0, 0x02, 0x00, 0x75, 0x01, 0xd2, 0x74, 0x00, 0x60, 0x4b,
-0x75, 0x72, 0x6f, 0x64, 0x6f, 0x6b, 0x6f, 0x27, 0x2c, 0x0c,
-0x00, 0x50, 0x6d, 0x61, 0x73, 0x75, 0x27, 0xc9, 0x01, 0x24,
-0x60, 0x57, 0xce, 0x02, 0x11, 0x42, 0x45, 0x01, 0xc0, 0x43,
-0x65, 0x6c, 0x6c, 0x73, 0x27, 0x2e, 0x00, 0x5b, 0x31, 0x38,
-0x5d, 0x7e, 0x00, 0x01, 0x1d, 0x04, 0x32, 0x00, 0x77, 0x61,
-0xf5, 0x03, 0x43, 0x72, 0x69, 0x62, 0x75, 0x0a, 0x01, 0x22,
-0x74, 0x68, 0x7e, 0x03, 0x13, 0x6c, 0x2a, 0x02, 0xf0, 0x01,
-0x62, 0x79, 0x00, 0x4a, 0x6f, 0x6e, 0x61, 0x73, 0x00, 0x4b,
-0x6f, 0x65, 0x6c, 0x6b, 0x65, 0x72, 0x3d, 0x00, 0x00, 0x45,
-0x00, 0xd1, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f,
-0x77, 0x77, 0x77, 0x2e, 0x6e, 0xac, 0x00, 0xa2, 0x2e, 0x63,
-0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0xcb, 0x00,
-0x30, 0x73, 0x2f, 0x77, 0x84, 0x00, 0x41, 0x5f, 0x69, 0x73,
-0x5f, 0xc9, 0x01, 0x20, 0x5f, 0x63, 0x84, 0x00, 0xc3, 0x2e,
-0x68, 0x74, 0x6d, 0x6c, 0x00, 0x00, 0x00, 0x33, 0x35, 0x2e,
-0x31, 0xa3, 0x04, 0x01, 0x82, 0x00, 0x30, 0x6f, 0x6c, 0x73,
-0xac, 0x04, 0x56, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x6c, 0x02,
-0x40, 0x6c, 0x65, 0x66, 0x74, 0xd0, 0x01, 0x30, 0x74, 0x6f,
-0x6e, 0x9d, 0x00, 0x56, 0x70, 0x61, 0x69, 0x6e, 0x74, 0x49,
-0x02, 0x03, 0x75, 0x04, 0x26, 0x6f, 0x72, 0x31, 0x00, 0x11,
-0x72, 0x0c, 0x03, 0x06, 0x32, 0x00, 0x6b, 0x6d, 0x61, 0x72,
-0x6b, 0x00, 0x61, 0x98, 0x03, 0x21, 0x64, 0x6f, 0x05, 0x02,
-0x82, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5b,
-0x03, 0x32, 0x79, 0x6f, 0x75, 0xa4, 0x04, 0x10, 0x75, 0x38,
-0x01, 0xc0, 0x74, 0x00, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64,
-0x00, 0x6e, 0x6f, 0x74, 0x2e, 0x02, 0x01, 0x7a, 0x00, 0x06,
-0x8f, 0x04, 0x50, 0x52, 0x65, 0x70, 0x65, 0x61, 0x10, 0x00,
-0x10, 0x63, 0xb0, 0x00, 0x00, 0xca, 0x02, 0x01, 0x5b, 0x00,
-0x20, 0x65, 0x69, 0x45, 0x04, 0x04, 0x7f, 0x00, 0x02, 0x01,
-0x02, 0x48, 0x79, 0x63, 0x6c, 0x65, 0x48, 0x03, 0x62, 0x74,
-0x68, 0x72, 0x6f, 0x75, 0x67, 0xae, 0x00, 0x65, 0x74, 0x68,
-0x72, 0x65, 0x65, 0x00, 0xa0, 0x02, 0x21, 0x73, 0x74, 0x64,
-0x02, 0x30, 0x28, 0x66, 0x69, 0xe1, 0x01, 0x10, 0x2c, 0xa8,
-0x00, 0x00, 0x64, 0x00, 0x00, 0x5d, 0x04, 0x50, 0x6d, 0x70,
-0x74, 0x79, 0x29, 0x68, 0x03, 0x50, 0x6f, 0x70, 0x70, 0x6f,
-0x73, 0xa1, 0x02, 0x05, 0xcd, 0x03, 0x23, 0x73, 0x2e, 0xe4,
-0x05, 0xb2, 0x63, 0x61, 0x6e, 0x00, 0x61, 0x6c, 0x73, 0x6f,
-0x00, 0x75, 0x73, 0x72, 0x00, 0xa1, 0x63, 0x75, 0x72, 0x73,
-0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x53, 0x02, 0x20, 0x6d,
-0x6f, 0x04, 0x06, 0x51, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1f,
-0x00, 0x01, 0x0d, 0x06, 0x05, 0xc8, 0x04, 0x41, 0x50, 0x72,
-0x65, 0x73, 0xe5, 0x04, 0x94, 0x52, 0x65, 0x74, 0x75, 0x72,
-0x6e, 0x00, 0x64, 0x6f, 0xef, 0x02, 0x30, 0x61, 0x6d, 0x65,
-0x7d, 0x03, 0x0a, 0xeb, 0x00, 0x0b, 0x9e, 0x01, 0x01, 0x29,
-0x03, 0x44, 0x6c, 0x65, 0x00, 0x70, 0x46, 0x00, 0x5e, 0x53,
-0x70, 0x61, 0x63, 0x65, 0x45, 0x00, 0x1a, 0x61, 0xa2, 0x01,
-0x01, 0x54, 0x00, 0x59, 0x2e, 0x00, 0x4d, 0x6f, 0x76, 0x59,
-0x00, 0x08, 0xb9, 0x00, 0x02, 0x58, 0x00, 0x41, 0x68, 0x6f,
-0x6c, 0x64, 0x57, 0x00, 0x42, 0x68, 0x69, 0x66, 0x74, 0x5a,
-0x01, 0x22, 0x70, 0x6c, 0x62, 0x00, 0x21, 0x74, 0x73, 0xf7,
-0x04, 0x25, 0x6c, 0x6c, 0x2a, 0x04, 0x01, 0xd0, 0x01, 0x00,
-0x6c, 0x01, 0x00, 0xf2, 0x00, 0x14, 0x64, 0x72, 0x01, 0x00,
-0x27, 0x01, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x62, 0x00, 0x12,
-0x61, 0x3b, 0x01, 0x82, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72,
-0x69, 0x62, 0xc4, 0x04, 0x13, 0x73, 0xf4, 0x02, 0x32, 0x32,
-0x2e, 0x31, 0x58, 0x06, 0x00, 0x4d, 0x01, 0x50, 0x61, 0x76,
-0x61, 0x69, 0x6c, 0x87, 0x05, 0x22, 0x2e, 0x29, 0xb7, 0x02,
-0x13, 0x32, 0xb7, 0x02, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d,
-0x65, 0x74, 0x65, 0x72, 0xb9, 0x02, 0x66, 0x54, 0x68, 0x65,
-0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c,
-0x00, 0x04, 0xc3, 0x05, 0xf1, 0x01, 0x65, 0x00, 0x60, 0x43,
-0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00,
-0x6f, 0x70, 0x6f, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00, 0xa0,
-0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
-0xab, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
-0x48, 0x65, 0x30, 0x01, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a,
-0x76, 0x07, 0x01, 0xb6, 0x01, 0x00, 0xad, 0x00, 0x80, 0x71,
-0x75, 0x61, 0x72, 0x65, 0x73, 0x2e, 0x00,
+0x00, 0x2d, 0x01, 0x00, 0xf4, 0x14, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00,
+0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
+0x75, 0x61, 0x72, 0x65, 0x73, 0x3b, 0x00, 0x73, 0x6f, 0x6d,
+0x65, 0x0e, 0x00, 0xf0, 0x02, 0x00, 0x63, 0x6f, 0x6e, 0x74,
+0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+0x73, 0x2e, 0x3a, 0x00, 0xf0, 0x00, 0x72, 0x00, 0x6a, 0x6f,
+0x62, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f,
+0x6c, 0x11, 0x00, 0x01, 0x34, 0x00, 0x56, 0x6f, 0x66, 0x00,
+0x74, 0x68, 0x3b, 0x00, 0xf3, 0x28, 0x62, 0x6c, 0x61, 0x63,
+0x6b, 0x2c, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00, 0x74, 0x68,
+0x61, 0x74, 0x00, 0x73, 0x65, 0x76, 0x65, 0x72, 0x61, 0x6c,
+0x00, 0x63, 0x72, 0x69, 0x74, 0x65, 0x72, 0x69, 0x61, 0x00,
+0x61, 0x72, 0x65, 0x00, 0x73, 0x61, 0x74, 0x69, 0x73, 0x66,
+0x69, 0x65, 0x64, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x6e,
+0x6f, 0x40, 0x00, 0x73, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00,
+0x61, 0x79, 0x00, 0x00, 0x6e, 0x00, 0x02, 0x6b, 0x00, 0x22,
+0x65, 0x64, 0x59, 0x00, 0x14, 0x2e, 0x2f, 0x00, 0x32, 0x74,
+0x77, 0x6f, 0x12, 0x00, 0x05, 0x79, 0x00, 0x00, 0x3e, 0x00,
+0xf0, 0x00, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74,
+0x00, 0x28, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0xc6, 0x00, 0xd0,
+0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72, 0x00, 0x76, 0x65, 0x72,
+0x74, 0x69, 0x63, 0x0e, 0x00, 0x12, 0x29, 0x44, 0x00, 0x71,
+0x66, 0x6f, 0x72, 0x00, 0x61, 0x6e, 0x79, 0x49, 0x00, 0x45,
+0x77, 0x68, 0x69, 0x74, 0xc2, 0x00, 0x10, 0x2c, 0xcf, 0x00,
+0x20, 0x72, 0x65, 0x7c, 0x00, 0xe0, 0x61, 0x00, 0x70, 0x61,
+0x74, 0x68, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e,
+0x18, 0x00, 0xca, 0x6d, 0x00, 0x75, 0x73, 0x69, 0x6e, 0x67,
+0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x37, 0x00, 0x06, 0x56, 0x00,
+0x4f, 0x65, 0x61, 0x63, 0x68, 0xcf, 0x00, 0x02, 0x12, 0x2c,
+0x11, 0x01, 0x03, 0xdc, 0x00, 0x71, 0x64, 0x65, 0x6e, 0x6f,
+0x74, 0x65, 0x73, 0x3d, 0x01, 0x54, 0x74, 0x6f, 0x74, 0x61,
+0x6c, 0x19, 0x00, 0x2a, 0x6f, 0x66, 0x5a, 0x00, 0x20, 0x00,
+0x72, 0x52, 0x00, 0x93, 0x61, 0x62, 0x6c, 0x65, 0x00, 0x66,
+0x72, 0x6f, 0x6d, 0x56, 0x01, 0x02, 0x60, 0x00, 0x20, 0x67,
+0x6f, 0x8e, 0x00, 0xf1, 0x03, 0x69, 0x6e, 0x00, 0x61, 0x00,
+0x73, 0x74, 0x72, 0x61, 0x69, 0x67, 0x68, 0x74, 0x00, 0x6c,
+0x69, 0x6e, 0x65, 0x13, 0x00, 0x36, 0x6e, 0x79, 0x00, 0x07,
+0x01, 0x08, 0x05, 0x01, 0xf0, 0x06, 0x00, 0x64, 0x69, 0x72,
+0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x75, 0x6e, 0x74,
+0x69, 0x6c, 0x00, 0x68, 0x69, 0x74, 0x74, 0x49, 0x00, 0x51,
+0x61, 0x00, 0x77, 0x61, 0x6c, 0x2b, 0x00, 0x19, 0x61, 0x5e,
+0x01, 0x17, 0x3b, 0xe3, 0x01, 0x02, 0xd4, 0x00, 0x00, 0x10,
+0x00, 0x06, 0xa5, 0x01, 0x80, 0x69, 0x6e, 0x63, 0x6c, 0x75,
+0x64, 0x65, 0x64, 0x77, 0x00, 0x06, 0xd0, 0x00, 0x51, 0x28,
+0x6f, 0x6e, 0x63, 0x65, 0x6f, 0x01, 0xf4, 0x00, 0x46, 0x6f,
+0x72, 0x00, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
+0x2c, 0x00, 0x61, 0x4a, 0x00, 0x03, 0x67, 0x02, 0x00, 0x7a,
+0x00, 0x07, 0x50, 0x00, 0x82, 0x6f, 0x6e, 0x65, 0x00, 0x6d,
+0x75, 0x73, 0x74, 0xab, 0x02, 0x10, 0x66, 0x69, 0x02, 0x0b,
+0xea, 0x01, 0xf1, 0x04, 0x73, 0x00, 0x69, 0x74, 0x73, 0x00,
+0x6e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x73,
+0x00, 0x62, 0x79, 0x41, 0x00, 0x44, 0x6c, 0x61, 0x73, 0x74,
+0x68, 0x02, 0x70, 0x6f, 0x6e, 0x3b, 0x00, 0x62, 0x75, 0x74,
+0x18, 0x00, 0xe1, 0x6e, 0x00, 0x69, 0x74, 0x27, 0x73, 0x00,
+0x69, 0x6d, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x48, 0x01, 0x00,
+0x90, 0x00, 0x10, 0x74, 0xca, 0x02, 0x11, 0x62, 0x86, 0x00,
+0x60, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x10, 0x00, 0x00,
+0x35, 0x01, 0x79, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65,
+0x86, 0x01, 0x10, 0x2c, 0x0e, 0x00, 0x84, 0x63, 0x68, 0x00,
+0x76, 0x69, 0x6f, 0x6c, 0x61, 0xb7, 0x01, 0x51, 0x73, 0x65,
+0x63, 0x6f, 0x6e, 0x37, 0x00, 0x0a, 0x7a, 0x00, 0x49, 0x2e,
+0x00, 0x53, 0x6f, 0xd4, 0x02, 0x25, 0x6c, 0x6c, 0x53, 0x03,
+0x0a, 0xe9, 0x00, 0x00, 0x1d, 0x01, 0x61, 0x43, 0x72, 0x65,
+0x64, 0x69, 0x74, 0x94, 0x00, 0xa0, 0x74, 0x68, 0x69, 0x73,
+0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0xdb, 0x01, 0x11, 0x65,
+0x6c, 0x03, 0x60, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x80,
+0x00, 0x12, 0x6f, 0x12, 0x01, 0xa0, 0x76, 0x61, 0x72, 0x69,
+0x6f, 0x75, 0x73, 0x6c, 0x79, 0x00, 0xd0, 0x02, 0x20, 0x65,
+0x64, 0xca, 0x00, 0xb2, 0x60, 0x4b, 0x75, 0x72, 0x6f, 0x64,
+0x6f, 0x6b, 0x6f, 0x27, 0x2c, 0x0c, 0x00, 0x50, 0x6d, 0x61,
+0x73, 0x75, 0x27, 0xc9, 0x01, 0x24, 0x60, 0x57, 0xce, 0x02,
+0x11, 0x42, 0x45, 0x01, 0xc0, 0x43, 0x65, 0x6c, 0x6c, 0x73,
+0x27, 0x2e, 0x00, 0x5b, 0x31, 0x38, 0x5d, 0x7e, 0x00, 0x01,
+0x2f, 0x04, 0x32, 0x00, 0x77, 0x61, 0xf5, 0x03, 0x43, 0x72,
+0x69, 0x62, 0x75, 0x0a, 0x01, 0x22, 0x74, 0x68, 0x7e, 0x03,
+0x13, 0x6c, 0x2a, 0x02, 0xf0, 0x01, 0x62, 0x79, 0x00, 0x4a,
+0x6f, 0x6e, 0x61, 0x73, 0x00, 0x4b, 0x6f, 0x65, 0x6c, 0x6b,
+0x65, 0x72, 0x3d, 0x00, 0x00, 0x45, 0x00, 0xe1, 0x00, 0x68,
+0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77,
+0x2e, 0x6e, 0xad, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a,
+0x70, 0x2f, 0x65, 0x6e, 0x2f, 0xcc, 0x00, 0x33, 0x73, 0x2f,
+0x6b, 0x9f, 0x00, 0x83, 0x2f, 0x00, 0x00, 0x00, 0x33, 0x35,
+0x2e, 0x31, 0xa6, 0x04, 0x01, 0x73, 0x00, 0x40, 0x6f, 0x6c,
+0x73, 0x20, 0x07, 0x01, 0x46, 0x6c, 0x69, 0x63, 0x6b, 0x5d,
+0x02, 0x40, 0x6c, 0x65, 0x66, 0x74, 0xc1, 0x01, 0x30, 0x74,
+0x6f, 0x6e, 0x8e, 0x00, 0x56, 0x70, 0x61, 0x69, 0x6e, 0x74,
+0x3a, 0x02, 0x03, 0x66, 0x04, 0x26, 0x6f, 0x72, 0x31, 0x00,
+0x11, 0x72, 0xfd, 0x02, 0x06, 0x32, 0x00, 0x6b, 0x6d, 0x61,
+0x72, 0x6b, 0x00, 0x61, 0x89, 0x03, 0x21, 0x64, 0x6f, 0xf6,
+0x01, 0x82, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65,
+0x4c, 0x03, 0x32, 0x79, 0x6f, 0x75, 0x95, 0x04, 0x30, 0x75,
+0x72, 0x65, 0x4d, 0x01, 0xa0, 0x73, 0x68, 0x6f, 0x75, 0x6c,
+0x64, 0x00, 0x6e, 0x6f, 0x74, 0x1f, 0x02, 0x01, 0x7a, 0x00,
+0x06, 0x80, 0x04, 0x50, 0x52, 0x65, 0x70, 0x65, 0x61, 0x10,
+0x00, 0x10, 0x63, 0xb0, 0x00, 0x00, 0xbb, 0x02, 0x01, 0x5b,
+0x00, 0x20, 0x65, 0x69, 0x36, 0x04, 0x04, 0x7f, 0x00, 0x02,
+0xf2, 0x01, 0x48, 0x79, 0x63, 0x6c, 0x65, 0x39, 0x03, 0x72,
+0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x22, 0x03, 0x55,
+0x68, 0x72, 0x65, 0x65, 0x00, 0x91, 0x02, 0x21, 0x73, 0x74,
+0x55, 0x02, 0x30, 0x28, 0x66, 0x69, 0xd2, 0x01, 0x10, 0x2c,
+0xa8, 0x00, 0x00, 0x64, 0x00, 0x00, 0x4e, 0x04, 0x50, 0x6d,
+0x70, 0x74, 0x79, 0x29, 0x59, 0x03, 0x50, 0x6f, 0x70, 0x70,
+0x6f, 0x73, 0x92, 0x02, 0x05, 0xbe, 0x03, 0x23, 0x73, 0x2e,
+0xd5, 0x05, 0xb2, 0x63, 0x61, 0x6e, 0x00, 0x61, 0x6c, 0x73,
+0x6f, 0x00, 0x75, 0x73, 0x72, 0x00, 0xb1, 0x63, 0x75, 0x72,
+0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x0c, 0x01,
+0x10, 0x6f, 0xf5, 0x05, 0x51, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+0x1f, 0x00, 0x01, 0xfe, 0x05, 0x05, 0xb9, 0x04, 0x41, 0x50,
+0x72, 0x65, 0x73, 0xd6, 0x04, 0x94, 0x52, 0x65, 0x74, 0x75,
+0x72, 0x6e, 0x00, 0x64, 0x6f, 0xe0, 0x02, 0x30, 0x61, 0x6d,
+0x65, 0x6e, 0x03, 0x0a, 0xeb, 0x00, 0x0b, 0x9e, 0x01, 0x01,
+0x1a, 0x03, 0x44, 0x6c, 0x65, 0x00, 0x70, 0x46, 0x00, 0x5e,
+0x53, 0x70, 0x61, 0x63, 0x65, 0x45, 0x00, 0x1a, 0x61, 0xa2,
+0x01, 0x01, 0x54, 0x00, 0x59, 0x2e, 0x00, 0x4d, 0x6f, 0x76,
+0x59, 0x00, 0x08, 0xb9, 0x00, 0x02, 0x58, 0x00, 0x41, 0x68,
+0x6f, 0x6c, 0x64, 0x57, 0x00, 0x42, 0x68, 0x69, 0x66, 0x74,
+0x5a, 0x01, 0x22, 0x70, 0x6c, 0x62, 0x00, 0x21, 0x74, 0x73,
+0xe8, 0x04, 0x25, 0x6c, 0x6c, 0x1b, 0x04, 0x01, 0xd0, 0x01,
+0x00, 0x6c, 0x01, 0x00, 0xf2, 0x00, 0x14, 0x64, 0x72, 0x01,
+0x00, 0x27, 0x01, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x62, 0x00,
+0x12, 0x61, 0x3b, 0x01, 0x82, 0x00, 0x64, 0x65, 0x73, 0x63,
+0x72, 0x69, 0x62, 0xb5, 0x04, 0x13, 0x73, 0xe5, 0x02, 0x32,
+0x32, 0x2e, 0x31, 0x49, 0x06, 0x00, 0x4d, 0x01, 0x50, 0x61,
+0x76, 0x61, 0x69, 0x6c, 0x78, 0x05, 0x22, 0x2e, 0x29, 0xb7,
+0x02, 0x13, 0x32, 0xb7, 0x02, 0x91, 0x70, 0x61, 0x72, 0x61,
+0x6d, 0x65, 0x74, 0x65, 0x72, 0xb9, 0x02, 0x66, 0x54, 0x68,
+0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x41, 0x00, 0x04,
+0x3c, 0x00, 0x04, 0xb4, 0x05, 0xf1, 0x01, 0x65, 0x00, 0x60,
+0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
+0x00, 0x6f, 0x70, 0x6f, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00,
+0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
+0x75, 0xab, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c,
+0x00, 0x48, 0x65, 0x30, 0x01, 0x51, 0x00, 0x00, 0x53, 0x69,
+0x7a, 0x67, 0x07, 0x01, 0xb6, 0x01, 0x28, 0x69, 0x6e, 0x72,
+0x06, 0x43, 0x33, 0x35, 0x2e, 0x33, 0x95, 0x00, 0xf1, 0x00,
+0x75, 0x73, 0x65, 0x72, 0x20, 0x70, 0x72, 0x65, 0x66, 0x65,
+0x72, 0x65, 0x6e, 0x63, 0x65, 0x9b, 0x00, 0x20, 0x4f, 0x6e,
+0x2c, 0x01, 0x63, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x73, 0x38,
+0x06, 0x70, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e,
+0x00, 0x17, 0x00, 0x2e, 0x00, 0x12, 0x2c, 0x89, 0x00, 0x16,
+0x50, 0x12, 0x00, 0x0d, 0xa5, 0x00, 0x33, 0x47, 0x61, 0x6d,
+0xa5, 0x00, 0x02, 0x86, 0x01, 0x22, 0x6c, 0x65, 0x3b, 0x03,
+0x60, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x3c, 0x03, 0x02,
+0x23, 0x05, 0x46, 0x77, 0x61, 0x79, 0x00, 0x6b, 0x02, 0x20,
+0x6d, 0x6f, 0x94, 0x02, 0x02, 0xf5, 0x01, 0x80, 0x73, 0x00,
+0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2036;
-const unsigned short help_text_words = 365;
+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 e86a77091b..dfd597eb0f 100644
--- a/apps/plugins/puzzles/help/rect.c
+++ b/apps/plugins/puzzles/help/rect.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,257 +6,257 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 144, TEXT_CENTER | C_RED },
- { 311, TEXT_CENTER | C_RED },
- { 328, TEXT_UNDERLINE },
- { 329, TEXT_UNDERLINE },
- { 339, TEXT_UNDERLINE },
- { 381, TEXT_UNDERLINE },
- { 512, TEXT_UNDERLINE },
- { 537, TEXT_UNDERLINE },
- { 582, TEXT_UNDERLINE },
+ { 142, TEXT_CENTER | C_RED },
+ { 309, TEXT_CENTER | C_RED },
+ { 326, TEXT_UNDERLINE },
+ { 327, TEXT_UNDERLINE },
+ { 337, TEXT_UNDERLINE },
+ { 379, TEXT_UNDERLINE },
+ { 510, TEXT_UNDERLINE },
+ { 535, TEXT_UNDERLINE },
+ { 580, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 3535 comp 2341 ratio 0.662235 level 10 saved 1194 */
+/* orig 3536 comp 2332 ratio 0.659502 level 10 saved 1204 */
 const char help_text[] = {
-0xf0, 0x50, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x09, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x38, 0x3a, 0x20, 0x52, 0x65, 0x63, 0x74, 0x61, 0x6e, 0x67,
-0x6c, 0x65, 0x73, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75,
-0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72,
-0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61,
-0x72, 0x65, 0x73, 0x2c, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x00, 0x77, 0x72,
-0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x69, 0x6e, 0x00, 0x73,
-0x6f, 0x6d, 0x65, 0x00, 0x28, 0x62, 0x75, 0x74, 0x00, 0x6e,
-0x6f, 0x74, 0x00, 0x61, 0x6c, 0x6c, 0x29, 0x37, 0x00, 0x34,
-0x74, 0x68, 0x65, 0x3b, 0x00, 0x10, 0x2e, 0x57, 0x00, 0xf1,
-0x07, 0x72, 0x00, 0x74, 0x61, 0x73, 0x6b, 0x00, 0x69, 0x73,
-0x00, 0x74, 0x6f, 0x00, 0x73, 0x75, 0x62, 0x64, 0x69, 0x76,
-0x69, 0x64, 0x65, 0x27, 0x00, 0x01, 0x6a, 0x00, 0x65, 0x69,
-0x6e, 0x74, 0x6f, 0x00, 0x72, 0x8d, 0x00, 0x00, 0x43, 0x00,
-0xb0, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x73,
-0x69, 0x7a, 0x80, 0x00, 0xf6, 0x04, 0x73, 0x75, 0x63, 0x68,
-0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x28, 0x61, 0x29, 0x00,
-0x65, 0x76, 0x65, 0x72, 0x79, 0x31, 0x00, 0xf3, 0x06, 0x00,
-0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x00, 0x65,
-0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x65,
-0xae, 0x00, 0x23, 0x65, 0x64, 0x8a, 0x00, 0x91, 0x2c, 0x00,
-0x61, 0x6e, 0x64, 0x00, 0x28, 0x62, 0x29, 0x77, 0x00, 0x40,
-0x61, 0x72, 0x65, 0x61, 0x67, 0x00, 0x47, 0x65, 0x61, 0x63,
-0x68, 0x49, 0x00, 0x80, 0x69, 0x73, 0x00, 0x65, 0x71, 0x75,
-0x61, 0x6c, 0xa8, 0x00, 0x24, 0x74, 0x68, 0x44, 0x00, 0x08,
-0xf1, 0x00, 0x3c, 0x69, 0x74, 0x73, 0x5a, 0x00, 0xf4, 0x0e,
-0x2e, 0x00, 0x00, 0x00, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74,
-0x00, 0x66, 0x6f, 0x72, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00,
-0x67, 0x61, 0x6d, 0x65, 0x00, 0x67, 0x6f, 0x65, 0x73, 0x4a,
-0x00, 0xf0, 0x18, 0x4a, 0x61, 0x70, 0x61, 0x6e, 0x65, 0x73,
-0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x6d,
-0x61, 0x67, 0x61, 0x7a, 0x69, 0x6e, 0x65, 0x00, 0x4e, 0x69,
-0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x33, 0x5d, 0x3b, 0x00,
-0x49, 0x27, 0x7e, 0x01, 0xf2, 0x14, 0x6c, 0x73, 0x6f, 0x00,
-0x73, 0x65, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x50, 0x61, 0x6c,
-0x6d, 0x00, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e,
-0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x61, 0x74, 0x00,
-0x50, 0x44, 0x00, 0xfa, 0x03, 0x50, 0x61, 0x6c, 0x61, 0x63,
-0x65, 0x00, 0x5b, 0x34, 0x5d, 0x2e, 0x00, 0x55, 0x6e, 0x6c,
-0x69, 0x6b, 0x65, 0x1a, 0x00, 0x2b, 0x27, 0x73, 0x3c, 0x00,
-0x91, 0x2c, 0x00, 0x6d, 0x79, 0x00, 0x76, 0x65, 0x72, 0x73,
-0x48, 0x00, 0xf1, 0x0e, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74,
-0x69, 0x63, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x67, 0x65, 0x6e,
-0x65, 0x72, 0x61, 0x74, 0x65, 0x73, 0x00, 0x72, 0x61, 0x6e,
-0x64, 0x6f, 0x6d, 0x99, 0x01, 0x01, 0x8a, 0x01, 0x31, 0x61,
-0x6e, 0x79, 0x86, 0x01, 0x50, 0x00, 0x79, 0x6f, 0x75, 0x00,
-0x65, 0x00, 0x60, 0x2e, 0x00, 0x54, 0x68, 0x65, 0x00, 0x27,
-0x01, 0x30, 0x69, 0x74, 0x79, 0x22, 0x00, 0x03, 0xd3, 0x00,
-0x61, 0x64, 0x65, 0x73, 0x69, 0x67, 0x6e, 0xe6, 0x01, 0x81,
-0x68, 0x65, 0x72, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x16, 0x02,
-0xd0, 0x71, 0x75, 0x69, 0x74, 0x65, 0x00, 0x61, 0x73, 0x00,
-0x67, 0x6f, 0x6f, 0x64, 0x08, 0x00, 0xc3, 0x68, 0x61, 0x6e,
-0x64, 0x2d, 0x63, 0x72, 0x61, 0x66, 0x74, 0x65, 0x64, 0x3d,
-0x00, 0xc0, 0x73, 0x00, 0x77, 0x6f, 0x75, 0x6c, 0x64, 0x00,
-0x62, 0x65, 0x2c, 0x00, 0x4e, 0x02, 0x21, 0x6f, 0x6e, 0x36,
-0x01, 0x21, 0x70, 0x6c, 0x03, 0x02, 0x12, 0x64, 0x7d, 0x00,
-0x50, 0x67, 0x65, 0x74, 0x00, 0x61, 0x86, 0x01, 0xf7, 0x02,
-0x65, 0x78, 0x68, 0x61, 0x75, 0x73, 0x74, 0x69, 0x62, 0x6c,
-0x65, 0x00, 0x73, 0x75, 0x70, 0x70, 0x6c, 0x87, 0x00, 0x70,
-0x73, 0x00, 0x74, 0x61, 0x69, 0x6c, 0x6f, 0x9f, 0x01, 0x40,
-0x74, 0x6f, 0x00, 0x79, 0x7d, 0x02, 0xc1, 0x6f, 0x77, 0x6e,
-0x00, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x08,
-0x01, 0x00, 0xb2, 0x01, 0xf1, 0x01, 0x5b, 0x33, 0x5d, 0x00,
-0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77,
-0x2e, 0x6e, 0x87, 0x01, 0xa3, 0x2e, 0x63, 0x6f, 0x2e, 0x6a,
-0x70, 0x2f, 0x65, 0x6e, 0x2f, 0x4d, 0x00, 0xf0, 0x06, 0x2f,
-0x73, 0x68, 0x69, 0x6b, 0x61, 0x6b, 0x75, 0x2e, 0x68, 0x74,
-0x6d, 0x6c, 0x00, 0x28, 0x62, 0x65, 0x77, 0x61, 0x72, 0x65,
-0x6d, 0x00, 0x60, 0x46, 0x6c, 0x61, 0x73, 0x68, 0x29, 0x48,
-0x00, 0x12, 0x34, 0x48, 0x00, 0x10, 0x73, 0x49, 0x00, 0xe0,
-0x65, 0x62, 0x2e, 0x61, 0x72, 0x63, 0x68, 0x69, 0x76, 0x65,
-0x2e, 0x6f, 0x72, 0x67, 0x10, 0x00, 0xf7, 0x01, 0x2f, 0x32,
-0x30, 0x30, 0x34, 0x31, 0x30, 0x32, 0x34, 0x30, 0x30, 0x31,
-0x34, 0x35, 0x39, 0x2f, 0x73, 0x00, 0x02, 0x63, 0x00, 0x30,
-0x2e, 0x67, 0x72, 0x73, 0x00, 0x02, 0x0d, 0x00, 0x21, 0x2f,
-0x73, 0x6e, 0x00, 0xb1, 0x2f, 0x70, 0x61, 0x6c, 0x6d, 0x2f,
-0x69, 0x6e, 0x64, 0x65, 0x78, 0x79, 0x00, 0x98, 0x2e, 0x65,
-0x6e, 0x00, 0x00, 0x00, 0x38, 0x2e, 0x31, 0xb2, 0x03, 0x00,
-0xf5, 0x02, 0x31, 0x72, 0x6f, 0x6c, 0xbb, 0x03, 0x15, 0x54,
-0x74, 0x02, 0x92, 0x69, 0x73, 0x00, 0x70, 0x6c, 0x61, 0x79,
-0x65, 0x64, 0xb3, 0x03, 0x00, 0x45, 0x01, 0xf0, 0x05, 0x6d,
-0x6f, 0x75, 0x73, 0x65, 0x00, 0x6f, 0x72, 0x00, 0x63, 0x75,
-0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x02,
-0x01, 0xa1, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
-0x63, 0x6b, 0xe4, 0x01, 0x41, 0x65, 0x64, 0x67, 0x65, 0xae,
-0x02, 0x21, 0x6f, 0x67, 0x0b, 0x03, 0x01, 0x85, 0x01, 0x70,
-0x6f, 0x72, 0x00, 0x6f, 0x66, 0x66, 0x2c, 0x08, 0x00, 0x18,
-0x6c, 0x2f, 0x00, 0x60, 0x64, 0x00, 0x64, 0x72, 0x61, 0x67,
-0x2f, 0x00, 0x40, 0x64, 0x72, 0x61, 0x77, 0x96, 0x01, 0x67,
-0x65, 0x6e, 0x74, 0x69, 0x72, 0x65, 0x4c, 0x03, 0x10, 0x28,
-0x34, 0x00, 0x44, 0x69, 0x6e, 0x65, 0x29, 0xcd, 0x01, 0x03,
-0xeb, 0x03, 0x01, 0x9d, 0x03, 0xc2, 0x67, 0x6f, 0x00, 0x28,
-0x72, 0x65, 0x6d, 0x6f, 0x76, 0x69, 0x6e, 0x67, 0x7e, 0x00,
-0x40, 0x78, 0x69, 0x73, 0x74, 0x0d, 0x00, 0x00, 0x87, 0x00,
-0x11, 0x73, 0xbd, 0x00, 0x22, 0x69, 0x6e, 0xf2, 0x03, 0x05,
-0x53, 0x00, 0x73, 0x29, 0x2e, 0x00, 0x52, 0x69, 0x67, 0x68,
-0x86, 0x00, 0x02, 0x3a, 0x00, 0x02, 0x89, 0x00, 0x10, 0x67,
-0x0d, 0x00, 0x40, 0x77, 0x69, 0x6c, 0x6c, 0x83, 0x04, 0x21,
-0x6f, 0x77, 0x2e, 0x02, 0x72, 0x74, 0x6f, 0x00, 0x65, 0x72,
-0x61, 0x73, 0x67, 0x04, 0x00, 0x2d, 0x01, 0x32, 0x65, 0x6e,
-0x74, 0xd1, 0x02, 0x07, 0xa5, 0x00, 0x00, 0x68, 0x00, 0x91,
-0x6f, 0x75, 0x74, 0x00, 0x61, 0x66, 0x66, 0x65, 0x63, 0x80,
-0x00, 0x00, 0xe1, 0x03, 0x01, 0x84, 0x00, 0x00, 0x23, 0x01,
-0xf4, 0x01, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74,
-0x69, 0x76, 0x65, 0x6c, 0x79, 0x2c, 0x00, 0x75, 0x4e, 0x00,
-0x06, 0x49, 0x01, 0x00, 0x67, 0x00, 0x42, 0x6d, 0x6f, 0x76,
-0x65, 0xaf, 0x02, 0x31, 0x6f, 0x73, 0x69, 0xa4, 0x03, 0x30,
-0x69, 0x6e, 0x64, 0x6b, 0x02, 0x91, 0x6f, 0x72, 0x00, 0x61,
-0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1e, 0x00, 0xc0, 0x62, 0x6f,
-0x61, 0x72, 0x64, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73,
-0x6a, 0x00, 0x20, 0x74, 0x68, 0x2f, 0x01, 0x40, 0x74, 0x75,
-0x72, 0x6e, 0x4a, 0x00, 0x00, 0x0f, 0x00, 0x12, 0x6e, 0xbf,
-0x00, 0x14, 0x73, 0xc0, 0x00, 0x0f, 0x70, 0x00, 0x04, 0x01,
-0x7b, 0x01, 0x08, 0xc6, 0x00, 0x00, 0xc2, 0x00, 0x42, 0x66,
-0x72, 0x6f, 0x6d, 0x30, 0x01, 0x04, 0x86, 0x00, 0x02, 0xf2,
-0x04, 0x1f, 0x70, 0x6f, 0x00, 0x04, 0x80, 0x61, 0x67, 0x61,
-0x69, 0x6e, 0x00, 0x63, 0x6f, 0x21, 0x04, 0x21, 0x74, 0x65,
-0xb4, 0x03, 0x06, 0x52, 0x00, 0x35, 0x2e, 0x00, 0x55, 0x34,
-0x00, 0x20, 0x73, 0x70, 0x65, 0x04, 0xa1, 0x62, 0x61, 0x72,
-0x00, 0x69, 0x6e, 0x73, 0x74, 0x65, 0x61, 0x19, 0x06, 0x0c,
-0x4d, 0x00, 0x09, 0xb7, 0x00, 0x0f, 0x77, 0x01, 0x2a, 0x10,
-0x2c, 0x22, 0x04, 0x57, 0x61, 0x62, 0x6f, 0x76, 0x65, 0x2b,
-0x01, 0xf1, 0x01, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x00,
-0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x73, 0x00, 0x61, 0x03,
-0x01, 0x00, 0xa1, 0x01, 0x11, 0x57, 0x35, 0x01, 0x08, 0x0b,
-0x01, 0x13, 0x66, 0x79, 0x00, 0x10, 0x72, 0x14, 0x00, 0x02,
-0xb9, 0x04, 0x25, 0x69, 0x73, 0xe8, 0x00, 0x20, 0x64, 0x2c,
-0xd9, 0x02, 0x01, 0x2a, 0x02, 0x90, 0x62, 0x65, 0x00, 0x73,
-0x68, 0x61, 0x64, 0x65, 0x64, 0x48, 0x00, 0x42, 0x28, 0x41,
-0x6c, 0x6c, 0x19, 0x06, 0x10, 0x63, 0x3b, 0x01, 0x10, 0x73,
-0xcd, 0x04, 0x61, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0xe6,
-0x06, 0x21, 0x65, 0x63, 0xd7, 0x01, 0x30, 0x32, 0x2e, 0x31,
-0x3a, 0x06, 0x02, 0xa3, 0x05, 0xb1, 0x61, 0x76, 0x61, 0x69,
-0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x9d, 0x03, 0x18,
-0x32, 0x9d, 0x03, 0x93, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-0x74, 0x65, 0x72, 0x9f, 0x03, 0x01, 0xfa, 0x05, 0x05, 0x14,
-0x00, 0x02, 0x45, 0x00, 0x04, 0x40, 0x00, 0x04, 0xbb, 0x01,
-0xf1, 0x01, 0x65, 0x00, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f,
-0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x73, 0x00,
-0x03, 0x3c, 0x03, 0xb1, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27,
-0x00, 0x6d, 0x65, 0x6e, 0x75, 0xf7, 0x00, 0x80, 0x69, 0x64,
-0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x0f, 0x03, 0x61, 0x00,
-0x00, 0x00, 0x53, 0x69, 0x7a, 0xfb, 0x00, 0x00, 0x63, 0x03,
-0x11, 0x2c, 0xb2, 0x00, 0x04, 0x7e, 0x07, 0x70, 0x00, 0x00,
-0x45, 0x78, 0x70, 0x61, 0x6e, 0xf2, 0x05, 0x40, 0x20, 0x66,
-0x61, 0x63, 0x93, 0x02, 0x03, 0x2f, 0x04, 0x10, 0x69, 0x48,
-0x01, 0x91, 0x6d, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x69, 0x73,
-0x6d, 0xbb, 0x06, 0x00, 0x0c, 0x00, 0x14, 0x67, 0xf8, 0x01,
-0x35, 0x74, 0x79, 0x70, 0x54, 0x00, 0x15, 0x73, 0x20, 0x06,
-0x42, 0x64, 0x00, 0x62, 0x79, 0xec, 0x02, 0x90, 0x72, 0x6f,
-0x67, 0x72, 0x61, 0x6d, 0x2e, 0x00, 0x53, 0x03, 0x08, 0x60,
-0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x6d, 0x02, 0x34, 0x66,
-0x65, 0x72, 0x41, 0x08, 0x03, 0x97, 0x07, 0x01, 0xa9, 0x03,
-0x97, 0x00, 0x66, 0x65, 0x77, 0x00, 0x6c, 0x61, 0x72, 0x67,
-0x66, 0x02, 0x01, 0xcd, 0x02, 0x00, 0x0e, 0x04, 0x07, 0x29,
-0x00, 0x11, 0x6d, 0x6f, 0x06, 0x40, 0x6d, 0x61, 0x6c, 0x6c,
-0x1a, 0x00, 0x10, 0x73, 0x5f, 0x00, 0x01, 0x57, 0x02, 0x40,
-0x63, 0x61, 0x6e, 0x00, 0x44, 0x08, 0x19, 0x52, 0x3d, 0x00,
-0x30, 0x65, 0x73, 0x73, 0x78, 0x04, 0x09, 0xc2, 0x06, 0x22,
-0x00, 0x61, 0x40, 0x00, 0x22, 0x65, 0x72, 0x86, 0x00, 0x32,
-0x74, 0x68, 0x61, 0x44, 0x01, 0x05, 0xc5, 0x06, 0x03, 0x0c,
-0x06, 0x22, 0x65, 0x64, 0x22, 0x03, 0x01, 0x79, 0x03, 0x00,
-0x4d, 0x00, 0x00, 0x29, 0x01, 0x10, 0x64, 0x20, 0x02, 0x60,
-0x62, 0x79, 0x00, 0x61, 0x64, 0x64, 0x8f, 0x00, 0x10, 0x72,
-0xd7, 0x02, 0x20, 0x61, 0x6e, 0xcc, 0x00, 0x41, 0x6c, 0x75,
-0x6d, 0x6e, 0x51, 0x01, 0x00, 0xfe, 0x06, 0x72, 0x64, 0x65,
-0x66, 0x61, 0x75, 0x6c, 0x74, 0x34, 0x00, 0x01, 0x4f, 0x07,
-0x03, 0x5d, 0x01, 0xd2, 0x6f, 0x66, 0x00, 0x7a, 0x65, 0x72,
-0x6f, 0x00, 0x6d, 0x65, 0x61, 0x6e, 0x73, 0x90, 0x03, 0x07,
-0xb3, 0x00, 0x01, 0x79, 0x02, 0x10, 0x73, 0x95, 0x07, 0x09,
-0xb0, 0x00, 0x04, 0x6f, 0x09, 0x09, 0xa6, 0x00, 0x00, 0xee,
-0x00, 0x42, 0x66, 0x6f, 0x72, 0x2c, 0xe5, 0x04, 0x10, 0x6f,
-0x4b, 0x07, 0x10, 0x68, 0x93, 0x00, 0x30, 0x66, 0x75, 0x72,
-0x60, 0x07, 0x42, 0x2e, 0x00, 0x49, 0x66, 0xce, 0x00, 0x02,
-0x16, 0x07, 0x0f, 0x8a, 0x00, 0x01, 0x91, 0x28, 0x73, 0x61,
-0x79, 0x29, 0x00, 0x30, 0x2e, 0x35, 0xf6, 0x02, 0x07, 0x93,
-0x00, 0x01, 0xf7, 0x08, 0x42, 0x64, 0x69, 0x6d, 0x65, 0x32,
-0x00, 0x26, 0x6f, 0x66, 0xa1, 0x05, 0x04, 0x1c, 0x03, 0x02,
-0x0e, 0x01, 0x02, 0x46, 0x07, 0x43, 0x68, 0x61, 0x6c, 0x66,
-0x31, 0x04, 0x70, 0x61, 0x73, 0x00, 0x62, 0x69, 0x67, 0x00,
-0xbc, 0x07, 0x14, 0x72, 0xc3, 0x00, 0x01, 0x52, 0x07, 0x60,
-0x49, 0x6e, 0x00, 0x6f, 0x74, 0x68, 0x2d, 0x09, 0x51, 0x6f,
-0x72, 0x64, 0x73, 0x2c, 0x51, 0x00, 0x30, 0x69, 0x6e, 0x69,
-0x9d, 0x01, 0x0a, 0x59, 0x00, 0x36, 0x32, 0x2f, 0x33, 0xe9,
-0x00, 0x2b, 0x69, 0x6e, 0x8c, 0x00, 0x02, 0xef, 0x00, 0x0f,
-0x85, 0x00, 0x01, 0x00, 0x22, 0x04, 0x21, 0x66, 0x75, 0x40,
-0x01, 0x17, 0x7a, 0x42, 0x04, 0x24, 0x64, 0x64, 0x43, 0x06,
-0x28, 0x6d, 0x6f, 0x80, 0x06, 0x01, 0xab, 0x01, 0x31, 0x53,
-0x65, 0x74, 0x5e, 0x04, 0x0f, 0x20, 0x01, 0x04, 0x03, 0x9d,
-0x05, 0x82, 0x30, 0x2e, 0x35, 0x00, 0x74, 0x65, 0x6e, 0x64,
-0xcd, 0x05, 0x23, 0x61, 0x6b, 0x9a, 0x0a, 0x00, 0x4f, 0x07,
-0x01, 0x54, 0x00, 0x92, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
-0x75, 0x6c, 0x74, 0x9d, 0x00, 0x01, 0xfe, 0x03, 0x50, 0x28,
-0x69, 0x6e, 0x00, 0x6d, 0xb7, 0x06, 0xb0, 0x70, 0x65, 0x72,
-0x69, 0x65, 0x6e, 0x63, 0x65, 0x29, 0x00, 0x72, 0x1d, 0x08,
-0x10, 0x64, 0x56, 0x03, 0x30, 0x6c, 0x65, 0x73, 0x42, 0x04,
-0x30, 0x64, 0x75, 0x63, 0x3a, 0x06, 0x01, 0x35, 0x00, 0x01,
-0x49, 0x00, 0x51, 0x69, 0x6e, 0x74, 0x75, 0x69, 0x13, 0x00,
-0x00, 0xa4, 0x07, 0x00, 0x99, 0x00, 0x59, 0x73, 0x74, 0x79,
-0x6c, 0x65, 0xcb, 0x01, 0xd0, 0x69, 0x74, 0x00, 0x74, 0x6f,
-0x6f, 0x00, 0x68, 0x69, 0x67, 0x68, 0x2c, 0x00, 0xe4, 0x00,
-0x02, 0x08, 0x00, 0x03, 0x90, 0x00, 0x03, 0x3c, 0x02, 0x30,
-0x63, 0x61, 0x6e, 0x5a, 0x09, 0x05, 0x43, 0x02, 0x01, 0x5e,
-0x00, 0x01, 0xe9, 0x02, 0x02, 0x69, 0x03, 0x0a, 0x63, 0x03,
-0x51, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x44, 0x00, 0x03, 0xa5,
-0x07, 0x02, 0x27, 0x04, 0x03, 0xfc, 0x02, 0x02, 0x59, 0x00,
-0x50, 0x62, 0x65, 0x63, 0x6f, 0x6d, 0x2f, 0x00, 0x61, 0x72,
-0x69, 0x76, 0x69, 0x61, 0x6c, 0x39, 0x04, 0xf1, 0x02, 0x6e,
-0x73, 0x75, 0x72, 0x65, 0x20, 0x75, 0x6e, 0x69, 0x71, 0x75,
-0x65, 0x20, 0x73, 0x6f, 0x6c, 0x75, 0x92, 0x04, 0x60, 0x00,
-0x00, 0x4e, 0x6f, 0x72, 0x6d, 0x73, 0x03, 0x1d, 0x2c, 0xdb,
-0x02, 0x01, 0x3d, 0x01, 0x00, 0x36, 0x00, 0x02, 0x67, 0x02,
-0x01, 0x28, 0x04, 0x03, 0x96, 0x09, 0x21, 0x69, 0x74, 0x8b,
-0x06, 0x01, 0x0e, 0x06, 0x01, 0x66, 0x0c, 0x23, 0x6f, 0x6e,
-0xa9, 0x0b, 0x04, 0x5a, 0x00, 0x13, 0x2e, 0xbe, 0x0a, 0x12,
-0x73, 0xbb, 0x08, 0x61, 0x61, 0x6d, 0x62, 0x69, 0x67, 0x75,
-0x04, 0x0c, 0x13, 0x65, 0x95, 0x05, 0x00, 0x05, 0x04, 0x1c,
-0x62, 0x95, 0x01, 0x06, 0x5f, 0x01, 0xd5, 0x73, 0x75, 0x62,
-0x74, 0x6c, 0x65, 0x2c, 0x00, 0x73, 0x6f, 0x00, 0x69, 0x66,
-0xaf, 0x0a, 0x05, 0x3f, 0x04, 0x01, 0xae, 0x06, 0x32, 0x6f,
-0x66, 0x66, 0xa2, 0x0b, 0x62, 0x66, 0x65, 0x61, 0x74, 0x75,
-0x72, 0x9d, 0x01, 0x40, 0x72, 0x69, 0x73, 0x6b, 0x95, 0x00,
-0x01, 0x2b, 0x02, 0x05, 0x77, 0x00, 0x03, 0xba, 0x00, 0xb2,
-0x2e, 0x00, 0x41, 0x6c, 0x73, 0x6f, 0x2c, 0x00, 0x66, 0x69,
-0x6e, 0x6b, 0x02, 0x24, 0x6c, 0x6c, 0xed, 0x07, 0x12, 0x73,
-0x82, 0x0a, 0x03, 0xc0, 0x00, 0x05, 0xa0, 0x00, 0x21, 0x61,
-0x6e, 0x97, 0x02, 0x00, 0x14, 0x00, 0x20, 0x61, 0x6c, 0x55,
-0x05, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x63, 0x05,
-0x01, 0x1c, 0x00, 0x10, 0x76, 0xc8, 0x06, 0x12, 0x64, 0xa9,
-0x09, 0x61, 0x72, 0x2e, 0x00, 0x54, 0x75, 0x72, 0xfc, 0x04,
-0x05, 0x9c, 0x00, 0x03, 0xfc, 0x05, 0x01, 0xf4, 0x04, 0x01,
-0x0e, 0x0c, 0x74, 0x70, 0x65, 0x65, 0x64, 0x00, 0x75, 0x70,
-0x6a, 0x0b, 0x03, 0xf8, 0x01, 0x50, 0x69, 0x6f, 0x6e, 0x2e,
-0x00,
+0x6c, 0x65, 0x73, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x01, 0xf0,
+0x3a, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61,
+0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00,
+0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73,
+0x2c, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x6e, 0x75, 0x6d,
+0x62, 0x65, 0x72, 0x73, 0x00, 0x77, 0x72, 0x69, 0x74, 0x74,
+0x65, 0x6e, 0x00, 0x69, 0x6e, 0x00, 0x73, 0x6f, 0x6d, 0x65,
+0x00, 0x28, 0x62, 0x75, 0x74, 0x00, 0x6e, 0x6f, 0x74, 0x00,
+0x61, 0x6c, 0x6c, 0x29, 0x37, 0x00, 0x34, 0x74, 0x68, 0x65,
+0x3b, 0x00, 0x10, 0x2e, 0x57, 0x00, 0xf1, 0x07, 0x72, 0x00,
+0x74, 0x61, 0x73, 0x6b, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f,
+0x00, 0x73, 0x75, 0x62, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65,
+0x27, 0x00, 0x01, 0x6a, 0x00, 0x65, 0x69, 0x6e, 0x74, 0x6f,
+0x00, 0x72, 0xa3, 0x00, 0x00, 0x43, 0x00, 0xb0, 0x76, 0x61,
+0x72, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x73, 0x69, 0x7a, 0x80,
+0x00, 0xf6, 0x04, 0x73, 0x75, 0x63, 0x68, 0x00, 0x74, 0x68,
+0x61, 0x74, 0x00, 0x28, 0x61, 0x29, 0x00, 0x65, 0x76, 0x65,
+0x72, 0x79, 0x31, 0x00, 0xf3, 0x06, 0x00, 0x63, 0x6f, 0x6e,
+0x74, 0x61, 0x69, 0x6e, 0x73, 0x00, 0x65, 0x78, 0x61, 0x63,
+0x74, 0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x65, 0xae, 0x00, 0x23,
+0x65, 0x64, 0x8a, 0x00, 0x91, 0x2c, 0x00, 0x61, 0x6e, 0x64,
+0x00, 0x28, 0x62, 0x29, 0x77, 0x00, 0x40, 0x61, 0x72, 0x65,
+0x61, 0x67, 0x00, 0x47, 0x65, 0x61, 0x63, 0x68, 0x49, 0x00,
+0x80, 0x69, 0x73, 0x00, 0x65, 0x71, 0x75, 0x61, 0x6c, 0xa8,
+0x00, 0x24, 0x74, 0x68, 0x44, 0x00, 0x08, 0xf1, 0x00, 0x3c,
+0x69, 0x74, 0x73, 0x5a, 0x00, 0xf4, 0x0e, 0x2e, 0x00, 0x00,
+0x00, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f,
+0x72, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d,
+0x65, 0x00, 0x67, 0x6f, 0x65, 0x73, 0x4a, 0x00, 0xf0, 0x18,
+0x4a, 0x61, 0x70, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x00, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x6d, 0x61, 0x67, 0x61,
+0x7a, 0x69, 0x6e, 0x65, 0x00, 0x4e, 0x69, 0x6b, 0x6f, 0x6c,
+0x69, 0x00, 0x5b, 0x33, 0x5d, 0x3b, 0x00, 0x49, 0x27, 0x7e,
+0x01, 0xf2, 0x14, 0x6c, 0x73, 0x6f, 0x00, 0x73, 0x65, 0x65,
+0x6e, 0x00, 0x61, 0x00, 0x50, 0x61, 0x6c, 0x6d, 0x00, 0x69,
+0x6d, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74,
+0x69, 0x6f, 0x6e, 0x00, 0x61, 0x74, 0x00, 0x50, 0x44, 0x00,
+0xfa, 0x03, 0x50, 0x61, 0x6c, 0x61, 0x63, 0x65, 0x00, 0x5b,
+0x34, 0x5d, 0x2e, 0x00, 0x55, 0x6e, 0x6c, 0x69, 0x6b, 0x65,
+0x1a, 0x00, 0x2b, 0x27, 0x73, 0x3c, 0x00, 0x91, 0x2c, 0x00,
+0x6d, 0x79, 0x00, 0x76, 0x65, 0x72, 0x73, 0x48, 0x00, 0xf1,
+0x0e, 0x75, 0x74, 0x6f, 0x6d, 0x61, 0x74, 0x69, 0x63, 0x61,
+0x6c, 0x6c, 0x79, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61,
+0x74, 0x65, 0x73, 0x00, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
+0x99, 0x01, 0x01, 0x8a, 0x01, 0x31, 0x61, 0x6e, 0x79, 0x86,
+0x01, 0x50, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x65, 0x00, 0x60,
+0x2e, 0x00, 0x54, 0x68, 0x65, 0x00, 0x27, 0x01, 0x30, 0x69,
+0x74, 0x79, 0x22, 0x00, 0x03, 0xd3, 0x00, 0x61, 0x64, 0x65,
+0x73, 0x69, 0x67, 0x6e, 0xe6, 0x01, 0x81, 0x68, 0x65, 0x72,
+0x65, 0x66, 0x6f, 0x72, 0x65, 0x16, 0x02, 0xd0, 0x71, 0x75,
+0x69, 0x74, 0x65, 0x00, 0x61, 0x73, 0x00, 0x67, 0x6f, 0x6f,
+0x64, 0x08, 0x00, 0xc3, 0x68, 0x61, 0x6e, 0x64, 0x2d, 0x63,
+0x72, 0x61, 0x66, 0x74, 0x65, 0x64, 0x3d, 0x00, 0xc0, 0x73,
+0x00, 0x77, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x62, 0x65, 0x2c,
+0x00, 0x4e, 0x02, 0x21, 0x6f, 0x6e, 0x36, 0x01, 0x21, 0x70,
+0x6c, 0x03, 0x02, 0x12, 0x64, 0x7d, 0x00, 0x50, 0x67, 0x65,
+0x74, 0x00, 0x61, 0x86, 0x01, 0xf7, 0x02, 0x65, 0x78, 0x68,
+0x61, 0x75, 0x73, 0x74, 0x69, 0x62, 0x6c, 0x65, 0x00, 0x73,
+0x75, 0x70, 0x70, 0x6c, 0x87, 0x00, 0x70, 0x73, 0x00, 0x74,
+0x61, 0x69, 0x6c, 0x6f, 0x9f, 0x01, 0x40, 0x74, 0x6f, 0x00,
+0x79, 0x7d, 0x02, 0xc1, 0x6f, 0x77, 0x6e, 0x00, 0x73, 0x70,
+0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x08, 0x01, 0x00, 0xb2,
+0x01, 0xf1, 0x02, 0x5b, 0x33, 0x5d, 0x00, 0x68, 0x74, 0x74,
+0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e,
+0x88, 0x01, 0xa3, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f,
+0x65, 0x6e, 0x2f, 0x4e, 0x00, 0x90, 0x2f, 0x73, 0x68, 0x69,
+0x6b, 0x61, 0x6b, 0x75, 0x2f, 0x33, 0x00, 0x17, 0x34, 0x33,
+0x00, 0xe0, 0x65, 0x62, 0x2e, 0x61, 0x72, 0x63, 0x68, 0x69,
+0x76, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x10, 0x00, 0xf0, 0x01,
+0x2f, 0x32, 0x30, 0x30, 0x34, 0x31, 0x30, 0x32, 0x34, 0x30,
+0x30, 0x31, 0x34, 0x35, 0x39, 0x2f, 0x2b, 0x00, 0x03, 0x5d,
+0x00, 0x02, 0x4d, 0x00, 0x30, 0x2e, 0x67, 0x72, 0x5d, 0x00,
+0x02, 0x0d, 0x00, 0x22, 0x2f, 0x73, 0x58, 0x00, 0xf8, 0x09,
+0x70, 0x61, 0x6c, 0x6d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78,
+0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x2e, 0x65, 0x6e, 0x00, 0x00,
+0x00, 0x38, 0x2e, 0x31, 0xb3, 0x03, 0x00, 0xe0, 0x02, 0x95,
+0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x5f,
+0x02, 0x92, 0x69, 0x73, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x65,
+0x64, 0x9e, 0x03, 0x00, 0x30, 0x01, 0xf0, 0x05, 0x6d, 0x6f,
+0x75, 0x73, 0x65, 0x00, 0x6f, 0x72, 0x00, 0x63, 0x75, 0x72,
+0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0xed, 0x00,
+0xa1, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0xcf, 0x01, 0x41, 0x65, 0x64, 0x67, 0x65, 0x99, 0x02,
+0x21, 0x6f, 0x67, 0xf6, 0x02, 0x01, 0x70, 0x01, 0x70, 0x6f,
+0x72, 0x00, 0x6f, 0x66, 0x66, 0x2c, 0x08, 0x00, 0x18, 0x6c,
+0x2f, 0x00, 0x60, 0x64, 0x00, 0x64, 0x72, 0x61, 0x67, 0x2f,
+0x00, 0x40, 0x64, 0x72, 0x61, 0x77, 0x81, 0x01, 0x67, 0x65,
+0x6e, 0x74, 0x69, 0x72, 0x65, 0x37, 0x03, 0x10, 0x28, 0x34,
+0x00, 0x44, 0x69, 0x6e, 0x65, 0x29, 0xb8, 0x01, 0x03, 0xd6,
+0x03, 0x01, 0x88, 0x03, 0xc2, 0x67, 0x6f, 0x00, 0x28, 0x72,
+0x65, 0x6d, 0x6f, 0x76, 0x69, 0x6e, 0x67, 0x7e, 0x00, 0x40,
+0x78, 0x69, 0x73, 0x74, 0x0d, 0x00, 0x00, 0x87, 0x00, 0x11,
+0x73, 0xbd, 0x00, 0x22, 0x69, 0x6e, 0xdd, 0x03, 0x05, 0x53,
+0x00, 0x73, 0x29, 0x2e, 0x00, 0x52, 0x69, 0x67, 0x68, 0x86,
+0x00, 0x02, 0x3a, 0x00, 0x02, 0x89, 0x00, 0x10, 0x67, 0x0d,
+0x00, 0x40, 0x77, 0x69, 0x6c, 0x6c, 0x6e, 0x04, 0x21, 0x6f,
+0x77, 0x19, 0x02, 0x72, 0x74, 0x6f, 0x00, 0x65, 0x72, 0x61,
+0x73, 0x52, 0x04, 0x00, 0x2d, 0x01, 0x32, 0x65, 0x6e, 0x74,
+0xbc, 0x02, 0x07, 0xa5, 0x00, 0x00, 0x68, 0x00, 0x91, 0x6f,
+0x75, 0x74, 0x00, 0x61, 0x66, 0x66, 0x65, 0x63, 0x80, 0x00,
+0x00, 0xcc, 0x03, 0x01, 0x84, 0x00, 0x00, 0x23, 0x01, 0xf4,
+0x01, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69,
+0x76, 0x65, 0x6c, 0x79, 0x2c, 0x00, 0x75, 0x4e, 0x00, 0x06,
+0x49, 0x01, 0x00, 0x67, 0x00, 0x42, 0x6d, 0x6f, 0x76, 0x65,
+0x9a, 0x02, 0x31, 0x6f, 0x73, 0x69, 0x8f, 0x03, 0x30, 0x69,
+0x6e, 0x64, 0x56, 0x02, 0x91, 0x6f, 0x72, 0x00, 0x61, 0x72,
+0x6f, 0x75, 0x6e, 0x64, 0x1e, 0x00, 0xc0, 0x62, 0x6f, 0x61,
+0x72, 0x64, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x6a,
+0x00, 0x20, 0x74, 0x68, 0x2f, 0x01, 0x40, 0x74, 0x75, 0x72,
+0x6e, 0x4a, 0x00, 0x00, 0x0f, 0x00, 0x12, 0x6e, 0xbf, 0x00,
+0x14, 0x73, 0xc0, 0x00, 0x0f, 0x70, 0x00, 0x04, 0x01, 0x7b,
+0x01, 0x08, 0xc6, 0x00, 0x00, 0xc2, 0x00, 0x42, 0x66, 0x72,
+0x6f, 0x6d, 0x30, 0x01, 0x04, 0x86, 0x00, 0x02, 0xdd, 0x04,
+0x1f, 0x70, 0x6f, 0x00, 0x04, 0x80, 0x61, 0x67, 0x61, 0x69,
+0x6e, 0x00, 0x63, 0x6f, 0x0c, 0x04, 0x21, 0x74, 0x65, 0x9f,
+0x03, 0x06, 0x52, 0x00, 0x35, 0x2e, 0x00, 0x55, 0x34, 0x00,
+0x20, 0x73, 0x70, 0x50, 0x04, 0xa1, 0x62, 0x61, 0x72, 0x00,
+0x69, 0x6e, 0x73, 0x74, 0x65, 0x61, 0x04, 0x06, 0x0c, 0x4d,
+0x00, 0x09, 0xb7, 0x00, 0x0f, 0x77, 0x01, 0x2a, 0x10, 0x2c,
+0x0d, 0x04, 0x57, 0x61, 0x62, 0x6f, 0x76, 0x65, 0x2b, 0x01,
+0xf1, 0x01, 0x65, 0x73, 0x63, 0x61, 0x70, 0x65, 0x00, 0x63,
+0x61, 0x6e, 0x63, 0x65, 0x6c, 0x73, 0x00, 0x61, 0x03, 0x01,
+0x00, 0xa1, 0x01, 0x11, 0x57, 0x35, 0x01, 0x08, 0x0b, 0x01,
+0x13, 0x66, 0x79, 0x00, 0x10, 0x72, 0x14, 0x00, 0x02, 0xa4,
+0x04, 0x25, 0x69, 0x73, 0xe8, 0x00, 0x20, 0x64, 0x2c, 0xd9,
+0x02, 0x01, 0x2a, 0x02, 0x90, 0x62, 0x65, 0x00, 0x73, 0x68,
+0x61, 0x64, 0x65, 0x64, 0x48, 0x00, 0x42, 0x28, 0x41, 0x6c,
+0x6c, 0x04, 0x06, 0x10, 0x63, 0x3b, 0x01, 0x10, 0x73, 0xb8,
+0x04, 0x61, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0xd1, 0x06,
+0x21, 0x65, 0x63, 0xd7, 0x01, 0x30, 0x32, 0x2e, 0x31, 0x25,
+0x06, 0x02, 0x8e, 0x05, 0xb1, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x9d, 0x03, 0x18, 0x32,
+0x9d, 0x03, 0x93, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0x9f, 0x03, 0x01, 0xe5, 0x05, 0x05, 0x14, 0x00,
+0x02, 0x45, 0x00, 0x04, 0x40, 0x00, 0x04, 0xbb, 0x01, 0xf1,
+0x01, 0x65, 0x00, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x73, 0x00, 0x03,
+0x3c, 0x03, 0xb1, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
+0x6d, 0x65, 0x6e, 0x75, 0xf7, 0x00, 0x80, 0x69, 0x64, 0x74,
+0x68, 0x2c, 0x00, 0x48, 0x65, 0x0f, 0x03, 0x61, 0x00, 0x00,
+0x00, 0x53, 0x69, 0x7a, 0xfb, 0x00, 0x00, 0x63, 0x03, 0x11,
+0x2c, 0xb2, 0x00, 0x04, 0x69, 0x07, 0x70, 0x00, 0x00, 0x45,
+0x78, 0x70, 0x61, 0x6e, 0xdd, 0x05, 0x40, 0x20, 0x66, 0x61,
+0x63, 0x93, 0x02, 0x03, 0x2f, 0x04, 0x10, 0x69, 0x48, 0x01,
+0x91, 0x6d, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x6d,
+0xa6, 0x06, 0x00, 0x0c, 0x00, 0x14, 0x67, 0xf8, 0x01, 0x35,
+0x74, 0x79, 0x70, 0x54, 0x00, 0x15, 0x73, 0x0b, 0x06, 0x42,
+0x64, 0x00, 0x62, 0x79, 0xec, 0x02, 0x90, 0x72, 0x6f, 0x67,
+0x72, 0x61, 0x6d, 0x2e, 0x00, 0x53, 0xee, 0x07, 0x60, 0x70,
+0x65, 0x6f, 0x70, 0x6c, 0x65, 0x6d, 0x02, 0x34, 0x66, 0x65,
+0x72, 0x2c, 0x08, 0x03, 0x82, 0x07, 0x01, 0xa9, 0x03, 0x97,
+0x00, 0x66, 0x65, 0x77, 0x00, 0x6c, 0x61, 0x72, 0x67, 0x66,
+0x02, 0x01, 0xcd, 0x02, 0x00, 0x0e, 0x04, 0x07, 0x29, 0x00,
+0x11, 0x6d, 0x5a, 0x06, 0x40, 0x6d, 0x61, 0x6c, 0x6c, 0x1a,
+0x00, 0x10, 0x73, 0x5f, 0x00, 0x01, 0x57, 0x02, 0x40, 0x63,
+0x61, 0x6e, 0x00, 0x2f, 0x08, 0x19, 0x52, 0x3d, 0x00, 0x30,
+0x65, 0x73, 0x73, 0x78, 0x04, 0x09, 0xad, 0x06, 0x22, 0x00,
+0x61, 0x40, 0x00, 0x22, 0x65, 0x72, 0x86, 0x00, 0x32, 0x74,
+0x68, 0x61, 0x44, 0x01, 0x05, 0xb0, 0x06, 0x03, 0xf7, 0x05,
+0x22, 0x65, 0x64, 0x22, 0x03, 0x01, 0x79, 0x03, 0x00, 0x4d,
+0x00, 0x00, 0x29, 0x01, 0x10, 0x64, 0x20, 0x02, 0x60, 0x62,
+0x79, 0x00, 0x61, 0x64, 0x64, 0x8f, 0x00, 0x10, 0x72, 0xd7,
+0x02, 0x20, 0x61, 0x6e, 0xcc, 0x00, 0x41, 0x6c, 0x75, 0x6d,
+0x6e, 0x51, 0x01, 0x00, 0xe9, 0x06, 0x72, 0x64, 0x65, 0x66,
+0x61, 0x75, 0x6c, 0x74, 0x34, 0x00, 0x01, 0x3a, 0x07, 0x03,
+0x5d, 0x01, 0xd2, 0x6f, 0x66, 0x00, 0x7a, 0x65, 0x72, 0x6f,
+0x00, 0x6d, 0x65, 0x61, 0x6e, 0x73, 0x90, 0x03, 0x07, 0xb3,
+0x00, 0x01, 0x79, 0x02, 0x10, 0x73, 0x80, 0x07, 0x09, 0xb0,
+0x00, 0x04, 0x5a, 0x09, 0x09, 0xa6, 0x00, 0x00, 0xee, 0x00,
+0x42, 0x66, 0x6f, 0x72, 0x2c, 0xe5, 0x04, 0x10, 0x6f, 0x36,
+0x07, 0x10, 0x68, 0x93, 0x00, 0x30, 0x66, 0x75, 0x72, 0x4b,
+0x07, 0x42, 0x2e, 0x00, 0x49, 0x66, 0xce, 0x00, 0x02, 0x01,
+0x07, 0x0f, 0x8a, 0x00, 0x01, 0x91, 0x28, 0x73, 0x61, 0x79,
+0x29, 0x00, 0x30, 0x2e, 0x35, 0xf6, 0x02, 0x07, 0x93, 0x00,
+0x01, 0xe2, 0x08, 0x42, 0x64, 0x69, 0x6d, 0x65, 0x32, 0x00,
+0x26, 0x6f, 0x66, 0xa1, 0x05, 0x04, 0x1c, 0x03, 0x02, 0x0e,
+0x01, 0x02, 0x31, 0x07, 0x43, 0x68, 0x61, 0x6c, 0x66, 0x31,
+0x04, 0x70, 0x61, 0x73, 0x00, 0x62, 0x69, 0x67, 0x00, 0xa7,
+0x07, 0x14, 0x72, 0xc3, 0x00, 0x01, 0x3d, 0x07, 0x60, 0x49,
+0x6e, 0x00, 0x6f, 0x74, 0x68, 0x18, 0x09, 0x51, 0x6f, 0x72,
+0x64, 0x73, 0x2c, 0x51, 0x00, 0x30, 0x69, 0x6e, 0x69, 0x9d,
+0x01, 0x0a, 0x59, 0x00, 0x36, 0x32, 0x2f, 0x33, 0xe9, 0x00,
+0x2b, 0x69, 0x6e, 0x8c, 0x00, 0x02, 0xef, 0x00, 0x0f, 0x85,
+0x00, 0x01, 0x00, 0x22, 0x04, 0x21, 0x66, 0x75, 0x40, 0x01,
+0x17, 0x7a, 0x42, 0x04, 0x24, 0x64, 0x64, 0x43, 0x06, 0x28,
+0x6d, 0x6f, 0x80, 0x06, 0x01, 0xab, 0x01, 0x31, 0x53, 0x65,
+0x74, 0x5e, 0x04, 0x0f, 0x20, 0x01, 0x04, 0x03, 0x9d, 0x05,
+0x82, 0x30, 0x2e, 0x35, 0x00, 0x74, 0x65, 0x6e, 0x64, 0xcd,
+0x05, 0x23, 0x61, 0x6b, 0x85, 0x0a, 0x00, 0x4f, 0x07, 0x01,
+0x54, 0x00, 0x92, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
+0x6c, 0x74, 0x9d, 0x00, 0x01, 0xfe, 0x03, 0x50, 0x28, 0x69,
+0x6e, 0x00, 0x6d, 0xb7, 0x06, 0xf0, 0x01, 0x70, 0x65, 0x72,
+0x69, 0x65, 0x6e, 0x63, 0x65, 0x29, 0x00, 0x72, 0x65, 0x77,
+0x61, 0x72, 0x64, 0x56, 0x03, 0x30, 0x6c, 0x65, 0x73, 0x42,
+0x04, 0x30, 0x64, 0x75, 0x63, 0x3a, 0x06, 0x01, 0x35, 0x00,
+0x01, 0x49, 0x00, 0x51, 0x69, 0x6e, 0x74, 0x75, 0x69, 0x13,
+0x00, 0x00, 0xa4, 0x07, 0x00, 0x99, 0x00, 0x59, 0x73, 0x74,
+0x79, 0x6c, 0x65, 0xcb, 0x01, 0xd0, 0x69, 0x74, 0x00, 0x74,
+0x6f, 0x6f, 0x00, 0x68, 0x69, 0x67, 0x68, 0x2c, 0x00, 0xe4,
+0x00, 0x02, 0x08, 0x00, 0x03, 0x90, 0x00, 0x03, 0x3c, 0x02,
+0x30, 0x63, 0x61, 0x6e, 0x45, 0x09, 0x05, 0x43, 0x02, 0x01,
+0x5e, 0x00, 0x01, 0xe9, 0x02, 0x02, 0x69, 0x03, 0x0a, 0x63,
+0x03, 0x51, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x44, 0x00, 0x03,
+0xa5, 0x07, 0x02, 0x27, 0x04, 0x03, 0xfc, 0x02, 0x02, 0x59,
+0x00, 0x50, 0x62, 0x65, 0x63, 0x6f, 0x6d, 0x2f, 0x00, 0x61,
+0x72, 0x69, 0x76, 0x69, 0x61, 0x6c, 0x39, 0x04, 0xf1, 0x02,
+0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x75, 0x6e, 0x69, 0x71,
+0x75, 0x65, 0x20, 0x73, 0x6f, 0x6c, 0x75, 0x92, 0x04, 0x60,
+0x00, 0x00, 0x4e, 0x6f, 0x72, 0x6d, 0x73, 0x03, 0x1d, 0x2c,
+0xdb, 0x02, 0x01, 0x3d, 0x01, 0x00, 0x36, 0x00, 0x02, 0x67,
+0x02, 0x01, 0x28, 0x04, 0x03, 0x81, 0x09, 0x21, 0x69, 0x74,
+0x8b, 0x06, 0x01, 0x0e, 0x06, 0x01, 0x51, 0x0c, 0x23, 0x6f,
+0x6e, 0x94, 0x0b, 0x04, 0x5a, 0x00, 0x13, 0x2e, 0xa9, 0x0a,
+0x12, 0x73, 0xbb, 0x08, 0x61, 0x61, 0x6d, 0x62, 0x69, 0x67,
+0x75, 0xef, 0x0b, 0x13, 0x65, 0x95, 0x05, 0x00, 0x05, 0x04,
+0x1c, 0x62, 0x95, 0x01, 0x06, 0x5f, 0x01, 0xd5, 0x73, 0x75,
+0x62, 0x74, 0x6c, 0x65, 0x2c, 0x00, 0x73, 0x6f, 0x00, 0x69,
+0x66, 0x9a, 0x0a, 0x05, 0x3f, 0x04, 0x01, 0xae, 0x06, 0x32,
+0x6f, 0x66, 0x66, 0x8d, 0x0b, 0x62, 0x66, 0x65, 0x61, 0x74,
+0x75, 0x72, 0x9d, 0x01, 0x40, 0x72, 0x69, 0x73, 0x6b, 0x95,
+0x00, 0x01, 0x2b, 0x02, 0x05, 0x77, 0x00, 0x03, 0xba, 0x00,
+0xb2, 0x2e, 0x00, 0x41, 0x6c, 0x73, 0x6f, 0x2c, 0x00, 0x66,
+0x69, 0x6e, 0x6b, 0x02, 0x24, 0x6c, 0x6c, 0xed, 0x07, 0x12,
+0x73, 0x6d, 0x0a, 0x03, 0xc0, 0x00, 0x05, 0xa0, 0x00, 0x21,
+0x61, 0x6e, 0x97, 0x02, 0x00, 0x14, 0x00, 0x20, 0x61, 0x6c,
+0x55, 0x05, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x63,
+0x05, 0x01, 0x1c, 0x00, 0x10, 0x76, 0xc8, 0x06, 0x12, 0x64,
+0xa9, 0x09, 0x61, 0x72, 0x2e, 0x00, 0x54, 0x75, 0x72, 0xfc,
+0x04, 0x05, 0x9c, 0x00, 0x03, 0xfc, 0x05, 0x01, 0xf4, 0x04,
+0x01, 0xf9, 0x0b, 0x74, 0x70, 0x65, 0x65, 0x64, 0x00, 0x75,
+0x70, 0x55, 0x0b, 0x03, 0xf8, 0x01, 0x50, 0x69, 0x6f, 0x6e,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3535;
-const unsigned short help_text_words = 605;
+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 5efe0ff4c3..62589b4f11 100644
--- a/apps/plugins/puzzles/help/samegame.c
+++ b/apps/plugins/puzzles/help/samegame.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,185 +6,187 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 116, TEXT_CENTER | C_RED },
- { 229, TEXT_CENTER | C_RED },
- { 246, TEXT_UNDERLINE },
+ { 117, TEXT_CENTER | C_RED },
+ { 230, TEXT_CENTER | C_RED },
  { 247, TEXT_UNDERLINE },
- { 257, TEXT_UNDERLINE },
- { 292, TEXT_UNDERLINE },
- { 342, TEXT_UNDERLINE },
- { 414, TEXT_UNDERLINE },
+ { 248, TEXT_UNDERLINE },
+ { 258, TEXT_UNDERLINE },
+ { 293, TEXT_UNDERLINE },
+ { 343, TEXT_UNDERLINE },
+ { 415, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2470 comp 1634 ratio 0.661538 level 10 saved 836 */
+/* orig 2492 comp 1641 ratio 0.658507 level 10 saved 851 */
 const char help_text[] = {
 0xf0, 0x03, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x33, 0x3a, 0x20, 0x53, 0x61, 0x6d, 0x65, 0x20, 0x47,
-0x05, 0x00, 0xf4, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75,
-0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72,
-0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x63, 0x6f, 0x6c, 0x6f,
-0x75, 0x72, 0x65, 0x64, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72,
-0x65, 0x73, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00,
-0x79, 0x2b, 0x00, 0xf0, 0x1c, 0x74, 0x6f, 0x00, 0x63, 0x6c,
-0x65, 0x61, 0x72, 0x00, 0x62, 0x79, 0x00, 0x68, 0x69, 0x67,
-0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x69, 0x6e, 0x67, 0x00,
-0x63, 0x6f, 0x6e, 0x74, 0x69, 0x67, 0x75, 0x6f, 0x75, 0x73,
-0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x50, 0x00,
-0xdc, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x74, 0x68, 0x61, 0x6e,
-0x00, 0x6f, 0x6e, 0x65, 0x5e, 0x00, 0xc1, 0x3b, 0x00, 0x74,
-0x68, 0x65, 0x00, 0x6c, 0x61, 0x72, 0x67, 0x65, 0x72, 0x0b,
-0x00, 0x02, 0x39, 0x00, 0x02, 0x6d, 0x00, 0x04, 0x5c, 0x00,
-0x11, 0x2c, 0x1a, 0x00, 0x01, 0x48, 0x00, 0x61, 0x70, 0x6f,
-0x69, 0x6e, 0x74, 0x73, 0x1f, 0x00, 0x81, 0x67, 0x65, 0x74,
-0x00, 0x28, 0x61, 0x6e, 0x64, 0x1d, 0x00, 0x61, 0x66, 0x61,
-0x73, 0x74, 0x65, 0x72, 0x18, 0x00, 0x02, 0x9c, 0x00, 0x00,
-0x15, 0x00, 0xcb, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x29, 0x2e,
-0x00, 0x00, 0x00, 0x49, 0x66, 0x1b, 0x00, 0x01, 0xed, 0x00,
-0x00, 0x13, 0x00, 0x44, 0x77, 0x69, 0x6e, 0x2e, 0x1f, 0x00,
-0xf0, 0x01, 0x65, 0x6e, 0x64, 0x00, 0x75, 0x70, 0x00, 0x77,
-0x69, 0x74, 0x68, 0x00, 0x6e, 0x6f, 0x74, 0x68, 0xd4, 0x00,
-0xa4, 0x62, 0x75, 0x74, 0x00, 0x73, 0x69, 0x6e, 0x67, 0x6c,
-0x65, 0x10, 0x01, 0x61, 0x00, 0x28, 0x69, 0x2e, 0x65, 0x2e,
-0x94, 0x00, 0x11, 0x72, 0x64, 0x00, 0x32, 0x00, 0x6e, 0x6f,
-0x9d, 0x00, 0x95, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x61, 0x62,
-0x6c, 0x65, 0xff, 0x00, 0x51, 0x6c, 0x65, 0x66, 0x74, 0x29,
-0x5c, 0x00, 0x40, 0x6c, 0x6f, 0x73, 0x65, 0x8a, 0x00, 0x50,
-0x52, 0x65, 0x6d, 0x6f, 0x76, 0x59, 0x00, 0x14, 0x61, 0xeb,
-0x00, 0x63, 0x63, 0x61, 0x75, 0x73, 0x65, 0x73, 0xfd, 0x00,
-0x20, 0x73, 0x74, 0x33, 0x01, 0x05, 0xa2, 0x00, 0xf0, 0x06,
-0x74, 0x6f, 0x00, 0x73, 0x68, 0x75, 0x66, 0x66, 0x6c, 0x65,
-0x00, 0x75, 0x70, 0x3a, 0x00, 0x62, 0x6c, 0x6f, 0x63, 0x6b,
-0x73, 0x4d, 0x01, 0x11, 0x74, 0x79, 0x00, 0xf3, 0x13, 0x73,
-0x75, 0x73, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x64, 0x00, 0x77,
-0x69, 0x6c, 0x6c, 0x00, 0x66, 0x61, 0x6c, 0x6c, 0x00, 0x64,
-0x6f, 0x77, 0x6e, 0x00, 0x28, 0x66, 0x69, 0x72, 0x73, 0x74,
-0x29, 0x2c, 0x00, 0x20, 0x01, 0x70, 0x6e, 0x00, 0x65, 0x6d,
-0x70, 0x74, 0x79, 0x7e, 0x01, 0x41, 0x75, 0x6d, 0x6e, 0x73,
-0x3d, 0x00, 0xb2, 0x66, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00,
-0x66, 0x72, 0x6f, 0x6d, 0x7d, 0x00, 0x00, 0x6b, 0x01, 0x00,
-0xa3, 0x00, 0x00, 0x21, 0x02, 0x20, 0x00, 0x47, 0x05, 0x00,
-0x31, 0x77, 0x61, 0x73, 0xd5, 0x01, 0x61, 0x72, 0x69, 0x62,
-0x75, 0x74, 0x65, 0x8f, 0x00, 0x40, 0x74, 0x68, 0x69, 0x73,
-0x47, 0x00, 0x40, 0x6c, 0x65, 0x63, 0x74, 0xbe, 0x00, 0xf0,
-0x00, 0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00,
-0x48, 0x61, 0x72, 0x76, 0x65, 0x79, 0x40, 0x00, 0x47, 0x31,
-0x33, 0x2e, 0x31, 0x66, 0x02, 0x01, 0x41, 0x00, 0x30, 0x6f,
-0x6c, 0x73, 0x6f, 0x02, 0x10, 0x54, 0x3e, 0x00, 0x10, 0x67,
-0x5b, 0x00, 0xd2, 0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00,
-0x70, 0x6c, 0x61, 0x79, 0x65, 0x64, 0x73, 0x01, 0x43, 0x65,
-0x69, 0x74, 0x68, 0x06, 0x02, 0xb3, 0x6b, 0x65, 0x79, 0x62,
-0x6f, 0x61, 0x72, 0x64, 0x00, 0x6f, 0x72, 0xfc, 0x01, 0x37,
-0x75, 0x73, 0x65, 0xc9, 0x01, 0x00, 0x58, 0x01, 0x11, 0x2d,
-0x6f, 0x01, 0x80, 0x00, 0x61, 0x6e, 0x00, 0x75, 0x6e, 0x73,
-0x65, 0x90, 0x00, 0x23, 0x65, 0x64, 0x54, 0x01, 0x90, 0x2c,
-0x00, 0x69, 0x74, 0x00, 0x62, 0x65, 0x63, 0x6f, 0x99, 0x00,
-0x05, 0x1c, 0x00, 0x92, 0x28, 0x70, 0x6f, 0x73, 0x73, 0x69,
-0x62, 0x6c, 0x79, 0x08, 0x02, 0x00, 0x85, 0x01, 0x00, 0x5c,
-0x00, 0x73, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x28,
-0x00, 0x4f, 0x69, 0x6f, 0x6e, 0x29, 0x69, 0x00, 0x03, 0x00,
-0x2c, 0x00, 0x0f, 0x68, 0x00, 0x01, 0x01, 0x7b, 0x01, 0x10,
-0x62, 0xbd, 0x01, 0x56, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x94,
-0x02, 0x0d, 0xce, 0x01, 0x03, 0xcb, 0x01, 0xd8, 0x64, 0x00,
-0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x6c,
-0x79, 0x6d, 0x00, 0x01, 0x82, 0x01, 0x0f, 0x6e, 0x00, 0x14,
-0x06, 0xf4, 0x00, 0x11, 0x2e, 0x58, 0x01, 0x01, 0xc8, 0x00,
-0x30, 0x73, 0x6f, 0x72, 0x3b, 0x01, 0x41, 0x73, 0x00, 0x6d,
-0x6f, 0xd3, 0x03, 0x03, 0x13, 0x00, 0x65, 0x61, 0x72, 0x6f,
-0x75, 0x6e, 0x64, 0x88, 0x00, 0x74, 0x2e, 0x00, 0x50, 0x72,
-0x65, 0x73, 0x73, 0x00, 0x01, 0x50, 0x53, 0x70, 0x61, 0x63,
-0x65, 0x69, 0x01, 0x43, 0x45, 0x6e, 0x74, 0x65, 0x40, 0x00,
-0x40, 0x77, 0x68, 0x69, 0x6c, 0xb5, 0x03, 0x05, 0x56, 0x00,
-0x5f, 0x69, 0x73, 0x00, 0x69, 0x6e, 0x6c, 0x01, 0x02, 0x03,
-0xa6, 0x00, 0x74, 0x73, 0x00, 0x69, 0x74, 0x3b, 0x00, 0x70,
-0x59, 0x00, 0x0b, 0x55, 0x00, 0x53, 0x61, 0x67, 0x61, 0x69,
-0x6e, 0x22, 0x01, 0x10, 0x73, 0xc7, 0x00, 0x71, 0x61, 0x73,
-0x00, 0x61, 0x62, 0x6f, 0x76, 0xd4, 0x01, 0x42, 0x28, 0x41,
-0x6c, 0x6c, 0xb0, 0x03, 0x21, 0x63, 0x74, 0x36, 0x03, 0x70,
-0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x29, 0x01, 0x00,
-0x5f, 0x00, 0x02, 0x69, 0x02, 0x31, 0x32, 0x2e, 0x31, 0xb7,
-0x02, 0xa0, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61,
-0x69, 0x6c, 0x6a, 0x03, 0x22, 0x2e, 0x29, 0x71, 0x02, 0x17,
-0x32, 0x71, 0x02, 0x93, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-0x74, 0x65, 0x72, 0x73, 0x02, 0x46, 0x65, 0x73, 0x65, 0x00,
-0x14, 0x00, 0x02, 0x45, 0x00, 0x04, 0x40, 0x00, 0x06, 0xff,
-0x02, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e,
-0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x73, 0x00, 0x22, 0x6f,
-0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0xaf, 0x00, 0x90, 0x57, 0x69, 0x64,
-0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xae, 0x01, 0x00, 0x2f,
-0x03, 0x30, 0x69, 0x7a, 0x65, 0xe7, 0x01, 0x01, 0xe3, 0x01,
-0x24, 0x69, 0x6e, 0x27, 0x04, 0x00, 0x2b, 0x00, 0x72, 0x4e,
-0x6f, 0x2e, 0x20, 0x6f, 0x66, 0x20, 0xf4, 0x04, 0x10, 0x73,
-0x11, 0x00, 0x50, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x2e, 0x00,
-0x51, 0x64, 0x69, 0x66, 0x66, 0x65, 0x78, 0x02, 0x04, 0x1e,
-0x00, 0x22, 0x75, 0x73, 0x62, 0x03, 0x00, 0x98, 0x03, 0x05,
-0xac, 0x01, 0x16, 0x3b, 0xfb, 0x04, 0x03, 0x28, 0x00, 0x12,
-0x2c, 0xf0, 0x04, 0x42, 0x65, 0x77, 0x65, 0x72, 0x38, 0x05,
-0x08, 0x6c, 0x05, 0x02, 0x24, 0x00, 0x03, 0xf6, 0x03, 0x26,
-0x75, 0x73, 0x3d, 0x00, 0x00, 0x6f, 0x00, 0x50, 0x69, 0x63,
-0x75, 0x6c, 0x74, 0x7d, 0x01, 0x21, 0x69, 0x73, 0x59, 0x04,
-0xbb, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c,
-0x6c, 0x79, 0x1a, 0x05, 0x01, 0x06, 0x04, 0x20, 0x63, 0x6f,
-0x23, 0x03, 0xb3, 0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d,
-0x00, 0x00, 0x00, 0x43, 0xc8, 0x03, 0x01, 0x26, 0x00, 0xf2,
-0x02, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x65, 0x00, 0x6d,
-0x65, 0x63, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x6d, 0xbf, 0x00,
-0x52, 0x66, 0x6f, 0x72, 0x00, 0x73, 0x39, 0x00, 0x30, 0x2e,
-0x00, 0x57, 0xd5, 0x03, 0x00, 0x2d, 0x00, 0x40, 0x64, 0x65,
-0x66, 0x61, 0x7b, 0x00, 0x02, 0x4b, 0x00, 0xf8, 0x02, 0x2c,
-0x00, 0x60, 0x28, 0x6e, 0x2d, 0x32, 0x29, 0x5e, 0x32, 0x27,
-0x2c, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0xc1, 0x00, 0x46, 0x74,
-0x68, 0x72, 0x65, 0x6a, 0x05, 0x22, 0x6f, 0x72, 0xbe, 0x00,
-0x01, 0xf5, 0x02, 0x20, 0x73, 0x63, 0x0b, 0x00, 0x34, 0x61,
-0x6e, 0x79, 0x05, 0x06, 0x00, 0x05, 0x05, 0x27, 0x6c, 0x6c,
-0x68, 0x00, 0xb1, 0x61, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61,
-0x74, 0x69, 0x76, 0x65, 0x64, 0x00, 0x10, 0x31, 0x64, 0x00,
-0x05, 0x76, 0x00, 0x08, 0x66, 0x00, 0x25, 0x77, 0x6f, 0x64,
-0x00, 0x03, 0x57, 0x00, 0x02, 0x55, 0x00, 0x52, 0x00, 0x65,
-0x61, 0x63, 0x68, 0x36, 0x05, 0x03, 0x94, 0x06, 0x04, 0x36,
-0x00, 0x02, 0x27, 0x00, 0x31, 0x72, 0x65, 0x6c, 0x5f, 0x00,
-0x28, 0x6c, 0x79, 0x8f, 0x06, 0x00, 0x2f, 0x01, 0xf2, 0x02,
-0x45, 0x6e, 0x73, 0x75, 0x72, 0x65, 0x20, 0x73, 0x6f, 0x6c,
-0x75, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0xd7, 0x03, 0x01,
-0x2f, 0x05, 0x03, 0x4f, 0x02, 0x00, 0x77, 0x01, 0x30, 0x69,
-0x63, 0x6b, 0x23, 0x04, 0x09, 0x16, 0x01, 0xd0, 0x74, 0x61,
-0x74, 0x65, 0x29, 0x2c, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72,
-0x61, 0x59, 0x03, 0x00, 0x83, 0x01, 0x15, 0x73, 0xea, 0x03,
-0x82, 0x67, 0x75, 0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x1e,
-0x02, 0x02, 0xad, 0x07, 0x71, 0x74, 0x00, 0x6c, 0x65, 0x61,
-0x73, 0x74, 0x52, 0x07, 0x00, 0x73, 0x00, 0x00, 0x60, 0x00,
-0x07, 0x49, 0x04, 0x60, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x69,
-0x7d, 0x04, 0x12, 0x66, 0x2f, 0x02, 0x01, 0x73, 0x05, 0x03,
-0x61, 0x00, 0x22, 0x6f, 0x72, 0x5b, 0x00, 0x70, 0x6e, 0x6f,
-0x74, 0x00, 0x74, 0x72, 0x79, 0x55, 0x00, 0x05, 0x63, 0x00,
-0x01, 0x4d, 0x00, 0x00, 0x17, 0x03, 0x01, 0x83, 0x00, 0x14,
-0x3b, 0x71, 0x04, 0xd0, 0x2c, 0x00, 0x68, 0x6f, 0x77, 0x65,
-0x76, 0x65, 0x72, 0x2c, 0x00, 0x73, 0x74, 0x3c, 0x00, 0x11,
-0x65, 0xee, 0x00, 0x02, 0x89, 0x06, 0x06, 0x08, 0x07, 0x05,
-0x97, 0x00, 0x16, 0x32, 0xc2, 0x01, 0x11, 0x66, 0x53, 0x01,
-0x04, 0x99, 0x02, 0x26, 0x6f, 0x6e, 0x0e, 0x05, 0x02, 0x3b,
-0x00, 0x00, 0xff, 0x00, 0x85, 0x72, 0x74, 0x00, 0x28, 0x73,
-0x69, 0x6e, 0x63, 0x86, 0x08, 0x02, 0x0f, 0x06, 0x62, 0x78,
-0x61, 0x63, 0x74, 0x6c, 0x79, 0xe4, 0x00, 0x01, 0x4f, 0x00,
-0x00, 0x4e, 0x00, 0x74, 0x61, 0x00, 0x67, 0x69, 0x76, 0x65,
-0x6e, 0x51, 0x00, 0x20, 0x69, 0x73, 0x48, 0x01, 0x40, 0x69,
-0x6e, 0x69, 0x74, 0x94, 0x01, 0x23, 0x69, 0x6e, 0xc0, 0x00,
-0x41, 0x29, 0x2e, 0x00, 0x47, 0x45, 0x01, 0x06, 0x55, 0x01,
-0x01, 0x54, 0x00, 0x08, 0x8f, 0x01, 0x50, 0x64, 0x69, 0x73,
-0x61, 0x62, 0x8e, 0x05, 0x31, 0x6d, 0x61, 0x79, 0xe6, 0x06,
-0x00, 0xa3, 0x04, 0x01, 0xd6, 0x01, 0x02, 0x57, 0x03, 0x43,
-0x61, 0x72, 0x65, 0x61, 0x55, 0x03, 0x05, 0xd7, 0x08, 0x02,
-0x76, 0x00, 0x10, 0x2c, 0xe7, 0x00, 0x11, 0x64, 0x40, 0x05,
-0xf1, 0x00, 0x6f, 0x00, 0x6f, 0x70, 0x70, 0x6f, 0x72, 0x74,
-0x75, 0x6e, 0x69, 0x74, 0x69, 0x65, 0x73, 0x01, 0x03, 0x00,
-0xb8, 0x08, 0x22, 0x65, 0x72, 0x32, 0x02, 0x11, 0x73, 0xc1,
-0x03, 0x11, 0x79, 0xef, 0x06, 0x01, 0xba, 0x04, 0x80, 0x74,
-0x61, 0x6b, 0x65, 0x00, 0x6c, 0x65, 0x73, 0x0c, 0x02, 0x21,
-0x6d, 0x65, 0x7d, 0x01, 0x90, 0x65, 0x6e, 0x65, 0x72, 0x61,
-0x74, 0x65, 0x2e, 0x00,
+0x05, 0x00, 0x2f, 0x00, 0x2d, 0x01, 0x00, 0x01, 0xf4, 0x20,
+0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
+0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
+0x66, 0x00, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x65, 0x64,
+0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00,
+0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x79, 0x2b, 0x00, 0xf0,
+0x1c, 0x74, 0x6f, 0x00, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x00,
+0x62, 0x79, 0x00, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x69, 0x67,
+0x68, 0x74, 0x69, 0x6e, 0x67, 0x00, 0x63, 0x6f, 0x6e, 0x74,
+0x69, 0x67, 0x75, 0x6f, 0x75, 0x73, 0x00, 0x72, 0x65, 0x67,
+0x69, 0x6f, 0x6e, 0x73, 0x50, 0x00, 0xdc, 0x6d, 0x6f, 0x72,
+0x65, 0x00, 0x74, 0x68, 0x61, 0x6e, 0x00, 0x6f, 0x6e, 0x65,
+0x5e, 0x00, 0xc1, 0x3b, 0x00, 0x74, 0x68, 0x65, 0x00, 0x6c,
+0x61, 0x72, 0x67, 0x65, 0x72, 0x0b, 0x00, 0x02, 0x39, 0x00,
+0x02, 0x6d, 0x00, 0x04, 0x5c, 0x00, 0x11, 0x2c, 0x1a, 0x00,
+0x01, 0x48, 0x00, 0x61, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73,
+0x1f, 0x00, 0x81, 0x67, 0x65, 0x74, 0x00, 0x28, 0x61, 0x6e,
+0x64, 0x1d, 0x00, 0x61, 0x66, 0x61, 0x73, 0x74, 0x65, 0x72,
+0x18, 0x00, 0x02, 0x9c, 0x00, 0x00, 0x15, 0x00, 0xcb, 0x61,
+0x72, 0x65, 0x6e, 0x61, 0x29, 0x2e, 0x00, 0x00, 0x00, 0x49,
+0x66, 0x1b, 0x00, 0x01, 0xed, 0x00, 0x00, 0x13, 0x00, 0x44,
+0x77, 0x69, 0x6e, 0x2e, 0x1f, 0x00, 0xf0, 0x01, 0x65, 0x6e,
+0x64, 0x00, 0x75, 0x70, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00,
+0x6e, 0x6f, 0x74, 0x68, 0xd4, 0x00, 0xa4, 0x62, 0x75, 0x74,
+0x00, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x10, 0x01, 0x61,
+0x00, 0x28, 0x69, 0x2e, 0x65, 0x2e, 0x94, 0x00, 0x11, 0x72,
+0x64, 0x00, 0x32, 0x00, 0x6e, 0x6f, 0x9d, 0x00, 0x95, 0x63,
+0x6c, 0x69, 0x63, 0x6b, 0x61, 0x62, 0x6c, 0x65, 0xff, 0x00,
+0x51, 0x6c, 0x65, 0x66, 0x74, 0x29, 0x5c, 0x00, 0x40, 0x6c,
+0x6f, 0x73, 0x65, 0x8a, 0x00, 0x50, 0x52, 0x65, 0x6d, 0x6f,
+0x76, 0x59, 0x00, 0x14, 0x61, 0xeb, 0x00, 0x63, 0x63, 0x61,
+0x75, 0x73, 0x65, 0x73, 0xfd, 0x00, 0x20, 0x73, 0x74, 0x33,
+0x01, 0x05, 0xa2, 0x00, 0xf0, 0x06, 0x74, 0x6f, 0x00, 0x73,
+0x68, 0x75, 0x66, 0x66, 0x6c, 0x65, 0x00, 0x75, 0x70, 0x3a,
+0x00, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x4d, 0x01, 0x11,
+0x74, 0x79, 0x00, 0xf3, 0x13, 0x73, 0x75, 0x73, 0x70, 0x65,
+0x6e, 0x64, 0x65, 0x64, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00,
+0x66, 0x61, 0x6c, 0x6c, 0x00, 0x64, 0x6f, 0x77, 0x6e, 0x00,
+0x28, 0x66, 0x69, 0x72, 0x73, 0x74, 0x29, 0x2c, 0x00, 0x20,
+0x01, 0x70, 0x6e, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x7e,
+0x01, 0x41, 0x75, 0x6d, 0x6e, 0x73, 0x3d, 0x00, 0xb2, 0x66,
+0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x66, 0x72, 0x6f, 0x6d,
+0x7d, 0x00, 0x00, 0x6b, 0x01, 0x00, 0xa3, 0x00, 0x00, 0x37,
+0x02, 0x20, 0x00, 0x47, 0x05, 0x00, 0x31, 0x77, 0x61, 0x73,
+0xd5, 0x01, 0x61, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x8f,
+0x00, 0x40, 0x74, 0x68, 0x69, 0x73, 0x47, 0x00, 0x40, 0x6c,
+0x65, 0x63, 0x74, 0xbe, 0x00, 0xf0, 0x00, 0x62, 0x79, 0x00,
+0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76,
+0x65, 0x79, 0x40, 0x00, 0x47, 0x31, 0x33, 0x2e, 0x31, 0x7c,
+0x02, 0x01, 0x41, 0x00, 0x80, 0x6f, 0x6c, 0x73, 0x20, 0x00,
+0x00, 0x00, 0x54, 0x3e, 0x00, 0x10, 0x67, 0x5b, 0x00, 0xd2,
+0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x70, 0x6c, 0x61,
+0x79, 0x65, 0x64, 0x73, 0x01, 0x43, 0x65, 0x69, 0x74, 0x68,
+0x06, 0x02, 0xb3, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72,
+0x64, 0x00, 0x6f, 0x72, 0xfc, 0x01, 0x37, 0x75, 0x73, 0x65,
+0xc9, 0x01, 0x00, 0x58, 0x01, 0x11, 0x2d, 0x6f, 0x01, 0x80,
+0x00, 0x61, 0x6e, 0x00, 0x75, 0x6e, 0x73, 0x65, 0x90, 0x00,
+0x23, 0x65, 0x64, 0x54, 0x01, 0x90, 0x2c, 0x00, 0x69, 0x74,
+0x00, 0x62, 0x65, 0x63, 0x6f, 0x99, 0x00, 0x05, 0x1c, 0x00,
+0x92, 0x28, 0x70, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x79,
+0x08, 0x02, 0x00, 0x85, 0x01, 0x00, 0x5c, 0x00, 0x73, 0x63,
+0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x28, 0x00, 0x4f, 0x69,
+0x6f, 0x6e, 0x29, 0x69, 0x00, 0x03, 0x00, 0x2c, 0x00, 0x0f,
+0x68, 0x00, 0x01, 0x01, 0x7b, 0x01, 0x10, 0x62, 0xbd, 0x01,
+0x56, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x94, 0x02, 0x0d, 0xce,
+0x01, 0x03, 0xcb, 0x01, 0xd8, 0x64, 0x00, 0x69, 0x6d, 0x6d,
+0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x6c, 0x79, 0x6d, 0x00,
+0x01, 0x82, 0x01, 0x0f, 0x6e, 0x00, 0x14, 0x06, 0xf4, 0x00,
+0x11, 0x2e, 0x58, 0x01, 0x01, 0xc8, 0x00, 0x30, 0x73, 0x6f,
+0x72, 0x3b, 0x01, 0x41, 0x73, 0x00, 0x6d, 0x6f, 0xd3, 0x03,
+0x03, 0x13, 0x00, 0x65, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+0x88, 0x00, 0x74, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73,
+0x00, 0x01, 0x50, 0x53, 0x70, 0x61, 0x63, 0x65, 0x69, 0x01,
+0x43, 0x45, 0x6e, 0x74, 0x65, 0x40, 0x00, 0x40, 0x77, 0x68,
+0x69, 0x6c, 0xb5, 0x03, 0x05, 0x56, 0x00, 0x5f, 0x69, 0x73,
+0x00, 0x69, 0x6e, 0x6c, 0x01, 0x02, 0x03, 0xa6, 0x00, 0x74,
+0x73, 0x00, 0x69, 0x74, 0x3b, 0x00, 0x70, 0x59, 0x00, 0x0b,
+0x55, 0x00, 0x53, 0x61, 0x67, 0x61, 0x69, 0x6e, 0x22, 0x01,
+0x10, 0x73, 0xc7, 0x00, 0x71, 0x61, 0x73, 0x00, 0x61, 0x62,
+0x6f, 0x76, 0xd4, 0x01, 0x42, 0x28, 0x41, 0x6c, 0x6c, 0xb0,
+0x03, 0x21, 0x63, 0x74, 0x36, 0x03, 0x70, 0x64, 0x65, 0x73,
+0x63, 0x72, 0x69, 0x62, 0x29, 0x01, 0x00, 0x5f, 0x00, 0x02,
+0x69, 0x02, 0x31, 0x32, 0x2e, 0x31, 0xb7, 0x02, 0xa0, 0x61,
+0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x6a,
+0x03, 0x22, 0x2e, 0x29, 0x71, 0x02, 0x17, 0x32, 0x71, 0x02,
+0x93, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+0x73, 0x02, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02,
+0x45, 0x00, 0x04, 0x40, 0x00, 0x06, 0xff, 0x02, 0xe1, 0x60,
+0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
+0x00, 0x6f, 0x70, 0x73, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00,
+0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
+0x75, 0xaf, 0x00, 0x90, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c,
+0x00, 0x48, 0x65, 0xae, 0x01, 0x00, 0x2f, 0x03, 0x30, 0x69,
+0x7a, 0x65, 0xe7, 0x01, 0x01, 0xe3, 0x01, 0x24, 0x69, 0x6e,
+0x27, 0x04, 0x00, 0x2b, 0x00, 0x72, 0x4e, 0x6f, 0x2e, 0x20,
+0x6f, 0x66, 0x20, 0xf4, 0x04, 0x10, 0x73, 0x11, 0x00, 0x50,
+0x75, 0x6d, 0x62, 0x65, 0x72, 0x2e, 0x00, 0x51, 0x64, 0x69,
+0x66, 0x66, 0x65, 0x78, 0x02, 0x04, 0x1e, 0x00, 0x22, 0x75,
+0x73, 0x62, 0x03, 0x00, 0x98, 0x03, 0x05, 0xac, 0x01, 0x16,
+0x3b, 0xfb, 0x04, 0x03, 0x28, 0x00, 0x12, 0x2c, 0xf0, 0x04,
+0x42, 0x65, 0x77, 0x65, 0x72, 0x38, 0x05, 0x08, 0x6c, 0x05,
+0x02, 0x24, 0x00, 0x03, 0xf6, 0x03, 0x26, 0x75, 0x73, 0x3d,
+0x00, 0x00, 0x6f, 0x00, 0x50, 0x69, 0x63, 0x75, 0x6c, 0x74,
+0x7d, 0x01, 0x21, 0x69, 0x73, 0x59, 0x04, 0xbb, 0x75, 0x63,
+0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x1a,
+0x05, 0x01, 0x06, 0x04, 0x20, 0x63, 0x6f, 0x23, 0x03, 0xb3,
+0x20, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x00, 0x00, 0x00,
+0x43, 0xc8, 0x03, 0x01, 0x26, 0x00, 0xf2, 0x02, 0x70, 0x72,
+0x65, 0x63, 0x69, 0x73, 0x65, 0x00, 0x6d, 0x65, 0x63, 0x68,
+0x61, 0x6e, 0x69, 0x73, 0x6d, 0xbf, 0x00, 0x52, 0x66, 0x6f,
+0x72, 0x00, 0x73, 0x39, 0x00, 0x30, 0x2e, 0x00, 0x57, 0xd5,
+0x03, 0x00, 0x2d, 0x00, 0x40, 0x64, 0x65, 0x66, 0x61, 0x7b,
+0x00, 0x02, 0x4b, 0x00, 0xf8, 0x02, 0x2c, 0x00, 0x60, 0x28,
+0x6e, 0x2d, 0x32, 0x29, 0x5e, 0x32, 0x27, 0x2c, 0x00, 0x6f,
+0x6e, 0x6c, 0x79, 0xc1, 0x00, 0x46, 0x74, 0x68, 0x72, 0x65,
+0x6a, 0x05, 0x22, 0x6f, 0x72, 0xbe, 0x00, 0x01, 0xf5, 0x02,
+0x20, 0x73, 0x63, 0x0b, 0x00, 0x34, 0x61, 0x6e, 0x79, 0x05,
+0x06, 0x00, 0x05, 0x05, 0x27, 0x6c, 0x6c, 0x68, 0x00, 0xb1,
+0x61, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76,
+0x65, 0x64, 0x00, 0x10, 0x31, 0x64, 0x00, 0x05, 0x76, 0x00,
+0x08, 0x66, 0x00, 0x25, 0x77, 0x6f, 0x64, 0x00, 0x03, 0x57,
+0x00, 0x02, 0x55, 0x00, 0x52, 0x00, 0x65, 0x61, 0x63, 0x68,
+0x36, 0x05, 0x03, 0x94, 0x06, 0x04, 0x36, 0x00, 0x02, 0x27,
+0x00, 0x31, 0x72, 0x65, 0x6c, 0x5f, 0x00, 0x28, 0x6c, 0x79,
+0x8f, 0x06, 0x00, 0x2f, 0x01, 0xf2, 0x02, 0x45, 0x6e, 0x73,
+0x75, 0x72, 0x65, 0x20, 0x73, 0x6f, 0x6c, 0x75, 0x62, 0x69,
+0x6c, 0x69, 0x74, 0x79, 0xd7, 0x03, 0x01, 0x2f, 0x05, 0x03,
+0x4f, 0x02, 0x00, 0x77, 0x01, 0x30, 0x69, 0x63, 0x6b, 0x23,
+0x04, 0x09, 0x16, 0x01, 0xd0, 0x74, 0x61, 0x74, 0x65, 0x29,
+0x2c, 0x00, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x59, 0x03,
+0x00, 0x83, 0x01, 0x15, 0x73, 0xea, 0x03, 0x82, 0x67, 0x75,
+0x61, 0x72, 0x61, 0x6e, 0x74, 0x65, 0x1e, 0x02, 0x02, 0xad,
+0x07, 0x71, 0x74, 0x00, 0x6c, 0x65, 0x61, 0x73, 0x74, 0x52,
+0x07, 0x00, 0x73, 0x00, 0x00, 0x60, 0x00, 0x07, 0x49, 0x04,
+0x60, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x69, 0x7d, 0x04, 0x12,
+0x66, 0x2f, 0x02, 0x01, 0x73, 0x05, 0x03, 0x61, 0x00, 0x22,
+0x6f, 0x72, 0x5b, 0x00, 0x70, 0x6e, 0x6f, 0x74, 0x00, 0x74,
+0x72, 0x79, 0x55, 0x00, 0x05, 0x63, 0x00, 0x01, 0x4d, 0x00,
+0x00, 0x17, 0x03, 0x01, 0x83, 0x00, 0x14, 0x3b, 0x71, 0x04,
+0xd0, 0x2c, 0x00, 0x68, 0x6f, 0x77, 0x65, 0x76, 0x65, 0x72,
+0x2c, 0x00, 0x73, 0x74, 0x3c, 0x00, 0x11, 0x65, 0xee, 0x00,
+0x02, 0x89, 0x06, 0x06, 0x08, 0x07, 0x05, 0x97, 0x00, 0x16,
+0x32, 0xc2, 0x01, 0x11, 0x66, 0x53, 0x01, 0x04, 0x99, 0x02,
+0x26, 0x6f, 0x6e, 0x0e, 0x05, 0x02, 0x3b, 0x00, 0x00, 0xff,
+0x00, 0x85, 0x72, 0x74, 0x00, 0x28, 0x73, 0x69, 0x6e, 0x63,
+0x86, 0x08, 0x02, 0x0f, 0x06, 0x62, 0x78, 0x61, 0x63, 0x74,
+0x6c, 0x79, 0xe4, 0x00, 0x01, 0x4f, 0x00, 0x00, 0x4e, 0x00,
+0x74, 0x61, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x51, 0x00,
+0x20, 0x69, 0x73, 0x48, 0x01, 0x40, 0x69, 0x6e, 0x69, 0x74,
+0x94, 0x01, 0x23, 0x69, 0x6e, 0xc0, 0x00, 0x41, 0x29, 0x2e,
+0x00, 0x47, 0x45, 0x01, 0x06, 0x55, 0x01, 0x01, 0x54, 0x00,
+0x08, 0x8f, 0x01, 0x50, 0x64, 0x69, 0x73, 0x61, 0x62, 0x8e,
+0x05, 0x31, 0x6d, 0x61, 0x79, 0xe6, 0x06, 0x00, 0xa3, 0x04,
+0x01, 0xd6, 0x01, 0x02, 0x57, 0x03, 0x43, 0x61, 0x72, 0x65,
+0x61, 0x55, 0x03, 0x05, 0xd7, 0x08, 0x02, 0x76, 0x00, 0x10,
+0x2c, 0xe7, 0x00, 0x11, 0x64, 0x40, 0x05, 0xf1, 0x00, 0x6f,
+0x00, 0x6f, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x75, 0x6e, 0x69,
+0x74, 0x69, 0x65, 0x73, 0x01, 0x03, 0x00, 0xb8, 0x08, 0x22,
+0x65, 0x72, 0x32, 0x02, 0x11, 0x73, 0xc1, 0x03, 0x11, 0x79,
+0xef, 0x06, 0x01, 0xba, 0x04, 0x80, 0x74, 0x61, 0x6b, 0x65,
+0x00, 0x6c, 0x65, 0x73, 0x0c, 0x02, 0x21, 0x6d, 0x65, 0x7d,
+0x01, 0x90, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x2e,
+0x00,
 };
 
-const unsigned short help_text_len = 2470;
-const unsigned short help_text_words = 444;
+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 6f89cbdd62..34e043da57 100644
--- a/apps/plugins/puzzles/help/signpost.c
+++ b/apps/plugins/puzzles/help/signpost.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,208 +6,221 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 158, TEXT_CENTER | C_RED },
- { 495, TEXT_CENTER | C_RED },
- { 512, TEXT_UNDERLINE },
+ { 159, TEXT_CENTER | C_RED },
+ { 496, TEXT_CENTER | C_RED },
  { 513, TEXT_UNDERLINE },
- { 523, TEXT_UNDERLINE },
+ { 514, TEXT_UNDERLINE },
+ { 524, TEXT_UNDERLINE },
+ { 569, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 3054 comp 1895 ratio 0.620498 level 10 saved 1159 */
+/* orig 3255 comp 2009 ratio 0.617204 level 10 saved 1246 */
 const char help_text[] = {
-0xf3, 0x29, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x34, 0x3a, 0x20, 0x53, 0x69, 0x67, 0x6e, 0x70, 0x6f,
-0x73, 0x74, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00,
-0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69,
-0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72,
-0x65, 0x73, 0x3b, 0x00, 0x65, 0x61, 0x63, 0x68, 0x0e, 0x00,
-0xf4, 0x23, 0x00, 0x28, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74,
-0x00, 0x74, 0x68, 0x65, 0x00, 0x6c, 0x61, 0x73, 0x74, 0x00,
-0x6f, 0x6e, 0x65, 0x29, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-0x69, 0x6e, 0x73, 0x00, 0x61, 0x6e, 0x00, 0x61, 0x72, 0x72,
-0x6f, 0x77, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x73, 0x6f,
-0x6d, 0x65, 0x47, 0x00, 0x54, 0x00, 0x61, 0x6c, 0x73, 0x6f,
-0x29, 0x00, 0x90, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
-0x73, 0x2e, 0x78, 0x00, 0xa1, 0x72, 0x00, 0x6a, 0x6f, 0x62,
-0x00, 0x69, 0x73, 0x00, 0x74, 0x20, 0x00, 0x32, 0x6e, 0x65,
-0x63, 0x5f, 0x00, 0x04, 0x39, 0x00, 0x91, 0x74, 0x6f, 0x00,
-0x66, 0x6f, 0x72, 0x6d, 0x00, 0x61, 0x3e, 0x00, 0x90, 0x69,
-0x6e, 0x75, 0x6f, 0x75, 0x73, 0x00, 0x6c, 0x69, 0x7c, 0x00,
-0x14, 0x66, 0x49, 0x00, 0xe1, 0x00, 0x73, 0x74, 0x61, 0x72,
-0x74, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x74, 0x00, 0x31, 0x7d,
-0x00, 0x91, 0x6c, 0x69, 0x6e, 0x6b, 0x65, 0x64, 0x00, 0x69,
-0x6e, 0x4d, 0x00, 0x90, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
-0x69, 0x6f, 0x6e, 0x35, 0x00, 0x00, 0x11, 0x00, 0x01, 0xa7,
-0x00, 0x66, 0x73, 0x00, 0x2d, 0x00, 0x73, 0x6f, 0x10, 0x00,
-0x77, 0x00, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x7f, 0x00,
-0x51, 0x00, 0x77, 0x69, 0x74, 0x68, 0x10, 0x00, 0x02, 0x6a,
-0x00, 0xd0, 0x00, 0x31, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00,
-0x70, 0x6f, 0x69, 0x6e, 0x74, 0x9b, 0x00, 0x07, 0x2b, 0x00,
-0x03, 0xdd, 0x00, 0x00, 0x86, 0x00, 0x07, 0x31, 0x00, 0x8f,
-0x32, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x38, 0x00,
-0x1d, 0x97, 0x33, 0x2c, 0x00, 0x65, 0x74, 0x63, 0x2e, 0x00,
-0x45, 0x7e, 0x01, 0xf1, 0x0e, 0x63, 0x61, 0x6e, 0x00, 0x62,
-0x65, 0x00, 0x61, 0x6e, 0x79, 0x00, 0x64, 0x69, 0x73, 0x74,
-0x61, 0x6e, 0x63, 0x65, 0x00, 0x61, 0x77, 0x61, 0x79, 0x00,
-0x66, 0x72, 0x6f, 0x6d, 0x3d, 0x00, 0x50, 0x70, 0x72, 0x65,
-0x76, 0x69, 0x21, 0x01, 0xc0, 0x6f, 0x6e, 0x65, 0x2c, 0x00,
-0x61, 0x73, 0x00, 0x6c, 0x6f, 0x6e, 0x67, 0x08, 0x00, 0x20,
-0x69, 0x74, 0x63, 0x01, 0x00, 0x92, 0x01, 0x5f, 0x77, 0x68,
-0x65, 0x72, 0x65, 0x18, 0x01, 0x0b, 0x60, 0x2e, 0x00, 0x00,
-0x00, 0x42, 0x79, 0x99, 0x00, 0x31, 0x76, 0x65, 0x6e, 0x1e,
-0x00, 0x00, 0x1b, 0x00, 0x52, 0x66, 0x69, 0x72, 0x73, 0x74,
-0x5c, 0x01, 0x00, 0xfa, 0x01, 0x04, 0x7b, 0x01, 0x00, 0x99,
-0x00, 0x60, 0x73, 0x68, 0x6f, 0x77, 0x6e, 0x3b, 0x75, 0x00,
-0x61, 0x00, 0x6f, 0x72, 0x00, 0x6d, 0x6f, 0x61, 0x00, 0x55,
-0x74, 0x65, 0x72, 0x69, 0x6d, 0x27, 0x00, 0x32, 0x6d, 0x61,
-0x79, 0x04, 0x02, 0x82, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72,
-0x00, 0x61, 0xe6, 0x01, 0x50, 0x62, 0x65, 0x67, 0x69, 0x6e,
-0xfc, 0x00, 0x00, 0x74, 0x00, 0x60, 0x43, 0x72, 0x65, 0x64,
-0x69, 0x74, 0xef, 0x01, 0xf2, 0x00, 0x00, 0x74, 0x68, 0x69,
-0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67,
-0x6f, 0x07, 0x02, 0xa0, 0x4a, 0x61, 0x6e, 0x6b, 0x6f, 0x00,
-0x5b, 0x31, 0x37, 0x5d, 0x54, 0x01, 0x60, 0x6f, 0x00, 0x63,
-0x61, 0x6c, 0x6c, 0xd9, 0x00, 0xe2, 0x60, 0x50, 0x66, 0x65,
-0x69, 0x6c, 0x70, 0x66, 0x61, 0x64, 0x27, 0x00, 0x28, 0x60,
-0xca, 0x01, 0x60, 0x70, 0x61, 0x74, 0x68, 0x27, 0x29, 0x55,
-0x00, 0x04, 0xe7, 0x02, 0x41, 0x00, 0x77, 0x61, 0x73, 0x6c,
-0x01, 0x72, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x86,
-0x01, 0x10, 0x69, 0x14, 0x00, 0x23, 0x6c, 0x6c, 0x05, 0x01,
-0xf0, 0x00, 0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73,
-0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0x79, 0x3f, 0x00, 0x00,
-0x6f, 0x00, 0x90, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f,
-0x2f, 0x6a, 0x81, 0x00, 0xc5, 0x2e, 0x61, 0x74, 0x2f, 0x52,
-0x61, 0x65, 0x74, 0x73, 0x65, 0x6c, 0x2f, 0x79, 0x00, 0xf6,
-0x02, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74,
-0x6d, 0x00, 0x00, 0x00, 0x33, 0x34, 0x2e, 0x31, 0x5e, 0x03,
-0x01, 0x73, 0x00, 0x30, 0x6f, 0x6c, 0x73, 0x67, 0x03, 0x75,
-0x54, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x94, 0x00, 0x55,
-0x2c, 0x00, 0x79, 0x6f, 0x75, 0xf6, 0x02, 0x06, 0xf2, 0x02,
-0x60, 0x67, 0x65, 0x74, 0x68, 0x65, 0x72, 0x8f, 0x00, 0x50,
-0x64, 0x72, 0x61, 0x67, 0x67, 0x1b, 0x02, 0x01, 0xe3, 0x01,
-0x25, 0x6f, 0x6e, 0x36, 0x02, 0x60, 0x74, 0x6f, 0x00, 0x61,
-0x6e, 0x6f, 0x27, 0x00, 0x92, 0x2c, 0x00, 0x69, 0x6e, 0x64,
-0x69, 0x63, 0x61, 0x74, 0x42, 0x02, 0x02, 0x59, 0x01, 0x11,
-0x79, 0x98, 0x01, 0x84, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65,
-0x6e, 0x74, 0xef, 0x01, 0xe6, 0x73, 0x65, 0x71, 0x75, 0x65,
-0x6e, 0x63, 0x65, 0x2e, 0x00, 0x44, 0x72, 0x61, 0x67, 0xdd,
-0x02, 0xb2, 0x6c, 0x65, 0x66, 0x74, 0x00, 0x62, 0x75, 0x74,
-0x74, 0x6f, 0x6e, 0x69, 0x00, 0x17, 0x61, 0x67, 0x00, 0xe0,
-0x69, 0x74, 0x73, 0x00, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73,
-0x73, 0x6f, 0x72, 0x2c, 0xe1, 0x01, 0x05, 0x38, 0x00, 0x4f,
-0x72, 0x69, 0x67, 0x68, 0x39, 0x00, 0x0b, 0x52, 0x70, 0x72,
-0x65, 0x64, 0x65, 0x3b, 0x00, 0x00, 0x4e, 0x01, 0x29, 0x49,
-0x66, 0xf2, 0x00, 0x05, 0xea, 0x00, 0x35, 0x74, 0x77, 0x6f,
-0xff, 0x00, 0x22, 0x69, 0x6e, 0x98, 0x01, 0x00, 0xd9, 0x02,
-0x00, 0x6e, 0x02, 0x01, 0x56, 0x02, 0x01, 0x9e, 0x02, 0x74,
-0x6d, 0x00, 0x68, 0x61, 0x73, 0x00, 0x61, 0x23, 0x03, 0x62,
-0x69, 0x6e, 0x00, 0x69, 0x74, 0x2c, 0xb7, 0x02, 0x95, 0x70,
-0x70, 0x72, 0x6f, 0x70, 0x72, 0x69, 0x61, 0x74, 0x41, 0x03,
-0x01, 0x70, 0x03, 0x03, 0x6d, 0x02, 0x03, 0xff, 0x00, 0x01,
-0x2f, 0x01, 0x03, 0x68, 0x00, 0x1d, 0x2e, 0x8c, 0x00, 0x72,
-0x77, 0x6f, 0x00, 0x6e, 0x6f, 0x6e, 0x2d, 0x3f, 0x00, 0x24,
-0x65, 0x64, 0x90, 0x00, 0x12, 0x2c, 0x4f, 0x01, 0x01, 0x4f,
-0x00, 0x00, 0x7d, 0x03, 0x50, 0x73, 0x73, 0x69, 0x67, 0x6e,
-0x3f, 0x02, 0x70, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72,
-0xd7, 0x02, 0xf9, 0x01, 0x67, 0x65, 0x62, 0x72, 0x61, 0x69,
-0x63, 0x00, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x3a, 0x00,
-0x32, 0x03, 0x8b, 0x6f, 0x63, 0x63, 0x61, 0x73, 0x69, 0x6f,
-0x6e, 0x49, 0x00, 0x01, 0x2c, 0x00, 0x71, 0x6c, 0x65, 0x64,
-0x00, 0x60, 0x61, 0x27, 0xe8, 0x00, 0x52, 0x60, 0x61, 0x2b,
-0x31, 0x27, 0x3a, 0x05, 0x73, 0x74, 0x68, 0x65, 0x6e, 0x00,
-0x60, 0x62, 0x18, 0x00, 0x15, 0x62, 0x18, 0x00, 0x82, 0x73,
-0x6f, 0x00, 0x6f, 0x6e, 0x2e, 0x00, 0x43, 0xb3, 0x00, 0x00,
-0xf0, 0x01, 0x01, 0x6c, 0x03, 0x04, 0x3a, 0x01, 0x24, 0x6f,
-0x6e, 0x5b, 0x04, 0x41, 0x65, 0x6e, 0x64, 0x73, 0xc5, 0x05,
-0x30, 0x75, 0x63, 0x68, 0x3a, 0x05, 0x10, 0x68, 0x76, 0x05,
-0x01, 0x7a, 0x00, 0x52, 0x63, 0x61, 0x75, 0x73, 0x65, 0x4d,
-0x01, 0x00, 0x3f, 0x03, 0x29, 0x74, 0x6f, 0x8c, 0x00, 0x05,
-0xda, 0x01, 0x30, 0x73, 0x61, 0x6d, 0x17, 0x02, 0x31, 0x74,
-0x74, 0x65, 0xb8, 0x01, 0x10, 0x57, 0x91, 0x00, 0x00, 0x2e,
-0x01, 0x00, 0x2a, 0x02, 0x60, 0x2d, 0x63, 0x6c, 0x69, 0x63,
-0x6b, 0x09, 0x02, 0x01, 0x00, 0x02, 0x03, 0x0f, 0x00, 0x25,
-0x69, 0x6e, 0xfd, 0x01, 0x13, 0x2c, 0x55, 0x02, 0x38, 0x67,
-0x61, 0x6c, 0xc7, 0x05, 0x04, 0x6a, 0x01, 0x11, 0x69, 0x02,
-0x05, 0x04, 0x08, 0x01, 0x01, 0x3c, 0x04, 0x10, 0x2e, 0x1d,
-0x03, 0x07, 0x87, 0x05, 0x09, 0x75, 0x06, 0x01, 0xdd, 0x05,
-0x00, 0xcf, 0x00, 0x72, 0x66, 0x00, 0x62, 0x6c, 0x61, 0x63,
-0x6b, 0x0c, 0x01, 0x01, 0x16, 0x04, 0x60, 0x67, 0x72, 0x65,
-0x79, 0x00, 0x6f, 0x08, 0x05, 0x09, 0xcb, 0x01, 0x2e, 0x68,
-0x65, 0xc0, 0x02, 0x04, 0x85, 0x02, 0x59, 0x41, 0x6c, 0x73,
-0x6f, 0x2c, 0x60, 0x00, 0x02, 0xa0, 0x05, 0x40, 0x6e, 0x65,
-0x65, 0x64, 0x5d, 0x02, 0x07, 0xb2, 0x02, 0x03, 0x6f, 0x02,
-0x20, 0x73, 0x6d, 0x2a, 0x01, 0x25, 0x64, 0x6f, 0x47, 0x03,
-0x62, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x36, 0x03, 0x64,
-0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72, 0xe5, 0x05, 0x86, 0x76,
-0x61, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x73, 0x94, 0x00, 0x00,
-0x88, 0x06, 0x0b, 0x16, 0x03, 0x60, 0x2e, 0x00, 0x53, 0x6f,
-0x00, 0x79, 0xfa, 0x06, 0x50, 0x61, 0x69, 0x6d, 0x00, 0x69,
-0x1c, 0x07, 0x39, 0x77, 0x61, 0x79, 0x23, 0x01, 0x19, 0x61,
-0x80, 0x06, 0x12, 0x61, 0xf8, 0x00, 0x03, 0x1e, 0x01, 0x2d,
-0x74, 0x6f, 0x1f, 0x00, 0x42, 0x64, 0x6f, 0x74, 0x2e, 0x5f,
-0x04, 0x52, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x23, 0x06, 0x00,
-0x7a, 0x00, 0x11, 0x73, 0x4d, 0x05, 0x30, 0x61, 0x00, 0x70,
-0x1f, 0x07, 0x55, 0x63, 0x75, 0x6c, 0x61, 0x72, 0xca, 0x07,
-0xa1, 0x62, 0x6f, 0x74, 0x68, 0x00, 0x69, 0x6e, 0x63, 0x6f,
-0x6d, 0x38, 0x07, 0x00, 0x69, 0x03, 0x92, 0x75, 0x74, 0x67,
-0x6f, 0x69, 0x6e, 0x67, 0x29, 0x2c, 0xe7, 0x01, 0x10, 0x64,
-0x24, 0x04, 0x10, 0x69, 0x68, 0x07, 0x02, 0x1c, 0x06, 0x00,
-0x1a, 0x08, 0x18, 0x2e, 0x65, 0x00, 0x00, 0x86, 0x05, 0x22,
-0x6c, 0x65, 0x5e, 0x02, 0x13, 0x2c, 0x0d, 0x02, 0x01, 0x35,
-0x00, 0x00, 0x7f, 0x00, 0x03, 0x68, 0x00, 0x03, 0x33, 0x01,
-0x02, 0x82, 0x02, 0x0a, 0x4a, 0x00, 0x02, 0x77, 0x08, 0x00,
-0xd5, 0x06, 0x01, 0x19, 0x06, 0x03, 0x98, 0x02, 0x40, 0x00,
-0x63, 0x75, 0x72, 0x7c, 0x01, 0x22, 0x6b, 0x65, 0x13, 0x01,
-0x02, 0x6b, 0x00, 0x55, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3c,
-0x00, 0x06, 0x56, 0x08, 0x02, 0xea, 0x07, 0x94, 0x65, 0x73,
-0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0x45, 0x07, 0x80,
-0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x6b, 0x70, 0x03,
-0x00, 0xbb, 0x02, 0x30, 0x6f, 0x76, 0x65, 0x07, 0x01, 0x0a,
-0x51, 0x02, 0x12, 0x61, 0x9d, 0x01, 0x50, 0x6f, 0x70, 0x65,
-0x72, 0x61, 0xff, 0x05, 0x02, 0x58, 0x02, 0x1f, 0x70, 0x48,
-0x00, 0x04, 0x4c, 0x61, 0x67, 0x61, 0x69, 0x49, 0x00, 0x01,
-0xc4, 0x02, 0x20, 0x66, 0x69, 0xf4, 0x01, 0x02, 0xf3, 0x02,
-0x70, 0x69, 0x6e, 0x6b, 0x2c, 0x00, 0x69, 0x66, 0x5b, 0x03,
-0x6b, 0x6f, 0x77, 0x61, 0x62, 0x6c, 0x65, 0x98, 0x00, 0x9f,
-0x73, 0x70, 0x61, 0x63, 0x65, 0x00, 0x62, 0x61, 0x72, 0x49,
-0x00, 0x01, 0x00, 0x0a, 0x03, 0x0d, 0xa8, 0x04, 0x12, 0x73,
-0x34, 0x08, 0x01, 0x41, 0x00, 0x00, 0x3d, 0x02, 0x02, 0xa5,
-0x00, 0x01, 0x60, 0x00, 0x01, 0x60, 0x02, 0x06, 0x1f, 0x09,
-0x72, 0x62, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0xfb, 0x08,
-0x0e, 0xcc, 0x00, 0x07, 0x7c, 0x00, 0x02, 0xcb, 0x00, 0x10,
-0x63, 0x40, 0x08, 0x21, 0x6c, 0x73, 0x6d, 0x05, 0x00, 0x8d,
-0x01, 0x42, 0x28, 0x41, 0x6c, 0x6c, 0x4d, 0x05, 0x01, 0x0d,
-0x07, 0x92, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x46, 0x09, 0x13, 0x73, 0x23, 0x07, 0x32, 0x32, 0x2e,
-0x31, 0x5b, 0x06, 0x01, 0xcc, 0x07, 0x41, 0x76, 0x61, 0x69,
-0x6c, 0xe7, 0x00, 0x12, 0x29, 0xf8, 0x06, 0x16, 0x32, 0xf8,
-0x06, 0xb2, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-0x72, 0x73, 0x20, 0xdd, 0x03, 0x36, 0x73, 0x65, 0x00, 0x14,
-0x00, 0x02, 0x44, 0x00, 0x04, 0x3f, 0x00, 0x06, 0xc1, 0x08,
-0xe2, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
-0x2e, 0x27, 0x00, 0x6f, 0x70, 0x9a, 0x08, 0x12, 0x6e, 0x1a,
-0x00, 0xa1, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65,
-0x6e, 0x75, 0x92, 0x04, 0x81, 0x69, 0x64, 0x74, 0x68, 0x2c,
-0x00, 0x48, 0x65, 0x83, 0x06, 0x00, 0xe7, 0x07, 0x11, 0x7a,
-0x27, 0x06, 0x01, 0x1f, 0x02, 0x24, 0x69, 0x6e, 0x3e, 0x01,
-0x00, 0x2b, 0x00, 0x61, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x20,
-0xf5, 0x01, 0x82, 0x2f, 0x65, 0x6e, 0x64, 0x20, 0x74, 0x6f,
-0x20, 0xb6, 0x03, 0x12, 0x73, 0x92, 0x06, 0x33, 0x74, 0x72,
-0x75, 0xb3, 0x04, 0x01, 0x24, 0x00, 0x01, 0x3a, 0x01, 0x27,
-0x65, 0x6e, 0x65, 0x02, 0x24, 0x72, 0x65, 0xa3, 0x03, 0x42,
-0x70, 0x6c, 0x61, 0x63, 0x10, 0x01, 0x94, 0x6f, 0x70, 0x70,
-0x6f, 0x73, 0x69, 0x74, 0x65, 0x00, 0x4b, 0x00, 0x17, 0x28,
-0x41, 0x00, 0x02, 0x83, 0x04, 0x31, 0x74, 0x6f, 0x70, 0x49,
-0x03, 0x05, 0xd4, 0x05, 0x01, 0x56, 0x00, 0x28, 0x61, 0x74,
-0x44, 0x04, 0x01, 0x35, 0x03, 0x11, 0x29, 0x8d, 0x06, 0x5f,
-0x66, 0x61, 0x6c, 0x73, 0x65, 0x87, 0x00, 0x0c, 0x03, 0x80,
-0x00, 0xf4, 0x03, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x6c,
-0x79, 0x00, 0x28, 0x61, 0x6c, 0x74, 0x68, 0x6f, 0x75, 0x67,
-0x68, 0xa1, 0x00, 0x01, 0xd6, 0x03, 0x80, 0x73, 0x68, 0x6f,
-0x77, 0x6e, 0x29, 0x2e, 0x00,
+0x73, 0x74, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf3, 0x14,
+0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
+0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
+0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x3b,
+0x00, 0x65, 0x61, 0x63, 0x68, 0x0e, 0x00, 0xf4, 0x23, 0x00,
+0x28, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x00, 0x74, 0x68,
+0x65, 0x00, 0x6c, 0x61, 0x73, 0x74, 0x00, 0x6f, 0x6e, 0x65,
+0x29, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
+0x00, 0x61, 0x6e, 0x00, 0x61, 0x72, 0x72, 0x6f, 0x77, 0x2c,
+0x00, 0x61, 0x6e, 0x64, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x47,
+0x00, 0x54, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x29, 0x00, 0x90,
+0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x2e, 0x78,
+0x00, 0xa1, 0x72, 0x00, 0x6a, 0x6f, 0x62, 0x00, 0x69, 0x73,
+0x00, 0x74, 0x20, 0x00, 0x32, 0x6e, 0x65, 0x63, 0x5f, 0x00,
+0x04, 0x39, 0x00, 0x91, 0x74, 0x6f, 0x00, 0x66, 0x6f, 0x72,
+0x6d, 0x00, 0x61, 0x3e, 0x00, 0x90, 0x69, 0x6e, 0x75, 0x6f,
+0x75, 0x73, 0x00, 0x6c, 0x69, 0x7c, 0x00, 0x14, 0x66, 0x49,
+0x00, 0xe1, 0x00, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e,
+0x67, 0x00, 0x61, 0x74, 0x00, 0x31, 0x7d, 0x00, 0x91, 0x6c,
+0x69, 0x6e, 0x6b, 0x65, 0x64, 0x00, 0x69, 0x6e, 0x4d, 0x00,
+0x90, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+0x35, 0x00, 0x00, 0x11, 0x00, 0x01, 0xa7, 0x00, 0x66, 0x73,
+0x00, 0x2d, 0x00, 0x73, 0x6f, 0x10, 0x00, 0x77, 0x00, 0x69,
+0x6e, 0x73, 0x69, 0x64, 0x65, 0x7f, 0x00, 0x51, 0x00, 0x77,
+0x69, 0x74, 0x68, 0x10, 0x00, 0x02, 0x6a, 0x00, 0xd0, 0x00,
+0x31, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x70, 0x6f, 0x69,
+0x6e, 0x74, 0x9b, 0x00, 0x07, 0x2b, 0x00, 0x03, 0xdd, 0x00,
+0x00, 0x86, 0x00, 0x07, 0x31, 0x00, 0x8f, 0x32, 0x2c, 0x00,
+0x77, 0x68, 0x69, 0x63, 0x68, 0x38, 0x00, 0x1d, 0x97, 0x33,
+0x2c, 0x00, 0x65, 0x74, 0x63, 0x2e, 0x00, 0x45, 0x7e, 0x01,
+0xf1, 0x0e, 0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x61,
+0x6e, 0x79, 0x00, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63,
+0x65, 0x00, 0x61, 0x77, 0x61, 0x79, 0x00, 0x66, 0x72, 0x6f,
+0x6d, 0x3d, 0x00, 0x50, 0x70, 0x72, 0x65, 0x76, 0x69, 0x21,
+0x01, 0xc0, 0x6f, 0x6e, 0x65, 0x2c, 0x00, 0x61, 0x73, 0x00,
+0x6c, 0x6f, 0x6e, 0x67, 0x08, 0x00, 0x20, 0x69, 0x74, 0x63,
+0x01, 0x00, 0x92, 0x01, 0x5f, 0x77, 0x68, 0x65, 0x72, 0x65,
+0x18, 0x01, 0x0b, 0x60, 0x2e, 0x00, 0x00, 0x00, 0x42, 0x79,
+0x99, 0x00, 0x31, 0x76, 0x65, 0x6e, 0x1e, 0x00, 0x00, 0x1b,
+0x00, 0x52, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5c, 0x01, 0x00,
+0xfa, 0x01, 0x04, 0x7b, 0x01, 0x00, 0x99, 0x00, 0x60, 0x73,
+0x68, 0x6f, 0x77, 0x6e, 0x3b, 0x75, 0x00, 0x61, 0x00, 0x6f,
+0x72, 0x00, 0x6d, 0x6f, 0x61, 0x00, 0x55, 0x74, 0x65, 0x72,
+0x69, 0x6d, 0x27, 0x00, 0x32, 0x6d, 0x61, 0x79, 0x04, 0x02,
+0x82, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x00, 0x61, 0xe6,
+0x01, 0x50, 0x62, 0x65, 0x67, 0x69, 0x6e, 0xfc, 0x00, 0x00,
+0x74, 0x00, 0x60, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0xef,
+0x01, 0xf2, 0x00, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x07, 0x02,
+0xa0, 0x4a, 0x61, 0x6e, 0x6b, 0x6f, 0x00, 0x5b, 0x31, 0x37,
+0x5d, 0x54, 0x01, 0x60, 0x6f, 0x00, 0x63, 0x61, 0x6c, 0x6c,
+0xd9, 0x00, 0xe2, 0x60, 0x50, 0x66, 0x65, 0x69, 0x6c, 0x70,
+0x66, 0x61, 0x64, 0x27, 0x00, 0x28, 0x60, 0xca, 0x01, 0x60,
+0x70, 0x61, 0x74, 0x68, 0x27, 0x29, 0x55, 0x00, 0x04, 0xfc,
+0x02, 0x41, 0x00, 0x77, 0x61, 0x73, 0x6c, 0x01, 0x72, 0x72,
+0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x86, 0x01, 0x10, 0x69,
+0x14, 0x00, 0x23, 0x6c, 0x6c, 0x05, 0x01, 0xf0, 0x00, 0x62,
+0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61,
+0x72, 0x76, 0x65, 0x79, 0x3f, 0x00, 0x00, 0x6f, 0x00, 0x90,
+0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x6a, 0x81,
+0x00, 0xc5, 0x2e, 0x61, 0x74, 0x2f, 0x52, 0x61, 0x65, 0x74,
+0x73, 0x65, 0x6c, 0x2f, 0x79, 0x00, 0xf6, 0x02, 0x2f, 0x69,
+0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0x00,
+0x00, 0x33, 0x34, 0x2e, 0x31, 0x73, 0x03, 0x01, 0x73, 0x00,
+0xe5, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x6f,
+0x00, 0x70, 0x6c, 0x61, 0x79, 0x94, 0x00, 0x55, 0x2c, 0x00,
+0x79, 0x6f, 0x75, 0xf6, 0x02, 0x06, 0xf2, 0x02, 0x60, 0x67,
+0x65, 0x74, 0x68, 0x65, 0x72, 0x8f, 0x00, 0x50, 0x64, 0x72,
+0x61, 0x67, 0x67, 0x1b, 0x02, 0x01, 0xe3, 0x01, 0x25, 0x6f,
+0x6e, 0x36, 0x02, 0x60, 0x74, 0x6f, 0x00, 0x61, 0x6e, 0x6f,
+0x27, 0x00, 0x92, 0x2c, 0x00, 0x69, 0x6e, 0x64, 0x69, 0x63,
+0x61, 0x74, 0x42, 0x02, 0x02, 0x59, 0x01, 0x11, 0x79, 0x98,
+0x01, 0x84, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74,
+0xef, 0x01, 0xe6, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63,
+0x65, 0x2e, 0x00, 0x44, 0x72, 0x61, 0x67, 0xdd, 0x02, 0xb2,
+0x6c, 0x65, 0x66, 0x74, 0x00, 0x62, 0x75, 0x74, 0x74, 0x6f,
+0x6e, 0x69, 0x00, 0x17, 0x61, 0x67, 0x00, 0xe0, 0x69, 0x74,
+0x73, 0x00, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x6f,
+0x72, 0x2c, 0xe1, 0x01, 0x05, 0x38, 0x00, 0x4f, 0x72, 0x69,
+0x67, 0x68, 0x39, 0x00, 0x0b, 0x52, 0x70, 0x72, 0x65, 0x64,
+0x65, 0x3b, 0x00, 0x00, 0x4e, 0x01, 0x29, 0x49, 0x66, 0xf2,
+0x00, 0x05, 0xea, 0x00, 0x35, 0x74, 0x77, 0x6f, 0xff, 0x00,
+0x22, 0x69, 0x6e, 0x98, 0x01, 0x00, 0xd9, 0x02, 0x00, 0x6e,
+0x02, 0x01, 0x56, 0x02, 0x01, 0x9e, 0x02, 0x74, 0x6d, 0x00,
+0x68, 0x61, 0x73, 0x00, 0x61, 0x23, 0x03, 0x62, 0x69, 0x6e,
+0x00, 0x69, 0x74, 0x2c, 0xb7, 0x02, 0x95, 0x70, 0x70, 0x72,
+0x6f, 0x70, 0x72, 0x69, 0x61, 0x74, 0x41, 0x03, 0x01, 0x70,
+0x03, 0x03, 0x6d, 0x02, 0x03, 0xff, 0x00, 0x01, 0x2f, 0x01,
+0x03, 0x68, 0x00, 0x1d, 0x2e, 0x8c, 0x00, 0x72, 0x77, 0x6f,
+0x00, 0x6e, 0x6f, 0x6e, 0x2d, 0x3f, 0x00, 0x24, 0x65, 0x64,
+0x90, 0x00, 0x12, 0x2c, 0x4f, 0x01, 0x01, 0x4f, 0x00, 0x00,
+0x7d, 0x03, 0x50, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x3f, 0x02,
+0x70, 0x65, 0x6d, 0x70, 0x6f, 0x72, 0x61, 0x72, 0xd7, 0x02,
+0xf9, 0x01, 0x67, 0x65, 0x62, 0x72, 0x61, 0x69, 0x63, 0x00,
+0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x3a, 0x00, 0x32, 0x03,
+0x8b, 0x6f, 0x63, 0x63, 0x61, 0x73, 0x69, 0x6f, 0x6e, 0x49,
+0x00, 0x01, 0x2c, 0x00, 0x71, 0x6c, 0x65, 0x64, 0x00, 0x60,
+0x61, 0x27, 0xe8, 0x00, 0x52, 0x60, 0x61, 0x2b, 0x31, 0x27,
+0x3a, 0x05, 0x73, 0x74, 0x68, 0x65, 0x6e, 0x00, 0x60, 0x62,
+0x18, 0x00, 0x15, 0x62, 0x18, 0x00, 0x82, 0x73, 0x6f, 0x00,
+0x6f, 0x6e, 0x2e, 0x00, 0x43, 0xb3, 0x00, 0x00, 0xf0, 0x01,
+0x01, 0x6c, 0x03, 0x04, 0x3a, 0x01, 0x24, 0x6f, 0x6e, 0x5b,
+0x04, 0x41, 0x65, 0x6e, 0x64, 0x73, 0xc5, 0x05, 0x30, 0x75,
+0x63, 0x68, 0x3a, 0x05, 0x10, 0x68, 0x76, 0x05, 0x01, 0x7a,
+0x00, 0x52, 0x63, 0x61, 0x75, 0x73, 0x65, 0x4d, 0x01, 0x00,
+0x3f, 0x03, 0x29, 0x74, 0x6f, 0x8c, 0x00, 0x05, 0xda, 0x01,
+0x30, 0x73, 0x61, 0x6d, 0x17, 0x02, 0x31, 0x74, 0x74, 0x65,
+0xb8, 0x01, 0x10, 0x57, 0x91, 0x00, 0x00, 0x2e, 0x01, 0x00,
+0x2a, 0x02, 0x60, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x09,
+0x02, 0x01, 0x00, 0x02, 0x03, 0x0f, 0x00, 0x25, 0x69, 0x6e,
+0xfd, 0x01, 0x13, 0x2c, 0x55, 0x02, 0x38, 0x67, 0x61, 0x6c,
+0xc7, 0x05, 0x04, 0x6a, 0x01, 0x11, 0x69, 0x02, 0x05, 0x04,
+0x08, 0x01, 0x01, 0x3c, 0x04, 0x10, 0x2e, 0x1d, 0x03, 0x07,
+0x87, 0x05, 0x09, 0x75, 0x06, 0x01, 0xdd, 0x05, 0x00, 0xcf,
+0x00, 0x72, 0x66, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x0c,
+0x01, 0x01, 0x16, 0x04, 0x60, 0x67, 0x72, 0x65, 0x79, 0x00,
+0x6f, 0x08, 0x05, 0x09, 0xcb, 0x01, 0x2e, 0x68, 0x65, 0xc0,
+0x02, 0x04, 0x85, 0x02, 0x59, 0x41, 0x6c, 0x73, 0x6f, 0x2c,
+0x60, 0x00, 0x02, 0xa0, 0x05, 0x40, 0x6e, 0x65, 0x65, 0x64,
+0x5d, 0x02, 0x07, 0xb2, 0x02, 0x03, 0x6f, 0x02, 0x20, 0x73,
+0x6d, 0x2a, 0x01, 0x25, 0x64, 0x6f, 0x47, 0x03, 0x62, 0x62,
+0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x36, 0x03, 0x64, 0x63, 0x6f,
+0x72, 0x6e, 0x65, 0x72, 0xe5, 0x05, 0x86, 0x76, 0x61, 0x6e,
+0x69, 0x73, 0x68, 0x65, 0x73, 0x94, 0x00, 0x00, 0x88, 0x06,
+0x0b, 0x16, 0x03, 0x60, 0x2e, 0x00, 0x53, 0x6f, 0x00, 0x79,
+0xfa, 0x06, 0x50, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x1c, 0x07,
+0x39, 0x77, 0x61, 0x79, 0x23, 0x01, 0x19, 0x61, 0x80, 0x06,
+0x12, 0x61, 0xf8, 0x00, 0x03, 0x1e, 0x01, 0x2d, 0x74, 0x6f,
+0x1f, 0x00, 0x42, 0x64, 0x6f, 0x74, 0x2e, 0x5f, 0x04, 0x52,
+0x72, 0x65, 0x6d, 0x6f, 0x76, 0x23, 0x06, 0x00, 0x7a, 0x00,
+0x11, 0x73, 0x4d, 0x05, 0x30, 0x61, 0x00, 0x70, 0x1f, 0x07,
+0x55, 0x63, 0x75, 0x6c, 0x61, 0x72, 0xca, 0x07, 0xa1, 0x62,
+0x6f, 0x74, 0x68, 0x00, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x38,
+0x07, 0x00, 0x69, 0x03, 0x92, 0x75, 0x74, 0x67, 0x6f, 0x69,
+0x6e, 0x67, 0x29, 0x2c, 0xe7, 0x01, 0x10, 0x64, 0x24, 0x04,
+0x10, 0x69, 0x68, 0x07, 0x02, 0x1c, 0x06, 0x00, 0x1a, 0x08,
+0x18, 0x2e, 0x65, 0x00, 0x00, 0x86, 0x05, 0x22, 0x6c, 0x65,
+0x5e, 0x02, 0x13, 0x2c, 0x0d, 0x02, 0x01, 0x35, 0x00, 0x00,
+0x7f, 0x00, 0x03, 0x68, 0x00, 0x03, 0x33, 0x01, 0x02, 0x82,
+0x02, 0x0a, 0x4a, 0x00, 0x02, 0x77, 0x08, 0x00, 0xd5, 0x06,
+0x01, 0x19, 0x06, 0x03, 0x98, 0x02, 0x40, 0x00, 0x63, 0x75,
+0x72, 0x7c, 0x01, 0x22, 0x6b, 0x65, 0x13, 0x01, 0x02, 0x6b,
+0x00, 0x55, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3c, 0x00, 0x06,
+0x56, 0x08, 0x02, 0xea, 0x07, 0x94, 0x65, 0x73, 0x2e, 0x00,
+0x50, 0x72, 0x65, 0x73, 0x73, 0x45, 0x07, 0x80, 0x72, 0x65,
+0x74, 0x75, 0x72, 0x6e, 0x00, 0x6b, 0x70, 0x03, 0x00, 0xbb,
+0x02, 0x30, 0x6f, 0x76, 0x65, 0x07, 0x01, 0x0a, 0x51, 0x02,
+0x12, 0x61, 0x9d, 0x01, 0x50, 0x6f, 0x70, 0x65, 0x72, 0x61,
+0xff, 0x05, 0x02, 0x58, 0x02, 0x1f, 0x70, 0x48, 0x00, 0x04,
+0x4c, 0x61, 0x67, 0x61, 0x69, 0x49, 0x00, 0x01, 0xc4, 0x02,
+0x20, 0x66, 0x69, 0xf4, 0x01, 0x02, 0xf3, 0x02, 0x70, 0x69,
+0x6e, 0x6b, 0x2c, 0x00, 0x69, 0x66, 0x5b, 0x03, 0x6b, 0x6f,
+0x77, 0x61, 0x62, 0x6c, 0x65, 0x98, 0x00, 0x9f, 0x73, 0x70,
+0x61, 0x63, 0x65, 0x00, 0x62, 0x61, 0x72, 0x49, 0x00, 0x01,
+0x00, 0x0a, 0x03, 0x0d, 0xa8, 0x04, 0x12, 0x73, 0x34, 0x08,
+0x01, 0x41, 0x00, 0x00, 0x3d, 0x02, 0x02, 0xa5, 0x00, 0x01,
+0x60, 0x00, 0x01, 0x60, 0x02, 0x06, 0x1f, 0x09, 0x72, 0x62,
+0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0xfb, 0x08, 0x0e, 0xcc,
+0x00, 0x07, 0x7c, 0x00, 0x02, 0xcb, 0x00, 0x10, 0x63, 0x40,
+0x08, 0x21, 0x6c, 0x73, 0x6d, 0x05, 0x00, 0x8d, 0x01, 0x42,
+0x28, 0x41, 0x6c, 0x6c, 0x4d, 0x05, 0x01, 0x0d, 0x07, 0x92,
+0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x46,
+0x09, 0x13, 0x73, 0x23, 0x07, 0x32, 0x32, 0x2e, 0x31, 0x5b,
+0x06, 0x01, 0xcc, 0x07, 0x41, 0x76, 0x61, 0x69, 0x6c, 0xe7,
+0x00, 0x12, 0x29, 0xf8, 0x06, 0x16, 0x32, 0xf8, 0x06, 0xb2,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
+0x20, 0xdd, 0x03, 0x36, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02,
+0x44, 0x00, 0x04, 0x3f, 0x00, 0x06, 0xc1, 0x08, 0xe2, 0x60,
+0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
+0x00, 0x6f, 0x70, 0x9a, 0x08, 0x12, 0x6e, 0x1a, 0x00, 0xa1,
+0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
+0x92, 0x04, 0x81, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48,
+0x65, 0x83, 0x06, 0x00, 0xe7, 0x07, 0x11, 0x7a, 0x27, 0x06,
+0x01, 0x1f, 0x02, 0x24, 0x69, 0x6e, 0x3e, 0x01, 0x00, 0x2b,
+0x00, 0x61, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x20, 0xf5, 0x01,
+0x82, 0x2f, 0x65, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, 0xb6,
+0x03, 0x12, 0x73, 0x92, 0x06, 0x33, 0x74, 0x72, 0x75, 0xb3,
+0x04, 0x01, 0x24, 0x00, 0x01, 0x3a, 0x01, 0x27, 0x65, 0x6e,
+0x65, 0x02, 0x24, 0x72, 0x65, 0xa3, 0x03, 0x42, 0x70, 0x6c,
+0x61, 0x63, 0x10, 0x01, 0x94, 0x6f, 0x70, 0x70, 0x6f, 0x73,
+0x69, 0x74, 0x65, 0x00, 0x4b, 0x00, 0x17, 0x28, 0x41, 0x00,
+0x02, 0x83, 0x04, 0x31, 0x74, 0x6f, 0x70, 0x49, 0x03, 0x05,
+0xd4, 0x05, 0x01, 0x56, 0x00, 0x28, 0x61, 0x74, 0x44, 0x04,
+0x01, 0x35, 0x03, 0x11, 0x29, 0x8d, 0x06, 0x5f, 0x66, 0x61,
+0x6c, 0x73, 0x65, 0x87, 0x00, 0x0c, 0x03, 0x80, 0x00, 0xf4,
+0x03, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x6c, 0x79, 0x00,
+0x28, 0x61, 0x6c, 0x74, 0x68, 0x6f, 0x75, 0x67, 0x68, 0xa1,
+0x00, 0x01, 0xd6, 0x03, 0x01, 0x53, 0x05, 0x22, 0x29, 0x2e,
+0x93, 0x01, 0x16, 0x33, 0x93, 0x01, 0xb0, 0x75, 0x73, 0x65,
+0x72, 0x20, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x06, 0x08,
+0x01, 0x99, 0x01, 0x20, 0x4f, 0x6e, 0x55, 0x00, 0x10, 0x74,
+0x44, 0x02, 0x12, 0x73, 0x3e, 0x08, 0x80, 0x73, 0x75, 0x70,
+0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e, 0x00, 0x17, 0x00, 0x2e,
+0x00, 0x12, 0x2c, 0x87, 0x01, 0x16, 0x50, 0x12, 0x00, 0x0d,
+0xa3, 0x01, 0x33, 0x47, 0x61, 0x6d, 0xa3, 0x01, 0x02, 0xd2,
+0x02, 0x34, 0x6c, 0x65, 0x74, 0x99, 0x05, 0x54, 0x66, 0x69,
+0x67, 0x75, 0x72, 0xdf, 0x00, 0x34, 0x79, 0x6c, 0x65, 0x71,
+0x0a, 0xf0, 0x01, 0x76, 0x69, 0x63, 0x74, 0x6f, 0x72, 0x79,
+0x00, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3054;
-const unsigned short help_text_words = 566;
+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 3f4ecd157b..9a1771e3c7 100644
--- a/apps/plugins/puzzles/help/singles.c
+++ b/apps/plugins/puzzles/help/singles.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,124 +6,148 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 122, TEXT_CENTER | C_RED },
- { 212, TEXT_CENTER | C_RED },
- { 229, TEXT_UNDERLINE },
- { 230, TEXT_UNDERLINE },
- { 240, TEXT_UNDERLINE },
+ { 120, TEXT_CENTER | C_RED },
+ { 232, TEXT_CENTER | C_RED },
+ { 249, TEXT_UNDERLINE },
+ { 250, TEXT_UNDERLINE },
+ { 260, TEXT_UNDERLINE },
+ { 272, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 1392 comp 1052 ratio 0.755747 level 10 saved 340 */
+/* orig 1780 comp 1279 ratio 0.718539 level 10 saved 501 */
 const char help_text[] = {
-0xf3, 0x2d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x32, 0x3a, 0x20, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65,
-0x73, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68,
-0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
-0x00, 0x6f, 0x66, 0x00, 0x77, 0x68, 0x69, 0x74, 0x65, 0x00,
-0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x61,
-0x6c, 0x6c, 0x16, 0x00, 0xf0, 0x04, 0x63, 0x68, 0x00, 0x63,
-0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d,
-0x62, 0x65, 0x72, 0x73, 0x2e, 0x40, 0x00, 0xf0, 0x01, 0x72,
-0x00, 0x74, 0x61, 0x73, 0x6b, 0x00, 0x69, 0x73, 0x00, 0x74,
-0x6f, 0x00, 0x63, 0x6f, 0x6c, 0x12, 0x00, 0x40, 0x73, 0x6f,
-0x6d, 0x65, 0x36, 0x00, 0x25, 0x74, 0x68, 0x4a, 0x00, 0xf1,
-0x01, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x00, 0x28, 0x72,
-0x65, 0x6d, 0x6f, 0x76, 0x69, 0x6e, 0x67, 0x1c, 0x00, 0x02,
-0x48, 0x00, 0x61, 0x29, 0x00, 0x73, 0x6f, 0x00, 0x61, 0x40,
-0x00, 0x74, 0x73, 0x61, 0x74, 0x69, 0x73, 0x66, 0x79, 0x76,
-0x00, 0x00, 0x24, 0x00, 0x60, 0x66, 0x6f, 0x6c, 0x6c, 0x6f,
-0x77, 0x32, 0x00, 0xf3, 0x03, 0x63, 0x6f, 0x6e, 0x64, 0x69,
-0x74, 0x69, 0x6f, 0x6e, 0x73, 0x3a, 0x00, 0x00, 0x00, 0x2d,
-0x00, 0x4e, 0x6f, 0x41, 0x00, 0xf0, 0x15, 0x00, 0x6f, 0x63,
-0x63, 0x75, 0x72, 0x73, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0x00,
-0x74, 0x68, 0x61, 0x6e, 0x00, 0x6f, 0x6e, 0x63, 0x65, 0x00,
-0x69, 0x6e, 0x00, 0x61, 0x6e, 0x79, 0x00, 0x72, 0x6f, 0x77,
-0x00, 0x6f, 0x72, 0x9b, 0x00, 0x44, 0x75, 0x6d, 0x6e, 0x2e,
-0x3a, 0x00, 0x02, 0x8f, 0x00, 0x02, 0x9d, 0x00, 0x00, 0xbd,
-0x00, 0x50, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0xdf, 0x00, 0x30,
-0x6c, 0x6c, 0x79, 0x2f, 0x00, 0x61, 0x76, 0x65, 0x72, 0x74,
-0x69, 0x63, 0x0e, 0x00, 0x80, 0x61, 0x64, 0x6a, 0x61, 0x63,
-0x65, 0x6e, 0x74, 0xa1, 0x00, 0x00, 0x51, 0x00, 0x59, 0x6f,
-0x74, 0x68, 0x65, 0x72, 0x41, 0x00, 0x02, 0x56, 0x00, 0xa0,
-0x54, 0x68, 0x65, 0x00, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e,
-0xae, 0x00, 0x09, 0x48, 0x01, 0x51, 0x00, 0x6d, 0x75, 0x73,
-0x74, 0xd6, 0x00, 0x81, 0x66, 0x6f, 0x72, 0x6d, 0x00, 0x6f,
-0x6e, 0x65, 0x4c, 0x01, 0xf0, 0x10, 0x69, 0x67, 0x75, 0x6f,
-0x75, 0x73, 0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x00,
-0x28, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x00, 0x62, 0x79, 0x00, 0x65, 0x64, 0x67, 0x80, 0x01, 0x70,
-0x6e, 0x6f, 0x74, 0x00, 0x6a, 0x75, 0x73, 0x7d, 0x00, 0x30,
-0x75, 0x63, 0x68, 0x59, 0x00, 0xb0, 0x61, 0x74, 0x00, 0x63,
-0x6f, 0x72, 0x6e, 0x65, 0x72, 0x73, 0x29, 0x78, 0x00, 0x60,
-0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x58, 0x00, 0xf1, 0x01,
-0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a,
-0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0x52, 0x01, 0xf0, 0x02,
-0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x31, 0x35,
-0x5d, 0x00, 0x77, 0x68, 0x6f, 0x00, 0x63, 0x85, 0x00, 0x90,
-0x69, 0x74, 0x00, 0x48, 0x69, 0x74, 0x6f, 0x72, 0x69, 0x41,
-0x00, 0x03, 0x0f, 0x02, 0x41, 0x00, 0x77, 0x61, 0x73, 0x95,
-0x00, 0x40, 0x72, 0x69, 0x62, 0x75, 0x84, 0x00, 0x22, 0x74,
-0x6f, 0x51, 0x00, 0x60, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-0x78, 0x01, 0x00, 0x97, 0x00, 0xc0, 0x4a, 0x61, 0x6d, 0x65,
-0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0x79, 0x3e, 0x00,
-0x01, 0x59, 0x00, 0xc1, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f,
-0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x70, 0x00, 0x82, 0x2e,
-0x63, 0x6f, 0x6d, 0x2f, 0x65, 0x6e, 0x2f, 0x8d, 0x00, 0x32,
-0x73, 0x2f, 0x68, 0x6e, 0x00, 0xb1, 0x68, 0x74, 0x6d, 0x6c,
-0x00, 0x28, 0x62, 0x65, 0x77, 0x61, 0x72, 0x20, 0x02, 0xd5,
-0x46, 0x6c, 0x61, 0x73, 0x68, 0x29, 0x00, 0x00, 0x00, 0x33,
-0x32, 0x2e, 0x31, 0x98, 0x02, 0x01, 0x85, 0x00, 0x21, 0x6f,
-0x6c, 0xa1, 0x02, 0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63,
-0x6c, 0x69, 0x63, 0x6b, 0xfb, 0x00, 0x10, 0x6f, 0xd2, 0x01,
-0x64, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0xbb, 0x01, 0x44,
-0x77, 0x69, 0x6c, 0x6c, 0x77, 0x02, 0x22, 0x69, 0x74, 0x96,
-0x01, 0x39, 0x3b, 0x00, 0x6c, 0x37, 0x00, 0x20, 0x61, 0x67,
-0xb5, 0x02, 0x01, 0x2a, 0x00, 0x42, 0x72, 0x65, 0x73, 0x74,
-0x26, 0x02, 0x04, 0x7e, 0x02, 0x67, 0x2e, 0x00, 0x52, 0x69,
-0x67, 0x68, 0x2e, 0x00, 0x01, 0x28, 0x00, 0xf1, 0x05, 0x61,
-0x64, 0x64, 0x00, 0x61, 0x00, 0x63, 0x69, 0x72, 0x63, 0x6c,
-0x65, 0x00, 0x28, 0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x64,
-0x01, 0x72, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0xc2,
-0x02, 0x20, 0x61, 0x74, 0x25, 0x00, 0x30, 0x65, 0x6c, 0x6c,
-0x42, 0x02, 0xa1, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
-0x65, 0x6c, 0x79, 0xb5, 0x01, 0x01, 0x8a, 0x00, 0x23, 0x29,
-0x2e, 0x65, 0x03, 0xb2, 0x63, 0x61, 0x6e, 0x00, 0x61, 0x6c,
-0x73, 0x6f, 0x00, 0x75, 0x73, 0x7d, 0x00, 0x00, 0xb1, 0x02,
-0x61, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0xa7, 0x01, 0x20,
-0x6d, 0x6f, 0x85, 0x03, 0x51, 0x72, 0x6f, 0x75, 0x6e, 0x64,
-0x1f, 0x00, 0x00, 0x8e, 0x03, 0x74, 0x2e, 0x00, 0x50, 0x72,
-0x65, 0x73, 0x73, 0x2d, 0x03, 0x60, 0x72, 0x65, 0x74, 0x75,
-0x72, 0x6e, 0x9c, 0x02, 0x52, 0x73, 0x70, 0x61, 0x63, 0x65,
-0x3b, 0x00, 0x01, 0xad, 0x00, 0x01, 0x18, 0x00, 0x14, 0x61,
-0x12, 0x01, 0x02, 0x99, 0x02, 0x2a, 0x6f, 0x72, 0xc4, 0x00,
-0x40, 0x72, 0x65, 0x73, 0x70, 0xc6, 0x01, 0xb8, 0x76, 0x65,
-0x6c, 0x79, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x70, 0x5d,
-0x00, 0x3f, 0x6b, 0x65, 0x79, 0x27, 0x01, 0x0b, 0x00, 0x51,
-0x00, 0x01, 0xbc, 0x03, 0x03, 0xbf, 0x00, 0x01, 0x56, 0x00,
-0x00, 0xde, 0x00, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x13, 0x00,
-0x11, 0x61, 0x24, 0x02, 0x00, 0x08, 0x01, 0x70, 0x73, 0x63,
-0x72, 0x69, 0x62, 0x65, 0x64, 0x81, 0x03, 0x13, 0x73, 0x3a,
-0x02, 0x40, 0x32, 0x2e, 0x31, 0x00, 0x9d, 0x00, 0x01, 0x04,
-0x01, 0xa3, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c,
-0x65, 0x2e, 0xfc, 0x01, 0x15, 0x32, 0xfc, 0x01, 0x91, 0x70,
-0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0xfe, 0x01,
-0x66, 0x54, 0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02,
-0x43, 0x00, 0x04, 0x3e, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f,
-0x6d, 0x7b, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f,
-0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x71, 0x00,
-0x22, 0x6f, 0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65,
-0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xad, 0x00, 0x90, 0x57,
-0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0xf3, 0x01,
-0x01, 0xfc, 0x02, 0x11, 0x7a, 0x89, 0x02, 0x01, 0xfd, 0x04,
-0x24, 0x69, 0x6e, 0xaf, 0x03, 0x00, 0x2b, 0x00, 0xa0, 0x44,
-0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x65,
-0x03, 0x03, 0x93, 0x02, 0x01, 0x54, 0x00, 0x16, 0x64, 0x1a,
-0x00, 0x03, 0xa4, 0x04, 0x60, 0x67, 0x65, 0x6e, 0x65, 0x72,
-0x61, 0x35, 0x03, 0x80, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65,
-0x2e, 0x00,
+0x73, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf3, 0x19, 0x00, 0x00,
+0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
+0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00,
+0x77, 0x68, 0x69, 0x74, 0x65, 0x00, 0x73, 0x71, 0x75, 0x61,
+0x72, 0x65, 0x73, 0x2c, 0x00, 0x61, 0x6c, 0x6c, 0x16, 0x00,
+0xf0, 0x04, 0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61,
+0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73,
+0x2e, 0x40, 0x00, 0xf0, 0x01, 0x72, 0x00, 0x74, 0x61, 0x73,
+0x6b, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f,
+0x6c, 0x12, 0x00, 0x40, 0x73, 0x6f, 0x6d, 0x65, 0x36, 0x00,
+0x25, 0x74, 0x68, 0x4a, 0x00, 0xf1, 0x01, 0x00, 0x62, 0x6c,
+0x61, 0x63, 0x6b, 0x00, 0x28, 0x72, 0x65, 0x6d, 0x6f, 0x76,
+0x69, 0x6e, 0x67, 0x1c, 0x00, 0x02, 0x48, 0x00, 0x61, 0x29,
+0x00, 0x73, 0x6f, 0x00, 0x61, 0x40, 0x00, 0x74, 0x73, 0x61,
+0x74, 0x69, 0x73, 0x66, 0x79, 0x76, 0x00, 0x00, 0x24, 0x00,
+0x60, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x32, 0x00, 0xf3,
+0x03, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+0x73, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x4e, 0x6f, 0x41,
+0x00, 0xf0, 0x15, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x73,
+0x00, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x74, 0x68, 0x61, 0x6e,
+0x00, 0x6f, 0x6e, 0x63, 0x65, 0x00, 0x69, 0x6e, 0x00, 0x61,
+0x6e, 0x79, 0x00, 0x72, 0x6f, 0x77, 0x00, 0x6f, 0x72, 0x9b,
+0x00, 0x44, 0x75, 0x6d, 0x6e, 0x2e, 0x3a, 0x00, 0x02, 0x8f,
+0x00, 0x02, 0x9d, 0x00, 0x00, 0xbd, 0x00, 0x50, 0x68, 0x6f,
+0x72, 0x69, 0x7a, 0xdf, 0x00, 0x30, 0x6c, 0x6c, 0x79, 0x2f,
+0x00, 0x61, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e, 0x00,
+0x80, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74, 0xa1,
+0x00, 0x00, 0x51, 0x00, 0x59, 0x6f, 0x74, 0x68, 0x65, 0x72,
+0x41, 0x00, 0x02, 0x56, 0x00, 0xa0, 0x54, 0x68, 0x65, 0x00,
+0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0xae, 0x00, 0x09, 0x48,
+0x01, 0x51, 0x00, 0x6d, 0x75, 0x73, 0x74, 0xd6, 0x00, 0x81,
+0x66, 0x6f, 0x72, 0x6d, 0x00, 0x6f, 0x6e, 0x65, 0x4c, 0x01,
+0xf0, 0x10, 0x69, 0x67, 0x75, 0x6f, 0x75, 0x73, 0x00, 0x72,
+0x65, 0x67, 0x69, 0x6f, 0x6e, 0x00, 0x28, 0x63, 0x6f, 0x6e,
+0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x00, 0x62, 0x79, 0x00,
+0x65, 0x64, 0x67, 0x80, 0x01, 0x70, 0x6e, 0x6f, 0x74, 0x00,
+0x6a, 0x75, 0x73, 0x7d, 0x00, 0x30, 0x75, 0x63, 0x68, 0x59,
+0x00, 0xb0, 0x61, 0x74, 0x00, 0x63, 0x6f, 0x72, 0x6e, 0x65,
+0x72, 0x73, 0x29, 0x78, 0x00, 0x60, 0x43, 0x72, 0x65, 0x64,
+0x69, 0x74, 0x58, 0x00, 0xf1, 0x01, 0x00, 0x74, 0x68, 0x69,
+0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67,
+0x6f, 0x65, 0x52, 0x01, 0xf0, 0x02, 0x4e, 0x69, 0x6b, 0x6f,
+0x6c, 0x69, 0x00, 0x5b, 0x31, 0x35, 0x5d, 0x00, 0x77, 0x68,
+0x6f, 0x00, 0x63, 0x85, 0x00, 0x90, 0x69, 0x74, 0x00, 0x48,
+0x69, 0x74, 0x6f, 0x72, 0x69, 0x41, 0x00, 0x03, 0x23, 0x02,
+0x41, 0x00, 0x77, 0x61, 0x73, 0x95, 0x00, 0x40, 0x72, 0x69,
+0x62, 0x75, 0x84, 0x00, 0x22, 0x74, 0x6f, 0x51, 0x00, 0x60,
+0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x78, 0x01, 0x00, 0x97,
+0x00, 0xc0, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61,
+0x72, 0x76, 0x65, 0x79, 0x3e, 0x00, 0x01, 0x59, 0x00, 0xd1,
+0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77,
+0x77, 0x2e, 0x6e, 0x71, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e,
+0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0x90, 0x00, 0x31, 0x73,
+0x2f, 0x68, 0x71, 0x00, 0x85, 0x2f, 0x00, 0x00, 0x00, 0x33,
+0x32, 0x2e, 0x31, 0x99, 0x02, 0x01, 0x72, 0x00, 0xf0, 0x02,
+0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x4c, 0x65, 0x66,
+0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xe8, 0x00, 0x10,
+0x6f, 0xbf, 0x01, 0x64, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79,
+0xa8, 0x01, 0x44, 0x77, 0x69, 0x6c, 0x6c, 0x64, 0x02, 0x22,
+0x69, 0x74, 0x83, 0x01, 0x30, 0x3b, 0x00, 0x6c, 0x37, 0x00,
+0x15, 0x00, 0x38, 0x00, 0x20, 0x61, 0x67, 0xa3, 0x02, 0x01,
+0x2b, 0x00, 0x42, 0x72, 0x65, 0x73, 0x74, 0x14, 0x02, 0x04,
+0x6c, 0x02, 0x67, 0x2e, 0x00, 0x52, 0x69, 0x67, 0x68, 0x66,
+0x00, 0x01, 0x28, 0x00, 0xf1, 0x05, 0x61, 0x64, 0x64, 0x00,
+0x61, 0x00, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x00, 0x28,
+0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x52, 0x01, 0x72, 0x69,
+0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0xb0, 0x02, 0x20, 0x61,
+0x74, 0x25, 0x00, 0x30, 0x65, 0x6c, 0x6c, 0x30, 0x02, 0xa1,
+0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x6c, 0x79,
+0xa3, 0x01, 0x01, 0x8b, 0x00, 0x45, 0x29, 0x2e, 0x00, 0x43,
+0xbe, 0x00, 0x52, 0x75, 0x74, 0x73, 0x69, 0x64, 0x7b, 0x00,
+0x01, 0x5b, 0x03, 0x01, 0x69, 0x00, 0xad, 0x74, 0x6f, 0x67,
+0x67, 0x6c, 0x65, 0x00, 0x77, 0x68, 0x65, 0x44, 0x02, 0x00,
+0x69, 0x01, 0x41, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x00, 0x14,
+0x68, 0x3b, 0x00, 0x03, 0x6a, 0x03, 0x00, 0x0d, 0x01, 0x50,
+0x74, 0x68, 0x65, 0x6d, 0x2c, 0x9b, 0x02, 0x71, 0x64, 0x69,
+0x73, 0x70, 0x6c, 0x61, 0x79, 0x11, 0x00, 0x00, 0xe5, 0x02,
+0x72, 0x64, 0x61, 0x72, 0x6b, 0x00, 0x67, 0x72, 0x90, 0x01,
+0x00, 0xd2, 0x03, 0xb2, 0x63, 0x61, 0x6e, 0x00, 0x61, 0x6c,
+0x73, 0x6f, 0x00, 0x75, 0x73, 0x46, 0x00, 0x00, 0x1e, 0x03,
+0x61, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x14, 0x02, 0x20,
+0x6d, 0x6f, 0xf2, 0x03, 0x55, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+0xa0, 0x00, 0x74, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73,
+0x9a, 0x03, 0x60, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x6e,
+0x00, 0x52, 0x73, 0x70, 0x61, 0x63, 0x65, 0x3b, 0x00, 0x02,
+0xc3, 0x00, 0x00, 0x18, 0x00, 0x14, 0x61, 0x92, 0x01, 0x02,
+0xc2, 0x00, 0x2a, 0x6f, 0x72, 0x43, 0x01, 0x40, 0x72, 0x65,
+0x73, 0x70, 0x33, 0x02, 0xb8, 0x76, 0x65, 0x6c, 0x79, 0x2c,
+0x00, 0x61, 0x6e, 0x64, 0x00, 0x70, 0x5d, 0x00, 0x3f, 0x6b,
+0x65, 0x79, 0xa6, 0x01, 0x0b, 0x00, 0x51, 0x00, 0x01, 0x29,
+0x04, 0x03, 0xbf, 0x00, 0x01, 0x56, 0x00, 0x00, 0xde, 0x00,
+0x41, 0x28, 0x41, 0x6c, 0x6c, 0x13, 0x00, 0x11, 0x61, 0x91,
+0x02, 0x00, 0x87, 0x01, 0x70, 0x73, 0x63, 0x72, 0x69, 0x62,
+0x65, 0x64, 0x09, 0x01, 0x13, 0x73, 0xa7, 0x02, 0x40, 0x32,
+0x2e, 0x31, 0x00, 0x9d, 0x00, 0x01, 0x04, 0x01, 0xb2, 0x61,
+0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
+0x7c, 0x02, 0x15, 0x32, 0x7c, 0x02, 0x91, 0x70, 0x61, 0x72,
+0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x7e, 0x02, 0x66, 0x54,
+0x68, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x43, 0x00,
+0x04, 0x3e, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x7b,
+0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e,
+0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x71, 0x00, 0x22, 0x6f,
+0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
+0x6d, 0x65, 0x6e, 0x75, 0xad, 0x00, 0x90, 0x57, 0x69, 0x64,
+0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x72, 0x02, 0x01, 0x69,
+0x03, 0x11, 0x7a, 0x16, 0x05, 0x01, 0x0f, 0x02, 0x24, 0x69,
+0x6e, 0xf8, 0x01, 0x00, 0x2b, 0x00, 0xa0, 0x44, 0x69, 0x66,
+0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0xd2, 0x03, 0x03,
+0x13, 0x03, 0x01, 0x54, 0x00, 0x16, 0x64, 0x1a, 0x00, 0x03,
+0x11, 0x05, 0x60, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0xa2,
+0x03, 0x02, 0x5b, 0x03, 0x12, 0x2e, 0xd7, 0x00, 0x15, 0x33,
+0xd7, 0x00, 0xf1, 0x00, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70,
+0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0xdd,
+0x00, 0x70, 0x4f, 0x6e, 0x00, 0x70, 0x6c, 0x61, 0x74, 0x7e,
+0x04, 0x12, 0x73, 0xcb, 0x02, 0x80, 0x73, 0x75, 0x70, 0x70,
+0x6f, 0x72, 0x74, 0x00, 0x2e, 0x00, 0x17, 0x00, 0x2e, 0x00,
+0x12, 0x2c, 0xcb, 0x00, 0x16, 0x50, 0x12, 0x00, 0x0d, 0xe7,
+0x00, 0x33, 0x47, 0x61, 0x6d, 0xe7, 0x00, 0x02, 0xc1, 0x01,
+0x70, 0x6c, 0x65, 0x74, 0x00, 0x79, 0x6f, 0x75, 0x3e, 0x04,
+0x56, 0x66, 0x69, 0x67, 0x75, 0x72, 0xe1, 0x02, 0x07, 0xbf,
+0x02, 0x0a, 0xec, 0x02, 0x00, 0x5c, 0x01, 0x50, 0x76, 0x69,
+0x73, 0x69, 0x62, 0xc0, 0x00, 0x8f, 0x55, 0x6e, 0x6c, 0x69,
+0x6b, 0x65, 0x00, 0x63, 0x3c, 0x03, 0x05, 0x12, 0x2c, 0x89,
+0x04, 0x01, 0x6c, 0x00, 0xf0, 0x08, 0x70, 0x65, 0x72, 0x73,
+0x69, 0x73, 0x74, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65,
+0x6e, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1392;
-const unsigned short help_text_words = 250;
+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 c3d52b6220..1ba92291f3 100644
--- a/apps/plugins/puzzles/help/sixteen.c
+++ b/apps/plugins/puzzles/help/sixteen.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,194 +6,196 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 113, TEXT_UNDERLINE },
- { 187, TEXT_CENTER | C_RED },
- { 321, TEXT_CENTER | C_RED },
- { 339, TEXT_UNDERLINE },
- { 341, TEXT_UNDERLINE },
+ { 114, TEXT_UNDERLINE },
+ { 188, TEXT_CENTER | C_RED },
+ { 322, TEXT_CENTER | C_RED },
+ { 340, TEXT_UNDERLINE },
+ { 342, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2534 comp 1755 ratio 0.692581 level 6 saved 779 */
+/* orig 2553 comp 1763 ratio 0.69056 level 6 saved 790 */
 const char help_text[] = {
-0xf0, 0x3b, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x36, 0x3a, 0x20, 0x53, 0x69, 0x78, 0x74, 0x65, 0x65, 0x6e,
-0x20, 0x00, 0x00, 0x00, 0x41, 0x6e, 0x6f, 0x74, 0x68, 0x65,
-0x72, 0x00, 0x73, 0x6c, 0x69, 0x64, 0x69, 0x6e, 0x67, 0x00,
-0x74, 0x69, 0x6c, 0x65, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
-0x65, 0x2c, 0x00, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x6c,
-0x79, 0x00, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x00,
-0x74, 0x6f, 0x00, 0x46, 0x69, 0x66, 0x3c, 0x00, 0x72, 0x00,
-0x28, 0x73, 0x65, 0x65, 0x00, 0x63, 0x54, 0x00, 0xf0, 0x23,
-0x00, 0x35, 0x29, 0x00, 0x62, 0x75, 0x74, 0x00, 0x77, 0x69,
-0x74, 0x68, 0x00, 0x61, 0x00, 0x64, 0x69, 0x66, 0x66, 0x65,
-0x72, 0x65, 0x6e, 0x74, 0x00, 0x74, 0x79, 0x70, 0x65, 0x00,
-0x6f, 0x66, 0x00, 0x6d, 0x6f, 0x76, 0x65, 0x2e, 0x00, 0x54,
-0x68, 0x69, 0x73, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x2c, 0x00,
-0x74, 0x00, 0xf0, 0x10, 0x65, 0x00, 0x69, 0x73, 0x00, 0x6e,
-0x6f, 0x00, 0x68, 0x6f, 0x6c, 0x65, 0x3a, 0x00, 0x61, 0x6c,
-0x6c, 0x00, 0x31, 0x36, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72,
-0x65, 0x73, 0x00, 0x6f, 0x6e, 0x24, 0x00, 0xf4, 0x07, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-0x69, 0x6e, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x65,
-0x64, 0x25, 0x00, 0x61, 0x2e, 0x00, 0x59, 0x6f, 0x75, 0x72,
-0x5d, 0x00, 0x00, 0x4b, 0x00, 0xf0, 0x16, 0x74, 0x6f, 0x00,
-0x73, 0x68, 0x69, 0x66, 0x74, 0x00, 0x61, 0x6e, 0x00, 0x65,
-0x6e, 0x74, 0x69, 0x72, 0x65, 0x00, 0x72, 0x6f, 0x77, 0x00,
-0x6c, 0x65, 0x66, 0x74, 0x00, 0x6f, 0x72, 0x00, 0x72, 0x69,
-0x67, 0x68, 0x74, 0x2c, 0x0a, 0x00, 0x0c, 0x26, 0x00, 0x90,
-0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x00, 0x75, 0x70, 0x1d,
-0x00, 0xb1, 0x64, 0x6f, 0x77, 0x6e, 0x3b, 0x00, 0x65, 0x76,
-0x65, 0x72, 0x79, 0xac, 0x00, 0xc1, 0x00, 0x79, 0x6f, 0x75,
-0x00, 0x64, 0x6f, 0x00, 0x74, 0x68, 0x61, 0x74, 0xb8, 0x00,
-0x02, 0x23, 0x01, 0x00, 0x16, 0x00, 0x02, 0x48, 0x00, 0x36,
-0x6f, 0x66, 0x66, 0xab, 0x00, 0xd1, 0x72, 0x65, 0x2d, 0x61,
-0x70, 0x70, 0x65, 0x61, 0x72, 0x73, 0x00, 0x61, 0x74, 0x17,
-0x00, 0x02, 0x5f, 0x01, 0x52, 0x65, 0x6e, 0x64, 0x00, 0x6f,
-0x28, 0x00, 0x31, 0x73, 0x61, 0x6d, 0x99, 0x00, 0x32, 0x2c,
-0x00, 0x69, 0xe4, 0x00, 0x42, 0x73, 0x70, 0x61, 0x63, 0x51,
-0x00, 0xf5, 0x0e, 0x6a, 0x75, 0x73, 0x74, 0x00, 0x76, 0x61,
-0x63, 0x61, 0x74, 0x65, 0x64, 0x2e, 0x00, 0x54, 0x6f, 0x00,
-0x77, 0x69, 0x6e, 0x2c, 0x00, 0x61, 0x72, 0x72, 0x61, 0x6e,
-0x67, 0x65, 0x7c, 0x00, 0x60, 0x73, 0x00, 0x69, 0x6e, 0x74,
-0x6f, 0x0e, 0x01, 0xf4, 0x06, 0x65, 0x72, 0x69, 0x63, 0x61,
-0x6c, 0x00, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x00, 0x28, 0x31,
-0x2c, 0x32, 0x2c, 0x33, 0x2c, 0x34, 0x3b, 0x01, 0x32, 0x74,
-0x6f, 0x70, 0x67, 0x00, 0xb4, 0x31, 0x33, 0x2c, 0x31, 0x34,
-0x2c, 0x31, 0x35, 0x2c, 0x31, 0x36, 0x1c, 0x00, 0xd0, 0x62,
-0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x29, 0x2e, 0x00, 0x57, 0x68,
-0x65, 0x6e, 0x7b, 0x00, 0x84, 0x27, 0x76, 0x65, 0x00, 0x64,
-0x6f, 0x6e, 0x65, 0xe7, 0x00, 0x70, 0x72, 0x79, 0x00, 0x70,
-0x6c, 0x61, 0x79, 0x12, 0x02, 0x27, 0x6f, 0x6e, 0xd1, 0x01,
-0x30, 0x73, 0x69, 0x7a, 0x9d, 0x01, 0x11, 0x66, 0xee, 0x00,
-0x70, 0x2e, 0x00, 0x00, 0x00, 0x49, 0x00, 0x6d, 0x58, 0x01,
-0x30, 0x00, 0x68, 0x61, 0x85, 0x01, 0x90, 0x6e, 0x76, 0x65,
-0x6e, 0x74, 0x65, 0x64, 0x00, 0x74, 0xea, 0x01, 0x10, 0x67,
-0xe9, 0x00, 0x60, 0x6d, 0x79, 0x73, 0x65, 0x6c, 0x66, 0x39,
-0x01, 0xf0, 0x03, 0x6f, 0x75, 0x67, 0x68, 0x00, 0x6f, 0x6e,
-0x6c, 0x79, 0x00, 0x62, 0x79, 0x00, 0x61, 0x63, 0x63, 0x69,
-0x64, 0x51, 0x00, 0xf4, 0x03, 0x69, 0x66, 0x00, 0x73, 0x6f,
-0x00, 0x28, 0x61, 0x6e, 0x64, 0x00, 0x49, 0x27, 0x6d, 0x00,
-0x73, 0x75, 0x72, 0x33, 0x01, 0x64, 0x70, 0x65, 0x6f, 0x70,
-0x6c, 0x65, 0x59, 0x00, 0x50, 0x64, 0x65, 0x70, 0x65, 0x6e,
-0x32, 0x00, 0x26, 0x6c, 0x79, 0x67, 0x00, 0x63, 0x69, 0x74,
-0x29, 0x2e, 0x00, 0x49, 0x5c, 0x00, 0xe0, 0x74, 0x00, 0x49,
-0x00, 0x77, 0x61, 0x73, 0x00, 0x69, 0x6d, 0x69, 0x74, 0x61,
-0x74, 0xba, 0x00, 0xf1, 0x08, 0x61, 0x00, 0x73, 0x63, 0x72,
-0x65, 0x65, 0x6e, 0x73, 0x61, 0x76, 0x65, 0x72, 0x00, 0x49,
-0x27, 0x64, 0x00, 0x73, 0x65, 0x65, 0x6e, 0x2c, 0xab, 0x02,
-0x12, 0x49, 0x59, 0x00, 0x61, 0x61, 0x00, 0x66, 0x65, 0x65,
-0x6c, 0xf9, 0x02, 0x13, 0x68, 0xb1, 0x01, 0x08, 0x34, 0x00,
-0x02, 0xdc, 0x00, 0x32, 0x61, 0x63, 0x74, 0x07, 0x03, 0x01,
-0x33, 0x00, 0x10, 0x62, 0xfe, 0x02, 0x14, 0x61, 0x08, 0x03,
-0x11, 0x2d, 0xe3, 0x02, 0x02, 0x31, 0x03, 0x31, 0x00, 0x72,
-0x61, 0xba, 0x00, 0x42, 0x74, 0x68, 0x61, 0x6e, 0x03, 0x01,
-0x20, 0x73, 0x6c, 0x41, 0x00, 0x27, 0x6c, 0x79, 0x42, 0x01,
-0x82, 0x6b, 0x69, 0x6e, 0x64, 0x2e, 0x00, 0x53, 0x6f, 0x21,
-0x00, 0x02, 0x61, 0x00, 0x12, 0x62, 0xdd, 0x01, 0x02, 0x80,
-0x01, 0x00, 0x8d, 0x00, 0x54, 0x69, 0x6e, 0x00, 0x6d, 0x79,
-0x56, 0x00, 0xf2, 0x19, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63,
-0x74, 0x69, 0x6f, 0x6e, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68,
-0x00, 0x72, 0x65, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74,
-0x73, 0x00, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x69,
-0x74, 0x79, 0x00, 0x6f, 0x34, 0x00, 0x39, 0x61, 0x72, 0x74,
-0x88, 0x00, 0x01, 0x54, 0x02, 0xb0, 0x65, 0x6e, 0x67, 0x69,
-0x6e, 0x65, 0x65, 0x72, 0x69, 0x6e, 0x67, 0xb5, 0x01, 0x35,
-0x36, 0x2e, 0x31, 0x04, 0x04, 0x00, 0x5d, 0x03, 0x40, 0x72,
-0x6f, 0x6c, 0x73, 0x0d, 0x04, 0xa3, 0x4c, 0x65, 0x66, 0x74,
-0x2d, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xf9, 0x01, 0x20, 0x61,
-0x6e, 0x7e, 0x02, 0x72, 0x6f, 0x77, 0x00, 0x77, 0x69, 0x6c,
-0x6c, 0x69, 0x03, 0x00, 0xa9, 0x00, 0xa2, 0x61, 0x70, 0x70,
-0x72, 0x6f, 0x70, 0x72, 0x69, 0x61, 0x74, 0x63, 0x03, 0x24,
-0x6f, 0x72, 0x44, 0x03, 0x03, 0xd3, 0x02, 0x33, 0x64, 0x69,
-0x72, 0xb2, 0x00, 0x43, 0x69, 0x6e, 0x64, 0x69, 0xd0, 0x02,
-0x10, 0x52, 0xec, 0x00, 0x06, 0x5f, 0x00, 0x06, 0x53, 0x00,
-0x24, 0x69, 0x74, 0x38, 0x00, 0x77, 0x6f, 0x70, 0x70, 0x6f,
-0x73, 0x69, 0x74, 0x41, 0x00, 0x00, 0xaf, 0x00, 0x60, 0x41,
-0x6c, 0x74, 0x65, 0x72, 0x6e, 0xe8, 0x00, 0x72, 0x65, 0x6c,
-0x79, 0x2c, 0x00, 0x75, 0x73, 0x86, 0x00, 0xa1, 0x63, 0x75,
-0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0xfc, 0x03,
-0x05, 0x9e, 0x00, 0x01, 0x43, 0x00, 0x07, 0x7c, 0x00, 0x91,
-0x6f, 0x72, 0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1e,
-0x00, 0x31, 0x65, 0x64, 0x67, 0x93, 0x04, 0x04, 0xb3, 0x03,
-0x20, 0x2c, 0x00, 0x7c, 0x02, 0x04, 0x54, 0x00, 0x60, 0x72,
-0x65, 0x74, 0x75, 0x72, 0x6e, 0x54, 0x00, 0x09, 0x53, 0x00,
-0x4f, 0x72, 0x6f, 0x77, 0x2f, 0xe2, 0x00, 0x10, 0x10, 0x00,
-0x91, 0x04, 0x20, 0x00, 0x63, 0x36, 0x01, 0x27, 0x6c, 0x73,
-0x3f, 0x00, 0x02, 0xb6, 0x03, 0x02, 0x33, 0x00, 0x79, 0x6c,
-0x79, 0x2e, 0x00, 0x4d, 0x6f, 0x76, 0xc3, 0x00, 0x10, 0x6f,
-0xd0, 0x03, 0x11, 0x61, 0x27, 0x00, 0x10, 0x2c, 0x0f, 0x05,
-0x32, 0x64, 0x00, 0x43, 0x96, 0x01, 0x01, 0x9c, 0x00, 0x00,
-0xed, 0x01, 0x16, 0x73, 0x8b, 0x01, 0x0c, 0x9c, 0x00, 0x01,
-0x8f, 0x04, 0x20, 0x75, 0x6e, 0x03, 0x04, 0x07, 0x53, 0x00,
-0x00, 0x39, 0x00, 0x1b, 0x6d, 0x67, 0x00, 0x52, 0x61, 0x6c,
-0x6f, 0x6e, 0x67, 0xa5, 0x05, 0x04, 0x39, 0x00, 0x43, 0x2e,
-0x00, 0x4f, 0x72, 0x73, 0x00, 0x11, 0x53, 0xce, 0x04, 0x04,
-0x5a, 0x00, 0x01, 0xa9, 0x03, 0x06, 0x26, 0x00, 0x10, 0x50,
-0x84, 0x00, 0x00, 0xb6, 0x01, 0x20, 0x45, 0x6e, 0xf0, 0x05,
-0x91, 0x73, 0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x73,
-0x3b, 0x00, 0x00, 0x18, 0x00, 0x00, 0x37, 0x05, 0x05, 0xb6,
-0x00, 0x12, 0x28, 0xb3, 0x00, 0x02, 0x2c, 0x00, 0x20, 0x61,
-0x67, 0xbc, 0x05, 0xc0, 0x74, 0x6f, 0x00, 0x72, 0x65, 0x6c,
-0x65, 0x61, 0x73, 0x65, 0x29, 0x2c, 0xc7, 0x02, 0x00, 0x66,
-0x06, 0x04, 0x54, 0x00, 0x11, 0x53, 0x01, 0x05, 0x0f, 0x54,
-0x00, 0x04, 0x01, 0x65, 0x05, 0x00, 0x5b, 0x01, 0x42, 0x28,
-0x41, 0x6c, 0x6c, 0x7e, 0x02, 0x01, 0x78, 0x01, 0x90, 0x73,
-0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x08, 0x04,
-0x33, 0x6e, 0x00, 0x73, 0x8e, 0x01, 0x72, 0x32, 0x2e, 0x31,
-0x00, 0x61, 0x72, 0x65, 0x81, 0x01, 0xb1, 0x61, 0x76, 0x61,
-0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0xf6, 0x02,
-0x15, 0x32, 0xf6, 0x02, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d,
-0x65, 0x74, 0x65, 0x72, 0xf8, 0x02, 0x10, 0x54, 0x36, 0x02,
-0x05, 0x12, 0x00, 0x06, 0x37, 0x00, 0x51, 0x00, 0x66, 0x72,
-0x6f, 0x6d, 0x74, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74,
-0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6a,
-0x00, 0x03, 0x4b, 0x05, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65,
-0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x79, 0x00, 0xb1, 0x3a,
-0x00, 0x00, 0x00, 0x2d, 0x00, 0x57, 0x69, 0x64, 0x74, 0x68,
-0x84, 0x01, 0x22, 0x48, 0x65, 0x77, 0x06, 0x02, 0xba, 0x03,
-0x00, 0x9a, 0x00, 0x00, 0x10, 0x05, 0x70, 0x2d, 0x65, 0x78,
-0x70, 0x6c, 0x61, 0x6e, 0x9c, 0x02, 0x21, 0x79, 0x2e, 0x32,
-0x00, 0x05, 0x39, 0x02, 0x40, 0x73, 0x6b, 0x00, 0x66, 0xac,
-0x01, 0x20, 0x00, 0x6c, 0xc9, 0x04, 0x00, 0xed, 0x06, 0x41,
-0x68, 0x75, 0x66, 0x66, 0xa3, 0x04, 0x51, 0x6f, 0x70, 0x65,
-0x72, 0x61, 0x7c, 0x00, 0x20, 0x74, 0x6f, 0x34, 0x04, 0x98,
-0x70, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x6d, 0x65, 0x64, 0x2e,
-0x07, 0xe3, 0x2e, 0x00, 0x42, 0x79, 0x00, 0x64, 0x65, 0x66,
-0x61, 0x75, 0x6c, 0x74, 0x2c, 0x00, 0xf0, 0x00, 0x02, 0x6d,
-0x03, 0x02, 0x4a, 0x00, 0x16, 0x65, 0xae, 0x06, 0x00, 0x38,
-0x01, 0x10, 0x75, 0x97, 0x00, 0x42, 0x00, 0x77, 0x61, 0x79,
-0x02, 0x05, 0x34, 0x61, 0x6e, 0x79, 0x71, 0x06, 0x11, 0x6d,
-0xa0, 0x05, 0xf1, 0x00, 0x73, 0x00, 0x61, 0x62, 0x6f, 0x75,
-0x74, 0x00, 0x61, 0x73, 0x00, 0x70, 0x72, 0x6f, 0x62, 0x17,
-0x01, 0x21, 0x61, 0x73, 0x28, 0x00, 0x01, 0xa8, 0x05, 0x15,
-0x2e, 0xbb, 0x00, 0x82, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69,
-0x64, 0x65, 0xda, 0x04, 0x93, 0x62, 0x79, 0x00, 0x72, 0x65,
-0x71, 0x75, 0x65, 0x73, 0x8b, 0x05, 0x73, 0x70, 0x72, 0x65,
-0x63, 0x69, 0x73, 0x65, 0xc5, 0x07, 0x00, 0x82, 0x03, 0x06,
-0xd9, 0x00, 0x00, 0x72, 0x02, 0x1c, 0x73, 0xd5, 0x00, 0x71,
-0x2e, 0x00, 0x54, 0x79, 0x70, 0x69, 0x63, 0x79, 0x05, 0x10,
-0x79, 0xe8, 0x07, 0x31, 0x61, 0x69, 0x6d, 0xe7, 0x07, 0x21,
-0x68, 0x65, 0x01, 0x01, 0x10, 0x64, 0xad, 0x01, 0x33, 0x6d,
-0x69, 0x6e, 0xf5, 0x03, 0x03, 0x5f, 0x00, 0x3f, 0x73, 0x65,
-0x74, 0x5c, 0x00, 0x01, 0x00, 0x8b, 0x01, 0x00, 0x37, 0x06,
-0x11, 0x72, 0xe4, 0x05, 0x50, 0x6d, 0x00, 0x65, 0x78, 0x61,
-0x8b, 0x03, 0x32, 0x2c, 0x00, 0x73, 0xda, 0x07, 0x01, 0x7f,
-0x07, 0x40, 0x61, 0x6e, 0x73, 0x77, 0x49, 0x07, 0x40, 0x73,
-0x61, 0x79, 0x29, 0x1a, 0x06, 0x41, 0x6f, 0x75, 0x72, 0x2d,
-0x0d, 0x03, 0x04, 0x39, 0x01, 0x03, 0xe0, 0x08, 0x07, 0x19,
-0x00, 0x32, 0x6f, 0x6c, 0x75, 0xa6, 0x04, 0x46, 0x4e, 0x6f,
-0x74, 0x65, 0x44, 0x06, 0x43, 0x6d, 0x6f, 0x72, 0x65, 0x7a,
-0x00, 0x01, 0x59, 0x00, 0x02, 0xd5, 0x01, 0x16, 0x2c, 0x1c,
-0x00, 0x40, 0x6c, 0x69, 0x6b, 0x65, 0xca, 0x06, 0x12, 0x74,
-0xd2, 0x00, 0x25, 0x61, 0x74, 0x4b, 0x00, 0x76, 0x73, 0x00,
-0x73, 0x68, 0x6f, 0x72, 0x74, 0x47, 0x06, 0xf2, 0x00, 0x65,
-0x00, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x00, 0x6c, 0x65,
-0x6e, 0x67, 0x74, 0x68, 0xcb, 0x01, 0x01, 0xa6, 0x04, 0x00,
-0x97, 0x01, 0x03, 0x35, 0x01, 0x90, 0x6f, 0x73, 0x73, 0x69,
-0x62, 0x6c, 0x65, 0x2e, 0x00,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x28, 0x00, 0x00, 0x00,
+0x41, 0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x00, 0x73, 0x6c,
+0x69, 0x64, 0x69, 0x6e, 0x67, 0x00, 0x74, 0x69, 0x6c, 0x65,
+0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x00, 0x76,
+0x69, 0x73, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x69,
+0x6d, 0x69, 0x6c, 0x61, 0x72, 0x00, 0x74, 0x6f, 0x00, 0x46,
+0x69, 0x66, 0x4f, 0x00, 0x72, 0x00, 0x28, 0x73, 0x65, 0x65,
+0x00, 0x63, 0x67, 0x00, 0xf0, 0x23, 0x00, 0x35, 0x29, 0x00,
+0x62, 0x75, 0x74, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x61,
+0x00, 0x64, 0x69, 0x66, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x74,
+0x00, 0x74, 0x79, 0x70, 0x65, 0x00, 0x6f, 0x66, 0x00, 0x6d,
+0x6f, 0x76, 0x65, 0x2e, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00,
+0x74, 0x69, 0x6d, 0x65, 0x2c, 0x00, 0x74, 0x00, 0xf0, 0x10,
+0x65, 0x00, 0x69, 0x73, 0x00, 0x6e, 0x6f, 0x00, 0x68, 0x6f,
+0x6c, 0x65, 0x3a, 0x00, 0x61, 0x6c, 0x6c, 0x00, 0x31, 0x36,
+0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x00, 0x6f,
+0x6e, 0x24, 0x00, 0xf4, 0x07, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x6e,
+0x75, 0x6d, 0x62, 0x65, 0x72, 0x65, 0x64, 0x25, 0x00, 0x61,
+0x2e, 0x00, 0x59, 0x6f, 0x75, 0x72, 0x5d, 0x00, 0x00, 0x4b,
+0x00, 0xf0, 0x16, 0x74, 0x6f, 0x00, 0x73, 0x68, 0x69, 0x66,
+0x74, 0x00, 0x61, 0x6e, 0x00, 0x65, 0x6e, 0x74, 0x69, 0x72,
+0x65, 0x00, 0x72, 0x6f, 0x77, 0x00, 0x6c, 0x65, 0x66, 0x74,
+0x00, 0x6f, 0x72, 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2c,
+0x0a, 0x00, 0x0c, 0x26, 0x00, 0x90, 0x63, 0x6f, 0x6c, 0x75,
+0x6d, 0x6e, 0x00, 0x75, 0x70, 0x1d, 0x00, 0xb1, 0x64, 0x6f,
+0x77, 0x6e, 0x3b, 0x00, 0x65, 0x76, 0x65, 0x72, 0x79, 0xac,
+0x00, 0xc1, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x64, 0x6f, 0x00,
+0x74, 0x68, 0x61, 0x74, 0xb8, 0x00, 0x02, 0x23, 0x01, 0x00,
+0x16, 0x00, 0x02, 0x48, 0x00, 0x36, 0x6f, 0x66, 0x66, 0xab,
+0x00, 0xd1, 0x72, 0x65, 0x2d, 0x61, 0x70, 0x70, 0x65, 0x61,
+0x72, 0x73, 0x00, 0x61, 0x74, 0x17, 0x00, 0x02, 0x5f, 0x01,
+0x52, 0x65, 0x6e, 0x64, 0x00, 0x6f, 0x28, 0x00, 0x31, 0x73,
+0x61, 0x6d, 0x99, 0x00, 0x32, 0x2c, 0x00, 0x69, 0xe4, 0x00,
+0x42, 0x73, 0x70, 0x61, 0x63, 0x51, 0x00, 0xf5, 0x0e, 0x6a,
+0x75, 0x73, 0x74, 0x00, 0x76, 0x61, 0x63, 0x61, 0x74, 0x65,
+0x64, 0x2e, 0x00, 0x54, 0x6f, 0x00, 0x77, 0x69, 0x6e, 0x2c,
+0x00, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x7c, 0x00,
+0x60, 0x73, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x0e, 0x01, 0xf4,
+0x06, 0x65, 0x72, 0x69, 0x63, 0x61, 0x6c, 0x00, 0x6f, 0x72,
+0x64, 0x65, 0x72, 0x00, 0x28, 0x31, 0x2c, 0x32, 0x2c, 0x33,
+0x2c, 0x34, 0x3b, 0x01, 0x32, 0x74, 0x6f, 0x70, 0x67, 0x00,
+0xb4, 0x31, 0x33, 0x2c, 0x31, 0x34, 0x2c, 0x31, 0x35, 0x2c,
+0x31, 0x36, 0x1c, 0x00, 0xd0, 0x62, 0x6f, 0x74, 0x74, 0x6f,
+0x6d, 0x29, 0x2e, 0x00, 0x57, 0x68, 0x65, 0x6e, 0x7b, 0x00,
+0x84, 0x27, 0x76, 0x65, 0x00, 0x64, 0x6f, 0x6e, 0x65, 0xe7,
+0x00, 0x70, 0x72, 0x79, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x12,
+0x02, 0x27, 0x6f, 0x6e, 0xd1, 0x01, 0x30, 0x73, 0x69, 0x7a,
+0x9d, 0x01, 0x11, 0x66, 0xee, 0x00, 0x70, 0x2e, 0x00, 0x00,
+0x00, 0x49, 0x00, 0x6d, 0x58, 0x01, 0x30, 0x00, 0x68, 0x61,
+0x85, 0x01, 0x90, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x65, 0x64,
+0x00, 0x74, 0xea, 0x01, 0x10, 0x67, 0xe9, 0x00, 0x60, 0x6d,
+0x79, 0x73, 0x65, 0x6c, 0x66, 0x39, 0x01, 0xf0, 0x03, 0x6f,
+0x75, 0x67, 0x68, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x62,
+0x79, 0x00, 0x61, 0x63, 0x63, 0x69, 0x64, 0x51, 0x00, 0xf4,
+0x03, 0x69, 0x66, 0x00, 0x73, 0x6f, 0x00, 0x28, 0x61, 0x6e,
+0x64, 0x00, 0x49, 0x27, 0x6d, 0x00, 0x73, 0x75, 0x72, 0x33,
+0x01, 0x64, 0x70, 0x65, 0x6f, 0x70, 0x6c, 0x65, 0x59, 0x00,
+0x50, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x32, 0x00, 0x26, 0x6c,
+0x79, 0x67, 0x00, 0x63, 0x69, 0x74, 0x29, 0x2e, 0x00, 0x49,
+0x5c, 0x00, 0xe0, 0x74, 0x00, 0x49, 0x00, 0x77, 0x61, 0x73,
+0x00, 0x69, 0x6d, 0x69, 0x74, 0x61, 0x74, 0xba, 0x00, 0xf1,
+0x08, 0x61, 0x00, 0x73, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x73,
+0x61, 0x76, 0x65, 0x72, 0x00, 0x49, 0x27, 0x64, 0x00, 0x73,
+0x65, 0x65, 0x6e, 0x2c, 0xab, 0x02, 0x12, 0x49, 0x59, 0x00,
+0x61, 0x61, 0x00, 0x66, 0x65, 0x65, 0x6c, 0xf9, 0x02, 0x13,
+0x68, 0xb1, 0x01, 0x08, 0x34, 0x00, 0x02, 0xdc, 0x00, 0x32,
+0x61, 0x63, 0x74, 0x07, 0x03, 0x01, 0x33, 0x00, 0x10, 0x62,
+0xfe, 0x02, 0x14, 0x61, 0x08, 0x03, 0x11, 0x2d, 0xe3, 0x02,
+0x02, 0x31, 0x03, 0x31, 0x00, 0x72, 0x61, 0xba, 0x00, 0x42,
+0x74, 0x68, 0x61, 0x6e, 0x03, 0x01, 0x20, 0x73, 0x6c, 0x41,
+0x00, 0x27, 0x6c, 0x79, 0x42, 0x01, 0x82, 0x6b, 0x69, 0x6e,
+0x64, 0x2e, 0x00, 0x53, 0x6f, 0x21, 0x00, 0x02, 0x61, 0x00,
+0x12, 0x62, 0xdd, 0x01, 0x02, 0x80, 0x01, 0x00, 0x8d, 0x00,
+0x54, 0x69, 0x6e, 0x00, 0x6d, 0x79, 0x56, 0x00, 0xf2, 0x19,
+0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x72, 0x65, 0x70,
+0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x73, 0x00, 0x63, 0x72,
+0x65, 0x61, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x00, 0x6f,
+0x34, 0x00, 0x39, 0x61, 0x72, 0x74, 0x88, 0x00, 0x01, 0x54,
+0x02, 0xb0, 0x65, 0x6e, 0x67, 0x69, 0x6e, 0x65, 0x65, 0x72,
+0x69, 0x6e, 0x67, 0xb5, 0x01, 0x35, 0x36, 0x2e, 0x31, 0x17,
+0x04, 0x00, 0x5d, 0x03, 0xf3, 0x03, 0x72, 0x6f, 0x6c, 0x73,
+0x20, 0x00, 0x00, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63,
+0x6c, 0x69, 0x63, 0x6b, 0xf9, 0x01, 0x20, 0x61, 0x6e, 0x7e,
+0x02, 0x72, 0x6f, 0x77, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x69,
+0x03, 0x00, 0xa9, 0x00, 0xa2, 0x61, 0x70, 0x70, 0x72, 0x6f,
+0x70, 0x72, 0x69, 0x61, 0x74, 0x63, 0x03, 0x24, 0x6f, 0x72,
+0x44, 0x03, 0x03, 0xd3, 0x02, 0x33, 0x64, 0x69, 0x72, 0xb2,
+0x00, 0x43, 0x69, 0x6e, 0x64, 0x69, 0xd0, 0x02, 0x10, 0x52,
+0xec, 0x00, 0x06, 0x5f, 0x00, 0x06, 0x53, 0x00, 0x24, 0x69,
+0x74, 0x38, 0x00, 0x77, 0x6f, 0x70, 0x70, 0x6f, 0x73, 0x69,
+0x74, 0x41, 0x00, 0x00, 0xaf, 0x00, 0x60, 0x41, 0x6c, 0x74,
+0x65, 0x72, 0x6e, 0xe8, 0x00, 0x72, 0x65, 0x6c, 0x79, 0x2c,
+0x00, 0x75, 0x73, 0x86, 0x00, 0xa1, 0x63, 0x75, 0x72, 0x73,
+0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0xfc, 0x03, 0x05, 0x9e,
+0x00, 0x01, 0x43, 0x00, 0x07, 0x7c, 0x00, 0x91, 0x6f, 0x72,
+0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1e, 0x00, 0x31,
+0x65, 0x64, 0x67, 0x93, 0x04, 0x04, 0xb3, 0x03, 0x20, 0x2c,
+0x00, 0x7c, 0x02, 0x04, 0x54, 0x00, 0x60, 0x72, 0x65, 0x74,
+0x75, 0x72, 0x6e, 0x54, 0x00, 0x09, 0x53, 0x00, 0x4f, 0x72,
+0x6f, 0x77, 0x2f, 0xe2, 0x00, 0x10, 0x10, 0x00, 0x91, 0x04,
+0x20, 0x00, 0x63, 0x36, 0x01, 0x27, 0x6c, 0x73, 0x3f, 0x00,
+0x02, 0xb6, 0x03, 0x02, 0x33, 0x00, 0x79, 0x6c, 0x79, 0x2e,
+0x00, 0x4d, 0x6f, 0x76, 0xc3, 0x00, 0x10, 0x6f, 0xd0, 0x03,
+0x11, 0x61, 0x27, 0x00, 0x10, 0x2c, 0x0f, 0x05, 0x32, 0x64,
+0x00, 0x43, 0x96, 0x01, 0x01, 0x9c, 0x00, 0x00, 0xed, 0x01,
+0x16, 0x73, 0x8b, 0x01, 0x0c, 0x9c, 0x00, 0x01, 0x8f, 0x04,
+0x20, 0x75, 0x6e, 0x03, 0x04, 0x07, 0x53, 0x00, 0x00, 0x39,
+0x00, 0x1b, 0x6d, 0x67, 0x00, 0x52, 0x61, 0x6c, 0x6f, 0x6e,
+0x67, 0xa5, 0x05, 0x04, 0x39, 0x00, 0x43, 0x2e, 0x00, 0x4f,
+0x72, 0x73, 0x00, 0x11, 0x53, 0xce, 0x04, 0x04, 0x5a, 0x00,
+0x01, 0xa9, 0x03, 0x06, 0x26, 0x00, 0x10, 0x50, 0x84, 0x00,
+0x00, 0xb6, 0x01, 0x20, 0x45, 0x6e, 0xf0, 0x05, 0x91, 0x73,
+0x69, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x73, 0x3b, 0x00,
+0x00, 0x18, 0x00, 0x00, 0x37, 0x05, 0x05, 0xb6, 0x00, 0x12,
+0x28, 0xb3, 0x00, 0x02, 0x2c, 0x00, 0x20, 0x61, 0x67, 0xbc,
+0x05, 0xc0, 0x74, 0x6f, 0x00, 0x72, 0x65, 0x6c, 0x65, 0x61,
+0x73, 0x65, 0x29, 0x2c, 0xc7, 0x02, 0x00, 0x66, 0x06, 0x04,
+0x54, 0x00, 0x11, 0x53, 0x01, 0x05, 0x0f, 0x54, 0x00, 0x04,
+0x01, 0x65, 0x05, 0x00, 0x5b, 0x01, 0x42, 0x28, 0x41, 0x6c,
+0x6c, 0x7e, 0x02, 0x01, 0x78, 0x01, 0x90, 0x73, 0x00, 0x64,
+0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x08, 0x04, 0x33, 0x6e,
+0x00, 0x73, 0x8e, 0x01, 0x72, 0x32, 0x2e, 0x31, 0x00, 0x61,
+0x72, 0x65, 0x81, 0x01, 0xb1, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0xf6, 0x02, 0x15, 0x32,
+0xf6, 0x02, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0xf8, 0x02, 0x10, 0x54, 0x36, 0x02, 0x05, 0x12,
+0x00, 0x06, 0x37, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d,
+0x74, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6a, 0x00, 0x03,
+0x4b, 0x05, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
+0x6d, 0x65, 0x6e, 0x75, 0x79, 0x00, 0xb1, 0x3a, 0x00, 0x00,
+0x00, 0x2d, 0x00, 0x57, 0x69, 0x64, 0x74, 0x68, 0x84, 0x01,
+0x22, 0x48, 0x65, 0x77, 0x06, 0x02, 0xba, 0x03, 0x00, 0x9a,
+0x00, 0x00, 0x10, 0x05, 0x70, 0x2d, 0x65, 0x78, 0x70, 0x6c,
+0x61, 0x6e, 0x9c, 0x02, 0x21, 0x79, 0x2e, 0x32, 0x00, 0x05,
+0x39, 0x02, 0x40, 0x73, 0x6b, 0x00, 0x66, 0xac, 0x01, 0x20,
+0x00, 0x6c, 0xc9, 0x04, 0x00, 0xed, 0x06, 0x41, 0x68, 0x75,
+0x66, 0x66, 0xa3, 0x04, 0x51, 0x6f, 0x70, 0x65, 0x72, 0x61,
+0x7c, 0x00, 0x20, 0x74, 0x6f, 0x34, 0x04, 0x98, 0x70, 0x65,
+0x72, 0x66, 0x6f, 0x72, 0x6d, 0x65, 0x64, 0x2e, 0x07, 0xe3,
+0x2e, 0x00, 0x42, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61, 0x75,
+0x6c, 0x74, 0x2c, 0x00, 0xf0, 0x00, 0x02, 0x6d, 0x03, 0x02,
+0x4a, 0x00, 0x16, 0x65, 0xae, 0x06, 0x00, 0x38, 0x01, 0x10,
+0x75, 0x97, 0x00, 0x42, 0x00, 0x77, 0x61, 0x79, 0x02, 0x05,
+0x34, 0x61, 0x6e, 0x79, 0x71, 0x06, 0x11, 0x6d, 0xa0, 0x05,
+0xf1, 0x00, 0x73, 0x00, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x00,
+0x61, 0x73, 0x00, 0x70, 0x72, 0x6f, 0x62, 0x17, 0x01, 0x21,
+0x61, 0x73, 0x28, 0x00, 0x01, 0xa8, 0x05, 0x15, 0x2e, 0xbb,
+0x00, 0x82, 0x6f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65,
+0xda, 0x04, 0x93, 0x62, 0x79, 0x00, 0x72, 0x65, 0x71, 0x75,
+0x65, 0x73, 0x8b, 0x05, 0x73, 0x70, 0x72, 0x65, 0x63, 0x69,
+0x73, 0x65, 0xc5, 0x07, 0x00, 0x82, 0x03, 0x06, 0xd9, 0x00,
+0x00, 0x72, 0x02, 0x1c, 0x73, 0xd5, 0x00, 0x71, 0x2e, 0x00,
+0x54, 0x79, 0x70, 0x69, 0x63, 0x79, 0x05, 0x10, 0x79, 0xe8,
+0x07, 0x31, 0x61, 0x69, 0x6d, 0xe7, 0x07, 0x21, 0x68, 0x65,
+0x01, 0x01, 0x10, 0x64, 0xad, 0x01, 0x33, 0x6d, 0x69, 0x6e,
+0xf5, 0x03, 0x03, 0x5f, 0x00, 0x3f, 0x73, 0x65, 0x74, 0x5c,
+0x00, 0x01, 0x00, 0x8b, 0x01, 0x00, 0x37, 0x06, 0x11, 0x72,
+0xe4, 0x05, 0x50, 0x6d, 0x00, 0x65, 0x78, 0x61, 0x8b, 0x03,
+0x32, 0x2c, 0x00, 0x73, 0xda, 0x07, 0x01, 0x7f, 0x07, 0x40,
+0x61, 0x6e, 0x73, 0x77, 0x49, 0x07, 0x40, 0x73, 0x61, 0x79,
+0x29, 0x1a, 0x06, 0x41, 0x6f, 0x75, 0x72, 0x2d, 0x0d, 0x03,
+0x04, 0x39, 0x01, 0x03, 0xe0, 0x08, 0x07, 0x19, 0x00, 0x32,
+0x6f, 0x6c, 0x75, 0xa6, 0x04, 0x46, 0x4e, 0x6f, 0x74, 0x65,
+0x44, 0x06, 0x43, 0x6d, 0x6f, 0x72, 0x65, 0x7a, 0x00, 0x01,
+0x59, 0x00, 0x02, 0xd5, 0x01, 0x16, 0x2c, 0x1c, 0x00, 0x40,
+0x6c, 0x69, 0x6b, 0x65, 0xca, 0x06, 0x12, 0x74, 0xd2, 0x00,
+0x25, 0x61, 0x74, 0x4b, 0x00, 0x76, 0x73, 0x00, 0x73, 0x68,
+0x6f, 0x72, 0x74, 0x47, 0x06, 0xf2, 0x00, 0x65, 0x00, 0x74,
+0x61, 0x72, 0x67, 0x65, 0x74, 0x00, 0x6c, 0x65, 0x6e, 0x67,
+0x74, 0x68, 0xcb, 0x01, 0x01, 0xa6, 0x04, 0x00, 0x97, 0x01,
+0x03, 0x35, 0x01, 0x90, 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c,
+0x65, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2534;
-const unsigned short help_text_words = 453;
+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 ad4363825e..7c24a1bac3 100644
--- a/apps/plugins/puzzles/help/slant.c
+++ b/apps/plugins/puzzles/help/slant.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,184 +6,198 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 125, TEXT_CENTER | C_RED },
- { 328, TEXT_CENTER | C_RED },
- { 345, TEXT_UNDERLINE },
+ { 126, TEXT_CENTER | C_RED },
+ { 329, TEXT_CENTER | C_RED },
  { 346, TEXT_UNDERLINE },
- { 356, TEXT_UNDERLINE },
- { 379, TEXT_UNDERLINE },
+ { 347, TEXT_UNDERLINE },
+ { 357, TEXT_UNDERLINE },
+ { 380, TEXT_UNDERLINE },
+ { 447, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 2378 comp 1650 ratio 0.69386 level 10 saved 728 */
+/* orig 2582 comp 1767 ratio 0.684353 level 10 saved 815 */
 const char help_text[] = {
-0xf0, 0x21, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x30, 0x3a, 0x20, 0x53, 0x6c, 0x61, 0x6e, 0x74, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
-0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
-0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2e,
-0x1c, 0x00, 0xf3, 0x1e, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00,
-0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x64, 0x72, 0x61, 0x77,
-0x00, 0x61, 0x00, 0x64, 0x69, 0x61, 0x67, 0x6f, 0x6e, 0x61,
-0x6c, 0x00, 0x6c, 0x69, 0x6e, 0x65, 0x00, 0x74, 0x68, 0x72,
-0x6f, 0x75, 0x67, 0x68, 0x00, 0x65, 0x61, 0x63, 0x68, 0x3a,
-0x00, 0xf2, 0x07, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x63,
-0x68, 0x6f, 0x6f, 0x73, 0x65, 0x00, 0x77, 0x68, 0x69, 0x63,
-0x68, 0x00, 0x77, 0x61, 0x79, 0x22, 0x00, 0x01, 0x34, 0x00,
-0x10, 0x73, 0x7d, 0x00, 0xfa, 0x24, 0x73, 0x00, 0x73, 0x6f,
-0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x74, 0x68, 0x65, 0x00,
-0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x69, 0x6e, 0x67, 0x00,
-0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-0x00, 0x61, 0x72, 0x65, 0x00, 0x6d, 0x65, 0x74, 0x3a, 0x00,
-0x00, 0x00, 0x2d, 0x00, 0x54, 0x68, 0x65, 0x7b, 0x00, 0xf1,
-0x05, 0x73, 0x00, 0x6e, 0x65, 0x76, 0x65, 0x72, 0x00, 0x66,
-0x6f, 0x72, 0x6d, 0x00, 0x61, 0x00, 0x6c, 0x6f, 0x6f, 0x70,
-0x2e, 0x2a, 0x00, 0xf2, 0x1e, 0x41, 0x6e, 0x79, 0x00, 0x70,
-0x6f, 0x69, 0x6e, 0x74, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00,
-0x61, 0x00, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x64, 0x00,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x68, 0x61, 0x73,
-0x00, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x65, 0x6c, 0x79,
-0x83, 0x00, 0x43, 0x6d, 0x61, 0x6e, 0x79, 0x55, 0x00, 0x40,
-0x6d, 0x65, 0x65, 0x74, 0x88, 0x00, 0xf1, 0x02, 0x61, 0x74,
-0x00, 0x69, 0x74, 0x2e, 0x00, 0x28, 0x54, 0x68, 0x75, 0x73,
-0x2c, 0x00, 0x61, 0x00, 0x34, 0x06, 0x01, 0x90, 0x68, 0x65,
-0x00, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x29, 0x01, 0xfe,
-0x0e, 0x61, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x00, 0x73,
-0x68, 0x61, 0x70, 0x65, 0x2c, 0x00, 0x77, 0x68, 0x65, 0x72,
-0x65, 0x61, 0x73, 0x00, 0x61, 0x00, 0x7a, 0x65, 0x72, 0x6f,
-0x2f, 0x00, 0x01, 0x3b, 0x01, 0x42, 0x6d, 0x6f, 0x6e, 0x64,
-0x31, 0x00, 0xc0, 0x00, 0x2d, 0x00, 0x6f, 0x72, 0x00, 0x72,
-0x61, 0x74, 0x68, 0x65, 0x72, 0x61, 0x00, 0x7a, 0x70, 0x61,
-0x72, 0x74, 0x69, 0x61, 0x6c, 0x25, 0x00, 0x94, 0x2c, 0x00,
-0x62, 0x65, 0x63, 0x61, 0x75, 0x73, 0x65, 0x56, 0x00, 0x33,
-0x63, 0x61, 0x6e, 0xf8, 0x00, 0x91, 0x61, 0x70, 0x70, 0x65,
-0x61, 0x72, 0x00, 0x69, 0x6e, 0x67, 0x00, 0x51, 0x6d, 0x69,
-0x64, 0x64, 0x6c, 0x67, 0x00, 0x00, 0x0e, 0x00, 0x01, 0xcb,
-0x01, 0x04, 0x3a, 0x00, 0x01, 0xe2, 0x00, 0xe0, 0x77, 0x6f,
-0x75, 0x6c, 0x64, 0x00, 0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69,
-0x61, 0x74, 0xf9, 0x00, 0x04, 0x57, 0x00, 0x01, 0x39, 0x01,
-0xa0, 0x29, 0x00, 0x00, 0x00, 0x43, 0x72, 0x65, 0x64, 0x69,
-0x74, 0x50, 0x01, 0xf1, 0x01, 0x00, 0x74, 0x68, 0x69, 0x73,
-0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f,
-0x65, 0xff, 0x01, 0xa0, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69,
-0x00, 0x5b, 0x38, 0x5d, 0x67, 0x01, 0xf1, 0x01, 0x5b, 0x38,
-0x5d, 0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77,
-0x77, 0x77, 0x2e, 0x6e, 0x1d, 0x00, 0xa2, 0x2e, 0x63, 0x6f,
-0x2e, 0x6a, 0x70, 0x2f, 0x6a, 0x61, 0x2f, 0x3c, 0x00, 0xf0,
-0x0e, 0x73, 0x2f, 0x67, 0x6f, 0x6b, 0x69, 0x67, 0x65, 0x6e,
-0x5f, 0x6e, 0x61, 0x6e, 0x61, 0x6d, 0x65, 0x00, 0x28, 0x69,
-0x6e, 0x00, 0x4a, 0x61, 0x70, 0x61, 0x6e, 0x65, 0x73, 0x65,
-0x73, 0x00, 0x43, 0x32, 0x30, 0x2e, 0x31, 0x8c, 0x02, 0x80,
-0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x95, 0x02,
-0xa0, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63,
-0x6b, 0x8a, 0x01, 0xa3, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x62,
-0x6c, 0x61, 0x6e, 0x6b, 0x61, 0x02, 0xa0, 0x00, 0x77, 0x69,
-0x6c, 0x6c, 0x00, 0x70, 0x6c, 0x61, 0x63, 0xc0, 0x00, 0x10,
-0x5c, 0x21, 0x00, 0x52, 0x69, 0x74, 0x00, 0x28, 0x61, 0x5e,
+0x00, 0x2d, 0x01, 0x00, 0xf0, 0x0f, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00,
+0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
+0x75, 0x61, 0x72, 0x65, 0x73, 0x2e, 0x1c, 0x00, 0xf3, 0x1e,
+0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74,
+0x6f, 0x00, 0x64, 0x72, 0x61, 0x77, 0x00, 0x61, 0x00, 0x64,
+0x69, 0x61, 0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x00, 0x6c, 0x69,
+0x6e, 0x65, 0x00, 0x74, 0x68, 0x72, 0x6f, 0x75, 0x67, 0x68,
+0x00, 0x65, 0x61, 0x63, 0x68, 0x3a, 0x00, 0xf2, 0x07, 0x2c,
+0x00, 0x61, 0x6e, 0x64, 0x00, 0x63, 0x68, 0x6f, 0x6f, 0x73,
+0x65, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x77, 0x61,
+0x79, 0x22, 0x00, 0x01, 0x34, 0x00, 0x10, 0x73, 0x8f, 0x00,
+0xfa, 0x24, 0x73, 0x00, 0x73, 0x6f, 0x00, 0x74, 0x68, 0x61,
+0x74, 0x00, 0x74, 0x68, 0x65, 0x00, 0x66, 0x6f, 0x6c, 0x6c,
+0x6f, 0x77, 0x69, 0x6e, 0x67, 0x00, 0x63, 0x6f, 0x6e, 0x64,
+0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x00, 0x61, 0x72, 0x65,
+0x00, 0x6d, 0x65, 0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00,
+0x54, 0x68, 0x65, 0x7b, 0x00, 0xf1, 0x05, 0x73, 0x00, 0x6e,
+0x65, 0x76, 0x65, 0x72, 0x00, 0x66, 0x6f, 0x72, 0x6d, 0x00,
+0x61, 0x00, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x2a, 0x00, 0xf2,
+0x1e, 0x41, 0x6e, 0x79, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74,
+0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x61, 0x00, 0x63, 0x69,
+0x72, 0x63, 0x6c, 0x65, 0x64, 0x00, 0x6e, 0x75, 0x6d, 0x62,
+0x65, 0x72, 0x00, 0x68, 0x61, 0x73, 0x00, 0x70, 0x72, 0x65,
+0x63, 0x69, 0x73, 0x65, 0x6c, 0x79, 0x83, 0x00, 0x43, 0x6d,
+0x61, 0x6e, 0x79, 0x55, 0x00, 0x40, 0x6d, 0x65, 0x65, 0x74,
+0x88, 0x00, 0xf1, 0x02, 0x61, 0x74, 0x00, 0x69, 0x74, 0x2e,
+0x00, 0x28, 0x54, 0x68, 0x75, 0x73, 0x2c, 0x00, 0x61, 0x00,
+0x34, 0x06, 0x01, 0x90, 0x68, 0x65, 0x00, 0x63, 0x65, 0x6e,
+0x74, 0x72, 0x65, 0x29, 0x01, 0xfe, 0x0e, 0x61, 0x00, 0x63,
+0x72, 0x6f, 0x73, 0x73, 0x00, 0x73, 0x68, 0x61, 0x70, 0x65,
+0x2c, 0x00, 0x77, 0x68, 0x65, 0x72, 0x65, 0x61, 0x73, 0x00,
+0x61, 0x00, 0x7a, 0x65, 0x72, 0x6f, 0x2f, 0x00, 0x01, 0x3b,
+0x01, 0x42, 0x6d, 0x6f, 0x6e, 0x64, 0x31, 0x00, 0xc0, 0x00,
+0x2d, 0x00, 0x6f, 0x72, 0x00, 0x72, 0x61, 0x74, 0x68, 0x65,
+0x72, 0x61, 0x00, 0x7a, 0x70, 0x61, 0x72, 0x74, 0x69, 0x61,
+0x6c, 0x25, 0x00, 0x94, 0x2c, 0x00, 0x62, 0x65, 0x63, 0x61,
+0x75, 0x73, 0x65, 0x56, 0x00, 0x33, 0x63, 0x61, 0x6e, 0xf8,
+0x00, 0x91, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x00, 0x69,
+0x6e, 0x67, 0x00, 0x51, 0x6d, 0x69, 0x64, 0x64, 0x6c, 0x67,
+0x00, 0x00, 0x0e, 0x00, 0x01, 0xcb, 0x01, 0x04, 0x3a, 0x00,
+0x01, 0xe2, 0x00, 0xe0, 0x77, 0x6f, 0x75, 0x6c, 0x64, 0x00,
+0x69, 0x6d, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0xf9, 0x00,
+0x04, 0x57, 0x00, 0x01, 0x39, 0x01, 0xa0, 0x29, 0x00, 0x00,
+0x00, 0x43, 0x72, 0x65, 0x64, 0x69, 0x74, 0x50, 0x01, 0xf1,
+0x01, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a,
+0x7a, 0x6c, 0x65, 0x00, 0x67, 0x6f, 0x65, 0xff, 0x01, 0xa0,
+0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b, 0x38, 0x5d,
+0x67, 0x01, 0xf1, 0x02, 0x5b, 0x38, 0x5d, 0x00, 0x68, 0x74,
+0x74, 0x70, 0x73, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e,
+0x6e, 0x1e, 0x00, 0xa2, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70,
+0x2f, 0x6a, 0x61, 0x2f, 0x3d, 0x00, 0xf0, 0x0f, 0x73, 0x2f,
+0x67, 0x6f, 0x6b, 0x69, 0x67, 0x65, 0x6e, 0x5f, 0x6e, 0x61,
+0x6e, 0x61, 0x6d, 0x65, 0x2f, 0x00, 0x28, 0x69, 0x6e, 0x00,
+0x4a, 0x61, 0x70, 0x61, 0x6e, 0x65, 0x73, 0x65, 0x75, 0x00,
+0x43, 0x32, 0x30, 0x2e, 0x31, 0xa0, 0x02, 0xf0, 0x07, 0x63,
+0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00,
+0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0x8c, 0x01, 0xa3, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x62,
+0x6c, 0x61, 0x6e, 0x6b, 0x63, 0x02, 0xa0, 0x00, 0x77, 0x69,
+0x6c, 0x6c, 0x00, 0x70, 0x6c, 0x61, 0x63, 0xc2, 0x00, 0x10,
+0x5c, 0x21, 0x00, 0x52, 0x69, 0x74, 0x00, 0x28, 0x61, 0x60,
 0x02, 0x40, 0x6c, 0x65, 0x61, 0x6e, 0x37, 0x00, 0x10, 0x74,
-0x5f, 0x02, 0x00, 0x0f, 0x00, 0xc1, 0x66, 0x74, 0x2c, 0x00,
+0x61, 0x02, 0x00, 0x0f, 0x00, 0xc1, 0x66, 0x74, 0x2c, 0x00,
 0x69, 0x2e, 0x65, 0x2e, 0x00, 0x72, 0x75, 0x6e, 0x1a, 0x00,
 0x41, 0x66, 0x72, 0x6f, 0x6d, 0x1c, 0x00, 0x31, 0x74, 0x6f,
-0x70, 0x20, 0x00, 0x04, 0x37, 0x01, 0x03, 0x5f, 0x00, 0x03,
+0x70, 0x20, 0x00, 0x04, 0x39, 0x01, 0x03, 0x5f, 0x00, 0x03,
 0x3a, 0x00, 0xf0, 0x01, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d,
 0x00, 0x72, 0x69, 0x67, 0x68, 0x74, 0x29, 0x2e, 0x00, 0x52,
 0x08, 0x00, 0x0f, 0x96, 0x00, 0x16, 0x14, 0x2f, 0x96, 0x00,
 0x0b, 0x8f, 0x00, 0x01, 0x4e, 0x00, 0x1b, 0x2c, 0x8b, 0x00,
 0x22, 0x6f, 0x70, 0x18, 0x00, 0x00, 0x25, 0x00, 0x03, 0x76,
-0x00, 0x00, 0x97, 0x00, 0x20, 0x29, 0x2e, 0x96, 0x01, 0x63,
+0x00, 0x00, 0x97, 0x00, 0x20, 0x29, 0x2e, 0x98, 0x01, 0x63,
 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x43, 0x00, 0x01, 0x7f,
-0x00, 0x30, 0x00, 0x65, 0x69, 0x35, 0x02, 0x72, 0x00, 0x62,
+0x00, 0x30, 0x00, 0x65, 0x69, 0x37, 0x02, 0x72, 0x00, 0x62,
 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x78, 0x00, 0xd2, 0x63, 0x79,
 0x63, 0x6c, 0x65, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65,
 0x6e, 0xdd, 0x00, 0xc5, 0x68, 0x72, 0x65, 0x65, 0x00, 0x70,
 0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0xdc, 0x00, 0x00, 0x67,
-0x01, 0x62, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x00, 0xd9, 0x02,
+0x01, 0x62, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x00, 0xdb, 0x02,
 0x85, 0x69, 0x66, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x6c, 0x72,
 0x01, 0xbe, 0x00, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65,
 0x64, 0x6c, 0x79, 0xe4, 0x00, 0x00, 0xd2, 0x00, 0x02, 0x6f,
 0x00, 0x52, 0x68, 0x61, 0x6e, 0x67, 0x65, 0xbf, 0x00, 0x02,
 0x21, 0x00, 0x40, 0x74, 0x6f, 0x00, 0x5c, 0x05, 0x00, 0x51,
 0x2f, 0x00, 0x62, 0x61, 0x63, 0x0f, 0x00, 0x01, 0x18, 0x00,
-0x02, 0x0d, 0x04, 0x03, 0x66, 0x00, 0x01, 0xe5, 0x00, 0x0e,
+0x02, 0x0f, 0x04, 0x03, 0x66, 0x00, 0x01, 0xe5, 0x00, 0x0e,
 0x67, 0x00, 0x07, 0x7b, 0x01, 0x0f, 0x5d, 0x00, 0x07, 0x12,
-0x2f, 0x62, 0x00, 0x09, 0x5d, 0x00, 0x01, 0x9f, 0x03, 0x50,
-0x65, 0x72, 0x65, 0x66, 0x6f, 0x76, 0x04, 0x00, 0x62, 0x00,
-0x00, 0x1f, 0x03, 0x42, 0x70, 0x6c, 0x61, 0x79, 0x06, 0x03,
-0x00, 0x73, 0x02, 0x50, 0x65, 0x6e, 0x74, 0x69, 0x72, 0xf0,
-0x02, 0x01, 0x0d, 0x04, 0x34, 0x6f, 0x6e, 0x65, 0x37, 0x01,
-0x03, 0x94, 0x00, 0x71, 0x6e, 0x65, 0x65, 0x64, 0x00, 0x74,
-0x6f, 0x02, 0x03, 0x13, 0x59, 0x42, 0x00, 0x52, 0x61, 0x6c,
-0x73, 0x6f, 0x00, 0x3b, 0x03, 0xc1, 0x65, 0x00, 0x63, 0x75,
-0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x07, 0x03,
-0x20, 0x6d, 0x6f, 0x2d, 0x05, 0x55, 0x72, 0x6f, 0x75, 0x6e,
-0x64, 0x6b, 0x03, 0x71, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73,
-0x73, 0xa4, 0x01, 0x00, 0xe4, 0x01, 0x50, 0x65, 0x74, 0x75,
-0x72, 0x6e, 0xde, 0x03, 0x20, 0x73, 0x70, 0x0e, 0x02, 0x01,
-0x3b, 0x00, 0x0b, 0xb4, 0x02, 0x20, 0x6f, 0x72, 0x25, 0x02,
-0xe2, 0x2c, 0x00, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63, 0x74,
-0x69, 0x76, 0x65, 0x6c, 0x79, 0x2c, 0x01, 0x01, 0x29, 0x00,
-0x43, 0x74, 0x68, 0x65, 0x6e, 0xd4, 0x01, 0x50, 0x74, 0x68,
-0x65, 0x6d, 0x00, 0x57, 0x04, 0x5a, 0x62, 0x6f, 0x76, 0x65,
-0x2e, 0xa4, 0x00, 0x10, 0x70, 0x77, 0x00, 0x20, 0x00, 0x2f,
-0x4e, 0x00, 0x01, 0x7d, 0x01, 0x06, 0x7e, 0x02, 0x00, 0x12,
-0x00, 0x0c, 0x5e, 0x00, 0xa1, 0x69, 0x6e, 0x64, 0x65, 0x70,
-0x65, 0x6e, 0x64, 0x65, 0x6e, 0xf2, 0x02, 0x20, 0x77, 0x68,
-0xe4, 0x04, 0x81, 0x73, 0x00, 0x61, 0x6c, 0x72, 0x65, 0x61,
-0x64, 0xee, 0x01, 0x07, 0xf0, 0x00, 0x02, 0x91, 0x01, 0x62,
-0x2e, 0x00, 0x42, 0x61, 0x63, 0x6b, 0xc7, 0x00, 0x20, 0x72,
-0x65, 0xfc, 0x00, 0x24, 0x73, 0x00, 0x2c, 0x05, 0x06, 0x48,
-0x03, 0x0b, 0x33, 0x00, 0x42, 0x00, 0x00, 0x28, 0x41, 0xc4,
-0x00, 0x32, 0x00, 0x61, 0x63, 0xcb, 0x05, 0x90, 0x64, 0x65,
-0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0x66, 0x00, 0x21,
-0x73, 0x65, 0x16, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31, 0xe4,
-0x05, 0x01, 0xcb, 0x00, 0xa3, 0x61, 0x76, 0x61, 0x69, 0x6c,
-0x61, 0x62, 0x6c, 0x65, 0x2e, 0x19, 0x04, 0x13, 0x32, 0x19,
-0x04, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-0x72, 0x1b, 0x04, 0x66, 0x54, 0x68, 0x65, 0x73, 0x65, 0x00,
-0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x06, 0x93,
-0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e,
-0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6f, 0x00, 0x22, 0x6f,
-0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0xab, 0x00, 0x91, 0x57, 0x69, 0x64,
-0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x81, 0x03, 0x51, 0x00,
-0x00, 0x53, 0x69, 0x7a, 0x47, 0x05, 0x01, 0x43, 0x05, 0x26,
-0x69, 0x6e, 0x0e, 0x07, 0xc3, 0x00, 0x00, 0x44, 0x69, 0x66,
-0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x98, 0x03, 0x00,
-0xb0, 0x04, 0x01, 0x54, 0x00, 0x16, 0x64, 0x1a, 0x00, 0x04,
-0x82, 0x05, 0x40, 0x65, 0x6e, 0x65, 0x72, 0xe0, 0x02, 0x03,
-0x47, 0x05, 0xf2, 0x00, 0x2e, 0x00, 0x41, 0x74, 0x00, 0x48,
-0x61, 0x72, 0x64, 0x00, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0xae,
-0x02, 0x20, 0x61, 0x72, 0x56, 0x01, 0x61, 0x71, 0x75, 0x69,
-0x72, 0x65, 0x64, 0x62, 0x07, 0x63, 0x6f, 0x00, 0x64, 0x65,
-0x64, 0x75, 0x34, 0x01, 0x50, 0x62, 0x61, 0x73, 0x65, 0x64,
-0xb6, 0x00, 0x81, 0x6b, 0x6e, 0x6f, 0x77, 0x6c, 0x65, 0x64,
-0x67, 0x98, 0x00, 0x41, 0x72, 0x65, 0x6c, 0x61, 0x20, 0x00,
-0x45, 0x68, 0x69, 0x70, 0x73, 0xf1, 0x03, 0x03, 0xa6, 0x00,
-0x03, 0x4f, 0x06, 0x00, 0xf3, 0x05, 0x00, 0x22, 0x02, 0x30,
-0x77, 0x61, 0x79, 0x23, 0x00, 0x01, 0xcf, 0x06, 0x10, 0x62,
-0x4b, 0x02, 0x03, 0x60, 0x00, 0x02, 0xd9, 0x02, 0x55, 0x65,
-0x78, 0x61, 0x63, 0x74, 0x11, 0x04, 0x00, 0x5c, 0x00, 0x25,
-0x6f, 0x6e, 0x89, 0x03, 0xf0, 0x00, 0x61, 0x74, 0x00, 0x61,
-0x00, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x00, 0x28, 0x46, 0x6f,
-0x72, 0x2d, 0x00, 0x33, 0x6d, 0x70, 0x6c, 0x66, 0x03, 0x11,
-0x6d, 0x2c, 0x01, 0x00, 0x97, 0x00, 0x03, 0xc2, 0x07, 0x25,
-0x77, 0x6f, 0x82, 0x00, 0x01, 0xdd, 0x07, 0x04, 0x4c, 0x02,
-0x30, 0x73, 0x61, 0x6d, 0x1d, 0x01, 0x12, 0x72, 0xf1, 0x01,
-0x55, 0x2c, 0x00, 0x65, 0x76, 0x65, 0x79, 0x03, 0x83, 0x64,
-0x6f, 0x6e, 0x27, 0x74, 0x00, 0x79, 0x65, 0x49, 0x00, 0x01,
-0x8e, 0x02, 0x01, 0x4e, 0x00, 0x05, 0x30, 0x00, 0x32, 0x00,
-0x69, 0x73, 0x13, 0x03, 0x01, 0x8f, 0x06, 0x02, 0x75, 0x00,
-0x21, 0x65, 0x6e, 0xca, 0x00, 0x00, 0x41, 0x00, 0x06, 0xce,
-0x00, 0x62, 0x73, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0xe7, 0x00,
-0x60, 0x6f, 0x75, 0x74, 0x00, 0x73, 0x74, 0x44, 0x03, 0x11,
-0x6f, 0x0b, 0x01, 0x04, 0xc0, 0x01, 0x30, 0x29, 0x00, 0x45,
-0x7d, 0x00, 0x1a, 0x61, 0x86, 0x01, 0x91, 0x67, 0x75, 0x65,
-0x73, 0x73, 0x77, 0x6f, 0x72, 0x6b, 0x68, 0x00, 0x00, 0x5d,
-0x04, 0x32, 0x74, 0x72, 0x61, 0xe1, 0x05, 0x21, 0x73, 0x68,
-0x33, 0x07, 0x02, 0x6d, 0x07, 0xe0, 0x62, 0x65, 0x00, 0x6e,
-0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x2e, 0x00,
+0x2f, 0x62, 0x00, 0x09, 0x5d, 0x00, 0x01, 0xa1, 0x03, 0x50,
+0x65, 0x72, 0x65, 0x66, 0x6f, 0x78, 0x04, 0x00, 0x62, 0x00,
+0x00, 0x21, 0x03, 0x42, 0x70, 0x6c, 0x61, 0x79, 0x08, 0x03,
+0x90, 0x61, 0x6d, 0x65, 0x00, 0x65, 0x6e, 0x74, 0x69, 0x72,
+0xf2, 0x02, 0x01, 0x0f, 0x04, 0x34, 0x6f, 0x6e, 0x65, 0x37,
+0x01, 0x03, 0x94, 0x00, 0x71, 0x6e, 0x65, 0x65, 0x64, 0x00,
+0x74, 0x6f, 0x04, 0x03, 0x13, 0x59, 0x42, 0x00, 0x52, 0x61,
+0x6c, 0x73, 0x6f, 0x00, 0x3d, 0x03, 0xc1, 0x65, 0x00, 0x63,
+0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x09,
+0x03, 0x20, 0x6d, 0x6f, 0x2f, 0x05, 0x55, 0x72, 0x6f, 0x75,
+0x6e, 0x64, 0x6d, 0x03, 0x71, 0x2e, 0x00, 0x50, 0x72, 0x65,
+0x73, 0x73, 0xa4, 0x01, 0x00, 0xe4, 0x01, 0x50, 0x65, 0x74,
+0x75, 0x72, 0x6e, 0xe0, 0x03, 0x20, 0x73, 0x70, 0x0e, 0x02,
+0x01, 0x3b, 0x00, 0x0b, 0xb4, 0x02, 0x20, 0x6f, 0x72, 0x25,
+0x02, 0xe2, 0x2c, 0x00, 0x72, 0x65, 0x73, 0x70, 0x65, 0x63,
+0x74, 0x69, 0x76, 0x65, 0x6c, 0x79, 0x2c, 0x01, 0x01, 0x29,
+0x00, 0x43, 0x74, 0x68, 0x65, 0x6e, 0xd4, 0x01, 0x50, 0x74,
+0x68, 0x65, 0x6d, 0x00, 0x59, 0x04, 0x5a, 0x62, 0x6f, 0x76,
+0x65, 0x2e, 0xa4, 0x00, 0x10, 0x70, 0x77, 0x00, 0x20, 0x00,
+0x2f, 0x4e, 0x00, 0x01, 0x7d, 0x01, 0x06, 0x7e, 0x02, 0x00,
+0x12, 0x00, 0x0c, 0x5e, 0x00, 0xa1, 0x69, 0x6e, 0x64, 0x65,
+0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0xf2, 0x02, 0x20, 0x77,
+0x68, 0xe6, 0x04, 0x81, 0x73, 0x00, 0x61, 0x6c, 0x72, 0x65,
+0x61, 0x64, 0xee, 0x01, 0x07, 0xf0, 0x00, 0x02, 0x91, 0x01,
+0x62, 0x2e, 0x00, 0x42, 0x61, 0x63, 0x6b, 0xc7, 0x00, 0x20,
+0x72, 0x65, 0xfc, 0x00, 0x24, 0x73, 0x00, 0x2e, 0x05, 0x06,
+0x48, 0x03, 0x0b, 0x33, 0x00, 0x42, 0x00, 0x00, 0x28, 0x41,
+0xc4, 0x00, 0x32, 0x00, 0x61, 0x63, 0xcd, 0x05, 0x90, 0x64,
+0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0x66, 0x00,
+0x21, 0x73, 0x65, 0x16, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31,
+0xe6, 0x05, 0x01, 0xcb, 0x00, 0xa3, 0x61, 0x76, 0x61, 0x69,
+0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x19, 0x04, 0x13, 0x32,
+0x19, 0x04, 0x91, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0x1b, 0x04, 0x66, 0x54, 0x68, 0x65, 0x73, 0x65,
+0x00, 0x14, 0x00, 0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x06,
+0x93, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
+0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6f, 0x00, 0x22,
+0x6f, 0x6e, 0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27,
+0x00, 0x6d, 0x65, 0x6e, 0x75, 0xab, 0x00, 0x91, 0x57, 0x69,
+0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x81, 0x03, 0x51,
+0x00, 0x00, 0x53, 0x69, 0x7a, 0x49, 0x05, 0x01, 0x45, 0x05,
+0x26, 0x69, 0x6e, 0x10, 0x07, 0xc3, 0x00, 0x00, 0x44, 0x69,
+0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x98, 0x03,
+0x00, 0xb0, 0x04, 0x01, 0x54, 0x00, 0x16, 0x64, 0x1a, 0x00,
+0x04, 0x84, 0x05, 0x40, 0x65, 0x6e, 0x65, 0x72, 0xe0, 0x02,
+0x03, 0x49, 0x05, 0xf2, 0x00, 0x2e, 0x00, 0x41, 0x74, 0x00,
+0x48, 0x61, 0x72, 0x64, 0x00, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+0xae, 0x02, 0x20, 0x61, 0x72, 0x56, 0x01, 0x61, 0x71, 0x75,
+0x69, 0x72, 0x65, 0x64, 0x64, 0x07, 0x63, 0x6f, 0x00, 0x64,
+0x65, 0x64, 0x75, 0x34, 0x01, 0x50, 0x62, 0x61, 0x73, 0x65,
+0x64, 0xb6, 0x00, 0x81, 0x6b, 0x6e, 0x6f, 0x77, 0x6c, 0x65,
+0x64, 0x67, 0x98, 0x00, 0x41, 0x72, 0x65, 0x6c, 0x61, 0x20,
+0x00, 0x45, 0x68, 0x69, 0x70, 0x73, 0xf1, 0x03, 0x03, 0xa6,
+0x00, 0x03, 0x51, 0x06, 0x00, 0xf5, 0x05, 0x00, 0x22, 0x02,
+0x30, 0x77, 0x61, 0x79, 0x23, 0x00, 0x01, 0xd1, 0x06, 0x10,
+0x62, 0x4b, 0x02, 0x03, 0x60, 0x00, 0x02, 0xd9, 0x02, 0x55,
+0x65, 0x78, 0x61, 0x63, 0x74, 0x11, 0x04, 0x00, 0x5c, 0x00,
+0x25, 0x6f, 0x6e, 0x89, 0x03, 0xf0, 0x00, 0x61, 0x74, 0x00,
+0x61, 0x00, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x00, 0x28, 0x46,
+0x6f, 0x72, 0x2d, 0x00, 0x33, 0x6d, 0x70, 0x6c, 0x66, 0x03,
+0x11, 0x6d, 0x2c, 0x01, 0x00, 0x97, 0x00, 0x03, 0xc4, 0x07,
+0x25, 0x77, 0x6f, 0x82, 0x00, 0x01, 0xdf, 0x07, 0x04, 0x4c,
+0x02, 0x30, 0x73, 0x61, 0x6d, 0x1d, 0x01, 0x12, 0x72, 0xf1,
+0x01, 0x55, 0x2c, 0x00, 0x65, 0x76, 0x65, 0x79, 0x03, 0x83,
+0x64, 0x6f, 0x6e, 0x27, 0x74, 0x00, 0x79, 0x65, 0x49, 0x00,
+0x01, 0x8e, 0x02, 0x01, 0x4e, 0x00, 0x05, 0x30, 0x00, 0x32,
+0x00, 0x69, 0x73, 0x13, 0x03, 0x01, 0x91, 0x06, 0x02, 0x75,
+0x00, 0x21, 0x65, 0x6e, 0xca, 0x00, 0x00, 0x41, 0x00, 0x06,
+0xce, 0x00, 0x62, 0x73, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0xe7,
+0x00, 0x60, 0x6f, 0x75, 0x74, 0x00, 0x73, 0x74, 0x44, 0x03,
+0x11, 0x6f, 0x0b, 0x01, 0x04, 0xc0, 0x01, 0x30, 0x29, 0x00,
+0x45, 0x7d, 0x00, 0x1a, 0x61, 0x86, 0x01, 0x91, 0x67, 0x75,
+0x65, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x6b, 0x68, 0x00, 0x00,
+0x5d, 0x04, 0x32, 0x74, 0x72, 0x61, 0xe1, 0x05, 0x21, 0x73,
+0x68, 0x35, 0x07, 0x02, 0x6f, 0x07, 0xd2, 0x62, 0x65, 0x00,
+0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, 0x61, 0x72, 0x79, 0x2e,
+0xa0, 0x02, 0x13, 0x33, 0xa0, 0x02, 0xf1, 0x00, 0x75, 0x73,
+0x65, 0x72, 0x20, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
+0x6e, 0x63, 0x65, 0xa6, 0x02, 0x11, 0x4f, 0x86, 0x04, 0x10,
+0x74, 0x9d, 0x08, 0x12, 0x73, 0xd5, 0x00, 0x80, 0x73, 0x75,
+0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e, 0x00, 0x17, 0x00,
+0x2e, 0x00, 0x12, 0x2c, 0x94, 0x02, 0x16, 0x50, 0x12, 0x00,
+0x0d, 0xb0, 0x02, 0x33, 0x47, 0x61, 0x6d, 0xb0, 0x02, 0x02,
+0x1c, 0x04, 0x32, 0x6c, 0x65, 0x74, 0xec, 0x04, 0x78, 0x6f,
+0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x67, 0x09, 0x06, 0x98,
+0x04, 0x44, 0x6d, 0x6f, 0x75, 0x73, 0xec, 0x04, 0x80, 0x73,
+0x00, 0x77, 0x6f, 0x72, 0x6b, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2378;
-const unsigned short help_text_words = 444;
+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 6ebeec86c0..68927490e6 100644
--- a/apps/plugins/puzzles/help/solo.c
+++ b/apps/plugins/puzzles/help/solo.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,382 +6,382 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 360, TEXT_UNDERLINE },
- { 390, TEXT_CENTER | C_RED },
- { 446, TEXT_UNDERLINE },
- { 674, TEXT_CENTER | C_RED },
- { 1059, TEXT_UNDERLINE },
+ { 361, TEXT_UNDERLINE },
+ { 388, TEXT_CENTER | C_RED },
+ { 444, TEXT_UNDERLINE },
+ { 672, TEXT_CENTER | C_RED },
+ { 1057, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 6263 comp 3635 ratio 0.580393 level 10 saved 2628 */
+/* orig 6259 comp 3626 ratio 0.579326 level 10 saved 2633 */
 const char help_text[] = {
-0xf0, 0x53, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfb, 0x04, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x31, 0x3a, 0x20, 0x53, 0x6f, 0x6c, 0x6f, 0x20, 0x00,
-0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65,
-0x00, 0x61, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63,
-0x68, 0x00, 0x69, 0x73, 0x00, 0x64, 0x69, 0x76, 0x69, 0x64,
-0x65, 0x64, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x00, 0x61, 0x73,
-0x00, 0x6d, 0x61, 0x6e, 0x79, 0x00, 0x65, 0x71, 0x75, 0x61,
-0x6c, 0x6c, 0x79, 0x00, 0x73, 0x69, 0x7a, 0x65, 0x64, 0x00,
-0x73, 0x75, 0x62, 0x2d, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73,
-0x21, 0x00, 0x22, 0x74, 0x68, 0x44, 0x00, 0xf4, 0x00, 0x00,
-0x68, 0x61, 0x73, 0x00, 0x72, 0x6f, 0x77, 0x73, 0x2e, 0x00,
-0x45, 0x61, 0x63, 0x68, 0x5f, 0x00, 0xc1, 0x6d, 0x75, 0x73,
-0x74, 0x00, 0x62, 0x65, 0x00, 0x66, 0x69, 0x6c, 0x6c, 0x57,
-0x00, 0xf1, 0x08, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x61,
-0x00, 0x64, 0x69, 0x67, 0x69, 0x74, 0x00, 0x66, 0x72, 0x6f,
-0x6d, 0x00, 0x31, 0x00, 0x74, 0x6f, 0x48, 0x00, 0x00, 0x60,
-0x00, 0x35, 0x00, 0x6f, 0x66, 0x54, 0x00, 0x10, 0x2c, 0x30,
-0x00, 0x30, 0x73, 0x75, 0x63, 0x30, 0x00, 0xf0, 0x03, 0x77,
-0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x00, 0x00,
-0x2d, 0x00, 0x65, 0x76, 0x65, 0x72, 0x79, 0x6e, 0x00, 0xf1,
-0x0d, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
-0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x6f, 0x6e, 0x65, 0x00,
-0x6f, 0x63, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x63, 0x4b,
-0x00, 0x10, 0x65, 0x8c, 0x00, 0x02, 0x6c, 0x00, 0x06, 0x39,
-0x00, 0x6f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x3c, 0x00,
-0x23, 0x01, 0xfa, 0x00, 0x0f, 0x3b, 0x00, 0x18, 0x11, 0x2e,
-0x3c, 0x00, 0x70, 0x28, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-0x46, 0x01, 0xf2, 0x02, 0x2c, 0x00, 0x62, 0x79, 0x00, 0x64,
-0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x00, 0x6f, 0x66, 0x66,
-0x29, 0x2d, 0x00, 0x03, 0xf7, 0x00, 0x02, 0x37, 0x01, 0xf0,
-0x01, 0x27, 0x73, 0x00, 0x74, 0x77, 0x6f, 0x00, 0x6d, 0x61,
-0x69, 0x6e, 0x00, 0x64, 0x69, 0x61, 0x67, 0x3a, 0x00, 0x1f,
-0x73, 0x75, 0x00, 0x1c, 0x00, 0xeb, 0x01, 0x01, 0xe1, 0x01,
-0x85, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x73, 0x6f, 0x6d, 0x5b,
-0x01, 0x61, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0xbe, 0x01,
-0xf0, 0x00, 0x63, 0x6c, 0x75, 0x65, 0x73, 0x3b, 0x00, 0x79,
-0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x02, 0x02, 0x81,
-0x74, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x2b, 0x00,
-0x4c, 0x72, 0x65, 0x73, 0x74, 0x37, 0x00, 0x90, 0x63, 0x6f,
-0x72, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x66, 0x00, 0x51,
-0x55, 0x6e, 0x64, 0x65, 0x72, 0x1f, 0x00, 0x04, 0xd3, 0x00,
-0x92, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2c,
-0xd0, 0x00, 0x07, 0x2d, 0x02, 0x24, 0x72, 0x65, 0x16, 0x02,
-0x30, 0x6f, 0x72, 0x00, 0x43, 0x00, 0xa7, 0x61, 0x6e, 0x67,
-0x75, 0x6c, 0x61, 0x72, 0x2e, 0x00, 0x54, 0x40, 0x00, 0x53,
-0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x0c, 0x02, 0xf3, 0x05, 0x69,
-0x73, 0x00, 0x33, 0x78, 0x33, 0x00, 0x28, 0x61, 0x00, 0x39,
-0x78, 0x39, 0x00, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c, 0x1a,
-0x02, 0x09, 0xa9, 0x02, 0x41, 0x6e, 0x69, 0x6e, 0x65, 0x2a,
-0x00, 0x02, 0x6b, 0x00, 0x21, 0x29, 0x2e, 0xfe, 0x00, 0xf1,
-0x00, 0x63, 0x61, 0x6e, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00,
-0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x53, 0x00, 0x12, 0x73,
-0x80, 0x02, 0x07, 0x7e, 0x00, 0x13, 0x00, 0x9f, 0x00, 0x70,
-0x69, 0x6e, 0x73, 0x74, 0x65, 0x61, 0x64, 0xee, 0x00, 0x04,
-0xa6, 0x00, 0x43, 0x6e, 0x65, 0x73, 0x2c, 0x80, 0x02, 0x32,
-0x73, 0x00, 0x32, 0x89, 0x00, 0x32, 0x36, 0x78, 0x36, 0xf0,
-0x02, 0x09, 0x81, 0x00, 0x76, 0x73, 0x69, 0x78, 0x00, 0x33,
-0x78, 0x32, 0x80, 0x00, 0xb0, 0x41, 0x6c, 0x74, 0x65, 0x72,
-0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0xf3, 0x01, 0x13, 0x79,
-0x8f, 0x00, 0x03, 0x8a, 0x00, 0xd1, 0x60, 0x6a, 0x69, 0x67,
-0x73, 0x61, 0x77, 0x27, 0x00, 0x6d, 0x6f, 0x64, 0x65, 0xe6,
-0x02, 0x02, 0x81, 0x03, 0x0f, 0x32, 0x01, 0x00, 0xe0, 0x61,
-0x72, 0x62, 0x69, 0x74, 0x72, 0x61, 0x72, 0x79, 0x00, 0x73,
-0x68, 0x61, 0x70, 0xc0, 0x00, 0x21, 0x68, 0x69, 0xe7, 0x01,
-0xf1, 0x00, 0x66, 0x66, 0x65, 0x72, 0x00, 0x62, 0x65, 0x74,
-0x77, 0x65, 0x65, 0x6e, 0x00, 0x69, 0x6e, 0x8f, 0x00, 0x00,
-0x1f, 0x01, 0x02, 0x40, 0x01, 0x10, 0x73, 0x9d, 0x01, 0xf1,
-0x02, 0x41, 0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x00, 0x61,
-0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x70, 0x00,
-0x00, 0x56, 0x01, 0x20, 0x60, 0x6b, 0x90, 0x03, 0xb3, 0x72,
-0x27, 0x2e, 0x00, 0x49, 0x6e, 0x00, 0x74, 0x68, 0x69, 0x73,
-0x8a, 0x00, 0x01, 0x10, 0x02, 0x01, 0x78, 0x00, 0x33, 0x6e,
-0x6f, 0x74, 0x3b, 0x02, 0x21, 0x69, 0x6e, 0x98, 0x00, 0x40,
-0x66, 0x6f, 0x72, 0x6d, 0x1d, 0x01, 0x02, 0xca, 0x03, 0x33,
-0x2d, 0x69, 0x6e, 0x27, 0x01, 0x24, 0x73, 0x3b, 0x3b, 0x01,
-0x16, 0x2c, 0x0d, 0x04, 0x0c, 0x4a, 0x04, 0x91, 0x60, 0x63,
-0x61, 0x67, 0x65, 0x73, 0x27, 0x00, 0x62, 0x7d, 0x03, 0x81,
-0x6f, 0x75, 0x72, 0x65, 0x64, 0x00, 0x6c, 0x69, 0x60, 0x01,
-0x30, 0x61, 0x6e, 0x64, 0x5c, 0x00, 0x02, 0xbe, 0x02, 0x00,
-0x27, 0x00, 0x02, 0x46, 0x00, 0x91, 0x61, 0x6d, 0x65, 0x00,
-0x74, 0x65, 0x6c, 0x6c, 0x73, 0x3c, 0x01, 0x10, 0x77, 0xfa,
-0x03, 0x02, 0x1e, 0x01, 0x01, 0x85, 0x00, 0x32, 0x61, 0x6c,
-0x6c, 0x75, 0x02, 0x00, 0xee, 0x02, 0x00, 0xbc, 0x01, 0x02,
-0x1c, 0x04, 0x01, 0x3f, 0x00, 0x90, 0x73, 0x68, 0x6f, 0x75,
-0x6c, 0x64, 0x00, 0x62, 0x65, 0x86, 0x01, 0x63, 0x73, 0x6f,
-0x2c, 0x00, 0x6e, 0x6f, 0xc6, 0x03, 0xe0, 0x6d, 0x61, 0x79,
-0x00, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x00, 0x6d, 0x6f,
-0x72, 0x69, 0x00, 0x40, 0x61, 0x6e, 0x00, 0x6f, 0x3e, 0x03,
-0x00, 0x15, 0x02, 0x41, 0x69, 0x6e, 0x00, 0x61, 0x42, 0x00,
-0x31, 0x2c, 0x00, 0x65, 0xf8, 0x00, 0x02, 0xf7, 0x02, 0x01,
-0x54, 0x00, 0x62, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0xee,
-0x04, 0xa1, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x61, 0x72, 0x69,
-0x65, 0x73, 0x75, 0x03, 0x30, 0x78, 0x69, 0x73, 0xf0, 0x02,
-0x71, 0x00, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x78, 0x01,
-0x21, 0x49, 0x66, 0xb5, 0x00, 0x03, 0xed, 0x01, 0x19, 0x61,
-0xd3, 0x02, 0x02, 0xbf, 0x01, 0x87, 0x72, 0x65, 0x71, 0x75,
-0x69, 0x72, 0x65, 0x73, 0x88, 0x00, 0x13, 0x39, 0xcd, 0x00,
-0x02, 0x46, 0x01, 0x42, 0x61, 0x64, 0x64, 0x69, 0x32, 0x04,
-0x04, 0xe4, 0x00, 0x40, 0x77, 0x69, 0x6c, 0x6c, 0x4a, 0x05,
-0x40, 0x6c, 0x65, 0x74, 0x74, 0x87, 0x03, 0x03, 0x96, 0x03,
-0xb0, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x62, 0x65, 0x74, 0x2e,
-0x00, 0x46, 0x45, 0x01, 0x50, 0x78, 0x61, 0x6d, 0x70, 0x6c,
-0x53, 0x02, 0x09, 0x83, 0x00, 0x30, 0x33, 0x78, 0x34, 0x2d,
-0x00, 0x18, 0x6e, 0x34, 0x01, 0x02, 0x89, 0x00, 0x20, 0x67,
-0x6f, 0x3d, 0x01, 0x01, 0x00, 0x04, 0x01, 0xb9, 0x01, 0x04,
-0x66, 0x00, 0x01, 0x94, 0x05, 0xf1, 0x01, 0x39, 0x2c, 0x00,
-0x70, 0x6c, 0x75, 0x73, 0x00, 0x60, 0x61, 0x27, 0x2c, 0x00,
-0x60, 0x62, 0x27, 0xac, 0x01, 0x30, 0x60, 0x63, 0x27, 0xb1,
-0x03, 0x20, 0x69, 0x73, 0xd1, 0x02, 0x21, 0x6e, 0x6f, 0xde,
-0x05, 0x02, 0x67, 0x00, 0x12, 0x65, 0xc9, 0x01, 0x02, 0x5b,
-0x02, 0x08, 0x88, 0x02, 0xb2, 0x49, 0x00, 0x66, 0x69, 0x72,
-0x73, 0x74, 0x00, 0x73, 0x61, 0x77, 0x6d, 0x02, 0x03, 0x11,
-0x01, 0xf2, 0x0d, 0x69, 0x6e, 0x00, 0x4e, 0x69, 0x6b, 0x6f,
-0x6c, 0x69, 0x00, 0x5b, 0x35, 0x5d, 0x2c, 0x00, 0x61, 0x6c,
-0x74, 0x68, 0x6f, 0x75, 0x67, 0x68, 0x00, 0x69, 0x74, 0x27,
-0x73, 0xba, 0x03, 0x10, 0x62, 0xdd, 0x02, 0x30, 0x70, 0x6f,
-0x70, 0xa9, 0x03, 0x40, 0x69, 0x73, 0x65, 0x64, 0x41, 0x02,
-0xf0, 0x00, 0x76, 0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x00,
-0x6e, 0x65, 0x77, 0x73, 0x70, 0x61, 0x70, 0x0c, 0x01, 0x15,
-0x75, 0x86, 0x04, 0x10, 0x6e, 0x38, 0x02, 0x80, 0x60, 0x53,
-0x75, 0x64, 0x6f, 0x6b, 0x75, 0x27, 0x68, 0x04, 0x50, 0x60,
-0x53, 0x75, 0x00, 0x44, 0x0d, 0x00, 0xf1, 0x01, 0x2e, 0x00,
-0x48, 0x6f, 0x77, 0x61, 0x72, 0x64, 0x00, 0x47, 0x61, 0x72,
-0x6e, 0x73, 0x00, 0x69, 0x50, 0x05, 0x40, 0x73, 0x69, 0x64,
-0x65, 0x8c, 0x02, 0x20, 0x74, 0x68, 0x8e, 0x00, 0x64, 0x76,
-0x65, 0x6e, 0x74, 0x6f, 0x72, 0x5a, 0x01, 0x00, 0x12, 0x03,
-0x25, 0x72, 0x6e, 0xf8, 0x02, 0x00, 0x13, 0x00, 0x02, 0xb8,
-0x00, 0x02, 0xb4, 0x02, 0x63, 0x69, 0x74, 0x00, 0x77, 0x61,
-0x73, 0xda, 0x00, 0x72, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x73,
-0x68, 0xe2, 0x06, 0xd2, 0x44, 0x65, 0x6c, 0x6c, 0x20, 0x50,
-0x65, 0x6e, 0x63, 0x69, 0x6c, 0x20, 0x50, 0x06, 0x01, 0xd0,
-0x20, 0x61, 0x6e, 0x64, 0x20, 0x57, 0x6f, 0x72, 0x64, 0x20,
-0x47, 0x61, 0x6d, 0x15, 0x01, 0x12, 0x41, 0xfa, 0x01, 0xf5,
-0x03, 0x65, 0x6c, 0x61, 0x62, 0x6f, 0x72, 0x61, 0x74, 0x65,
-0x00, 0x74, 0x72, 0x65, 0x61, 0x74, 0x6d, 0x65, 0x6e, 0x6f,
-0x05, 0x7a, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x7b,
-0x00, 0x01, 0x45, 0x04, 0x00, 0x4f, 0x07, 0x00, 0x84, 0x02,
-0xf0, 0x02, 0x00, 0x6f, 0x6e, 0x00, 0x57, 0x69, 0x6b, 0x69,
-0x70, 0x65, 0x64, 0x69, 0x61, 0x00, 0x5b, 0x36, 0x5d, 0x6c,
-0x01, 0xf1, 0x01, 0x5b, 0x35, 0x5d, 0x00, 0x68, 0x74, 0x74,
-0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x60,
-0x01, 0xa3, 0x2e, 0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65,
-0x6e, 0x2f, 0x96, 0x01, 0x21, 0x2f, 0x73, 0x22, 0x01, 0xc1,
-0x2e, 0x68, 0x74, 0x6d, 0x6c, 0x00, 0x28, 0x62, 0x65, 0x77,
-0x61, 0x72, 0x1f, 0x06, 0x60, 0x46, 0x6c, 0x61, 0x73, 0x68,
-0x29, 0x47, 0x00, 0x15, 0x36, 0x47, 0x00, 0x44, 0x65, 0x6e,
-0x2e, 0x77, 0x66, 0x00, 0x50, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
-0x0e, 0x00, 0x12, 0x2f, 0x63, 0x01, 0x72, 0x00, 0x00, 0x00,
-0x31, 0x31, 0x2e, 0x31, 0x60, 0x08, 0x00, 0xa0, 0x06, 0x40,
-0x72, 0x6f, 0x6c, 0x73, 0x69, 0x08, 0x11, 0x54, 0x46, 0x06,
-0x20, 0x79, 0x00, 0x19, 0x00, 0xe3, 0x2c, 0x00, 0x73, 0x69,
-0x6d, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b,
-0x5c, 0x01, 0x21, 0x75, 0x73, 0x00, 0x02, 0x01, 0x5f, 0x08,
-0x44, 0x6d, 0x70, 0x74, 0x79, 0x75, 0x05, 0x00, 0x5b, 0x01,
-0x02, 0xab, 0x02, 0x35, 0x79, 0x70, 0x65, 0x28, 0x08, 0x23,
-0x6f, 0x72, 0xf8, 0x02, 0x22, 0x00, 0x6f, 0xc5, 0x02, 0x50,
-0x6b, 0x65, 0x79, 0x62, 0x6f, 0xce, 0x01, 0x21, 0x74, 0x6f,
-0x92, 0x04, 0x02, 0x00, 0x04, 0x02, 0x44, 0x00, 0x14, 0x2e,
-0x81, 0x03, 0x30, 0x6d, 0x61, 0x6b, 0x43, 0x00, 0x8f, 0x6d,
-0x69, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x2c, 0x80, 0x00, 0x01,
-0x02, 0xf9, 0x01, 0x03, 0xd3, 0x06, 0x08, 0x84, 0x00, 0x81,
-0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0x0a, 0x07,
-0x40, 0x6f, 0x00, 0x63, 0x6c, 0x36, 0x04, 0x50, 0x69, 0x74,
-0x00, 0x61, 0x67, 0x95, 0x07, 0x62, 0x28, 0x6f, 0x72, 0x00,
-0x75, 0x73, 0xab, 0x04, 0xd7, 0x55, 0x6e, 0x64, 0x6f, 0x00,
-0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x29, 0xff, 0x03,
-0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x74, 0x00, 0x01,
-0x5c, 0x04, 0x0f, 0xe2, 0x00, 0x04, 0x02, 0x58, 0x07, 0x12,
-0x2c, 0xc2, 0x00, 0x02, 0x0d, 0x00, 0x05, 0x87, 0x03, 0x52,
-0x65, 0x6e, 0x74, 0x65, 0x72, 0x56, 0x02, 0x06, 0x1e, 0x08,
-0x00, 0x8e, 0x06, 0x41, 0x61, 0x00, 0x60, 0x70, 0x62, 0x02,
-0x66, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x27, 0xf1, 0x06, 0x01,
-0xde, 0x09, 0x07, 0x1b, 0x00, 0x11, 0x73, 0x94, 0x03, 0x76,
-0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0xc5, 0x07, 0x04,
-0x51, 0x00, 0x00, 0x2f, 0x03, 0x04, 0x36, 0x01, 0x12, 0x53,
-0xd0, 0x05, 0x04, 0x68, 0x08, 0x00, 0xd5, 0x04, 0x06, 0xed,
-0x05, 0x05, 0xfe, 0x07, 0x02, 0xf5, 0x03, 0x01, 0x9e, 0x03,
-0x03, 0x29, 0x00, 0x09, 0x6f, 0x00, 0x10, 0x2e, 0xfd, 0x01,
-0x04, 0xc1, 0x05, 0x40, 0x70, 0x61, 0x79, 0x73, 0x7f, 0x05,
-0x50, 0x61, 0x74, 0x74, 0x65, 0x6e, 0xcf, 0x04, 0x01, 0x5e,
-0x08, 0x07, 0x2e, 0x00, 0x40, 0x2c, 0x00, 0x73, 0x6f, 0xb5,
-0x04, 0x00, 0x4f, 0x08, 0x02, 0xe5, 0x05, 0x00, 0x3a, 0x01,
-0x03, 0x5a, 0x01, 0x11, 0x6d, 0xbb, 0x00, 0x50, 0x69, 0x73,
-0x00, 0x75, 0x70, 0x38, 0x00, 0x45, 0x79, 0x6f, 0x75, 0x3a,
-0x49, 0x07, 0x05, 0x23, 0x00, 0x00, 0x76, 0x0a, 0x30, 0x65,
-0x6d, 0x69, 0x01, 0x04, 0x12, 0x73, 0x43, 0x01, 0x81, 0x61,
-0x00, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0xdd, 0x07, 0x03,
-0x32, 0x01, 0x41, 0x6e, 0x65, 0x65, 0x64, 0xdb, 0x08, 0x10,
-0x62, 0xd4, 0x08, 0x10, 0x2d, 0x27, 0x05, 0x42, 0x69, 0x6e,
-0x65, 0x64, 0xfd, 0x05, 0x00, 0x54, 0x00, 0x42, 0x6b, 0x6e,
-0x6f, 0x77, 0x93, 0x03, 0x4b, 0x61, 0x62, 0x6f, 0x75, 0x45,
-0x00, 0x04, 0xa2, 0x01, 0x2f, 0x6f, 0x72, 0x80, 0x00, 0x02,
-0x55, 0x6c, 0x69, 0x73, 0x74, 0x73, 0xa8, 0x03, 0x5a, 0x6f,
-0x73, 0x73, 0x69, 0x62, 0x6a, 0x01, 0x14, 0x61, 0x85, 0x09,
-0x01, 0x8d, 0x00, 0x01, 0x48, 0x00, 0x50, 0x61, 0x6e, 0x79,
-0x74, 0x68, 0x62, 0x01, 0x32, 0x65, 0x6c, 0x73, 0x82, 0x00,
-0xa2, 0x66, 0x65, 0x65, 0x6c, 0x00, 0x6c, 0x69, 0x6b, 0x65,
-0x2e, 0x3f, 0x03, 0x41, 0x65, 0x72, 0x61, 0x73, 0xa8, 0x0b,
-0x49, 0x69, 0x6e, 0x67, 0x6c, 0xd3, 0x01, 0x1c, 0x2c, 0x5b,
-0x02, 0x08, 0x1b, 0x02, 0x22, 0x6e, 0x64, 0x58, 0x02, 0x05,
-0xde, 0x01, 0x03, 0x52, 0x02, 0x01, 0xb8, 0x02, 0x01, 0x15,
-0x08, 0x2a, 0x6c, 0x6c, 0x20, 0x02, 0x09, 0x9c, 0x02, 0x22,
-0x72, 0x65, 0x79, 0x00, 0x30, 0x64, 0x00, 0x77, 0xa3, 0x02,
-0x00, 0x99, 0x00, 0x34, 0x6c, 0x65, 0x66, 0x6c, 0x00, 0x05,
-0x5e, 0x00, 0x18, 0x61, 0x14, 0x01, 0x0f, 0x2a, 0x00, 0x05,
-0x02, 0x43, 0x03, 0x10, 0x73, 0x43, 0x03, 0x36, 0x2e, 0x00,
-0x52, 0xb3, 0x00, 0x00, 0xf7, 0x00, 0x05, 0x20, 0x00, 0x00,
-0x0d, 0x00, 0x01, 0x23, 0x00, 0x02, 0xf4, 0x02, 0x01, 0x58,
-0x02, 0x02, 0xfb, 0x00, 0x0c, 0x56, 0x02, 0x0b, 0x53, 0x09,
-0x04, 0x7f, 0x03, 0x60, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0x11, 0x04, 0x01, 0xe1, 0x01, 0x32, 0x6d, 0x6f, 0x76, 0x18,
-0x00, 0x00, 0x38, 0x00, 0x31, 0x00, 0x61, 0x72, 0x29, 0x05,
-0x04, 0x98, 0x08, 0x34, 0x2e, 0x00, 0x50, 0x74, 0x00, 0x02,
-0xde, 0x0a, 0x40, 0x74, 0x75, 0x72, 0x6e, 0x3b, 0x00, 0x86,
-0x00, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x73, 0x3a, 0x00,
-0x11, 0x28, 0x9b, 0x0c, 0x82, 0x61, 0x00, 0x6e, 0x6f, 0x72,
-0x6d, 0x61, 0x6c, 0x14, 0x00, 0x00, 0x13, 0x0d, 0x08, 0x97,
-0x00, 0x24, 0x29, 0x2c, 0x12, 0x01, 0x01, 0xd3, 0x00, 0x04,
-0x6b, 0x01, 0x20, 0x69, 0x6e, 0xb5, 0x02, 0x0f, 0xbb, 0x03,
-0x03, 0x03, 0x0e, 0x00, 0x80, 0x61, 0x70, 0x70, 0x72, 0x6f,
-0x70, 0x72, 0x69, 0xfa, 0x05, 0x44, 0x77, 0x61, 0x79, 0x3b,
-0x44, 0x00, 0x01, 0x8c, 0x01, 0x21, 0x30, 0x00, 0x5e, 0x04,
-0x04, 0xa6, 0x00, 0x02, 0x1e, 0x01, 0x23, 0x62, 0x61, 0x16,
-0x04, 0x02, 0x8a, 0x04, 0x14, 0x61, 0x52, 0x0d, 0x04, 0xbd,
-0x03, 0x43, 0x00, 0x00, 0x28, 0x41, 0x15, 0x09, 0x30, 0x61,
-0x63, 0x74, 0x8a, 0x08, 0x82, 0x00, 0x64, 0x65, 0x73, 0x63,
-0x72, 0x69, 0x62, 0x84, 0x00, 0x31, 0x73, 0x65, 0x63, 0x81,
-0x03, 0x32, 0x32, 0x2e, 0x31, 0x58, 0x0a, 0x00, 0x69, 0x01,
-0x05, 0x19, 0x0a, 0x22, 0x2e, 0x29, 0xca, 0x05, 0x12, 0x32,
-0xca, 0x05, 0x60, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x67,
-0x08, 0x00, 0xcc, 0x05, 0x00, 0x13, 0x00, 0x00, 0x72, 0x09,
-0x22, 0x6f, 0x77, 0x8d, 0x09, 0x11, 0x74, 0xfa, 0x03, 0x40,
-0x66, 0x69, 0x67, 0x75, 0xbc, 0x08, 0x10, 0x77, 0x60, 0x0b,
-0x00, 0x31, 0x00, 0x10, 0x74, 0x5b, 0x08, 0x41, 0x6d, 0x65,
-0x6e, 0x73, 0x7d, 0x00, 0x0a, 0xb7, 0x06, 0x01, 0x5c, 0x08,
-0x03, 0xbb, 0x05, 0xc7, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27,
-0x00, 0x6d, 0x65, 0x6e, 0x75, 0x3a, 0x59, 0x0c, 0x00, 0x32,
-0x00, 0x02, 0x99, 0x0d, 0x03, 0x15, 0x0a, 0x0a, 0x1b, 0x00,
-0x00, 0x5b, 0x0e, 0x12, 0x2c, 0x4d, 0x0a, 0x06, 0x2c, 0x0b,
-0x01, 0x21, 0x0d, 0x0b, 0x71, 0x0a, 0x47, 0x2e, 0x00, 0x28,
-0x54, 0x4c, 0x0e, 0x13, 0x61, 0xb2, 0x0d, 0x25, 0x69, 0x73,
-0xe5, 0x07, 0x23, 0x72, 0x73, 0x0b, 0x0d, 0x5f, 0x69, 0x73,
-0x3a, 0x00, 0x66, 0x36, 0x09, 0x07, 0x14, 0x32, 0x90, 0x00,
-0x01, 0x8f, 0x00, 0x13, 0x33, 0x83, 0x00, 0x01, 0xa8, 0x0a,
-0x03, 0x8b, 0x0c, 0x02, 0x5b, 0x00, 0x01, 0x97, 0x01, 0x01,
-0x78, 0x05, 0x19, 0x33, 0x32, 0x00, 0x12, 0x32, 0x10, 0x0f,
-0x16, 0x29, 0x13, 0x06, 0x14, 0x74, 0x80, 0x06, 0xd2, 0x60,
-0x58, 0x27, 0x00, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62, 0x6f,
-0x78, 0x2c, 0x61, 0x01, 0x02, 0xff, 0x02, 0x10, 0x70, 0x28,
-0x07, 0x00, 0x22, 0x00, 0x04, 0x31, 0x0e, 0x61, 0x00, 0x65,
-0x78, 0x74, 0x72, 0x61, 0xac, 0x08, 0x50, 0x74, 0x72, 0x61,
-0x69, 0x6e, 0x07, 0x0b, 0x03, 0x0c, 0x0b, 0x0e, 0x23, 0x0e,
-0x08, 0x3d, 0x0f, 0x0a, 0xa3, 0x05, 0x01, 0x2e, 0x0e, 0x13,
-0x66, 0xc4, 0x0e, 0x03, 0x24, 0x0e, 0x11, 0x28, 0xc6, 0x09,
-0x21, 0x69, 0x73, 0x1d, 0x0e, 0x51, 0x74, 0x69, 0x6d, 0x65,
-0x73, 0x07, 0x05, 0x10, 0x6e, 0xd4, 0x04, 0x03, 0x43, 0x09,
-0x30, 0x2d, 0x58, 0x27, 0x3d, 0x02, 0x06, 0x6b, 0x09, 0x2b,
-0x2e, 0x29, 0x32, 0x0c, 0x06, 0xdc, 0x02, 0x00, 0x98, 0x0e,
-0x0f, 0x98, 0x00, 0x05, 0x04, 0xd0, 0x06, 0x40, 0x73, 0x68,
-0x61, 0x64, 0xb5, 0x02, 0x10, 0x6c, 0x0e, 0x04, 0x00, 0x52,
-0x10, 0x12, 0x6f, 0xcf, 0x00, 0x05, 0x83, 0x05, 0x01, 0xfb,
-0x09, 0x20, 0x65, 0x6e, 0x94, 0x02, 0x2f, 0x64, 0x2e, 0x39,
-0x01, 0x01, 0x13, 0x4a, 0x3a, 0x0d, 0x0f, 0x3e, 0x01, 0x01,
-0x41, 0x67, 0x65, 0x6e, 0x65, 0x88, 0x02, 0x73, 0x72, 0x61,
-0x6e, 0x64, 0x6f, 0x6d, 0x6c, 0x34, 0x0d, 0x08, 0xb3, 0x10,
-0x1e, 0x2e, 0xbf, 0x00, 0x08, 0x58, 0x0e, 0x03, 0xa4, 0x0b,
-0x03, 0xae, 0x00, 0x00, 0x36, 0x08, 0x13, 0x6e, 0x36, 0x06,
-0x01, 0xcd, 0x02, 0x5d, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x11,
-0x0f, 0x0b, 0xea, 0x03, 0x22, 0x60, 0x43, 0x04, 0x02, 0x03,
-0x2f, 0x0b, 0x30, 0x52, 0x6f, 0x77, 0xf9, 0x0c, 0x41, 0x6f,
-0x78, 0x65, 0x73, 0xe9, 0x0e, 0x00, 0x05, 0x04, 0x01, 0x15,
-0x07, 0x50, 0x72, 0x65, 0x61, 0x73, 0x6f, 0xfa, 0x0d, 0x34,
-0x79, 0x00, 0x79, 0x97, 0x11, 0x22, 0x74, 0x6f, 0x4e, 0x00,
-0x06, 0x4d, 0x04, 0x10, 0x67, 0x18, 0x0a, 0x22, 0x65, 0x72,
-0x24, 0x0c, 0x10, 0x31, 0x64, 0x00, 0x42, 0x62, 0x6f, 0x74,
-0x68, 0x50, 0x00, 0x22, 0x3b, 0x00, 0x0e, 0x01, 0x02, 0xd7,
-0x0d, 0x21, 0x68, 0x61, 0x57, 0x00, 0x07, 0x2a, 0x02, 0x03,
-0x90, 0x01, 0x05, 0xd9, 0x00, 0x05, 0xb9, 0x0a, 0x00, 0xc2,
-0x06, 0x01, 0xe4, 0x0c, 0x20, 0x62, 0x65, 0xd2, 0x04, 0x26,
-0x72, 0x69, 0x28, 0x06, 0x2a, 0x69, 0x66, 0x8e, 0x06, 0x3f,
-0x00, 0x69, 0x74, 0x88, 0x01, 0x02, 0x12, 0x4b, 0x41, 0x0e,
-0x0f, 0x88, 0x01, 0x0b, 0x10, 0x61, 0x0e, 0x10, 0x00, 0x2f,
-0x01, 0x00, 0xdc, 0x03, 0x00, 0x02, 0x0e, 0x04, 0x6a, 0x12,
-0x2e, 0x61, 0x72, 0xa5, 0x01, 0x00, 0x9c, 0x00, 0x41, 0x64,
-0x72, 0x61, 0x77, 0x72, 0x0e, 0x00, 0x99, 0x0d, 0x20, 0x75,
-0x74, 0x23, 0x0e, 0x02, 0xc5, 0x03, 0x02, 0xf0, 0x0e, 0x00,
-0x1f, 0x0b, 0x02, 0x40, 0x0e, 0x03, 0x66, 0x12, 0x02, 0x8a,
-0x01, 0x24, 0x73, 0x65, 0x7e, 0x0d, 0x06, 0x24, 0x11, 0x51,
-0x61, 0x00, 0x73, 0x6d, 0x61, 0x89, 0x0c, 0x00, 0xd4, 0x0e,
-0x03, 0x77, 0x00, 0x20, 0x73, 0x68, 0xc4, 0x04, 0x05, 0x05,
-0x0d, 0x0c, 0x4e, 0x0e, 0x04, 0xc8, 0x02, 0x13, 0x69, 0x23,
-0x02, 0x02, 0x55, 0x00, 0x04, 0x4d, 0x11, 0x05, 0x4f, 0x10,
-0x07, 0xfd, 0x04, 0x22, 0x68, 0x65, 0x10, 0x07, 0x00, 0x35,
-0x10, 0x71, 0x79, 0x6d, 0x6d, 0x65, 0x74, 0x72, 0x79, 0x65,
-0x00, 0x05, 0x36, 0x0f, 0x04, 0x0b, 0x01, 0x16, 0x64, 0x10,
-0x0d, 0x10, 0x4d, 0x66, 0x08, 0x05, 0x2e, 0x00, 0x00, 0xa4,
-0x0a, 0x17, 0x73, 0x2b, 0x05, 0x60, 0x73, 0x00, 0x6c, 0x6f,
-0x6f, 0x6b, 0x1c, 0x07, 0x30, 0x74, 0x74, 0x69, 0xe2, 0x0f,
-0x13, 0x75, 0xb8, 0x0e, 0x00, 0x7a, 0x00, 0x01, 0xd1, 0x0a,
-0x01, 0x77, 0x08, 0x60, 0x65, 0x61, 0x73, 0x69, 0x65, 0x72,
-0x5a, 0x0b, 0x13, 0x6e, 0xab, 0x11, 0x05, 0x52, 0x00, 0x06,
-0x01, 0x02, 0x01, 0xae, 0x09, 0x00, 0xe2, 0x04, 0x22, 0x63,
-0x65, 0xdc, 0x08, 0x02, 0xdf, 0x0f, 0x01, 0x4b, 0x02, 0x60,
-0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, 0x58, 0x10, 0x02, 0xe0,
-0x02, 0x00, 0x8d, 0x07, 0x70, 0x65, 0x6e, 0x74, 0x2e, 0x00,
-0x43, 0x6f, 0x0c, 0x05, 0x63, 0x74, 0x65, 0x6c, 0x79, 0x00,
-0x61, 0x54, 0x00, 0x25, 0x69, 0x63, 0x9d, 0x00, 0x02, 0xa6,
-0x02, 0x00, 0x0f, 0x10, 0x86, 0x72, 0x65, 0x65, 0x64, 0x6f,
-0x6d, 0x00, 0x74, 0x64, 0x04, 0x00, 0x0e, 0x0d, 0x24, 0x65,
-0x77, 0x44, 0x10, 0x15, 0x73, 0x0b, 0x09, 0x00, 0x41, 0x01,
-0x23, 0x46, 0x69, 0xfd, 0x12, 0x04, 0x41, 0x09, 0x0a, 0x45,
-0x01, 0x00, 0xdf, 0x01, 0x00, 0x6d, 0x09, 0x15, 0x74, 0xf0,
-0x0c, 0x0f, 0x39, 0x01, 0x00, 0x16, 0x44, 0x25, 0x00, 0x52,
-0x6c, 0x65, 0x76, 0x65, 0x6c, 0xa9, 0x10, 0x42, 0x6a, 0x75,
-0x64, 0x67, 0x19, 0x0e, 0x01, 0x0e, 0x08, 0x01, 0xbe, 0x00,
-0x26, 0x78, 0x69, 0x49, 0x00, 0x82, 0x74, 0x65, 0x63, 0x68,
-0x6e, 0x69, 0x71, 0x75, 0xaf, 0x0f, 0x42, 0x64, 0x65, 0x64,
-0x75, 0x09, 0x07, 0x03, 0x83, 0x0f, 0x01, 0x42, 0x0c, 0x57,
-0x73, 0x6f, 0x6c, 0x76, 0x65, 0x85, 0x01, 0x12, 0x3a, 0xe6,
-0x05, 0x01, 0x66, 0x00, 0x06, 0xac, 0x0f, 0x12, 0x61, 0x68,
-0x03, 0x23, 0x6f, 0x66, 0xbb, 0x03, 0x00, 0xa1, 0x07, 0x02,
-0x58, 0x02, 0x11, 0x77, 0x7b, 0x03, 0x17, 0x74, 0x55, 0x01,
-0x23, 0x69, 0x6e, 0x32, 0x04, 0x21, 0x65, 0x76, 0xad, 0x0e,
-0x31, 0x6f, 0x6e, 0x65, 0x7b, 0x04, 0x06, 0x56, 0x0a, 0x10,
-0x2c, 0x9f, 0x03, 0x1d, 0x64, 0xd3, 0x00, 0x83, 0x60, 0x54,
-0x72, 0x69, 0x76, 0x69, 0x61, 0x6c, 0x3e, 0x04, 0x70, 0x42,
-0x61, 0x73, 0x69, 0x63, 0x27, 0x00, 0xc7, 0x11, 0x06, 0x98,
-0x04, 0x05, 0xaf, 0x09, 0x04, 0x4d, 0x01, 0x01, 0x02, 0x0d,
-0x06, 0x5c, 0x15, 0x03, 0x33, 0x0a, 0x04, 0xfa, 0x09, 0x12,
-0x74, 0xe1, 0x02, 0x22, 0x69, 0x6d, 0x80, 0x03, 0x10, 0x65,
-0xbe, 0x00, 0x00, 0x16, 0x00, 0x20, 0x60, 0x49, 0x6b, 0x04,
-0x30, 0x6d, 0x65, 0x64, 0x87, 0x08, 0x13, 0x27, 0xee, 0x00,
-0x20, 0x61, 0x6e, 0x3b, 0x11, 0x42, 0x79, 0x6f, 0x6e, 0x64,
-0x79, 0x11, 0x05, 0xdc, 0x06, 0x13, 0x74, 0x7f, 0x02, 0x01,
-0xc2, 0x00, 0x26, 0x61, 0x6c, 0x4a, 0x01, 0x13, 0x73, 0x33,
-0x0b, 0x01, 0x85, 0x02, 0x02, 0xef, 0x03, 0x04, 0x49, 0x03,
-0x05, 0xc6, 0x04, 0x13, 0x63, 0x93, 0x11, 0x13, 0x00, 0x3c,
-0x0d, 0x07, 0x2c, 0x00, 0x04, 0x46, 0x05, 0x02, 0xc1, 0x11,
-0x07, 0x28, 0x00, 0x04, 0xe6, 0x00, 0x00, 0x4e, 0x13, 0x52,
-0x74, 0x00, 0x60, 0x55, 0x6e, 0x76, 0x01, 0x00, 0x1b, 0x06,
-0x03, 0xad, 0x00, 0x03, 0xa9, 0x11, 0x13, 0x74, 0xc7, 0x06,
-0x00, 0x82, 0x01, 0x20, 0x65, 0x6e, 0x42, 0x10, 0x02, 0xe9,
-0x04, 0x05, 0xc0, 0x00, 0x10, 0x65, 0xd9, 0x0f, 0x02, 0xc3,
-0x16, 0x09, 0xcb, 0x00, 0x86, 0x61, 0x00, 0x67, 0x75, 0x65,
-0x73, 0x73, 0x2c, 0x93, 0x0d, 0x70, 0x62, 0x61, 0x63, 0x6b,
-0x74, 0x72, 0x61, 0x30, 0x08, 0x10, 0x66, 0x29, 0x05, 0x00,
-0x20, 0x0a, 0x10, 0x73, 0x8a, 0x04, 0x03, 0x26, 0x03, 0x50,
-0x77, 0x72, 0x6f, 0x6e, 0x67, 0xd0, 0x02, 0x12, 0x47, 0x9f,
-0x02, 0x00, 0x03, 0x02, 0x05, 0xc4, 0x01, 0x05, 0x25, 0x03,
-0x00, 0x8f, 0x00, 0x56, 0x74, 0x73, 0x65, 0x6c, 0x66, 0x1c,
-0x00, 0x1b, 0x3a, 0x5c, 0x08, 0x03, 0x90, 0x07, 0x02, 0xe9,
-0x0f, 0x10, 0x67, 0xa5, 0x13, 0x0d, 0x0b, 0x02, 0x03, 0x52,
-0x05, 0x2b, 0x6d, 0x61, 0xb6, 0x00, 0x01, 0x93, 0x17, 0x00,
-0x52, 0x0d, 0x31, 0x6d, 0x70, 0x74, 0xc8, 0x01, 0x16, 0x67,
-0x8c, 0x00, 0x05, 0x6c, 0x12, 0x30, 0x62, 0x65, 0x66, 0xf1,
-0x03, 0x00, 0x63, 0x17, 0x41, 0x69, 0x6e, 0x64, 0x73, 0x70,
-0x00, 0x10, 0x68, 0x30, 0x0f, 0x02, 0x21, 0x01, 0x22, 0x00,
-0x66, 0xcc, 0x0c, 0x31, 0x2e, 0x00, 0x42, 0xa5, 0x02, 0x23,
-0x70, 0x61, 0x0a, 0x03, 0xc1, 0x77, 0x61, 0x69, 0x74, 0x2c,
-0x00, 0x65, 0x73, 0x70, 0x65, 0x63, 0x69, 0x31, 0x01, 0x26,
-0x69, 0x66, 0x9e, 0x06, 0x0a, 0xfe, 0x04, 0x95, 0x64, 0x00,
-0x61, 0x00, 0x6c, 0x61, 0x72, 0x67, 0x65, 0xe0, 0x12, 0x50,
-0x69, 0x7a, 0x65, 0x2e, 0x00,
+0x2d, 0x01, 0x00, 0xf0, 0x42, 0x00, 0x00, 0x00, 0x59, 0x6f,
+0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x73,
+0x71, 0x75, 0x61, 0x72, 0x65, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x2c, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x69, 0x73,
+0x00, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x00, 0x69,
+0x6e, 0x74, 0x6f, 0x00, 0x61, 0x73, 0x00, 0x6d, 0x61, 0x6e,
+0x79, 0x00, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x00,
+0x73, 0x69, 0x7a, 0x65, 0x64, 0x00, 0x73, 0x75, 0x62, 0x2d,
+0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x73, 0x21, 0x00, 0x22, 0x74,
+0x68, 0x44, 0x00, 0xf4, 0x00, 0x00, 0x68, 0x61, 0x73, 0x00,
+0x72, 0x6f, 0x77, 0x73, 0x2e, 0x00, 0x45, 0x61, 0x63, 0x68,
+0x5f, 0x00, 0xc1, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x62, 0x65,
+0x00, 0x66, 0x69, 0x6c, 0x6c, 0x57, 0x00, 0xf1, 0x08, 0x00,
+0x77, 0x69, 0x74, 0x68, 0x00, 0x61, 0x00, 0x64, 0x69, 0x67,
+0x69, 0x74, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x31, 0x00,
+0x74, 0x6f, 0x48, 0x00, 0x00, 0x60, 0x00, 0x35, 0x00, 0x6f,
+0x66, 0x54, 0x00, 0x10, 0x2c, 0x30, 0x00, 0x30, 0x73, 0x75,
+0x63, 0x30, 0x00, 0xf0, 0x03, 0x77, 0x61, 0x79, 0x00, 0x74,
+0x68, 0x61, 0x74, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x65, 0x76,
+0x65, 0x72, 0x79, 0x6e, 0x00, 0xf1, 0x0d, 0x00, 0x63, 0x6f,
+0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x00, 0x6f, 0x6e, 0x6c,
+0x79, 0x00, 0x6f, 0x6e, 0x65, 0x00, 0x6f, 0x63, 0x63, 0x75,
+0x72, 0x72, 0x65, 0x6e, 0x63, 0x4b, 0x00, 0x10, 0x65, 0x8c,
+0x00, 0x02, 0x6c, 0x00, 0x06, 0x39, 0x00, 0x6f, 0x63, 0x6f,
+0x6c, 0x75, 0x6d, 0x6e, 0x3c, 0x00, 0x23, 0x01, 0xfa, 0x00,
+0x0f, 0x3b, 0x00, 0x18, 0x11, 0x2e, 0x3c, 0x00, 0x70, 0x28,
+0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x01, 0xf2, 0x02,
+0x2c, 0x00, 0x62, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61, 0x75,
+0x6c, 0x74, 0x00, 0x6f, 0x66, 0x66, 0x29, 0x2d, 0x00, 0x03,
+0xf7, 0x00, 0x02, 0x37, 0x01, 0xf0, 0x01, 0x27, 0x73, 0x00,
+0x74, 0x77, 0x6f, 0x00, 0x6d, 0x61, 0x69, 0x6e, 0x00, 0x64,
+0x69, 0x61, 0x67, 0x3a, 0x00, 0x1f, 0x73, 0x75, 0x00, 0x1c,
+0x00, 0xeb, 0x01, 0x01, 0xe1, 0x01, 0x85, 0x69, 0x76, 0x65,
+0x6e, 0x00, 0x73, 0x6f, 0x6d, 0x5b, 0x01, 0x61, 0x6e, 0x75,
+0x6d, 0x62, 0x65, 0x72, 0xbe, 0x01, 0xf0, 0x00, 0x63, 0x6c,
+0x75, 0x65, 0x73, 0x3b, 0x00, 0x79, 0x6f, 0x75, 0x72, 0x00,
+0x61, 0x69, 0x6d, 0x02, 0x02, 0x81, 0x74, 0x6f, 0x00, 0x70,
+0x6c, 0x61, 0x63, 0x65, 0x2b, 0x00, 0x4c, 0x72, 0x65, 0x73,
+0x74, 0x37, 0x00, 0x90, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63,
+0x74, 0x6c, 0x79, 0x66, 0x00, 0x51, 0x55, 0x6e, 0x64, 0x65,
+0x72, 0x1f, 0x00, 0x04, 0xd3, 0x00, 0x92, 0x73, 0x65, 0x74,
+0x74, 0x69, 0x6e, 0x67, 0x73, 0x2c, 0xd0, 0x00, 0x07, 0x2d,
+0x02, 0x24, 0x72, 0x65, 0x16, 0x02, 0x30, 0x6f, 0x72, 0x00,
+0x43, 0x00, 0xa7, 0x61, 0x6e, 0x67, 0x75, 0x6c, 0x61, 0x72,
+0x2e, 0x00, 0x54, 0x40, 0x00, 0x53, 0x70, 0x75, 0x7a, 0x7a,
+0x6c, 0x0c, 0x02, 0xf3, 0x05, 0x69, 0x73, 0x00, 0x33, 0x78,
+0x33, 0x00, 0x28, 0x61, 0x00, 0x39, 0x78, 0x39, 0x00, 0x61,
+0x63, 0x74, 0x75, 0x61, 0x6c, 0x1a, 0x02, 0x09, 0xa9, 0x02,
+0x41, 0x6e, 0x69, 0x6e, 0x65, 0x2a, 0x00, 0x02, 0x6b, 0x00,
+0x21, 0x29, 0x2e, 0xfe, 0x00, 0xf1, 0x00, 0x63, 0x61, 0x6e,
+0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x73, 0x65, 0x6c, 0x65,
+0x63, 0x74, 0x53, 0x00, 0x12, 0x73, 0x80, 0x02, 0x07, 0x7e,
+0x00, 0x13, 0x00, 0x9f, 0x00, 0x70, 0x69, 0x6e, 0x73, 0x74,
+0x65, 0x61, 0x64, 0xee, 0x00, 0x04, 0xa6, 0x00, 0x43, 0x6e,
+0x65, 0x73, 0x2c, 0x80, 0x02, 0x32, 0x73, 0x00, 0x32, 0x89,
+0x00, 0x32, 0x36, 0x78, 0x36, 0xf0, 0x02, 0x09, 0x81, 0x00,
+0x76, 0x73, 0x69, 0x78, 0x00, 0x33, 0x78, 0x32, 0x80, 0x00,
+0xb0, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69,
+0x76, 0x65, 0xf3, 0x01, 0x13, 0x79, 0x8f, 0x00, 0x03, 0x8a,
+0x00, 0xd1, 0x60, 0x6a, 0x69, 0x67, 0x73, 0x61, 0x77, 0x27,
+0x00, 0x6d, 0x6f, 0x64, 0x65, 0xe6, 0x02, 0x02, 0x81, 0x03,
+0x0f, 0x32, 0x01, 0x00, 0xe0, 0x61, 0x72, 0x62, 0x69, 0x74,
+0x72, 0x61, 0x72, 0x79, 0x00, 0x73, 0x68, 0x61, 0x70, 0xc0,
+0x00, 0x21, 0x68, 0x69, 0xe7, 0x01, 0xf1, 0x00, 0x66, 0x66,
+0x65, 0x72, 0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e,
+0x00, 0x69, 0x6e, 0x8f, 0x00, 0x00, 0x1f, 0x01, 0x02, 0x40,
+0x01, 0x10, 0x73, 0x9d, 0x01, 0xf1, 0x02, 0x41, 0x6e, 0x6f,
+0x74, 0x68, 0x65, 0x72, 0x00, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x65, 0x70, 0x00, 0x00, 0x56, 0x01, 0x20,
+0x60, 0x6b, 0x90, 0x03, 0xb3, 0x72, 0x27, 0x2e, 0x00, 0x49,
+0x6e, 0x00, 0x74, 0x68, 0x69, 0x73, 0x8a, 0x00, 0x01, 0x10,
+0x02, 0x01, 0x78, 0x00, 0x33, 0x6e, 0x6f, 0x74, 0x3b, 0x02,
+0x21, 0x69, 0x6e, 0x98, 0x00, 0x40, 0x66, 0x6f, 0x72, 0x6d,
+0x1d, 0x01, 0x02, 0xca, 0x03, 0x33, 0x2d, 0x69, 0x6e, 0x27,
+0x01, 0x24, 0x73, 0x3b, 0x3b, 0x01, 0x16, 0x2c, 0x0d, 0x04,
+0x0c, 0x4a, 0x04, 0x91, 0x60, 0x63, 0x61, 0x67, 0x65, 0x73,
+0x27, 0x00, 0x62, 0x7d, 0x03, 0x81, 0x6f, 0x75, 0x72, 0x65,
+0x64, 0x00, 0x6c, 0x69, 0x60, 0x01, 0x30, 0x61, 0x6e, 0x64,
+0x5c, 0x00, 0x02, 0xbe, 0x02, 0x00, 0x27, 0x00, 0x02, 0x46,
+0x00, 0x91, 0x61, 0x6d, 0x65, 0x00, 0x74, 0x65, 0x6c, 0x6c,
+0x73, 0x3c, 0x01, 0x10, 0x77, 0xfa, 0x03, 0x02, 0x1e, 0x01,
+0x01, 0x85, 0x00, 0x32, 0x61, 0x6c, 0x6c, 0x75, 0x02, 0x00,
+0xee, 0x02, 0x00, 0xbc, 0x01, 0x02, 0x1c, 0x04, 0x01, 0x3f,
+0x00, 0x90, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x62,
+0x65, 0x86, 0x01, 0x63, 0x73, 0x6f, 0x2c, 0x00, 0x6e, 0x6f,
+0xc6, 0x03, 0xe0, 0x6d, 0x61, 0x79, 0x00, 0x61, 0x70, 0x70,
+0x65, 0x61, 0x72, 0x00, 0x6d, 0x6f, 0x72, 0x69, 0x00, 0x40,
+0x61, 0x6e, 0x00, 0x6f, 0x3e, 0x03, 0x00, 0x15, 0x02, 0x41,
+0x69, 0x6e, 0x00, 0x61, 0x42, 0x00, 0x31, 0x2c, 0x00, 0x65,
+0xf8, 0x00, 0x02, 0xf7, 0x02, 0x01, 0x54, 0x00, 0x62, 0x63,
+0x72, 0x6f, 0x73, 0x73, 0x65, 0xee, 0x04, 0xa1, 0x62, 0x6f,
+0x75, 0x6e, 0x64, 0x61, 0x72, 0x69, 0x65, 0x73, 0x75, 0x03,
+0x30, 0x78, 0x69, 0x73, 0xf0, 0x02, 0x71, 0x00, 0x72, 0x65,
+0x67, 0x69, 0x6f, 0x6e, 0x78, 0x01, 0x21, 0x49, 0x66, 0xb5,
+0x00, 0x03, 0xed, 0x01, 0x19, 0x61, 0xd3, 0x02, 0x02, 0xbf,
+0x01, 0x87, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73,
+0x88, 0x00, 0x13, 0x39, 0xcd, 0x00, 0x02, 0x46, 0x01, 0x42,
+0x61, 0x64, 0x64, 0x69, 0x32, 0x04, 0x04, 0xe4, 0x00, 0x40,
+0x77, 0x69, 0x6c, 0x6c, 0x4a, 0x05, 0x40, 0x6c, 0x65, 0x74,
+0x74, 0x87, 0x03, 0x03, 0x96, 0x03, 0xb0, 0x61, 0x6c, 0x70,
+0x68, 0x61, 0x62, 0x65, 0x74, 0x2e, 0x00, 0x46, 0x45, 0x01,
+0x50, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x53, 0x02, 0x09, 0x83,
+0x00, 0x30, 0x33, 0x78, 0x34, 0x2d, 0x00, 0x18, 0x6e, 0x34,
+0x01, 0x02, 0x89, 0x00, 0x20, 0x67, 0x6f, 0x3d, 0x01, 0x01,
+0x00, 0x04, 0x01, 0xb9, 0x01, 0x04, 0x66, 0x00, 0x01, 0x94,
+0x05, 0xf1, 0x01, 0x39, 0x2c, 0x00, 0x70, 0x6c, 0x75, 0x73,
+0x00, 0x60, 0x61, 0x27, 0x2c, 0x00, 0x60, 0x62, 0x27, 0xac,
+0x01, 0x30, 0x60, 0x63, 0x27, 0xb1, 0x03, 0x20, 0x69, 0x73,
+0xd1, 0x02, 0x21, 0x6e, 0x6f, 0xde, 0x05, 0x02, 0x67, 0x00,
+0x12, 0x65, 0xc9, 0x01, 0x02, 0x5b, 0x02, 0x08, 0x88, 0x02,
+0xb2, 0x49, 0x00, 0x66, 0x69, 0x72, 0x73, 0x74, 0x00, 0x73,
+0x61, 0x77, 0x6d, 0x02, 0x03, 0x11, 0x01, 0xf2, 0x0d, 0x69,
+0x6e, 0x00, 0x4e, 0x69, 0x6b, 0x6f, 0x6c, 0x69, 0x00, 0x5b,
+0x35, 0x5d, 0x2c, 0x00, 0x61, 0x6c, 0x74, 0x68, 0x6f, 0x75,
+0x67, 0x68, 0x00, 0x69, 0x74, 0x27, 0x73, 0xba, 0x03, 0x10,
+0x62, 0xdd, 0x02, 0x30, 0x70, 0x6f, 0x70, 0xa9, 0x03, 0x40,
+0x69, 0x73, 0x65, 0x64, 0x41, 0x02, 0xf0, 0x00, 0x76, 0x61,
+0x72, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x6e, 0x65, 0x77, 0x73,
+0x70, 0x61, 0x70, 0x0c, 0x01, 0x15, 0x75, 0x86, 0x04, 0x10,
+0x6e, 0x38, 0x02, 0x80, 0x60, 0x53, 0x75, 0x64, 0x6f, 0x6b,
+0x75, 0x27, 0x68, 0x04, 0x50, 0x60, 0x53, 0x75, 0x00, 0x44,
+0x0d, 0x00, 0xf1, 0x01, 0x2e, 0x00, 0x48, 0x6f, 0x77, 0x61,
+0x72, 0x64, 0x00, 0x47, 0x61, 0x72, 0x6e, 0x73, 0x00, 0x69,
+0x50, 0x05, 0x40, 0x73, 0x69, 0x64, 0x65, 0x8c, 0x02, 0x20,
+0x74, 0x68, 0x8e, 0x00, 0x64, 0x76, 0x65, 0x6e, 0x74, 0x6f,
+0x72, 0x5a, 0x01, 0x00, 0x12, 0x03, 0x25, 0x72, 0x6e, 0xf8,
+0x02, 0x00, 0x13, 0x00, 0x02, 0xb8, 0x00, 0x02, 0xb4, 0x02,
+0x63, 0x69, 0x74, 0x00, 0x77, 0x61, 0x73, 0xda, 0x00, 0x72,
+0x70, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0xe2, 0x06, 0xd2,
+0x44, 0x65, 0x6c, 0x6c, 0x20, 0x50, 0x65, 0x6e, 0x63, 0x69,
+0x6c, 0x20, 0x50, 0x06, 0x01, 0xd0, 0x20, 0x61, 0x6e, 0x64,
+0x20, 0x57, 0x6f, 0x72, 0x64, 0x20, 0x47, 0x61, 0x6d, 0x15,
+0x01, 0x12, 0x41, 0xfa, 0x01, 0xf5, 0x03, 0x65, 0x6c, 0x61,
+0x62, 0x6f, 0x72, 0x61, 0x74, 0x65, 0x00, 0x74, 0x72, 0x65,
+0x61, 0x74, 0x6d, 0x65, 0x6e, 0x6f, 0x05, 0x7a, 0x68, 0x69,
+0x73, 0x74, 0x6f, 0x72, 0x79, 0x7b, 0x00, 0x01, 0x45, 0x04,
+0x00, 0x4f, 0x07, 0x00, 0x84, 0x02, 0xf0, 0x02, 0x00, 0x6f,
+0x6e, 0x00, 0x57, 0x69, 0x6b, 0x69, 0x70, 0x65, 0x64, 0x69,
+0x61, 0x00, 0x5b, 0x36, 0x5d, 0x6c, 0x01, 0xf1, 0x02, 0x5b,
+0x35, 0x5d, 0x00, 0x68, 0x74, 0x74, 0x70, 0x73, 0x3a, 0x2f,
+0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6e, 0x61, 0x01, 0xa3, 0x2e,
+0x63, 0x6f, 0x2e, 0x6a, 0x70, 0x2f, 0x65, 0x6e, 0x2f, 0x97,
+0x01, 0x21, 0x2f, 0x73, 0x23, 0x01, 0x10, 0x2f, 0x32, 0x00,
+0x12, 0x36, 0x32, 0x00, 0x74, 0x3a, 0x2f, 0x2f, 0x65, 0x6e,
+0x2e, 0x77, 0x51, 0x00, 0x50, 0x2e, 0x6f, 0x72, 0x67, 0x2f,
+0x0e, 0x00, 0x12, 0x2f, 0x4e, 0x01, 0x72, 0x00, 0x00, 0x00,
+0x31, 0x31, 0x2e, 0x31, 0x5c, 0x08, 0x00, 0x8b, 0x06, 0x91,
+0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x31,
+0x06, 0x20, 0x79, 0x00, 0x19, 0x00, 0xe3, 0x2c, 0x00, 0x73,
+0x69, 0x6d, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0x47, 0x01, 0x21, 0x75, 0x73, 0xeb, 0x01, 0x01, 0x4a,
+0x08, 0x44, 0x6d, 0x70, 0x74, 0x79, 0x60, 0x05, 0x00, 0x46,
+0x01, 0x02, 0x96, 0x02, 0x35, 0x79, 0x70, 0x65, 0x13, 0x08,
+0x23, 0x6f, 0x72, 0xe3, 0x02, 0x22, 0x00, 0x6f, 0xb0, 0x02,
+0x50, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0xb9, 0x01, 0x21, 0x74,
+0x6f, 0x7d, 0x04, 0x02, 0xeb, 0x03, 0x02, 0x44, 0x00, 0x14,
+0x2e, 0x6c, 0x03, 0x30, 0x6d, 0x61, 0x6b, 0x43, 0x00, 0x8f,
+0x6d, 0x69, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x2c, 0x80, 0x00,
+0x01, 0x02, 0xe4, 0x01, 0x03, 0xbe, 0x06, 0x08, 0x84, 0x00,
+0x81, 0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0xf5,
+0x06, 0x40, 0x6f, 0x00, 0x63, 0x6c, 0x21, 0x04, 0x50, 0x69,
+0x74, 0x00, 0x61, 0x67, 0x80, 0x07, 0x62, 0x28, 0x6f, 0x72,
+0x00, 0x75, 0x73, 0x96, 0x04, 0xd7, 0x55, 0x6e, 0x64, 0x6f,
+0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x29, 0xea,
+0x03, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x74, 0x00,
+0x01, 0x47, 0x04, 0x0f, 0xe2, 0x00, 0x04, 0x02, 0x43, 0x07,
+0x12, 0x2c, 0xc2, 0x00, 0x02, 0x0d, 0x00, 0x05, 0x72, 0x03,
+0x52, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x41, 0x02, 0x06, 0x09,
+0x08, 0x00, 0x79, 0x06, 0x41, 0x61, 0x00, 0x60, 0x70, 0x4d,
+0x02, 0x66, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x27, 0xdc, 0x06,
+0x01, 0xc9, 0x09, 0x07, 0x1b, 0x00, 0x11, 0x73, 0x7f, 0x03,
+0x76, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0xb0, 0x07,
+0x04, 0x51, 0x00, 0x00, 0x1a, 0x03, 0x04, 0x36, 0x01, 0x12,
+0x53, 0xbb, 0x05, 0x04, 0x53, 0x08, 0x00, 0xc0, 0x04, 0x06,
+0xd8, 0x05, 0x05, 0xe9, 0x07, 0x02, 0xe0, 0x03, 0x01, 0x89,
+0x03, 0x03, 0x29, 0x00, 0x09, 0x6f, 0x00, 0x10, 0x2e, 0xfd,
+0x01, 0x04, 0xac, 0x05, 0x40, 0x70, 0x61, 0x79, 0x73, 0x6a,
+0x05, 0x50, 0x61, 0x74, 0x74, 0x65, 0x6e, 0xba, 0x04, 0x01,
+0x49, 0x08, 0x07, 0x2e, 0x00, 0x40, 0x2c, 0x00, 0x73, 0x6f,
+0xa0, 0x04, 0x00, 0x3a, 0x08, 0x02, 0xd0, 0x05, 0x00, 0x3a,
+0x01, 0x03, 0x5a, 0x01, 0x11, 0x6d, 0xbb, 0x00, 0x50, 0x69,
+0x73, 0x00, 0x75, 0x70, 0x38, 0x00, 0x45, 0x79, 0x6f, 0x75,
+0x3a, 0x34, 0x07, 0x05, 0x23, 0x00, 0x00, 0x61, 0x0a, 0x30,
+0x65, 0x6d, 0x69, 0xec, 0x03, 0x12, 0x73, 0x43, 0x01, 0x81,
+0x61, 0x00, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0xc8, 0x07,
+0x03, 0x32, 0x01, 0x41, 0x6e, 0x65, 0x65, 0x64, 0xc6, 0x08,
+0x10, 0x62, 0xbf, 0x08, 0x10, 0x2d, 0x12, 0x05, 0x42, 0x69,
+0x6e, 0x65, 0x64, 0xe8, 0x05, 0x00, 0x54, 0x00, 0x42, 0x6b,
+0x6e, 0x6f, 0x77, 0x7e, 0x03, 0x4b, 0x61, 0x62, 0x6f, 0x75,
+0x45, 0x00, 0x04, 0xa2, 0x01, 0x2f, 0x6f, 0x72, 0x80, 0x00,
+0x02, 0x55, 0x6c, 0x69, 0x73, 0x74, 0x73, 0x93, 0x03, 0x5a,
+0x6f, 0x73, 0x73, 0x69, 0x62, 0x6a, 0x01, 0x14, 0x61, 0x70,
+0x09, 0x01, 0x8d, 0x00, 0x01, 0x48, 0x00, 0x50, 0x61, 0x6e,
+0x79, 0x74, 0x68, 0x62, 0x01, 0x32, 0x65, 0x6c, 0x73, 0x82,
+0x00, 0xa2, 0x66, 0x65, 0x65, 0x6c, 0x00, 0x6c, 0x69, 0x6b,
+0x65, 0x2e, 0x3f, 0x03, 0x41, 0x65, 0x72, 0x61, 0x73, 0x93,
+0x0b, 0x49, 0x69, 0x6e, 0x67, 0x6c, 0xd3, 0x01, 0x1c, 0x2c,
+0x5b, 0x02, 0x08, 0x1b, 0x02, 0x22, 0x6e, 0x64, 0x58, 0x02,
+0x05, 0xde, 0x01, 0x03, 0x52, 0x02, 0x01, 0xb8, 0x02, 0x01,
+0x00, 0x08, 0x2a, 0x6c, 0x6c, 0x20, 0x02, 0x09, 0x9c, 0x02,
+0x22, 0x72, 0x65, 0x79, 0x00, 0x30, 0x64, 0x00, 0x77, 0xa3,
+0x02, 0x00, 0x99, 0x00, 0x34, 0x6c, 0x65, 0x66, 0x6c, 0x00,
+0x05, 0x5e, 0x00, 0x18, 0x61, 0x14, 0x01, 0x0f, 0x2a, 0x00,
+0x05, 0x02, 0x43, 0x03, 0x10, 0x73, 0x43, 0x03, 0x36, 0x2e,
+0x00, 0x52, 0xb3, 0x00, 0x00, 0xf7, 0x00, 0x05, 0x20, 0x00,
+0x00, 0x0d, 0x00, 0x01, 0x23, 0x00, 0x02, 0xf4, 0x02, 0x01,
+0x58, 0x02, 0x02, 0xfb, 0x00, 0x0c, 0x56, 0x02, 0x0b, 0x3e,
+0x09, 0x04, 0x7f, 0x03, 0x60, 0x63, 0x75, 0x72, 0x73, 0x6f,
+0x72, 0x11, 0x04, 0x01, 0xe1, 0x01, 0x32, 0x6d, 0x6f, 0x76,
+0x18, 0x00, 0x00, 0x38, 0x00, 0x31, 0x00, 0x61, 0x72, 0x14,
+0x05, 0x04, 0x83, 0x08, 0x34, 0x2e, 0x00, 0x50, 0x74, 0x00,
+0x02, 0xc9, 0x0a, 0x40, 0x74, 0x75, 0x72, 0x6e, 0x3b, 0x00,
+0x86, 0x00, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x73, 0x3a,
+0x00, 0x11, 0x28, 0x86, 0x0c, 0x82, 0x61, 0x00, 0x6e, 0x6f,
+0x72, 0x6d, 0x61, 0x6c, 0x14, 0x00, 0x00, 0xfe, 0x0c, 0x08,
+0x97, 0x00, 0x24, 0x29, 0x2c, 0x12, 0x01, 0x01, 0xd3, 0x00,
+0x04, 0x6b, 0x01, 0x20, 0x69, 0x6e, 0xb5, 0x02, 0x0f, 0xbb,
+0x03, 0x03, 0x03, 0x0e, 0x00, 0x80, 0x61, 0x70, 0x70, 0x72,
+0x6f, 0x70, 0x72, 0x69, 0xe5, 0x05, 0x44, 0x77, 0x61, 0x79,
+0x3b, 0x44, 0x00, 0x01, 0x8c, 0x01, 0x21, 0x30, 0x00, 0x5e,
+0x04, 0x04, 0xa6, 0x00, 0x02, 0x1e, 0x01, 0x23, 0x62, 0x61,
+0x16, 0x04, 0x02, 0x8a, 0x04, 0x14, 0x61, 0x3d, 0x0d, 0x04,
+0xbd, 0x03, 0x43, 0x00, 0x00, 0x28, 0x41, 0x00, 0x09, 0x30,
+0x61, 0x63, 0x74, 0x75, 0x08, 0x82, 0x00, 0x64, 0x65, 0x73,
+0x63, 0x72, 0x69, 0x62, 0x84, 0x00, 0x31, 0x73, 0x65, 0x63,
+0x81, 0x03, 0x32, 0x32, 0x2e, 0x31, 0x43, 0x0a, 0x00, 0x69,
+0x01, 0x05, 0x04, 0x0a, 0x22, 0x2e, 0x29, 0xca, 0x05, 0x12,
+0x32, 0xca, 0x05, 0x60, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
+0x52, 0x08, 0x00, 0xcc, 0x05, 0x00, 0x13, 0x00, 0x00, 0x5d,
+0x09, 0x22, 0x6f, 0x77, 0x78, 0x09, 0x11, 0x74, 0xfa, 0x03,
+0x40, 0x66, 0x69, 0x67, 0x75, 0xa7, 0x08, 0x10, 0x77, 0x4b,
+0x0b, 0x00, 0x31, 0x00, 0x10, 0x74, 0x46, 0x08, 0x41, 0x6d,
+0x65, 0x6e, 0x73, 0x7d, 0x00, 0x0a, 0xa2, 0x06, 0x01, 0x47,
+0x08, 0x03, 0xbb, 0x05, 0xc7, 0x60, 0x54, 0x79, 0x70, 0x65,
+0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x3a, 0x44, 0x0c, 0x00,
+0x32, 0x00, 0x02, 0x84, 0x0d, 0x03, 0x00, 0x0a, 0x0a, 0x1b,
+0x00, 0x00, 0x46, 0x0e, 0x12, 0x2c, 0x38, 0x0a, 0x06, 0x17,
+0x0b, 0x01, 0x0c, 0x0d, 0x0b, 0x5c, 0x0a, 0x47, 0x2e, 0x00,
+0x28, 0x54, 0x37, 0x0e, 0x13, 0x61, 0x9d, 0x0d, 0x25, 0x69,
+0x73, 0xd0, 0x07, 0x23, 0x72, 0x73, 0xf6, 0x0c, 0x5f, 0x69,
+0x73, 0x3a, 0x00, 0x66, 0x21, 0x09, 0x07, 0x14, 0x32, 0x90,
+0x00, 0x01, 0x8f, 0x00, 0x13, 0x33, 0x83, 0x00, 0x01, 0x93,
+0x0a, 0x03, 0x76, 0x0c, 0x02, 0x5b, 0x00, 0x01, 0x97, 0x01,
+0x01, 0x78, 0x05, 0x19, 0x33, 0x32, 0x00, 0x12, 0x32, 0xfb,
+0x0e, 0x16, 0x29, 0x13, 0x06, 0x14, 0x74, 0x80, 0x06, 0xd2,
+0x60, 0x58, 0x27, 0x00, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x62,
+0x6f, 0x78, 0x2c, 0x61, 0x01, 0x02, 0xff, 0x02, 0x10, 0x70,
+0x28, 0x07, 0x00, 0x22, 0x00, 0x04, 0x1c, 0x0e, 0x61, 0x00,
+0x65, 0x78, 0x74, 0x72, 0x61, 0x97, 0x08, 0x50, 0x74, 0x72,
+0x61, 0x69, 0x6e, 0xf2, 0x0a, 0x03, 0xf7, 0x0a, 0x0e, 0x0e,
+0x0e, 0x08, 0x28, 0x0f, 0x0a, 0xa3, 0x05, 0x01, 0x19, 0x0e,
+0x13, 0x66, 0xaf, 0x0e, 0x03, 0x0f, 0x0e, 0x11, 0x28, 0xb1,
+0x09, 0x21, 0x69, 0x73, 0x08, 0x0e, 0x51, 0x74, 0x69, 0x6d,
+0x65, 0x73, 0x07, 0x05, 0x10, 0x6e, 0xd4, 0x04, 0x03, 0x2e,
+0x09, 0x30, 0x2d, 0x58, 0x27, 0x3d, 0x02, 0x06, 0x56, 0x09,
+0x2b, 0x2e, 0x29, 0x1d, 0x0c, 0x06, 0xdc, 0x02, 0x00, 0x83,
+0x0e, 0x0f, 0x98, 0x00, 0x05, 0x04, 0xd0, 0x06, 0x40, 0x73,
+0x68, 0x61, 0x64, 0xb5, 0x02, 0x10, 0x6c, 0x0e, 0x04, 0x00,
+0x3d, 0x10, 0x12, 0x6f, 0xcf, 0x00, 0x05, 0x83, 0x05, 0x01,
+0xe6, 0x09, 0x20, 0x65, 0x6e, 0x94, 0x02, 0x2f, 0x64, 0x2e,
+0x39, 0x01, 0x01, 0x13, 0x4a, 0x25, 0x0d, 0x0f, 0x3e, 0x01,
+0x01, 0x41, 0x67, 0x65, 0x6e, 0x65, 0x88, 0x02, 0x73, 0x72,
+0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x6c, 0x1f, 0x0d, 0x08, 0x9e,
+0x10, 0x1e, 0x2e, 0xbf, 0x00, 0x08, 0x43, 0x0e, 0x03, 0x8f,
+0x0b, 0x03, 0xae, 0x00, 0x00, 0x36, 0x08, 0x13, 0x6e, 0x36,
+0x06, 0x01, 0xcd, 0x02, 0x5d, 0x72, 0x6f, 0x64, 0x75, 0x63,
+0xfc, 0x0e, 0x0b, 0xea, 0x03, 0x22, 0x60, 0x43, 0x04, 0x02,
+0x03, 0x1a, 0x0b, 0x30, 0x52, 0x6f, 0x77, 0xe4, 0x0c, 0x41,
+0x6f, 0x78, 0x65, 0x73, 0xd4, 0x0e, 0x00, 0x05, 0x04, 0x01,
+0x15, 0x07, 0x50, 0x72, 0x65, 0x61, 0x73, 0x6f, 0xe5, 0x0d,
+0x34, 0x79, 0x00, 0x79, 0x82, 0x11, 0x22, 0x74, 0x6f, 0x4e,
+0x00, 0x06, 0x4d, 0x04, 0x10, 0x67, 0x03, 0x0a, 0x22, 0x65,
+0x72, 0x0f, 0x0c, 0x10, 0x31, 0x64, 0x00, 0x42, 0x62, 0x6f,
+0x74, 0x68, 0x50, 0x00, 0x22, 0x3b, 0x00, 0x0e, 0x01, 0x02,
+0xc2, 0x0d, 0x21, 0x68, 0x61, 0x57, 0x00, 0x07, 0x2a, 0x02,
+0x03, 0x90, 0x01, 0x05, 0xd9, 0x00, 0x05, 0xa4, 0x0a, 0x00,
+0xc2, 0x06, 0x01, 0xcf, 0x0c, 0x20, 0x62, 0x65, 0xd2, 0x04,
+0x26, 0x72, 0x69, 0x28, 0x06, 0x2a, 0x69, 0x66, 0x8e, 0x06,
+0x3f, 0x00, 0x69, 0x74, 0x88, 0x01, 0x02, 0x12, 0x4b, 0x2c,
+0x0e, 0x0f, 0x88, 0x01, 0x0b, 0x10, 0x61, 0xf9, 0x0f, 0x00,
+0x2f, 0x01, 0x00, 0xdc, 0x03, 0x00, 0xed, 0x0d, 0x04, 0x55,
+0x12, 0x2e, 0x61, 0x72, 0xa5, 0x01, 0x00, 0x9c, 0x00, 0x41,
+0x64, 0x72, 0x61, 0x77, 0x5d, 0x0e, 0x00, 0x84, 0x0d, 0x20,
+0x75, 0x74, 0x0e, 0x0e, 0x02, 0xc5, 0x03, 0x02, 0xdb, 0x0e,
+0x00, 0x0a, 0x0b, 0x02, 0x2b, 0x0e, 0x03, 0x51, 0x12, 0x02,
+0x8a, 0x01, 0x24, 0x73, 0x65, 0x69, 0x0d, 0x06, 0x0f, 0x11,
+0x51, 0x61, 0x00, 0x73, 0x6d, 0x61, 0x74, 0x0c, 0x00, 0xbf,
+0x0e, 0x03, 0x77, 0x00, 0x20, 0x73, 0x68, 0xc4, 0x04, 0x05,
+0xf0, 0x0c, 0x0c, 0x39, 0x0e, 0x04, 0xc8, 0x02, 0x13, 0x69,
+0x23, 0x02, 0x02, 0x55, 0x00, 0x04, 0x38, 0x11, 0x05, 0x3a,
+0x10, 0x07, 0xfd, 0x04, 0x22, 0x68, 0x65, 0x10, 0x07, 0x00,
+0x20, 0x10, 0x71, 0x79, 0x6d, 0x6d, 0x65, 0x74, 0x72, 0x79,
+0x65, 0x00, 0x05, 0x21, 0x0f, 0x04, 0x0b, 0x01, 0x16, 0x64,
+0xfb, 0x0c, 0x10, 0x4d, 0x66, 0x08, 0x05, 0x2e, 0x00, 0x00,
+0xa4, 0x0a, 0x17, 0x73, 0x2b, 0x05, 0x60, 0x73, 0x00, 0x6c,
+0x6f, 0x6f, 0x6b, 0x1c, 0x07, 0x30, 0x74, 0x74, 0x69, 0xcd,
+0x0f, 0x13, 0x75, 0xa3, 0x0e, 0x00, 0x7a, 0x00, 0x01, 0xd1,
+0x0a, 0x01, 0x77, 0x08, 0x60, 0x65, 0x61, 0x73, 0x69, 0x65,
+0x72, 0x5a, 0x0b, 0x13, 0x6e, 0x96, 0x11, 0x05, 0x52, 0x00,
+0x06, 0x01, 0x02, 0x01, 0xae, 0x09, 0x00, 0xe2, 0x04, 0x22,
+0x63, 0x65, 0xdc, 0x08, 0x02, 0xca, 0x0f, 0x01, 0x4b, 0x02,
+0x60, 0x6e, 0x65, 0x63, 0x65, 0x73, 0x73, 0x43, 0x10, 0x02,
+0xe0, 0x02, 0x00, 0x8d, 0x07, 0x70, 0x65, 0x6e, 0x74, 0x2e,
+0x00, 0x43, 0x6f, 0x0c, 0x05, 0x63, 0x74, 0x65, 0x6c, 0x79,
+0x00, 0x61, 0x54, 0x00, 0x25, 0x69, 0x63, 0x9d, 0x00, 0x02,
+0xa6, 0x02, 0x00, 0xfa, 0x0f, 0x86, 0x72, 0x65, 0x65, 0x64,
+0x6f, 0x6d, 0x00, 0x74, 0x64, 0x04, 0x00, 0xf9, 0x0c, 0x24,
+0x65, 0x77, 0x2f, 0x10, 0x15, 0x73, 0x0b, 0x09, 0x00, 0x41,
+0x01, 0x23, 0x46, 0x69, 0xe8, 0x12, 0x04, 0x41, 0x09, 0x0a,
+0x45, 0x01, 0x00, 0xdf, 0x01, 0x00, 0x6d, 0x09, 0x15, 0x74,
+0xdb, 0x0c, 0x0f, 0x39, 0x01, 0x00, 0x16, 0x44, 0x25, 0x00,
+0x52, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x94, 0x10, 0x42, 0x6a,
+0x75, 0x64, 0x67, 0x04, 0x0e, 0x01, 0x0e, 0x08, 0x01, 0xbe,
+0x00, 0x26, 0x78, 0x69, 0x49, 0x00, 0x82, 0x74, 0x65, 0x63,
+0x68, 0x6e, 0x69, 0x71, 0x75, 0x9a, 0x0f, 0x42, 0x64, 0x65,
+0x64, 0x75, 0x09, 0x07, 0x03, 0x6e, 0x0f, 0x01, 0x42, 0x0c,
+0x57, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x85, 0x01, 0x12, 0x3a,
+0xe6, 0x05, 0x01, 0x66, 0x00, 0x06, 0x97, 0x0f, 0x12, 0x61,
+0x68, 0x03, 0x23, 0x6f, 0x66, 0xbb, 0x03, 0x00, 0xa1, 0x07,
+0x02, 0x58, 0x02, 0x11, 0x77, 0x7b, 0x03, 0x17, 0x74, 0x55,
+0x01, 0x23, 0x69, 0x6e, 0x32, 0x04, 0x21, 0x65, 0x76, 0x98,
+0x0e, 0x31, 0x6f, 0x6e, 0x65, 0x7b, 0x04, 0x06, 0x56, 0x0a,
+0x10, 0x2c, 0x9f, 0x03, 0x1d, 0x64, 0xd3, 0x00, 0x83, 0x60,
+0x54, 0x72, 0x69, 0x76, 0x69, 0x61, 0x6c, 0x3e, 0x04, 0x70,
+0x42, 0x61, 0x73, 0x69, 0x63, 0x27, 0x00, 0xb2, 0x11, 0x06,
+0x98, 0x04, 0x05, 0xaf, 0x09, 0x04, 0x4d, 0x01, 0x01, 0x02,
+0x0d, 0x06, 0x47, 0x15, 0x03, 0x33, 0x0a, 0x04, 0xfa, 0x09,
+0x12, 0x74, 0xe1, 0x02, 0x22, 0x69, 0x6d, 0x80, 0x03, 0x10,
+0x65, 0xbe, 0x00, 0x00, 0x16, 0x00, 0x20, 0x60, 0x49, 0x6b,
+0x04, 0x30, 0x6d, 0x65, 0x64, 0x87, 0x08, 0x13, 0x27, 0xee,
+0x00, 0x20, 0x61, 0x6e, 0x26, 0x11, 0x42, 0x79, 0x6f, 0x6e,
+0x64, 0x64, 0x11, 0x05, 0xdc, 0x06, 0x13, 0x74, 0x7f, 0x02,
+0x01, 0xc2, 0x00, 0x26, 0x61, 0x6c, 0x4a, 0x01, 0x13, 0x73,
+0x33, 0x0b, 0x01, 0x85, 0x02, 0x02, 0xef, 0x03, 0x04, 0x49,
+0x03, 0x05, 0xc6, 0x04, 0x13, 0x63, 0x7e, 0x11, 0x13, 0x00,
+0x3c, 0x0d, 0x07, 0x2c, 0x00, 0x04, 0x46, 0x05, 0x02, 0xac,
+0x11, 0x07, 0x28, 0x00, 0x04, 0xe6, 0x00, 0x00, 0x39, 0x13,
+0x52, 0x74, 0x00, 0x60, 0x55, 0x6e, 0x76, 0x01, 0x00, 0x1b,
+0x06, 0x03, 0xad, 0x00, 0x03, 0x94, 0x11, 0x13, 0x74, 0xc7,
+0x06, 0x00, 0x82, 0x01, 0x20, 0x65, 0x6e, 0x2d, 0x10, 0x02,
+0xe9, 0x04, 0x05, 0xc0, 0x00, 0x10, 0x65, 0xc4, 0x0f, 0x02,
+0xae, 0x16, 0x09, 0xcb, 0x00, 0x86, 0x61, 0x00, 0x67, 0x75,
+0x65, 0x73, 0x73, 0x2c, 0x93, 0x0d, 0x70, 0x62, 0x61, 0x63,
+0x6b, 0x74, 0x72, 0x61, 0x30, 0x08, 0x10, 0x66, 0x29, 0x05,
+0x00, 0x20, 0x0a, 0x10, 0x73, 0x8a, 0x04, 0x03, 0x26, 0x03,
+0x50, 0x77, 0x72, 0x6f, 0x6e, 0x67, 0xd0, 0x02, 0x12, 0x47,
+0x9f, 0x02, 0x00, 0x03, 0x02, 0x05, 0xc4, 0x01, 0x05, 0x25,
+0x03, 0x00, 0x8f, 0x00, 0x56, 0x74, 0x73, 0x65, 0x6c, 0x66,
+0x1c, 0x00, 0x1b, 0x3a, 0x5c, 0x08, 0x03, 0x90, 0x07, 0x02,
+0xd4, 0x0f, 0x10, 0x67, 0x90, 0x13, 0x0d, 0x0b, 0x02, 0x03,
+0x52, 0x05, 0x2b, 0x6d, 0x61, 0xb6, 0x00, 0x01, 0x7e, 0x17,
+0x00, 0x52, 0x0d, 0x31, 0x6d, 0x70, 0x74, 0xc8, 0x01, 0x16,
+0x67, 0x8c, 0x00, 0x05, 0x57, 0x12, 0x30, 0x62, 0x65, 0x66,
+0xf1, 0x03, 0x00, 0x4e, 0x17, 0x41, 0x69, 0x6e, 0x64, 0x73,
+0x70, 0x00, 0x10, 0x68, 0x30, 0x0f, 0x02, 0x21, 0x01, 0x22,
+0x00, 0x66, 0xcc, 0x0c, 0x31, 0x2e, 0x00, 0x42, 0xa5, 0x02,
+0x23, 0x70, 0x61, 0x0a, 0x03, 0xc1, 0x77, 0x61, 0x69, 0x74,
+0x2c, 0x00, 0x65, 0x73, 0x70, 0x65, 0x63, 0x69, 0x31, 0x01,
+0x26, 0x69, 0x66, 0x9e, 0x06, 0x0a, 0xfe, 0x04, 0x95, 0x64,
+0x00, 0x61, 0x00, 0x6c, 0x61, 0x72, 0x67, 0x65, 0xcb, 0x12,
+0x50, 0x69, 0x7a, 0x65, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 6263;
-const unsigned short help_text_words = 1155;
+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 f0617fefd4..8b14490a51 100644
--- a/apps/plugins/puzzles/help/tents.c
+++ b/apps/plugins/puzzles/help/tents.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,160 +6,162 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 102, TEXT_UNDERLINE },
- { 160, TEXT_CENTER | C_RED },
- { 190, TEXT_UNDERLINE },
- { 207, TEXT_UNDERLINE },
- { 342, TEXT_CENTER | C_RED },
- { 359, TEXT_UNDERLINE },
+ { 103, TEXT_UNDERLINE },
+ { 161, TEXT_CENTER | C_RED },
+ { 191, TEXT_UNDERLINE },
+ { 208, TEXT_UNDERLINE },
+ { 343, TEXT_CENTER | C_RED },
  { 360, TEXT_UNDERLINE },
- { 370, TEXT_UNDERLINE },
+ { 361, TEXT_UNDERLINE },
+ { 371, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 2140 comp 1385 ratio 0.647196 level 10 saved 755 */
+/* orig 2158 comp 1394 ratio 0.645968 level 10 saved 764 */
 const char help_text[] = {
-0xf0, 0x26, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfc, 0x05, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x35, 0x3a, 0x20, 0x54, 0x65, 0x6e, 0x74, 0x73, 0x20,
-0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76,
-0x65, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00, 0x6f,
-0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x73, 0x2c,
-0x00, 0x73, 0x6f, 0x6d, 0x65, 0x11, 0x00, 0xf0, 0x05, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61,
-0x69, 0x6e, 0x00, 0x74, 0x72, 0x65, 0x65, 0x73, 0x2e, 0x39,
-0x00, 0xf0, 0x04, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69,
-0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x63, 0x65,
-0x00, 0x74, 0x57, 0x00, 0x35, 0x00, 0x69, 0x6e, 0x3b, 0x00,
-0xd6, 0x74, 0x68, 0x65, 0x00, 0x72, 0x65, 0x6d, 0x61, 0x69,
-0x6e, 0x69, 0x6e, 0x67, 0x5a, 0x00, 0x00, 0x22, 0x00, 0xe1,
-0x75, 0x63, 0x68, 0x00, 0x61, 0x00, 0x77, 0x61, 0x79, 0x00,
-0x74, 0x68, 0x61, 0x74, 0x2a, 0x00, 0x60, 0x66, 0x6f, 0x6c,
-0x6c, 0x6f, 0x77, 0x2a, 0x00, 0xf1, 0x0e, 0x63, 0x6f, 0x6e,
-0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x00, 0x61, 0x72,
-0x65, 0x00, 0x6d, 0x65, 0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d,
-0x00, 0x54, 0x68, 0x65, 0x72, 0x65, 0x13, 0x00, 0xf3, 0x00,
-0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x00, 0x61, 0x73,
-0x00, 0x6d, 0x61, 0x6e, 0x79, 0x7b, 0x00, 0x24, 0x61, 0x73,
-0xa0, 0x00, 0x03, 0x2e, 0x00, 0x04, 0x18, 0x00, 0x22, 0x6e,
-0x64, 0x19, 0x00, 0xff, 0x03, 0x00, 0x63, 0x61, 0x6e, 0x00,
-0x62, 0x65, 0x00, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x64,
-0x00, 0x75, 0x70, 0x8d, 0x00, 0x01, 0x41, 0x65, 0x61, 0x63,
-0x68, 0x3a, 0x00, 0x00, 0xde, 0x00, 0x42, 0x64, 0x69, 0x72,
-0x65, 0x6b, 0x00, 0x40, 0x64, 0x6a, 0x61, 0x63, 0x15, 0x00,
-0x60, 0x28, 0x68, 0x6f, 0x72, 0x69, 0x7a, 0x10, 0x01, 0xd0,
-0x6c, 0x6c, 0x79, 0x00, 0x6f, 0x72, 0x00, 0x76, 0x65, 0x72,
-0x74, 0x69, 0x63, 0x0e, 0x00, 0xf0, 0x01, 0x2c, 0x00, 0x62,
-0x75, 0x74, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x64, 0x69, 0x61,
-0x67, 0x6f, 0x6e, 0x14, 0x00, 0x10, 0x29, 0x21, 0x01, 0x62,
-0x69, 0x74, 0x73, 0x00, 0x6f, 0x77, 0x3f, 0x01, 0xc2, 0x2e,
-0x00, 0x48, 0x6f, 0x77, 0x65, 0x76, 0x65, 0x72, 0x2c, 0x00,
-0x61, 0x67, 0x00, 0x30, 0x6d, 0x61, 0x79, 0x96, 0x00, 0x05,
-0x62, 0x00, 0x83, 0x74, 0x6f, 0x00, 0x6f, 0x74, 0x68, 0x65,
-0x72, 0xb5, 0x00, 0x70, 0x61, 0x73, 0x00, 0x77, 0x65, 0x6c,
-0x6c, 0x08, 0x00, 0x03, 0x48, 0x00, 0x02, 0xe1, 0x00, 0x64,
-0x4e, 0x6f, 0x00, 0x74, 0x77, 0x6f, 0xe4, 0x00, 0x17, 0x72,
-0x41, 0x00, 0x08, 0xa2, 0x00, 0x17, 0x2c, 0xa0, 0x00, 0x46,
-0x00, 0x6f, 0x72, 0x20, 0x9a, 0x00, 0x06, 0x27, 0x01, 0x61,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0xb3, 0x01, 0x04, 0xc4,
-0x01, 0x01, 0x05, 0x01, 0x41, 0x72, 0x6f, 0x77, 0x2c, 0x3e,
-0x01, 0x04, 0x11, 0x00, 0x73, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-0x6e, 0x2c, 0x41, 0x01, 0x35, 0x73, 0x00, 0x74, 0x3d, 0x00,
-0xd1, 0x73, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x72,
-0x6f, 0x75, 0x6e, 0x64, 0x18, 0x00, 0x54, 0x73, 0x69, 0x64,
-0x65, 0x73, 0x07, 0x02, 0x00, 0x5f, 0x02, 0x00, 0x70, 0x00,
-0xb4, 0x54, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a,
-0x6c, 0x65, 0x8d, 0x01, 0x11, 0x66, 0x32, 0x00, 0x00, 0x88,
-0x01, 0x00, 0x15, 0x01, 0x22, 0x61, 0x6c, 0x4e, 0x02, 0x41,
-0x73, 0x00, 0x6f, 0x6e, 0x3a, 0x00, 0x82, 0x49, 0x6e, 0x74,
-0x65, 0x72, 0x6e, 0x65, 0x74, 0x89, 0x00, 0xa1, 0x77, 0x61,
-0x73, 0x00, 0x62, 0x72, 0x6f, 0x75, 0x67, 0x68, 0x27, 0x01,
-0x50, 0x6d, 0x79, 0x00, 0x61, 0x74, 0xb4, 0x00, 0xf0, 0x28,
-0x69, 0x6f, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x65, 0x2d, 0x6d,
-0x61, 0x69, 0x6c, 0x2e, 0x00, 0x49, 0x00, 0x64, 0x6f, 0x6e,
-0x27, 0x74, 0x00, 0x6b, 0x6e, 0x6f, 0x77, 0x00, 0x77, 0x68,
-0x6f, 0x00, 0x49, 0x00, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64,
-0x00, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x00, 0x66, 0x6f,
-0x72, 0x00, 0x69, 0x6e, 0x76, 0x3a, 0x00, 0x50, 0x6e, 0x67,
-0x00, 0x69, 0x74, 0x9c, 0x00, 0x43, 0x32, 0x35, 0x2e, 0x31,
-0x1c, 0x03, 0x00, 0xef, 0x02, 0x31, 0x72, 0x6f, 0x6c, 0x25,
-0x03, 0xa1, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
-0x63, 0x6b, 0x2b, 0x00, 0x93, 0x6e, 0x00, 0x61, 0x00, 0x62,
-0x6c, 0x61, 0x6e, 0x6b, 0xd1, 0x02, 0x43, 0x00, 0x77, 0x69,
-0x6c, 0xb4, 0x00, 0x04, 0xd0, 0x01, 0x21, 0x69, 0x6e, 0x52,
-0x00, 0x7f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x00, 0x3b,
-0x00, 0x0d, 0x30, 0x63, 0x6f, 0x6c, 0x4e, 0x03, 0x80, 0x69,
-0x74, 0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x03, 0x41,
-0x64, 0x69, 0x63, 0x61, 0x99, 0x00, 0x01, 0x90, 0x02, 0x31,
-0x79, 0x6f, 0x75, 0xdf, 0x01, 0x60, 0x73, 0x75, 0x72, 0x65,
-0x00, 0x69, 0x96, 0x02, 0x00, 0xdb, 0x00, 0x02, 0x6c, 0x00,
-0x34, 0x2e, 0x00, 0x43, 0x5f, 0x00, 0x21, 0x65, 0x69, 0x34,
-0x02, 0x61, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x6d, 0x00,
-0xaa, 0x6e, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x70, 0x69, 0x65,
-0x64, 0x71, 0x00, 0x43, 0x6c, 0x65, 0x61, 0x72, 0xf4, 0x00,
-0x21, 0x49, 0x66, 0x5f, 0x00, 0x92, 0x64, 0x72, 0x61, 0x67,
-0x00, 0x77, 0x69, 0x74, 0x68, 0xb4, 0x03, 0x00, 0xb9, 0x00,
-0x04, 0x49, 0x00, 0x70, 0x61, 0x6c, 0x6f, 0x6e, 0x67, 0x00,
-0x61, 0x0c, 0x02, 0x00, 0xed, 0x02, 0x04, 0x02, 0x02, 0x00,
-0xac, 0x01, 0x1a, 0x79, 0xce, 0x00, 0x23, 0x69, 0x6e, 0xf2,
-0x03, 0x10, 0x67, 0x8e, 0x01, 0x00, 0x57, 0x00, 0x52, 0x63,
-0x6f, 0x76, 0x65, 0x72, 0x75, 0x00, 0x94, 0x62, 0x65, 0x00,
-0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0xe6, 0x00, 0x00, 0xce,
-0x01, 0x14, 0x6e, 0xe9, 0x02, 0x03, 0x1c, 0x04, 0x05, 0x2b,
-0x00, 0xb1, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64,
-0x2e, 0x00, 0x28, 0x32, 0x02, 0x91, 0x69, 0x73, 0x00, 0x75,
-0x73, 0x65, 0x66, 0x75, 0x6c, 0xb9, 0x01, 0x01, 0xc1, 0x00,
-0x02, 0x1f, 0x01, 0x04, 0x61, 0x04, 0x12, 0x64, 0xbf, 0x02,
-0x03, 0xa7, 0x00, 0x54, 0x6e, 0x63, 0x65, 0x00, 0x79, 0xdc,
-0x04, 0x01, 0x9b, 0x01, 0x51, 0x64, 0x00, 0x61, 0x6c, 0x6c,
-0x3f, 0x03, 0x01, 0xe2, 0x02, 0x23, 0x2e, 0x29, 0xfe, 0x04,
-0x20, 0x63, 0x61, 0xe2, 0x00, 0x20, 0x73, 0x6f, 0x5f, 0x00,
-0x01, 0x4f, 0x00, 0xb1, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0x00, 0x6b, 0x65, 0x79, 0x73, 0x61, 0x02, 0x10, 0x6f, 0x1e,
-0x05, 0x06, 0xd5, 0x02, 0x02, 0xc8, 0x02, 0x56, 0x50, 0x72,
-0x65, 0x73, 0x73, 0x81, 0x00, 0x00, 0xd9, 0x00, 0x00, 0x32,
-0x00, 0x11, 0x00, 0xef, 0x00, 0x8f, 0x61, 0x6e, 0x00, 0x65,
-0x6d, 0x70, 0x74, 0x79, 0x20, 0x02, 0x06, 0x02, 0xfc, 0x00,
-0x18, 0x70, 0x44, 0x00, 0x20, 0x73, 0x70, 0x1f, 0x00, 0x3e,
-0x62, 0x61, 0x72, 0x43, 0x00, 0x0f, 0x28, 0x02, 0x05, 0x14,
-0x3b, 0xf1, 0x01, 0x00, 0x79, 0x00, 0x07, 0xd8, 0x01, 0x0e,
-0xf6, 0x01, 0x00, 0x71, 0x04, 0x20, 0x6c, 0x64, 0x6b, 0x00,
-0x5e, 0x53, 0x68, 0x69, 0x66, 0x74, 0x7e, 0x00, 0x08, 0xf4,
-0x00, 0x08, 0x6b, 0x00, 0x08, 0x84, 0x00, 0x12, 0x73, 0x76,
-0x00, 0x06, 0x4c, 0x00, 0x12, 0x43, 0x23, 0x03, 0x0f, 0x4e,
-0x00, 0x17, 0x01, 0x40, 0x00, 0x5b, 0x00, 0x62, 0x6f, 0x74,
-0x68, 0x59, 0x00, 0x00, 0x42, 0x00, 0x06, 0x01, 0x02, 0x12,
-0x74, 0x7c, 0x05, 0x01, 0xc5, 0x05, 0x41, 0x28, 0x41, 0x6c,
-0x6c, 0x54, 0x00, 0x22, 0x61, 0x63, 0x0f, 0x06, 0x83, 0x64,
-0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x30, 0x04, 0x11,
-0x63, 0xf8, 0x03, 0x32, 0x32, 0x2e, 0x31, 0xff, 0x04, 0x00,
-0xc8, 0x01, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
-0x6c, 0x65, 0x2e, 0x29, 0xd3, 0x03, 0x13, 0x32, 0xd3, 0x03,
-0xb1, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-0x73, 0x20, 0x88, 0x04, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14,
-0x00, 0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x51, 0x00, 0x66,
-0x72, 0x6f, 0x6d, 0x79, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73,
-0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70,
-0x6f, 0x00, 0x03, 0x98, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70,
-0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xab, 0x00, 0x91,
-0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x3c,
-0x03, 0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x04, 0x07, 0x01,
-0x58, 0x07, 0x24, 0x69, 0x6e, 0xe1, 0x00, 0x00, 0x2b, 0x00,
-0xc4, 0x44, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
-0x79, 0x00, 0x00, 0x47, 0x01, 0x02, 0x4b, 0x05, 0x16, 0x64,
-0x1a, 0x00, 0x04, 0x38, 0x05, 0x83, 0x65, 0x6e, 0x65, 0x72,
-0x61, 0x74, 0x65, 0x64, 0x35, 0x05, 0x57, 0x2e, 0x00, 0x4d,
-0x6f, 0x72, 0x29, 0x00, 0x03, 0x17, 0x00, 0x70, 0x73, 0x00,
-0x72, 0x65, 0x71, 0x75, 0x69, 0x2d, 0x07, 0x00, 0x1f, 0x00,
-0xc2, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x00, 0x64,
-0x65, 0x64, 0x75, 0x3a, 0x01, 0x02, 0x9a, 0x06, 0x21, 0x61,
-0x74, 0xab, 0x01, 0x20, 0x65, 0x6e, 0xa5, 0x06, 0x15, 0x6e,
-0xa4, 0x07, 0x06, 0xf8, 0x00, 0x07, 0x81, 0x00, 0x55, 0x6c,
-0x65, 0x76, 0x65, 0x6c, 0x58, 0x00, 0xb0, 0x73, 0x00, 0x67,
-0x75, 0x65, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x6b, 0x06, 0x04,
-0xe0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0x63, 0x6b,
-0x69, 0x6e, 0x67, 0x2e, 0x00,
+0x00, 0x2d, 0x01, 0x00, 0xf0, 0x14, 0x00, 0x00, 0x00, 0x59,
+0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61, 0x00,
+0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
+0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d,
+0x65, 0x11, 0x00, 0xf0, 0x05, 0x77, 0x68, 0x69, 0x63, 0x68,
+0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x74,
+0x72, 0x65, 0x65, 0x73, 0x2e, 0x39, 0x00, 0xf0, 0x04, 0x72,
+0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73, 0x00, 0x74, 0x6f,
+0x00, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x00, 0x74, 0x69, 0x00,
+0x35, 0x00, 0x69, 0x6e, 0x3b, 0x00, 0xd6, 0x74, 0x68, 0x65,
+0x00, 0x72, 0x65, 0x6d, 0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67,
+0x5a, 0x00, 0x00, 0x22, 0x00, 0xe1, 0x75, 0x63, 0x68, 0x00,
+0x61, 0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74,
+0x2a, 0x00, 0x60, 0x66, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x2a,
+0x00, 0xf1, 0x0e, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
+0x6f, 0x6e, 0x73, 0x00, 0x61, 0x72, 0x65, 0x00, 0x6d, 0x65,
+0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x54, 0x68, 0x65,
+0x72, 0x65, 0x13, 0x00, 0xf3, 0x00, 0x65, 0x78, 0x61, 0x63,
+0x74, 0x6c, 0x79, 0x00, 0x61, 0x73, 0x00, 0x6d, 0x61, 0x6e,
+0x79, 0x7b, 0x00, 0x24, 0x61, 0x73, 0xa0, 0x00, 0x03, 0x2e,
+0x00, 0x04, 0x18, 0x00, 0x22, 0x6e, 0x64, 0x19, 0x00, 0xff,
+0x03, 0x00, 0x63, 0x61, 0x6e, 0x00, 0x62, 0x65, 0x00, 0x6d,
+0x61, 0x74, 0x63, 0x68, 0x65, 0x64, 0x00, 0x75, 0x70, 0x8d,
+0x00, 0x01, 0x41, 0x65, 0x61, 0x63, 0x68, 0x3a, 0x00, 0x00,
+0xde, 0x00, 0x42, 0x64, 0x69, 0x72, 0x65, 0x6b, 0x00, 0x40,
+0x64, 0x6a, 0x61, 0x63, 0x15, 0x00, 0x60, 0x28, 0x68, 0x6f,
+0x72, 0x69, 0x7a, 0x10, 0x01, 0xd0, 0x6c, 0x6c, 0x79, 0x00,
+0x6f, 0x72, 0x00, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x0e,
+0x00, 0xf0, 0x01, 0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x6e,
+0x6f, 0x74, 0x00, 0x64, 0x69, 0x61, 0x67, 0x6f, 0x6e, 0x14,
+0x00, 0x10, 0x29, 0x21, 0x01, 0x62, 0x69, 0x74, 0x73, 0x00,
+0x6f, 0x77, 0x3f, 0x01, 0xc2, 0x2e, 0x00, 0x48, 0x6f, 0x77,
+0x65, 0x76, 0x65, 0x72, 0x2c, 0x00, 0x61, 0x67, 0x00, 0x30,
+0x6d, 0x61, 0x79, 0x96, 0x00, 0x05, 0x62, 0x00, 0x83, 0x74,
+0x6f, 0x00, 0x6f, 0x74, 0x68, 0x65, 0x72, 0xb5, 0x00, 0x70,
+0x61, 0x73, 0x00, 0x77, 0x65, 0x6c, 0x6c, 0x08, 0x00, 0x03,
+0x48, 0x00, 0x02, 0xe1, 0x00, 0x64, 0x4e, 0x6f, 0x00, 0x74,
+0x77, 0x6f, 0xe4, 0x00, 0x17, 0x72, 0x41, 0x00, 0x08, 0xa2,
+0x00, 0x17, 0x2c, 0xa0, 0x00, 0x46, 0x00, 0x6f, 0x72, 0x20,
+0x9a, 0x00, 0x06, 0x27, 0x01, 0x61, 0x6e, 0x75, 0x6d, 0x62,
+0x65, 0x72, 0xb3, 0x01, 0x04, 0xc4, 0x01, 0x01, 0x05, 0x01,
+0x41, 0x72, 0x6f, 0x77, 0x2c, 0x3e, 0x01, 0x04, 0x11, 0x00,
+0x73, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2c, 0x41, 0x01,
+0x35, 0x73, 0x00, 0x74, 0x3d, 0x00, 0xd1, 0x73, 0x00, 0x67,
+0x69, 0x76, 0x65, 0x6e, 0x00, 0x72, 0x6f, 0x75, 0x6e, 0x64,
+0x18, 0x00, 0x54, 0x73, 0x69, 0x64, 0x65, 0x73, 0x07, 0x02,
+0x00, 0x5f, 0x02, 0x00, 0x70, 0x00, 0xb4, 0x54, 0x68, 0x69,
+0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x8d, 0x01,
+0x11, 0x66, 0x32, 0x00, 0x00, 0x88, 0x01, 0x00, 0x15, 0x01,
+0x22, 0x61, 0x6c, 0x4e, 0x02, 0x41, 0x73, 0x00, 0x6f, 0x6e,
+0x3a, 0x00, 0x82, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65,
+0x74, 0x89, 0x00, 0xa1, 0x77, 0x61, 0x73, 0x00, 0x62, 0x72,
+0x6f, 0x75, 0x67, 0x68, 0x27, 0x01, 0x50, 0x6d, 0x79, 0x00,
+0x61, 0x74, 0xb4, 0x00, 0xf0, 0x28, 0x69, 0x6f, 0x6e, 0x00,
+0x62, 0x79, 0x00, 0x65, 0x2d, 0x6d, 0x61, 0x69, 0x6c, 0x2e,
+0x00, 0x49, 0x00, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x00, 0x6b,
+0x6e, 0x6f, 0x77, 0x00, 0x77, 0x68, 0x6f, 0x00, 0x49, 0x00,
+0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x63, 0x72, 0x65,
+0x64, 0x69, 0x74, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x69, 0x6e,
+0x76, 0x3a, 0x00, 0x50, 0x6e, 0x67, 0x00, 0x69, 0x74, 0x9c,
+0x00, 0x43, 0x32, 0x35, 0x2e, 0x31, 0x2e, 0x03, 0x00, 0xef,
+0x02, 0xf1, 0x03, 0x72, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x00,
+0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x63,
+0x6b, 0x2b, 0x00, 0x93, 0x6e, 0x00, 0x61, 0x00, 0x62, 0x6c,
+0x61, 0x6e, 0x6b, 0xd1, 0x02, 0x43, 0x00, 0x77, 0x69, 0x6c,
+0xb4, 0x00, 0x04, 0xd0, 0x01, 0x21, 0x69, 0x6e, 0x52, 0x00,
+0x7f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x00, 0x3b, 0x00,
+0x0d, 0x30, 0x63, 0x6f, 0x6c, 0x4e, 0x03, 0x80, 0x69, 0x74,
+0x00, 0x67, 0x72, 0x65, 0x65, 0x6e, 0x20, 0x03, 0x41, 0x64,
+0x69, 0x63, 0x61, 0x99, 0x00, 0x01, 0x90, 0x02, 0x31, 0x79,
+0x6f, 0x75, 0xdf, 0x01, 0x60, 0x73, 0x75, 0x72, 0x65, 0x00,
+0x69, 0x96, 0x02, 0x00, 0xdb, 0x00, 0x02, 0x6c, 0x00, 0x34,
+0x2e, 0x00, 0x43, 0x5f, 0x00, 0x21, 0x65, 0x69, 0x34, 0x02,
+0x61, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x6d, 0x00, 0xaa,
+0x6e, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x70, 0x69, 0x65, 0x64,
+0x71, 0x00, 0x43, 0x6c, 0x65, 0x61, 0x72, 0xf4, 0x00, 0x21,
+0x49, 0x66, 0x5f, 0x00, 0x92, 0x64, 0x72, 0x61, 0x67, 0x00,
+0x77, 0x69, 0x74, 0x68, 0xb4, 0x03, 0x00, 0xb9, 0x00, 0x04,
+0x49, 0x00, 0x70, 0x61, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x61,
+0x0c, 0x02, 0x00, 0xed, 0x02, 0x04, 0x02, 0x02, 0x00, 0xac,
+0x01, 0x1a, 0x79, 0xce, 0x00, 0x23, 0x69, 0x6e, 0xf2, 0x03,
+0x10, 0x67, 0x8e, 0x01, 0x00, 0x57, 0x00, 0x52, 0x63, 0x6f,
+0x76, 0x65, 0x72, 0x75, 0x00, 0x94, 0x62, 0x65, 0x00, 0x74,
+0x75, 0x72, 0x6e, 0x65, 0x64, 0xe6, 0x00, 0x00, 0xce, 0x01,
+0x14, 0x6e, 0xe9, 0x02, 0x03, 0x1c, 0x04, 0x05, 0x2b, 0x00,
+0xb1, 0x61, 0x66, 0x66, 0x65, 0x63, 0x74, 0x65, 0x64, 0x2e,
+0x00, 0x28, 0x32, 0x02, 0x91, 0x69, 0x73, 0x00, 0x75, 0x73,
+0x65, 0x66, 0x75, 0x6c, 0xb9, 0x01, 0x01, 0xc1, 0x00, 0x02,
+0x1f, 0x01, 0x04, 0x61, 0x04, 0x12, 0x64, 0xbf, 0x02, 0x03,
+0xa7, 0x00, 0x54, 0x6e, 0x63, 0x65, 0x00, 0x79, 0xdc, 0x04,
+0x01, 0x9b, 0x01, 0x51, 0x64, 0x00, 0x61, 0x6c, 0x6c, 0x3f,
+0x03, 0x01, 0xe2, 0x02, 0x23, 0x2e, 0x29, 0xfe, 0x04, 0x20,
+0x63, 0x61, 0xe2, 0x00, 0x20, 0x73, 0x6f, 0x5f, 0x00, 0x01,
+0x4f, 0x00, 0xb1, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00,
+0x6b, 0x65, 0x79, 0x73, 0x61, 0x02, 0x10, 0x6f, 0x1e, 0x05,
+0x06, 0xd5, 0x02, 0x02, 0xc8, 0x02, 0x56, 0x50, 0x72, 0x65,
+0x73, 0x73, 0x81, 0x00, 0x00, 0xd9, 0x00, 0x00, 0x32, 0x00,
+0x11, 0x00, 0xef, 0x00, 0x8f, 0x61, 0x6e, 0x00, 0x65, 0x6d,
+0x70, 0x74, 0x79, 0x20, 0x02, 0x06, 0x02, 0xfc, 0x00, 0x18,
+0x70, 0x44, 0x00, 0x20, 0x73, 0x70, 0x1f, 0x00, 0x3e, 0x62,
+0x61, 0x72, 0x43, 0x00, 0x0f, 0x28, 0x02, 0x05, 0x14, 0x3b,
+0xf1, 0x01, 0x00, 0x79, 0x00, 0x07, 0xd8, 0x01, 0x0e, 0xf6,
+0x01, 0x00, 0x71, 0x04, 0x20, 0x6c, 0x64, 0x6b, 0x00, 0x5e,
+0x53, 0x68, 0x69, 0x66, 0x74, 0x7e, 0x00, 0x08, 0xf4, 0x00,
+0x08, 0x6b, 0x00, 0x08, 0x84, 0x00, 0x12, 0x73, 0x76, 0x00,
+0x06, 0x4c, 0x00, 0x12, 0x43, 0x23, 0x03, 0x0f, 0x4e, 0x00,
+0x17, 0x01, 0x40, 0x00, 0x5b, 0x00, 0x62, 0x6f, 0x74, 0x68,
+0x59, 0x00, 0x00, 0x42, 0x00, 0x06, 0x01, 0x02, 0x12, 0x74,
+0x7c, 0x05, 0x01, 0xc5, 0x05, 0x41, 0x28, 0x41, 0x6c, 0x6c,
+0x54, 0x00, 0x22, 0x61, 0x63, 0x0f, 0x06, 0x83, 0x64, 0x65,
+0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x30, 0x04, 0x11, 0x63,
+0xf8, 0x03, 0x32, 0x32, 0x2e, 0x31, 0xff, 0x04, 0x00, 0xc8,
+0x01, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c,
+0x65, 0x2e, 0x29, 0xd3, 0x03, 0x13, 0x32, 0xd3, 0x03, 0xb1,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
+0x20, 0x88, 0x04, 0x46, 0x65, 0x73, 0x65, 0x00, 0x14, 0x00,
+0x02, 0x41, 0x00, 0x04, 0x3c, 0x00, 0x51, 0x00, 0x66, 0x72,
+0x6f, 0x6d, 0x79, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73, 0x74,
+0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x6f,
+0x00, 0x03, 0x98, 0x04, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65,
+0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xab, 0x00, 0x91, 0x57,
+0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x3c, 0x03,
+0x51, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x04, 0x07, 0x01, 0x58,
+0x07, 0x24, 0x69, 0x6e, 0xe1, 0x00, 0x00, 0x2b, 0x00, 0xc4,
+0x44, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79,
+0x00, 0x00, 0x47, 0x01, 0x02, 0x4b, 0x05, 0x16, 0x64, 0x1a,
+0x00, 0x04, 0x38, 0x05, 0x83, 0x65, 0x6e, 0x65, 0x72, 0x61,
+0x74, 0x65, 0x64, 0x35, 0x05, 0x57, 0x2e, 0x00, 0x4d, 0x6f,
+0x72, 0x29, 0x00, 0x03, 0x17, 0x00, 0x70, 0x73, 0x00, 0x72,
+0x65, 0x71, 0x75, 0x69, 0x2d, 0x07, 0x00, 0x1f, 0x00, 0xc2,
+0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x00, 0x64, 0x65,
+0x64, 0x75, 0x3a, 0x01, 0x02, 0x9a, 0x06, 0x21, 0x61, 0x74,
+0xab, 0x01, 0x20, 0x65, 0x6e, 0xa5, 0x06, 0x15, 0x6e, 0xa4,
+0x07, 0x06, 0xf8, 0x00, 0x07, 0x81, 0x00, 0x55, 0x6c, 0x65,
+0x76, 0x65, 0x6c, 0x58, 0x00, 0xb0, 0x73, 0x00, 0x67, 0x75,
+0x65, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x6b, 0x06, 0x04, 0xe0,
+0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69,
+0x6e, 0x67, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2140;
-const unsigned short help_text_words = 400;
+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 7b27064659..ff5a0a495a 100644
--- a/apps/plugins/puzzles/help/towers.c
+++ b/apps/plugins/puzzles/help/towers.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,239 +6,262 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 216, TEXT_CENTER | C_RED },
- { 291, TEXT_UNDERLINE },
- { 588, TEXT_CENTER | C_RED },
- { 605, TEXT_UNDERLINE },
- { 637, TEXT_UNDERLINE },
+ { 217, TEXT_CENTER | C_RED },
+ { 292, TEXT_UNDERLINE },
+ { 589, TEXT_CENTER | C_RED },
+ { 606, TEXT_UNDERLINE },
+ { 638, TEXT_UNDERLINE },
+ { 677, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 3541 comp 2203 ratio 0.622141 level 10 saved 1338 */
+/* orig 3906 comp 2412 ratio 0.617512 level 10 saved 1494 */
 const char help_text[] = {
-0xf4, 0x26, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x31, 0x3a, 0x20, 0x54, 0x6f, 0x77, 0x65, 0x72, 0x73,
-0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61,
-0x76, 0x65, 0x00, 0x61, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72,
-0x65, 0x00, 0x67, 0x72, 0x69, 0x64, 0x2e, 0x00, 0x4f, 0x6e,
-0x00, 0x65, 0x61, 0x63, 0x68, 0x15, 0x00, 0x52, 0x6f, 0x66,
-0x00, 0x74, 0x68, 0x1c, 0x00, 0xf0, 0x03, 0x00, 0x79, 0x6f,
-0x75, 0x00, 0x63, 0x61, 0x6e, 0x00, 0x62, 0x75, 0x69, 0x6c,
-0x64, 0x00, 0x61, 0x00, 0x74, 0x4d, 0x00, 0xf1, 0x14, 0x2c,
-0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x69, 0x74, 0x73, 0x00,
-0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x00, 0x72, 0x61, 0x6e,
-0x67, 0x69, 0x6e, 0x67, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00,
-0x31, 0x00, 0x74, 0x6f, 0x42, 0x00, 0x39, 0x73, 0x69, 0x7a,
-0x4e, 0x00, 0x81, 0x2e, 0x00, 0x41, 0x72, 0x6f, 0x75, 0x6e,
-0x64, 0x11, 0x00, 0x3a, 0x65, 0x64, 0x67, 0x6b, 0x00, 0x00,
-0x7b, 0x00, 0xf2, 0x04, 0x73, 0x6f, 0x6d, 0x65, 0x00, 0x6e,
-0x75, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x00, 0x63, 0x6c, 0x75,
-0x65, 0x73, 0x2e, 0xb8, 0x00, 0x90, 0x72, 0x00, 0x74, 0x61,
-0x73, 0x6b, 0x00, 0x69, 0x73, 0x5c, 0x00, 0x09, 0x8d, 0x00,
-0x93, 0x00, 0x6f, 0x6e, 0x00, 0x65, 0x76, 0x65, 0x72, 0x79,
-0xbf, 0x00, 0xf0, 0x0c, 0x2c, 0x00, 0x69, 0x6e, 0x00, 0x73,
-0x75, 0x63, 0x68, 0x00, 0x61, 0x00, 0x77, 0x61, 0x79, 0x00,
-0x74, 0x68, 0x61, 0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00,
-0x45, 0xe4, 0x00, 0xc3, 0x72, 0x6f, 0x77, 0x00, 0x63, 0x6f,
-0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x38, 0x00, 0x84, 0x70,
-0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0xcd, 0x00, 0x25,
-0x6f, 0x66, 0x5a, 0x00, 0x26, 0x63, 0x65, 0x3a, 0x00, 0x6f,
-0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x3d, 0x00, 0x24, 0x08,
-0xd4, 0x00, 0xa1, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x65, 0x73, 0xfd, 0x00, 0x65, 0x6e, 0x75, 0x6d, 0x62,
-0x65, 0x72, 0x39, 0x00, 0x11, 0x73, 0xb2, 0x00, 0x02, 0x75,
-0x01, 0x91, 0x65, 0x00, 0x73, 0x65, 0x65, 0x6e, 0x00, 0x69,
-0x66, 0x88, 0x01, 0x74, 0x6c, 0x6f, 0x6f, 0x6b, 0x00, 0x69,
-0x6e, 0x5d, 0x01, 0x02, 0xad, 0x01, 0x01, 0x72, 0x01, 0x01,
-0x32, 0x00, 0xf0, 0x01, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
-0x69, 0x6f, 0x6e, 0x2c, 0x00, 0x61, 0x73, 0x73, 0x75, 0x6d,
-0x90, 0x01, 0x01, 0x19, 0x00, 0x74, 0x73, 0x68, 0x6f, 0x72,
-0x74, 0x65, 0x72, 0x5f, 0x00, 0x00, 0x36, 0x00, 0x50, 0x68,
-0x69, 0x64, 0x64, 0x65, 0x61, 0x00, 0x20, 0x68, 0x69, 0x8f,
-0x01, 0x31, 0x61, 0x6c, 0x6c, 0xb2, 0x00, 0x00, 0x6f, 0x01,
-0xa2, 0x46, 0x6f, 0x72, 0x00, 0x65, 0x78, 0x61, 0x6d, 0x70,
-0x6c, 0x4b, 0x01, 0x51, 0x61, 0x00, 0x35, 0x78, 0x35, 0xa2,
-0x01, 0x32, 0x2c, 0x00, 0x61, 0xc0, 0x00, 0xf3, 0x04, 0x6d,
-0x61, 0x72, 0x6b, 0x65, 0x64, 0x00, 0x60, 0x35, 0x27, 0x00,
-0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0xb6, 0x00,
-0x00, 0x99, 0x00, 0x43, 0x66, 0x69, 0x76, 0x65, 0x04, 0x01,
-0x02, 0x14, 0x01, 0xd0, 0x73, 0x00, 0x6d, 0x75, 0x73, 0x74,
-0x00, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0x53, 0x00, 0x70,
-0x69, 0x6e, 0x63, 0x72, 0x65, 0x61, 0x73, 0xa1, 0x00, 0xf1,
-0x01, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x00, 0x28, 0x6f, 0x74,
-0x68, 0x65, 0x72, 0x77, 0x69, 0x73, 0x65, 0xe9, 0x00, 0x90,
-0x77, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x6e, 0x6f, 0x74, 0x02,
-0x01, 0x30, 0x61, 0x62, 0x6c, 0x4f, 0x00, 0x00, 0x0a, 0x01,
-0x47, 0x00, 0x61, 0x6c, 0x6c, 0x5f, 0x00, 0x70, 0x73, 0x29,
-0x2c, 0x00, 0x77, 0x68, 0x65, 0x4b, 0x00, 0x0c, 0x9a, 0x00,
-0x1f, 0x31, 0x9a, 0x00, 0x02, 0x01, 0xe8, 0x00, 0x23, 0x73,
-0x74, 0x9d, 0x00, 0x10, 0x28, 0x13, 0x00, 0x25, 0x6f, 0x6e,
-0x35, 0x00, 0x22, 0x35, 0x29, 0xa8, 0x00, 0x30, 0x63, 0x6f,
-0x6d, 0xc5, 0x00, 0x30, 0x72, 0x73, 0x74, 0x7c, 0x02, 0x51,
-0x49, 0x6e, 0x00, 0x68, 0x61, 0xa5, 0x00, 0xf2, 0x03, 0x6f,
-0x72, 0x00, 0x6c, 0x61, 0x72, 0x67, 0x65, 0x72, 0x00, 0x70,
-0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x73, 0x2c, 0xaf, 0x02, 0x03,
-0x57, 0x01, 0x41, 0x77, 0x69, 0x6c, 0x6c, 0xb2, 0x01, 0xc1,
-0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x00, 0x66,
-0x6f, 0x72, 0xcf, 0x00, 0x92, 0x61, 0x73, 0x00, 0x77, 0x65,
-0x6c, 0x6c, 0x00, 0x61, 0xf0, 0x01, 0x01, 0xd7, 0x02, 0x1a,
-0x00, 0x09, 0x03, 0x52, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x4f,
-0x00, 0x01, 0x18, 0x03, 0x02, 0x24, 0x00, 0x30, 0x6d, 0x61,
-0x79, 0x52, 0x00, 0x30, 0x6d, 0x69, 0x73, 0x2c, 0x01, 0x00,
-0x8e, 0x00, 0x43, 0x54, 0x68, 0x69, 0x73, 0x7f, 0x00, 0x03,
-0x50, 0x01, 0x10, 0x73, 0x00, 0x03, 0x00, 0x47, 0x00, 0x60,
-0x77, 0x65, 0x62, 0x00, 0x75, 0x6e, 0xa9, 0x00, 0xb0, 0x76,
-0x61, 0x72, 0x69, 0x6f, 0x75, 0x73, 0x00, 0x6e, 0x61, 0x6d,
-0xa5, 0x00, 0xf2, 0x21, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63,
-0x75, 0x6c, 0x61, 0x72, 0x6c, 0x79, 0x00, 0x60, 0x53, 0x6b,
-0x79, 0x73, 0x63, 0x72, 0x61, 0x70, 0x65, 0x72, 0x73, 0x27,
-0x2c, 0x00, 0x62, 0x75, 0x74, 0x00, 0x49, 0x00, 0x64, 0x6f,
-0x6e, 0x27, 0x74, 0x00, 0x6b, 0x6e, 0x6f, 0x77, 0x00, 0x77,
-0x68, 0x6f, 0xfc, 0x00, 0xb1, 0x00, 0x69, 0x6e, 0x76, 0x65,
-0x6e, 0x74, 0x65, 0x64, 0x00, 0x69, 0x08, 0x01, 0x44, 0x33,
-0x31, 0x2e, 0x31, 0x4b, 0x04, 0x00, 0x03, 0x03, 0x31, 0x72,
-0x6f, 0x6c, 0x54, 0x04, 0x12, 0x54, 0xfe, 0x00, 0x40, 0x73,
-0x68, 0x61, 0x72, 0xb2, 0x00, 0x00, 0x78, 0x03, 0x21, 0x6f,
-0x66, 0x1b, 0x04, 0x03, 0x26, 0x00, 0x72, 0x00, 0x73, 0x79,
-0x73, 0x74, 0x65, 0x6d, 0x33, 0x04, 0xd1, 0x53, 0x6f, 0x6c,
-0x6f, 0x2c, 0x00, 0x55, 0x6e, 0x65, 0x71, 0x75, 0x61, 0x6c,
-0xf4, 0x00, 0x51, 0x4b, 0x65, 0x65, 0x6e, 0x2e, 0x48, 0x00,
-0x53, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x50, 0x00, 0xe1, 0x2c,
-0x00, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c,
-0x69, 0x63, 0x6b, 0xe0, 0x00, 0x51, 0x6d, 0x6f, 0x75, 0x73,
-0x65, 0x91, 0x02, 0x84, 0x6e, 0x79, 0x00, 0x65, 0x6d, 0x70,
-0x74, 0x79, 0x03, 0x03, 0x12, 0x61, 0x49, 0x01, 0x50, 0x6e,
-0x00, 0x74, 0x79, 0x70, 0xdc, 0x04, 0x54, 0x64, 0x69, 0x67,
-0x69, 0x74, 0x17, 0x01, 0x80, 0x6b, 0x65, 0x79, 0x62, 0x6f,
-0x61, 0x72, 0x64, 0x43, 0x02, 0x10, 0x66, 0xa3, 0x01, 0x02,
-0x13, 0x03, 0x02, 0x3a, 0x00, 0x01, 0x94, 0x00, 0x05, 0x48,
-0x04, 0x03, 0x8c, 0x04, 0x43, 0x69, 0x76, 0x65, 0x6e, 0xba,
-0x02, 0x32, 0x2e, 0x00, 0x49, 0x7b, 0x03, 0x30, 0x6d, 0x61,
-0x6b, 0x5a, 0x00, 0x8e, 0x6d, 0x69, 0x73, 0x74, 0x61, 0x6b,
-0x65, 0x2c, 0x97, 0x00, 0x02, 0x6d, 0x00, 0x50, 0x69, 0x6e,
-0x63, 0x6f, 0x72, 0x86, 0x03, 0x08, 0x9b, 0x00, 0xa1, 0x70,
-0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0x61, 0x63, 0xc8,
-0x02, 0x21, 0x63, 0x6c, 0x06, 0x03, 0xc0, 0x74, 0x00, 0x61,
-0x67, 0x61, 0x69, 0x6e, 0x00, 0x28, 0x6f, 0x72, 0x00, 0x42,
-0x00, 0x00, 0x3f, 0x00, 0xd1, 0x55, 0x6e, 0x64, 0x6f, 0x00,
-0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x29, 0x7d, 0x02,
-0x02, 0x7e, 0x00, 0x10, 0x72, 0x8c, 0x00, 0x12, 0x2d, 0x74,
-0x00, 0x01, 0x92, 0x03, 0x0f, 0xf9, 0x00, 0x04, 0x02, 0x4a,
-0x04, 0x12, 0x2c, 0xe3, 0x00, 0x03, 0x57, 0x04, 0x04, 0x97,
-0x02, 0x00, 0xcc, 0x01, 0x10, 0x72, 0xce, 0x01, 0x18, 0x6e,
-0x3e, 0x04, 0x01, 0x3a, 0x03, 0x71, 0x60, 0x70, 0x65, 0x6e,
-0x63, 0x69, 0x6c, 0x08, 0x03, 0x43, 0x27, 0x2e, 0x00, 0x59,
-0xf3, 0x05, 0x01, 0x2a, 0x06, 0x07, 0x1b, 0x00, 0x11, 0x73,
-0xd1, 0x02, 0x74, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c,
-0xb7, 0x04, 0x15, 0x73, 0x51, 0x00, 0x24, 0x61, 0x6d, 0x56,
-0x00, 0x34, 0x2e, 0x00, 0x41, 0x60, 0x00, 0x03, 0x2d, 0x05,
-0x00, 0xea, 0x03, 0x04, 0x67, 0x01, 0x30, 0x63, 0x61, 0x6e,
-0xda, 0x03, 0x44, 0x61, 0x6c, 0x73, 0x6f, 0x1f, 0x00, 0x09,
-0x66, 0x00, 0x02, 0xe7, 0x02, 0x30, 0x65, 0x00, 0x67, 0x51,
-0x00, 0xd0, 0x70, 0x61, 0x79, 0x73, 0x00, 0x6e, 0x6f, 0x00,
-0x61, 0x74, 0x74, 0x65, 0x6e, 0xdc, 0x04, 0x00, 0x42, 0x01,
-0x08, 0x2e, 0x00, 0x00, 0x84, 0x03, 0x00, 0xaf, 0x04, 0x60,
-0x63, 0x74, 0x6c, 0x79, 0x00, 0x77, 0xf8, 0x00, 0x00, 0x31,
-0x01, 0x03, 0x51, 0x01, 0x11, 0x6d, 0xb2, 0x00, 0x50, 0x69,
-0x73, 0x00, 0x75, 0x70, 0x38, 0x00, 0x45, 0x79, 0x6f, 0x75,
-0x3a, 0xd1, 0x06, 0x05, 0x23, 0x00, 0x95, 0x61, 0x73, 0x00,
-0x72, 0x65, 0x6d, 0x69, 0x6e, 0x64, 0x7b, 0x05, 0x17, 0x61,
-0x33, 0x03, 0x04, 0xc9, 0x00, 0x42, 0x6e, 0x65, 0x65, 0x64,
-0x7c, 0x06, 0x50, 0x65, 0x00, 0x72, 0x65, 0x2d, 0x21, 0x05,
-0x42, 0x69, 0x6e, 0x65, 0x64, 0xe6, 0x05, 0x00, 0x54, 0x00,
-0x01, 0x3e, 0x03, 0x30, 0x6d, 0x6f, 0x72, 0xb1, 0x04, 0x2b,
-0x6f, 0x75, 0x45, 0x00, 0x04, 0x99, 0x01, 0x2f, 0x6f, 0x72,
-0x80, 0x00, 0x02, 0x54, 0x6c, 0x69, 0x73, 0x74, 0x73, 0x80,
-0x02, 0x05, 0x51, 0x06, 0x07, 0x61, 0x01, 0x13, 0x61, 0x96,
-0x02, 0x04, 0xe2, 0x06, 0x20, 0x6f, 0x72, 0x06, 0x03, 0x20,
-0x74, 0x68, 0x58, 0x01, 0x23, 0x65, 0x6c, 0x36, 0x05, 0x93,
-0x66, 0x65, 0x65, 0x6c, 0x00, 0x6c, 0x69, 0x6b, 0x65, 0x4f,
-0x03, 0x41, 0x65, 0x72, 0x61, 0x73, 0xeb, 0x07, 0x49, 0x69,
-0x6e, 0x67, 0x6c, 0xca, 0x01, 0x1c, 0x2c, 0x52, 0x02, 0x08,
-0x12, 0x02, 0x22, 0x6e, 0x64, 0x4f, 0x02, 0x05, 0xd5, 0x01,
-0x03, 0x49, 0x02, 0x01, 0xaf, 0x02, 0x00, 0x5b, 0x00, 0x3a,
-0x41, 0x6c, 0x6c, 0x17, 0x02, 0x09, 0x93, 0x02, 0x22, 0x72,
-0x65, 0x79, 0x00, 0x10, 0x64, 0x9b, 0x05, 0x12, 0x6e, 0xb8,
-0x06, 0x24, 0x65, 0x66, 0x6c, 0x00, 0x05, 0x5e, 0x00, 0x18,
-0x61, 0x14, 0x01, 0x0f, 0x2a, 0x00, 0x05, 0x02, 0x3a, 0x03,
-0x10, 0x73, 0x3a, 0x03, 0x36, 0x2e, 0x00, 0x52, 0xb3, 0x00,
-0x01, 0x4f, 0x02, 0x04, 0x20, 0x00, 0x00, 0x0d, 0x00, 0x01,
-0x23, 0x00, 0x02, 0xeb, 0x02, 0x01, 0x58, 0x02, 0x02, 0xfb,
-0x00, 0x0c, 0x56, 0x02, 0x12, 0x41, 0xc2, 0x02, 0x02, 0x84,
-0x04, 0x01, 0x8a, 0x05, 0x50, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0x23, 0x04, 0x14, 0x73, 0x70, 0x07, 0x22, 0x75, 0x73, 0x24,
-0x03, 0x61, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x4f, 0x07,
-0x02, 0x26, 0x04, 0x00, 0x30, 0x00, 0x02, 0x59, 0x04, 0x01,
-0x2f, 0x00, 0x01, 0x91, 0x06, 0x15, 0x74, 0xa4, 0x01, 0x2b,
-0x6f, 0x72, 0x6e, 0x00, 0x3d, 0x55, 0x73, 0x65, 0x63, 0x00,
-0x51, 0x74, 0x6f, 0x00, 0x6d, 0x6f, 0x7e, 0x09, 0x51, 0x68,
-0x69, 0x67, 0x68, 0x6c, 0x2f, 0x08, 0x16, 0x61, 0x08, 0x06,
-0x03, 0x63, 0x07, 0x2a, 0x6e, 0x64, 0xc8, 0x04, 0x22, 0x74,
-0x6f, 0xbc, 0x03, 0x00, 0x33, 0x04, 0x03, 0xab, 0x01, 0x05,
-0x3f, 0x00, 0x25, 0x65, 0x64, 0x73, 0x03, 0x14, 0x50, 0x0c,
-0x01, 0x50, 0x72, 0x65, 0x74, 0x75, 0x72, 0x28, 0x03, 0x5a,
-0x67, 0x67, 0x6c, 0x65, 0x73, 0x30, 0x00, 0x02, 0x3e, 0x08,
-0x51, 0x61, 0x00, 0x6d, 0x6f, 0x64, 0xb4, 0x04, 0x55, 0x77,
-0x68, 0x69, 0x63, 0x68, 0x93, 0x02, 0x02, 0x67, 0x00, 0x20,
-0x6f, 0x72, 0x10, 0x03, 0x2e, 0x6f, 0x76, 0x40, 0x01, 0x05,
-0x63, 0x00, 0x12, 0x4d, 0x6b, 0x01, 0x01, 0x4f, 0x05, 0x01,
-0xfd, 0x01, 0x41, 0x66, 0x75, 0x6c, 0x6c, 0x10, 0x01, 0x2d,
-0x6f, 0x66, 0x1b, 0x02, 0x08, 0x9c, 0x09, 0x03, 0xa9, 0x08,
-0x31, 0x6f, 0x65, 0x73, 0xde, 0x07, 0x03, 0x8c, 0x0a, 0x10,
-0x6d, 0x03, 0x04, 0x02, 0xed, 0x00, 0x23, 0x69, 0x6e, 0x6f,
-0x06, 0x38, 0x4c, 0x65, 0x66, 0xed, 0x01, 0x02, 0xde, 0x07,
-0x01, 0x76, 0x00, 0x00, 0x59, 0x00, 0x01, 0x3f, 0x05, 0x30,
-0x73, 0x00, 0x64, 0xbe, 0x07, 0x60, 0x28, 0x67, 0x72, 0x65,
-0x79, 0x00, 0xf1, 0x05, 0x31, 0x75, 0x74, 0x29, 0x4f, 0x02,
-0x24, 0x75, 0x6e, 0x24, 0x00, 0x10, 0x69, 0x8a, 0x06, 0x00,
-0x01, 0x04, 0x73, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79,
-0xeb, 0x07, 0x60, 0x2e, 0x00, 0x48, 0x6f, 0x6c, 0x64, 0x59,
-0x00, 0x13, 0x43, 0xa4, 0x06, 0x00, 0x17, 0x02, 0x4a, 0x68,
-0x69, 0x66, 0x74, 0x57, 0x02, 0x50, 0x61, 0x6e, 0x00, 0x61,
-0x72, 0x31, 0x0a, 0x31, 0x6b, 0x65, 0x79, 0x5a, 0x03, 0x01,
-0xa2, 0x08, 0x02, 0xda, 0x00, 0x00, 0x86, 0x06, 0x01, 0x95,
-0x00, 0x27, 0x69, 0x6e, 0x37, 0x06, 0x05, 0x84, 0x09, 0x00,
-0xc4, 0x00, 0x10, 0x28, 0x2a, 0x03, 0x00, 0x1c, 0x00, 0x11,
-0x61, 0x13, 0x00, 0x15, 0x73, 0xf8, 0x09, 0x11, 0x64, 0xa3,
-0x0a, 0x12, 0x65, 0x5e, 0x02, 0x31, 0x32, 0x2e, 0x31, 0x36,
-0x03, 0x01, 0xb9, 0x02, 0x50, 0x61, 0x76, 0x61, 0x69, 0x6c,
-0xf2, 0x08, 0x22, 0x2e, 0x29, 0x74, 0x07, 0x14, 0x32, 0x74,
-0x07, 0x73, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0xca,
-0x0b, 0x30, 0x54, 0x68, 0x65, 0xe1, 0x02, 0x05, 0x14, 0x00,
-0x02, 0x42, 0x00, 0x04, 0x3d, 0x00, 0x04, 0x15, 0x0a, 0xf1,
-0x01, 0x65, 0x00, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x70, 0x00, 0x03,
-0x18, 0x07, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0xac, 0x00, 0x51, 0x47, 0x72, 0x69,
-0x64, 0x20, 0xb0, 0x0b, 0x33, 0x00, 0x00, 0x53, 0xc2, 0x08,
-0x1f, 0x73, 0xc5, 0x0b, 0x04, 0x11, 0x4c, 0xc8, 0x05, 0x32,
-0x6c, 0x69, 0x6d, 0x5c, 0x01, 0x68, 0x33, 0x3b, 0x00, 0x75,
-0x70, 0x70, 0x12, 0x00, 0x74, 0x39, 0x00, 0x28, 0x62, 0x65,
-0x63, 0x61, 0xd7, 0x06, 0x20, 0x75, 0x73, 0xbe, 0x02, 0x00,
-0x5d, 0x02, 0x11, 0x66, 0xa7, 0x03, 0x01, 0xde, 0x09, 0x21,
-0x62, 0x65, 0x68, 0x09, 0x01, 0x32, 0x05, 0x40, 0x64, 0x69,
-0x66, 0x66, 0x2a, 0x05, 0x12, 0x74, 0x6b, 0x03, 0x11, 0x60,
-0x0c, 0x02, 0x70, 0x73, 0x27, 0x00, 0x62, 0x69, 0x67, 0x67,
-0xb8, 0x0a, 0x61, 0x68, 0x61, 0x6e, 0x00, 0x39, 0x21, 0x12,
-0x07, 0x14, 0x44, 0x2b, 0x00, 0x34, 0x79, 0x00, 0x00, 0xbe,
-0x01, 0x13, 0x73, 0x9d, 0x03, 0x05, 0x1a, 0x00, 0x04, 0xae,
-0x00, 0x50, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x25, 0x03, 0x02,
-0x32, 0x09, 0x70, 0x2e, 0x00, 0x41, 0x74, 0x00, 0x55, 0x6e,
-0x30, 0x0a, 0x21, 0x6f, 0x6e, 0x28, 0x01, 0x53, 0x6c, 0x65,
-0x76, 0x65, 0x6c, 0xc7, 0x09, 0x72, 0x62, 0x61, 0x63, 0x6b,
-0x74, 0x72, 0x61, 0x71, 0x02, 0x04, 0x36, 0x07, 0x82, 0x72,
-0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x2a, 0x09, 0x01,
-0x0f, 0x01, 0x31, 0x6f, 0x6c, 0x75, 0x48, 0x01, 0x21, 0x73,
-0x68, 0xc8, 0x00, 0x23, 0x73, 0x74, 0x2b, 0x00, 0x71, 0x75,
-0x6e, 0x69, 0x71, 0x75, 0x65, 0x2e, 0xbc, 0x06, 0x33, 0x72,
-0x65, 0x6d, 0xf6, 0x06, 0x01, 0x62, 0x00, 0x14, 0x73, 0x48,
-0x00, 0x07, 0xfa, 0x0a, 0x00, 0xdc, 0x08, 0x10, 0x6f, 0x65,
-0x0b, 0x22, 0x78, 0x00, 0x91, 0x00, 0x01, 0xaf, 0x0b, 0x00,
-0x02, 0x02, 0x30, 0x6f, 0x69, 0x64, 0x1a, 0x03, 0x03, 0x10,
-0x00, 0xb0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0x63,
-0x6b, 0x2e, 0x00,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf4, 0x13, 0x00, 0x00, 0x00,
+0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61,
+0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00, 0x67, 0x72,
+0x69, 0x64, 0x2e, 0x00, 0x4f, 0x6e, 0x00, 0x65, 0x61, 0x63,
+0x68, 0x15, 0x00, 0x52, 0x6f, 0x66, 0x00, 0x74, 0x68, 0x1c,
+0x00, 0xf0, 0x03, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x63, 0x61,
+0x6e, 0x00, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x00, 0x61, 0x00,
+0x74, 0x60, 0x00, 0xf1, 0x14, 0x2c, 0x00, 0x77, 0x69, 0x74,
+0x68, 0x00, 0x69, 0x74, 0x73, 0x00, 0x68, 0x65, 0x69, 0x67,
+0x68, 0x74, 0x00, 0x72, 0x61, 0x6e, 0x67, 0x69, 0x6e, 0x67,
+0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x31, 0x00, 0x74, 0x6f,
+0x42, 0x00, 0x39, 0x73, 0x69, 0x7a, 0x4e, 0x00, 0x81, 0x2e,
+0x00, 0x41, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x11, 0x00, 0x3a,
+0x65, 0x64, 0x67, 0x6b, 0x00, 0x00, 0x7b, 0x00, 0xf2, 0x04,
+0x73, 0x6f, 0x6d, 0x65, 0x00, 0x6e, 0x75, 0x6d, 0x65, 0x72,
+0x69, 0x63, 0x00, 0x63, 0x6c, 0x75, 0x65, 0x73, 0x2e, 0xb8,
+0x00, 0x90, 0x72, 0x00, 0x74, 0x61, 0x73, 0x6b, 0x00, 0x69,
+0x73, 0x5c, 0x00, 0x09, 0x8d, 0x00, 0x93, 0x00, 0x6f, 0x6e,
+0x00, 0x65, 0x76, 0x65, 0x72, 0x79, 0xbf, 0x00, 0xf0, 0x0c,
+0x2c, 0x00, 0x69, 0x6e, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00,
+0x61, 0x00, 0x77, 0x61, 0x79, 0x00, 0x74, 0x68, 0x61, 0x74,
+0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00, 0x45, 0xe4, 0x00, 0xc3,
+0x72, 0x6f, 0x77, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
+0x6e, 0x73, 0x38, 0x00, 0x84, 0x70, 0x6f, 0x73, 0x73, 0x69,
+0x62, 0x6c, 0x65, 0xcd, 0x00, 0x25, 0x6f, 0x66, 0x5a, 0x00,
+0x26, 0x63, 0x65, 0x3a, 0x00, 0x6f, 0x63, 0x6f, 0x6c, 0x75,
+0x6d, 0x6e, 0x3d, 0x00, 0x24, 0x08, 0xd4, 0x00, 0xa1, 0x00,
+0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x73, 0xfd,
+0x00, 0x65, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x39, 0x00,
+0x11, 0x73, 0xb2, 0x00, 0x02, 0x75, 0x01, 0x91, 0x65, 0x00,
+0x73, 0x65, 0x65, 0x6e, 0x00, 0x69, 0x66, 0x88, 0x01, 0x74,
+0x6c, 0x6f, 0x6f, 0x6b, 0x00, 0x69, 0x6e, 0x5d, 0x01, 0x02,
+0xad, 0x01, 0x01, 0x72, 0x01, 0x01, 0x32, 0x00, 0xf0, 0x01,
+0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x2c,
+0x00, 0x61, 0x73, 0x73, 0x75, 0x6d, 0x90, 0x01, 0x01, 0x19,
+0x00, 0x74, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x65, 0x72, 0x5f,
+0x00, 0x00, 0x36, 0x00, 0x50, 0x68, 0x69, 0x64, 0x64, 0x65,
+0x61, 0x00, 0x20, 0x68, 0x69, 0x8f, 0x01, 0x31, 0x61, 0x6c,
+0x6c, 0xb2, 0x00, 0x00, 0x6f, 0x01, 0xa2, 0x46, 0x6f, 0x72,
+0x00, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x4b, 0x01, 0x51,
+0x61, 0x00, 0x35, 0x78, 0x35, 0xa2, 0x01, 0x32, 0x2c, 0x00,
+0x61, 0xc0, 0x00, 0xf3, 0x04, 0x6d, 0x61, 0x72, 0x6b, 0x65,
+0x64, 0x00, 0x60, 0x35, 0x27, 0x00, 0x69, 0x6e, 0x64, 0x69,
+0x63, 0x61, 0x74, 0x65, 0xb6, 0x00, 0x00, 0x99, 0x00, 0x43,
+0x66, 0x69, 0x76, 0x65, 0x04, 0x01, 0x02, 0x14, 0x01, 0xd0,
+0x73, 0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x61, 0x70, 0x70,
+0x65, 0x61, 0x72, 0x53, 0x00, 0x70, 0x69, 0x6e, 0x63, 0x72,
+0x65, 0x61, 0x73, 0xa1, 0x00, 0xf1, 0x01, 0x6f, 0x72, 0x64,
+0x65, 0x72, 0x00, 0x28, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x77,
+0x69, 0x73, 0x65, 0xe9, 0x00, 0x90, 0x77, 0x6f, 0x75, 0x6c,
+0x64, 0x00, 0x6e, 0x6f, 0x74, 0x02, 0x01, 0x30, 0x61, 0x62,
+0x6c, 0x4f, 0x00, 0x00, 0x0a, 0x01, 0x47, 0x00, 0x61, 0x6c,
+0x6c, 0x5f, 0x00, 0x70, 0x73, 0x29, 0x2c, 0x00, 0x77, 0x68,
+0x65, 0x4b, 0x00, 0x0c, 0x9a, 0x00, 0x1f, 0x31, 0x9a, 0x00,
+0x02, 0x01, 0xe8, 0x00, 0x23, 0x73, 0x74, 0x9d, 0x00, 0x10,
+0x28, 0x13, 0x00, 0x25, 0x6f, 0x6e, 0x35, 0x00, 0x22, 0x35,
+0x29, 0xa8, 0x00, 0x30, 0x63, 0x6f, 0x6d, 0xc5, 0x00, 0x30,
+0x72, 0x73, 0x74, 0x7c, 0x02, 0x51, 0x49, 0x6e, 0x00, 0x68,
+0x61, 0xa5, 0x00, 0xf2, 0x03, 0x6f, 0x72, 0x00, 0x6c, 0x61,
+0x72, 0x67, 0x65, 0x72, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
+0x65, 0x73, 0x2c, 0xaf, 0x02, 0x03, 0x57, 0x01, 0x41, 0x77,
+0x69, 0x6c, 0x6c, 0xb2, 0x01, 0xc1, 0x70, 0x65, 0x63, 0x69,
+0x66, 0x69, 0x65, 0x64, 0x00, 0x66, 0x6f, 0x72, 0xcf, 0x00,
+0x92, 0x61, 0x73, 0x00, 0x77, 0x65, 0x6c, 0x6c, 0x00, 0x61,
+0xf0, 0x01, 0x01, 0xd7, 0x02, 0x1a, 0x00, 0x09, 0x03, 0x52,
+0x2c, 0x00, 0x61, 0x6e, 0x64, 0x4f, 0x00, 0x01, 0x18, 0x03,
+0x02, 0x24, 0x00, 0x30, 0x6d, 0x61, 0x79, 0x52, 0x00, 0x30,
+0x6d, 0x69, 0x73, 0x2c, 0x01, 0x00, 0x8e, 0x00, 0x43, 0x54,
+0x68, 0x69, 0x73, 0x7f, 0x00, 0x03, 0x50, 0x01, 0x10, 0x73,
+0x00, 0x03, 0x00, 0x47, 0x00, 0x60, 0x77, 0x65, 0x62, 0x00,
+0x75, 0x6e, 0xa9, 0x00, 0xb0, 0x76, 0x61, 0x72, 0x69, 0x6f,
+0x75, 0x73, 0x00, 0x6e, 0x61, 0x6d, 0xa5, 0x00, 0xf2, 0x21,
+0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x75, 0x6c, 0x61, 0x72,
+0x6c, 0x79, 0x00, 0x60, 0x53, 0x6b, 0x79, 0x73, 0x63, 0x72,
+0x61, 0x70, 0x65, 0x72, 0x73, 0x27, 0x2c, 0x00, 0x62, 0x75,
+0x74, 0x00, 0x49, 0x00, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x00,
+0x6b, 0x6e, 0x6f, 0x77, 0x00, 0x77, 0x68, 0x6f, 0xfc, 0x00,
+0xb1, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e, 0x74, 0x65, 0x64,
+0x00, 0x69, 0x08, 0x01, 0x44, 0x33, 0x31, 0x2e, 0x31, 0x5e,
+0x04, 0x00, 0x03, 0x03, 0x50, 0x72, 0x6f, 0x6c, 0x73, 0x20,
+0x92, 0x00, 0x02, 0xfe, 0x00, 0x40, 0x73, 0x68, 0x61, 0x72,
+0xb2, 0x00, 0x00, 0x78, 0x03, 0x21, 0x6f, 0x66, 0x1b, 0x04,
+0x03, 0x26, 0x00, 0x72, 0x00, 0x73, 0x79, 0x73, 0x74, 0x65,
+0x6d, 0x33, 0x04, 0xd1, 0x53, 0x6f, 0x6c, 0x6f, 0x2c, 0x00,
+0x55, 0x6e, 0x65, 0x71, 0x75, 0x61, 0x6c, 0xf4, 0x00, 0x51,
+0x4b, 0x65, 0x65, 0x6e, 0x2e, 0x48, 0x00, 0x53, 0x00, 0x70,
+0x6c, 0x61, 0x79, 0x50, 0x00, 0xe1, 0x2c, 0x00, 0x73, 0x69,
+0x6d, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b,
+0xe0, 0x00, 0x51, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x91, 0x02,
+0x84, 0x6e, 0x79, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x03,
+0x03, 0x12, 0x61, 0x49, 0x01, 0x50, 0x6e, 0x00, 0x74, 0x79,
+0x70, 0xdc, 0x04, 0x54, 0x64, 0x69, 0x67, 0x69, 0x74, 0x17,
+0x01, 0x80, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64,
+0x43, 0x02, 0x10, 0x66, 0xa3, 0x01, 0x02, 0x13, 0x03, 0x02,
+0x3a, 0x00, 0x01, 0x94, 0x00, 0x05, 0x48, 0x04, 0x03, 0x8c,
+0x04, 0x43, 0x69, 0x76, 0x65, 0x6e, 0xba, 0x02, 0x32, 0x2e,
+0x00, 0x49, 0x7b, 0x03, 0x30, 0x6d, 0x61, 0x6b, 0x5a, 0x00,
+0x8e, 0x6d, 0x69, 0x73, 0x74, 0x61, 0x6b, 0x65, 0x2c, 0x97,
+0x00, 0x02, 0x6d, 0x00, 0x50, 0x69, 0x6e, 0x63, 0x6f, 0x72,
+0x86, 0x03, 0x08, 0x9b, 0x00, 0xa1, 0x70, 0x72, 0x65, 0x73,
+0x73, 0x00, 0x53, 0x70, 0x61, 0x63, 0xc8, 0x02, 0x21, 0x63,
+0x6c, 0x06, 0x03, 0xc0, 0x74, 0x00, 0x61, 0x67, 0x61, 0x69,
+0x6e, 0x00, 0x28, 0x6f, 0x72, 0x00, 0x42, 0x00, 0x00, 0x3f,
+0x00, 0xd1, 0x55, 0x6e, 0x64, 0x6f, 0x00, 0x66, 0x65, 0x61,
+0x74, 0x75, 0x72, 0x65, 0x29, 0x7d, 0x02, 0x02, 0x7e, 0x00,
+0x10, 0x72, 0x8c, 0x00, 0x12, 0x2d, 0x74, 0x00, 0x01, 0x92,
+0x03, 0x0f, 0xf9, 0x00, 0x04, 0x02, 0x4a, 0x04, 0x12, 0x2c,
+0xe3, 0x00, 0x03, 0x57, 0x04, 0x04, 0x97, 0x02, 0x00, 0xcc,
+0x01, 0x10, 0x72, 0xce, 0x01, 0x18, 0x6e, 0x3e, 0x04, 0x01,
+0x3a, 0x03, 0x71, 0x60, 0x70, 0x65, 0x6e, 0x63, 0x69, 0x6c,
+0x08, 0x03, 0x43, 0x27, 0x2e, 0x00, 0x59, 0xf3, 0x05, 0x01,
+0x2a, 0x06, 0x07, 0x1b, 0x00, 0x11, 0x73, 0xd1, 0x02, 0x74,
+0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0xb7, 0x04, 0x15,
+0x73, 0x51, 0x00, 0x24, 0x61, 0x6d, 0x56, 0x00, 0x34, 0x2e,
+0x00, 0x41, 0x60, 0x00, 0x03, 0x2d, 0x05, 0x00, 0xea, 0x03,
+0x04, 0x67, 0x01, 0x30, 0x63, 0x61, 0x6e, 0xda, 0x03, 0x44,
+0x61, 0x6c, 0x73, 0x6f, 0x1f, 0x00, 0x09, 0x66, 0x00, 0x02,
+0xe7, 0x02, 0x30, 0x65, 0x00, 0x67, 0x51, 0x00, 0xd0, 0x70,
+0x61, 0x79, 0x73, 0x00, 0x6e, 0x6f, 0x00, 0x61, 0x74, 0x74,
+0x65, 0x6e, 0xdc, 0x04, 0x00, 0x42, 0x01, 0x08, 0x2e, 0x00,
+0x00, 0x84, 0x03, 0x00, 0xaf, 0x04, 0x60, 0x63, 0x74, 0x6c,
+0x79, 0x00, 0x77, 0xf8, 0x00, 0x00, 0x31, 0x01, 0x03, 0x51,
+0x01, 0x11, 0x6d, 0xb2, 0x00, 0x50, 0x69, 0x73, 0x00, 0x75,
+0x70, 0x38, 0x00, 0x45, 0x79, 0x6f, 0x75, 0x3a, 0xd1, 0x06,
+0x05, 0x23, 0x00, 0x95, 0x61, 0x73, 0x00, 0x72, 0x65, 0x6d,
+0x69, 0x6e, 0x64, 0x7b, 0x05, 0x17, 0x61, 0x33, 0x03, 0x04,
+0xc9, 0x00, 0x42, 0x6e, 0x65, 0x65, 0x64, 0x7c, 0x06, 0x50,
+0x65, 0x00, 0x72, 0x65, 0x2d, 0x21, 0x05, 0x42, 0x69, 0x6e,
+0x65, 0x64, 0xe6, 0x05, 0x00, 0x54, 0x00, 0x01, 0x3e, 0x03,
+0x30, 0x6d, 0x6f, 0x72, 0xb1, 0x04, 0x2b, 0x6f, 0x75, 0x45,
+0x00, 0x04, 0x99, 0x01, 0x2f, 0x6f, 0x72, 0x80, 0x00, 0x02,
+0x54, 0x6c, 0x69, 0x73, 0x74, 0x73, 0x80, 0x02, 0x05, 0x51,
+0x06, 0x07, 0x61, 0x01, 0x13, 0x61, 0x96, 0x02, 0x04, 0xe2,
+0x06, 0x20, 0x6f, 0x72, 0x06, 0x03, 0x20, 0x74, 0x68, 0x58,
+0x01, 0x23, 0x65, 0x6c, 0x36, 0x05, 0x93, 0x66, 0x65, 0x65,
+0x6c, 0x00, 0x6c, 0x69, 0x6b, 0x65, 0x4f, 0x03, 0x41, 0x65,
+0x72, 0x61, 0x73, 0xeb, 0x07, 0x49, 0x69, 0x6e, 0x67, 0x6c,
+0xca, 0x01, 0x1c, 0x2c, 0x52, 0x02, 0x08, 0x12, 0x02, 0x22,
+0x6e, 0x64, 0x4f, 0x02, 0x05, 0xd5, 0x01, 0x03, 0x49, 0x02,
+0x01, 0xaf, 0x02, 0x00, 0x5b, 0x00, 0x3a, 0x41, 0x6c, 0x6c,
+0x17, 0x02, 0x09, 0x93, 0x02, 0x22, 0x72, 0x65, 0x79, 0x00,
+0x10, 0x64, 0x9b, 0x05, 0x12, 0x6e, 0xb8, 0x06, 0x24, 0x65,
+0x66, 0x6c, 0x00, 0x05, 0x5e, 0x00, 0x18, 0x61, 0x14, 0x01,
+0x0f, 0x2a, 0x00, 0x05, 0x02, 0x3a, 0x03, 0x10, 0x73, 0x3a,
+0x03, 0x36, 0x2e, 0x00, 0x52, 0xb3, 0x00, 0x01, 0x4f, 0x02,
+0x04, 0x20, 0x00, 0x00, 0x0d, 0x00, 0x01, 0x23, 0x00, 0x02,
+0xeb, 0x02, 0x01, 0x58, 0x02, 0x02, 0xfb, 0x00, 0x0c, 0x56,
+0x02, 0x12, 0x41, 0xc2, 0x02, 0x02, 0x84, 0x04, 0x01, 0x8a,
+0x05, 0x50, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x23, 0x04, 0x14,
+0x73, 0x70, 0x07, 0x22, 0x75, 0x73, 0x24, 0x03, 0x61, 0x63,
+0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x4f, 0x07, 0x02, 0x26, 0x04,
+0x00, 0x30, 0x00, 0x02, 0x59, 0x04, 0x01, 0x2f, 0x00, 0x01,
+0x91, 0x06, 0x15, 0x74, 0xa4, 0x01, 0x2b, 0x6f, 0x72, 0x6e,
+0x00, 0x3d, 0x55, 0x73, 0x65, 0x63, 0x00, 0x51, 0x74, 0x6f,
+0x00, 0x6d, 0x6f, 0x7e, 0x09, 0x51, 0x68, 0x69, 0x67, 0x68,
+0x6c, 0x2f, 0x08, 0x16, 0x61, 0x08, 0x06, 0x03, 0x63, 0x07,
+0x2a, 0x6e, 0x64, 0xc8, 0x04, 0x22, 0x74, 0x6f, 0xbc, 0x03,
+0x00, 0x33, 0x04, 0x03, 0xab, 0x01, 0x05, 0x3f, 0x00, 0x25,
+0x65, 0x64, 0x73, 0x03, 0x14, 0x50, 0x0c, 0x01, 0x50, 0x72,
+0x65, 0x74, 0x75, 0x72, 0x28, 0x03, 0x5a, 0x67, 0x67, 0x6c,
+0x65, 0x73, 0x30, 0x00, 0x02, 0x3e, 0x08, 0x51, 0x61, 0x00,
+0x6d, 0x6f, 0x64, 0xb4, 0x04, 0x55, 0x77, 0x68, 0x69, 0x63,
+0x68, 0x93, 0x02, 0x02, 0x67, 0x00, 0x20, 0x6f, 0x72, 0x10,
+0x03, 0x2e, 0x6f, 0x76, 0x40, 0x01, 0x05, 0x63, 0x00, 0x12,
+0x4d, 0x6b, 0x01, 0x01, 0x4f, 0x05, 0x01, 0xfd, 0x01, 0x41,
+0x66, 0x75, 0x6c, 0x6c, 0x10, 0x01, 0x2d, 0x6f, 0x66, 0x1b,
+0x02, 0x08, 0x9c, 0x09, 0x03, 0xa9, 0x08, 0x31, 0x6f, 0x65,
+0x73, 0xde, 0x07, 0x03, 0x8c, 0x0a, 0x10, 0x6d, 0x03, 0x04,
+0x02, 0xed, 0x00, 0x23, 0x69, 0x6e, 0x6f, 0x06, 0x38, 0x4c,
+0x65, 0x66, 0xed, 0x01, 0x02, 0xde, 0x07, 0x01, 0x76, 0x00,
+0x00, 0x59, 0x00, 0x01, 0x3f, 0x05, 0x30, 0x73, 0x00, 0x64,
+0xbe, 0x07, 0x60, 0x28, 0x67, 0x72, 0x65, 0x79, 0x00, 0xf1,
+0x05, 0x31, 0x75, 0x74, 0x29, 0x4f, 0x02, 0x24, 0x75, 0x6e,
+0x24, 0x00, 0x10, 0x69, 0x8a, 0x06, 0x00, 0x01, 0x04, 0x73,
+0x61, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0xeb, 0x07, 0x60,
+0x2e, 0x00, 0x48, 0x6f, 0x6c, 0x64, 0x59, 0x00, 0x13, 0x43,
+0xa4, 0x06, 0x00, 0x17, 0x02, 0x4a, 0x68, 0x69, 0x66, 0x74,
+0x57, 0x02, 0x50, 0x61, 0x6e, 0x00, 0x61, 0x72, 0x31, 0x0a,
+0x31, 0x6b, 0x65, 0x79, 0x5a, 0x03, 0x01, 0xa2, 0x08, 0x02,
+0xda, 0x00, 0x00, 0x86, 0x06, 0x01, 0x95, 0x00, 0x27, 0x69,
+0x6e, 0x37, 0x06, 0x05, 0x84, 0x09, 0x00, 0xc4, 0x00, 0x10,
+0x28, 0x2a, 0x03, 0x00, 0x1c, 0x00, 0x11, 0x61, 0x13, 0x00,
+0x15, 0x73, 0xf8, 0x09, 0x11, 0x64, 0xa3, 0x0a, 0x12, 0x65,
+0x5e, 0x02, 0x31, 0x32, 0x2e, 0x31, 0x36, 0x03, 0x01, 0xb9,
+0x02, 0x50, 0x61, 0x76, 0x61, 0x69, 0x6c, 0xf2, 0x08, 0x22,
+0x2e, 0x29, 0x74, 0x07, 0x14, 0x32, 0x74, 0x07, 0x71, 0x70,
+0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0xdd, 0x0b, 0x01, 0x21,
+0x05, 0x00, 0xe1, 0x02, 0x05, 0x14, 0x00, 0x02, 0x42, 0x00,
+0x04, 0x3d, 0x00, 0x04, 0x15, 0x0a, 0xf1, 0x01, 0x65, 0x00,
+0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e,
+0x27, 0x00, 0x6f, 0x70, 0x70, 0x00, 0x03, 0x18, 0x07, 0xb0,
+0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
+0x75, 0xac, 0x00, 0x51, 0x47, 0x72, 0x69, 0x64, 0x20, 0xb0,
+0x0b, 0x33, 0x00, 0x00, 0x53, 0xc2, 0x08, 0x1f, 0x73, 0xc5,
+0x0b, 0x04, 0x11, 0x4c, 0xc8, 0x05, 0x32, 0x6c, 0x69, 0x6d,
+0x5c, 0x01, 0x68, 0x33, 0x3b, 0x00, 0x75, 0x70, 0x70, 0x12,
+0x00, 0x74, 0x39, 0x00, 0x28, 0x62, 0x65, 0x63, 0x61, 0xd7,
+0x06, 0x20, 0x75, 0x73, 0xbe, 0x02, 0x00, 0x5d, 0x02, 0x11,
+0x66, 0xa7, 0x03, 0x01, 0xde, 0x09, 0x21, 0x62, 0x65, 0x68,
+0x09, 0x01, 0x32, 0x05, 0x40, 0x64, 0x69, 0x66, 0x66, 0x2a,
+0x05, 0x12, 0x74, 0x6b, 0x03, 0x11, 0x60, 0x0c, 0x02, 0x70,
+0x73, 0x27, 0x00, 0x62, 0x69, 0x67, 0x67, 0xb8, 0x0a, 0x61,
+0x68, 0x61, 0x6e, 0x00, 0x39, 0x21, 0x12, 0x07, 0x14, 0x44,
+0x2b, 0x00, 0x34, 0x79, 0x00, 0x00, 0xbe, 0x01, 0x13, 0x73,
+0x9d, 0x03, 0x05, 0x1a, 0x00, 0x04, 0xae, 0x00, 0x50, 0x65,
+0x6e, 0x65, 0x72, 0x61, 0x25, 0x03, 0x02, 0x32, 0x09, 0x70,
+0x2e, 0x00, 0x41, 0x74, 0x00, 0x55, 0x6e, 0x30, 0x0a, 0x21,
+0x6f, 0x6e, 0x28, 0x01, 0x53, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+0xc7, 0x09, 0x72, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61,
+0x71, 0x02, 0x04, 0x36, 0x07, 0x82, 0x72, 0x65, 0x71, 0x75,
+0x69, 0x72, 0x65, 0x64, 0x2a, 0x09, 0x01, 0x0f, 0x01, 0x31,
+0x6f, 0x6c, 0x75, 0x48, 0x01, 0x21, 0x73, 0x68, 0xc8, 0x00,
+0x23, 0x73, 0x74, 0x2b, 0x00, 0x71, 0x75, 0x6e, 0x69, 0x71,
+0x75, 0x65, 0x2e, 0xbc, 0x06, 0x33, 0x72, 0x65, 0x6d, 0xf6,
+0x06, 0x01, 0x62, 0x00, 0x14, 0x73, 0x48, 0x00, 0x07, 0xfa,
+0x0a, 0x00, 0xdc, 0x08, 0x10, 0x6f, 0x65, 0x0b, 0x22, 0x78,
+0x00, 0x91, 0x00, 0x01, 0xaf, 0x0b, 0x00, 0x02, 0x02, 0x30,
+0x6f, 0x69, 0x64, 0x1a, 0x03, 0x03, 0x10, 0x00, 0x05, 0x97,
+0x00, 0x03, 0x85, 0x09, 0x14, 0x33, 0x11, 0x02, 0x00, 0x56,
+0x01, 0xb1, 0x20, 0x70, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
+0x6e, 0x63, 0x65, 0x17, 0x02, 0x20, 0x4f, 0x6e, 0x45, 0x09,
+0x63, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x73, 0xe9, 0x08, 0x62,
+0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x84, 0x01, 0x07, 0x2e,
+0x00, 0x12, 0x2c, 0x05, 0x02, 0x16, 0x50, 0x12, 0x00, 0x0d,
+0x21, 0x02, 0x33, 0x47, 0x61, 0x6d, 0x21, 0x02, 0x02, 0x0f,
+0x01, 0x32, 0x6c, 0x65, 0x74, 0x2b, 0x04, 0x73, 0x6f, 0x6e,
+0x66, 0x69, 0x67, 0x75, 0x72, 0x23, 0x06, 0x36, 0x74, 0x79,
+0x6c, 0x20, 0x02, 0x20, 0x61, 0x6d, 0x89, 0x01, 0x10, 0x73,
+0xca, 0x09, 0x05, 0x3c, 0x09, 0x02, 0x5e, 0x0a, 0x00, 0x3f,
+0x03, 0x02, 0x85, 0x0b, 0xf1, 0x01, 0x68, 0x72, 0x65, 0x65,
+0x2d, 0x64, 0x69, 0x6d, 0x65, 0x6e, 0x73, 0x69, 0x6f, 0x6e,
+0x61, 0x6c, 0x8e, 0x04, 0x50, 0x2c, 0x00, 0x73, 0x65, 0x6c,
+0x12, 0x03, 0x72, 0x6e, 0x67, 0x00, 0x60, 0x32, 0x44, 0x27,
+0x73, 0x00, 0x61, 0x73, 0x77, 0x69, 0x74, 0x63, 0x68, 0x17,
+0x01, 0x02, 0x11, 0x0a, 0x24, 0x65, 0x72, 0x5f, 0x00, 0x03,
+0x79, 0x00, 0x05, 0xc5, 0x04, 0x07, 0xdd, 0x0c, 0xa0, 0x73,
+0x68, 0x6f, 0x77, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x6a, 0xcf,
+0x0b, 0x42, 0x77, 0x72, 0x69, 0x74, 0x0b, 0x0d, 0x24, 0x65,
+0x69, 0x92, 0x0c, 0x07, 0xf4, 0x06, 0x50, 0x61, 0x72, 0x65,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3541;
-const unsigned short help_text_words = 674;
+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 dc1bd011fa..f3677352b5 100644
--- a/apps/plugins/puzzles/help/tracks.c
+++ b/apps/plugins/puzzles/help/tracks.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,147 +6,149 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 86, TEXT_CENTER | C_RED },
- { 207, TEXT_CENTER | C_RED },
- { 224, TEXT_UNDERLINE },
+ { 87, TEXT_CENTER | C_RED },
+ { 208, TEXT_CENTER | C_RED },
  { 225, TEXT_UNDERLINE },
- { 236, TEXT_UNDERLINE },
- { 268, TEXT_UNDERLINE },
+ { 226, TEXT_UNDERLINE },
+ { 237, TEXT_UNDERLINE },
+ { 269, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 1862 comp 1274 ratio 0.684211 level 10 saved 588 */
+/* orig 1881 comp 1282 ratio 0.681552 level 10 saved 599 */
 const char help_text[] = {
-0xf0, 0x2c, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x34, 0x30, 0x3a, 0x20, 0x54, 0x72, 0x61, 0x63, 0x6b, 0x73,
-0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72,
-0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
-0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d,
-0x65, 0x11, 0x00, 0x51, 0x77, 0x68, 0x69, 0x63, 0x68, 0x2b,
-0x00, 0xf1, 0x04, 0x66, 0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00,
-0x77, 0x69, 0x74, 0x68, 0x00, 0x74, 0x72, 0x61, 0x69, 0x6e,
-0x00, 0x74, 0x4f, 0x00, 0x11, 0x2e, 0x4d, 0x00, 0xf2, 0x05,
-0x6e, 0x65, 0x65, 0x64, 0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f,
-0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x00, 0x74, 0x68, 0x65,
-0x21, 0x00, 0x70, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x41,
-0x1d, 0x00, 0x91, 0x42, 0x00, 0x73, 0x6f, 0x00, 0x74, 0x68,
-0x61, 0x74, 0x1e, 0x00, 0xf1, 0x06, 0x72, 0x6f, 0x77, 0x73,
-0x00, 0x61, 0x6e, 0x64, 0x00, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-0x6e, 0x73, 0x00, 0x63, 0x6f, 0x6e, 0x74, 0x58, 0x00, 0xe0,
-0x68, 0x65, 0x00, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x6e, 0x75,
-0x6d, 0x62, 0x65, 0x72, 0x87, 0x00, 0x02, 0x4a, 0x00, 0xb1,
-0x73, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x00, 0x61,
-0x73, 0x93, 0x00, 0xa3, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61,
-0x74, 0x65, 0x64, 0x00, 0x36, 0x00, 0x50, 0x63, 0x6c, 0x75,
-0x65, 0x73, 0x6a, 0x00, 0x01, 0x7e, 0x00, 0x21, 0x6f, 0x70,
-0x5f, 0x00, 0x51, 0x72, 0x69, 0x67, 0x68, 0x74, 0x45, 0x00,
-0x21, 0x68, 0x65, 0xe9, 0x00, 0x91, 0x2e, 0x00, 0x00, 0x00,
-0x54, 0x68, 0x65, 0x72, 0x65, 0x45, 0x00, 0x60, 0x6f, 0x6e,
-0x6c, 0x79, 0x00, 0x73, 0xd2, 0x00, 0x00, 0x27, 0x00, 0x00,
-0x31, 0x00, 0xf1, 0x08, 0x39, 0x30, 0x00, 0x64, 0x65, 0x67,
-0x72, 0x65, 0x65, 0x00, 0x63, 0x75, 0x72, 0x76, 0x65, 0x64,
-0x00, 0x72, 0x61, 0x69, 0x6c, 0x73, 0x2c, 0x1c, 0x00, 0x06,
-0xd7, 0x00, 0xf1, 0x05, 0x6d, 0x61, 0x79, 0x00, 0x6e, 0x6f,
-0x74, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x00, 0x69, 0x74,
-0x73, 0x65, 0x6c, 0x66, 0x5a, 0x00, 0x01, 0x16, 0x01, 0x32,
-0x00, 0x77, 0x61, 0xd1, 0x00, 0x40, 0x72, 0x69, 0x62, 0x75,
-0xa2, 0x00, 0x01, 0x95, 0x00, 0x20, 0x69, 0x73, 0xed, 0x00,
-0xf0, 0x08, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00,
-0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48,
-0x61, 0x72, 0x76, 0x65, 0x79, 0x3d, 0x00, 0x44, 0x34, 0x30,
-0x2e, 0x31, 0xa7, 0x01, 0x01, 0x3e, 0x00, 0x21, 0x6f, 0x6c,
-0xb0, 0x01, 0xf4, 0x15, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63,
-0x6c, 0x69, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x00, 0x6f, 0x6e,
-0x00, 0x61, 0x6e, 0x00, 0x65, 0x64, 0x67, 0x65, 0x00, 0x62,
-0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x77, 0x6f,
-0xbd, 0x01, 0x7a, 0x00, 0x61, 0x64, 0x64, 0x73, 0x00, 0x61,
-0x34, 0x01, 0x06, 0x29, 0x00, 0x28, 0x68, 0x65, 0x2d, 0x00,
-0x30, 0x2e, 0x00, 0x52, 0xf8, 0x00, 0x0f, 0x5c, 0x00, 0x02,
-0x03, 0x48, 0x00, 0x02, 0xe1, 0x00, 0x12, 0x6f, 0x3b, 0x00,
-0x00, 0x19, 0x00, 0x14, 0x2c, 0x79, 0x01, 0x00, 0x30, 0x00,
-0x23, 0x6e, 0x6f, 0x69, 0x00, 0xa1, 0x69, 0x73, 0x00, 0x70,
-0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0xfd, 0x01, 0x3d, 0x72,
-0x65, 0x2e, 0xb8, 0x00, 0x10, 0x69, 0x6b, 0x02, 0x02, 0x79,
-0x00, 0x05, 0x5d, 0x00, 0x54, 0x6f, 0x6c, 0x6f, 0x75, 0x72,
-0x51, 0x00, 0x70, 0x6f, 0x72, 0x00, 0x73, 0x68, 0x6f, 0x77,
-0x2c, 0x00, 0x01, 0x27, 0x02, 0x82, 0x79, 0x6f, 0x75, 0x00,
-0x6b, 0x6e, 0x6f, 0x77, 0x13, 0x02, 0x02, 0x39, 0x00, 0x45,
-0x6d, 0x75, 0x73, 0x74, 0x2b, 0x02, 0x03, 0xe6, 0x00, 0x30,
-0x2c, 0x00, 0x65, 0xc8, 0x02, 0x21, 0x69, 0x66, 0x32, 0x00,
-0x52, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x38, 0x00, 0x02, 0xbf,
-0x02, 0x00, 0xb5, 0x00, 0x00, 0xa3, 0x01, 0x02, 0xcb, 0x00,
-0x6d, 0x65, 0x73, 0x00, 0x79, 0x65, 0x74, 0xf9, 0x00, 0x0e,
-0x9d, 0x00, 0x04, 0xdb, 0x01, 0x06, 0xed, 0x00, 0x15, 0x69,
-0x7a, 0x00, 0x16, 0x73, 0xf9, 0x00, 0x03, 0x62, 0x01, 0x05,
-0xef, 0x00, 0x32, 0x00, 0x6f, 0x72, 0x74, 0x02, 0x60, 0x2d,
-0x64, 0x72, 0x61, 0x67, 0x67, 0x38, 0x00, 0x04, 0x7d, 0x01,
-0x05, 0xa2, 0x01, 0x20, 0x6c, 0x6c, 0xfd, 0x02, 0x00, 0xad,
-0x00, 0x86, 0x74, 0x6f, 0x00, 0x6c, 0x61, 0x79, 0x00, 0x61,
-0x83, 0x02, 0x31, 0x6c, 0x69, 0x6e, 0x7b, 0x03, 0x32, 0x69,
-0x73, 0x2d, 0x61, 0x00, 0x20, 0x6f, 0x72, 0x0c, 0x00, 0x33,
-0x6e, 0x6f, 0x74, 0x10, 0x00, 0x05, 0x2d, 0x01, 0xd1, 0x73,
-0x2c, 0x00, 0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x00, 0x66,
-0x6f, 0x72, 0xa1, 0x03, 0x03, 0xc9, 0x00, 0x01, 0x5b, 0x03,
-0x25, 0x6f, 0x72, 0x5a, 0x03, 0x85, 0x74, 0x6f, 0x00, 0x6d,
-0x61, 0x74, 0x63, 0x68, 0x25, 0x03, 0x00, 0xad, 0x00, 0x41,
-0x28, 0x41, 0x6c, 0x6c, 0x11, 0x00, 0x11, 0x61, 0x8f, 0x02,
-0x92, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62,
-0x4f, 0x03, 0x13, 0x73, 0xa5, 0x02, 0x41, 0x32, 0x2e, 0x31,
-0x00, 0x13, 0x01, 0xf2, 0x00, 0x6c, 0x73, 0x6f, 0x00, 0x61,
-0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
-0xad, 0x02, 0x14, 0x32, 0xad, 0x02, 0xb2, 0x70, 0x61, 0x72,
-0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x5e, 0x03,
-0x36, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x42, 0x00, 0x04,
-0x3d, 0x00, 0x02, 0x12, 0x04, 0x00, 0x7a, 0x00, 0xe1, 0x60,
-0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
-0x00, 0x6f, 0x70, 0x70, 0x00, 0x03, 0x68, 0x02, 0xb0, 0x60,
-0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75,
-0xac, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00,
-0x48, 0x65, 0x22, 0x01, 0x68, 0x00, 0x00, 0x53, 0x69, 0x7a,
-0x65, 0xd3, 0x03, 0x00, 0x93, 0x02, 0x06, 0xd3, 0x02, 0xf3,
-0x01, 0x00, 0x00, 0x44, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
-0x6c, 0x74, 0x79, 0x00, 0x00, 0x00, 0x43, 0x49, 0x03, 0x01,
-0x2e, 0x00, 0x16, 0x64, 0x1a, 0x00, 0x04, 0x40, 0x00, 0x41,
-0x65, 0x6e, 0x65, 0x72, 0x46, 0x04, 0xf3, 0x0b, 0x70, 0x75,
-0x7a, 0x7a, 0x6c, 0x65, 0x3a, 0x00, 0x61, 0x74, 0x00, 0x54,
-0x72, 0x69, 0x63, 0x6b, 0x79, 0x00, 0x6c, 0x65, 0x76, 0x65,
-0x6c, 0x2c, 0x00, 0x79, 0x2f, 0x05, 0x82, 0x72, 0x65, 0x71,
-0x75, 0x69, 0x72, 0x65, 0x64, 0x51, 0x01, 0xc3, 0x6b, 0x65,
-0x00, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x64, 0x65, 0x64, 0x75,
-0x43, 0x01, 0x60, 0x72, 0x65, 0x67, 0x61, 0x72, 0x64, 0x86,
-0x01, 0x36, 0x64, 0x69, 0x73, 0x0d, 0x00, 0x52, 0x6d, 0x6f,
-0x76, 0x65, 0x73, 0xd3, 0x02, 0x91, 0x77, 0x6f, 0x75, 0x6c,
-0x64, 0x00, 0x6c, 0x65, 0x61, 0x45, 0x00, 0x25, 0x69, 0x6d,
-0x34, 0x03, 0x01, 0x6d, 0x02, 0xa2, 0x69, 0x6e, 0x67, 0x73,
-0x00, 0x6c, 0x61, 0x74, 0x65, 0x72, 0xc6, 0x00, 0x11, 0x73,
-0x2a, 0x02, 0x00, 0x0b, 0x04, 0xb2, 0x73, 0x65, 0x63, 0x75,
-0x74, 0x69, 0x76, 0x65, 0x20, 0x31, 0x20, 0xe6, 0x04, 0x07,
-0xd8, 0x00, 0x30, 0x77, 0x68, 0x65, 0x72, 0x03, 0x01, 0xce,
-0x00, 0x03, 0x7f, 0x04, 0x35, 0x67, 0x61, 0x6d, 0xda, 0x00,
-0x00, 0x57, 0x01, 0x71, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x74,
-0x73, 0xfb, 0x03, 0x50, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x14,
-0x04, 0x0f, 0x27, 0x02, 0x00, 0x81, 0x68, 0x61, 0x76, 0x65,
-0x00, 0x61, 0x00, 0x31, 0x26, 0x02, 0x10, 0x2c, 0x1d, 0x00,
-0x05, 0x3a, 0x00, 0x02, 0xb3, 0x05, 0x06, 0x30, 0x00, 0x04,
-0x40, 0x01, 0x01, 0x95, 0x02, 0xbd, 0x27, 0x73, 0x00, 0x65,
-0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x00, 0xc2,
-0x2e, 0x00, 0x42, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61, 0x75,
-0x6c, 0x74, 0x05, 0x05, 0x21, 0x69, 0x73, 0x3b, 0x05, 0x02,
-0x5b, 0x00, 0x60, 0x74, 0x65, 0x64, 0x2c, 0x00, 0x74, 0x5d,
-0x02, 0x86, 0x6f, 0x69, 0x64, 0x00, 0x6c, 0x6f, 0x6e, 0x67,
-0x0c, 0x03, 0x30, 0x62, 0x6f, 0x72, 0x40, 0x01, 0x05, 0xf9,
-0x05, 0x05, 0x0b, 0x06, 0x00, 0x8c, 0x05, 0x01, 0x82, 0x01,
-0x01, 0xc2, 0x01, 0x01, 0x46, 0x05, 0x01, 0x8c, 0x01, 0x71,
-0x74, 0x77, 0x69, 0x64, 0x64, 0x6c, 0x79, 0x20, 0x00, 0x70,
-0x69, 0x6e, 0x74, 0x65, 0x72, 0x65, 0x73, 0xba, 0x03, 0x32,
-0x2e, 0x00, 0x49, 0x1c, 0x04, 0x22, 0x77, 0x61, 0xa1, 0x00,
-0x00, 0x18, 0x00, 0x22, 0x6f, 0x72, 0x3f, 0x00, 0x02, 0x83,
-0x01, 0xb2, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2c, 0x00, 0x74,
-0x75, 0x72, 0x6e, 0xa5, 0x00, 0x03, 0x91, 0x02, 0x50, 0x6f,
-0x66, 0x66, 0x2e, 0x00,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x19, 0x00, 0x00, 0x00,
+0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69,
+0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
+0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x11, 0x00, 0x51,
+0x77, 0x68, 0x69, 0x63, 0x68, 0x2b, 0x00, 0xf1, 0x04, 0x66,
+0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74, 0x68,
+0x00, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x00, 0x74, 0x62, 0x00,
+0x11, 0x2e, 0x4d, 0x00, 0xf2, 0x05, 0x6e, 0x65, 0x65, 0x64,
+0x00, 0x74, 0x6f, 0x00, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+0x74, 0x65, 0x00, 0x74, 0x68, 0x65, 0x21, 0x00, 0x70, 0x00,
+0x66, 0x72, 0x6f, 0x6d, 0x00, 0x41, 0x1d, 0x00, 0x91, 0x42,
+0x00, 0x73, 0x6f, 0x00, 0x74, 0x68, 0x61, 0x74, 0x1e, 0x00,
+0xf1, 0x06, 0x72, 0x6f, 0x77, 0x73, 0x00, 0x61, 0x6e, 0x64,
+0x00, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x00, 0x63,
+0x6f, 0x6e, 0x74, 0x58, 0x00, 0xe0, 0x68, 0x65, 0x00, 0x73,
+0x61, 0x6d, 0x65, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+0x87, 0x00, 0x02, 0x4a, 0x00, 0xb1, 0x73, 0x65, 0x67, 0x6d,
+0x65, 0x6e, 0x74, 0x73, 0x00, 0x61, 0x73, 0x93, 0x00, 0xa3,
+0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x00,
+0x36, 0x00, 0x50, 0x63, 0x6c, 0x75, 0x65, 0x73, 0x6a, 0x00,
+0x01, 0x7e, 0x00, 0x21, 0x6f, 0x70, 0x5f, 0x00, 0x51, 0x72,
+0x69, 0x67, 0x68, 0x74, 0x45, 0x00, 0x21, 0x68, 0x65, 0xe9,
+0x00, 0x91, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x68, 0x65, 0x72,
+0x65, 0x45, 0x00, 0x60, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x73,
+0xd2, 0x00, 0x00, 0x27, 0x00, 0x00, 0x31, 0x00, 0xf1, 0x08,
+0x39, 0x30, 0x00, 0x64, 0x65, 0x67, 0x72, 0x65, 0x65, 0x00,
+0x63, 0x75, 0x72, 0x76, 0x65, 0x64, 0x00, 0x72, 0x61, 0x69,
+0x6c, 0x73, 0x2c, 0x1c, 0x00, 0x06, 0xd7, 0x00, 0xf1, 0x05,
+0x6d, 0x61, 0x79, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x63, 0x72,
+0x6f, 0x73, 0x73, 0x00, 0x69, 0x74, 0x73, 0x65, 0x6c, 0x66,
+0x5a, 0x00, 0x01, 0x16, 0x01, 0x32, 0x00, 0x77, 0x61, 0xd1,
+0x00, 0x40, 0x72, 0x69, 0x62, 0x75, 0xa2, 0x00, 0x01, 0x95,
+0x00, 0x20, 0x69, 0x73, 0xed, 0x00, 0xf0, 0x08, 0x6c, 0x65,
+0x63, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a,
+0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72, 0x76, 0x65,
+0x79, 0x3d, 0x00, 0x44, 0x34, 0x30, 0x2e, 0x31, 0xba, 0x01,
+0x01, 0x3e, 0x00, 0xf4, 0x1c, 0x6f, 0x6c, 0x73, 0x20, 0x00,
+0x00, 0x00, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x63, 0x6c, 0x69,
+0x63, 0x6b, 0x69, 0x6e, 0x67, 0x00, 0x6f, 0x6e, 0x00, 0x61,
+0x6e, 0x00, 0x65, 0x64, 0x67, 0x65, 0x00, 0x62, 0x65, 0x74,
+0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x77, 0x6f, 0xbd, 0x01,
+0x7a, 0x00, 0x61, 0x64, 0x64, 0x73, 0x00, 0x61, 0x34, 0x01,
+0x06, 0x29, 0x00, 0x28, 0x68, 0x65, 0x2d, 0x00, 0x30, 0x2e,
+0x00, 0x52, 0xf8, 0x00, 0x0f, 0x5c, 0x00, 0x02, 0x03, 0x48,
+0x00, 0x02, 0xe1, 0x00, 0x12, 0x6f, 0x3b, 0x00, 0x00, 0x19,
+0x00, 0x14, 0x2c, 0x79, 0x01, 0x00, 0x30, 0x00, 0x23, 0x6e,
+0x6f, 0x69, 0x00, 0xa1, 0x69, 0x73, 0x00, 0x70, 0x6f, 0x73,
+0x73, 0x69, 0x62, 0x6c, 0xfd, 0x01, 0x3d, 0x72, 0x65, 0x2e,
+0xb8, 0x00, 0x10, 0x69, 0x6b, 0x02, 0x02, 0x79, 0x00, 0x05,
+0x5d, 0x00, 0x54, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x51, 0x00,
+0x70, 0x6f, 0x72, 0x00, 0x73, 0x68, 0x6f, 0x77, 0x2c, 0x00,
+0x01, 0x27, 0x02, 0x82, 0x79, 0x6f, 0x75, 0x00, 0x6b, 0x6e,
+0x6f, 0x77, 0x13, 0x02, 0x02, 0x39, 0x00, 0x45, 0x6d, 0x75,
+0x73, 0x74, 0x2b, 0x02, 0x03, 0xe6, 0x00, 0x30, 0x2c, 0x00,
+0x65, 0xc8, 0x02, 0x21, 0x69, 0x66, 0x32, 0x00, 0x52, 0x64,
+0x6f, 0x6e, 0x27, 0x74, 0x38, 0x00, 0x02, 0xbf, 0x02, 0x00,
+0xb5, 0x00, 0x00, 0xa3, 0x01, 0x02, 0xcb, 0x00, 0x6d, 0x65,
+0x73, 0x00, 0x79, 0x65, 0x74, 0xf9, 0x00, 0x0e, 0x9d, 0x00,
+0x04, 0xdb, 0x01, 0x06, 0xed, 0x00, 0x15, 0x69, 0x7a, 0x00,
+0x16, 0x73, 0xf9, 0x00, 0x03, 0x62, 0x01, 0x05, 0xef, 0x00,
+0x32, 0x00, 0x6f, 0x72, 0x74, 0x02, 0x60, 0x2d, 0x64, 0x72,
+0x61, 0x67, 0x67, 0x38, 0x00, 0x04, 0x7d, 0x01, 0x05, 0xa2,
+0x01, 0x20, 0x6c, 0x6c, 0xfd, 0x02, 0x00, 0xad, 0x00, 0x86,
+0x74, 0x6f, 0x00, 0x6c, 0x61, 0x79, 0x00, 0x61, 0x83, 0x02,
+0x31, 0x6c, 0x69, 0x6e, 0x7b, 0x03, 0x32, 0x69, 0x73, 0x2d,
+0x61, 0x00, 0x20, 0x6f, 0x72, 0x0c, 0x00, 0x33, 0x6e, 0x6f,
+0x74, 0x10, 0x00, 0x05, 0x2d, 0x01, 0xd1, 0x73, 0x2c, 0x00,
+0x75, 0x73, 0x65, 0x66, 0x75, 0x6c, 0x00, 0x66, 0x6f, 0x72,
+0xa1, 0x03, 0x03, 0xc9, 0x00, 0x01, 0x5b, 0x03, 0x25, 0x6f,
+0x72, 0x5a, 0x03, 0x85, 0x74, 0x6f, 0x00, 0x6d, 0x61, 0x74,
+0x63, 0x68, 0x25, 0x03, 0x00, 0xad, 0x00, 0x41, 0x28, 0x41,
+0x6c, 0x6c, 0x11, 0x00, 0x11, 0x61, 0x8f, 0x02, 0x92, 0x73,
+0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x4f, 0x03,
+0x13, 0x73, 0xa5, 0x02, 0x41, 0x32, 0x2e, 0x31, 0x00, 0x13,
+0x01, 0xf2, 0x00, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61,
+0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0xad, 0x02,
+0x14, 0x32, 0xad, 0x02, 0xb2, 0x70, 0x61, 0x72, 0x61, 0x6d,
+0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x5e, 0x03, 0x36, 0x73,
+0x65, 0x00, 0x14, 0x00, 0x02, 0x42, 0x00, 0x04, 0x3d, 0x00,
+0x02, 0x12, 0x04, 0x00, 0x7a, 0x00, 0xe1, 0x60, 0x43, 0x75,
+0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f,
+0x70, 0x70, 0x00, 0x03, 0x68, 0x02, 0xb0, 0x60, 0x54, 0x79,
+0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xac, 0x00,
+0x91, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48, 0x65,
+0x22, 0x01, 0x68, 0x00, 0x00, 0x53, 0x69, 0x7a, 0x65, 0xd3,
+0x03, 0x00, 0x93, 0x02, 0x06, 0xd3, 0x02, 0xf3, 0x01, 0x00,
+0x00, 0x44, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
+0x79, 0x00, 0x00, 0x00, 0x43, 0x49, 0x03, 0x01, 0x2e, 0x00,
+0x16, 0x64, 0x1a, 0x00, 0x04, 0x40, 0x00, 0x41, 0x65, 0x6e,
+0x65, 0x72, 0x46, 0x04, 0xf3, 0x0b, 0x70, 0x75, 0x7a, 0x7a,
+0x6c, 0x65, 0x3a, 0x00, 0x61, 0x74, 0x00, 0x54, 0x72, 0x69,
+0x63, 0x6b, 0x79, 0x00, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x2c,
+0x00, 0x79, 0x2f, 0x05, 0x82, 0x72, 0x65, 0x71, 0x75, 0x69,
+0x72, 0x65, 0x64, 0x51, 0x01, 0xc3, 0x6b, 0x65, 0x00, 0x6d,
+0x6f, 0x72, 0x65, 0x00, 0x64, 0x65, 0x64, 0x75, 0x43, 0x01,
+0x60, 0x72, 0x65, 0x67, 0x61, 0x72, 0x64, 0x86, 0x01, 0x36,
+0x64, 0x69, 0x73, 0x0d, 0x00, 0x52, 0x6d, 0x6f, 0x76, 0x65,
+0x73, 0xd3, 0x02, 0x91, 0x77, 0x6f, 0x75, 0x6c, 0x64, 0x00,
+0x6c, 0x65, 0x61, 0x45, 0x00, 0x25, 0x69, 0x6d, 0x34, 0x03,
+0x01, 0x6d, 0x02, 0xa2, 0x69, 0x6e, 0x67, 0x73, 0x00, 0x6c,
+0x61, 0x74, 0x65, 0x72, 0xc6, 0x00, 0x11, 0x73, 0x2a, 0x02,
+0x00, 0x0b, 0x04, 0xb2, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69,
+0x76, 0x65, 0x20, 0x31, 0x20, 0xe6, 0x04, 0x07, 0xd8, 0x00,
+0x30, 0x77, 0x68, 0x65, 0x72, 0x03, 0x01, 0xce, 0x00, 0x03,
+0x7f, 0x04, 0x35, 0x67, 0x61, 0x6d, 0xda, 0x00, 0x00, 0x57,
+0x01, 0x71, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x73, 0xfb,
+0x03, 0x50, 0x61, 0x64, 0x6a, 0x61, 0x63, 0x14, 0x04, 0x0f,
+0x27, 0x02, 0x00, 0x81, 0x68, 0x61, 0x76, 0x65, 0x00, 0x61,
+0x00, 0x31, 0x26, 0x02, 0x10, 0x2c, 0x1d, 0x00, 0x05, 0x3a,
+0x00, 0x02, 0xb3, 0x05, 0x06, 0x30, 0x00, 0x04, 0x40, 0x01,
+0x01, 0x95, 0x02, 0xbd, 0x27, 0x73, 0x00, 0x65, 0x6e, 0x64,
+0x70, 0x6f, 0x69, 0x6e, 0x74, 0x47, 0x00, 0xc2, 0x2e, 0x00,
+0x42, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
+0x05, 0x05, 0x21, 0x69, 0x73, 0x3b, 0x05, 0x02, 0x5b, 0x00,
+0x60, 0x74, 0x65, 0x64, 0x2c, 0x00, 0x74, 0x5d, 0x02, 0x86,
+0x6f, 0x69, 0x64, 0x00, 0x6c, 0x6f, 0x6e, 0x67, 0x0c, 0x03,
+0x30, 0x62, 0x6f, 0x72, 0x40, 0x01, 0x05, 0xf9, 0x05, 0x05,
+0x0b, 0x06, 0x00, 0x8c, 0x05, 0x01, 0x82, 0x01, 0x01, 0xc2,
+0x01, 0x01, 0x46, 0x05, 0x01, 0x8c, 0x01, 0x71, 0x74, 0x77,
+0x69, 0x64, 0x64, 0x6c, 0x79, 0x20, 0x00, 0x70, 0x69, 0x6e,
+0x74, 0x65, 0x72, 0x65, 0x73, 0xba, 0x03, 0x32, 0x2e, 0x00,
+0x49, 0x1c, 0x04, 0x22, 0x77, 0x61, 0xa1, 0x00, 0x00, 0x18,
+0x00, 0x22, 0x6f, 0x72, 0x3f, 0x00, 0x02, 0x83, 0x01, 0xb2,
+0x69, 0x6c, 0x69, 0x74, 0x79, 0x2c, 0x00, 0x74, 0x75, 0x72,
+0x6e, 0xa5, 0x00, 0x03, 0x91, 0x02, 0x50, 0x6f, 0x66, 0x66,
+0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 1862;
-const unsigned short help_text_words = 336;
+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 48efbc10ad..a07ba931d4 100644
--- a/apps/plugins/puzzles/help/twiddle.c
+++ b/apps/plugins/puzzles/help/twiddle.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,202 +6,204 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 137, TEXT_CENTER | C_RED },
- { 297, TEXT_CENTER | C_RED },
+ { 138, TEXT_CENTER | C_RED },
+ { 298, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 2926 comp 1866 ratio 0.637731 level 10 saved 1060 */
+/* orig 2945 comp 1873 ratio 0.635993 level 10 saved 1072 */
 const char help_text[] = {
-0xf3, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x37, 0x3a, 0x20, 0x54, 0x77, 0x69, 0x64, 0x64, 0x6c, 0x65,
-0x20, 0x00, 0x00, 0x00, 0x0b, 0x00, 0xf2, 0x34, 0x00, 0x69,
-0x73, 0x00, 0x61, 0x00, 0x74, 0x69, 0x6c, 0x65, 0x2d, 0x72,
-0x65, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x6d, 0x65,
-0x6e, 0x74, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c,
-0x00, 0x76, 0x69, 0x73, 0x75, 0x61, 0x6c, 0x6c, 0x79, 0x00,
-0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x00, 0x74, 0x6f,
-0x00, 0x53, 0x69, 0x78, 0x74, 0x65, 0x65, 0x6e, 0x00, 0x28,
-0x73, 0x65, 0x65, 0x00, 0x63, 0x5f, 0x00, 0xf0, 0x11, 0x00,
-0x36, 0x29, 0x3a, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x61, 0x72,
-0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
-0x75, 0x17, 0x00, 0x00, 0x67, 0x00, 0xf0, 0x11, 0x73, 0x2c,
-0x00, 0x65, 0x61, 0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e, 0x74,
-0x61, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x00, 0x6e,
-0x75, 0x6d, 0x62, 0x65, 0x72, 0x2c, 0x00, 0x61, 0x6e, 0x64,
-0x44, 0x00, 0x50, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x9a, 0x00,
-0x33, 0x74, 0x6f, 0x00, 0x94, 0x00, 0x43, 0x00, 0x74, 0x68,
-0x65, 0x27, 0x00, 0x40, 0x73, 0x00, 0x69, 0x6e, 0x19, 0x00,
-0x50, 0x73, 0x63, 0x65, 0x6e, 0x64, 0x40, 0x00, 0xf4, 0x02,
-0x6f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x00, 0x00, 0x00, 0x49,
-0x6e, 0x00, 0x62, 0x61, 0x73, 0x69, 0x63, 0xdd, 0x00, 0x12,
-0x2c, 0x4d, 0x00, 0x43, 0x6d, 0x6f, 0x76, 0x65, 0x4e, 0x00,
-0x84, 0x72, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x00, 0x61, 0x92,
-0x00, 0x50, 0x67, 0x72, 0x6f, 0x75, 0x70, 0xa2, 0x00, 0x10,
-0x66, 0x29, 0x00, 0x01, 0xa0, 0x00, 0x60, 0x00, 0x61, 0x62,
-0x6f, 0x75, 0x74, 0x70, 0x00, 0xf0, 0x0f, 0x69, 0x72, 0x00,
-0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x00, 0x63, 0x65, 0x6e,
-0x74, 0x72, 0x65, 0x2e, 0x00, 0x28, 0x4f, 0x72, 0x69, 0x65,
-0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x00, 0xf1,
-0x03, 0x6e, 0x6f, 0x74, 0x00, 0x73, 0x69, 0x67, 0x6e, 0x69,
-0x66, 0x69, 0x63, 0x61, 0x6e, 0x74, 0x00, 0x69, 0x6e, 0xa8,
-0x00, 0x02, 0x85, 0x00, 0x04, 0x42, 0x01, 0x81, 0x61, 0x6c,
-0x74, 0x68, 0x6f, 0x75, 0x67, 0x68, 0x1e, 0x01, 0xf5, 0x1b,
-0x63, 0x61, 0x6e, 0x00, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74,
-0x00, 0x69, 0x74, 0x2e, 0x29, 0x00, 0x4f, 0x6e, 0x00, 0x6d,
-0x6f, 0x72, 0x65, 0x00, 0x61, 0x64, 0x76, 0x61, 0x6e, 0x63,
-0x65, 0x64, 0x00, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67,
-0x73, 0x2c, 0x2f, 0x00, 0x05, 0xb4, 0x00, 0x6d, 0x6c, 0x61,
-0x72, 0x67, 0x65, 0x72, 0xbb, 0x00, 0x01, 0xb6, 0x00, 0x01,
-0xff, 0x00, 0xd0, 0x00, 0x66, 0x69, 0x72, 0x73, 0x74, 0x00,
-0x73, 0x61, 0x77, 0x00, 0x74, 0x68, 0xf1, 0x00, 0x30, 0x79,
-0x70, 0x65, 0x22, 0x00, 0x02, 0x8a, 0x00, 0x04, 0x9e, 0x00,
-0xf2, 0x13, 0x47, 0x61, 0x6d, 0x65, 0x43, 0x75, 0x62, 0x65,
-0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x60, 0x4d, 0x65, 0x74,
-0x72, 0x6f, 0x69, 0x64, 0x00, 0x50, 0x72, 0x69, 0x6d, 0x65,
-0x00, 0x32, 0x27, 0x2e, 0x00, 0x49, 0x28, 0x00, 0xd0, 0x4d,
-0x61, 0x69, 0x6e, 0x00, 0x47, 0x79, 0x72, 0x6f, 0x00, 0x43,
-0x68, 0x61, 0x79, 0x01, 0x02, 0x41, 0x00, 0x21, 0x61, 0x74,
-0x39, 0x00, 0x10, 0x2c, 0x24, 0x00, 0x13, 0x72, 0x40, 0x02,
-0x03, 0x61, 0x00, 0x00, 0xb2, 0x00, 0x50, 0x73, 0x6f, 0x6c,
-0x76, 0x65, 0x6b, 0x01, 0xf2, 0x05, 0x75, 0x6e, 0x6c, 0x6f,
-0x63, 0x6b, 0x00, 0x61, 0x00, 0x64, 0x6f, 0x6f, 0x72, 0x2c,
-0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x2e, 0x00, 0xb1, 0x73,
-0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x00, 0x63, 0x61, 0x73,
-0x9f, 0x00, 0x03, 0xae, 0x01, 0xd2, 0x2e, 0x00, 0x49, 0x00,
-0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x64, 0xc1,
-0x00, 0x01, 0xa2, 0x00, 0x20, 0x61, 0x73, 0x4a, 0x02, 0x82,
-0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x69, 0x73, 0x7c, 0x01,
-0x22, 0x6f, 0x66, 0x8a, 0x00, 0x02, 0x79, 0x00, 0x00, 0xfd,
-0x00, 0x35, 0x37, 0x2e, 0x31, 0xdf, 0x02, 0x00, 0x5c, 0x02,
-0x41, 0x72, 0x6f, 0x6c, 0x73, 0xe8, 0x02, 0x66, 0x6f, 0x00,
-0x70, 0x6c, 0x61, 0x79, 0x13, 0x02, 0x51, 0x63, 0x6c, 0x69,
-0x63, 0x6b, 0xe1, 0x00, 0x45, 0x6d, 0x6f, 0x75, 0x73, 0x16,
-0x01, 0x02, 0xe3, 0x01, 0x02, 0x59, 0x00, 0x1a, 0x65, 0x64,
-0x01, 0x00, 0xd7, 0x00, 0x46, 0x77, 0x69, 0x73, 0x68, 0x41,
-0x02, 0x05, 0x24, 0x01, 0x02, 0xea, 0x01, 0x32, 0x6d, 0x6f,
-0x64, 0x6c, 0x02, 0x06, 0xac, 0x01, 0x33, 0x32, 0x78, 0x32,
-0x45, 0x00, 0x04, 0xfb, 0x00, 0x51, 0x6d, 0x65, 0x61, 0x6e,
-0x73, 0x25, 0x00, 0x22, 0x68, 0x61, 0x22, 0x01, 0x02, 0x8a,
-0x00, 0xf1, 0x04, 0x61, 0x74, 0x00, 0x61, 0x00, 0x63, 0x6f,
-0x72, 0x6e, 0x65, 0x72, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74,
-0x00, 0x77, 0x59, 0x01, 0x07, 0x92, 0x02, 0x43, 0x6d, 0x65,
-0x65, 0x74, 0xe0, 0x02, 0x0a, 0x2d, 0x02, 0x00, 0x79, 0x00,
-0x02, 0x54, 0x00, 0x82, 0x6d, 0x69, 0x67, 0x68, 0x74, 0x00,
-0x62, 0x65, 0x82, 0x00, 0x00, 0x16, 0x03, 0xa4, 0x33, 0x78,
-0x33, 0x00, 0x6f, 0x72, 0x00, 0x65, 0x76, 0x65, 0x36, 0x00,
-0x11, 0x74, 0xea, 0x03, 0x53, 0x6d, 0x65, 0x3b, 0x00, 0x69,
-0xe6, 0x00, 0x2c, 0x69, 0x7a, 0xf2, 0x00, 0x60, 0x69, 0x73,
-0x00, 0x6f, 0x64, 0x64, 0x12, 0x00, 0x12, 0x6e, 0xcf, 0x01,
-0x53, 0x69, 0x6d, 0x70, 0x6c, 0x79, 0xab, 0x00, 0x0a, 0x2b,
-0x01, 0x00, 0x9c, 0x00, 0x0b, 0x3e, 0x00, 0x01, 0x2a, 0x01,
-0x00, 0x09, 0x03, 0x07, 0x2a, 0x01, 0x30, 0x00, 0x00, 0x43,
-0x3d, 0x00, 0x00, 0x93, 0x00, 0x41, 0x77, 0x69, 0x74, 0x68,
-0x2f, 0x00, 0x43, 0x6c, 0x65, 0x66, 0x74, 0x7f, 0x01, 0x54,
-0x62, 0x75, 0x74, 0x74, 0x6f, 0xe5, 0x02, 0x11, 0x73, 0x1e,
-0x00, 0x02, 0x76, 0x01, 0x50, 0x61, 0x6e, 0x74, 0x69, 0x63,
-0x43, 0x02, 0x5f, 0x77, 0x69, 0x73, 0x65, 0x2e, 0x45, 0x00,
-0x00, 0x12, 0x72, 0xf3, 0x00, 0x0a, 0x40, 0x00, 0x37, 0x69,
-0x74, 0x00, 0x35, 0x00, 0x33, 0x00, 0x00, 0x59, 0x45, 0x03,
-0x42, 0x61, 0x6c, 0x73, 0x6f, 0x09, 0x04, 0x95, 0x61, 0x6e,
-0x00, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0xb6, 0x00, 0x51,
-0x61, 0x72, 0x6f, 0x75, 0x6e, 0xf4, 0x00, 0x02, 0xb1, 0x04,
-0x05, 0x62, 0x00, 0xcb, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72,
-0x00, 0x6b, 0x65, 0x79, 0x73, 0x3b, 0x25, 0x01, 0x05, 0x3f,
-0x01, 0x20, 0x61, 0x62, 0x55, 0x00, 0x10, 0x28, 0xf0, 0x01,
-0xb0, 0x62, 0x79, 0x00, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
-0x74, 0x2c, 0x7a, 0x01, 0x02, 0xaf, 0x03, 0x80, 0x29, 0x2e,
-0x00, 0x50, 0x72, 0x65, 0x73, 0x73, 0xbb, 0x00, 0x01, 0xb6,
-0x00, 0x50, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x54, 0x00, 0x00,
-0x24, 0x00, 0x40, 0x73, 0x70, 0x61, 0x63, 0x46, 0x02, 0x64,
-0x72, 0x00, 0x77, 0x69, 0x6c, 0x6c, 0x3f, 0x02, 0x03, 0x7c,
-0x00, 0x10, 0x72, 0x88, 0x05, 0x04, 0xa4, 0x00, 0x08, 0x0e,
-0x01, 0x00, 0x3a, 0x00, 0x06, 0x0d, 0x00, 0x20, 0x72, 0x65,
-0x51, 0x03, 0x60, 0x74, 0x69, 0x76, 0x65, 0x6c, 0x79, 0xf3,
-0x00, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x43, 0x00, 0x20, 0x61,
-0x63, 0x2c, 0x03, 0xd0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63,
-0x72, 0x69, 0x62, 0x65, 0x64, 0x00, 0x69, 0x7d, 0x04, 0x11,
-0x63, 0x42, 0x03, 0x31, 0x32, 0x2e, 0x31, 0xab, 0x05, 0x01,
-0x19, 0x01, 0xb1, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62,
-0x6c, 0x65, 0x2e, 0x29, 0x4b, 0x03, 0x15, 0x32, 0x4b, 0x03,
-0xa8, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
-0x73, 0x35, 0x06, 0x50, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x7b,
-0x02, 0x30, 0x73, 0x65, 0x76, 0x97, 0x03, 0x00, 0xce, 0x05,
-0x53, 0x66, 0x69, 0x67, 0x75, 0x72, 0x9e, 0x03, 0x12, 0x70,
-0x79, 0x00, 0x31, 0x76, 0x69, 0x61, 0x89, 0x00, 0x83, 0x60,
-0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x27, 0x19, 0x00, 0x32,
-0x00, 0x6f, 0x6e, 0x17, 0x00, 0xf5, 0x00, 0x54, 0x79, 0x70,
-0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x3a, 0x00, 0x00,
-0x00, 0x2d, 0xad, 0x01, 0x04, 0x4e, 0x00, 0x02, 0x0a, 0x01,
-0x51, 0x77, 0x69, 0x64, 0x74, 0x68, 0x1b, 0x06, 0x21, 0x68,
-0x65, 0xf3, 0x01, 0x03, 0x74, 0x02, 0x03, 0x75, 0x04, 0x00,
-0xb3, 0x01, 0x1f, 0x2e, 0x3f, 0x00, 0x08, 0x04, 0xe5, 0x02,
-0x03, 0x49, 0x01, 0x11, 0x62, 0x96, 0x04, 0x01, 0x3d, 0x04,
-0x04, 0x34, 0x02, 0x05, 0x19, 0x03, 0x0a, 0x47, 0x00, 0x52,
-0x61, 0x73, 0x6b, 0x00, 0x66, 0x42, 0x03, 0x25, 0x72, 0x79,
-0xfb, 0x01, 0x16, 0x6e, 0x28, 0x02, 0x20, 0x74, 0x6f, 0x71,
-0x03, 0x30, 0x64, 0x69, 0x73, 0x70, 0x03, 0x40, 0x75, 0x69,
-0x73, 0x68, 0x42, 0x01, 0x20, 0x00, 0x28, 0x20, 0x00, 0x03,
-0x08, 0x02, 0x11, 0x29, 0x09, 0x02, 0x1b, 0x79, 0x51, 0x00,
-0x12, 0x61, 0x56, 0x03, 0x57, 0x69, 0x66, 0x69, 0x65, 0x64,
-0x9c, 0x05, 0x02, 0x27, 0x04, 0x02, 0x56, 0x05, 0x05, 0x7d,
-0x04, 0x10, 0x73, 0xbb, 0x00, 0x30, 0x69, 0x64, 0x65, 0xff,
-0x01, 0x24, 0x61, 0x6c, 0x02, 0x07, 0x05, 0x80, 0x04, 0x0e,
-0x49, 0x00, 0x08, 0x3f, 0x07, 0x48, 0x6a, 0x75, 0x73, 0x74,
-0x44, 0x07, 0x13, 0x61, 0x19, 0x02, 0x13, 0x31, 0x43, 0x07,
-0x00, 0x0c, 0x00, 0x02, 0x33, 0x06, 0x45, 0x72, 0x6f, 0x77,
-0x2c, 0x1f, 0x00, 0x17, 0x32, 0x1f, 0x00, 0x63, 0x73, 0x65,
-0x63, 0x6f, 0x6e, 0x64, 0x20, 0x00, 0x8f, 0x6e, 0x64, 0x00,
-0x73, 0x6f, 0x00, 0x6f, 0x6e, 0x6f, 0x01, 0x05, 0x30, 0x77,
-0x68, 0x65, 0xbf, 0x00, 0x01, 0x39, 0x00, 0x17, 0x6f, 0x2a,
-0x07, 0x24, 0x6f, 0x66, 0xc9, 0x04, 0x32, 0x61, 0x74, 0x74,
-0xbf, 0x00, 0x12, 0x66, 0x2c, 0x08, 0x04, 0x12, 0x01, 0x14,
-0x6e, 0x30, 0x00, 0x24, 0x62, 0x6c, 0xd9, 0x01, 0x03, 0x28,
-0x08, 0x01, 0x66, 0x04, 0x01, 0x1d, 0x03, 0x01, 0x37, 0x05,
-0xf0, 0x01, 0x61, 0x00, 0x74, 0x72, 0x69, 0x61, 0x6e, 0x67,
-0x6c, 0x65, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e, 0x39, 0x01,
-0x44, 0x69, 0x74, 0x2e, 0x00, 0xf4, 0x02, 0x04, 0x1e, 0x00,
-0x51, 0x73, 0x00, 0x6d, 0x75, 0x73, 0x11, 0x05, 0x01, 0x54,
-0x05, 0x00, 0x7e, 0x03, 0x71, 0x75, 0x70, 0x77, 0x61, 0x72,
-0x64, 0x73, 0x7a, 0x05, 0x77, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-0x74, 0x65, 0x48, 0x02, 0x0e, 0xfc, 0x01, 0x02, 0xab, 0x01,
-0x50, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x98, 0x07, 0x51, 0x68,
-0x75, 0x66, 0x66, 0x6c, 0x6f, 0x08, 0x23, 0x70, 0x65, 0xe8,
-0x02, 0x02, 0x01, 0x02, 0x94, 0x70, 0x65, 0x72, 0x66, 0x6f,
-0x72, 0x6d, 0x65, 0x64, 0xd8, 0x02, 0x02, 0x92, 0x02, 0x17,
-0x42, 0x0e, 0x04, 0x04, 0x38, 0x03, 0x01, 0xc8, 0x00, 0x02,
-0x4a, 0x00, 0x16, 0x65, 0x48, 0x02, 0x00, 0x9a, 0x04, 0x11,
-0x75, 0xfb, 0x01, 0x00, 0x8a, 0x02, 0x38, 0x6e, 0x79, 0x00,
-0x88, 0x09, 0x14, 0x69, 0x91, 0x08, 0x20, 0x61, 0x73, 0x77,
-0x03, 0x11, 0x62, 0x22, 0x01, 0x21, 0x61, 0x73, 0x28, 0x00,
-0x10, 0x6f, 0x6e, 0x01, 0x15, 0x2e, 0xb5, 0x00, 0x82, 0x6f,
-0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x3c, 0x07, 0x81,
-0x62, 0x79, 0x00, 0x72, 0x65, 0x71, 0x75, 0x65, 0x9e, 0x02,
-0x00, 0xa4, 0x07, 0x54, 0x72, 0x65, 0x63, 0x69, 0x73, 0x45,
-0x09, 0x01, 0x12, 0x03, 0x05, 0xd3, 0x00, 0x00, 0x19, 0x05,
-0x1c, 0x73, 0xcf, 0x00, 0x71, 0x2e, 0x00, 0x54, 0x79, 0x70,
-0x69, 0x63, 0xfd, 0x09, 0x09, 0x95, 0x09, 0x21, 0x68, 0x65,
-0xfb, 0x00, 0x10, 0x64, 0x17, 0x04, 0x33, 0x6d, 0x69, 0x6e,
-0x46, 0x01, 0x03, 0x5f, 0x00, 0x3e, 0x73, 0x65, 0x74, 0x5c,
-0x00, 0x00, 0xaf, 0x00, 0x00, 0x7e, 0x04, 0x31, 0x76, 0x65,
-0x72, 0x5a, 0x09, 0xa0, 0x6d, 0x00, 0x65, 0x78, 0x61, 0x63,
-0x74, 0x6c, 0x79, 0x2c, 0xfd, 0x00, 0x01, 0xf8, 0x00, 0x01,
-0x0f, 0x02, 0xd1, 0x6e, 0x73, 0x77, 0x65, 0x72, 0x00, 0x28,
-0x73, 0x61, 0x79, 0x29, 0x00, 0x61, 0x02, 0x07, 0x11, 0x2d,
-0xb4, 0x05, 0x04, 0x33, 0x01, 0x01, 0x9a, 0x05, 0x09, 0x19,
-0x00, 0x50, 0x6f, 0x6c, 0x75, 0x74, 0x69, 0x92, 0x02, 0x21,
-0x4e, 0x6f, 0xcf, 0x01, 0x11, 0x61, 0x60, 0x00, 0x02, 0xf1,
-0x06, 0x02, 0x7a, 0x00, 0x07, 0x68, 0x02, 0x16, 0x2c, 0x1c,
-0x00, 0x81, 0x6c, 0x69, 0x6b, 0x65, 0x6c, 0x79, 0x00, 0x69,
-0x61, 0x01, 0x01, 0x37, 0x00, 0x04, 0x4b, 0x00, 0x71, 0x73,
-0x00, 0x73, 0x68, 0x6f, 0x72, 0x74, 0xc7, 0x02, 0x22, 0x61,
-0x6e, 0x55, 0x02, 0x00, 0xca, 0x05, 0x82, 0x74, 0x00, 0x6c,
-0x65, 0x6e, 0x67, 0x74, 0x68, 0xc5, 0x01, 0x01, 0xc5, 0x05,
-0x01, 0x28, 0x0a, 0x12, 0x6f, 0x65, 0x02, 0x80, 0x73, 0x73,
-0x69, 0x62, 0x6c, 0x65, 0x2e, 0x00,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0x33, 0x00, 0x00, 0x00, 0x1e,
+0x00, 0xf2, 0x34, 0x00, 0x69, 0x73, 0x00, 0x61, 0x00, 0x74,
+0x69, 0x6c, 0x65, 0x2d, 0x72, 0x65, 0x61, 0x72, 0x72, 0x61,
+0x6e, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x00, 0x70, 0x75,
+0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x00, 0x76, 0x69, 0x73, 0x75,
+0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x69, 0x6d, 0x69, 0x6c,
+0x61, 0x72, 0x00, 0x74, 0x6f, 0x00, 0x53, 0x69, 0x78, 0x74,
+0x65, 0x65, 0x6e, 0x00, 0x28, 0x73, 0x65, 0x65, 0x00, 0x63,
+0x72, 0x00, 0xf0, 0x11, 0x00, 0x36, 0x29, 0x3a, 0x00, 0x79,
+0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76,
+0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64, 0x00,
+0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x17, 0x00, 0x00, 0x67,
+0x00, 0xf0, 0x11, 0x73, 0x2c, 0x00, 0x65, 0x61, 0x63, 0x68,
+0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x6e,
+0x67, 0x00, 0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+0x2c, 0x00, 0x61, 0x6e, 0x64, 0x44, 0x00, 0x50, 0x72, 0x00,
+0x61, 0x69, 0x6d, 0x9a, 0x00, 0x33, 0x74, 0x6f, 0x00, 0x94,
+0x00, 0x43, 0x00, 0x74, 0x68, 0x65, 0x27, 0x00, 0x40, 0x73,
+0x00, 0x69, 0x6e, 0x19, 0x00, 0x50, 0x73, 0x63, 0x65, 0x6e,
+0x64, 0x40, 0x00, 0xf4, 0x02, 0x6f, 0x72, 0x64, 0x65, 0x72,
+0x2e, 0x00, 0x00, 0x00, 0x49, 0x6e, 0x00, 0x62, 0x61, 0x73,
+0x69, 0x63, 0xdd, 0x00, 0x12, 0x2c, 0x4d, 0x00, 0x43, 0x6d,
+0x6f, 0x76, 0x65, 0x4e, 0x00, 0x84, 0x72, 0x6f, 0x74, 0x61,
+0x74, 0x65, 0x00, 0x61, 0x92, 0x00, 0x50, 0x67, 0x72, 0x6f,
+0x75, 0x70, 0xa2, 0x00, 0x10, 0x66, 0x29, 0x00, 0x01, 0xa0,
+0x00, 0x60, 0x00, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x70, 0x00,
+0xf0, 0x0f, 0x69, 0x72, 0x00, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
+0x6e, 0x00, 0x63, 0x65, 0x6e, 0x74, 0x72, 0x65, 0x2e, 0x00,
+0x28, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69,
+0x6f, 0x6e, 0x52, 0x00, 0xf1, 0x03, 0x6e, 0x6f, 0x74, 0x00,
+0x73, 0x69, 0x67, 0x6e, 0x69, 0x66, 0x69, 0x63, 0x61, 0x6e,
+0x74, 0x00, 0x69, 0x6e, 0xa8, 0x00, 0x02, 0x85, 0x00, 0x04,
+0x42, 0x01, 0x81, 0x61, 0x6c, 0x74, 0x68, 0x6f, 0x75, 0x67,
+0x68, 0x1e, 0x01, 0xf5, 0x1b, 0x63, 0x61, 0x6e, 0x00, 0x73,
+0x65, 0x6c, 0x65, 0x63, 0x74, 0x00, 0x69, 0x74, 0x2e, 0x29,
+0x00, 0x4f, 0x6e, 0x00, 0x6d, 0x6f, 0x72, 0x65, 0x00, 0x61,
+0x64, 0x76, 0x61, 0x6e, 0x63, 0x65, 0x64, 0x00, 0x73, 0x65,
+0x74, 0x74, 0x69, 0x6e, 0x67, 0x73, 0x2c, 0x2f, 0x00, 0x05,
+0xb4, 0x00, 0x6d, 0x6c, 0x61, 0x72, 0x67, 0x65, 0x72, 0xbb,
+0x00, 0x01, 0xb6, 0x00, 0x01, 0xff, 0x00, 0xd0, 0x00, 0x66,
+0x69, 0x72, 0x73, 0x74, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74,
+0x68, 0xf1, 0x00, 0x30, 0x79, 0x70, 0x65, 0x22, 0x00, 0x02,
+0x8a, 0x00, 0x04, 0x9e, 0x00, 0xf2, 0x13, 0x47, 0x61, 0x6d,
+0x65, 0x43, 0x75, 0x62, 0x65, 0x00, 0x67, 0x61, 0x6d, 0x65,
+0x00, 0x60, 0x4d, 0x65, 0x74, 0x72, 0x6f, 0x69, 0x64, 0x00,
+0x50, 0x72, 0x69, 0x6d, 0x65, 0x00, 0x32, 0x27, 0x2e, 0x00,
+0x49, 0x28, 0x00, 0xd0, 0x4d, 0x61, 0x69, 0x6e, 0x00, 0x47,
+0x79, 0x72, 0x6f, 0x00, 0x43, 0x68, 0x61, 0x79, 0x01, 0x02,
+0x41, 0x00, 0x21, 0x61, 0x74, 0x39, 0x00, 0x10, 0x2c, 0x24,
+0x00, 0x13, 0x72, 0x40, 0x02, 0x03, 0x61, 0x00, 0x00, 0xb2,
+0x00, 0x50, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x6b, 0x01, 0xf2,
+0x05, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x00, 0x61, 0x00,
+0x64, 0x6f, 0x6f, 0x72, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63,
+0x68, 0x2e, 0x00, 0xb1, 0x73, 0x70, 0x65, 0x63, 0x69, 0x61,
+0x6c, 0x00, 0x63, 0x61, 0x73, 0x9f, 0x00, 0x03, 0xae, 0x01,
+0xd2, 0x2e, 0x00, 0x49, 0x00, 0x64, 0x65, 0x76, 0x65, 0x6c,
+0x6f, 0x70, 0x65, 0x64, 0xc1, 0x00, 0x01, 0xa2, 0x00, 0x20,
+0x61, 0x73, 0x4a, 0x02, 0x82, 0x65, 0x6e, 0x65, 0x72, 0x61,
+0x6c, 0x69, 0x73, 0x7c, 0x01, 0x22, 0x6f, 0x66, 0x8a, 0x00,
+0x02, 0x79, 0x00, 0x00, 0xfd, 0x00, 0x35, 0x37, 0x2e, 0x31,
+0xf2, 0x02, 0x00, 0x5c, 0x02, 0x50, 0x72, 0x6f, 0x6c, 0x73,
+0x20, 0xe8, 0x02, 0x66, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79,
+0x13, 0x02, 0x51, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xe1, 0x00,
+0x45, 0x6d, 0x6f, 0x75, 0x73, 0x16, 0x01, 0x02, 0xe3, 0x01,
+0x02, 0x59, 0x00, 0x1a, 0x65, 0x64, 0x01, 0x00, 0xd7, 0x00,
+0x46, 0x77, 0x69, 0x73, 0x68, 0x41, 0x02, 0x05, 0x24, 0x01,
+0x02, 0xea, 0x01, 0x32, 0x6d, 0x6f, 0x64, 0x6c, 0x02, 0x06,
+0xac, 0x01, 0x33, 0x32, 0x78, 0x32, 0x45, 0x00, 0x04, 0xfb,
+0x00, 0x51, 0x6d, 0x65, 0x61, 0x6e, 0x73, 0x25, 0x00, 0x22,
+0x68, 0x61, 0x22, 0x01, 0x02, 0x8a, 0x00, 0xf1, 0x04, 0x61,
+0x74, 0x00, 0x61, 0x00, 0x63, 0x6f, 0x72, 0x6e, 0x65, 0x72,
+0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x00, 0x77, 0x59, 0x01,
+0x07, 0x92, 0x02, 0x43, 0x6d, 0x65, 0x65, 0x74, 0xe0, 0x02,
+0x0a, 0x2d, 0x02, 0x00, 0x79, 0x00, 0x02, 0x54, 0x00, 0x82,
+0x6d, 0x69, 0x67, 0x68, 0x74, 0x00, 0x62, 0x65, 0x82, 0x00,
+0x00, 0x16, 0x03, 0xa4, 0x33, 0x78, 0x33, 0x00, 0x6f, 0x72,
+0x00, 0x65, 0x76, 0x65, 0x36, 0x00, 0x11, 0x74, 0xea, 0x03,
+0x53, 0x6d, 0x65, 0x3b, 0x00, 0x69, 0xe6, 0x00, 0x2c, 0x69,
+0x7a, 0xf2, 0x00, 0x60, 0x69, 0x73, 0x00, 0x6f, 0x64, 0x64,
+0x12, 0x00, 0x12, 0x6e, 0xcf, 0x01, 0x53, 0x69, 0x6d, 0x70,
+0x6c, 0x79, 0xab, 0x00, 0x0a, 0x2b, 0x01, 0x00, 0x9c, 0x00,
+0x0b, 0x3e, 0x00, 0x01, 0x2a, 0x01, 0x00, 0x09, 0x03, 0x07,
+0x2a, 0x01, 0x30, 0x00, 0x00, 0x43, 0x3d, 0x00, 0x00, 0x93,
+0x00, 0x41, 0x77, 0x69, 0x74, 0x68, 0x2f, 0x00, 0x43, 0x6c,
+0x65, 0x66, 0x74, 0x7f, 0x01, 0x54, 0x62, 0x75, 0x74, 0x74,
+0x6f, 0xe5, 0x02, 0x11, 0x73, 0x1e, 0x00, 0x02, 0x76, 0x01,
+0x50, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x43, 0x02, 0x5f, 0x77,
+0x69, 0x73, 0x65, 0x2e, 0x45, 0x00, 0x00, 0x12, 0x72, 0xf3,
+0x00, 0x0a, 0x40, 0x00, 0x37, 0x69, 0x74, 0x00, 0x35, 0x00,
+0x33, 0x00, 0x00, 0x59, 0x45, 0x03, 0x42, 0x61, 0x6c, 0x73,
+0x6f, 0x09, 0x04, 0x95, 0x61, 0x6e, 0x00, 0x6f, 0x75, 0x74,
+0x6c, 0x69, 0x6e, 0xb6, 0x00, 0x51, 0x61, 0x72, 0x6f, 0x75,
+0x6e, 0xf4, 0x00, 0x02, 0xb1, 0x04, 0x05, 0x62, 0x00, 0xcb,
+0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79,
+0x73, 0x3b, 0x25, 0x01, 0x05, 0x3f, 0x01, 0x20, 0x61, 0x62,
+0x55, 0x00, 0x10, 0x28, 0xf0, 0x01, 0xb0, 0x62, 0x79, 0x00,
+0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x2c, 0x7a, 0x01,
+0x02, 0xaf, 0x03, 0x80, 0x29, 0x2e, 0x00, 0x50, 0x72, 0x65,
+0x73, 0x73, 0xbb, 0x00, 0x01, 0xb6, 0x00, 0x50, 0x65, 0x74,
+0x75, 0x72, 0x6e, 0x54, 0x00, 0x00, 0x24, 0x00, 0x40, 0x73,
+0x70, 0x61, 0x63, 0x46, 0x02, 0x64, 0x72, 0x00, 0x77, 0x69,
+0x6c, 0x6c, 0x3f, 0x02, 0x03, 0x7c, 0x00, 0x10, 0x72, 0x88,
+0x05, 0x04, 0xa4, 0x00, 0x08, 0x0e, 0x01, 0x00, 0x3a, 0x00,
+0x06, 0x0d, 0x00, 0x20, 0x72, 0x65, 0x51, 0x03, 0x60, 0x74,
+0x69, 0x76, 0x65, 0x6c, 0x79, 0xf3, 0x00, 0x41, 0x28, 0x41,
+0x6c, 0x6c, 0x43, 0x00, 0x20, 0x61, 0x63, 0x2c, 0x03, 0xd0,
+0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+0x64, 0x00, 0x69, 0x7d, 0x04, 0x11, 0x63, 0x42, 0x03, 0x31,
+0x32, 0x2e, 0x31, 0xab, 0x05, 0x01, 0x19, 0x01, 0xb1, 0x61,
+0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
+0x4b, 0x03, 0x15, 0x32, 0x4b, 0x03, 0xb7, 0x70, 0x61, 0x72,
+0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0x35, 0x06,
+0x50, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x7b, 0x02, 0x30, 0x73,
+0x65, 0x76, 0x97, 0x03, 0x00, 0xce, 0x05, 0x53, 0x66, 0x69,
+0x67, 0x75, 0x72, 0x9e, 0x03, 0x12, 0x70, 0x79, 0x00, 0x31,
+0x76, 0x69, 0x61, 0x89, 0x00, 0x83, 0x60, 0x43, 0x75, 0x73,
+0x74, 0x6f, 0x6d, 0x27, 0x19, 0x00, 0x32, 0x00, 0x6f, 0x6e,
+0x17, 0x00, 0xf5, 0x00, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
+0x6d, 0x65, 0x6e, 0x75, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0xad,
+0x01, 0x04, 0x4e, 0x00, 0x02, 0x0a, 0x01, 0x51, 0x77, 0x69,
+0x64, 0x74, 0x68, 0x1b, 0x06, 0x21, 0x68, 0x65, 0xf3, 0x01,
+0x03, 0x74, 0x02, 0x03, 0x75, 0x04, 0x00, 0xb3, 0x01, 0x1f,
+0x2e, 0x3f, 0x00, 0x08, 0x04, 0xe5, 0x02, 0x03, 0x49, 0x01,
+0x11, 0x62, 0x96, 0x04, 0x01, 0x3d, 0x04, 0x04, 0x34, 0x02,
+0x05, 0x19, 0x03, 0x0a, 0x47, 0x00, 0x52, 0x61, 0x73, 0x6b,
+0x00, 0x66, 0x42, 0x03, 0x25, 0x72, 0x79, 0xfb, 0x01, 0x16,
+0x6e, 0x28, 0x02, 0x20, 0x74, 0x6f, 0x71, 0x03, 0x30, 0x64,
+0x69, 0x73, 0x70, 0x03, 0x40, 0x75, 0x69, 0x73, 0x68, 0x42,
+0x01, 0x20, 0x00, 0x28, 0x20, 0x00, 0x03, 0x08, 0x02, 0x11,
+0x29, 0x09, 0x02, 0x1b, 0x79, 0x51, 0x00, 0x12, 0x61, 0x56,
+0x03, 0x57, 0x69, 0x66, 0x69, 0x65, 0x64, 0x9c, 0x05, 0x02,
+0x27, 0x04, 0x02, 0x56, 0x05, 0x05, 0x7d, 0x04, 0x10, 0x73,
+0xbb, 0x00, 0x30, 0x69, 0x64, 0x65, 0xff, 0x01, 0x24, 0x61,
+0x6c, 0x02, 0x07, 0x05, 0x80, 0x04, 0x0e, 0x49, 0x00, 0x08,
+0x3f, 0x07, 0x48, 0x6a, 0x75, 0x73, 0x74, 0x44, 0x07, 0x13,
+0x61, 0x19, 0x02, 0x13, 0x31, 0x43, 0x07, 0x00, 0x0c, 0x00,
+0x02, 0x33, 0x06, 0x45, 0x72, 0x6f, 0x77, 0x2c, 0x1f, 0x00,
+0x17, 0x32, 0x1f, 0x00, 0x63, 0x73, 0x65, 0x63, 0x6f, 0x6e,
+0x64, 0x20, 0x00, 0x8f, 0x6e, 0x64, 0x00, 0x73, 0x6f, 0x00,
+0x6f, 0x6e, 0x6f, 0x01, 0x05, 0x30, 0x77, 0x68, 0x65, 0xbf,
+0x00, 0x01, 0x39, 0x00, 0x17, 0x6f, 0x2a, 0x07, 0x24, 0x6f,
+0x66, 0xc9, 0x04, 0x32, 0x61, 0x74, 0x74, 0xbf, 0x00, 0x12,
+0x66, 0x2c, 0x08, 0x04, 0x12, 0x01, 0x14, 0x6e, 0x30, 0x00,
+0x24, 0x62, 0x6c, 0xd9, 0x01, 0x03, 0x28, 0x08, 0x01, 0x66,
+0x04, 0x01, 0x1d, 0x03, 0x01, 0x37, 0x05, 0xf0, 0x01, 0x61,
+0x00, 0x74, 0x72, 0x69, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x00,
+0x64, 0x72, 0x61, 0x77, 0x6e, 0x39, 0x01, 0x44, 0x69, 0x74,
+0x2e, 0x00, 0xf4, 0x02, 0x04, 0x1e, 0x00, 0x51, 0x73, 0x00,
+0x6d, 0x75, 0x73, 0x11, 0x05, 0x01, 0x54, 0x05, 0x00, 0x7e,
+0x03, 0x71, 0x75, 0x70, 0x77, 0x61, 0x72, 0x64, 0x73, 0x7a,
+0x05, 0x77, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x48,
+0x02, 0x0e, 0xfc, 0x01, 0x02, 0xab, 0x01, 0x50, 0x6c, 0x69,
+0x6d, 0x69, 0x74, 0x98, 0x07, 0x51, 0x68, 0x75, 0x66, 0x66,
+0x6c, 0x6f, 0x08, 0x23, 0x70, 0x65, 0xe8, 0x02, 0x02, 0x01,
+0x02, 0x94, 0x70, 0x65, 0x72, 0x66, 0x6f, 0x72, 0x6d, 0x65,
+0x64, 0xd8, 0x02, 0x02, 0x92, 0x02, 0x17, 0x42, 0x0e, 0x04,
+0x04, 0x38, 0x03, 0x01, 0xc8, 0x00, 0x02, 0x4a, 0x00, 0x16,
+0x65, 0x48, 0x02, 0x00, 0x9a, 0x04, 0x11, 0x75, 0xfb, 0x01,
+0x00, 0x8a, 0x02, 0x38, 0x6e, 0x79, 0x00, 0x88, 0x09, 0x14,
+0x69, 0x91, 0x08, 0x20, 0x61, 0x73, 0x77, 0x03, 0x11, 0x62,
+0x22, 0x01, 0x21, 0x61, 0x73, 0x28, 0x00, 0x10, 0x6f, 0x6e,
+0x01, 0x15, 0x2e, 0xb5, 0x00, 0x82, 0x6f, 0x76, 0x65, 0x72,
+0x72, 0x69, 0x64, 0x65, 0x3c, 0x07, 0x81, 0x62, 0x79, 0x00,
+0x72, 0x65, 0x71, 0x75, 0x65, 0x9e, 0x02, 0x00, 0xa4, 0x07,
+0x54, 0x72, 0x65, 0x63, 0x69, 0x73, 0x45, 0x09, 0x01, 0x12,
+0x03, 0x05, 0xd3, 0x00, 0x00, 0x19, 0x05, 0x1c, 0x73, 0xcf,
+0x00, 0x71, 0x2e, 0x00, 0x54, 0x79, 0x70, 0x69, 0x63, 0xfd,
+0x09, 0x09, 0x95, 0x09, 0x21, 0x68, 0x65, 0xfb, 0x00, 0x10,
+0x64, 0x17, 0x04, 0x33, 0x6d, 0x69, 0x6e, 0x46, 0x01, 0x03,
+0x5f, 0x00, 0x3e, 0x73, 0x65, 0x74, 0x5c, 0x00, 0x00, 0xaf,
+0x00, 0x00, 0x7e, 0x04, 0x31, 0x76, 0x65, 0x72, 0x5a, 0x09,
+0xa0, 0x6d, 0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79,
+0x2c, 0xfd, 0x00, 0x01, 0xf8, 0x00, 0x01, 0x0f, 0x02, 0xd1,
+0x6e, 0x73, 0x77, 0x65, 0x72, 0x00, 0x28, 0x73, 0x61, 0x79,
+0x29, 0x00, 0x61, 0x02, 0x07, 0x11, 0x2d, 0xb4, 0x05, 0x04,
+0x33, 0x01, 0x01, 0x9a, 0x05, 0x09, 0x19, 0x00, 0x50, 0x6f,
+0x6c, 0x75, 0x74, 0x69, 0x92, 0x02, 0x21, 0x4e, 0x6f, 0xcf,
+0x01, 0x11, 0x61, 0x60, 0x00, 0x02, 0xf1, 0x06, 0x02, 0x7a,
+0x00, 0x07, 0x68, 0x02, 0x16, 0x2c, 0x1c, 0x00, 0x81, 0x6c,
+0x69, 0x6b, 0x65, 0x6c, 0x79, 0x00, 0x69, 0x61, 0x01, 0x01,
+0x37, 0x00, 0x04, 0x4b, 0x00, 0x71, 0x73, 0x00, 0x73, 0x68,
+0x6f, 0x72, 0x74, 0xc7, 0x02, 0x22, 0x61, 0x6e, 0x55, 0x02,
+0x00, 0xca, 0x05, 0x82, 0x74, 0x00, 0x6c, 0x65, 0x6e, 0x67,
+0x74, 0x68, 0xc5, 0x01, 0x01, 0xc5, 0x05, 0x01, 0x28, 0x0a,
+0x12, 0x6f, 0x65, 0x02, 0x80, 0x73, 0x73, 0x69, 0x62, 0x6c,
+0x65, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 2926;
-const unsigned short help_text_words = 548;
+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 c08801003a..dc75e88743 100644
--- a/apps/plugins/puzzles/help/undead.c
+++ b/apps/plugins/puzzles/help/undead.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,230 +6,247 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 202, TEXT_CENTER | C_RED },
- { 282, TEXT_UNDERLINE },
- { 576, TEXT_CENTER | C_RED },
- { 593, TEXT_UNDERLINE },
- { 594, TEXT_UNDERLINE },
- { 604, TEXT_UNDERLINE },
+ { 203, TEXT_CENTER | C_RED },
+ { 291, TEXT_UNDERLINE },
+ { 591, TEXT_CENTER | C_RED },
+ { 608, TEXT_UNDERLINE },
+ { 609, TEXT_UNDERLINE },
+ { 619, TEXT_UNDERLINE },
+ { 631, TEXT_CENTER | C_RED },
  LAST_STYLE_ITEM
 };
 
-/* orig 3286 comp 2109 ratio 0.641814 level 10 saved 1177 */
+/* orig 3574 comp 2258 ratio 0.631785 level 10 saved 1316 */
 const char help_text[] = {
-0xf0, 0x2c, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x37, 0x3a, 0x20, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64,
-0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72,
-0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
-0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d,
-0x65, 0x11, 0x00, 0xf3, 0x16, 0x77, 0x68, 0x69, 0x63, 0x68,
-0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x64,
-0x69, 0x61, 0x67, 0x6f, 0x6e, 0x61, 0x6c, 0x00, 0x6d, 0x69,
-0x72, 0x72, 0x6f, 0x72, 0x73, 0x2e, 0x00, 0x45, 0x76, 0x65,
-0x72, 0x79, 0x37, 0x00, 0x03, 0x2d, 0x00, 0x83, 0x69, 0x73,
-0x00, 0x6e, 0x6f, 0x74, 0x00, 0x61, 0x25, 0x00, 0xf1, 0x08,
-0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x62, 0x65, 0x00, 0x66,
-0x69, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x77, 0x69, 0x74, 0x68,
-0x00, 0x6f, 0x6e, 0x5e, 0x00, 0xb0, 0x74, 0x68, 0x72, 0x65,
-0x65, 0x00, 0x74, 0x79, 0x70, 0x65, 0x73, 0x0f, 0x00, 0x11,
-0x75, 0xa0, 0x00, 0x90, 0x00, 0x6d, 0x6f, 0x6e, 0x73, 0x74,
-0x65, 0x72, 0x3a, 0x98, 0x00, 0xf2, 0x12, 0x68, 0x6f, 0x73,
-0x74, 0x2c, 0x00, 0x61, 0x00, 0x76, 0x61, 0x6d, 0x70, 0x69,
-0x72, 0x65, 0x2c, 0x00, 0x6f, 0x72, 0x00, 0x61, 0x00, 0x7a,
-0x6f, 0x6d, 0x62, 0x69, 0x65, 0x2e, 0x00, 0x00, 0x00, 0x56,
-0x18, 0x00, 0x50, 0x73, 0x00, 0x63, 0x61, 0x6e, 0x65, 0x00,
-0x30, 0x73, 0x65, 0x65, 0xa7, 0x00, 0xb1, 0x72, 0x65, 0x63,
-0x74, 0x6c, 0x79, 0x2c, 0x00, 0x62, 0x75, 0x74, 0xe8, 0x00,
-0x80, 0x69, 0x6e, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0xa4,
-0x00, 0xf6, 0x00, 0x65, 0x6e, 0x00, 0x72, 0x65, 0x66, 0x6c,
-0x65, 0x63, 0x74, 0x65, 0x64, 0x00, 0x69, 0x6e, 0xcc, 0x00,
-0x10, 0x47, 0x6d, 0x00, 0x11, 0x73, 0x30, 0x00, 0xf0, 0x08,
-0x74, 0x68, 0x65, 0x00, 0x6f, 0x70, 0x70, 0x6f, 0x73, 0x69,
-0x74, 0x65, 0x00, 0x77, 0x61, 0x79, 0x00, 0x72, 0x6f, 0x75,
-0x6e, 0x64, 0x3a, 0x18, 0x00, 0x19, 0x79, 0x6b, 0x00, 0x06,
-0x40, 0x00, 0x0f, 0x6d, 0x00, 0x06, 0x95, 0x6c, 0x6f, 0x6f,
-0x6b, 0x65, 0x64, 0x00, 0x61, 0x74, 0x98, 0x00, 0x31, 0x2e,
-0x00, 0x5a, 0xc1, 0x00, 0x02, 0x6c, 0x00, 0x04, 0x2d, 0x00,
-0xd7, 0x62, 0x79, 0x00, 0x61, 0x6e, 0x79, 0x00, 0x6d, 0x65,
-0x61, 0x6e, 0x73, 0x2e, 0xa4, 0x01, 0x91, 0x61, 0x6c, 0x73,
-0x6f, 0x00, 0x74, 0x6f, 0x6c, 0x64, 0x96, 0x00, 0xc0, 0x74,
-0x6f, 0x74, 0x61, 0x6c, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-0x72, 0x34, 0x01, 0x41, 0x65, 0x61, 0x63, 0x68, 0x42, 0x01,
-0x00, 0x0d, 0x00, 0x03, 0x3a, 0x01, 0x00, 0x96, 0x00, 0x00,
-0x2c, 0x00, 0x00, 0xd6, 0x01, 0x30, 0x2e, 0x00, 0x41, 0x40,
-0x00, 0x11, 0x61, 0xc1, 0x00, 0x01, 0x16, 0x00, 0x33, 0x65,
-0x64, 0x67, 0x7d, 0x01, 0x12, 0x65, 0xf8, 0x01, 0x01, 0xbb,
-0x01, 0x63, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x59, 0x00,
-0x24, 0x73, 0x2c, 0xcc, 0x01, 0xd1, 0x6e, 0x64, 0x69, 0x63,
-0x61, 0x74, 0x65, 0x00, 0x68, 0x6f, 0x77, 0x00, 0x6d, 0x9f,
-0x00, 0x02, 0x63, 0x00, 0x1a, 0x73, 0x06, 0x01, 0x51, 0x66,
-0x00, 0x79, 0x6f, 0x75, 0xea, 0x00, 0x57, 0x00, 0x69, 0x6e,
-0x74, 0x6f, 0x5c, 0x00, 0xa0, 0x6c, 0x6f, 0x6e, 0x67, 0x00,
-0x61, 0x00, 0x72, 0x6f, 0x77, 0xbb, 0x01, 0xf1, 0x0b, 0x63,
-0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x00, 0x73, 0x74, 0x61, 0x72,
-0x74, 0x69, 0x6e, 0x67, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00,
-0x74, 0x68, 0x61, 0x74, 0x00, 0x6c, 0x01, 0x9d, 0x69, 0x6f,
-0x6e, 0x2e, 0x00, 0x28, 0x54, 0x68, 0x65, 0x6a, 0x02, 0x01,
-0xa5, 0x00, 0x03, 0xb7, 0x01, 0xf1, 0x05, 0x69, 0x76, 0x65,
-0x00, 0x6f, 0x6e, 0x00, 0x62, 0x6f, 0x74, 0x68, 0x00, 0x73,
-0x69, 0x64, 0x65, 0x73, 0x2e, 0x00, 0x49, 0x81, 0x00, 0x17,
-0x72, 0xd9, 0x01, 0x22, 0x6c, 0x69, 0x63, 0x02, 0xd1, 0x73,
-0x69, 0x67, 0x68, 0x74, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73,
-0x65, 0x73, 0x98, 0x00, 0x45, 0x73, 0x61, 0x6d, 0x65, 0x2a,
-0x01, 0x21, 0x6d, 0x6f, 0xee, 0x01, 0x81, 0x61, 0x6e, 0x00,
-0x6f, 0x6e, 0x63, 0x65, 0x2c, 0x21, 0x00, 0x03, 0x5d, 0x01,
-0xd3, 0x77, 0x69, 0x6c, 0x6c, 0x00, 0x63, 0x6f, 0x75, 0x6e,
-0x74, 0x00, 0x69, 0x74, 0x68, 0x01, 0x30, 0x69, 0x6d, 0x65,
-0x0d, 0x00, 0x24, 0x69, 0x73, 0xb6, 0x01, 0x11, 0x2c, 0xec,
-0x02, 0x10, 0x6a, 0xe3, 0x02, 0x00, 0x41, 0x00, 0xf2, 0x01,
-0x2e, 0x29, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00,
-0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x9a, 0x01, 0x30, 0x77,
-0x61, 0x73, 0x15, 0x02, 0x20, 0x65, 0x6e, 0x99, 0x00, 0xf1,
-0x01, 0x62, 0x79, 0x00, 0x44, 0x61, 0x76, 0x69, 0x64, 0x00,
-0x4d, 0x69, 0x6c, 0x6c, 0x61, 0x72, 0x2c, 0xf6, 0x02, 0x12,
-0x72, 0x79, 0x00, 0x00, 0x9a, 0x00, 0x41, 0x60, 0x48, 0x61,
-0x75, 0x29, 0x00, 0x12, 0x4d, 0x3f, 0x03, 0xf3, 0x03, 0x4d,
-0x61, 0x7a, 0x65, 0x27, 0x2e, 0x00, 0x53, 0x65, 0x65, 0x00,
-0x5b, 0x32, 0x30, 0x5d, 0x00, 0x66, 0x6f, 0xb6, 0x00, 0x61,
-0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x2b, 0x02, 0x02, 0xd9,
-0x03, 0x01, 0x68, 0x00, 0x00, 0xab, 0x03, 0x40, 0x72, 0x69,
-0x62, 0x75, 0x42, 0x00, 0x01, 0x89, 0x01, 0x20, 0x69, 0x73,
-0x76, 0x01, 0x01, 0x38, 0x01, 0x20, 0x6f, 0x6e, 0x7e, 0x00,
-0xd0, 0x53, 0x74, 0x65, 0x66, 0x66, 0x65, 0x6e, 0x00, 0x42,
-0x61, 0x75, 0x65, 0x72, 0x3e, 0x00, 0x01, 0x57, 0x00, 0xf4,
-0x29, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77,
-0x77, 0x2e, 0x6a, 0x61, 0x6e, 0x6b, 0x6f, 0x2e, 0x61, 0x74,
-0x2f, 0x52, 0x61, 0x65, 0x74, 0x73, 0x65, 0x6c, 0x2f, 0x53,
-0x70, 0x75, 0x6b, 0x73, 0x63, 0x68, 0x6c, 0x6f, 0x73, 0x73,
-0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d,
-0x00, 0x00, 0x00, 0x33, 0x37, 0x2e, 0x31, 0x55, 0x04, 0x01,
-0x78, 0x00, 0x46, 0x6f, 0x6c, 0x73, 0x20, 0x8f, 0x00, 0xe3,
-0x68, 0x61, 0x73, 0x00, 0x61, 0x00, 0x73, 0x69, 0x6d, 0x69,
-0x6c, 0x61, 0x72, 0x00, 0x21, 0x00, 0x70, 0x00, 0x73, 0x79,
-0x73, 0x74, 0x65, 0x6d, 0x9c, 0x00, 0xf0, 0x08, 0x53, 0x6f,
-0x6c, 0x6f, 0x2c, 0x00, 0x55, 0x6e, 0x65, 0x71, 0x75, 0x61,
-0x6c, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x4b, 0x65, 0x65, 0x6e,
-0x2e, 0x42, 0x01, 0x63, 0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79,
-0x49, 0x00, 0x71, 0x2c, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b,
-0x23, 0x01, 0x40, 0x6d, 0x6f, 0x75, 0x73, 0x62, 0x03, 0x01,
-0x2b, 0x03, 0x45, 0x65, 0x6d, 0x70, 0x74, 0x7d, 0x04, 0x12,
-0x61, 0xdf, 0x02, 0x12, 0x6e, 0x73, 0x01, 0x60, 0x61, 0x00,
-0x6c, 0x65, 0x74, 0x74, 0x23, 0x03, 0x02, 0x0b, 0x03, 0x84,
-0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0xd2, 0x02,
-0x00, 0x7d, 0x02, 0x01, 0x4f, 0x03, 0x0a, 0x3a, 0x03, 0x51,
-0x3a, 0x00, 0x60, 0x47, 0x27, 0x63, 0x01, 0x05, 0x7c, 0x04,
-0x24, 0x60, 0x56, 0x11, 0x00, 0x08, 0x84, 0x04, 0x24, 0x60,
-0x5a, 0x16, 0x00, 0x04, 0x8c, 0x04, 0x12, 0x49, 0x04, 0x03,
-0x41, 0x6d, 0x61, 0x6b, 0x65, 0xfc, 0x04, 0x5e, 0x73, 0x74,
-0x61, 0x6b, 0x65, 0xbb, 0x00, 0x03, 0x9b, 0x03, 0x50, 0x69,
-0x6e, 0x63, 0x6f, 0x72, 0x0e, 0x04, 0x08, 0xbf, 0x00, 0xb0,
-0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0x61, 0x63,
-0x65, 0x20, 0x01, 0x50, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x6f,
-0x02, 0x20, 0x61, 0x67, 0x7d, 0x05, 0x62, 0x28, 0x6f, 0x72,
-0x00, 0x75, 0x73, 0x9c, 0x04, 0xd0, 0x55, 0x6e, 0x64, 0x6f,
-0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x29, 0x32,
-0x01, 0x03, 0x7e, 0x00, 0x10, 0x72, 0xee, 0x02, 0x12, 0x2d,
-0x74, 0x00, 0x00, 0x25, 0x01, 0x0f, 0x1d, 0x01, 0x0b, 0x02,
-0xef, 0x02, 0x01, 0x89, 0x00, 0x50, 0x73, 0x70, 0x6f, 0x6e,
-0x64, 0x15, 0x01, 0x04, 0x19, 0x03, 0x01, 0xfe, 0x02, 0x00,
-0xe0, 0x03, 0x31, 0x68, 0x6f, 0x77, 0xe7, 0x04, 0xb3, 0x72,
-0x65, 0x64, 0x75, 0x63, 0x65, 0x64, 0x00, 0x73, 0x69, 0x7a,
-0xc6, 0x00, 0x14, 0x61, 0xbd, 0x00, 0x21, 0x2c, 0x00, 0xea,
-0x01, 0xe1, 0x60, 0x70, 0x65, 0x6e, 0x63, 0x69, 0x6c, 0x00,
-0x6d, 0x61, 0x72, 0x6b, 0x27, 0x2e, 0xc0, 0x04, 0x00, 0x25,
-0x04, 0x57, 0x68, 0x61, 0x76, 0x65, 0x00, 0x1b, 0x00, 0x12,
-0x73, 0xc3, 0x02, 0x65, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c,
-0x8a, 0x03, 0x00, 0x22, 0x03, 0x06, 0x9f, 0x03, 0x02, 0x58,
-0x00, 0x34, 0x2e, 0x00, 0x41, 0xc1, 0x00, 0x03, 0x82, 0x06,
-0x11, 0x69, 0x4d, 0x04, 0x51, 0x66, 0x75, 0x6c, 0x6c, 0x2d,
-0x88, 0x00, 0x04, 0xae, 0x00, 0x31, 0x63, 0x61, 0x6e, 0x74,
-0x06, 0x00, 0xeb, 0x04, 0x04, 0xad, 0x06, 0x08, 0x73, 0x00,
-0x01, 0x55, 0x02, 0x00, 0x94, 0x04, 0x00, 0x5d, 0x00, 0x30,
-0x70, 0x61, 0x79, 0xa3, 0x06, 0x20, 0x00, 0x61, 0xf2, 0x04,
-0x01, 0x16, 0x03, 0x29, 0x74, 0x6f, 0x2e, 0x00, 0x00, 0xff,
-0x06, 0x40, 0x00, 0x65, 0x78, 0x61, 0xac, 0x05, 0x20, 0x00,
-0x77, 0xe8, 0x00, 0x00, 0x5c, 0x01, 0x03, 0x7c, 0x01, 0x11,
-0x6d, 0xbf, 0x00, 0x50, 0x69, 0x73, 0x00, 0x75, 0x70, 0x38,
-0x00, 0x63, 0x79, 0x6f, 0x75, 0x3a, 0x00, 0x79, 0xeb, 0x00,
-0x05, 0x23, 0x00, 0x70, 0x61, 0x73, 0x00, 0x72, 0x65, 0x6d,
-0x69, 0xda, 0x03, 0x12, 0x73, 0x2a, 0x01, 0x30, 0x61, 0x00,
-0x70, 0xf4, 0x04, 0x20, 0x63, 0x75, 0x0c, 0x03, 0x03, 0xd5,
-0x00, 0x50, 0x6e, 0x65, 0x65, 0x64, 0x73, 0x45, 0x00, 0x10,
-0x62, 0xdc, 0x04, 0x91, 0x2d, 0x65, 0x78, 0x61, 0x6d, 0x69,
-0x6e, 0x65, 0x64, 0x4a, 0x04, 0x01, 0x54, 0x00, 0x42, 0x6b,
-0x6e, 0x6f, 0x77, 0xed, 0x03, 0x4b, 0x61, 0x62, 0x6f, 0x75,
-0x45, 0x00, 0x03, 0xfc, 0x00, 0x01, 0x8f, 0x02, 0x0f, 0x81,
-0x00, 0x01, 0x20, 0x6c, 0x69, 0xce, 0x06, 0x03, 0xe9, 0x05,
-0x32, 0x70, 0x6f, 0x73, 0x66, 0x06, 0x07, 0x23, 0x06, 0x13,
-0x61, 0xff, 0x07, 0x04, 0xc5, 0x01, 0x20, 0x6f, 0x72, 0x56,
-0x03, 0x20, 0x74, 0x68, 0x65, 0x01, 0x32, 0x65, 0x6c, 0x73,
-0x83, 0x00, 0x93, 0x66, 0x65, 0x65, 0x6c, 0x00, 0x6c, 0x69,
-0x6b, 0x65, 0x98, 0x03, 0x51, 0x65, 0x72, 0x61, 0x73, 0x65,
-0xd7, 0x03, 0x39, 0x6e, 0x67, 0x6c, 0xd8, 0x01, 0x1c, 0x2c,
-0x7e, 0x02, 0x01, 0xce, 0x01, 0x07, 0x80, 0x02, 0x00, 0x7b,
-0x02, 0x05, 0xe2, 0x01, 0x03, 0x9f, 0x03, 0x01, 0xdb, 0x02,
-0x00, 0x5b, 0x00, 0x3a, 0x41, 0x6c, 0x6c, 0x25, 0x02, 0x09,
-0xbf, 0x02, 0x22, 0x72, 0x65, 0x79, 0x00, 0x12, 0x64, 0x53,
-0x07, 0x01, 0x6d, 0x06, 0x24, 0x65, 0x66, 0x6c, 0x00, 0x05,
-0x5e, 0x00, 0x15, 0x61, 0xdf, 0x00, 0x04, 0xe1, 0x02, 0x2f,
-0x6f, 0x72, 0x32, 0x00, 0x06, 0x07, 0x6e, 0x03, 0x31, 0x2e,
-0x00, 0x52, 0xbb, 0x00, 0x02, 0xae, 0x03, 0x01, 0x65, 0x02,
-0x04, 0x21, 0x00, 0x00, 0x0d, 0x00, 0x11, 0x73, 0x92, 0x03,
-0x01, 0x12, 0x03, 0x01, 0x62, 0x02, 0x02, 0x04, 0x01, 0x0c,
-0x60, 0x02, 0x12, 0x41, 0xd9, 0x02, 0x02, 0xd6, 0x04, 0x01,
-0x59, 0x03, 0x50, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x7b, 0x04,
-0x05, 0x2e, 0x07, 0x22, 0x75, 0x73, 0x74, 0x08, 0x62, 0x63,
-0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0x93, 0x05, 0x01, 0x11, 0x09,
-0x25, 0x74, 0x68, 0x13, 0x01, 0x01, 0x30, 0x00, 0x11, 0x74,
-0x02, 0x05, 0x17, 0x63, 0x1f, 0x03, 0x2b, 0x6f, 0x72, 0x72,
-0x00, 0x3d, 0x55, 0x73, 0x65, 0x67, 0x00, 0x60, 0x74, 0x6f,
-0x00, 0x6d, 0x6f, 0x76, 0x09, 0x01, 0x51, 0x68, 0x69, 0x67,
-0x68, 0x6c, 0xfc, 0x06, 0x07, 0xfb, 0x07, 0x00, 0x93, 0x07,
-0x1f, 0x2c, 0x2f, 0x01, 0x07, 0x00, 0x3f, 0x00, 0x00, 0xa5,
-0x06, 0x01, 0x75, 0x04, 0x03, 0xc1, 0x01, 0x05, 0x48, 0x00,
-0x25, 0x65, 0x64, 0x96, 0x03, 0x14, 0x50, 0x19, 0x01, 0x50,
-0x72, 0x65, 0x74, 0x75, 0x72, 0x3f, 0x03, 0x5a, 0x67, 0x67,
-0x6c, 0x65, 0x73, 0x30, 0x00, 0x02, 0x09, 0x08, 0x00, 0x63,
-0x00, 0x11, 0x64, 0x30, 0x04, 0x02, 0x51, 0x08, 0x04, 0xa9,
-0x02, 0x02, 0x67, 0x00, 0x20, 0x6f, 0x72, 0x27, 0x03, 0x1b,
-0x6f, 0x20, 0x04, 0x07, 0xd0, 0x04, 0x60, 0x70, 0x72, 0x65,
-0x66, 0x65, 0x72, 0x0b, 0x01, 0x23, 0x69, 0x6e, 0xa5, 0x00,
-0x05, 0xd3, 0x02, 0x81, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x62,
-0x65, 0x74, 0x2b, 0x05, 0x26, 0x75, 0x74, 0xdb, 0x02, 0x51,
-0x70, 0x69, 0x63, 0x74, 0x75, 0xc6, 0x0a, 0x04, 0x6e, 0x00,
-0x02, 0xeb, 0x01, 0x31, 0x60, 0x41, 0x27, 0x13, 0x07, 0x01,
-0xae, 0x00, 0x50, 0x00, 0x62, 0x65, 0x74, 0x77, 0xbc, 0x08,
-0x00, 0xe1, 0x04, 0x04, 0x0e, 0x06, 0x05, 0x6d, 0x01, 0x29,
-0x61, 0x73, 0x79, 0x01, 0x07, 0x24, 0x00, 0x02, 0x5b, 0x03,
-0x02, 0x8a, 0x00, 0x00, 0xa9, 0x00, 0x15, 0x4c, 0x55, 0x02,
-0x02, 0x9c, 0x04, 0x33, 0x63, 0x6c, 0x75, 0x2b, 0x02, 0x00,
-0xcc, 0x00, 0x01, 0xbe, 0x05, 0x30, 0x73, 0x00, 0x64, 0xf0,
-0x0a, 0x50, 0x28, 0x67, 0x72, 0x65, 0x79, 0x11, 0x00, 0x41,
-0x6f, 0x75, 0x74, 0x29, 0x9a, 0x02, 0x24, 0x75, 0x6e, 0x24,
-0x00, 0x23, 0x69, 0x66, 0x57, 0x08, 0x71, 0x61, 0x6c, 0x72,
-0x65, 0x61, 0x64, 0x79, 0x3d, 0x00, 0x20, 0x65, 0x64, 0x61,
-0x00, 0x10, 0x28, 0x1a, 0x03, 0x01, 0xf0, 0x00, 0x01, 0x2f,
-0x02, 0x92, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x49, 0x02, 0x13, 0x73, 0xd8, 0x07, 0x36, 0x32, 0x2e,
-0x31, 0x2d, 0x0a, 0x82, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61,
-0x62, 0x6c, 0x8f, 0x08, 0x44, 0x33, 0x37, 0x2e, 0x32, 0xa6,
-0x07, 0x60, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0xbc, 0x00,
-0x12, 0x20, 0x12, 0x05, 0x00, 0xc8, 0x02, 0x05, 0x14, 0x00,
-0x02, 0x42, 0x00, 0x04, 0x3d, 0x00, 0x04, 0x9d, 0x09, 0xf1,
-0x01, 0x65, 0x00, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d,
-0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x70, 0x00, 0x03,
-0x57, 0x07, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00,
-0x6d, 0x65, 0x6e, 0x75, 0xac, 0x00, 0x91, 0x57, 0x69, 0x64,
-0x74, 0x68, 0x2c, 0x00, 0x48, 0x65, 0x01, 0x02, 0x51, 0x00,
-0x00, 0x53, 0x69, 0x7a, 0x5e, 0x07, 0x01, 0x0b, 0x0a, 0x14,
-0x69, 0x6a, 0x04, 0x01, 0x38, 0x01, 0x40, 0x44, 0x69, 0x66,
-0x66, 0xc9, 0x04, 0x63, 0x74, 0x79, 0x00, 0x00, 0x00, 0x43,
-0x3d, 0x08, 0x01, 0x54, 0x00, 0x16, 0x64, 0x1a, 0x00, 0x04,
-0xa6, 0x0a, 0x50, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x82, 0x02,
-0x80, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2e, 0x00,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x19, 0x00, 0x00, 0x00,
+0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69,
+0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
+0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d, 0x65, 0x11, 0x00, 0xf3,
+0x16, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x63, 0x6f, 0x6e,
+0x74, 0x61, 0x69, 0x6e, 0x00, 0x64, 0x69, 0x61, 0x67, 0x6f,
+0x6e, 0x61, 0x6c, 0x00, 0x6d, 0x69, 0x72, 0x72, 0x6f, 0x72,
+0x73, 0x2e, 0x00, 0x45, 0x76, 0x65, 0x72, 0x79, 0x37, 0x00,
+0x03, 0x2d, 0x00, 0x83, 0x69, 0x73, 0x00, 0x6e, 0x6f, 0x74,
+0x00, 0x61, 0x25, 0x00, 0xf1, 0x08, 0x00, 0x6d, 0x75, 0x73,
+0x74, 0x00, 0x62, 0x65, 0x00, 0x66, 0x69, 0x6c, 0x6c, 0x65,
+0x64, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x6f, 0x6e, 0x5e,
+0x00, 0xb0, 0x74, 0x68, 0x72, 0x65, 0x65, 0x00, 0x74, 0x79,
+0x70, 0x65, 0x73, 0x0f, 0x00, 0x11, 0x75, 0xb3, 0x00, 0x90,
+0x00, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x98,
+0x00, 0xf2, 0x12, 0x68, 0x6f, 0x73, 0x74, 0x2c, 0x00, 0x61,
+0x00, 0x76, 0x61, 0x6d, 0x70, 0x69, 0x72, 0x65, 0x2c, 0x00,
+0x6f, 0x72, 0x00, 0x61, 0x00, 0x7a, 0x6f, 0x6d, 0x62, 0x69,
+0x65, 0x2e, 0x00, 0x00, 0x00, 0x56, 0x18, 0x00, 0x50, 0x73,
+0x00, 0x63, 0x61, 0x6e, 0x65, 0x00, 0x30, 0x73, 0x65, 0x65,
+0xa7, 0x00, 0xb1, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x2c,
+0x00, 0x62, 0x75, 0x74, 0xe8, 0x00, 0x80, 0x69, 0x6e, 0x76,
+0x69, 0x73, 0x69, 0x62, 0x6c, 0xa4, 0x00, 0xf6, 0x00, 0x65,
+0x6e, 0x00, 0x72, 0x65, 0x66, 0x6c, 0x65, 0x63, 0x74, 0x65,
+0x64, 0x00, 0x69, 0x6e, 0xcc, 0x00, 0x10, 0x47, 0x6d, 0x00,
+0x11, 0x73, 0x30, 0x00, 0xf0, 0x08, 0x74, 0x68, 0x65, 0x00,
+0x6f, 0x70, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x65, 0x00, 0x77,
+0x61, 0x79, 0x00, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x18,
+0x00, 0x19, 0x79, 0x6b, 0x00, 0x06, 0x40, 0x00, 0x0f, 0x6d,
+0x00, 0x06, 0x95, 0x6c, 0x6f, 0x6f, 0x6b, 0x65, 0x64, 0x00,
+0x61, 0x74, 0x98, 0x00, 0x31, 0x2e, 0x00, 0x5a, 0xc1, 0x00,
+0x02, 0x6c, 0x00, 0x04, 0x2d, 0x00, 0xd7, 0x62, 0x79, 0x00,
+0x61, 0x6e, 0x79, 0x00, 0x6d, 0x65, 0x61, 0x6e, 0x73, 0x2e,
+0xa4, 0x01, 0x91, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x74, 0x6f,
+0x6c, 0x64, 0x96, 0x00, 0xc0, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x34, 0x01, 0x41,
+0x65, 0x61, 0x63, 0x68, 0x42, 0x01, 0x00, 0x0d, 0x00, 0x03,
+0x3a, 0x01, 0x00, 0x96, 0x00, 0x00, 0x2c, 0x00, 0x00, 0xd6,
+0x01, 0x30, 0x2e, 0x00, 0x41, 0x40, 0x00, 0x11, 0x61, 0xc1,
+0x00, 0x01, 0x16, 0x00, 0x33, 0x65, 0x64, 0x67, 0x7d, 0x01,
+0x12, 0x65, 0xf8, 0x01, 0x01, 0xbb, 0x01, 0x63, 0x72, 0x69,
+0x74, 0x74, 0x65, 0x6e, 0x59, 0x00, 0x24, 0x73, 0x2c, 0xcc,
+0x01, 0xd1, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x00,
+0x68, 0x6f, 0x77, 0x00, 0x6d, 0x9f, 0x00, 0x02, 0x63, 0x00,
+0x1a, 0x73, 0x06, 0x01, 0x51, 0x66, 0x00, 0x79, 0x6f, 0x75,
+0xea, 0x00, 0x57, 0x00, 0x69, 0x6e, 0x74, 0x6f, 0x5c, 0x00,
+0xa0, 0x6c, 0x6f, 0x6e, 0x67, 0x00, 0x61, 0x00, 0x72, 0x6f,
+0x77, 0xbb, 0x01, 0xf1, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+0x6e, 0x00, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67,
+0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x74, 0x68, 0x61, 0x74,
+0x00, 0x6c, 0x01, 0x9d, 0x69, 0x6f, 0x6e, 0x2e, 0x00, 0x28,
+0x54, 0x68, 0x65, 0x6a, 0x02, 0x01, 0xa5, 0x00, 0x03, 0xb7,
+0x01, 0xf1, 0x05, 0x69, 0x76, 0x65, 0x00, 0x6f, 0x6e, 0x00,
+0x62, 0x6f, 0x74, 0x68, 0x00, 0x73, 0x69, 0x64, 0x65, 0x73,
+0x2e, 0x00, 0x49, 0x81, 0x00, 0x17, 0x72, 0xd9, 0x01, 0x22,
+0x6c, 0x69, 0x63, 0x02, 0xd1, 0x73, 0x69, 0x67, 0x68, 0x74,
+0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73, 0x98, 0x00,
+0x45, 0x73, 0x61, 0x6d, 0x65, 0x2a, 0x01, 0x21, 0x6d, 0x6f,
+0xee, 0x01, 0x81, 0x61, 0x6e, 0x00, 0x6f, 0x6e, 0x63, 0x65,
+0x2c, 0x21, 0x00, 0x03, 0x5d, 0x01, 0xd3, 0x77, 0x69, 0x6c,
+0x6c, 0x00, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x00, 0x69, 0x74,
+0x68, 0x01, 0x30, 0x69, 0x6d, 0x65, 0x0d, 0x00, 0x24, 0x69,
+0x73, 0xb6, 0x01, 0x11, 0x2c, 0xec, 0x02, 0x10, 0x6a, 0xe3,
+0x02, 0x00, 0x41, 0x00, 0xf2, 0x01, 0x2e, 0x29, 0x00, 0x00,
+0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a,
+0x6c, 0x65, 0x9a, 0x01, 0x30, 0x77, 0x61, 0x73, 0x15, 0x02,
+0x20, 0x65, 0x6e, 0x99, 0x00, 0xf1, 0x01, 0x62, 0x79, 0x00,
+0x44, 0x61, 0x76, 0x69, 0x64, 0x00, 0x4d, 0x69, 0x6c, 0x6c,
+0x61, 0x72, 0x2c, 0xf6, 0x02, 0x12, 0x72, 0x79, 0x00, 0x00,
+0x9a, 0x00, 0x41, 0x60, 0x48, 0x61, 0x75, 0x29, 0x00, 0x12,
+0x4d, 0x3f, 0x03, 0xf3, 0x03, 0x4d, 0x61, 0x7a, 0x65, 0x27,
+0x2e, 0x00, 0x53, 0x65, 0x65, 0x00, 0x5b, 0x32, 0x30, 0x5d,
+0x00, 0x66, 0x6f, 0xb6, 0x00, 0x61, 0x64, 0x65, 0x74, 0x61,
+0x69, 0x6c, 0x2b, 0x02, 0x02, 0xec, 0x03, 0x01, 0x68, 0x00,
+0x00, 0xab, 0x03, 0x40, 0x72, 0x69, 0x62, 0x75, 0x42, 0x00,
+0x01, 0x89, 0x01, 0x20, 0x69, 0x73, 0x76, 0x01, 0x01, 0x38,
+0x01, 0x20, 0x6f, 0x6e, 0x7e, 0x00, 0xd0, 0x53, 0x74, 0x65,
+0x66, 0x66, 0x65, 0x6e, 0x00, 0x42, 0x61, 0x75, 0x65, 0x72,
+0x3e, 0x00, 0x01, 0x57, 0x00, 0xf4, 0x29, 0x68, 0x74, 0x74,
+0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6a, 0x61,
+0x6e, 0x6b, 0x6f, 0x2e, 0x61, 0x74, 0x2f, 0x52, 0x61, 0x65,
+0x74, 0x73, 0x65, 0x6c, 0x2f, 0x53, 0x70, 0x75, 0x6b, 0x73,
+0x63, 0x68, 0x6c, 0x6f, 0x73, 0x73, 0x2f, 0x69, 0x6e, 0x64,
+0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0x00, 0x00, 0x33,
+0x37, 0x2e, 0x31, 0x68, 0x04, 0x01, 0x78, 0x00, 0x46, 0x6f,
+0x6c, 0x73, 0x20, 0x8f, 0x00, 0xe3, 0x68, 0x61, 0x73, 0x00,
+0x61, 0x00, 0x73, 0x69, 0x6d, 0x69, 0x6c, 0x61, 0x72, 0x00,
+0x21, 0x00, 0x70, 0x00, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d,
+0x9c, 0x00, 0xf0, 0x08, 0x53, 0x6f, 0x6c, 0x6f, 0x2c, 0x00,
+0x55, 0x6e, 0x65, 0x71, 0x75, 0x61, 0x6c, 0x00, 0x61, 0x6e,
+0x64, 0x00, 0x4b, 0x65, 0x65, 0x6e, 0x2e, 0x42, 0x01, 0x63,
+0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x49, 0x00, 0x71, 0x2c,
+0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x23, 0x01, 0x40, 0x6d,
+0x6f, 0x75, 0x73, 0x62, 0x03, 0x01, 0x2b, 0x03, 0x45, 0x65,
+0x6d, 0x70, 0x74, 0x7d, 0x04, 0x12, 0x61, 0xdf, 0x02, 0x12,
+0x6e, 0x73, 0x01, 0x60, 0x61, 0x00, 0x6c, 0x65, 0x74, 0x74,
+0x23, 0x03, 0x15, 0x72, 0x2d, 0x03, 0x02, 0x15, 0x03, 0x84,
+0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0xdc, 0x02,
+0x00, 0x87, 0x02, 0x01, 0x59, 0x03, 0x0a, 0x44, 0x03, 0x50,
+0x3a, 0x00, 0x60, 0x47, 0x27, 0x3e, 0x00, 0x31, 0x60, 0x31,
+0x27, 0x74, 0x01, 0x05, 0x8d, 0x04, 0x22, 0x60, 0x56, 0x18,
+0x00, 0x14, 0x32, 0x18, 0x00, 0x08, 0x9c, 0x04, 0x22, 0x60,
+0x5a, 0x1d, 0x00, 0x14, 0x33, 0x1d, 0x00, 0x04, 0xab, 0x04,
+0x12, 0x49, 0x23, 0x03, 0x41, 0x6d, 0x61, 0x6b, 0x65, 0x1b,
+0x05, 0x5e, 0x73, 0x74, 0x61, 0x6b, 0x65, 0xda, 0x00, 0x03,
+0xba, 0x03, 0x50, 0x69, 0x6e, 0x63, 0x6f, 0x72, 0x2d, 0x04,
+0x08, 0xde, 0x00, 0xb0, 0x70, 0x72, 0x65, 0x73, 0x73, 0x00,
+0x53, 0x70, 0x61, 0x63, 0x65, 0x3f, 0x01, 0x50, 0x63, 0x6c,
+0x65, 0x61, 0x72, 0x8e, 0x02, 0x20, 0x61, 0x67, 0x9c, 0x05,
+0x62, 0x28, 0x6f, 0x72, 0x00, 0x75, 0x73, 0xbb, 0x04, 0xd0,
+0x55, 0x6e, 0x64, 0x6f, 0x00, 0x66, 0x65, 0x61, 0x74, 0x75,
+0x72, 0x65, 0x29, 0x51, 0x01, 0x03, 0x7e, 0x00, 0x10, 0x72,
+0x0d, 0x03, 0x12, 0x2d, 0x74, 0x00, 0x00, 0x44, 0x01, 0x0f,
+0x3c, 0x01, 0x15, 0x02, 0x18, 0x03, 0x01, 0x93, 0x00, 0x50,
+0x73, 0x70, 0x6f, 0x6e, 0x64, 0x34, 0x01, 0x04, 0x42, 0x03,
+0x01, 0x27, 0x03, 0x00, 0x09, 0x04, 0x31, 0x68, 0x6f, 0x77,
+0x10, 0x05, 0xb3, 0x72, 0x65, 0x64, 0x75, 0x63, 0x65, 0x64,
+0x00, 0x73, 0x69, 0x7a, 0xd0, 0x00, 0x14, 0x61, 0xc7, 0x00,
+0x21, 0x2c, 0x00, 0x13, 0x02, 0xe1, 0x60, 0x70, 0x65, 0x6e,
+0x63, 0x69, 0x6c, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x27, 0x2e,
+0xe9, 0x04, 0x00, 0x4e, 0x04, 0x57, 0x68, 0x61, 0x76, 0x65,
+0x00, 0x1b, 0x00, 0x12, 0x73, 0xec, 0x02, 0x65, 0x75, 0x6c,
+0x74, 0x69, 0x70, 0x6c, 0xb3, 0x03, 0x00, 0x4b, 0x03, 0x06,
+0xc8, 0x03, 0x02, 0x58, 0x00, 0x34, 0x2e, 0x00, 0x41, 0xcb,
+0x00, 0x03, 0xab, 0x06, 0x11, 0x69, 0x76, 0x04, 0x51, 0x66,
+0x75, 0x6c, 0x6c, 0x2d, 0x88, 0x00, 0x04, 0xae, 0x00, 0x31,
+0x63, 0x61, 0x6e, 0x9d, 0x06, 0x00, 0x14, 0x05, 0x04, 0xd6,
+0x06, 0x08, 0x73, 0x00, 0x01, 0x7e, 0x02, 0x00, 0xbd, 0x04,
+0x00, 0x5d, 0x00, 0x30, 0x70, 0x61, 0x79, 0xcc, 0x06, 0x20,
+0x00, 0x61, 0x1b, 0x05, 0x01, 0x3f, 0x03, 0x29, 0x74, 0x6f,
+0x2e, 0x00, 0x00, 0x28, 0x07, 0x40, 0x00, 0x65, 0x78, 0x61,
+0xd5, 0x05, 0x20, 0x00, 0x77, 0xe8, 0x00, 0x00, 0x66, 0x01,
+0x03, 0x86, 0x01, 0x11, 0x6d, 0xbf, 0x00, 0x50, 0x69, 0x73,
+0x00, 0x75, 0x70, 0x38, 0x00, 0x63, 0x79, 0x6f, 0x75, 0x3a,
+0x00, 0x79, 0xeb, 0x00, 0x05, 0x23, 0x00, 0x70, 0x61, 0x73,
+0x00, 0x72, 0x65, 0x6d, 0x69, 0x03, 0x04, 0x12, 0x73, 0x2a,
+0x01, 0x30, 0x61, 0x00, 0x70, 0x1d, 0x05, 0x20, 0x63, 0x75,
+0x35, 0x03, 0x03, 0xd5, 0x00, 0x50, 0x6e, 0x65, 0x65, 0x64,
+0x73, 0x45, 0x00, 0x10, 0x62, 0x05, 0x05, 0x91, 0x2d, 0x65,
+0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x64, 0x73, 0x04, 0x01,
+0x54, 0x00, 0x42, 0x6b, 0x6e, 0x6f, 0x77, 0x16, 0x04, 0x4b,
+0x61, 0x62, 0x6f, 0x75, 0x45, 0x00, 0x03, 0xfc, 0x00, 0x01,
+0xa0, 0x02, 0x0f, 0x81, 0x00, 0x01, 0x20, 0x6c, 0x69, 0xf7,
+0x06, 0x03, 0x12, 0x06, 0x32, 0x70, 0x6f, 0x73, 0x8f, 0x06,
+0x07, 0x4c, 0x06, 0x13, 0x61, 0x28, 0x08, 0x04, 0xc5, 0x01,
+0x20, 0x6f, 0x72, 0x7f, 0x03, 0x20, 0x74, 0x68, 0x65, 0x01,
+0x32, 0x65, 0x6c, 0x73, 0x83, 0x00, 0x93, 0x66, 0x65, 0x65,
+0x6c, 0x00, 0x6c, 0x69, 0x6b, 0x65, 0xc1, 0x03, 0x51, 0x65,
+0x72, 0x61, 0x73, 0x65, 0x00, 0x04, 0x39, 0x6e, 0x67, 0x6c,
+0xd8, 0x01, 0x1c, 0x2c, 0x88, 0x02, 0x01, 0xce, 0x01, 0x07,
+0x8a, 0x02, 0x00, 0x85, 0x02, 0x05, 0xe2, 0x01, 0x0d, 0xc8,
+0x03, 0x01, 0xef, 0x02, 0x00, 0x65, 0x00, 0x3a, 0x41, 0x6c,
+0x6c, 0x2f, 0x02, 0x09, 0xd3, 0x02, 0x22, 0x72, 0x65, 0x83,
+0x00, 0x12, 0x64, 0x86, 0x07, 0x01, 0xa0, 0x06, 0x24, 0x65,
+0x66, 0x76, 0x00, 0x05, 0x68, 0x00, 0x15, 0x61, 0xe9, 0x00,
+0x02, 0x69, 0x00, 0x01, 0xde, 0x00, 0x0f, 0x32, 0x00, 0x05,
+0x07, 0x82, 0x03, 0x31, 0x2e, 0x00, 0x52, 0xc5, 0x00, 0x02,
+0xc2, 0x03, 0x01, 0x6f, 0x02, 0x04, 0x21, 0x00, 0x00, 0x0d,
+0x00, 0x11, 0x73, 0xa6, 0x03, 0x01, 0x1c, 0x03, 0x01, 0x6c,
+0x02, 0x02, 0x0e, 0x01, 0x0c, 0x6a, 0x02, 0x12, 0x41, 0xe3,
+0x02, 0x02, 0x09, 0x05, 0x01, 0x63, 0x03, 0x50, 0x75, 0x72,
+0x73, 0x6f, 0x72, 0xa4, 0x04, 0x05, 0x61, 0x07, 0x22, 0x75,
+0x73, 0xa7, 0x08, 0x62, 0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e,
+0xc6, 0x05, 0x01, 0x44, 0x09, 0x25, 0x74, 0x68, 0x1d, 0x01,
+0x01, 0x30, 0x00, 0x11, 0x74, 0x35, 0x05, 0x17, 0x63, 0x29,
+0x03, 0x2b, 0x6f, 0x72, 0x72, 0x00, 0x3d, 0x55, 0x73, 0x65,
+0x67, 0x00, 0x60, 0x74, 0x6f, 0x00, 0x6d, 0x6f, 0x76, 0x09,
+0x01, 0x51, 0x68, 0x69, 0x67, 0x68, 0x6c, 0x2f, 0x07, 0x07,
+0x2e, 0x08, 0x00, 0xc6, 0x07, 0x1f, 0x2c, 0x2f, 0x01, 0x07,
+0x07, 0x98, 0x01, 0x30, 0x74, 0x6f, 0x00, 0xe2, 0x06, 0x01,
+0x93, 0x04, 0x03, 0xd5, 0x01, 0x05, 0x52, 0x00, 0x25, 0x65,
+0x64, 0xaa, 0x03, 0x14, 0x50, 0x23, 0x01, 0x50, 0x72, 0x65,
+0x74, 0x75, 0x72, 0x53, 0x03, 0x5a, 0x67, 0x67, 0x6c, 0x65,
+0x73, 0x30, 0x00, 0x02, 0x46, 0x08, 0x00, 0x6d, 0x00, 0x11,
+0x64, 0x44, 0x04, 0x02, 0x8e, 0x08, 0x04, 0xbd, 0x02, 0x02,
+0x67, 0x00, 0x10, 0x6f, 0xef, 0x07, 0x2b, 0x6d, 0x6f, 0x34,
+0x04, 0x07, 0xee, 0x04, 0x60, 0x70, 0x72, 0x65, 0x66, 0x65,
+0x72, 0x15, 0x01, 0x23, 0x69, 0x6e, 0xaf, 0x00, 0x05, 0xe7,
+0x02, 0x81, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x62, 0x65, 0x74,
+0x49, 0x05, 0x26, 0x75, 0x74, 0xef, 0x02, 0x51, 0x70, 0x69,
+0x63, 0x74, 0x75, 0x03, 0x0b, 0x04, 0x6e, 0x00, 0x02, 0xf5,
+0x01, 0x31, 0x60, 0x41, 0x27, 0x50, 0x07, 0x01, 0xae, 0x00,
+0x50, 0x00, 0x62, 0x65, 0x74, 0x77, 0xf9, 0x08, 0x00, 0xf5,
+0x04, 0x04, 0x41, 0x06, 0x05, 0x77, 0x01, 0x29, 0x61, 0x73,
+0x83, 0x01, 0x07, 0x24, 0x00, 0x02, 0x6f, 0x03, 0x02, 0x8a,
+0x00, 0x00, 0xa9, 0x00, 0x15, 0x4c, 0x5f, 0x02, 0x02, 0xb0,
+0x04, 0x33, 0x63, 0x6c, 0x75, 0x35, 0x02, 0x00, 0xcc, 0x00,
+0x01, 0xdc, 0x05, 0x30, 0x73, 0x00, 0x64, 0x2d, 0x0b, 0x50,
+0x28, 0x67, 0x72, 0x65, 0x79, 0x11, 0x00, 0x41, 0x6f, 0x75,
+0x74, 0x29, 0xa4, 0x02, 0x24, 0x75, 0x6e, 0x24, 0x00, 0x23,
+0x69, 0x66, 0x94, 0x08, 0x71, 0x61, 0x6c, 0x72, 0x65, 0x61,
+0x64, 0x79, 0x3d, 0x00, 0x20, 0x65, 0x64, 0x61, 0x00, 0x10,
+0x28, 0x24, 0x03, 0x01, 0xf0, 0x00, 0x01, 0x39, 0x02, 0x92,
+0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x53,
+0x02, 0x13, 0x73, 0x15, 0x08, 0x36, 0x32, 0x2e, 0x31, 0x6a,
+0x0a, 0x82, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c,
+0xcc, 0x08, 0x44, 0x33, 0x37, 0x2e, 0x32, 0xe3, 0x07, 0x60,
+0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0xbc, 0x00, 0x12, 0x20,
+0x26, 0x05, 0x00, 0xd2, 0x02, 0x05, 0x14, 0x00, 0x02, 0x42,
+0x00, 0x04, 0x3d, 0x00, 0x04, 0xda, 0x09, 0xf1, 0x01, 0x65,
+0x00, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
+0x2e, 0x27, 0x00, 0x6f, 0x70, 0x70, 0x00, 0x03, 0x8a, 0x07,
+0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65,
+0x6e, 0x75, 0xac, 0x00, 0x91, 0x57, 0x69, 0x64, 0x74, 0x68,
+0x2c, 0x00, 0x48, 0x65, 0x01, 0x02, 0x51, 0x00, 0x00, 0x53,
+0x69, 0x7a, 0x91, 0x07, 0x01, 0x48, 0x0a, 0x14, 0x69, 0x7e,
+0x04, 0x01, 0x38, 0x01, 0x40, 0x44, 0x69, 0x66, 0x66, 0xdd,
+0x04, 0x63, 0x74, 0x79, 0x00, 0x00, 0x00, 0x43, 0x7a, 0x08,
+0x01, 0x54, 0x00, 0x16, 0x64, 0x1a, 0x00, 0x04, 0xe3, 0x0a,
+0x50, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x82, 0x02, 0x02, 0x93,
+0x09, 0x12, 0x2e, 0xd6, 0x00, 0x14, 0x33, 0xd6, 0x00, 0x52,
+0x75, 0x73, 0x65, 0x72, 0x20, 0x2b, 0x02, 0x41, 0x65, 0x6e,
+0x63, 0x65, 0xdc, 0x00, 0x20, 0x4f, 0x6e, 0x36, 0x02, 0x63,
+0x74, 0x66, 0x6f, 0x72, 0x6d, 0x73, 0xc0, 0x06, 0x70, 0x75,
+0x70, 0x70, 0x6f, 0x72, 0x74, 0x00, 0x2e, 0x00, 0x17, 0x00,
+0x2e, 0x00, 0x12, 0x2c, 0xca, 0x00, 0x16, 0x50, 0x12, 0x00,
+0x0d, 0xe6, 0x00, 0x33, 0x47, 0x61, 0x6d, 0xe6, 0x00, 0x02,
+0xdb, 0x01, 0x32, 0x6c, 0x65, 0x74, 0x5c, 0x02, 0x71, 0x6f,
+0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x27, 0x0c, 0x44, 0x74,
+0x68, 0x65, 0x72, 0x38, 0x09, 0x10, 0x75, 0xaa, 0x0a, 0x05,
+0xb0, 0x02, 0x06, 0x93, 0x02, 0x00, 0x80, 0x02, 0x20, 0x72,
+0x65, 0x8f, 0x02, 0xe0, 0x65, 0x6e, 0x74, 0x00, 0x6d, 0x6f,
+0x6e, 0x73, 0x74, 0x65, 0x72, 0x73, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3286;
-const unsigned short help_text_words = 614;
+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 8885d70c33..6bccf6bef3 100644
--- a/apps/plugins/puzzles/help/unequal.c
+++ b/apps/plugins/puzzles/help/unequal.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,255 +6,256 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 239, TEXT_CENTER | C_RED },
- { 306, TEXT_UNDERLINE },
- { 631, TEXT_CENTER | C_RED },
- { 648, TEXT_UNDERLINE },
- { 660, TEXT_UNDERLINE },
- { 668, TEXT_UNDERLINE },
+ { 240, TEXT_CENTER | C_RED },
+ { 307, TEXT_UNDERLINE },
+ { 632, TEXT_CENTER | C_RED },
+ { 649, TEXT_UNDERLINE },
+ { 661, TEXT_UNDERLINE },
+ { 669, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 3934 comp 2352 ratio 0.597865 level 10 saved 1582 */
+/* orig 3954 comp 2358 ratio 0.596358 level 10 saved 1596 */
 const char help_text[] = {
-0xf4, 0x24, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfe, 0x07, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x32, 0x37, 0x3a, 0x20, 0x55, 0x6e, 0x65, 0x71, 0x75, 0x61,
-0x6c, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x68,
-0x61, 0x76, 0x65, 0x00, 0x61, 0x00, 0x73, 0x71, 0x75, 0x61,
-0x72, 0x65, 0x00, 0x67, 0x72, 0x69, 0x64, 0x3b, 0x00, 0x65,
-0x61, 0x63, 0x68, 0x12, 0x00, 0xf1, 0x1a, 0x6d, 0x61, 0x79,
-0x00, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x00, 0x61,
-0x00, 0x64, 0x69, 0x67, 0x69, 0x74, 0x00, 0x66, 0x72, 0x6f,
-0x6d, 0x00, 0x31, 0x00, 0x74, 0x6f, 0x00, 0x74, 0x68, 0x65,
-0x00, 0x73, 0x69, 0x7a, 0x65, 0x00, 0x6f, 0x66, 0x0c, 0x00,
-0x00, 0x40, 0x00, 0xa3, 0x2c, 0x00, 0x61, 0x6e, 0x64, 0x00,
-0x73, 0x6f, 0x6d, 0x65, 0x44, 0x00, 0x12, 0x73, 0x65, 0x00,
-0x30, 0x63, 0x6c, 0x75, 0x2d, 0x00, 0xb0, 0x67, 0x6e, 0x73,
-0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x33, 0x00,
-0x20, 0x6d, 0x2e, 0x87, 0x00, 0x80, 0x72, 0x00, 0x61, 0x69,
-0x6d, 0x00, 0x69, 0x73, 0x54, 0x00, 0xe5, 0x66, 0x75, 0x6c,
-0x6c, 0x79, 0x00, 0x70, 0x6f, 0x70, 0x75, 0x6c, 0x61, 0x74,
-0x65, 0x57, 0x00, 0xf0, 0x0f, 0x00, 0x77, 0x69, 0x74, 0x68,
-0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x00, 0x73,
-0x75, 0x63, 0x68, 0x00, 0x74, 0x68, 0x61, 0x74, 0x3a, 0x00,
-0x00, 0x00, 0x2d, 0x00, 0x45, 0xb2, 0x00, 0x34, 0x72, 0x6f,
-0x77, 0xab, 0x00, 0xf1, 0x05, 0x73, 0x00, 0x6f, 0x6e, 0x6c,
-0x79, 0x00, 0x6f, 0x6e, 0x65, 0x00, 0x6f, 0x63, 0x63, 0x75,
-0x72, 0x72, 0x65, 0x6e, 0x63, 0xa5, 0x00, 0x01, 0xdb, 0x00,
-0x02, 0xc6, 0x00, 0x05, 0x38, 0x00, 0x6f, 0x63, 0x6f, 0x6c,
-0x75, 0x6d, 0x6e, 0x3b, 0x00, 0x1d, 0x31, 0x41, 0x6c, 0x6c,
-0x9c, 0x00, 0x07, 0xd7, 0x00, 0x00, 0x30, 0x01, 0xf1, 0x03,
-0x73, 0x61, 0x74, 0x69, 0x73, 0x66, 0x69, 0x65, 0x64, 0x2e,
-0x00, 0x00, 0x00, 0x54, 0x68, 0x65, 0x72, 0x65, 0x17, 0x00,
-0xf3, 0x0b, 0x74, 0x77, 0x6f, 0x00, 0x6d, 0x6f, 0x64, 0x65,
-0x73, 0x00, 0x66, 0x6f, 0x72, 0x00, 0x74, 0x68, 0x69, 0x73,
-0x00, 0x67, 0x61, 0x6d, 0x65, 0x2c, 0x00, 0x60, 0x90, 0x01,
-0x11, 0x27, 0x36, 0x01, 0xa0, 0x60, 0x41, 0x64, 0x6a, 0x61,
-0x63, 0x65, 0x6e, 0x74, 0x27, 0x3f, 0x00, 0x27, 0x49, 0x6e,
-0x1f, 0x00, 0x00, 0x3e, 0x00, 0x1e, 0x2c, 0x72, 0x00, 0x00,
-0x1d, 0x01, 0xf1, 0x0e, 0x65, 0x61, 0x74, 0x65, 0x72, 0x2d,
-0x74, 0x68, 0x61, 0x6e, 0x00, 0x73, 0x79, 0x6d, 0x62, 0x6f,
-0x6c, 0x73, 0x00, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74,
-0x69, 0x6e, 0x67, 0xca, 0x00, 0x02, 0x89, 0x01, 0x50, 0x27,
-0x73, 0x00, 0x76, 0x61, 0x3d, 0x00, 0x24, 0x69, 0x73, 0x36,
-0x00, 0x11, 0x00, 0x36, 0x00, 0xf0, 0x01, 0x69, 0x74, 0x73,
-0x00, 0x6e, 0x65, 0x69, 0x67, 0x68, 0x62, 0x6f, 0x75, 0x72,
-0x27, 0x73, 0x2e, 0x7a, 0x00, 0x01, 0xa4, 0x00, 0x00, 0x75,
-0x00, 0x81, 0x00, 0x6e, 0x6f, 0x74, 0x00, 0x61, 0x6c, 0x6c,
-0x78, 0x00, 0x11, 0x73, 0x11, 0x02, 0xf0, 0x18, 0x62, 0x65,
-0x00, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x2c, 0x00,
-0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x75, 0x6c, 0x61, 0x72,
-0x6c, 0x79, 0x00, 0x61, 0x74, 0x00, 0x68, 0x69, 0x67, 0x68,
-0x65, 0x72, 0x00, 0x64, 0x69, 0x66, 0x66, 0x17, 0x00, 0x94,
-0x74, 0x79, 0x00, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73, 0xd1,
-0x00, 0x05, 0xe2, 0x00, 0x0f, 0xd2, 0x00, 0x07, 0x3f, 0x62,
-0x61, 0x72, 0xc2, 0x00, 0x10, 0x90, 0x6e, 0x75, 0x6d, 0x65,
-0x72, 0x69, 0x63, 0x61, 0x6c, 0x78, 0x00, 0x03, 0x55, 0x00,
-0x61, 0x00, 0x28, 0x69, 0x2e, 0x65, 0x2e, 0x31, 0x00, 0x03,
-0x88, 0x00, 0x21, 0x6f, 0x72, 0x0e, 0x00, 0x6f, 0x6c, 0x6f,
-0x77, 0x65, 0x72, 0x29, 0xee, 0x00, 0x00, 0x0b, 0xec, 0x00,
-0x06, 0xe8, 0x00, 0x20, 0x61, 0x72, 0x0e, 0x00, 0x44, 0x77,
-0x61, 0x79, 0x73, 0xec, 0x00, 0x54, 0x3a, 0x00, 0x61, 0x62,
-0x73, 0x0e, 0x02, 0x10, 0x61, 0xa6, 0x00, 0xb1, 0x00, 0x74,
-0x68, 0x75, 0x73, 0x00, 0x6d, 0x65, 0x61, 0x6e, 0x73, 0x8d,
-0x02, 0x2f, 0x00, 0x61, 0xa8, 0x00, 0x00, 0xa1, 0x64, 0x65,
-0x66, 0x69, 0x6e, 0x69, 0x74, 0x65, 0x6c, 0x79, 0x4a, 0x01,
-0x0f, 0xb7, 0x00, 0x02, 0x22, 0x74, 0x6f, 0x40, 0x00, 0x09,
-0x85, 0x01, 0x02, 0x30, 0x01, 0x50, 0x54, 0x72, 0x69, 0x76,
-0x69, 0x01, 0x02, 0x0c, 0x52, 0x01, 0xa0, 0x00, 0x28, 0x61,
-0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x8e, 0x01, 0x11,
-0x61, 0x49, 0x01, 0x81, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f,
-0x6d, 0x27, 0x5d, 0x02, 0xf1, 0x00, 0x00, 0x74, 0x79, 0x70,
-0x65, 0x00, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72,
-0x29, 0x6b, 0x01, 0x03, 0x8f, 0x02, 0x2b, 0x6e, 0x6f, 0x37,
-0x02, 0x01, 0x7c, 0x01, 0x1c, 0x69, 0x70, 0x02, 0x11, 0x3b,
-0x55, 0x00, 0x63, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x9e,
-0x03, 0x42, 0x73, 0x6f, 0x6c, 0x76, 0x95, 0x03, 0x10, 0x4c,
-0x9d, 0x01, 0x04, 0x27, 0x04, 0x00, 0x34, 0x03, 0x00, 0xb2,
-0x00, 0x21, 0x41, 0x74, 0x1c, 0x00, 0x31, 0x74, 0x69, 0x6d,
-0x26, 0x01, 0x30, 0x77, 0x72, 0x69, 0xc2, 0x01, 0x02, 0xe6,
-0x01, 0x0a, 0x5c, 0x00, 0x02, 0x33, 0x04, 0x27, 0x69, 0x73,
-0x5f, 0x00, 0x60, 0x61, 0x70, 0x70, 0x65, 0x61, 0x72, 0xf2,
-0x01, 0x21, 0x69, 0x6e, 0x32, 0x00, 0xf1, 0x06, 0x47, 0x75,
-0x61, 0x72, 0x64, 0x69, 0x61, 0x6e, 0x00, 0x77, 0x65, 0x65,
-0x6b, 0x6c, 0x79, 0x00, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x1a,
-0x00, 0x10, 0x6e, 0xe0, 0x00, 0xa1, 0x60, 0x46, 0x75, 0x74,
-0x6f, 0x73, 0x68, 0x69, 0x6b, 0x69, 0x2f, 0x03, 0x03, 0x5f,
-0x00, 0x41, 0x00, 0x77, 0x61, 0x73, 0xcd, 0x03, 0x72, 0x72,
-0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x5d, 0x01, 0x20, 0x69,
-0x73, 0xe8, 0x03, 0x00, 0x0b, 0x01, 0xf1, 0x03, 0x69, 0x6f,
-0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73,
-0x00, 0x48, 0x61, 0x72, 0x76, 0x65, 0xba, 0x00, 0x45, 0x32,
-0x37, 0x2e, 0x31, 0x1d, 0x05, 0x01, 0x3f, 0x00, 0x47, 0x6f,
-0x6c, 0x73, 0x20, 0x57, 0x00, 0x21, 0x73, 0x68, 0xcc, 0x04,
-0x10, 0x6d, 0x7a, 0x04, 0x21, 0x6f, 0x66, 0x46, 0x02, 0x03,
-0x27, 0x00, 0x72, 0x00, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d,
-0xa2, 0x04, 0x41, 0x53, 0x6f, 0x6c, 0x6f, 0xfc, 0x03, 0x64,
-0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x3f, 0x00, 0xe1, 0x2c,
-0x00, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c,
-0x69, 0x63, 0x6b, 0xc4, 0x00, 0x60, 0x6d, 0x6f, 0x75, 0x73,
-0x65, 0x00, 0x58, 0x05, 0x84, 0x6e, 0x79, 0x00, 0x65, 0x6d,
-0x70, 0x74, 0x79, 0x4e, 0x01, 0x00, 0x0b, 0x04, 0x42, 0x74,
-0x68, 0x65, 0x6e, 0xc2, 0x01, 0x04, 0x77, 0x05, 0x70, 0x6f,
-0x72, 0x00, 0x6c, 0x65, 0x74, 0x74, 0xd5, 0x02, 0x02, 0x1f,
-0x01, 0x81, 0x6b, 0x65, 0x79, 0x62, 0x6f, 0x61, 0x72, 0x64,
-0x36, 0x05, 0x32, 0x69, 0x6c, 0x6c, 0x44, 0x02, 0x02, 0x44,
-0x00, 0xc0, 0x2e, 0x00, 0x49, 0x66, 0x00, 0x79, 0x6f, 0x75,
-0x00, 0x6d, 0x61, 0x6b, 0x43, 0x00, 0x8e, 0x6d, 0x69, 0x73,
-0x74, 0x61, 0x6b, 0x65, 0x2c, 0x80, 0x00, 0x02, 0x4c, 0x00,
-0x98, 0x69, 0x6e, 0x63, 0x6f, 0x72, 0x72, 0x65, 0x63, 0x74,
-0x84, 0x00, 0xb0, 0x70, 0x72, 0x65, 0x73, 0x73, 0x00, 0x53,
-0x70, 0x61, 0x63, 0x65, 0x64, 0x00, 0xb0, 0x63, 0x6c, 0x65,
-0x61, 0x72, 0x00, 0x69, 0x74, 0x00, 0x61, 0x67, 0x0f, 0x06,
-0x62, 0x28, 0x6f, 0x72, 0x00, 0x75, 0x73, 0x0d, 0x02, 0xd1,
-0x55, 0x6e, 0x64, 0x6f, 0x00, 0x66, 0x65, 0x61, 0x74, 0x75,
-0x72, 0x65, 0x29, 0xbb, 0x02, 0x02, 0x7e, 0x00, 0x62, 0x72,
-0x69, 0x67, 0x68, 0x74, 0x2d, 0x74, 0x00, 0x01, 0x42, 0x06,
-0x0f, 0xe2, 0x00, 0x04, 0x02, 0xd8, 0x05, 0x13, 0x2c, 0x06,
-0x03, 0x01, 0x0d, 0x00, 0x20, 0x00, 0x77, 0xd3, 0x00, 0xa4,
-0x62, 0x65, 0x00, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x65, 0x64,
-0xaa, 0x00, 0x04, 0x42, 0x00, 0xf1, 0x03, 0x73, 0x00, 0x61,
-0x00, 0x60, 0x70, 0x65, 0x6e, 0x63, 0x69, 0x6c, 0x00, 0x6d,
-0x61, 0x72, 0x6b, 0x27, 0x2e, 0xd1, 0x06, 0x32, 0x63, 0x61,
-0x6e, 0x70, 0x06, 0x07, 0x1b, 0x00, 0x02, 0x76, 0x05, 0x85,
-0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x65, 0x45, 0x06,
-0x04, 0x51, 0x00, 0x00, 0x4c, 0x02, 0x04, 0x36, 0x01, 0x13,
-0x53, 0xb3, 0x06, 0x03, 0x0e, 0x06, 0x00, 0x8d, 0x02, 0x00,
-0x5b, 0x01, 0x55, 0x65, 0x64, 0x2d, 0x69, 0x6e, 0x39, 0x00,
-0x32, 0x63, 0x61, 0x6e, 0x15, 0x05, 0x25, 0x73, 0x6f, 0x1d,
-0x07, 0x08, 0x6f, 0x00, 0x03, 0xfc, 0x05, 0x02, 0x86, 0x03,
-0x10, 0x70, 0x43, 0x04, 0x81, 0x6e, 0x6f, 0x00, 0x61, 0x74,
-0x74, 0x65, 0x6e, 0x7e, 0x02, 0x29, 0x74, 0x6f, 0x2e, 0x00,
-0xe0, 0x2c, 0x00, 0x73, 0x6f, 0x00, 0x65, 0x78, 0x61, 0x63,
-0x74, 0x6c, 0x79, 0x00, 0x77, 0x01, 0x01, 0x00, 0x3a, 0x01,
-0x03, 0x5a, 0x01, 0x11, 0x6d, 0xbb, 0x00, 0x50, 0x69, 0x73,
-0x00, 0x75, 0x70, 0x38, 0x00, 0x63, 0x79, 0x6f, 0x75, 0x3a,
-0x00, 0x79, 0xe7, 0x00, 0x05, 0x23, 0x00, 0x70, 0x61, 0x73,
-0x00, 0x72, 0x65, 0x6d, 0x69, 0x1e, 0x03, 0x05, 0x89, 0x04,
-0x06, 0x98, 0x05, 0x04, 0x32, 0x01, 0x41, 0x6e, 0x65, 0x65,
-0x64, 0xc4, 0x03, 0xf0, 0x01, 0x62, 0x65, 0x00, 0x72, 0x65,
-0x2d, 0x65, 0x78, 0x61, 0x6d, 0x69, 0x6e, 0x65, 0x64, 0x00,
-0x6f, 0xd3, 0x04, 0x00, 0x54, 0x00, 0x70, 0x6b, 0x6e, 0x6f,
-0x77, 0x00, 0x6d, 0x6f, 0x5d, 0x01, 0x3b, 0x62, 0x6f, 0x75,
-0x45, 0x00, 0x04, 0xa2, 0x01, 0x2f, 0x6f, 0x72, 0x80, 0x00,
-0x02, 0x54, 0x6c, 0x69, 0x73, 0x74, 0x73, 0x07, 0x08, 0x31,
-0x70, 0x6f, 0x73, 0x32, 0x05, 0x08, 0x6a, 0x01, 0x64, 0x61,
-0x00, 0x67, 0x69, 0x76, 0x65, 0x31, 0x04, 0x01, 0x48, 0x00,
-0x50, 0x61, 0x6e, 0x79, 0x74, 0x68, 0x62, 0x01, 0x32, 0x65,
-0x6c, 0x73, 0x82, 0x00, 0x93, 0x66, 0x65, 0x65, 0x6c, 0x00,
-0x6c, 0x69, 0x6b, 0x65, 0x42, 0x03, 0x41, 0x65, 0x72, 0x61,
-0x73, 0x9f, 0x08, 0x49, 0x69, 0x6e, 0x67, 0x6c, 0xd3, 0x01,
-0x1c, 0x2c, 0x5b, 0x02, 0x08, 0x1b, 0x02, 0x22, 0x6e, 0x64,
-0x58, 0x02, 0x05, 0xde, 0x01, 0x03, 0x52, 0x02, 0x01, 0xb8,
-0x02, 0x01, 0xa7, 0x04, 0x2a, 0x6c, 0x6c, 0x20, 0x02, 0x09,
-0x9c, 0x02, 0x22, 0x72, 0x65, 0x79, 0x00, 0x30, 0x64, 0x00,
-0x77, 0xa3, 0x02, 0x00, 0x99, 0x00, 0x34, 0x6c, 0x65, 0x66,
-0x6c, 0x00, 0x05, 0x5e, 0x00, 0x18, 0x61, 0x14, 0x01, 0x0f,
-0x2a, 0x00, 0x05, 0x02, 0x43, 0x03, 0x10, 0x73, 0x43, 0x03,
-0x36, 0x2e, 0x00, 0x52, 0xb3, 0x00, 0x00, 0xf7, 0x00, 0x05,
-0x20, 0x00, 0x00, 0x0d, 0x00, 0x01, 0x23, 0x00, 0x02, 0xf4,
-0x02, 0x01, 0x58, 0x02, 0x02, 0xfb, 0x00, 0x0c, 0x56, 0x02,
-0x12, 0x41, 0xcb, 0x02, 0x00, 0x65, 0x04, 0x03, 0x3b, 0x07,
-0x50, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x0b, 0x04, 0x01, 0x97,
-0x02, 0x00, 0xdc, 0x01, 0x22, 0x75, 0x73, 0x2d, 0x03, 0x62,
-0x63, 0x6f, 0x6e, 0x6a, 0x75, 0x6e, 0xf1, 0x04, 0x01, 0x9b,
-0x04, 0x00, 0x30, 0x00, 0x02, 0x4b, 0x04, 0x01, 0x2f, 0x00,
-0x00, 0xce, 0x05, 0x25, 0x65, 0x74, 0xa4, 0x01, 0x2b, 0x6f,
-0x72, 0x6e, 0x00, 0x04, 0x4e, 0x03, 0x01, 0x8f, 0x00, 0x04,
-0xe9, 0x03, 0x30, 0x60, 0x4d, 0x27, 0x3e, 0x00, 0x00, 0x3d,
-0x00, 0x51, 0x61, 0x75, 0x74, 0x6f, 0x2d, 0x78, 0x04, 0x54,
-0x65, 0x76, 0x65, 0x72, 0x79, 0xda, 0x06, 0xc1, 0x00, 0x68,
-0x69, 0x6e, 0x74, 0x2c, 0x00, 0x72, 0x65, 0x61, 0x64, 0x79,
-0xad, 0x00, 0x72, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c,
-0xa6, 0x02, 0x61, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x33,
-0x01, 0x01, 0x4f, 0x00, 0x15, 0x48, 0x4f, 0x00, 0x26, 0x64,
-0x6f, 0xb0, 0x01, 0x23, 0x62, 0x75, 0x5e, 0x03, 0x22, 0x74,
-0x6f, 0x3f, 0x00, 0x02, 0x9a, 0x07, 0x71, 0x6f, 0x62, 0x76,
-0x69, 0x6f, 0x75, 0x73, 0x62, 0x00, 0x12, 0x73, 0xc8, 0x01,
-0xc5, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x74, 0x69, 0x76, 0x65,
-0x6c, 0x79, 0x2c, 0xa5, 0x00, 0x08, 0x15, 0x01, 0x10, 0x74,
-0x79, 0x09, 0x03, 0xb3, 0x06, 0x00, 0xd9, 0x00, 0x75, 0x00,
-0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x58, 0x0a, 0x34, 0x2e,
-0x00, 0x50, 0x83, 0x01, 0x20, 0x74, 0x68, 0x19, 0x03, 0x43,
-0x74, 0x75, 0x72, 0x6e, 0x94, 0x00, 0x56, 0x67, 0x67, 0x6c,
-0x65, 0x73, 0x3a, 0x00, 0x11, 0x28, 0xf9, 0x0a, 0x72, 0x61,
-0x00, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x27, 0x01, 0x01, 0x08,
-0x01, 0x08, 0x38, 0x01, 0x24, 0x29, 0x2c, 0x21, 0x02, 0x01,
-0xe2, 0x01, 0x04, 0x7a, 0x02, 0x20, 0x69, 0x6e, 0xc4, 0x03,
-0x0f, 0xca, 0x04, 0x03, 0x03, 0x0e, 0x00, 0x80, 0x61, 0x70,
-0x70, 0x72, 0x6f, 0x70, 0x72, 0x69, 0xf5, 0x0a, 0x44, 0x77,
-0x61, 0x79, 0x3b, 0x44, 0x00, 0x01, 0x9b, 0x02, 0x21, 0x30,
-0x00, 0x6d, 0x05, 0x04, 0xa6, 0x00, 0x02, 0x2d, 0x02, 0x23,
-0x62, 0x61, 0x25, 0x05, 0x02, 0x99, 0x05, 0x13, 0x61, 0xaa,
-0x04, 0x05, 0xcc, 0x04, 0x58, 0x00, 0x00, 0x4c, 0x65, 0x66,
-0x70, 0x02, 0x02, 0x69, 0x09, 0x01, 0x33, 0x00, 0x01, 0xbd,
-0x00, 0x20, 0x69, 0x74, 0x95, 0x01, 0x10, 0x64, 0x21, 0x09,
-0x60, 0x28, 0x67, 0x72, 0x65, 0x79, 0x00, 0x66, 0x06, 0x41,
-0x75, 0x74, 0x29, 0x2c, 0x6e, 0x00, 0x14, 0x6e, 0x24, 0x00,
-0x10, 0x69, 0xee, 0x06, 0x01, 0xa1, 0x07, 0x12, 0x6c, 0xd6,
-0x01, 0x00, 0x19, 0x00, 0x00, 0xe2, 0x0a, 0x40, 0x48, 0x6f,
-0x6c, 0x64, 0x59, 0x00, 0x13, 0x43, 0x08, 0x07, 0x00, 0x9a,
-0x02, 0x4a, 0x68, 0x69, 0x66, 0x74, 0xda, 0x02, 0x00, 0x43,
-0x02, 0x10, 0x72, 0x9d, 0x0b, 0x00, 0x55, 0x01, 0x00, 0xdd,
-0x03, 0x43, 0x77, 0x69, 0x73, 0x65, 0x78, 0x03, 0x00, 0xfb,
-0x06, 0x01, 0x95, 0x00, 0x0a, 0x0b, 0x09, 0x05, 0xc3, 0x01,
-0x03, 0x1c, 0x01, 0x02, 0x3b, 0x04, 0x32, 0x64, 0x69, 0x72,
-0xc0, 0x07, 0x00, 0xdb, 0x00, 0x14, 0x28, 0x81, 0x0b, 0x11,
-0x61, 0x13, 0x00, 0x00, 0x68, 0x09, 0x52, 0x73, 0x63, 0x72,
-0x69, 0x62, 0x5f, 0x01, 0x13, 0x73, 0xe9, 0x07, 0x33, 0x32,
-0x2e, 0x31, 0xca, 0x09, 0x35, 0x73, 0x6f, 0x00, 0x30, 0x09,
-0x22, 0x2e, 0x29, 0xf1, 0x07, 0x15, 0x32, 0xf1, 0x07, 0xb2,
-0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73,
-0x20, 0xbc, 0x05, 0x00, 0x7c, 0x03, 0x05, 0x14, 0x00, 0x02,
-0x43, 0x00, 0x05, 0x6e, 0x09, 0x01, 0x07, 0x02, 0x07, 0x6f,
-0x09, 0x71, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70, 0x71,
-0x00, 0x03, 0x9b, 0x07, 0xb0, 0x60, 0x54, 0x79, 0x70, 0x65,
-0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xad, 0x00, 0x10, 0x4d,
-0xf1, 0x08, 0x03, 0x07, 0x00, 0x28, 0x6f, 0x66, 0x56, 0x09,
-0x16, 0x28, 0x16, 0x09, 0x27, 0x6f, 0x72, 0x1e, 0x0b, 0x00,
-0xa2, 0x00, 0x94, 0x53, 0x69, 0x7a, 0x65, 0x20, 0x28, 0x73,
-0x2a, 0x73, 0x0d, 0x00, 0x00, 0x3c, 0x00, 0x02, 0xb4, 0x02,
-0x36, 0x00, 0x00, 0x44, 0x0f, 0x0a, 0x14, 0x00, 0x81, 0x01,
-0x02, 0xac, 0x02, 0x07, 0x29, 0x0a, 0x04, 0x97, 0x0d, 0x50,
-0x65, 0x6e, 0x65, 0x72, 0x61, 0x0c, 0x09, 0x02, 0x76, 0x00,
-0x10, 0x2e, 0xa8, 0x09, 0x03, 0x59, 0x0a, 0x02, 0x4d, 0x0a,
-0x0f, 0x1d, 0x0a, 0x0e, 0x0f, 0x0b, 0x0a, 0x1d, 0x50, 0x41,
-0x74, 0x00, 0x52, 0x65, 0xc5, 0x01, 0x34, 0x69, 0x76, 0x65,
-0xb0, 0x0a, 0x01, 0x59, 0x0d, 0x0f, 0xb5, 0x0a, 0x1b, 0x82,
-0x00, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0xc1, 0x02,
-0x04, 0x12, 0x08, 0x06, 0x47, 0x04, 0x00, 0x29, 0x04, 0x01,
-0x11, 0x03, 0x31, 0x6f, 0x6c, 0x75, 0x80, 0x01, 0x93, 0x73,
-0x68, 0x6f, 0x75, 0x6c, 0x64, 0x00, 0x73, 0x74, 0x2b, 0x00,
-0x71, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x2e, 0x8f, 0x07,
-0x02, 0x89, 0x0c, 0x00, 0x1f, 0x02, 0x04, 0x81, 0x0e, 0x03,
-0x49, 0x00, 0x00, 0xfe, 0x08, 0x31, 0x72, 0x65, 0x61, 0x66,
-0x06, 0x00, 0xef, 0x0e, 0x60, 0x6d, 0x70, 0x6c, 0x65, 0x78,
-0x00, 0x12, 0x00, 0x21, 0x6f, 0x6e, 0x73, 0x03, 0x00, 0x3c,
-0x02, 0x30, 0x6f, 0x69, 0x64, 0x59, 0x08, 0x03, 0x10, 0x00,
-0xb0, 0x62, 0x61, 0x63, 0x6b, 0x74, 0x72, 0x61, 0x63, 0x6b,
-0x2e, 0x00,
+0x6c, 0x20, 0x00, 0x2d, 0x01, 0x00, 0xf4, 0x10, 0x00, 0x00,
+0x00, 0x59, 0x6f, 0x75, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00,
+0x61, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65, 0x00, 0x67,
+0x72, 0x69, 0x64, 0x3b, 0x00, 0x65, 0x61, 0x63, 0x68, 0x12,
+0x00, 0xf1, 0x1a, 0x6d, 0x61, 0x79, 0x00, 0x63, 0x6f, 0x6e,
+0x74, 0x61, 0x69, 0x6e, 0x00, 0x61, 0x00, 0x64, 0x69, 0x67,
+0x69, 0x74, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x00, 0x31, 0x00,
+0x74, 0x6f, 0x00, 0x74, 0x68, 0x65, 0x00, 0x73, 0x69, 0x7a,
+0x65, 0x00, 0x6f, 0x66, 0x0c, 0x00, 0x00, 0x40, 0x00, 0xa3,
+0x2c, 0x00, 0x61, 0x6e, 0x64, 0x00, 0x73, 0x6f, 0x6d, 0x65,
+0x44, 0x00, 0x12, 0x73, 0x65, 0x00, 0x30, 0x63, 0x6c, 0x75,
+0x2d, 0x00, 0xb0, 0x67, 0x6e, 0x73, 0x00, 0x62, 0x65, 0x74,
+0x77, 0x65, 0x65, 0x6e, 0x33, 0x00, 0x20, 0x6d, 0x2e, 0x87,
+0x00, 0x80, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73,
+0x54, 0x00, 0xe5, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x00, 0x70,
+0x6f, 0x70, 0x75, 0x6c, 0x61, 0x74, 0x65, 0x57, 0x00, 0xf0,
+0x0f, 0x00, 0x77, 0x69, 0x74, 0x68, 0x00, 0x6e, 0x75, 0x6d,
+0x62, 0x65, 0x72, 0x73, 0x00, 0x73, 0x75, 0x63, 0x68, 0x00,
+0x74, 0x68, 0x61, 0x74, 0x3a, 0x00, 0x00, 0x00, 0x2d, 0x00,
+0x45, 0xb2, 0x00, 0x34, 0x72, 0x6f, 0x77, 0xab, 0x00, 0xf1,
+0x05, 0x73, 0x00, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x6f, 0x6e,
+0x65, 0x00, 0x6f, 0x63, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e,
+0x63, 0xa5, 0x00, 0x01, 0xdb, 0x00, 0x02, 0xc6, 0x00, 0x05,
+0x38, 0x00, 0x6f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x3b,
+0x00, 0x1d, 0x31, 0x41, 0x6c, 0x6c, 0x9c, 0x00, 0x07, 0xd7,
+0x00, 0x00, 0x30, 0x01, 0xf1, 0x03, 0x73, 0x61, 0x74, 0x69,
+0x73, 0x66, 0x69, 0x65, 0x64, 0x2e, 0x00, 0x00, 0x00, 0x54,
+0x68, 0x65, 0x72, 0x65, 0x17, 0x00, 0xf3, 0x0b, 0x74, 0x77,
+0x6f, 0x00, 0x6d, 0x6f, 0x64, 0x65, 0x73, 0x00, 0x66, 0x6f,
+0x72, 0x00, 0x74, 0x68, 0x69, 0x73, 0x00, 0x67, 0x61, 0x6d,
+0x65, 0x2c, 0x00, 0x60, 0xa4, 0x01, 0x11, 0x27, 0x36, 0x01,
+0xa0, 0x60, 0x41, 0x64, 0x6a, 0x61, 0x63, 0x65, 0x6e, 0x74,
+0x27, 0x3f, 0x00, 0x27, 0x49, 0x6e, 0x1f, 0x00, 0x00, 0x3e,
+0x00, 0x1e, 0x2c, 0x72, 0x00, 0x00, 0x1d, 0x01, 0xf1, 0x0e,
+0x65, 0x61, 0x74, 0x65, 0x72, 0x2d, 0x74, 0x68, 0x61, 0x6e,
+0x00, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x73, 0x00, 0x69,
+0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6e, 0x67, 0xca,
+0x00, 0x02, 0x89, 0x01, 0x50, 0x27, 0x73, 0x00, 0x76, 0x61,
+0x3d, 0x00, 0x24, 0x69, 0x73, 0x36, 0x00, 0x11, 0x00, 0x36,
+0x00, 0xf0, 0x01, 0x69, 0x74, 0x73, 0x00, 0x6e, 0x65, 0x69,
+0x67, 0x68, 0x62, 0x6f, 0x75, 0x72, 0x27, 0x73, 0x2e, 0x7a,
+0x00, 0x01, 0xa4, 0x00, 0x00, 0x75, 0x00, 0x81, 0x00, 0x6e,
+0x6f, 0x74, 0x00, 0x61, 0x6c, 0x6c, 0x78, 0x00, 0x11, 0x73,
+0x11, 0x02, 0xf0, 0x18, 0x62, 0x65, 0x00, 0x76, 0x69, 0x73,
+0x69, 0x62, 0x6c, 0x65, 0x2c, 0x00, 0x70, 0x61, 0x72, 0x74,
+0x69, 0x63, 0x75, 0x6c, 0x61, 0x72, 0x6c, 0x79, 0x00, 0x61,
+0x74, 0x00, 0x68, 0x69, 0x67, 0x68, 0x65, 0x72, 0x00, 0x64,
+0x69, 0x66, 0x66, 0x17, 0x00, 0x94, 0x74, 0x79, 0x00, 0x6c,
+0x65, 0x76, 0x65, 0x6c, 0x73, 0xd1, 0x00, 0x05, 0xe2, 0x00,
+0x0f, 0xd2, 0x00, 0x07, 0x3f, 0x62, 0x61, 0x72, 0xc2, 0x00,
+0x10, 0x90, 0x6e, 0x75, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61,
+0x6c, 0x78, 0x00, 0x03, 0x55, 0x00, 0x61, 0x00, 0x28, 0x69,
+0x2e, 0x65, 0x2e, 0x31, 0x00, 0x03, 0x88, 0x00, 0x21, 0x6f,
+0x72, 0x0e, 0x00, 0x6f, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x29,
+0xee, 0x00, 0x00, 0x0b, 0xec, 0x00, 0x06, 0xe8, 0x00, 0x20,
+0x61, 0x72, 0x0e, 0x00, 0x44, 0x77, 0x61, 0x79, 0x73, 0xec,
+0x00, 0x54, 0x3a, 0x00, 0x61, 0x62, 0x73, 0x0e, 0x02, 0x10,
+0x61, 0xa6, 0x00, 0xb1, 0x00, 0x74, 0x68, 0x75, 0x73, 0x00,
+0x6d, 0x65, 0x61, 0x6e, 0x73, 0x8d, 0x02, 0x2f, 0x00, 0x61,
+0xa8, 0x00, 0x00, 0xa1, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69,
+0x74, 0x65, 0x6c, 0x79, 0x4a, 0x01, 0x0f, 0xb7, 0x00, 0x02,
+0x22, 0x74, 0x6f, 0x40, 0x00, 0x09, 0x85, 0x01, 0x02, 0x30,
+0x01, 0x50, 0x54, 0x72, 0x69, 0x76, 0x69, 0x01, 0x02, 0x0c,
+0x52, 0x01, 0xa0, 0x00, 0x28, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x8e, 0x01, 0x11, 0x61, 0x49, 0x01, 0x81,
+0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x27, 0x5d, 0x02,
+0xf1, 0x00, 0x00, 0x74, 0x79, 0x70, 0x65, 0x00, 0x73, 0x65,
+0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x29, 0x6b, 0x01, 0x03,
+0x8f, 0x02, 0x2b, 0x6e, 0x6f, 0x37, 0x02, 0x01, 0x7c, 0x01,
+0x1c, 0x69, 0x70, 0x02, 0x11, 0x3b, 0x55, 0x00, 0x63, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x9e, 0x03, 0x42, 0x73, 0x6f,
+0x6c, 0x76, 0x95, 0x03, 0x10, 0x4c, 0x9d, 0x01, 0x04, 0x27,
+0x04, 0x00, 0x34, 0x03, 0x00, 0xb2, 0x00, 0x21, 0x41, 0x74,
+0x1c, 0x00, 0x31, 0x74, 0x69, 0x6d, 0x26, 0x01, 0x30, 0x77,
+0x72, 0x69, 0xc2, 0x01, 0x02, 0xe6, 0x01, 0x0a, 0x5c, 0x00,
+0x02, 0x33, 0x04, 0x27, 0x69, 0x73, 0x5f, 0x00, 0x60, 0x61,
+0x70, 0x70, 0x65, 0x61, 0x72, 0xf2, 0x01, 0x21, 0x69, 0x6e,
+0x32, 0x00, 0xf1, 0x06, 0x47, 0x75, 0x61, 0x72, 0x64, 0x69,
+0x61, 0x6e, 0x00, 0x77, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x00,
+0x75, 0x6e, 0x64, 0x65, 0x72, 0x1a, 0x00, 0x10, 0x6e, 0xe0,
+0x00, 0xa1, 0x60, 0x46, 0x75, 0x74, 0x6f, 0x73, 0x68, 0x69,
+0x6b, 0x69, 0x2f, 0x03, 0x03, 0x5f, 0x00, 0x41, 0x00, 0x77,
+0x61, 0x73, 0xcd, 0x03, 0x72, 0x72, 0x69, 0x62, 0x75, 0x74,
+0x65, 0x64, 0x5d, 0x01, 0x20, 0x69, 0x73, 0xe8, 0x03, 0x00,
+0x0b, 0x01, 0xf1, 0x03, 0x69, 0x6f, 0x6e, 0x00, 0x62, 0x79,
+0x00, 0x4a, 0x61, 0x6d, 0x65, 0x73, 0x00, 0x48, 0x61, 0x72,
+0x76, 0x65, 0xba, 0x00, 0x45, 0x32, 0x37, 0x2e, 0x31, 0x31,
+0x05, 0x01, 0x3f, 0x00, 0x47, 0x6f, 0x6c, 0x73, 0x20, 0x57,
+0x00, 0x21, 0x73, 0x68, 0xcc, 0x04, 0x10, 0x6d, 0x7a, 0x04,
+0x21, 0x6f, 0x66, 0x46, 0x02, 0x03, 0x27, 0x00, 0x72, 0x00,
+0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0xa2, 0x04, 0x41, 0x53,
+0x6f, 0x6c, 0x6f, 0xfc, 0x03, 0x64, 0x6f, 0x00, 0x70, 0x6c,
+0x61, 0x79, 0x3f, 0x00, 0xe1, 0x2c, 0x00, 0x73, 0x69, 0x6d,
+0x70, 0x6c, 0x79, 0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xc4,
+0x00, 0x60, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x58, 0x05,
+0x84, 0x6e, 0x79, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x4e,
+0x01, 0x00, 0x0b, 0x04, 0x42, 0x74, 0x68, 0x65, 0x6e, 0xc2,
+0x01, 0x04, 0x77, 0x05, 0x70, 0x6f, 0x72, 0x00, 0x6c, 0x65,
+0x74, 0x74, 0xd5, 0x02, 0x02, 0x1f, 0x01, 0x81, 0x6b, 0x65,
+0x79, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x36, 0x05, 0x32, 0x69,
+0x6c, 0x6c, 0x44, 0x02, 0x02, 0x44, 0x00, 0xc0, 0x2e, 0x00,
+0x49, 0x66, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x6d, 0x61, 0x6b,
+0x43, 0x00, 0x8e, 0x6d, 0x69, 0x73, 0x74, 0x61, 0x6b, 0x65,
+0x2c, 0x80, 0x00, 0x02, 0x4c, 0x00, 0x98, 0x69, 0x6e, 0x63,
+0x6f, 0x72, 0x72, 0x65, 0x63, 0x74, 0x84, 0x00, 0xb0, 0x70,
+0x72, 0x65, 0x73, 0x73, 0x00, 0x53, 0x70, 0x61, 0x63, 0x65,
+0x64, 0x00, 0xb0, 0x63, 0x6c, 0x65, 0x61, 0x72, 0x00, 0x69,
+0x74, 0x00, 0x61, 0x67, 0x0f, 0x06, 0x62, 0x28, 0x6f, 0x72,
+0x00, 0x75, 0x73, 0x0d, 0x02, 0xd1, 0x55, 0x6e, 0x64, 0x6f,
+0x00, 0x66, 0x65, 0x61, 0x74, 0x75, 0x72, 0x65, 0x29, 0xbb,
+0x02, 0x02, 0x7e, 0x00, 0x62, 0x72, 0x69, 0x67, 0x68, 0x74,
+0x2d, 0x74, 0x00, 0x01, 0x42, 0x06, 0x0f, 0xe2, 0x00, 0x04,
+0x02, 0xd8, 0x05, 0x13, 0x2c, 0x06, 0x03, 0x01, 0x0d, 0x00,
+0x20, 0x00, 0x77, 0xd3, 0x00, 0xa4, 0x62, 0x65, 0x00, 0x65,
+0x6e, 0x74, 0x65, 0x72, 0x65, 0x64, 0xaa, 0x00, 0x04, 0x42,
+0x00, 0xf1, 0x03, 0x73, 0x00, 0x61, 0x00, 0x60, 0x70, 0x65,
+0x6e, 0x63, 0x69, 0x6c, 0x00, 0x6d, 0x61, 0x72, 0x6b, 0x27,
+0x2e, 0xd1, 0x06, 0x32, 0x63, 0x61, 0x6e, 0x70, 0x06, 0x07,
+0x1b, 0x00, 0x02, 0x76, 0x05, 0x85, 0x6d, 0x75, 0x6c, 0x74,
+0x69, 0x70, 0x6c, 0x65, 0x45, 0x06, 0x04, 0x51, 0x00, 0x00,
+0x4c, 0x02, 0x04, 0x36, 0x01, 0x13, 0x53, 0xb3, 0x06, 0x03,
+0x0e, 0x06, 0x00, 0x8d, 0x02, 0x00, 0x5b, 0x01, 0x55, 0x65,
+0x64, 0x2d, 0x69, 0x6e, 0x39, 0x00, 0x32, 0x63, 0x61, 0x6e,
+0x15, 0x05, 0x25, 0x73, 0x6f, 0x1d, 0x07, 0x08, 0x6f, 0x00,
+0x03, 0xfc, 0x05, 0x02, 0x86, 0x03, 0x10, 0x70, 0x43, 0x04,
+0x81, 0x6e, 0x6f, 0x00, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x7e,
+0x02, 0x29, 0x74, 0x6f, 0x2e, 0x00, 0xe0, 0x2c, 0x00, 0x73,
+0x6f, 0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x00,
+0x77, 0x01, 0x01, 0x00, 0x3a, 0x01, 0x03, 0x5a, 0x01, 0x11,
+0x6d, 0xbb, 0x00, 0x50, 0x69, 0x73, 0x00, 0x75, 0x70, 0x38,
+0x00, 0x63, 0x79, 0x6f, 0x75, 0x3a, 0x00, 0x79, 0xe7, 0x00,
+0x05, 0x23, 0x00, 0x70, 0x61, 0x73, 0x00, 0x72, 0x65, 0x6d,
+0x69, 0x1e, 0x03, 0x05, 0x89, 0x04, 0x06, 0x98, 0x05, 0x04,
+0x32, 0x01, 0x41, 0x6e, 0x65, 0x65, 0x64, 0xc4, 0x03, 0xf0,
+0x01, 0x62, 0x65, 0x00, 0x72, 0x65, 0x2d, 0x65, 0x78, 0x61,
+0x6d, 0x69, 0x6e, 0x65, 0x64, 0x00, 0x6f, 0xd3, 0x04, 0x00,
+0x54, 0x00, 0x70, 0x6b, 0x6e, 0x6f, 0x77, 0x00, 0x6d, 0x6f,
+0x5d, 0x01, 0x3b, 0x62, 0x6f, 0x75, 0x45, 0x00, 0x04, 0xa2,
+0x01, 0x2f, 0x6f, 0x72, 0x80, 0x00, 0x02, 0x54, 0x6c, 0x69,
+0x73, 0x74, 0x73, 0x07, 0x08, 0x31, 0x70, 0x6f, 0x73, 0x32,
+0x05, 0x08, 0x6a, 0x01, 0x64, 0x61, 0x00, 0x67, 0x69, 0x76,
+0x65, 0x31, 0x04, 0x01, 0x48, 0x00, 0x50, 0x61, 0x6e, 0x79,
+0x74, 0x68, 0x62, 0x01, 0x32, 0x65, 0x6c, 0x73, 0x82, 0x00,
+0x93, 0x66, 0x65, 0x65, 0x6c, 0x00, 0x6c, 0x69, 0x6b, 0x65,
+0x42, 0x03, 0x41, 0x65, 0x72, 0x61, 0x73, 0x9f, 0x08, 0x49,
+0x69, 0x6e, 0x67, 0x6c, 0xd3, 0x01, 0x1c, 0x2c, 0x5b, 0x02,
+0x08, 0x1b, 0x02, 0x22, 0x6e, 0x64, 0x58, 0x02, 0x05, 0xde,
+0x01, 0x03, 0x52, 0x02, 0x01, 0xb8, 0x02, 0x01, 0xa7, 0x04,
+0x2a, 0x6c, 0x6c, 0x20, 0x02, 0x09, 0x9c, 0x02, 0x22, 0x72,
+0x65, 0x79, 0x00, 0x30, 0x64, 0x00, 0x77, 0xa3, 0x02, 0x00,
+0x99, 0x00, 0x34, 0x6c, 0x65, 0x66, 0x6c, 0x00, 0x05, 0x5e,
+0x00, 0x18, 0x61, 0x14, 0x01, 0x0f, 0x2a, 0x00, 0x05, 0x02,
+0x43, 0x03, 0x10, 0x73, 0x43, 0x03, 0x36, 0x2e, 0x00, 0x52,
+0xb3, 0x00, 0x00, 0xf7, 0x00, 0x05, 0x20, 0x00, 0x00, 0x0d,
+0x00, 0x01, 0x23, 0x00, 0x02, 0xf4, 0x02, 0x01, 0x58, 0x02,
+0x02, 0xfb, 0x00, 0x0c, 0x56, 0x02, 0x12, 0x41, 0xcb, 0x02,
+0x00, 0x65, 0x04, 0x03, 0x3b, 0x07, 0x50, 0x75, 0x72, 0x73,
+0x6f, 0x72, 0x0b, 0x04, 0x01, 0x97, 0x02, 0x00, 0xdc, 0x01,
+0x22, 0x75, 0x73, 0x2d, 0x03, 0x62, 0x63, 0x6f, 0x6e, 0x6a,
+0x75, 0x6e, 0xf1, 0x04, 0x01, 0x9b, 0x04, 0x00, 0x30, 0x00,
+0x02, 0x4b, 0x04, 0x01, 0x2f, 0x00, 0x00, 0xce, 0x05, 0x25,
+0x65, 0x74, 0xa4, 0x01, 0x2b, 0x6f, 0x72, 0x6e, 0x00, 0x04,
+0x4e, 0x03, 0x01, 0x8f, 0x00, 0x04, 0xe9, 0x03, 0x30, 0x60,
+0x4d, 0x27, 0x3e, 0x00, 0x00, 0x3d, 0x00, 0x51, 0x61, 0x75,
+0x74, 0x6f, 0x2d, 0x78, 0x04, 0x54, 0x65, 0x76, 0x65, 0x72,
+0x79, 0xda, 0x06, 0xc1, 0x00, 0x68, 0x69, 0x6e, 0x74, 0x2c,
+0x00, 0x72, 0x65, 0x61, 0x64, 0x79, 0xad, 0x00, 0x72, 0x72,
+0x65, 0x6d, 0x6f, 0x76, 0x61, 0x6c, 0xa6, 0x02, 0x61, 0x71,
+0x75, 0x69, 0x72, 0x65, 0x64, 0x33, 0x01, 0x01, 0x4f, 0x00,
+0x15, 0x48, 0x4f, 0x00, 0x26, 0x64, 0x6f, 0xb0, 0x01, 0x23,
+0x62, 0x75, 0x5e, 0x03, 0x22, 0x74, 0x6f, 0x3f, 0x00, 0x02,
+0x9a, 0x07, 0x71, 0x6f, 0x62, 0x76, 0x69, 0x6f, 0x75, 0x73,
+0x62, 0x00, 0x12, 0x73, 0xc8, 0x01, 0xc5, 0x74, 0x65, 0x72,
+0x6e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x6c, 0x79, 0x2c, 0xa5,
+0x00, 0x08, 0x15, 0x01, 0x10, 0x74, 0x79, 0x09, 0x03, 0xb3,
+0x06, 0x00, 0xd9, 0x00, 0x75, 0x00, 0x61, 0x72, 0x6f, 0x75,
+0x6e, 0x64, 0x58, 0x0a, 0x34, 0x2e, 0x00, 0x50, 0x83, 0x01,
+0x20, 0x74, 0x68, 0x19, 0x03, 0x43, 0x74, 0x75, 0x72, 0x6e,
+0x94, 0x00, 0x56, 0x67, 0x67, 0x6c, 0x65, 0x73, 0x3a, 0x00,
+0x11, 0x28, 0xf9, 0x0a, 0x72, 0x61, 0x00, 0x6e, 0x6f, 0x72,
+0x6d, 0x61, 0x27, 0x01, 0x01, 0x08, 0x01, 0x08, 0x38, 0x01,
+0x24, 0x29, 0x2c, 0x21, 0x02, 0x01, 0xe2, 0x01, 0x04, 0x7a,
+0x02, 0x20, 0x69, 0x6e, 0xc4, 0x03, 0x0f, 0xca, 0x04, 0x03,
+0x03, 0x0e, 0x00, 0x80, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x70,
+0x72, 0x69, 0xf5, 0x0a, 0x44, 0x77, 0x61, 0x79, 0x3b, 0x44,
+0x00, 0x01, 0x9b, 0x02, 0x21, 0x30, 0x00, 0x6d, 0x05, 0x04,
+0xa6, 0x00, 0x02, 0x2d, 0x02, 0x23, 0x62, 0x61, 0x25, 0x05,
+0x02, 0x99, 0x05, 0x13, 0x61, 0xaa, 0x04, 0x05, 0xcc, 0x04,
+0x58, 0x00, 0x00, 0x4c, 0x65, 0x66, 0x70, 0x02, 0x02, 0x69,
+0x09, 0x01, 0x33, 0x00, 0x01, 0xbd, 0x00, 0x20, 0x69, 0x74,
+0x95, 0x01, 0x10, 0x64, 0x21, 0x09, 0x60, 0x28, 0x67, 0x72,
+0x65, 0x79, 0x00, 0x66, 0x06, 0x41, 0x75, 0x74, 0x29, 0x2c,
+0x6e, 0x00, 0x14, 0x6e, 0x24, 0x00, 0x10, 0x69, 0xee, 0x06,
+0x01, 0xa1, 0x07, 0x12, 0x6c, 0xd6, 0x01, 0x00, 0x19, 0x00,
+0x00, 0xe2, 0x0a, 0x40, 0x48, 0x6f, 0x6c, 0x64, 0x59, 0x00,
+0x13, 0x43, 0x08, 0x07, 0x00, 0x9a, 0x02, 0x4a, 0x68, 0x69,
+0x66, 0x74, 0xda, 0x02, 0x00, 0x43, 0x02, 0x10, 0x72, 0x9d,
+0x0b, 0x00, 0x55, 0x01, 0x00, 0xdd, 0x03, 0x43, 0x77, 0x69,
+0x73, 0x65, 0x78, 0x03, 0x00, 0xfb, 0x06, 0x01, 0x95, 0x00,
+0x0a, 0x0b, 0x09, 0x05, 0xc3, 0x01, 0x03, 0x1c, 0x01, 0x02,
+0x3b, 0x04, 0x32, 0x64, 0x69, 0x72, 0xc0, 0x07, 0x00, 0xdb,
+0x00, 0x14, 0x28, 0x81, 0x0b, 0x11, 0x61, 0x13, 0x00, 0x00,
+0x68, 0x09, 0x52, 0x73, 0x63, 0x72, 0x69, 0x62, 0x5f, 0x01,
+0x13, 0x73, 0xe9, 0x07, 0x33, 0x32, 0x2e, 0x31, 0xca, 0x09,
+0x35, 0x73, 0x6f, 0x00, 0x30, 0x09, 0x22, 0x2e, 0x29, 0xf1,
+0x07, 0x15, 0x32, 0xf1, 0x07, 0xb2, 0x70, 0x61, 0x72, 0x61,
+0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x20, 0xbc, 0x05, 0x00,
+0x7c, 0x03, 0x05, 0x14, 0x00, 0x02, 0x43, 0x00, 0x05, 0x6e,
+0x09, 0x01, 0x07, 0x02, 0x07, 0x6f, 0x09, 0x71, 0x2e, 0x2e,
+0x2e, 0x27, 0x00, 0x6f, 0x70, 0x71, 0x00, 0x03, 0x9b, 0x07,
+0xb0, 0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65,
+0x6e, 0x75, 0xad, 0x00, 0x10, 0x4d, 0xf1, 0x08, 0x03, 0x07,
+0x00, 0x28, 0x6f, 0x66, 0x56, 0x09, 0x16, 0x28, 0x16, 0x09,
+0x27, 0x6f, 0x72, 0x1e, 0x0b, 0x00, 0xa2, 0x00, 0x94, 0x53,
+0x69, 0x7a, 0x65, 0x20, 0x28, 0x73, 0x2a, 0x73, 0x0d, 0x00,
+0x00, 0x3c, 0x00, 0x02, 0xb4, 0x02, 0x36, 0x00, 0x00, 0x44,
+0x0f, 0x0a, 0x14, 0x00, 0x81, 0x01, 0x02, 0xac, 0x02, 0x07,
+0x29, 0x0a, 0x04, 0x97, 0x0d, 0x50, 0x65, 0x6e, 0x65, 0x72,
+0x61, 0x0c, 0x09, 0x02, 0x76, 0x00, 0x10, 0x2e, 0xa8, 0x09,
+0x03, 0x59, 0x0a, 0x02, 0x4d, 0x0a, 0x0f, 0x1d, 0x0a, 0x0e,
+0x0f, 0x0b, 0x0a, 0x1d, 0x50, 0x41, 0x74, 0x00, 0x52, 0x65,
+0xc5, 0x01, 0x34, 0x69, 0x76, 0x65, 0xb0, 0x0a, 0x01, 0x59,
+0x0d, 0x0f, 0xb5, 0x0a, 0x1b, 0x82, 0x00, 0x62, 0x61, 0x63,
+0x6b, 0x74, 0x72, 0x61, 0xc1, 0x02, 0x04, 0x12, 0x08, 0x06,
+0x47, 0x04, 0x00, 0x29, 0x04, 0x01, 0x11, 0x03, 0x31, 0x6f,
+0x6c, 0x75, 0x80, 0x01, 0x93, 0x73, 0x68, 0x6f, 0x75, 0x6c,
+0x64, 0x00, 0x73, 0x74, 0x2b, 0x00, 0x71, 0x75, 0x6e, 0x69,
+0x71, 0x75, 0x65, 0x2e, 0x8f, 0x07, 0x02, 0x89, 0x0c, 0x00,
+0x1f, 0x02, 0x04, 0x81, 0x0e, 0x03, 0x49, 0x00, 0x00, 0xfe,
+0x08, 0x31, 0x72, 0x65, 0x61, 0x66, 0x06, 0x00, 0xef, 0x0e,
+0x60, 0x6d, 0x70, 0x6c, 0x65, 0x78, 0x00, 0x12, 0x00, 0x21,
+0x6f, 0x6e, 0x73, 0x03, 0x00, 0x3c, 0x02, 0x30, 0x6f, 0x69,
+0x64, 0x59, 0x08, 0x03, 0x10, 0x00, 0xb0, 0x62, 0x61, 0x63,
+0x6b, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 3934;
-const unsigned short help_text_words = 730;
+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 b098642a72..97348e5c26 100644
--- a/apps/plugins/puzzles/help/unruly.c
+++ b/apps/plugins/puzzles/help/unruly.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,142 +6,144 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 99, TEXT_CENTER | C_RED },
- { 221, TEXT_CENTER | C_RED },
- { 238, TEXT_UNDERLINE },
+ { 100, TEXT_CENTER | C_RED },
+ { 222, TEXT_CENTER | C_RED },
  { 239, TEXT_UNDERLINE },
- { 266, TEXT_UNDERLINE },
- { 278, TEXT_UNDERLINE },
+ { 240, TEXT_UNDERLINE },
+ { 267, TEXT_UNDERLINE },
+ { 279, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 1688 comp 1225 ratio 0.725711 level 10 saved 463 */
+/* orig 1707 comp 1231 ratio 0.721148 level 10 saved 476 */
 const char help_text[] = {
-0xf0, 0x4d, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xfd, 0x06, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x33, 0x38, 0x3a, 0x20, 0x55, 0x6e, 0x72, 0x75, 0x6c, 0x79,
-0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72,
-0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00,
-0x67, 0x72, 0x69, 0x64, 0x00, 0x6f, 0x66, 0x00, 0x73, 0x71,
-0x75, 0x61, 0x72, 0x65, 0x73, 0x2c, 0x00, 0x77, 0x68, 0x69,
-0x63, 0x68, 0x00, 0x79, 0x6f, 0x75, 0x00, 0x6d, 0x75, 0x73,
-0x74, 0x00, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72, 0x00, 0x65,
-0x69, 0x74, 0x68, 0x65, 0x72, 0x00, 0x62, 0x6c, 0x61, 0x63,
-0x6b, 0x00, 0x6f, 0x72, 0x26, 0x00, 0x84, 0x74, 0x65, 0x2e,
-0x00, 0x53, 0x6f, 0x6d, 0x65, 0x3b, 0x00, 0x01, 0x57, 0x00,
-0xf1, 0x0c, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64,
-0x00, 0x61, 0x73, 0x00, 0x63, 0x6c, 0x75, 0x65, 0x73, 0x3b,
-0x00, 0x74, 0x68, 0x65, 0x00, 0x72, 0x65, 0x73, 0x74, 0x20,
-0x00, 0x81, 0x6c, 0x65, 0x66, 0x74, 0x00, 0x66, 0x6f, 0x72,
-0x61, 0x00, 0xf0, 0x09, 0x74, 0x6f, 0x00, 0x66, 0x69, 0x6c,
-0x6c, 0x00, 0x69, 0x6e, 0x2e, 0x00, 0x45, 0x61, 0x63, 0x68,
-0x00, 0x72, 0x6f, 0x77, 0x00, 0x61, 0x6e, 0x64, 0x75, 0x00,
-0x34, 0x75, 0x6d, 0x6e, 0x81, 0x00, 0x51, 0x6e, 0x74, 0x61,
-0x69, 0x6e, 0x47, 0x00, 0xb0, 0x73, 0x61, 0x6d, 0x65, 0x00,
-0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0xb4, 0x00, 0x02, 0x8e,
-0x00, 0x00, 0x31, 0x00, 0x01, 0x8f, 0x00, 0x06, 0xc4, 0x00,
-0x00, 0x13, 0x00, 0x21, 0x6e, 0x6f, 0x4f, 0x00, 0x25, 0x6f,
-0x72, 0x4e, 0x00, 0x27, 0x61, 0x79, 0x4d, 0x00, 0x30, 0x72,
-0x65, 0x65, 0x0e, 0x00, 0x76, 0x73, 0x65, 0x63, 0x75, 0x74,
-0x69, 0x76, 0xc5, 0x00, 0x26, 0x6f, 0x66, 0x6a, 0x00, 0x02,
-0xfc, 0x00, 0xf1, 0x2d, 0x2e, 0x00, 0x00, 0x00, 0x54, 0x68,
-0x69, 0x73, 0x00, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00,
-0x74, 0x79, 0x70, 0x65, 0x00, 0x77, 0x61, 0x73, 0x00, 0x69,
-0x6e, 0x76, 0x65, 0x6e, 0x74, 0x65, 0x64, 0x00, 0x62, 0x79,
-0x00, 0x41, 0x64, 0x6f, 0x6c, 0x66, 0x6f, 0x00, 0x5a, 0x61,
-0x6e, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x2c, 0x00, 0x75,
-0x6e, 0x64, 0x65, 0x72, 0x4c, 0x00, 0x10, 0x6e, 0x4c, 0x00,
-0xf1, 0x09, 0x60, 0x54, 0x6f, 0x68, 0x75, 0x00, 0x77, 0x61,
-0x00, 0x56, 0x6f, 0x68, 0x75, 0x27, 0x2e, 0x00, 0x53, 0x65,
-0x65, 0x00, 0x5b, 0x32, 0x31, 0x5d, 0x0d, 0x01, 0xc0, 0x6d,
-0x6f, 0x72, 0x65, 0x00, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c,
-0x73, 0x6f, 0x00, 0x02, 0xaf, 0x01, 0x01, 0x65, 0x00, 0x00,
-0xb2, 0x00, 0x40, 0x72, 0x69, 0x62, 0x75, 0x68, 0x00, 0x60,
-0x74, 0x6f, 0x00, 0x74, 0x68, 0x69, 0x14, 0x00, 0x80, 0x6c,
-0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x7b, 0x00, 0xe0,
-0x4c, 0x65, 0x6e, 0x6e, 0x61, 0x72, 0x64, 0x00, 0x53, 0x70,
-0x72, 0x6f, 0x6e, 0x67, 0x3f, 0x00, 0x01, 0x58, 0x00, 0xf0,
-0x0d, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77,
-0x77, 0x2e, 0x6a, 0x61, 0x6e, 0x6b, 0x6f, 0x2e, 0x61, 0x74,
-0x2f, 0x52, 0x61, 0x65, 0x74, 0x73, 0x65, 0x6c, 0x2f, 0x8c,
-0x00, 0x40, 0x2d, 0x57, 0x61, 0x2d, 0x8c, 0x00, 0xf4, 0x02,
-0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d,
-0x00, 0x00, 0x00, 0x33, 0x38, 0x2e, 0x31, 0x2d, 0x02, 0x01,
-0x7a, 0x00, 0x40, 0x6f, 0x6c, 0x73, 0x20, 0x00, 0x01, 0x63,
-0x6f, 0x00, 0x70, 0x6c, 0x61, 0x79, 0x99, 0x00, 0x71, 0x2c,
-0x00, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0xdd, 0x00, 0x70, 0x6d,
-0x6f, 0x75, 0x73, 0x65, 0x00, 0x69, 0x4b, 0x02, 0x02, 0x43,
-0x01, 0x00, 0xa6, 0x00, 0xa5, 0x63, 0x68, 0x61, 0x6e, 0x67,
-0x65, 0x00, 0x69, 0x74, 0x73, 0x44, 0x01, 0x51, 0x4c, 0x65,
-0x66, 0x74, 0x2d, 0x37, 0x00, 0xc4, 0x69, 0x6e, 0x67, 0x00,
-0x61, 0x6e, 0x00, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x34, 0x00,
-0x10, 0x77, 0x07, 0x02, 0x72, 0x74, 0x75, 0x72, 0x6e, 0x00,
-0x69, 0x74, 0xd7, 0x01, 0x02, 0xc5, 0x01, 0x47, 0x72, 0x69,
-0x67, 0x68, 0x37, 0x00, 0x09, 0x27, 0x00, 0x03, 0x83, 0x02,
-0x55, 0x4b, 0x65, 0x65, 0x70, 0x00, 0x22, 0x00, 0x05, 0xbc,
-0x01, 0x61, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x8d, 0x00,
-0x40, 0x79, 0x63, 0x6c, 0x65, 0xf2, 0x01, 0x41, 0x6f, 0x75,
-0x67, 0x68, 0x21, 0x00, 0x02, 0xfe, 0x01, 0xf1, 0x00, 0x70,
-0x6f, 0x73, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x00, 0x73, 0x74,
-0x61, 0x74, 0x65, 0x73, 0x89, 0x01, 0x24, 0x74, 0x68, 0x0a,
-0x02, 0x42, 0x2e, 0x00, 0x49, 0x66, 0x06, 0x03, 0x52, 0x69,
-0x64, 0x64, 0x6c, 0x65, 0x84, 0x00, 0x09, 0xe8, 0x00, 0x22,
-0x69, 0x74, 0x90, 0x00, 0x11, 0x62, 0xdf, 0x02, 0x20, 0x65,
-0x74, 0x6c, 0x00, 0x01, 0xd5, 0x00, 0x13, 0x2e, 0x67, 0x03,
-0x90, 0x63, 0x61, 0x6e, 0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00,
-0x22, 0x01, 0x00, 0x5a, 0x00, 0xb0, 0x63, 0x75, 0x72, 0x73,
-0x6f, 0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x2d, 0x00, 0xb1,
-0x6d, 0x6f, 0x76, 0x65, 0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e,
-0x64, 0x1f, 0x00, 0x00, 0x8b, 0x03, 0x74, 0x2e, 0x00, 0x50,
-0x72, 0x65, 0x73, 0x73, 0xcb, 0x00, 0x21, 0x72, 0x65, 0xee,
-0x00, 0x82, 0x6f, 0x72, 0x00, 0x73, 0x70, 0x61, 0x63, 0x65,
-0x3b, 0x00, 0x06, 0x06, 0x01, 0x0c, 0x47, 0x01, 0x0a, 0x9f,
-0x03, 0x00, 0x97, 0x00, 0x30, 0x70, 0x65, 0x63, 0xdf, 0x02,
-0x52, 0x6c, 0x79, 0x00, 0x28, 0x61, 0x67, 0x00, 0x15, 0x6e,
-0x11, 0x01, 0x04, 0xe1, 0x02, 0x28, 0x73, 0x00, 0x5f, 0x03,
-0x30, 0x77, 0x61, 0x79, 0xbd, 0x03, 0x06, 0xdc, 0x01, 0x02,
-0x4a, 0x01, 0x22, 0x73, 0x29, 0x92, 0x01, 0x14, 0x70, 0x9f,
-0x00, 0x42, 0x42, 0x61, 0x63, 0x6b, 0x95, 0x00, 0x01, 0x90,
-0x00, 0x02, 0x03, 0x01, 0x08, 0x05, 0x02, 0x05, 0x0c, 0x01,
-0x41, 0x28, 0x41, 0x6c, 0x6c, 0x50, 0x00, 0x11, 0x61, 0xb4,
-0x02, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-0x62, 0x65, 0x64, 0x79, 0x00, 0x13, 0x73, 0xca, 0x02, 0x31,
-0x32, 0x2e, 0x31, 0x22, 0x04, 0x01, 0x32, 0x01, 0xb2, 0x61,
-0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
-0x96, 0x02, 0x14, 0x32, 0x96, 0x02, 0x92, 0x70, 0x61, 0x72,
-0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x98, 0x02, 0x56, 0x68,
-0x65, 0x73, 0x65, 0x00, 0x14, 0x00, 0x02, 0x42, 0x00, 0x04,
-0x3d, 0x00, 0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x7a, 0x00,
-0xe1, 0x60, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e,
-0x2e, 0x27, 0x00, 0x6f, 0x70, 0x70, 0x00, 0x22, 0x6f, 0x6e,
-0x1a, 0x00, 0xa0, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d,
-0x65, 0x6e, 0x75, 0xac, 0x00, 0x90, 0x57, 0x69, 0x64, 0x74,
-0x68, 0x2c, 0x00, 0x48, 0x65, 0x79, 0x02, 0x70, 0x00, 0x00,
-0x00, 0x53, 0x69, 0x7a, 0x65, 0x14, 0x04, 0x01, 0x27, 0x05,
-0x24, 0x69, 0x6e, 0x27, 0x04, 0x60, 0x2e, 0x00, 0x28, 0x4e,
-0x6f, 0x74, 0x45, 0x01, 0x22, 0x61, 0x74, 0xa9, 0x01, 0x26,
-0x75, 0x6c, 0x3d, 0x04, 0x30, 0x67, 0x61, 0x6d, 0x7d, 0x01,
-0x30, 0x71, 0x75, 0x69, 0x94, 0x01, 0x22, 0x6f, 0x74, 0x76,
-0x02, 0x10, 0x77, 0x5b, 0x00, 0x01, 0x44, 0x01, 0x12, 0x68,
-0x5e, 0x00, 0x20, 0x74, 0x6f, 0x3c, 0x02, 0x10, 0x65, 0x88,
-0x05, 0x02, 0xd4, 0x04, 0x11, 0x73, 0xee, 0x00, 0xe3, 0x44,
-0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x00,
-0x00, 0x00, 0x43, 0x85, 0x03, 0x01, 0x42, 0x00, 0x16, 0x64,
-0x1a, 0x00, 0x04, 0x6a, 0x00, 0x50, 0x65, 0x6e, 0x65, 0x72,
-0x61, 0x1c, 0x04, 0x02, 0x9d, 0x04, 0x02, 0x3d, 0x04, 0xe2,
-0x69, 0x71, 0x75, 0x65, 0x20, 0x72, 0x6f, 0x77, 0x73, 0x20,
-0x61, 0x6e, 0x64, 0x20, 0xff, 0x04, 0x30, 0x73, 0x00, 0x00,
-0xd2, 0x02, 0x20, 0x65, 0x6e, 0x19, 0x01, 0x20, 0x64, 0x2c,
-0x1f, 0x05, 0x21, 0x74, 0x77, 0x23, 0x05, 0x03, 0xb9, 0x05,
-0x53, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x66, 0x04, 0xc6, 0x68,
-0x61, 0x76, 0x65, 0x00, 0x65, 0x78, 0x61, 0x63, 0x74, 0x6c,
-0x79, 0x1a, 0x02, 0x72, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72,
-0x6e, 0x08, 0x02, 0x83, 0x6c, 0x69, 0x6b, 0x65, 0x77, 0x69,
-0x73, 0x65, 0x5e, 0x05, 0x00, 0x12, 0x01, 0x15, 0x41, 0xc0,
-0x05, 0x14, 0x61, 0x74, 0x05, 0x20, 0x63, 0x61, 0x78, 0x05,
-0xe0, 0x74, 0x63, 0x68, 0x2c, 0x00, 0x74, 0x68, 0x6f, 0x75,
-0x67, 0x68, 0x2e, 0x29, 0x00,
+0x20, 0x00, 0x2d, 0x01, 0x00, 0xf0, 0x3a, 0x00, 0x00, 0x00,
+0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65, 0x00, 0x67, 0x69,
+0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x67, 0x72, 0x69, 0x64,
+0x00, 0x6f, 0x66, 0x00, 0x73, 0x71, 0x75, 0x61, 0x72, 0x65,
+0x73, 0x2c, 0x00, 0x77, 0x68, 0x69, 0x63, 0x68, 0x00, 0x79,
+0x6f, 0x75, 0x00, 0x6d, 0x75, 0x73, 0x74, 0x00, 0x63, 0x6f,
+0x6c, 0x6f, 0x75, 0x72, 0x00, 0x65, 0x69, 0x74, 0x68, 0x65,
+0x72, 0x00, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x00, 0x6f, 0x72,
+0x26, 0x00, 0x84, 0x74, 0x65, 0x2e, 0x00, 0x53, 0x6f, 0x6d,
+0x65, 0x3b, 0x00, 0x01, 0x57, 0x00, 0xf1, 0x0c, 0x70, 0x72,
+0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x00, 0x61, 0x73, 0x00,
+0x63, 0x6c, 0x75, 0x65, 0x73, 0x3b, 0x00, 0x74, 0x68, 0x65,
+0x00, 0x72, 0x65, 0x73, 0x74, 0x20, 0x00, 0x81, 0x6c, 0x65,
+0x66, 0x74, 0x00, 0x66, 0x6f, 0x72, 0x61, 0x00, 0xf0, 0x09,
+0x74, 0x6f, 0x00, 0x66, 0x69, 0x6c, 0x6c, 0x00, 0x69, 0x6e,
+0x2e, 0x00, 0x45, 0x61, 0x63, 0x68, 0x00, 0x72, 0x6f, 0x77,
+0x00, 0x61, 0x6e, 0x64, 0x75, 0x00, 0x34, 0x75, 0x6d, 0x6e,
+0x81, 0x00, 0x51, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x00,
+0xb0, 0x73, 0x61, 0x6d, 0x65, 0x00, 0x6e, 0x75, 0x6d, 0x62,
+0x65, 0x72, 0xb4, 0x00, 0x02, 0x8e, 0x00, 0x00, 0x31, 0x00,
+0x01, 0x8f, 0x00, 0x06, 0xc4, 0x00, 0x00, 0x13, 0x00, 0x21,
+0x6e, 0x6f, 0x4f, 0x00, 0x25, 0x6f, 0x72, 0x4e, 0x00, 0x27,
+0x61, 0x79, 0x4d, 0x00, 0x30, 0x72, 0x65, 0x65, 0x0e, 0x00,
+0x76, 0x73, 0x65, 0x63, 0x75, 0x74, 0x69, 0x76, 0xc5, 0x00,
+0x26, 0x6f, 0x66, 0x6a, 0x00, 0x02, 0xfc, 0x00, 0xf1, 0x2d,
+0x2e, 0x00, 0x00, 0x00, 0x54, 0x68, 0x69, 0x73, 0x00, 0x70,
+0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x00, 0x74, 0x79, 0x70, 0x65,
+0x00, 0x77, 0x61, 0x73, 0x00, 0x69, 0x6e, 0x76, 0x65, 0x6e,
+0x74, 0x65, 0x64, 0x00, 0x62, 0x79, 0x00, 0x41, 0x64, 0x6f,
+0x6c, 0x66, 0x6f, 0x00, 0x5a, 0x61, 0x6e, 0x65, 0x6c, 0x6c,
+0x61, 0x74, 0x69, 0x2c, 0x00, 0x75, 0x6e, 0x64, 0x65, 0x72,
+0x4c, 0x00, 0x10, 0x6e, 0x4c, 0x00, 0xf1, 0x09, 0x60, 0x54,
+0x6f, 0x68, 0x75, 0x00, 0x77, 0x61, 0x00, 0x56, 0x6f, 0x68,
+0x75, 0x27, 0x2e, 0x00, 0x53, 0x65, 0x65, 0x00, 0x5b, 0x32,
+0x31, 0x5d, 0x0d, 0x01, 0xc0, 0x6d, 0x6f, 0x72, 0x65, 0x00,
+0x64, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x73, 0x6f, 0x00, 0x02,
+0xc2, 0x01, 0x01, 0x65, 0x00, 0x00, 0xb2, 0x00, 0x40, 0x72,
+0x69, 0x62, 0x75, 0x68, 0x00, 0x60, 0x74, 0x6f, 0x00, 0x74,
+0x68, 0x69, 0x14, 0x00, 0x80, 0x6c, 0x6c, 0x65, 0x63, 0x74,
+0x69, 0x6f, 0x6e, 0x7b, 0x00, 0xe0, 0x4c, 0x65, 0x6e, 0x6e,
+0x61, 0x72, 0x64, 0x00, 0x53, 0x70, 0x72, 0x6f, 0x6e, 0x67,
+0x3f, 0x00, 0x01, 0x58, 0x00, 0xf0, 0x0d, 0x68, 0x74, 0x74,
+0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x6a, 0x61,
+0x6e, 0x6b, 0x6f, 0x2e, 0x61, 0x74, 0x2f, 0x52, 0x61, 0x65,
+0x74, 0x73, 0x65, 0x6c, 0x2f, 0x8c, 0x00, 0x40, 0x2d, 0x57,
+0x61, 0x2d, 0x8c, 0x00, 0xf4, 0x02, 0x2f, 0x69, 0x6e, 0x64,
+0x65, 0x78, 0x2e, 0x68, 0x74, 0x6d, 0x00, 0x00, 0x00, 0x33,
+0x38, 0x2e, 0x31, 0x40, 0x02, 0x01, 0x7a, 0x00, 0x40, 0x6f,
+0x6c, 0x73, 0x20, 0x00, 0x01, 0x63, 0x6f, 0x00, 0x70, 0x6c,
+0x61, 0x79, 0x99, 0x00, 0x71, 0x2c, 0x00, 0x63, 0x6c, 0x69,
+0x63, 0x6b, 0xdd, 0x00, 0x70, 0x6d, 0x6f, 0x75, 0x73, 0x65,
+0x00, 0x69, 0x4b, 0x02, 0x02, 0x43, 0x01, 0x00, 0xa6, 0x00,
+0xa5, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x00, 0x69, 0x74,
+0x73, 0x44, 0x01, 0x51, 0x4c, 0x65, 0x66, 0x74, 0x2d, 0x37,
+0x00, 0xc4, 0x69, 0x6e, 0x67, 0x00, 0x61, 0x6e, 0x00, 0x65,
+0x6d, 0x70, 0x74, 0x79, 0x34, 0x00, 0x10, 0x77, 0x07, 0x02,
+0x72, 0x74, 0x75, 0x72, 0x6e, 0x00, 0x69, 0x74, 0xd7, 0x01,
+0x02, 0xc5, 0x01, 0x47, 0x72, 0x69, 0x67, 0x68, 0x37, 0x00,
+0x09, 0x27, 0x00, 0x03, 0x83, 0x02, 0x55, 0x4b, 0x65, 0x65,
+0x70, 0x00, 0x22, 0x00, 0x05, 0xbc, 0x01, 0x61, 0x62, 0x75,
+0x74, 0x74, 0x6f, 0x6e, 0x8d, 0x00, 0x40, 0x79, 0x63, 0x6c,
+0x65, 0xf2, 0x01, 0x41, 0x6f, 0x75, 0x67, 0x68, 0x21, 0x00,
+0x02, 0xfe, 0x01, 0xf1, 0x00, 0x70, 0x6f, 0x73, 0x73, 0x69,
+0x62, 0x6c, 0x65, 0x00, 0x73, 0x74, 0x61, 0x74, 0x65, 0x73,
+0x89, 0x01, 0x24, 0x74, 0x68, 0x0a, 0x02, 0x42, 0x2e, 0x00,
+0x49, 0x66, 0x06, 0x03, 0x52, 0x69, 0x64, 0x64, 0x6c, 0x65,
+0x84, 0x00, 0x09, 0xe8, 0x00, 0x22, 0x69, 0x74, 0x90, 0x00,
+0x11, 0x62, 0xdf, 0x02, 0x20, 0x65, 0x74, 0x6c, 0x00, 0x01,
+0xd5, 0x00, 0x13, 0x2e, 0x67, 0x03, 0x90, 0x63, 0x61, 0x6e,
+0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x22, 0x01, 0x00, 0x5a,
+0x00, 0xb0, 0x63, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x00, 0x6b,
+0x65, 0x79, 0x73, 0x2d, 0x00, 0xb1, 0x6d, 0x6f, 0x76, 0x65,
+0x00, 0x61, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x1f, 0x00, 0x00,
+0x8b, 0x03, 0x74, 0x2e, 0x00, 0x50, 0x72, 0x65, 0x73, 0x73,
+0xcb, 0x00, 0x21, 0x72, 0x65, 0xee, 0x00, 0x82, 0x6f, 0x72,
+0x00, 0x73, 0x70, 0x61, 0x63, 0x65, 0x3b, 0x00, 0x06, 0x06,
+0x01, 0x0c, 0x47, 0x01, 0x0a, 0x9f, 0x03, 0x00, 0x97, 0x00,
+0x30, 0x70, 0x65, 0x63, 0xdf, 0x02, 0x52, 0x6c, 0x79, 0x00,
+0x28, 0x61, 0x67, 0x00, 0x15, 0x6e, 0x11, 0x01, 0x04, 0xe1,
+0x02, 0x28, 0x73, 0x00, 0x5f, 0x03, 0x30, 0x77, 0x61, 0x79,
+0xbd, 0x03, 0x06, 0xdc, 0x01, 0x02, 0x4a, 0x01, 0x22, 0x73,
+0x29, 0x92, 0x01, 0x14, 0x70, 0x9f, 0x00, 0x42, 0x42, 0x61,
+0x63, 0x6b, 0x95, 0x00, 0x01, 0x90, 0x00, 0x02, 0x03, 0x01,
+0x08, 0x05, 0x02, 0x05, 0x0c, 0x01, 0x41, 0x28, 0x41, 0x6c,
+0x6c, 0x50, 0x00, 0x11, 0x61, 0xb4, 0x02, 0xb0, 0x73, 0x00,
+0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x64, 0x79,
+0x00, 0x13, 0x73, 0xca, 0x02, 0x31, 0x32, 0x2e, 0x31, 0x22,
+0x04, 0x01, 0x32, 0x01, 0xb2, 0x61, 0x76, 0x61, 0x69, 0x6c,
+0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0x96, 0x02, 0x14, 0x32,
+0x96, 0x02, 0x92, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+0x65, 0x72, 0x98, 0x02, 0x56, 0x68, 0x65, 0x73, 0x65, 0x00,
+0x14, 0x00, 0x02, 0x42, 0x00, 0x04, 0x3d, 0x00, 0x51, 0x00,
+0x66, 0x72, 0x6f, 0x6d, 0x7a, 0x00, 0xe1, 0x60, 0x43, 0x75,
+0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f,
+0x70, 0x70, 0x00, 0x22, 0x6f, 0x6e, 0x1a, 0x00, 0xa0, 0x54,
+0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0xac,
+0x00, 0x90, 0x57, 0x69, 0x64, 0x74, 0x68, 0x2c, 0x00, 0x48,
+0x65, 0x79, 0x02, 0x70, 0x00, 0x00, 0x00, 0x53, 0x69, 0x7a,
+0x65, 0x14, 0x04, 0x01, 0x27, 0x05, 0x24, 0x69, 0x6e, 0x27,
+0x04, 0x60, 0x2e, 0x00, 0x28, 0x4e, 0x6f, 0x74, 0x45, 0x01,
+0x22, 0x61, 0x74, 0xa9, 0x01, 0x26, 0x75, 0x6c, 0x3d, 0x04,
+0x30, 0x67, 0x61, 0x6d, 0x7d, 0x01, 0x30, 0x71, 0x75, 0x69,
+0x94, 0x01, 0x22, 0x6f, 0x74, 0x76, 0x02, 0x10, 0x77, 0x5b,
+0x00, 0x01, 0x44, 0x01, 0x12, 0x68, 0x5e, 0x00, 0x20, 0x74,
+0x6f, 0x3c, 0x02, 0x10, 0x65, 0x88, 0x05, 0x02, 0xd4, 0x04,
+0x11, 0x73, 0xee, 0x00, 0xe3, 0x44, 0x69, 0x66, 0x66, 0x69,
+0x63, 0x75, 0x6c, 0x74, 0x79, 0x00, 0x00, 0x00, 0x43, 0x85,
+0x03, 0x01, 0x42, 0x00, 0x16, 0x64, 0x1a, 0x00, 0x04, 0x6a,
+0x00, 0x50, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x1c, 0x04, 0x02,
+0x9d, 0x04, 0x02, 0x3d, 0x04, 0xe2, 0x69, 0x71, 0x75, 0x65,
+0x20, 0x72, 0x6f, 0x77, 0x73, 0x20, 0x61, 0x6e, 0x64, 0x20,
+0xff, 0x04, 0x30, 0x73, 0x00, 0x00, 0xd2, 0x02, 0x20, 0x65,
+0x6e, 0x19, 0x01, 0x20, 0x64, 0x2c, 0x1f, 0x05, 0x21, 0x74,
+0x77, 0x23, 0x05, 0x03, 0xb9, 0x05, 0x53, 0x65, 0x72, 0x6d,
+0x69, 0x74, 0x66, 0x04, 0xc6, 0x68, 0x61, 0x76, 0x65, 0x00,
+0x65, 0x78, 0x61, 0x63, 0x74, 0x6c, 0x79, 0x1a, 0x02, 0x72,
+0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x08, 0x02, 0x83,
+0x6c, 0x69, 0x6b, 0x65, 0x77, 0x69, 0x73, 0x65, 0x5e, 0x05,
+0x00, 0x12, 0x01, 0x15, 0x41, 0xc0, 0x05, 0x14, 0x61, 0x74,
+0x05, 0x20, 0x63, 0x61, 0x78, 0x05, 0xe0, 0x74, 0x63, 0x68,
+0x2c, 0x00, 0x74, 0x68, 0x6f, 0x75, 0x67, 0x68, 0x2e, 0x29,
+0x00,
 };
 
-const unsigned short help_text_len = 1688;
-const unsigned short help_text_words = 305;
+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 f7f5c05f24..88b6e39d5a 100644
--- a/apps/plugins/puzzles/help/untangle.c
+++ b/apps/plugins/puzzles/help/untangle.c
@@ -1,4 +1,4 @@
-/* auto-generated on Dec  7 2020 by genhelp.sh */
+/* auto-generated by genhelp.sh */
 /* help text is compressed using LZ4; see compress.c for details */
 /* DO NOT EDIT! */
 
@@ -6,79 +6,96 @@
 
 struct style_text help_text_style[] = {
  { 0, TEXT_CENTER | C_RED },
- { 64, TEXT_CENTER | C_RED },
- { 100, TEXT_CENTER | C_RED },
- { 119, TEXT_UNDERLINE },
+ { 65, TEXT_CENTER | C_RED },
+ { 136, TEXT_CENTER | C_RED },
+ { 155, TEXT_UNDERLINE },
  LAST_STYLE_ITEM
 };
 
-/* orig 751 comp 627 ratio 0.834887 level 4 saved 124 */
+/* orig 974 comp 787 ratio 0.808008 level 4 saved 187 */
 const char help_text[] = {
-0xf0, 0x2f, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
+0xff, 0x08, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x20,
 0x31, 0x38, 0x3a, 0x20, 0x55, 0x6e, 0x74, 0x61, 0x6e, 0x67,
-0x6c, 0x65, 0x20, 0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00,
-0x61, 0x72, 0x65, 0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00,
-0x61, 0x00, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f,
-0x66, 0x00, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x00,
-0x73, 0x6f, 0x6d, 0x65, 0x10, 0x00, 0xf1, 0x15, 0x77, 0x68,
-0x69, 0x63, 0x68, 0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x6c,
-0x69, 0x6e, 0x65, 0x73, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e,
-0x00, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74,
-0x68, 0x65, 0x6d, 0x2e, 0x4f, 0x00, 0x80, 0x63, 0x61, 0x6e,
-0x00, 0x6d, 0x6f, 0x76, 0x65, 0x13, 0x00, 0x03, 0x46, 0x00,
-0xf8, 0x1c, 0x00, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x00, 0x61,
-0x72, 0x62, 0x69, 0x74, 0x72, 0x61, 0x72, 0x69, 0x6c, 0x79,
-0x3b, 0x00, 0x79, 0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d,
-0x00, 0x69, 0x73, 0x00, 0x74, 0x6f, 0x00, 0x70, 0x6f, 0x73,
-0x69, 0x74, 0x69, 0x6f, 0x6e, 0x36, 0x00, 0xa1, 0x73, 0x6f,
-0x00, 0x74, 0x68, 0x61, 0x74, 0x00, 0x6e, 0x6f, 0x73, 0x00,
-0xf2, 0x1c, 0x00, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73,
-0x00, 0x61, 0x6e, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x00,
-0x00, 0x00, 0x49, 0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e,
-0x61, 0x6c, 0x6c, 0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74,
-0x68, 0x69, 0x73, 0x00, 0x69, 0x47, 0x00, 0x40, 0x66, 0x6f,
-0x72, 0x6d, 0xbb, 0x00, 0xf0, 0x2b, 0x61, 0x00, 0x46, 0x6c,
-0x61, 0x73, 0x68, 0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x63,
-0x61, 0x6c, 0x6c, 0x65, 0x64, 0x00, 0x50, 0x6c, 0x61, 0x6e,
-0x61, 0x72, 0x69, 0x74, 0x79, 0x00, 0x5b, 0x37, 0x5d, 0x2c,
-0x00, 0x77, 0x72, 0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62,
-0x79, 0x00, 0x4a, 0x6f, 0x68, 0x6e, 0x00, 0x54, 0x61, 0x6e,
-0x74, 0x61, 0x6c, 0x6f, 0x63, 0x00, 0xc4, 0x5b, 0x37, 0x5d,
-0x00, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x35,
-0x00, 0xb6, 0x2e, 0x6e, 0x65, 0x74, 0x00, 0x00, 0x00, 0x31,
-0x38, 0x2e, 0x31, 0x4f, 0x01, 0x80, 0x63, 0x6f, 0x6e, 0x74,
-0x72, 0x6f, 0x6c, 0x73, 0x58, 0x01, 0x22, 0x54, 0x6f, 0x04,
-0x01, 0x12, 0x61, 0xcc, 0x00, 0xf1, 0x03, 0x2c, 0x00, 0x63,
-0x6c, 0x69, 0x63, 0x6b, 0x00, 0x6f, 0x6e, 0x00, 0x69, 0x74,
-0x00, 0x77, 0x69, 0x74, 0x68, 0xa1, 0x00, 0xf0, 0x06, 0x6c,
-0x65, 0x66, 0x74, 0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00,
-0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x00, 0x61, 0x6e, 0x64,
-0x59, 0x01, 0x10, 0x67, 0x27, 0x00, 0x40, 0x69, 0x6e, 0x74,
-0x6f, 0x93, 0x01, 0x25, 0x65, 0x77, 0x1e, 0x01, 0x00, 0x90,
-0x00, 0x41, 0x28, 0x41, 0x6c, 0x6c, 0x3e, 0x00, 0x20, 0x61,
-0x63, 0x13, 0x00, 0xb0, 0x73, 0x00, 0x64, 0x65, 0x73, 0x63,
-0x72, 0x69, 0x62, 0x65, 0x64, 0xf8, 0x00, 0x21, 0x73, 0x65,
-0x16, 0x00, 0x41, 0x00, 0x32, 0x2e, 0x31, 0xd9, 0x01, 0xf2,
-0x01, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x61, 0x76, 0x61, 0x69,
-0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29, 0xb6, 0x00, 0x16,
-0x32, 0xb6, 0x00, 0x92, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-0x74, 0x65, 0x72, 0xb8, 0x00, 0x40, 0x68, 0x65, 0x72, 0x65,
-0x93, 0x01, 0x95, 0x6f, 0x6e, 0x6c, 0x79, 0x00, 0x6f, 0x6e,
-0x65, 0x00, 0x20, 0x00, 0x06, 0x46, 0x00, 0x51, 0x00, 0x66,
-0x72, 0x6f, 0x6d, 0x83, 0x00, 0xe1, 0x60, 0x43, 0x75, 0x73,
-0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27, 0x00, 0x6f, 0x70,
-0x79, 0x00, 0x03, 0xc3, 0x01, 0xf1, 0x01, 0x60, 0x54, 0x79,
-0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e, 0x75, 0x3a, 0x00,
-0x00, 0x00, 0x4e, 0x58, 0x02, 0x43, 0x20, 0x6f, 0x66, 0x20,
-0xdc, 0x01, 0x33, 0x00, 0x00, 0x43, 0x2f, 0x01, 0x01, 0x2f,
-0x00, 0x31, 0x73, 0x69, 0x7a, 0x66, 0x02, 0x01, 0xfe, 0x01,
-0x60, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c, 0x8c, 0x01, 0xa1,
-0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79, 0x69, 0x6e, 0x67,
-0x1a, 0x00, 0x0c, 0x9e, 0x02, 0x04, 0xe9, 0x01, 0xf0, 0x02,
+0x6c, 0x65, 0x20, 0x00, 0x2d, 0x01, 0x00, 0x00, 0xf0, 0x1a,
+0x00, 0x00, 0x00, 0x59, 0x6f, 0x75, 0x00, 0x61, 0x72, 0x65,
+0x00, 0x67, 0x69, 0x76, 0x65, 0x6e, 0x00, 0x61, 0x00, 0x6e,
+0x75, 0x6d, 0x62, 0x65, 0x72, 0x00, 0x6f, 0x66, 0x00, 0x70,
+0x6f, 0x69, 0x6e, 0x74, 0x73, 0x2c, 0x00, 0x73, 0x6f, 0x6d,
+0x65, 0x10, 0x00, 0xf1, 0x15, 0x77, 0x68, 0x69, 0x63, 0x68,
+0x00, 0x68, 0x61, 0x76, 0x65, 0x00, 0x6c, 0x69, 0x6e, 0x65,
+0x73, 0x00, 0x64, 0x72, 0x61, 0x77, 0x6e, 0x00, 0x62, 0x65,
+0x74, 0x77, 0x65, 0x65, 0x6e, 0x00, 0x74, 0x68, 0x65, 0x6d,
+0x2e, 0x4f, 0x00, 0x80, 0x63, 0x61, 0x6e, 0x00, 0x6d, 0x6f,
+0x76, 0x65, 0x13, 0x00, 0x03, 0x46, 0x00, 0xf8, 0x1c, 0x00,
+0x61, 0x62, 0x6f, 0x75, 0x74, 0x00, 0x61, 0x72, 0x62, 0x69,
+0x74, 0x72, 0x61, 0x72, 0x69, 0x6c, 0x79, 0x3b, 0x00, 0x79,
+0x6f, 0x75, 0x72, 0x00, 0x61, 0x69, 0x6d, 0x00, 0x69, 0x73,
+0x00, 0x74, 0x6f, 0x00, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
+0x6f, 0x6e, 0x36, 0x00, 0xa1, 0x73, 0x6f, 0x00, 0x74, 0x68,
+0x61, 0x74, 0x00, 0x6e, 0x6f, 0x73, 0x00, 0xf2, 0x1c, 0x00,
+0x63, 0x72, 0x6f, 0x73, 0x73, 0x65, 0x73, 0x00, 0x61, 0x6e,
+0x6f, 0x74, 0x68, 0x65, 0x72, 0x2e, 0x00, 0x00, 0x00, 0x49,
+0x00, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x6c,
+0x79, 0x00, 0x73, 0x61, 0x77, 0x00, 0x74, 0x68, 0x69, 0x73,
+0x00, 0x69, 0x47, 0x00, 0x40, 0x66, 0x6f, 0x72, 0x6d, 0xbb,
+0x00, 0xf0, 0x2b, 0x61, 0x00, 0x46, 0x6c, 0x61, 0x73, 0x68,
+0x00, 0x67, 0x61, 0x6d, 0x65, 0x00, 0x63, 0x61, 0x6c, 0x6c,
+0x65, 0x64, 0x00, 0x50, 0x6c, 0x61, 0x6e, 0x61, 0x72, 0x69,
+0x74, 0x79, 0x00, 0x5b, 0x37, 0x5d, 0x2c, 0x00, 0x77, 0x72,
+0x69, 0x74, 0x74, 0x65, 0x6e, 0x00, 0x62, 0x79, 0x00, 0x4a,
+0x6f, 0x68, 0x6e, 0x00, 0x54, 0x61, 0x6e, 0x74, 0x61, 0x6c,
+0x6f, 0x63, 0x00, 0xc4, 0x5b, 0x37, 0x5d, 0x00, 0x68, 0x74,
+0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x70, 0x35, 0x00, 0xb6, 0x2e,
+0x6e, 0x65, 0x74, 0x00, 0x00, 0x00, 0x31, 0x38, 0x2e, 0x31,
+0x64, 0x01, 0xe2, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c,
+0x73, 0x20, 0x00, 0x00, 0x00, 0x54, 0x6f, 0x04, 0x01, 0x12,
+0x61, 0xcc, 0x00, 0xf1, 0x03, 0x2c, 0x00, 0x63, 0x6c, 0x69,
+0x63, 0x6b, 0x00, 0x6f, 0x6e, 0x00, 0x69, 0x74, 0x00, 0x77,
+0x69, 0x74, 0x68, 0xa1, 0x00, 0xf0, 0x06, 0x6c, 0x65, 0x66,
+0x74, 0x00, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x00, 0x62, 0x75,
+0x74, 0x74, 0x6f, 0x6e, 0x00, 0x61, 0x6e, 0x64, 0x59, 0x01,
+0x10, 0x67, 0x27, 0x00, 0x40, 0x69, 0x6e, 0x74, 0x6f, 0x93,
+0x01, 0x25, 0x65, 0x77, 0x1e, 0x01, 0x00, 0x90, 0x00, 0xf0,
+0x11, 0x54, 0x68, 0x65, 0x00, 0x63, 0x75, 0x72, 0x73, 0x6f,
+0x72, 0x00, 0x6b, 0x65, 0x79, 0x73, 0x00, 0x6d, 0x61, 0x79,
+0x00, 0x61, 0x6c, 0x73, 0x6f, 0x00, 0x62, 0x65, 0x00, 0x75,
+0x73, 0x65, 0x64, 0x4e, 0x01, 0xf7, 0x01, 0x6e, 0x61, 0x76,
+0x69, 0x67, 0x61, 0x74, 0x65, 0x00, 0x61, 0x6d, 0x6f, 0x6e,
+0x67, 0x73, 0x74, 0x56, 0x01, 0xa1, 0x2e, 0x00, 0x50, 0x72,
+0x65, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x15, 0x00, 0x41, 0x45,
+0x6e, 0x74, 0x65, 0x49, 0x00, 0xc1, 0x00, 0x77, 0x69, 0x6c,
+0x6c, 0x00, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x83, 0x00,
+0x14, 0x67, 0x23, 0x00, 0xf2, 0x07, 0x63, 0x75, 0x72, 0x72,
+0x65, 0x6e, 0x74, 0x6c, 0x79, 0x2d, 0x00, 0x68, 0x69, 0x67,
+0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x4f, 0x00,
+0x07, 0x4e, 0x00, 0xc2, 0x54, 0x61, 0x62, 0x00, 0x6f, 0x72,
+0x00, 0x53, 0x70, 0x61, 0x63, 0x65, 0x4d, 0x00, 0x40, 0x63,
+0x79, 0x63, 0x6c, 0x07, 0x02, 0x99, 0x72, 0x6f, 0x75, 0x67,
+0x68, 0x00, 0x61, 0x6c, 0x6c, 0x87, 0x00, 0x43, 0x00, 0x00,
+0x28, 0x41, 0x13, 0x00, 0x20, 0x61, 0x63, 0xdd, 0x00, 0xb0,
+0x73, 0x00, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
+0x64, 0xc2, 0x01, 0x21, 0x73, 0x65, 0x16, 0x00, 0x41, 0x00,
+0x32, 0x2e, 0x31, 0xa3, 0x02, 0x01, 0xe4, 0x00, 0xb2, 0x61,
+0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x29,
+0x80, 0x01, 0x16, 0x32, 0x80, 0x01, 0x92, 0x70, 0x61, 0x72,
+0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x82, 0x01, 0x40, 0x68,
+0x65, 0x72, 0x65, 0x5d, 0x02, 0x95, 0x6f, 0x6e, 0x6c, 0x79,
+0x00, 0x6f, 0x6e, 0x65, 0x00, 0x20, 0x00, 0x06, 0x46, 0x00,
+0x51, 0x00, 0x66, 0x72, 0x6f, 0x6d, 0x83, 0x00, 0xe1, 0x60,
+0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x2e, 0x2e, 0x2e, 0x27,
+0x00, 0x6f, 0x70, 0x79, 0x00, 0x03, 0x8d, 0x02, 0xf1, 0x01,
+0x60, 0x54, 0x79, 0x70, 0x65, 0x27, 0x00, 0x6d, 0x65, 0x6e,
+0x75, 0x3a, 0x00, 0x00, 0x00, 0x4e, 0x22, 0x03, 0x43, 0x20,
+0x6f, 0x66, 0x20, 0xa6, 0x02, 0x33, 0x00, 0x00, 0x43, 0xf9,
+0x01, 0x01, 0x2f, 0x00, 0x31, 0x73, 0x69, 0x7a, 0x30, 0x03,
+0x01, 0xeb, 0x00, 0x60, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2c,
+0x56, 0x02, 0x74, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x79,
+0x54, 0x01, 0x0c, 0x68, 0x03, 0x04, 0xb3, 0x02, 0xf0, 0x02,
 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x00,
 0x67, 0x72, 0x61, 0x70, 0x68, 0x2e, 0x00,
 };
 
-const unsigned short help_text_len = 751;
-const unsigned short help_text_words = 138;
+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/rbcompat.h b/apps/plugins/puzzles/rbcompat.h
index 9069c1e659..f37ac8068e 100644
--- a/apps/plugins/puzzles/rbcompat.h
+++ b/apps/plugins/puzzles/rbcompat.h
@@ -34,6 +34,8 @@ int sscanf_wrapper(const char *ibuf, const char *fmt, ...);
 double atof_wrapper(const char *s);
 double acos_wrapper(double x);
 
+#define NO_TGMATH_H
+
 #define acos acos_wrapper
 #define atan atan_wrapper
 #define atan2 atan2_wrapper
diff --git a/apps/plugins/puzzles/resync.sh b/apps/plugins/puzzles/resync.sh
index 76679971a4..3431a6f695 100755
--- a/apps/plugins/puzzles/resync.sh
+++ b/apps/plugins/puzzles/resync.sh
@@ -19,19 +19,58 @@ then
 fi
 
 echo "=== POTENTIALLY DANGEROUS OPERATION ==="
-echo "Are you sure you want to remove all files in src/?"
+echo "Are you sure you want to remove all files in src/ and help/?"
 echo -n "If so, type \"yes\" in all caps: "
 read ans
 if [ "YES" == $ans ]
 then
     pushd "$(dirname "$0")" > /dev/null
+    ROOT="$PWD"
 
     echo "[1/5] Removing current src/ directory"
     rm -rf src
     echo "[2/5] Copying new sources"
-    mkdir src
-    cp -r "$1"/{*.c,*.h,*.R,*.but,LICENCE,README} 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
+    # in SOURCES.core.
+    cat src/CMakeLists.txt | awk '/add_library\(/{p=1} p{printf $0" "} /\)/{if(p) print; p=0}' | grep -E "core|common" | grep -Po "[a-z0-9\-]*?\.c" | sort -n | grep -vE 'malloc\.c|ps\.c' | awk '{print "src/"$0}' | uniq > SOURCES.core
+    echo "src/printing.c" >> SOURCES.core
+
+    # Parse out puzzle definitions to build SOURCES.games, but
+    # preserve the ability to disable puzzles based on memory size.
+    cat src/CMakeLists.txt | awk '/puzzle\(/{p=1} p{print} /\)/{p=0}' | grep -Eo "\(.*$" | tr -dc "a-z\n" | grep -v nullgame | awk '$0!~/loopy|pearl|solo/' | awk '{print "src/"$0".c"}' > SOURCES.games
+
+    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 -r $SRC "$ROOT"/src
+    popd > /dev/null
+
+    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
+
+    cat <<EOF >> SOURCES.games
+
+/* no c200v2 */
+#if PLUGIN_BUFFER_SIZE > 0x14000
+src/loopy.c
+src/pearl.c
+src/solo.c
+#endif
+EOF
+
+    cat <<EOF > SOURCES
+/* Auto-generated by resync.sh */
+EOF
+    cat SOURCES.rockbox | cpp | grep -vE "^#" >> SOURCES
+    echo -e "\n/* puzzles core sources */" >> SOURCES
+    cat SOURCES.core >> SOURCES
+    rm SOURCES.core
+
     echo "[3/5] Regenerating help"
+    rm -rf help
     ./genhelp.sh
 
     echo "[4/5] Staging for commit"
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 263a19f421..27060208fc 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -7,7 +7,7 @@
  *                     \/            \/     \/    \/            \/
  * $Id$
  *
- * Copyright (C) 2016-2020 Franklin Wei
+ * Copyright (C) 2016-2024 Franklin Wei
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -24,10 +24,9 @@
  * ================================
  *
  * This file contains the majority of the rockbox-specific code for
- * the sgt-puzzles port. It implements a set of functions for the
- * backend to call to actually run the games, as well as rockbox UI
- * code (menus, input, etc). For a good overview of the rest of the
- * puzzles code, see:
+ * the sgt-puzzles port. It implements an API for the backend to call
+ * to run the games, as well as the rockbox UI code (menus, input,
+ * etc). For a good overview of the rest of the puzzles code, see:
  *
  * <https://www.chiark.greenend.org.uk/~sgtatham/puzzles/devel/>.
  *
@@ -37,7 +36,7 @@
  * Contents of this file
  * ---------------------
  *
- * By rough order of appearnce in this file:
+ * By rough order of appearance in this file:
  *
  *  1) "Zoom" feature
  *
@@ -62,8 +61,7 @@
  *     mode switching. In commit 5094aaa, this behavior was changed so
  *     that the frontend can now query the backend for the on-screen
  *     cursor location and move the viewport accordingly through the
- *     new midend_get_cursor_location() API (which is not yet merged
- *     into Simon's tree as of October 2020).
+ *     new midend_get_cursor_location() API.
  *
  *  2) Font management
  *
@@ -82,8 +80,8 @@
  *
  *  3) Drawing API
  *
- *     The sgt-puzzles backend wants a set of function pointers to the
- *     usual drawing primitives. [1] If the `zoom_enabled' switch is
+ *     The sgt-puzzles backend wants a set of function pointers to
+ *     typical drawing primitives. [1] If the `zoom_enabled' switch is
  *     on, these call upon the "zoomed" drawing routines in (1).
  *
  *     In the normal un-zoomed case, these functions generally rely on
@@ -108,7 +106,7 @@
  *     a) Mouse mode
  *
  *        This mode is designed to accommodate puzzles without a
- *        keyboard or cursor interface (currently only "Loopy"). We
+ *        keyboard or cursor interface (currently only Loopyx). We
  *        remap the cursor keys to move an on-screen cursor rather
  *        than sending arrow keys to the game.
  *
@@ -163,6 +161,11 @@
  *        cases by waiting until a key has been released before we
  *        send the input keystroke(s) to the game.
  *
+ *     e) Key repeat
+ *
+ *        In some games, we would like to send repeated key events to
+ *        allow long drags. Currently, this is only used in Untangle.
+ *
  *  5) Game configuration and preset management
  *
  *     The backend games specify a hierarchy of user-adjustable game
@@ -170,6 +173,10 @@
  *     generation, etc. Also supplied are a set of "presets" that
  *     specify a predetermined set of configuration parameters.
  *
+ *     In 2023, Simon introduced a User Preferences system that allows
+ *     further customization of the game UI (e.g., "snap to grid" in
+ *     Untangle). Rockbox support for this was added in July 2024.
+ *
  *  6) In-game help
  *
  *     The sgt-puzzles manual (src/puzzles.but) contains a chapter
@@ -315,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 */
 
@@ -339,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;
@@ -741,12 +750,13 @@ 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
  * coordinates */
-static void rb_clip(void *handle, int x, int y, int w, int h)
+static void rb_clip(drawing *dr, int x, int y, int w, int h)
 {
     if(!zoom_enabled)
     {
@@ -776,7 +786,7 @@ static void rb_clip(void *handle, int x, int y, int w, int h)
     }
 }
 
-static void rb_unclip(void *handle)
+static void rb_unclip(drawing *dr)
 {
     if(!zoom_enabled)
     {
@@ -793,7 +803,7 @@ static void rb_unclip(void *handle)
     }
 }
 
-static void rb_draw_text(void *handle, int x, int y, int fonttype,
+static void rb_draw_text(drawing *dr, int x, int y, int fonttype,
                          int fontsize, int align, int color, const char *text)
 {
     (void) fontsize;
@@ -858,7 +868,7 @@ static void rb_draw_text(void *handle, int x, int y, int fonttype,
     }
 }
 
-static void rb_draw_rect(void *handle, int x, int y, int w, int h, int color)
+static void rb_draw_rect(drawing *dr, int x, int y, int w, int h, int color)
 {
     rb_color(color);
     if(!zoom_enabled)
@@ -1000,7 +1010,7 @@ static void draw_antialiased_line(fb_data *fb, int w, int h, int x0, int y0, int
     }
 }
 
-static void rb_draw_line(void *handle, int x1, int y1, int x2, int y2,
+static void rb_draw_line(drawing *dr, int x1, int y1, int x2, int y2,
                          int color)
 {
     rb_color(color);
@@ -1028,349 +1038,7 @@ static void rb_draw_line(void *handle, int x1, int y1, int x2, int y2,
     }
 }
 
-#if 0
-/*
- * draw filled polygon
- * originally by Sebastian Leonhardt (ulmutul)
- * 'count' : number of coordinate pairs
- * 'pxy': array of coordinates. pxy[0]=x0,pxy[1]=y0,...
- * note: provide space for one extra coordinate, because the starting point
- * will automatically be inserted as end point.
- */
-
-/*
- * helper function:
- * find points of intersection between polygon and scanline
- */
-
-#define MAX_INTERSECTION 32
-
-static void fill_poly_line(int scanline, int count, int *pxy)
-{
-    int i;
-    int j;
-    int num_of_intersects;
-    int direct, old_direct;
-    //intersections of every line with scanline (y-coord)
-    int intersection[MAX_INTERSECTION];
-    /* add starting point as ending point */
-    pxy[count*2] = pxy[0];
-    pxy[count*2+1] = pxy[1];
-
-    old_direct=0;
-    num_of_intersects=0;
-    for (i=0; i<count*2; i+=2) {
-        int x1=pxy[i];
-        int y1=pxy[i+1];
-        int x2=pxy[i+2];
-        int y2=pxy[i+3];
-        // skip if line is outside of scanline
-        if (y1 < y2) {
-            if (scanline < y1 || scanline > y2)
-                continue;
-        }
-        else {
-            if (scanline < y2 || scanline > y1)
-                continue;
-        }
-        // calculate x-coord of intersection
-        if (y1==y2) {
-            direct=0;
-        }
-        else {
-            direct = y1>y2 ? 1 : -1;
-            // omit double intersections, if both lines lead in the same direction
-            intersection[num_of_intersects] =
-                x1+((scanline-y1)*(x2-x1))/(y2-y1);
-            if ( (direct!=old_direct)
-                 || (intersection[num_of_intersects] != intersection[num_of_intersects-1])
-                )
-                ++num_of_intersects;
-        }
-        old_direct = direct;
-    }
-
-    // sort points of intersection
-    for (i=0; i<num_of_intersects-1; ++i) {
-        for (j=i+1; j<num_of_intersects; ++j) {
-            if (intersection[j]<intersection[i]) {
-                int temp=intersection[i];
-                intersection[i]=intersection[j];
-                intersection[j]=temp;
-            }
-        }
-    }
-    // draw
-    for (i=0; i<num_of_intersects; i+=2) {
-        rb->lcd_hline(intersection[i], intersection[i+1], scanline);
-    }
-}
-
-/* two extra elements at end of pxy needed */
-static void v_fillarea(int count, int *pxy)
-{
-    int i;
-    int y1, y2;
-
-    // find min and max y coords
-    y1=y2=pxy[1];
-    for (i=3; i<count*2; i+=2) {
-        if (pxy[i] < y1) y1 = pxy[i];
-        else if (pxy[i] > y2) y2 = pxy[i];
-    }
-
-    for (i=y1; i<=y2; ++i) {
-        fill_poly_line(i, count, pxy);
-    }
-}
-#endif
-
-/* I'm a horrible person: this was copy-pasta'd straight from
- * xlcd_draw.c */
-
-/* sort the given coordinates by increasing x value */
-static void sort_points_by_increasing_x(int* x1, int* y1,
-                                        int* x2, int* y2,
-                                        int* x3, int* y3)
-{
-    int x, y;
-    if (*x1 > *x3)
-    {
-        if (*x2 < *x3)       /* x2 < x3 < x1 */
-        {
-            x = *x1; *x1 = *x2; *x2 = *x3; *x3 = x;
-            y = *y1; *y1 = *y2; *y2 = *y3; *y3 = y;
-        }
-        else if (*x2 > *x1)  /* x3 < x1 < x2 */
-        {
-            x = *x1; *x1 = *x3; *x3 = *x2; *x2 = x;
-            y = *y1; *y1 = *y3; *y3 = *y2; *y2 = y;
-        }
-        else               /* x3 <= x2 <= x1 */
-        {
-            x = *x1; *x1 = *x3; *x3 = x;
-            y = *y1; *y1 = *y3; *y3 = y;
-        }
-    }
-    else
-    {
-        if (*x2 < *x1)       /* x2 < x1 <= x3 */
-        {
-            x = *x1; *x1 = *x2; *x2 = x;
-            y = *y1; *y1 = *y2; *y2 = y;
-        }
-        else if (*x2 > *x3)  /* x1 <= x3 < x2 */
-        {
-            x = *x2; *x2 = *x3; *x3 = x;
-            y = *y2; *y2 = *y3; *y3 = y;
-        }
-        /* else already sorted */
-    }
-}
-
-#define sort_points_by_increasing_y(x1, y1, x2, y2, x3, y3)     \
-    sort_points_by_increasing_x(y1, x1, y2, x2, y3, x3)
-
-/* draw a filled triangle, using horizontal lines for speed */
-static void zoom_filltriangle(int x1, int y1,
-                              int x2, int y2,
-                              int x3, int y3)
-{
-    long fp_x1, fp_x2, fp_dx1, fp_dx2;
-    int y;
-    sort_points_by_increasing_y(&x1, &y1, &x2, &y2, &x3, &y3);
-
-    if (y1 < y3)  /* draw */
-    {
-        fp_dx1 = ((x3 - x1) << 16) / (y3 - y1);
-        fp_x1  = (x1 << 16) + (1<<15) + (fp_dx1 >> 1);
-
-        if (y1 < y2)  /* first part */
-        {
-            fp_dx2 = ((x2 - x1) << 16) / (y2 - y1);
-            fp_x2  = (x1 << 16) + (1<<15) + (fp_dx2 >> 1);
-            for (y = y1; y < y2; y++)
-            {
-                zoom_hline(fp_x1 >> 16, fp_x2 >> 16, y);
-                fp_x1 += fp_dx1;
-                fp_x2 += fp_dx2;
-            }
-        }
-        if (y2 < y3)  /* second part */
-        {
-            fp_dx2 = ((x3 - x2) << 16) / (y3 - y2);
-            fp_x2 = (x2 << 16) + (1<<15) + (fp_dx2 >> 1);
-            for (y = y2; y < y3; y++)
-            {
-                zoom_hline(fp_x1 >> 16, fp_x2 >> 16, y);
-                fp_x1 += fp_dx1;
-                fp_x2 += fp_dx2;
-            }
-        }
-    }
-}
-
-/* Should probably refactor this */
-static void rb_draw_poly(void *handle, int *coords, int npoints,
-                         int fillcolor, int outlinecolor)
-{
-    if(!zoom_enabled)
-    {
-        LOGF("rb_draw_poly");
-
-        if(fillcolor >= 0)
-        {
-            rb_color(fillcolor);
-#if 1
-            /* serious hack: draw a bunch of triangles between adjacent points */
-            /* this generally works, even with some concave polygons */
-            for(int i = 2; i < npoints; ++i)
-            {
-                int x1, y1, x2, y2, x3, y3;
-                x1 = coords[0];
-                y1 = coords[1];
-                x2 = coords[(i - 1) * 2];
-                y2 = coords[(i - 1) * 2 + 1];
-                x3 = coords[i * 2];
-                y3 = coords[i * 2 + 1];
-                offset_coords(&x1, &y1);
-                offset_coords(&x2, &y2);
-                offset_coords(&x3, &y3);
-                xlcd_filltriangle(x1, y1,
-                                  x2, y2,
-                                  x3, y3);
-
-#ifdef DEBUG_MENU
-                if(debug_settings.polyanim)
-                {
-                    rb->lcd_update();
-                    rb->sleep(HZ/4);
-                }
-#endif
-#if 0
-                /* debug code */
-                rb->lcd_set_foreground(LCD_RGBPACK(255,0,0));
-                rb->lcd_drawpixel(x1, y1);
-                rb->lcd_drawpixel(x2, y2);
-                rb->lcd_drawpixel(x3, y3);
-                rb->lcd_update();
-                rb->sleep(HZ);
-                rb_color(fillcolor);
-                rb->lcd_drawpixel(x1, y1);
-                rb->lcd_drawpixel(x2, y2);
-                rb->lcd_drawpixel(x3, y3);
-                rb->lcd_update();
-#endif
-            }
-#else
-            int *pxy = smalloc(sizeof(int) * 2 * npoints + 2);
-            /* copy points, offsetted */
-            for(int i = 0; i < npoints; ++i)
-            {
-                pxy[2 * i + 0] = coords[2 * i + 0];
-                pxy[2 * i + 1] = coords[2 * i + 1];
-                offset_coords(&pxy[2*i+0], &pxy[2*i+1]);
-            }
-            v_fillarea(npoints, pxy);
-            sfree(pxy);
-#endif
-        }
-
-        /* draw outlines last so they're not covered by the fill */
-        assert(outlinecolor >= 0);
-        rb_color(outlinecolor);
-
-        for(int i = 1; i < npoints; ++i)
-        {
-            int x1, y1, x2, y2;
-            x1 = coords[2 * (i - 1)];
-            y1 = coords[2 * (i - 1) + 1];
-            x2 = coords[2 * i];
-            y2 = coords[2 * i + 1];
-            if(debug_settings.no_aa)
-            {
-                offset_coords(&x1, &y1);
-                offset_coords(&x2, &y2);
-                rb->lcd_drawline(x1, y1,
-                                 x2, y2);
-            }
-            else
-                draw_antialiased_line(lcd_fb, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2);
-
-#ifdef DEBUG_MENU
-            if(debug_settings.polyanim)
-            {
-                rb->lcd_update();
-                rb->sleep(HZ/4);
-            }
-#endif
-        }
-
-        int x1, y1, x2, y2;
-        x1 = coords[0];
-        y1 = coords[1];
-        x2 = coords[2 * (npoints - 1)];
-        y2 = coords[2 * (npoints - 1) + 1];
-        if(debug_settings.no_aa)
-        {
-            offset_coords(&x1, &y1);
-            offset_coords(&x2, &y2);
-
-            rb->lcd_drawline(x1, y1,
-                             x2, y2);
-        }
-        else
-            draw_antialiased_line(lcd_fb, LCD_WIDTH, LCD_HEIGHT, x1, y1, x2, y2);
-    }
-    else
-    {
-        LOGF("rb_draw_poly");
-
-        if(fillcolor >= 0)
-        {
-            rb_color(fillcolor);
-
-            /* serious hack: draw a bunch of triangles between adjacent points */
-            /* this generally works, even with some concave polygons */
-            for(int i = 2; i < npoints; ++i)
-            {
-                int x1, y1, x2, y2, x3, y3;
-                x1 = coords[0];
-                y1 = coords[1];
-                x2 = coords[(i - 1) * 2];
-                y2 = coords[(i - 1) * 2 + 1];
-                x3 = coords[i * 2];
-                y3 = coords[i * 2 + 1];
-                zoom_filltriangle(x1, y1,
-                                  x2, y2,
-                                  x3, y3);
-            }
-        }
-
-        /* draw outlines last so they're not covered by the fill */
-        assert(outlinecolor >= 0);
-        rb_color(outlinecolor);
-
-        for(int i = 1; i < npoints; ++i)
-        {
-            int x1, y1, x2, y2;
-            x1 = coords[2 * (i - 1)];
-            y1 = coords[2 * (i - 1) + 1];
-            x2 = coords[2 * i];
-            y2 = coords[2 * i + 1];
-            draw_antialiased_line(zoom_fb, zoom_w, zoom_h, x1, y1, x2, y2);
-        }
-
-        int x1, y1, x2, y2;
-        x1 = coords[0];
-        y1 = coords[1];
-        x2 = coords[2 * (npoints - 1)];
-        y2 = coords[2 * (npoints - 1) + 1];
-        draw_antialiased_line(zoom_fb, zoom_w, zoom_h, x1, y1, x2, y2);
-    }
-}
-
-static void rb_draw_circle(void *handle, int cx, int cy, int radius,
+static void rb_draw_circle(drawing *dr, int cx, int cy, int radius,
                            int fillcolor, int outlinecolor)
 {
     if(!zoom_enabled)
@@ -1442,7 +1110,7 @@ static void trim_rect(int *x, int *y, int *w, int *h)
     *h = y1 - y0;
 }
 
-static blitter *rb_blitter_new(void *handle, int w, int h)
+static blitter *rb_blitter_new(drawing *dr, int w, int h)
 {
     LOGF("rb_blitter_new");
     blitter *b = snew(blitter);
@@ -1453,7 +1121,7 @@ static blitter *rb_blitter_new(void *handle, int w, int h)
     return b;
 }
 
-static void rb_blitter_free(void *handle, blitter *bl)
+static void rb_blitter_free(drawing *dr, blitter *bl)
 {
     LOGF("rb_blitter_free");
     sfree(bl->bmp.data);
@@ -1462,7 +1130,7 @@ static void rb_blitter_free(void *handle, blitter *bl)
 }
 
 /* copy a section of the framebuffer */
-static void rb_blitter_save(void *handle, blitter *bl, int x, int y)
+static void rb_blitter_save(drawing *dr, blitter *bl, int x, int y)
 {
     /* no viewport offset */
 #if LCD_STRIDEFORMAT == VERTICAL_STRIDE
@@ -1491,7 +1159,7 @@ static void rb_blitter_save(void *handle, blitter *bl, int x, int y)
 #endif
 }
 
-static void rb_blitter_load(void *handle, blitter *bl, int x, int y)
+static void rb_blitter_load(drawing *dr, blitter *bl, int x, int y)
 {
     LOGF("rb_blitter_load");
     if(!bl->have_data)
@@ -1521,7 +1189,7 @@ static void rb_blitter_load(void *handle, blitter *bl, int x, int y)
     }
 }
 
-static void rb_draw_update(void *handle, int x, int y, int w, int h)
+static void rb_draw_update(drawing *dr, int x, int y, int w, int h)
 {
     LOGF("rb_draw_update(%d, %d, %d, %d)", x, y, w, h);
 
@@ -1545,9 +1213,9 @@ static void rb_draw_update(void *handle, int x, int y, int w, int h)
     need_draw_update = true;
 }
 
-static void rb_start_draw(void *handle)
+static void rb_start_draw(drawing *dr)
 {
-    (void) handle;
+    (void) dr;
 
     /* ... mumble mumble ... not ... reentrant ... mumble mumble ... */
 
@@ -1558,9 +1226,9 @@ static void rb_start_draw(void *handle)
     ud_d = LCD_HEIGHT;
 }
 
-static void rb_end_draw(void *handle)
+static void rb_end_draw(drawing *dr)
 {
-    (void) handle;
+    (void) dr;
 
     if(debug_settings.highlight_cursor)
     {
@@ -1587,7 +1255,7 @@ static void rb_end_draw(void *handle)
 #endif
 }
 
-static void rb_status_bar(void *handle, const char *text)
+static void rb_status_bar(drawing *dr, const char *text)
 {
     if(titlebar)
         sfree(titlebar);
@@ -1619,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);
@@ -1685,7 +1354,7 @@ static void draw_mouse(void)
  * glyph exists in a font) */
 #if 0
 /* See: https://www.chiark.greenend.org.uk/~sgtatham/puzzles/devel/drawing.html#drawing-text-fallback */
-static char *rb_text_fallback(void *handle, const char *const *strings,
+static char *rb_text_fallback(drawing *dr, const char *const *strings,
                               int nstrings)
 {
     struct font *pf = rb->font_get(cur_font);
@@ -1718,10 +1387,11 @@ static char *rb_text_fallback(void *handle, const char *const *strings,
 #endif
 
 const drawing_api rb_drawing = {
+    1,
     rb_draw_text,
     rb_draw_rect,
     rb_draw_line,
-    rb_draw_poly,
+    draw_polygon_fallback,
     rb_draw_circle,
     rb_draw_update,
     rb_clip,
@@ -2016,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;
@@ -2268,7 +1946,7 @@ static void zoom(void)
     zoom_clipl = 0;
     zoom_clipr = zoom_w;
 
-    midend_size(me, &zoom_w, &zoom_h, true);
+    midend_size(me, &zoom_w, &zoom_h, true, 1.0);
 
     /* Allocating the framebuffer will mostly likely grab the
      * audiobuffer, which will make impossible to load new fonts, and
@@ -2448,7 +2126,6 @@ static int list_choose(const char *list_str, const char *title, int sel)
     struct gui_synclist list;
 
     rb->gui_synclist_init(&list, &config_choices_formatter, (void*)list_str, false, 1, NULL);
-    rb->gui_synclist_set_icon_callback(&list, NULL);
     rb->gui_synclist_set_nb_items(&list, n);
 
     rb->gui_synclist_select_item(&list, sel);
@@ -2634,10 +2311,10 @@ const char *config_formatter(int sel, void *data, char *buf, size_t len)
     return buf;
 }
 
-static bool config_menu(void)
+static bool config_menu_core(int which)
 {
     char *title;
-    config_item *config = midend_get_config(me, CFG_SETTINGS, &title);
+    config_item *config = midend_get_config(me, which, &title);
 
     rb->lcd_setfont(cur_font = FONT_UI);
 
@@ -2661,7 +2338,6 @@ static bool config_menu(void)
     struct gui_synclist list;
 
     rb->gui_synclist_init(&list, &config_formatter, config, false, 1, NULL);
-    rb->gui_synclist_set_icon_callback(&list, NULL);
     rb->gui_synclist_set_nb_items(&list, n);
 
     rb->gui_synclist_select_item(&list, 0);
@@ -2689,7 +2365,7 @@ static bool config_menu(void)
                 old_str = dupstr(old.u.string.sval);
 
             bool freed_str = do_configure_item(config, pos);
-            const char *err = midend_set_config(me, CFG_SETTINGS, config);
+            const char *err = midend_set_config(me, which, config);
 
             if(err)
             {
@@ -2728,6 +2404,16 @@ done:
     return success;
 }
 
+static bool config_menu(void)
+{
+    return config_menu_core(CFG_SETTINGS);
+}
+
+static bool preferences_menu(void)
+{
+    return config_menu_core(CFG_PREFS);
+}
+
 static const char *preset_formatter(int sel, void *data, char *buf, size_t len)
 {
     struct preset_menu *menu = data;
@@ -2746,7 +2432,6 @@ static int do_preset_menu(struct preset_menu *menu, char *title, int selected)
     struct gui_synclist list;
 
     rb->gui_synclist_init(&list, &preset_formatter, menu, false, 1, NULL);
-    rb->gui_synclist_set_icon_callback(&list, NULL);
     rb->gui_synclist_set_nb_items(&list, menu->n_entries);
 
     rb->gui_synclist_select_item(&list, selected);
@@ -2809,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)
     {
@@ -2819,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;
@@ -2878,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)
@@ -3028,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;
@@ -3078,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
@@ -3108,8 +2801,9 @@ static int pause_menu(void)
                         "Game Type",           // 10
                         "Debug Menu",          // 11
                         "Configure Game",      // 12
-                        "Quit without Saving", // 13
-                        "Quit");               // 14
+                        "Preferences",         // 13
+                        "Quit without Saving", // 14
+                        "Quit");               // 15
 
 #if defined(FOR_REAL) && defined(DEBUG_MENU)
     help_times = 0;
@@ -3190,15 +2884,19 @@ static int pause_menu(void)
                 quit = true;
             }
             break;
-        case 13:
-            return -2;
+        case 13:
+            preferences_menu();
+            // do not go straight into game.
+            break;
         case 14:
+            return -2;
+        case 15:
             return -3;
         default:
             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();
@@ -3217,7 +2915,7 @@ static void fix_size(void)
     rb->lcd_setfont(cur_font = FONT_UI);
     rb->lcd_getstringsize("X", NULL, &h_x);
     h -= h_x;
-    midend_size(me, &w, &h, true);
+    midend_size(me, &w, &h, true, 1.0);
 }
 
 static void init_tlsf(void)
@@ -3245,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;
@@ -3277,32 +2976,39 @@ static bool string_in_list(const char *target, const char **list)
 static void tune_input(const char *name)
 {
     static const char *want_spacebar[] = {
+        "Black Box",
+        "Bridges",
+        "Galaxies",
+        "Keen",
         "Magnets",
         "Map",
         "Mines",
         "Palisade",
+        "Pattern",
         "Rectangles",
+        "Signpost",
+        "Singles",
+        "Solo",
+        "Tents",
+        "Towers",
+        "Unequal",
+        "Group",
         NULL
     };
 
-    /* these get a spacebar on long click - you must also add to the
-     * falling_edge list below! */
+    /* these get a spacebar on long click - this implicitly enables
+     * falling-edge button events (see below)! */
     input_settings.want_spacebar = string_in_list(name, want_spacebar);
 
     static const char *falling_edge[] = {
         "Inertia",
-        "Magnets",
-        "Map",
-        "Mines",
-        "Palisade",
-        "Rectangles",
         NULL
     };
 
     /* wait until a key is released to send an action (useful for
      * chording in Inertia; must be enabled if the game needs a
      * spacebar) */
-    input_settings.falling_edge = string_in_list(name, falling_edge);
+    input_settings.falling_edge = string_in_list(name, falling_edge) || input_settings.want_spacebar;
 
     /* For want_spacebar to work, events must be sent on the falling
      * edge */
@@ -3322,6 +3028,7 @@ static void tune_input(const char *name)
     static const char *no_rclick_on_hold[] = {
         "Map",
         "Signpost",
+        "Slide",
         "Untangle",
         NULL
     };
@@ -3330,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",
@@ -3627,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;
@@ -3691,8 +3411,9 @@ static void puzzles_main(void)
                         "Playback Control",    // 4
                         "Game Type",           // 5
                         "Configure Game",      // 6
-                        "Quit without Saving", // 7
-                        "Quit");               // 8
+                        "Preferences",         // 7
+                        "Quit without Saving", // 8
+                        "Quit");               // 9
 
     bool quit = false;
     int sel = 0;
@@ -3738,11 +3459,14 @@ static void puzzles_main(void)
                 goto game_loop;
             }
             break;
-        case 8:
+        case 7:
+            preferences_menu();
+            break;
+        case 9:
             if(load_success)
                 save_game();
             /* fall through */
-        case 7:
+        case 8:
             /* we don't care about freeing anything because tlsf will
              * be wiped out the next time around */
             return;
@@ -3787,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;
@@ -3822,6 +3548,7 @@ static void puzzles_main(void)
             rb->yield();
         }
         sfree(colors);
+        colors = NULL;
     }
 }
 
diff --git a/apps/plugins/puzzles/src/CMakeLists.txt b/apps/plugins/puzzles/src/CMakeLists.txt
new file mode 100644
index 0000000000..ce3ce3d3df
--- /dev/null
+++ b/apps/plugins/puzzles/src/CMakeLists.txt
@@ -0,0 +1,291 @@
+cmake_minimum_required(VERSION 3.5)
+
+project(puzzles
+  LANGUAGES C)
+
+include(cmake/setup.cmake)
+
+add_library(core_obj OBJECT
+  combi.c divvy.c draw-poly.c drawing.c dsf.c findloop.c grid.c
+  latin.c laydomino.c loopgen.c malloc.c matching.c midend.c misc.c
+  penrose.c penrose-legacy.c ps.c random.c sort.c tdq.c tree234.c
+  version.c
+  ${platform_common_sources})
+add_library(core $<TARGET_OBJECTS:core_obj>)
+add_library(common $<TARGET_OBJECTS:core_obj> hat.c spectre.c)
+
+cliprogram(polygon-test draw-poly.c
+  SDL2_LIB COMPILE_DEFINITIONS STANDALONE_POLYGON)
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+puzzle(blackbox
+  DISPLAYNAME "Black Box"
+  DESCRIPTION "Ball-finding puzzle"
+  OBJECTIVE "Find the hidden balls in the box by bouncing laser beams \
+off them.")
+
+puzzle(bridges
+  DISPLAYNAME "Bridges"
+  DESCRIPTION "Bridge-placing puzzle"
+  OBJECTIVE "Connect all the islands with a network of bridges.")
+
+puzzle(cube
+  DISPLAYNAME "Cube"
+  DESCRIPTION "Rolling cube puzzle"
+  OBJECTIVE "Pick up all the blue squares by rolling the cube over them.")
+
+puzzle(dominosa
+  DISPLAYNAME "Dominosa"
+  DESCRIPTION "Domino tiling puzzle"
+  OBJECTIVE "Tile the rectangle with a full set of dominoes.")
+solver(dominosa)
+
+puzzle(fifteen
+  DISPLAYNAME "Fifteen"
+  DESCRIPTION "Sliding block puzzle"
+  OBJECTIVE "Slide the tiles around to arrange them into order.")
+solver(fifteen)
+
+puzzle(filling
+  DISPLAYNAME "Filling"
+  DESCRIPTION "Polyomino puzzle"
+  OBJECTIVE "Mark every square with the area of its containing region.")
+solver(filling)
+
+puzzle(flip
+  DISPLAYNAME "Flip"
+  DESCRIPTION "Tile inversion puzzle"
+  OBJECTIVE "Flip groups of squares to light them all up at once.")
+
+puzzle(flood
+  DISPLAYNAME "Flood"
+  DESCRIPTION "Flood-filling puzzle"
+  OBJECTIVE "Turn the grid the same colour in as few flood fills as possible.")
+
+puzzle(galaxies
+  DISPLAYNAME "Galaxies"
+  DESCRIPTION "Symmetric polyomino puzzle"
+  OBJECTIVE "Divide the grid into rotationally symmetric regions each \
+centred on a dot.")
+solver(galaxies)
+cliprogram(galaxiespicture galaxies.c
+  COMPILE_DEFINITIONS STANDALONE_PICTURE_GENERATOR)
+guiprogram(galaxieseditor galaxies.c
+  COMPILE_DEFINITIONS EDITOR)
+
+puzzle(guess
+  DISPLAYNAME "Guess"
+  DESCRIPTION "Combination-guessing puzzle"
+  OBJECTIVE "Guess the hidden combination of colours.")
+
+puzzle(inertia
+  DISPLAYNAME "Inertia"
+  DESCRIPTION "Gem-collecting puzzle"
+  OBJECTIVE "Collect all the gems without running into any of the mines.")
+
+puzzle(keen
+  DISPLAYNAME "Keen"
+  DESCRIPTION "Arithmetic Latin square puzzle"
+  OBJECTIVE "Complete the latin square in accordance with the \
+arithmetic clues.")
+solver(keen latin.c)
+
+puzzle(lightup
+  DISPLAYNAME "Light Up"
+  DESCRIPTION "Light-bulb placing puzzle"
+  OBJECTIVE "Place bulbs to light up all the squares.")
+solver(lightup)
+
+puzzle(loopy
+  DISPLAYNAME "Loopy"
+  DESCRIPTION "Loop-drawing puzzle"
+  OBJECTIVE "Draw a single closed loop, given clues about number of \
+adjacent edges.")
+solver(loopy)
+
+puzzle(magnets
+  DISPLAYNAME "Magnets"
+  DESCRIPTION "Magnet-placing puzzle"
+  OBJECTIVE "Place magnets to satisfy the clues and avoid like poles \
+touching.")
+solver(magnets)
+
+puzzle(map
+  DISPLAYNAME "Map"
+  DESCRIPTION "Map-colouring puzzle"
+  OBJECTIVE "Colour the map so that adjacent regions are never the \
+same colour.")
+solver(map)
+
+puzzle(mines
+  DISPLAYNAME "Mines"
+  DESCRIPTION "Mine-finding puzzle"
+  OBJECTIVE "Find all the mines without treading on any of them.")
+cliprogram(mineobfusc mines.c COMPILE_DEFINITIONS STANDALONE_OBFUSCATOR)
+
+puzzle(mosaic
+  DISPLAYNAME "Mosaic"
+  DESCRIPTION "Grid-filling puzzle"
+  OBJECTIVE "Fill in the grid given clues about number of \
+nearby black squares.")
+
+puzzle(net
+  # The Windows Net shouldn't be called 'net.exe', since Windows
+  # already has a reasonably important utility program by that name!
+  WINDOWS_EXE_NAME netgame
+
+  DISPLAYNAME "Net"
+  DESCRIPTION "Network jigsaw puzzle"
+  OBJECTIVE "Rotate each tile to reassemble the network.")
+
+puzzle(netslide
+  DISPLAYNAME "Netslide"
+  DESCRIPTION "Toroidal sliding network puzzle"
+  OBJECTIVE "Slide a row at a time to reassemble the network.")
+
+puzzle(nullgame)
+
+puzzle(palisade
+  DISPLAYNAME "Palisade"
+  DESCRIPTION "Grid-division puzzle"
+  OBJECTIVE "Divide the grid into equal-sized areas in accordance with\
+ the clues.")
+
+puzzle(pattern
+  DISPLAYNAME "Pattern"
+  DESCRIPTION "Pattern puzzle"
+  OBJECTIVE "Fill in the pattern in the grid, given only the lengths \
+of runs of black squares.")
+solver(pattern)
+cliprogram(patternpicture pattern.c
+  COMPILE_DEFINITIONS STANDALONE_PICTURE_GENERATOR)
+
+puzzle(pearl
+  DISPLAYNAME "Pearl"
+  DESCRIPTION "Loop-drawing puzzle"
+  OBJECTIVE "Draw a single closed loop, given clues about corner and \
+straight squares.")
+solver(pearl)
+cliprogram(pearlbench pearl.c COMPILE_DEFINITIONS STANDALONE_SOLVER)
+
+puzzle(pegs
+  DISPLAYNAME "Pegs"
+  DESCRIPTION "Peg solitaire puzzle"
+  OBJECTIVE "Jump pegs over each other to remove all but one.")
+
+puzzle(range
+  DISPLAYNAME "Range"
+  DESCRIPTION "Visible-distance puzzle"
+  OBJECTIVE "Place black squares to limit the visible distance from \
+each numbered cell.")
+
+puzzle(rect
+  DISPLAYNAME "Rectangles"
+  DESCRIPTION "Rectangles puzzle"
+  OBJECTIVE "Divide the grid into rectangles with areas equal to the \
+numbers.")
+
+puzzle(samegame
+  DISPLAYNAME "Same Game"
+  DESCRIPTION "Block-clearing puzzle"
+  OBJECTIVE "Clear the grid by removing touching groups of the same \
+colour squares.")
+
+puzzle(signpost
+  DISPLAYNAME "Signpost"
+  DESCRIPTION "Square-connecting puzzle"
+  OBJECTIVE "Connect the squares into a path following the arrows.")
+solver(signpost)
+
+puzzle(singles
+  DISPLAYNAME "Singles"
+  DESCRIPTION "Number-removing puzzle"
+  OBJECTIVE "Black out the right set of duplicate numbers.")
+solver(singles)
+
+puzzle(sixteen
+  DISPLAYNAME "Sixteen"
+  DESCRIPTION "Toroidal sliding block puzzle"
+  OBJECTIVE "Slide a row at a time to arrange the tiles into order.")
+
+puzzle(slant
+  DISPLAYNAME "Slant"
+  DESCRIPTION "Maze-drawing puzzle"
+  OBJECTIVE "Draw a maze of slanting lines that matches the clues.")
+solver(slant)
+
+puzzle(solo
+  DISPLAYNAME "Solo"
+  DESCRIPTION "Number placement puzzle"
+  OBJECTIVE "Fill in the grid so that each row, column and square \
+block contains one of every digit.")
+solver(solo)
+
+puzzle(tents
+  DISPLAYNAME "Tents"
+  DESCRIPTION "Tent-placing puzzle"
+  OBJECTIVE "Place a tent next to each tree.")
+solver(tents)
+
+puzzle(towers
+  DISPLAYNAME "Towers"
+  DESCRIPTION "Tower-placing Latin square puzzle"
+  OBJECTIVE "Complete the latin square of towers in accordance with \
+the clues.")
+solver(towers latin.c)
+
+puzzle(tracks
+  DISPLAYNAME "Tracks"
+  DESCRIPTION "Path-finding railway track puzzle"
+  OBJECTIVE "Fill in the railway track according to the clues.")
+solver(tracks)
+
+puzzle(twiddle
+  DISPLAYNAME "Twiddle"
+  DESCRIPTION "Rotational sliding block puzzle"
+  OBJECTIVE "Rotate the tiles around themselves to arrange them into order.")
+
+puzzle(undead
+  DISPLAYNAME "Undead"
+  DESCRIPTION "Monster-placing puzzle"
+  OBJECTIVE "Place ghosts, vampires and zombies so that the right \
+numbers of them can be seen in mirrors.")
+
+puzzle(unequal
+  DISPLAYNAME "Unequal"
+  DESCRIPTION "Latin square puzzle"
+  OBJECTIVE "Complete the latin square in accordance with the > signs.")
+solver(unequal latin.c)
+
+puzzle(unruly
+  DISPLAYNAME "Unruly"
+  DESCRIPTION "Black and white grid puzzle"
+  OBJECTIVE "Fill in the black and white grid to avoid runs of three.")
+solver(unruly)
+
+puzzle(untangle
+  DISPLAYNAME "Untangle"
+  DESCRIPTION "Planar graph layout puzzle"
+  OBJECTIVE "Reposition the points so that the lines do not cross.")
+
+add_subdirectory(unfinished)
+add_subdirectory(auxiliary)
+
+if(build_cli_programs)
+  write_generated_games_header()
+  include(CheckFunctionExists)
+  check_function_exists(HF_ITER HAVE_HF_ITER)
+  set(WITH_LIBFUZZER OFF
+    CACHE BOOL "Build fuzzpuzz using Clang's libFuzzer")
+  cliprogram(fuzzpuzz fuzzpuzz.c list.c ${puzzle_sources}
+    COMPILE_DEFINITIONS COMBINED $<$<BOOL:${WITH_LIBFUZZER}>:OMIT_MAIN>
+    $<$<BOOL:${HAVE_HF_ITER}>:HAVE_HF_ITER>)
+  target_include_directories(fuzzpuzz PRIVATE ${generated_include_dir})
+  if(WITH_LIBFUZZER)
+    target_compile_options(fuzzpuzz PRIVATE -fsanitize=fuzzer)
+    set_target_properties(fuzzpuzz PROPERTIES LINK_FLAGS -fsanitize=fuzzer)
+  endif()
+endif()
+
+build_extras()
diff --git a/apps/plugins/puzzles/src/LICENCE b/apps/plugins/puzzles/src/LICENCE
index 85f67ba795..d33dae80af 100644
--- a/apps/plugins/puzzles/src/LICENCE
+++ b/apps/plugins/puzzles/src/LICENCE
@@ -1,9 +1,9 @@
-This software is copyright (c) 2004-2014 Simon Tatham.
+This software is copyright (c) 2004-2024 Simon Tatham.
 
 Portions copyright Richard Boulton, James Harvey, Mike Pinna, Jonas
 Kölker, Dariusz Olszewski, Michael Schierl, Lambros Lambrou, Bernd
 Schmidt, Steffen Bauer, Lennard Sprong, Rogier Goossens, Michael
-Quevillon and Asher Gordon.
+Quevillon, Asher Gordon, Didi Kohen and Ben Harris.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
diff --git a/apps/plugins/puzzles/src/README b/apps/plugins/puzzles/src/README
index 00830126e8..dd76edc19b 100644
--- a/apps/plugins/puzzles/src/README
+++ b/apps/plugins/puzzles/src/README
@@ -2,48 +2,12 @@ This is the README accompanying the source code to Simon Tatham's
 puzzle collection. The collection's web site is at
 <https://www.chiark.greenend.org.uk/~sgtatham/puzzles/>.
 
-If you've obtained the source code by downloading a .tar.gz archive
-from the Puzzles web site, you should find several Makefiles in the
-source code. However, if you've checked the source code out from the
-Puzzles git repository, you won't find the Makefiles: they're
-automatically generated by `mkfiles.pl', so run that to create them.
+The puzzle collection is built using CMake <https://cmake.org/>. To
+compile in the simplest way (on any of Linux, Windows or Mac), run
+these commands in the source directory:
 
-The Makefiles include:
-
- - `Makefile.am', together with the static `configure.ac', is intended
-   as input to automake. Run `mkauto.sh' to turn these into a
-   configure script and Makefile.in, after which you can then run
-   `./configure' to create an actual Unix Makefile.
-
- - `Makefile.vc' should work under MS Visual C++ on Windows. Run
-   'nmake /f Makefile.vc' in a Visual Studio command prompt.
-
- - `Makefile.cyg' should work under Cygwin / MinGW. With appropriate
-   tweaks and setting of TOOLPATH, it should work for both compiling
-   on Windows and cross-compiling on Unix.
-
- - `Makefile.osx' should work under Mac OS X, provided the Xcode
-   tools are installed. It builds a single monolithic OS X
-   application capable of running any of the puzzles, or even more
-   than one of them at a time.
-
- - `Makefile.wce' should work under MS eMbedded Visual C++ on
-   Windows and the Pocket PC SDK; it builds Pocket PC binaries.
-
-Many of these Makefiles build a program called `nullgame' in
-addition to the actual game binaries. This program doesn't do
-anything; it's just a template for people to start from when adding
-a new game to the collection, and it's compiled every time to ensure
-that it _does_ compile and link successfully (because otherwise it
-wouldn't be much use as a template). Once it's built, you can run it
-if you really want to (but it's very boring), and then you should
-ignore it.
-
-DO NOT EDIT THE MAKEFILES DIRECTLY, if you plan to send any changes
-back to the maintainer. The makefiles are generated automatically by
-the Perl script `mkfiles.pl' from the file `Recipe' and the various
-.R files. If you need to change the makefiles as part of a patch,
-you should change Recipe, *.R, and/or mkfiles.pl.
+  cmake .
+  cmake --build .
 
 The manual is provided in Windows Help format for the Windows build;
 in text format for anyone who needs it; and in HTML for the Mac OS X
diff --git a/apps/plugins/puzzles/src/blackbox.R b/apps/plugins/puzzles/src/blackbox.R
deleted file mode 100644
index 116225206d..0000000000
--- a/apps/plugins/puzzles/src/blackbox.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-blackbox : [X] GTK COMMON blackbox blackbox-icon|no-icon
-
-blackbox : [G] WINDOWS COMMON blackbox blackbox.res|noicon.res
-
-ALL += blackbox[COMBINED]
-
-!begin am gtk
-GAMES += blackbox
-!end
-
-!begin >list.c
-    A(blackbox) \
-!end
-
-!begin >gamedesc.txt
-blackbox:blackbox.exe:Black Box:Ball-finding puzzle:Find the hidden balls in the box by bouncing laser beams off them.
-!end
diff --git a/apps/plugins/puzzles/src/blackbox.c b/apps/plugins/puzzles/src/blackbox.c
index a9c1f88261..ab8e382d0a 100644
--- a/apps/plugins/puzzles/src/blackbox.c
+++ b/apps/plugins/puzzles/src/blackbox.c
@@ -7,7 +7,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -192,12 +196,14 @@ static const char *validate_params(const game_params *params, bool full)
      * types, and could be worked around if required. */
     if (params->w > 255 || params->h > 255)
         return "Widths and heights greater than 255 are not supported";
+    if (params->minballs < 0)
+        return "Negative number of balls";
+    if (params->minballs < 1)
+        return "Number of balls must be at least one";
     if (params->minballs > params->maxballs)
         return "Minimum number of balls may not be greater than maximum";
     if (params->minballs >= params->w * params->h)
         return "Too many balls to fit in grid";
-    if (params->minballs < 1)
-        return "Number of balls must be at least one";
     return NULL;
 }
 
@@ -307,7 +313,7 @@ struct game_state {
 
 #define GRID(s,x,y) ((s)->grid[(y)*((s)->w+2) + (x)])
 
-#define RANGECHECK(s,x) ((x) >= 0 && (x) <= (s)->nlasers)
+#define RANGECHECK(s,x) ((x) >= 0 && (x) < (s)->nlasers)
 
 /* specify numbers because they must match array indexes. */
 enum { DIR_UP = 0, DIR_RIGHT = 1, DIR_DOWN = 2, DIR_LEFT = 3 };
@@ -468,16 +474,6 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     return dupstr("S");
 }
 
-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;
-}
-
 struct game_ui {
     int flash_laserno;
     int errors;
@@ -495,7 +491,7 @@ static game_ui *new_ui(const game_state *state)
     ui->newmove = false;
 
     ui->cur_x = ui->cur_y = 1;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     ui->flash_laser = 0;
 
@@ -517,7 +513,8 @@ static char *encode_ui(const game_ui *ui)
     return dupstr(buf);
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void decode_ui(game_ui *ui, const char *encoding,
+                      const game_state *state)
 {
     sscanf(encoding, "E%d", &ui->errors);
 }
@@ -534,6 +531,41 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     ui->newmove = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible && !state->reveal) {
+        int gx = ui->cur_x, gy = ui->cur_y, rangeno = -1;
+        if (gx == 0 && gy == 0 && button == CURSOR_SELECT) return "Check";
+        if (gx >= 1 && gx <= state->w && gy >= 1 && gy <= state->h) {
+            /* Cursor somewhere in the arena. */
+            if (button == CURSOR_SELECT && !(GRID(state, gx,gy) & BALL_LOCK))
+                return (GRID(state, gx, gy) & BALL_GUESS) ? "Clear" : "Ball";
+            if (button == CURSOR_SELECT2)
+                return (GRID(state, gx, gy) & BALL_LOCK) ? "Unlock" : "Lock";
+        }
+        if (grid2range(state, gx, gy, &rangeno)) {
+            if (button == CURSOR_SELECT &&
+                state->exits[rangeno] == LASER_EMPTY)
+                return "Fire";
+            if (button == CURSOR_SELECT2) {
+                int n = 0;
+                /* Row or column lock or unlock. */
+                if (gy == 0 || gy > state->h) { /* Column lock */
+                    for (gy = 1; gy <= state->h; gy++)
+                        n += !!(GRID(state, gx, gy) & BALL_LOCK);
+                    return n > state->h/2 ? "Unlock" : "Lock";
+                } else { /* Row lock */
+                    for (gx = 1; gx <= state->w; gx++)
+                        n += !!(GRID(state, gx, gy) & BALL_LOCK);
+                    return n > state->w/2 ? "Unlock" : "Lock";
+                }
+            }
+        }
+    }
+    return "";
+}
+
 #define OFFSET(gx,gy,o) do {                                    \
     int off = (4 + (o) % 4) % 4;                                \
     (gx) += offsets[off].x;                                     \
@@ -875,7 +907,7 @@ done:
 #define TILE_SIZE (ds->tilesize)
 
 #define TODRAW(x) ((TILE_SIZE * (x)) + (TILE_SIZE / 2))
-#define FROMDRAW(x) (((x) - (TILE_SIZE / 2)) / TILE_SIZE)
+#define FROMDRAW(x) (((x) + (TILE_SIZE / 2)) / TILE_SIZE - 1)
 
 #define CAN_REVEAL(state) ((state)->nguesses >= (state)->minballs && \
                            (state)->nguesses <= (state)->maxballs && \
@@ -900,7 +932,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     if (IS_CURSOR_MOVE(button)) {
         int cx = ui->cur_x, cy = ui->cur_y;
 
-        move_cursor(button, &cx, &cy, state->w+2, state->h+2, false);
+        move_cursor(button, &cx, &cy, state->w+2, state->h+2, false, NULL);
         if ((cx == 0 && cy == 0 && !CAN_REVEAL(state)) ||
             (cx == 0 && cy == state->h+1) ||
             (cx == state->w+1 && cy == 0) ||
@@ -909,7 +941,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->cur_x = cx;
         ui->cur_y = cy;
         ui->cur_visible = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
@@ -919,7 +951,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         wouldflash = 1;
     } else if (button == LEFT_RELEASE) {
         ui->flash_laser = 0;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else if (IS_CURSOR_SELECT(button)) {
         if (ui->cur_visible) {
             gx = ui->cur_x;
@@ -928,7 +960,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             wouldflash = 2;
         } else {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         /* Fix up 'button' for the below logic. */
         if (button == CURSOR_SELECT2) button = RIGHT_BUTTON;
@@ -977,9 +1009,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             return nullret;
         ui->flash_laserno = rangeno;
         ui->flash_laser = wouldflash;
-        nullret = UI_UPDATE;
+        nullret = MOVE_UI_UPDATE;
         if (state->exits[rangeno] != LASER_EMPTY)
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         sprintf(buf, "F%d", rangeno);
         break;
 
@@ -1034,10 +1066,10 @@ static game_state *execute_move(const game_state *from, const char *move)
 
     case 'F':
         sscanf(move+1, "%d", &rangeno);
-        if (ret->exits[rangeno] != LASER_EMPTY)
-            goto badmove;
         if (!RANGECHECK(ret, rangeno))
             goto badmove;
+        if (ret->exits[rangeno] != LASER_EMPTY)
+            goto badmove;
         fire_laser(ret, rangeno);
         break;
 
@@ -1119,7 +1151,7 @@ static void game_get_cursor_location(const game_ui *ui,
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Border is ts/2, to make things easier.
      * Thus we have (width) + 2 (firing range*2) + 1 (border*2) tiles
@@ -1379,10 +1411,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         int x0 = TODRAW(0)-1, y0 = TODRAW(0)-1;
         int x1 = TODRAW(state->w+2), y1 = TODRAW(state->h+2);
 
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * (state->w+3), TILE_SIZE * (state->h+3),
-                  COL_BACKGROUND);
-
         /* clockwise around the outline starting at pt behind (1,1). */
         draw_line(dr, x0+ts, y0+ts, x0+ts, y0,    COL_HIGHLIGHT);
         draw_line(dr, x0+ts, y0,    x1-ts, y0,    COL_HIGHLIGHT);
@@ -1429,14 +1457,14 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         int outline = (ui->cur_visible && ui->cur_x == 0 && ui->cur_y == 0)
             ? COL_CURSOR : COL_BALL;
         clip(dr, TODRAW(0)-1, TODRAW(0)-1, TILE_SIZE+1, TILE_SIZE+1);
-        draw_circle(dr, TODRAW(0) + ds->crad, TODRAW(0) + ds->crad, ds->crad,
+        draw_circle(dr, TODRAW(0) + ds->crad-1, TODRAW(0) + ds->crad-1, ds->crad-1,
                     outline, outline);
-        draw_circle(dr, TODRAW(0) + ds->crad, TODRAW(0) + ds->crad, ds->crad-2,
+        draw_circle(dr, TODRAW(0) + ds->crad-1, TODRAW(0) + ds->crad-1, ds->crad-3,
                     COL_BUTTON, COL_BUTTON);
         unclip(dr);
     } else {
         draw_rect(dr, TODRAW(0)-1, TODRAW(0)-1,
-                  TILE_SIZE+1, TILE_SIZE+1, COL_BACKGROUND);
+                  TILE_SIZE, TILE_SIZE, COL_BACKGROUND);
     }
     draw_update(dr, TODRAW(0), TODRAW(0), TILE_SIZE, TILE_SIZE);
     ds->reveal = state->reveal;
@@ -1509,19 +1537,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame blackbox
 #endif
@@ -1542,13 +1557,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    NULL, NULL, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
     encode_ui,
     decode_ui,
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1560,9 +1577,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/bridges.R b/apps/plugins/puzzles/src/bridges.R
deleted file mode 100644
index 75df309152..0000000000
--- a/apps/plugins/puzzles/src/bridges.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-BRIDGES_EXTRA = dsf findloop
-
-bridges  : [X] GTK COMMON bridges BRIDGES_EXTRA bridges-icon|no-icon
-
-bridges  : [G] WINDOWS COMMON bridges BRIDGES_EXTRA bridges.res|noicon.res
-
-ALL += bridges[COMBINED] BRIDGES_EXTRA
-
-!begin am gtk
-GAMES += bridges
-!end
-
-!begin >list.c
-    A(bridges) \
-!end
-
-!begin >gamedesc.txt
-bridges:bridges.exe:Bridges:Bridge-placing puzzle:Connect all the islands with a network of bridges.
-!end
diff --git a/apps/plugins/puzzles/src/bridges.c b/apps/plugins/puzzles/src/bridges.c
index 83086c9761..7e87764d6d 100644
--- a/apps/plugins/puzzles/src/bridges.c
+++ b/apps/plugins/puzzles/src/bridges.c
@@ -72,11 +72,15 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
-/* Turn this on for hints about which lines are considered possibilities. */
 #undef DRAW_GRID
 
 /* --- structures for params, state, etc. --- */
@@ -134,8 +138,8 @@ struct game_params {
 typedef unsigned int grid_type; /* change me later if we invent > 16 bits of flags. */
 
 struct solver_state {
-    int *dsf, *comptspaces;
-    int *tmpdsf, *tmpcompspaces;
+    DSF *dsf, *tmpdsf;
+    int *comptspaces, *tmpcompspaces;
     int refcount;
 };
 
@@ -183,7 +187,7 @@ struct game_state {
 
 #define GRIDCOUNT(s,x,y,f) ((GRID(s,x,y) & (f)) ? (INDEX(s,lines,x,y)) : 0)
 
-#define WITHIN2(x,min,max) ((x) >= (min) && (x) < (max))
+#define WITHIN2(x,min,max) ((x) >= (min) && (x) <= (max))
 #define WITHIN(x,min,max) ((min) > (max) ? \
                            WITHIN2(x,max,min) : WITHIN2(x,min,max))
 
@@ -803,6 +807,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 3 || params->h < 3)
         return "Width and height must be at least 3";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->maxb < 1 || params->maxb > MAX_BRIDGES)
         return "Too many bridges.";
     if (full) {
@@ -1133,13 +1139,13 @@ static bool map_hasloops(game_state *state, bool mark)
 
 static void map_group(game_state *state)
 {
-    int i, wh = state->w*state->h, d1, d2;
+    int i, d1, d2;
     int x, y, x2, y2;
-    int *dsf = state->solver->dsf;
+    DSF *dsf = state->solver->dsf;
     struct island *is, *is_join;
 
     /* Initialise dsf. */
-    dsf_init(dsf, wh);
+    dsf_reinit(dsf);
 
     /* For each island, find connected islands right or down
      * and merge the dsf for the island squares as well as the
@@ -1160,7 +1166,7 @@ static void map_group(game_state *state)
                 if (!is_join) continue;
 
                 d2 = DINDEX(is_join->x, is_join->y);
-                if (dsf_canonify(dsf,d1) == dsf_canonify(dsf,d2)) {
+                if (dsf_equivalent(dsf, d1, d2)) {
                     ; /* we have a loop. See comment in map_hasloops. */
                     /* However, we still want to merge all squares joining
                      * this side-that-makes-a-loop. */
@@ -1180,7 +1186,8 @@ static void map_group(game_state *state)
 static bool map_group_check(game_state *state, int canon, bool warn,
                             int *nislands_r)
 {
-    int *dsf = state->solver->dsf, nislands = 0;
+    DSF *dsf = state->solver->dsf;
+    int nislands = 0;
     int x, y, i;
     bool allfull = true;
     struct island *is;
@@ -1212,7 +1219,8 @@ static bool map_group_check(game_state *state, int canon, bool warn,
 
 static bool map_group_full(game_state *state, int *ngroups_r)
 {
-    int *dsf = state->solver->dsf, ngroups = 0;
+    DSF *dsf = state->solver->dsf;
+    int ngroups = 0;
     int i;
     bool anyfull = false;
     struct island *is;
@@ -1267,7 +1275,8 @@ static void map_clear(game_state *state)
 static void solve_join(struct island *is, int direction, int n, bool is_max)
 {
     struct island *is_orth;
-    int d1, d2, *dsf = is->state->solver->dsf;
+    int d1, d2;
+    DSF *dsf = is->state->solver->dsf;
     game_state *state = is->state; /* for DINDEX */
 
     is_orth = INDEX(is->state, gridi,
@@ -1281,7 +1290,7 @@ static void solve_join(struct island *is, int direction, int n, bool is_max)
     if (n > 0 && !is_max) {
         d1 = DINDEX(is->x, is->y);
         d2 = DINDEX(is_orth->x, is_orth->y);
-        if (dsf_canonify(dsf, d1) != dsf_canonify(dsf, d2))
+        if (!dsf_equivalent(dsf, d1, d2))
             dsf_merge(dsf, d1, d2);
     }
 }
@@ -1382,7 +1391,8 @@ static bool solve_island_stage1(struct island *is, bool *didsth_r)
 static bool solve_island_checkloop(struct island *is, int direction)
 {
     struct island *is_orth;
-    int *dsf = is->state->solver->dsf, d1, d2;
+    DSF *dsf = is->state->solver->dsf;
+    int d1, d2;
     game_state *state = is->state;
 
     if (is->state->allowloops)
@@ -1399,7 +1409,7 @@ static bool solve_island_checkloop(struct island *is, int direction)
 
     d1 = DINDEX(is->x, is->y);
     d2 = DINDEX(is_orth->x, is_orth->y);
-    if (dsf_canonify(dsf, d1) == dsf_canonify(dsf, d2)) {
+    if (dsf_equivalent(dsf, d1, d2)) {
         /* two islands are connected already; don't join them. */
         return true;
     }
@@ -1457,7 +1467,8 @@ static bool solve_island_stage2(struct island *is, bool *didsth_r)
 static bool solve_island_subgroup(struct island *is, int direction)
 {
     struct island *is_join;
-    int nislands, *dsf = is->state->solver->dsf;
+    int nislands;
+    DSF *dsf = is->state->solver->dsf;
     game_state *state = is->state;
 
     debug(("..checking subgroups.\n"));
@@ -1520,7 +1531,6 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
 {
     int i, n, x, y, missing, spc, curr, maxb;
     bool didsth = false;
-    int wh = is->state->w * is->state->h;
     struct solver_state *ss = is->state->solver;
 
     assert(didsth_r);
@@ -1544,7 +1554,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
         maxb = -1;
         /* We have to squirrel the dsf away and restore it afterwards;
          * it is additive only, and can't be removed from. */
-        memcpy(ss->tmpdsf, ss->dsf, wh*sizeof(int));
+        dsf_copy(ss->tmpdsf, ss->dsf);
         for (n = curr+1; n <= curr+spc; n++) {
             solve_join(is, i, n, false);
             map_update_possibles(is->state);
@@ -1560,7 +1570,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
             }
         }
         solve_join(is, i, curr, false); /* put back to before. */
-        memcpy(ss->dsf, ss->tmpdsf, wh*sizeof(int));
+        dsf_copy(ss->dsf, ss->tmpdsf);
 
         if (maxb != -1) {
             /*debug_state(is->state);*/
@@ -1629,7 +1639,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
                                   is->adj.points[j].dx ? G_LINEH : G_LINEV);
         if (before[i] != 0) continue;  /* this idea is pointless otherwise */
 
-        memcpy(ss->tmpdsf, ss->dsf, wh*sizeof(int));
+        dsf_copy(ss->tmpdsf, ss->dsf);
 
         for (j = 0; j < is->adj.npoints; j++) {
             spc = island_adjspace(is, true, missing, j);
@@ -1644,7 +1654,7 @@ static bool solve_island_stage3(struct island *is, bool *didsth_r)
 
         for (j = 0; j < is->adj.npoints; j++)
             solve_join(is, j, before[j], false);
-        memcpy(ss->dsf, ss->tmpdsf, wh*sizeof(int));
+        dsf_copy(ss->dsf, ss->tmpdsf);
 
         if (got) {
             debug(("island at (%d,%d) must connect in direction (%d,%d) to"
@@ -1763,8 +1773,8 @@ static game_state *new_state(const game_params *params)
     ret->completed = false;
 
     ret->solver = snew(struct solver_state);
-    ret->solver->dsf = snew_dsf(wh);
-    ret->solver->tmpdsf = snewn(wh, int);
+    ret->solver->dsf = dsf_new(wh);
+    ret->solver->tmpdsf = dsf_new(wh);
 
     ret->solver->refcount = 1;
 
@@ -1813,8 +1823,8 @@ static game_state *dup_game(const game_state *state)
 static void free_game(game_state *state)
 {
     if (--state->solver->refcount <= 0) {
-        sfree(state->solver->dsf);
-        sfree(state->solver->tmpdsf);
+        dsf_free(state->solver->dsf);
+        dsf_free(state->solver->tmpdsf);
         sfree(state->solver);
     }
 
@@ -2004,28 +2014,38 @@ generated:
 
 static const char *validate_desc(const game_params *params, const char *desc)
 {
-    int i, wh = params->w * params->h;
+    int i, j, wh = params->w * params->h, nislands = 0;
+    bool *last_row = snewn(params->w, bool);
 
+    memset(last_row, 0, params->w * sizeof(bool));
     for (i = 0; i < wh; i++) {
-        if (*desc >= '1' && *desc <= '9')
-            /* OK */;
-        else if (*desc >= 'a' && *desc <= 'z')
+        if ((*desc >= '1' && *desc <= '9') || (*desc >= 'A' && *desc <= 'G')) {
+            nislands++;
+            /* Look for other islands to the left and above. */
+            if ((i % params->w > 0 && last_row[i % params->w - 1]) ||
+                last_row[i % params->w]) {
+                sfree(last_row);
+                return "Game description contains joined islands";
+            }
+            last_row[i % params->w] = true;
+        } else if (*desc >= 'a' && *desc <= 'z') {
+            for (j = 0; j < *desc - 'a' + 1; j++)
+                last_row[(i + j) % params->w] = false;
             i += *desc - 'a'; /* plus the i++ */
-        else if (*desc >= 'A' && *desc <= 'G')
-            /* OK */;
-        else if (*desc == 'V' || *desc == 'W' ||
-                 *desc == 'X' || *desc == 'Y' ||
-                 *desc == 'H' || *desc == 'I' ||
-                 *desc == 'J' || *desc == 'K')
-            /* OK */;
-        else if (!*desc)
+        } else if (!*desc) {
+            sfree(last_row);
             return "Game description shorter than expected";
-        else
+        } else {
+            sfree(last_row);
             return "Game description contains unexpected character";
+        }
         desc++;
     }
+    sfree(last_row);
     if (*desc || i > wh)
         return "Game description longer than expected";
+    if (nislands < 2)
+        return "Game description has too few islands";
 
     return NULL;
 }
@@ -2105,32 +2125,47 @@ static char *ui_cancel_drag(game_ui *ui)
     ui->dragx_src = ui->dragy_src = -1;
     ui->dragx_dst = ui->dragy_dst = -1;
     ui->dragging = false;
-    return UI_UPDATE;
+    return MOVE_UI_UPDATE;
 }
 
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     ui_cancel_drag(ui);
-    ui->cur_x = state->islands[0].x;
-    ui->cur_y = state->islands[0].y;
-    ui->cur_visible = false;
+    if (state != NULL) {
+        ui->cur_x = state->islands[0].x;
+        ui->cur_y = state->islands[0].y;
+    }
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->show_hints = false;
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Show possible bridge locations";
+    ret[0].kw = "show-hints";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->show_hints;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->show_hints = cfg[0].u.boolean.bval;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -2138,6 +2173,20 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 {
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible)
+            return ""; /* Actually shows cursor. */
+        if (ui->dragging || button == CURSOR_SELECT2)
+            return "Finished";
+        if (GRID(state, ui->cur_x, ui->cur_y) & G_ISLAND)
+            return "Select";
+    }
+    return "";
+}
+
 struct game_drawstate {
     int tilesize;
     int w, h;
@@ -2307,7 +2356,7 @@ static char *update_drag_dst(const game_state *state, game_ui *ui,
     /*debug(("update_drag src (%d,%d) d(%d,%d) dst (%d,%d)\n",
            ui->dragx_src, ui->dragy_src, dx, dy,
            ui->dragx_dst, ui->dragy_dst));*/
-    return UI_UPDATE;
+    return MOVE_UI_UPDATE;
 }
 
 static char *finish_drag(const game_state *state, game_ui *ui)
@@ -2342,15 +2391,15 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char buf[80], *ret;
     grid_type ggrid = INGRID(state,gx,gy) ? GRID(state,gx,gy) : 0;
     bool shift = button & MOD_SHFT, control = button & MOD_CTRL;
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
-        if (!INGRID(state, gx, gy)) return NULL;
+        if (!INGRID(state, gx, gy)) return MOVE_UNUSED;
         ui->cur_visible = false;
         if (ggrid & G_ISLAND) {
             ui->dragx_src = gx;
             ui->dragy_src = gy;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         } else
             return ui_cancel_drag(ui);
     } else if (button == LEFT_DRAG || button == RIGHT_DRAG) {
@@ -2364,7 +2413,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             /* cancel a drag when we go back to the starting point */
             ui->dragx_dst = -1;
             ui->dragy_dst = -1;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else if (button == LEFT_RELEASE || button == RIGHT_RELEASE) {
         if (ui->dragging) {
@@ -2375,8 +2424,8 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 return ui_cancel_drag(ui);
             }
             ui_cancel_drag(ui);
-            if (!INGRID(state, gx, gy)) return NULL;
-            if (!(GRID(state, gx, gy) & G_ISLAND)) return NULL;
+            if (!INGRID(state, gx, gy)) return MOVE_UNUSED;
+            if (!(GRID(state, gx, gy) & G_ISLAND)) return MOVE_NO_EFFECT;
             sprintf(buf, "M%d,%d", gx, gy);
             return dupstr(buf);
         }
@@ -2397,9 +2446,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (ui->dragging) {
             int nx = ui->cur_x, ny = ui->cur_y;
 
-            move_cursor(button, &nx, &ny, state->w, state->h, false);
+            move_cursor(button, &nx, &ny, state->w, state->h, false, NULL);
             if (nx == ui->cur_x && ny == ui->cur_y)
-                return NULL;
+                return MOVE_NO_EFFECT;
             update_drag_dst(state, ui, ds,
                              COORD(nx)+TILE_SIZE/2,
                              COORD(ny)+TILE_SIZE/2);
@@ -2451,19 +2500,19 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
                     if (!dingrid) break;
                 }
-                if (!oingrid) return UI_UPDATE;
+                if (!oingrid) return MOVE_UI_UPDATE;
             }
             /* not reached */
 
 found:
             ui->cur_x = nx;
             ui->cur_y = ny;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else if (IS_CURSOR_SELECT(button)) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (ui->dragging || button == CURSOR_SELECT2) {
             ui_cancel_drag(ui);
@@ -2471,7 +2520,7 @@ found:
                 sprintf(buf, "M%d,%d", ui->cur_x, ui->cur_y);
                 return dupstr(buf);
             } else
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
         } else {
             grid_type v = GRID(state, ui->cur_x, ui->cur_y);
             if (v & G_ISLAND) {
@@ -2480,7 +2529,7 @@ found:
                 ui->dragy_src = ui->cur_y;
                 ui->dragx_dst = ui->dragy_dst = -1;
                 ui->drag_is_noline = (button == CURSOR_SELECT2);
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             }
         }
     } else if ((button >= '0' && button <= '9') ||
@@ -2498,7 +2547,7 @@ found:
 
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
 
         for (i = 0; i < state->n_islands; ++i) {
@@ -2525,15 +2574,15 @@ found:
         if (best_x != -1 && best_y != -1) {
             ui->cur_x = best_x;
             ui->cur_y = best_y;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         } else
-            return NULL;
+            return MOVE_NO_EFFECT;
     } else if (button == 'g' || button == 'G') {
         ui->show_hints = !ui->show_hints;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -2557,6 +2606,8 @@ static game_state *execute_move(const game_state *state, const char *move)
                 goto badmove;
             if (!INGRID(ret, x1, y1) || !INGRID(ret, x2, y2))
                 goto badmove;
+            /* Precisely one co-ordinate must differ between islands. */
+            if ((x1 != x2) + (y1 != y2) != 1) goto badmove;
             is1 = INDEX(ret, gridi, x1, y1);
             is2 = INDEX(ret, gridi, x2, y2);
             if (!is1 || !is2) goto badmove;
@@ -2568,6 +2619,7 @@ static game_state *execute_move(const game_state *state, const char *move)
                 goto badmove;
             if (!INGRID(ret, x1, y1) || !INGRID(ret, x2, y2))
                 goto badmove;
+            if ((x1 != x2) + (y1 != y2) != 1) goto badmove;
             is1 = INDEX(ret, gridi, x1, y1);
             is2 = INDEX(ret, gridi, x2, y2);
             if (!is1 || !is2) goto badmove;
@@ -2636,7 +2688,7 @@ static char *solve_game(const game_state *state, const game_state *currstate,
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2987,9 +3039,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     /* Clear screen, if required. */
     if (!ds->started) {
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * ds->w + 2 * BORDER,
-                  TILE_SIZE * ds->h + 2 * BORDER, COL_BACKGROUND);
 #ifdef DRAW_GRID
         draw_rect_outline(dr,
                           COORD(0)-1, COORD(0)-1,
@@ -3177,22 +3226,19 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /* 10mm squares by default. */
-    game_compute_size(params, 1000, &pw, &ph);
+    game_compute_size(params, 1000, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int ts)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int ts)
 {
     int ink = print_mono_colour(dr, 0);
     int paper = print_mono_colour(dr, 1);
@@ -3266,12 +3312,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -3285,7 +3333,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/combi.c b/apps/plugins/puzzles/src/combi.c
index 3460183c9c..132d74027e 100644
--- a/apps/plugins/puzzles/src/combi.c
+++ b/apps/plugins/puzzles/src/combi.c
@@ -71,40 +71,3 @@ void free_combi(combi_ctx *combi)
     sfree(combi->a);
     sfree(combi);
 }
-
-/* compile this with:
- *   gcc -o combi.exe -DSTANDALONE_COMBI_TEST combi.c malloc.c
- */
-#ifdef STANDALONE_COMBI_TEST
-
-#include <stdio.h>
-
-void fatal(const char *fmt, ...)
-{
-    abort();
-}
-
-int main(int argc, char *argv[])
-{
-    combi_ctx *c;
-    int i, r, n;
-
-    if (argc < 3) {
-        fprintf(stderr, "Usage: combi R N\n");
-        exit(1);
-    }
-
-    r = atoi(argv[1]); n = atoi(argv[2]);
-    c = new_combi(r, n);
-    printf("combi %d of %d, %d elements.\n", c->r, c->n, c->total);
-
-    while (next_combi(c)) {
-        for (i = 0; i < c->r; i++) {
-            printf("%d ", c->a[i]);
-        }
-        printf("\n");
-    }
-    free_combi(c);
-}
-
-#endif
diff --git a/apps/plugins/puzzles/src/cube.R b/apps/plugins/puzzles/src/cube.R
deleted file mode 100644
index 85b081ec76..0000000000
--- a/apps/plugins/puzzles/src/cube.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-cube     : [X] GTK COMMON cube cube-icon|no-icon
-
-cube     : [G] WINDOWS COMMON cube cube.res|noicon.res
-
-ALL += cube[COMBINED]
-
-!begin am gtk
-GAMES += cube
-!end
-
-!begin >list.c
-    A(cube) \
-!end
-
-!begin >gamedesc.txt
-cube:cube.exe:Cube:Rolling cube puzzle:Pick up all the blue squares by rolling the cube over them.
-!end
diff --git a/apps/plugins/puzzles/src/cube.c b/apps/plugins/puzzles/src/cube.c
index 8c8c46faed..08788cbd65 100644
--- a/apps/plugins/puzzles/src/cube.c
+++ b/apps/plugins/puzzles/src/cube.c
@@ -7,7 +7,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -171,7 +175,7 @@ enum { LEFT, RIGHT, UP, DOWN, UP_LEFT, UP_RIGHT, DOWN_LEFT, DOWN_RIGHT };
     (ra)[0] = rx; (ra)[1] = ry; (ra)[2] = rz; \
 } while (0)
 
-#define APPROXEQ(x,y) ( SQ(x-y) < 0.1 )
+#define APPROXEQ(x,y) ( SQ(x-y) < 0.1F )
 
 struct grid_square {
     float x, y;
@@ -202,8 +206,8 @@ struct game_grid {
 };
 
 #define SET_SQUARE(state, i, val) \
-    ((state)->bluemask[(i)/32] &= ~(1 << ((i)%32)), \
-     (state)->bluemask[(i)/32] |= ((!!val) << ((i)%32)))
+    ((state)->bluemask[(i)/32] &= ~(1UL << ((i)%32)), \
+     (state)->bluemask[(i)/32] |= ((unsigned long)(!!val) << ((i)%32)))
 #define GET_SQUARE(state, i) \
     (((state)->bluemask[(i)/32] >> ((i)%32)) & 1)
 
@@ -542,12 +546,38 @@ static const char *validate_params(const game_params *params, bool full)
     if (params->solid < 0 || params->solid >= lenof(solids))
         return "Unrecognised solid type";
 
+    if (params->d1 < 0 || params->d2 < 0)
+        return "Grid dimensions may not be negative";
+
     if (solids[params->solid]->order == 4) {
         if (params->d1 <= 1 || params->d2 <= 1)
             return "Both grid dimensions must be greater than one";
+        if (params->d2 > INT_MAX / params->d1)
+            return "Grid area must not be unreasonably large";
     } else {
         if (params->d1 <= 0 && params->d2 <= 0)
             return "At least one grid dimension must be greater than zero";
+
+        /*
+         * Check whether d1^2 + d2^2 + 4 d1 d2 > INT_MAX, without overflow:
+         *
+         * First check d1^2 doesn't overflow by itself.
+         *
+         * Then check d2^2 doesn't exceed the remaining space between
+         * d1^2 and INT_MAX.
+         *
+         * If that's all OK then we know both d1 and d2 are
+         * individually less than the square root of INT_MAX, so we
+         * can safely multiply them and compare against the
+         * _remaining_ space.
+         */
+        if ((params->d1 > 0 && params->d1 > INT_MAX / params->d1) ||
+            (params->d2 > 0 &&
+             params->d2 > (INT_MAX - params->d1*params->d1) / params->d2) ||
+            (params->d2 > 0 &&
+             params->d1*params->d2 > (INT_MAX - params->d1*params->d1 -
+                                      params->d2*params->d2) / params->d2))
+            return "Grid area must not be unreasonably large";
     }
 
     for (i = 0; i < 4; i++)
@@ -761,7 +791,7 @@ static bool align_poly(const struct solid *solid, struct grid_square *sq,
             dist += SQ(solid->vertices[i*3+1] * flip - sq->points[j*2+1] + sq->y);
             dist += SQ(solid->vertices[i*3+2] - zmin);
 
-            if (dist < 0.1) {
+            if (dist < 0.1F) {
                 matches++;
                 index = i;
             }
@@ -811,7 +841,7 @@ static struct solid *transform_poly(const struct solid *solid, bool flip,
      */
     vx = ret->vertices[key1*3+0] - ret->vertices[key0*3+0];
     vy = ret->vertices[key1*3+1] - ret->vertices[key0*3+1];
-    assert(APPROXEQ(vx*vx + vy*vy, 1.0));
+    assert(APPROXEQ(vx*vx + vy*vy, 1.0F));
 
     vmatrix[0] =  vx; vmatrix[3] = vy; vmatrix[6] = 0;
     vmatrix[1] = -vy; vmatrix[4] = vx; vmatrix[7] = 0;
@@ -999,22 +1029,6 @@ 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;
@@ -1024,15 +1038,6 @@ static void free_ui(game_ui *ui)
 {
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
@@ -1081,11 +1086,11 @@ static int find_move_dest(const game_state *from, int direction,
             for (j = 0; j < from->grid->squares[i].npoints; j++) {
                 dist = (SQ(from->grid->squares[i].points[j*2] - points[0]) +
                         SQ(from->grid->squares[i].points[j*2+1] - points[1]));
-                if (dist < 0.1)
+                if (dist < 0.1F)
                     dkey[match++] = j;
                 dist = (SQ(from->grid->squares[i].points[j*2] - points[2]) +
                         SQ(from->grid->squares[i].points[j*2+1] - points[3]));
-                if (dist < 0.1)
+                if (dist < 0.1F)
                     dkey[match++] = j;
             }
 
@@ -1140,7 +1145,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         cy = (int)(state->grid->squares[state->current].y * GRID_SCALE) + ds->oy;
 
         if (x == cx && y == cy)
-            return NULL;               /* clicked in exact centre!  */
+            return MOVE_NO_EFFECT;     /* clicked in exact centre!  */
         angle = atan2(y - cy, x - cx);
 
         /*
@@ -1191,11 +1196,11 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 direction = RIGHT;
         }
     } else
-        return NULL;
+        return MOVE_UNUSED;
 
     mask = state->grid->squares[state->current].directions[direction];
     if (mask == 0)
-        return NULL;
+        return MOVE_NO_EFFECT;
 
     /*
      * Translate diagonal directions into orthogonal ones.
@@ -1210,14 +1215,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     }
 
     if (find_move_dest(state, direction, skey, dkey) < 0)
-        return NULL;
+        return MOVE_NO_EFFECT;
 
     if (direction == LEFT)  return dupstr("L");
     if (direction == RIGHT) return dupstr("R");
     if (direction == UP)    return dupstr("U");
     if (direction == DOWN)  return dupstr("D");
 
-    return NULL;                       /* should never happen */
+    return MOVE_NO_EFFECT;             /* should never happen */
 }
 
 static game_state *execute_move(const game_state *from, const char *move)
@@ -1484,7 +1489,7 @@ static struct bbox find_bbox(const game_params *params)
     ((int)(((bb).d - (bb).u + 2*(solid)->border) * gs))
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     struct bbox bb = find_bbox(params);
 
@@ -1734,19 +1739,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame cube
 #endif
@@ -1766,14 +1758,16 @@ const struct game thegame = {
     new_game,
     dup_game,
     free_game,
-    false, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, /* solve */
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    NULL, NULL, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    NULL, /* current_key_label */
     interpret_move,
     execute_move,
     PREFERRED_GRID_SCALE, game_compute_size, game_set_size,
@@ -1785,8 +1779,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
diff --git a/apps/plugins/puzzles/src/devel.but b/apps/plugins/puzzles/src/devel.but
deleted file mode 100644
index 7521596df9..0000000000
--- a/apps/plugins/puzzles/src/devel.but
+++ /dev/null
@@ -1,5061 +0,0 @@
-\cfg{text-indent}{0}
-\cfg{text-width}{72}
-\cfg{text-title-align}{left}
-\cfg{text-chapter-align}{left}
-\cfg{text-chapter-numeric}{true}
-\cfg{text-chapter-suffix}{. }
-\cfg{text-chapter-underline}{-}
-\cfg{text-section-align}{0}{left}
-\cfg{text-section-numeric}{0}{true}
-\cfg{text-section-suffix}{0}{. }
-\cfg{text-section-underline}{0}{-}
-\cfg{text-section-align}{1}{left}
-\cfg{text-section-numeric}{1}{true}
-\cfg{text-section-suffix}{1}{. }
-\cfg{text-section-underline}{1}{-}
-\cfg{text-versionid}{0}
-
-\cfg{html-contents-filename}{index.html}
-\cfg{html-template-filename}{%k.html}
-\cfg{html-index-filename}{docindex.html}
-\cfg{html-leaf-level}{1}
-\cfg{html-contents-depth-0}{1}
-\cfg{html-contents-depth-1}{3}
-\cfg{html-leaf-contains-contents}{true}
-
-\define{dash} \u2013{-}
-
-\title Developer documentation for Simon Tatham's puzzle collection
-
-This is a guide to the internal structure of Simon Tatham's Portable
-Puzzle Collection (henceforth referred to simply as \q{Puzzles}),
-for use by anyone attempting to implement a new puzzle or port to a
-new platform.
-
-This guide is believed correct as of r6190. Hopefully it will be
-updated along with the code in future, but if not, I've at least
-left this version number in here so you can figure out what's
-changed by tracking commit comments from there onwards.
-
-\C{intro} Introduction
-
-The Puzzles code base is divided into four parts: a set of
-interchangeable front ends, a set of interchangeable back ends, a
-universal \q{middle end} which acts as a buffer between the two, and
-a bunch of miscellaneous utility functions. In the following
-sections I give some general discussion of each of these parts.
-
-\H{intro-frontend} Front end
-
-The front end is the non-portable part of the code: it's the bit
-that you replace completely when you port to a different platform.
-So it's responsible for all system calls, all GUI interaction, and
-anything else platform-specific.
-
-The current front ends in the main code base are for Windows, GTK
-and MacOS X; I also know of a third-party front end for PalmOS.
-
-The front end contains \cw{main()} or the local platform's
-equivalent. Top-level control over the application's execution flow
-belongs to the front end (it isn't, for example, a set of functions
-called by a universal \cw{main()} somewhere else).
-
-The front end has complete freedom to design the GUI for any given
-port of Puzzles. There is no centralised mechanism for maintaining
-the menu layout, for example. This has a cost in consistency (when I
-\e{do} want the same menu layout on more than one platform, I have
-to edit two pieces of code in parallel every time I make a change),
-but the advantage is that local GUI conventions can be conformed to
-and local constraints adapted to. For example, MacOS X has strict
-human interface guidelines which specify a different menu layout
-from the one I've used on Windows and GTK; there's nothing stopping
-the OS X front end from providing a menu layout consistent with
-those guidelines.
-
-Although the front end is mostly caller rather than the callee in
-its interactions with other parts of the code, it is required to
-implement a small API for other modules to call, mostly of drawing
-functions for games to use when drawing their graphics. The drawing
-API is documented in \k{drawing}; the other miscellaneous front end
-API functions are documented in \k{frontend-api}.
-
-\H{intro-backend} Back end
-
-A \q{back end}, in this collection, is synonymous with a \q{puzzle}.
-Each back end implements a different game.
-
-At the top level, a back end is simply a data structure, containing
-a few constants (flag words, preferred pixel size) and a large
-number of function pointers. Back ends are almost invariably callee
-rather than caller, which means there's a limitation on what a back
-end can do on its own initiative.
-
-The persistent state in a back end is divided into a number of data
-structures, which are used for different purposes and therefore
-likely to be switched around, changed without notice, and otherwise
-updated by the rest of the code. It is important when designing a
-back end to put the right pieces of data into the right structures,
-or standard midend-provided features (such as Undo) may fail to
-work.
-
-The functions and variables provided in the back end data structure
-are documented in \k{backend}.
-
-\H{intro-midend} Middle end
-
-Puzzles has a single and universal \q{middle end}. This code is
-common to all platforms and all games; it sits in between the front
-end and the back end and provides standard functionality everywhere.
-
-People adding new back ends or new front ends should generally not
-need to edit the middle end. On rare occasions there might be a
-change that can be made to the middle end to permit a new game to do
-something not currently anticipated by the middle end's present
-design; however, this is terribly easy to get wrong and should
-probably not be undertaken without consulting the primary maintainer
-(me). Patch submissions containing unannounced mid-end changes will
-be treated on their merits like any other patch; this is just a
-friendly warning that mid-end changes will need quite a lot of
-merits to make them acceptable.
-
-Functionality provided by the mid-end includes:
-
-\b Maintaining a list of game state structures and moving back and
-forth along that list to provide Undo and Redo.
-
-\b Handling timers (for move animations, flashes on completion, and
-in some cases actually timing the game).
-
-\b Handling the container format of game IDs: receiving them,
-picking them apart into parameters, description and/or random seed,
-and so on. The game back end need only handle the individual parts
-of a game ID (encoded parameters and encoded game description);
-everything else is handled centrally by the mid-end.
-
-\b Handling standard keystrokes and menu commands, such as \q{New
-Game}, \q{Restart Game} and \q{Quit}.
-
-\b Pre-processing mouse events so that the game back ends can rely
-on them arriving in a sensible order (no missing button-release
-events, no sudden changes of which button is currently pressed,
-etc).
-
-\b Handling the dialog boxes which ask the user for a game ID.
-
-\b Handling serialisation of entire games (for loading and saving a
-half-finished game to a disk file, or for handling application
-shutdown and restart on platforms such as PalmOS where state is
-expected to be saved).
-
-Thus, there's a lot of work done once by the mid-end so that
-individual back ends don't have to worry about it. All the back end
-has to do is cooperate in ensuring the mid-end can do its work
-properly.
-
-The API of functions provided by the mid-end to be called by the
-front end is documented in \k{midend}.
-
-\H{intro-utils} Miscellaneous utilities
-
-In addition to these three major structural components, the Puzzles
-code also contains a variety of utility modules usable by all of the
-above components. There is a set of functions to provide
-platform-independent random number generation; functions to make
-memory allocation easier; functions which implement a balanced tree
-structure to be used as necessary in complex algorithms; and a few
-other miscellaneous functions. All of these are documented in
-\k{utils}.
-
-\H{intro-structure} Structure of this guide
-
-There are a number of function call interfaces within Puzzles, and
-this guide will discuss each one in a chapter of its own. After
-that, \k{writing} discusses how to design new games, with some
-general design thoughts and tips.
-
-\C{backend} Interface to the back end
-
-This chapter gives a detailed discussion of the interface that each
-back end must implement.
-
-At the top level, each back end source file exports a single global
-symbol, which is a \c{const struct game} containing a large number
-of function pointers and a small amount of constant data. This
-structure is called by different names depending on what kind of
-platform the puzzle set is being compiled on:
-
-\b On platforms such as Windows and GTK, which build a separate
-binary for each puzzle, the game structure in every back end has the
-same name, \cq{thegame}; the front end refers directly to this name,
-so that compiling the same front end module against a different back
-end module builds a different puzzle.
-
-\b On platforms such as MacOS X and PalmOS, which build all the
-puzzles into a single monolithic binary, the game structure in each
-back end must have a different name, and there's a helper module
-\c{list.c} (constructed automatically by the same Perl script that
-builds the \cw{Makefile}s) which contains a complete list of those
-game structures.
-
-On the latter type of platform, source files may assume that the
-preprocessor symbol \c{COMBINED} has been defined. Thus, the usual
-code to declare the game structure looks something like this:
-
-\c #ifdef COMBINED
-\c #define thegame net    /* or whatever this game is called */
-\e                 iii    iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-\c #endif
-\c 
-\c const struct game thegame = {
-\c     /* lots of structure initialisation in here */
-\e     iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-\c };
-
-Game back ends must also internally define a number of data
-structures, for storing their various persistent state. This chapter
-will first discuss the nature and use of those structures, and then
-go on to give details of every element of the game structure.
-
-\H{backend-structs} Data structures
-
-Each game is required to define four separate data structures. This
-section discusses each one and suggests what sorts of things need to
-be put in it.
-
-\S{backend-game-params} \c{game_params}
-
-The \c{game_params} structure contains anything which affects the
-automatic generation of new puzzles. So if puzzle generation is
-parametrised in any way, those parameters need to be stored in
-\c{game_params}.
-
-Most puzzles currently in this collection are played on a grid of
-squares, meaning that the most obvious parameter is the grid size.
-Many puzzles have additional parameters; for example, Mines allows
-you to control the number of mines in the grid independently of its
-size, Net can be wrapping or non-wrapping, Solo has difficulty
-levels and symmetry settings, and so on.
-
-A simple rule for deciding whether a data item needs to go in
-\c{game_params} is: would the user expect to be able to control this
-data item from either the preset-game-types menu or the \q{Custom}
-game type configuration? If so, it's part of \c{game_params}.
-
-\c{game_params} structures are permitted to contain pointers to
-subsidiary data if they need to. The back end is required to provide
-functions to create and destroy \c{game_params}, and those functions
-can allocate and free additional memory if necessary. (It has not
-yet been necessary to do this in any puzzle so far, but the
-capability is there just in case.)
-
-\c{game_params} is also the only structure which the game's
-\cw{compute_size()} function may refer to; this means that any
-aspect of the game which affects the size of the window it needs to
-be drawn in must be stored in \c{game_params}. In particular, this
-imposes the fundamental limitation that random game generation may
-not have a random effect on the window size: game generation
-algorithms are constrained to work by starting from the grid size
-rather than generating it as an emergent phenomenon. (Although this
-is a restriction in theory, it has not yet seemed to be a problem.)
-
-\S{backend-game-state} \c{game_state}
-
-While the user is actually playing a puzzle, the \c{game_state}
-structure stores all the data corresponding to the current state of
-play.
-
-The mid-end keeps \c{game_state}s in a list, and adds to the list
-every time the player makes a move; the Undo and Redo functions step
-back and forth through that list.
-
-Therefore, a good means of deciding whether a data item needs to go
-in \c{game_state} is: would a player expect that data item to be
-restored on undo? If so, put it in \c{game_state}, and this will
-automatically happen without you having to lift a finger. If not
-\dash for example, the deaths counter in Mines is precisely
-something that does \e{not} want to be reset to its previous state
-on an undo \dash then you might have found a data item that needs to
-go in \c{game_ui} instead.
-
-During play, \c{game_state}s are often passed around without an
-accompanying \c{game_params} structure. Therefore, any information
-in \c{game_params} which is important during play (such as the grid
-size) must be duplicated within the \c{game_state}. One simple
-method of doing this is to have the \c{game_state} structure
-\e{contain} a \c{game_params} structure as one of its members,
-although this isn't obligatory if you prefer to do it another way.
-
-\S{backend-game-drawstate} \c{game_drawstate}
-
-\c{game_drawstate} carries persistent state relating to the current
-graphical contents of the puzzle window. The same \c{game_drawstate}
-is passed to every call to the game redraw function, so that it can
-remember what it has already drawn and what needs redrawing.
-
-A typical use for a \c{game_drawstate} is to have an array mirroring
-the array of grid squares in the \c{game_state}; then every time the
-redraw function was passed a \c{game_state}, it would loop over all
-the squares, and physically redraw any whose description in the
-\c{game_state} (i.e. what the square needs to look like when the
-redraw is completed) did not match its description in the
-\c{game_drawstate} (i.e. what the square currently looks like).
-
-\c{game_drawstate} is occasionally completely torn down and
-reconstructed by the mid-end, if the user somehow forces a full
-redraw. Therefore, no data should be stored in \c{game_drawstate}
-which is \e{not} related to the state of the puzzle window, because
-it might be unexpectedly destroyed.
-
-The back end provides functions to create and destroy
-\c{game_drawstate}, which means it can contain pointers to
-subsidiary allocated data if it needs to. A common thing to want to
-allocate in a \c{game_drawstate} is a \c{blitter}; see
-\k{drawing-blitter} for more on this subject.
-
-\S{backend-game-ui} \c{game_ui}
-
-\c{game_ui} contains whatever doesn't fit into the above three
-structures!
-
-A new \c{game_ui} is created when the user begins playing a new
-instance of a puzzle (i.e. during \q{New Game} or after entering a
-game ID etc). It persists until the user finishes playing that game
-and begins another one (or closes the window); in particular,
-\q{Restart Game} does \e{not} destroy the \c{game_ui}.
-
-\c{game_ui} is useful for implementing user-interface state which is
-not part of \c{game_state}. Common examples are keyboard control
-(you wouldn't want to have to separately Undo through every cursor
-motion) and mouse dragging. See \k{writing-keyboard-cursor} and
-\k{writing-howto-dragging}, respectively, for more details.
-
-Another use for \c{game_ui} is to store highly persistent data such
-as the Mines death counter. This is conceptually rather different:
-where the Net cursor position was \e{not important enough} to
-preserve for the player to restore by Undo, the Mines death counter
-is \e{too important} to permit the player to revert by Undo!
-
-A final use for \c{game_ui} is to pass information to the redraw
-function about recent changes to the game state. This is used in
-Mines, for example, to indicate whether a requested \q{flash} should
-be a white flash for victory or a red flash for defeat; see
-\k{writing-flash-types}.
-
-\H{backend-simple} Simple data in the back end
-
-In this section I begin to discuss each individual element in the
-back end structure. To begin with, here are some simple
-self-contained data elements.
-
-\S{backend-name} \c{name}
-
-\c const char *name;
-
-This is a simple ASCII string giving the name of the puzzle. This
-name will be used in window titles, in game selection menus on
-monolithic platforms, and anywhere else that the front end needs to
-know the name of a game.
-
-\S{backend-winhelp} \c{winhelp_topic}
-
-\c const char *winhelp_topic;
-
-This member is used on Windows only, to provide online help.
-Although the Windows front end provides a separate binary for each
-puzzle, it has a single monolithic help file; so when a user selects
-\q{Help} from the menu, the program needs to open the help file and
-jump to the chapter describing that particular puzzle.
-
-Therefore, each chapter in \c{puzzles.but} is labelled with a
-\e{help topic} name, similar to this:
-
-\c \cfg{winhelp-topic}{games.net}
-
-And then the corresponding game back end encodes the topic string
-(here \cq{games.net}) in the \c{winhelp_topic} element of the game
-structure.
-
-\H{backend-params} Handling game parameter sets
-
-In this section I present the various functions which handle the
-\c{game_params} structure.
-
-\S{backend-default-params} \cw{default_params()}
-
-\c game_params *(*default_params)(void);
-
-This function allocates a new \c{game_params} structure, fills it
-with the default values, and returns a pointer to it.
-
-\S{backend-fetch-preset} \cw{fetch_preset()}
-
-\c bool (*fetch_preset)(int i, char **name, game_params **params);
-
-This function is one of the two APIs a back end can provide to
-populate the \q{Type} menu, which provides a list of conveniently
-accessible preset parameters for most games.
-
-The function is called with \c{i} equal to the index of the preset
-required (numbering from zero). It returns \cw{false} if that preset
-does not exist (if \c{i} is less than zero or greater than the
-largest preset index). Otherwise, it sets \c{*params} to point at a
-newly allocated \c{game_params} structure containing the preset
-information, sets \c{*name} to point at a newly allocated C string
-containing the preset title (to go on the \q{Type} menu), and
-returns \cw{true}.
-
-If the game does not wish to support any presets at all, this
-function is permitted to return \cw{false} always.
-
-If the game wants to return presets in the form of a hierarchical menu
-instead of a flat list (and, indeed, even if it doesn't), then it may
-set this function pointer to \cw{NULL}, and instead fill in the
-alternative function pointer \cw{preset_menu}
-(\k{backend-preset-menu}).
-
-\S{backend-preset-menu} \cw{preset_menu()}
-
-\c struct preset_menu *(*preset_menu)(void);
-
-This function is the more flexible of the two APIs by which a back end
-can define a collection of preset game parameters.
-
-This function simply returns a complete menu hierarchy, in the form of
-a \c{struct preset_menu} (see \k{midend-get-presets}) and further
-submenus (if it wishes) dangling off it. There are utility functions
-described in \k{utils-presets} to make it easy for the back end to
-construct this menu.
-
-If the game has no need to return a hierarchy of menus, it may instead
-opt to implement the \cw{fetch_preset()} function (see
-\k{backend-fetch-preset}).
-
-The game need not fill in the \c{id} fields in the preset menu
-structures. The mid-end will do that after it receives the structure
-from the game, and before passing it on to the front end.
-
-\S{backend-encode-params} \cw{encode_params()}
-
-\c char *(*encode_params)(const game_params *params, bool full);
-
-The job of this function is to take a \c{game_params}, and encode it
-in a string form for use in game IDs. The return value must be a
-newly allocated C string, and \e{must} not contain a colon or a hash
-(since those characters are used to mark the end of the parameter
-section in a game ID).
-
-Ideally, it should also not contain any other potentially
-controversial punctuation; bear in mind when designing a string
-parameter format that it will probably be used on both Windows and
-Unix command lines under a variety of exciting shell quoting and
-metacharacter rules. Sticking entirely to alphanumerics is the
-safest thing; if you really need punctuation, you can probably get
-away with commas, periods or underscores without causing anybody any
-major inconvenience. If you venture far beyond that, you're likely
-to irritate \e{somebody}.
-
-(At the time of writing this, all existing games have purely
-alphanumeric string parameter formats. Usually these involve a
-letter denoting a parameter, followed optionally by a number giving
-the value of that parameter, with a few mandatory parts at the
-beginning such as numeric width and height separated by \cq{x}.)
-
-If the \c{full} parameter is \cw{true}, this function should encode
-absolutely everything in the \c{game_params}, such that a subsequent
-call to \cw{decode_params()} (\k{backend-decode-params}) will yield
-an identical structure. If \c{full} is \cw{false}, however, you
-should leave out anything which is not necessary to describe a
-\e{specific puzzle instance}, i.e. anything which only takes effect
-when a new puzzle is \e{generated}. For example, the Solo
-\c{game_params} includes a difficulty rating used when constructing
-new puzzles; but a Solo game ID need not explicitly include the
-difficulty, since to describe a puzzle once generated it's
-sufficient to give the grid dimensions and the location and contents
-of the clue squares. (Indeed, one might very easily type in a puzzle
-out of a newspaper without \e{knowing} what its difficulty level is
-in Solo's terminology.) Therefore, Solo's \cw{encode_params()} only
-encodes the difficulty level if \c{full} is set.
-
-\S{backend-decode-params} \cw{decode_params()}
-
-\c void (*decode_params)(game_params *params, char const *string);
-
-This function is the inverse of \cw{encode_params()}
-(\k{backend-encode-params}). It parses the supplied string and fills
-in the supplied \c{game_params} structure. Note that the structure
-will \e{already} have been allocated: this function is not expected
-to create a \e{new} \c{game_params}, but to modify an existing one.
-
-This function can receive a string which only encodes a subset of
-the parameters. The most obvious way in which this can happen is if
-the string was constructed by \cw{encode_params()} with its \c{full}
-parameter set to \cw{FALSE}; however, it could also happen if the
-user typed in a parameter set manually and missed something out. Be
-prepared to deal with a wide range of possibilities.
-
-When dealing with a parameter which is not specified in the input
-string, what to do requires a judgment call on the part of the
-programmer. Sometimes it makes sense to adjust other parameters to
-bring them into line with the new ones. In Mines, for example, you
-would probably not want to keep the same mine count if the user
-dropped the grid size and didn't specify one, since you might easily
-end up with more mines than would actually fit in the grid! On the
-other hand, sometimes it makes sense to leave the parameter alone: a
-Solo player might reasonably expect to be able to configure size and
-difficulty independently of one another.
-
-This function currently has no direct means of returning an error if
-the string cannot be parsed at all. However, the returned
-\c{game_params} is almost always subsequently passed to
-\cw{validate_params()} (\k{backend-validate-params}), so if you
-really want to signal parse errors, you could always have a \c{char
-*} in your parameters structure which stored an error message, and
-have \cw{validate_params()} return it if it is non-\cw{NULL}.
-
-\S{backend-free-params} \cw{free_params()}
-
-\c void (*free_params)(game_params *params);
-
-This function frees a \c{game_params} structure, and any subsidiary
-allocations contained within it.
-
-\S{backend-dup-params} \cw{dup_params()}
-
-\c game_params *(*dup_params)(const game_params *params);
-
-This function allocates a new \c{game_params} structure and
-initialises it with an exact copy of the information in the one
-provided as input. It returns a pointer to the new duplicate.
-
-\S{backend-can-configure} \c{can_configure}
-
-\c bool can_configure;
-
-This data element is set to \cw{true} if the back end supports custom
-parameter configuration via a dialog box. If it is \cw{true}, then the
-functions \cw{configure()} and \cw{custom_params()} are expected to
-work. See \k{backend-configure} and \k{backend-custom-params} for more
-details.
-
-\S{backend-configure} \cw{configure()}
-
-\c config_item *(*configure)(const game_params *params);
-
-This function is called when the user requests a dialog box for
-custom parameter configuration. It returns a newly allocated array
-of \cw{config_item} structures, describing the GUI elements required
-in the dialog box. The array should have one more element than the
-number of controls, since it is terminated with a \cw{C_END} marker
-(see below). Each array element describes the control together with
-its initial value; the front end will modify the value fields and
-return the updated array to \cw{custom_params()} (see
-\k{backend-custom-params}).
-
-The \cw{config_item} structure contains the following elements:
-
-\c char *name;
-\c int type;
-\c union { /* type-specific fields */ } u;
-\e         iiiiiiiiiiiiiiiiiiiiiiiiii
-
-\c{name} is an ASCII string giving the textual label for a GUI
-control. It is \e{not} expected to be dynamically allocated.
-
-\c{type} contains one of a small number of \c{enum} values defining
-what type of control is being described. The usable member of the
-union field \c{u} depends on \c{type}. The valid type values are:
-
-\dt \c{C_STRING}
-
-\dd Describes a text input box. (This is also used for numeric
-input. The back end does not bother informing the front end that the
-box is numeric rather than textual; some front ends do have the
-capacity to take this into account, but I decided it wasn't worth
-the extra complexity in the interface.)
-
-\lcont{
-
-For controls of this type, \c{u.string} contains a single field
-
-\c char *sval;
-
-which stores a dynamically allocated string representing the contents
-of the input box.
-
-}
-
-\dt \c{C_BOOLEAN}
-
-\dd Describes a simple checkbox.
-
-\lcont{
-
-For controls of this type, \c{u.boolean} contains a single field
-
-\c int bval;
-
-which is either \cw{TRUE} or \cw{FALSE}.
-
-}
-
-\dt \c{C_CHOICES}
-
-\dd Describes a drop-down list presenting one of a small number of
-fixed choices.
-
-\lcont{
-
-For controls of this type, \c{u.choices} contains two fields:
-
-\c const char *choicenames;
-\c int selected;
-
-\c{choicenames} contains a list of strings describing the choices. The
-very first character of \c{sval} is used as a delimiter when
-processing the rest (so that the strings \cq{:zero:one:two},
-\cq{!zero!one!two} and \cq{xzeroxonextwo} all define a three-element
-list containing \cq{zero}, \cq{one} and \cq{two}).
-
-\c{selected} contains the index of the currently selected element,
-numbering from zero (so that in the above example, 0 would mean
-\cq{zero} and 2 would mean \cq{two}).
-
-Note that \c{u.choices.choicenames} is \e{not} dynamically allocated,
-unlike \c{u.string.sval}.
-
-}
-
-\dt \c{C_END}
-
-\dd Marks the end of the array of \c{config_item}s. There is no
-associated member of the union field \c{u} for this type.
-
-The array returned from this function is expected to have filled in
-the initial values of all the controls according to the input
-\c{game_params} structure.
-
-If the game's \c{can_configure} flag is set to \cw{FALSE}, this
-function is never called and need not do anything at all.
-
-\S{backend-custom-params} \cw{custom_params()}
-
-\c game_params *(*custom_params)(const config_item *cfg);
-
-This function is the counterpart to \cw{configure()}
-(\k{backend-configure}). It receives as input an array of
-\c{config_item}s which was originally created by \cw{configure()},
-but in which the control values have since been changed in
-accordance with user input. Its function is to read the new values
-out of the controls and return a newly allocated \c{game_params}
-structure representing the user's chosen parameter set.
-
-(The front end will have modified the controls' \e{values}, but
-there will still always be the same set of controls, in the same
-order, as provided by \cw{configure()}. It is not necessary to check
-the \c{name} and \c{type} fields, although you could use
-\cw{assert()} if you were feeling energetic.)
-
-This function is not expected to (and indeed \e{must not}) free the
-input \c{config_item} array. (If the parameters fail to validate,
-the dialog box will stay open.)
-
-If the game's \c{can_configure} flag is set to \cw{FALSE}, this
-function is never called and need not do anything at all.
-
-\S{backend-validate-params} \cw{validate_params()}
-
-\c const char *(*validate_params)(const game_params *params,
-\c                                bool full);
-
-This function takes a \c{game_params} structure as input, and checks
-that the parameters described in it fall within sensible limits. (At
-the very least, grid dimensions should almost certainly be strictly
-positive, for example.)
-
-Return value is \cw{NULL} if no problems were found, or
-alternatively a (non-dynamically-allocated) ASCII string describing
-the error in human-readable form.
-
-If the \c{full} parameter is set, full validation should be
-performed: any set of parameters which would not permit generation
-of a sensible puzzle should be faulted. If \c{full} is \e{not} set,
-the implication is that these parameters are not going to be used
-for \e{generating} a puzzle; so parameters which can't even sensibly
-\e{describe} a valid puzzle should still be faulted, but parameters
-which only affect puzzle generation should not be.
-
-(The \c{full} option makes a difference when parameter combinations
-are non-orthogonal. For example, Net has a boolean option
-controlling whether it enforces a unique solution; it turns out that
-it's impossible to generate a uniquely soluble puzzle with wrapping
-walls and width 2, so \cw{validate_params()} will complain if you
-ask for one. However, if the user had just been playing a unique
-wrapping puzzle of a more sensible width, and then pastes in a game
-ID acquired from somebody else which happens to describe a
-\e{non}-unique wrapping width-2 puzzle, then \cw{validate_params()}
-will be passed a \c{game_params} containing the width and wrapping
-settings from the new game ID and the uniqueness setting from the
-old one. This would be faulted, if it weren't for the fact that
-\c{full} is not set during this call, so Net ignores the
-inconsistency. The resulting \c{game_params} is never subsequently
-used to generate a puzzle; this is a promise made by the mid-end
-when it asks for a non-full validation.)
-
-\H{backend-descs} Handling game descriptions
-
-In this section I present the functions that deal with a textual
-description of a puzzle, i.e. the part that comes after the colon in
-a descriptive-format game ID.
-
-\S{backend-new-desc} \cw{new_desc()}
-
-\c char *(*new_desc)(const game_params *params, random_state *rs,
-\c                   char **aux, bool interactive);
-
-This function is where all the really hard work gets done. This is
-the function whose job is to randomly generate a new puzzle,
-ensuring solubility and uniqueness as appropriate.
-
-As input it is given a \c{game_params} structure and a random state
-(see \k{utils-random} for the random number API). It must invent a
-puzzle instance, encode it in string form, and return a dynamically
-allocated C string containing that encoding.
-
-Additionally, it may return a second dynamically allocated string in
-\c{*aux}. (If it doesn't want to, then it can leave that parameter
-completely alone; it isn't required to set it to \cw{NULL}, although
-doing so is harmless.) That string, if present, will be passed to
-\cw{solve()} (\k{backend-solve}) later on; so if the puzzle is
-generated in such a way that a solution is known, then information
-about that solution can be saved in \c{*aux} for \cw{solve()} to
-use.
-
-The \c{interactive} parameter should be ignored by almost all
-puzzles. Its purpose is to distinguish between generating a puzzle
-within a GUI context for immediate play, and generating a puzzle in
-a command-line context for saving to be played later. The only
-puzzle that currently uses this distinction (and, I fervently hope,
-the only one which will \e{ever} need to use it) is Mines, which
-chooses a random first-click location when generating puzzles
-non-interactively, but which waits for the user to place the first
-click when interactive. If you think you have come up with another
-puzzle which needs to make use of this parameter, please think for
-at least ten minutes about whether there is \e{any} alternative!
-
-Note that game description strings are not required to contain an
-encoding of parameters such as grid size; a game description is
-never separated from the \c{game_params} it was generated with, so
-any information contained in that structure need not be encoded
-again in the game description.
-
-\S{backend-validate-desc} \cw{validate_desc()}
-
-\c const char *(*validate_desc)(const game_params *params,
-\c                              const char *desc);
-
-This function is given a game description, and its job is to
-validate that it describes a puzzle which makes sense.
-
-To some extent it's up to the user exactly how far they take the
-phrase \q{makes sense}; there are no particularly strict rules about
-how hard the user is permitted to shoot themself in the foot when
-typing in a bogus game description by hand. (For example, Rectangles
-will not verify that the sum of all the numbers in the grid equals
-the grid's area. So a user could enter a puzzle which was provably
-not soluble, and the program wouldn't complain; there just wouldn't
-happen to be any sequence of moves which solved it.)
-
-The one non-negotiable criterion is that any game description which
-makes it through \cw{validate_desc()} \e{must not} subsequently
-cause a crash or an assertion failure when fed to \cw{new_game()}
-and thence to the rest of the back end.
-
-The return value is \cw{NULL} on success, or a
-non-dynamically-allocated C string containing an error message.
-
-\S{backend-new-game} \cw{new_game()}
-
-\c game_state *(*new_game)(midend *me, const game_params *params,
-\c                         const char *desc);
-
-This function takes a game description as input, together with its
-accompanying \c{game_params}, and constructs a \c{game_state}
-describing the initial state of the puzzle. It returns a newly
-allocated \c{game_state} structure.
-
-Almost all puzzles should ignore the \c{me} parameter. It is
-required by Mines, which needs it for later passing to
-\cw{midend_supersede_game_desc()} (see \k{backend-supersede}) once
-the user has placed the first click. I fervently hope that no other
-puzzle will be awkward enough to require it, so everybody else
-should ignore it. As with the \c{interactive} parameter in
-\cw{new_desc()} (\k{backend-new-desc}), if you think you have a
-reason to need this parameter, please try very hard to think of an
-alternative approach!
-
-\H{backend-states} Handling game states
-
-This section describes the functions which create and destroy
-\c{game_state} structures.
-
-(Well, except \cw{new_game()}, which is in \k{backend-new-game}
-instead of under here; but it deals with game descriptions \e{and}
-game states and it had to go in one section or the other.)
-
-\S{backend-dup-game} \cw{dup_game()}
-
-\c game_state *(*dup_game)(const game_state *state);
-
-This function allocates a new \c{game_state} structure and
-initialises it with an exact copy of the information in the one
-provided as input. It returns a pointer to the new duplicate.
-
-\S{backend-free-game} \cw{free_game()}
-
-\c void (*free_game)(game_state *state);
-
-This function frees a \c{game_state} structure, and any subsidiary
-allocations contained within it.
-
-\H{backend-ui} Handling \c{game_ui}
-
-\S{backend-new-ui} \cw{new_ui()}
-
-\c game_ui *(*new_ui)(const game_state *state);
-
-This function allocates and returns a new \c{game_ui} structure for
-playing a particular puzzle. It is passed a pointer to the initial
-\c{game_state}, in case it needs to refer to that when setting up
-the initial values for the new game.
-
-\S{backend-free-ui} \cw{free_ui()}
-
-\c void (*free_ui)(game_ui *ui);
-
-This function frees a \c{game_ui} structure, and any subsidiary
-allocations contained within it.
-
-\S{backend-encode-ui} \cw{encode_ui()}
-
-\c char *(*encode_ui)(const game_ui *ui);
-
-This function encodes any \e{important} data in a \c{game_ui}
-structure in string form. It is only called when saving a
-half-finished game to a file.
-
-It should be used sparingly. Almost all data in a \c{game_ui} is not
-important enough to save. The location of the keyboard-controlled
-cursor, for example, can be reset to a default position on reloading
-the game without impacting the user experience. If the user should
-somehow manage to save a game while a mouse drag was in progress,
-then discarding that mouse drag would be an outright \e{feature}.
-
-A typical thing that \e{would} be worth encoding in this function is
-the Mines death counter: it's in the \c{game_ui} rather than the
-\c{game_state} because it's too important to allow the user to
-revert it by using Undo, and therefore it's also too important to
-allow the user to revert it by saving and reloading. (Of course, the
-user could edit the save file by hand... But if the user is \e{that}
-determined to cheat, they could just as easily modify the game's
-source.)
-
-\S{backend-decode-ui} \cw{decode_ui()}
-
-\c void (*decode_ui)(game_ui *ui, const char *encoding);
-
-This function parses a string previously output by \cw{encode_ui()},
-and writes the decoded data back into the provided \c{game_ui}
-structure.
-
-\S{backend-changed-state} \cw{changed_state()}
-
-\c void (*changed_state)(game_ui *ui, const game_state *oldstate,
-\c                       const game_state *newstate);
-
-This function is called by the mid-end whenever the current game
-state changes, for any reason. Those reasons include:
-
-\b a fresh move being made by \cw{interpret_move()} and
-\cw{execute_move()}
-
-\b a solve operation being performed by \cw{solve()} and
-\cw{execute_move()}
-
-\b the user moving back and forth along the undo list by means of
-the Undo and Redo operations
-
-\b the user selecting Restart to go back to the initial game state.
-
-The job of \cw{changed_state()} is to update the \c{game_ui} for
-consistency with the new game state, if any update is necessary. For
-example, Same Game stores data about the currently selected tile
-group in its \c{game_ui}, and this data is intrinsically related to
-the game state it was derived from. So it's very likely to become
-invalid when the game state changes; thus, Same Game's
-\cw{changed_state()} function clears the current selection whenever
-it is called.
-
-When \cw{anim_length()} or \cw{flash_length()} are called, you can
-be sure that there has been a previous call to \cw{changed_state()}.
-So \cw{changed_state()} can set up data in the \c{game_ui} which will
-be read by \cw{anim_length()} and \cw{flash_length()}, and those
-functions will not have to worry about being called without the data
-having been initialised.
-
-\H{backend-moves} Making moves
-
-This section describes the functions which actually make moves in
-the game: that is, the functions which process user input and end up
-producing new \c{game_state}s.
-
-\S{backend-interpret-move} \cw{interpret_move()}
-
-\c char *(*interpret_move)(const game_state *state, game_ui *ui,
-\c                         const game_drawstate *ds,
-\c                         int x, int y, int button);
-
-This function receives user input and processes it. Its input
-parameters are the current \c{game_state}, the current \c{game_ui}
-and the current \c{game_drawstate}, plus details of the input event.
-\c{button} is either an ASCII value or a special code (listed below)
-indicating an arrow or function key or a mouse event; when
-\c{button} is a mouse event, \c{x} and \c{y} contain the pixel
-coordinates of the mouse pointer relative to the top left of the
-puzzle's drawing area.
-
-(The pointer to the \c{game_drawstate} is marked \c{const}, because
-\c{interpret_move} should not write to it. The normal use of that
-pointer will be to read the game's tile size parameter in order to
-divide mouse coordinates by it.)
-
-\cw{interpret_move()} may return in three different ways:
-
-\b Returning \cw{NULL} indicates that no action whatsoever occurred
-in response to the input event; the puzzle was not interested in it
-at all.
-
-\b Returning the special value \cw{UI_UPDATE} indicates that the input
-event has resulted in a change being made to the \c{game_ui} which
-will require a redraw of the game window, but that no actual \e{move}
-was made (i.e. no new \c{game_state} needs to be created).
-
-\b Returning anything else indicates that a move was made and that a
-new \c{game_state} must be created. However, instead of actually
-constructing a new \c{game_state} itself, this function is required
-to return a string description of the details of the move. This
-string will be passed to \cw{execute_move()}
-(\k{backend-execute-move}) to actually create the new
-\c{game_state}. (Encoding moves as strings in this way means that
-the mid-end can keep the strings as well as the game states, and the
-strings can be written to disk when saving the game and fed to
-\cw{execute_move()} again on reloading.)
-
-The return value from \cw{interpret_move()} is expected to be
-dynamically allocated if and only if it is not either \cw{NULL}
-\e{or} the special string constant \c{UI_UPDATE}.
-
-After this function is called, the back end is permitted to rely on
-some subsequent operations happening in sequence:
-
-\b \cw{execute_move()} will be called to convert this move
-description into a new \c{game_state}
-
-\b \cw{changed_state()} will be called with the new \c{game_state}.
-
-This means that if \cw{interpret_move()} needs to do updates to the
-\c{game_ui} which are easier to perform by referring to the new
-\c{game_state}, it can safely leave them to be done in
-\cw{changed_state()} and not worry about them failing to happen.
-
-(Note, however, that \cw{execute_move()} may \e{also} be called in
-other circumstances. It is only \cw{interpret_move()} which can rely
-on a subsequent call to \cw{changed_state()}.)
-
-The special key codes supported by this function are:
-
-\dt \cw{LEFT_BUTTON}, \cw{MIDDLE_BUTTON}, \cw{RIGHT_BUTTON}
-
-\dd Indicate that one of the mouse buttons was pressed down.
-
-\dt \cw{LEFT_DRAG}, \cw{MIDDLE_DRAG}, \cw{RIGHT_DRAG}
-
-\dd Indicate that the mouse was moved while one of the mouse buttons
-was still down. The mid-end guarantees that when one of these events
-is received, it will always have been preceded by a button-down
-event (and possibly other drag events) for the same mouse button,
-and no event involving another mouse button will have appeared in
-between.
-
-\dt \cw{LEFT_RELEASE}, \cw{MIDDLE_RELEASE}, \cw{RIGHT_RELEASE}
-
-\dd Indicate that a mouse button was released.  The mid-end
-guarantees that when one of these events is received, it will always
-have been preceded by a button-down event (and possibly some drag
-events) for the same mouse button, and no event involving another
-mouse button will have appeared in between.
-
-\dt \cw{CURSOR_UP}, \cw{CURSOR_DOWN}, \cw{CURSOR_LEFT},
-\cw{CURSOR_RIGHT}
-
-\dd Indicate that an arrow key was pressed.
-
-\dt \cw{CURSOR_SELECT}
-
-\dd On platforms which have a prominent \q{select} button alongside
-their cursor keys, indicates that that button was pressed.
-
-In addition, there are some modifiers which can be bitwise-ORed into
-the \c{button} parameter:
-
-\dt \cw{MOD_CTRL}, \cw{MOD_SHFT}
-
-\dd These indicate that the Control or Shift key was pressed
-alongside the key. They only apply to the cursor keys, not to mouse
-buttons or anything else.
-
-\dt \cw{MOD_NUM_KEYPAD}
-
-\dd This applies to some ASCII values, and indicates that the key
-code was input via the numeric keypad rather than the main keyboard.
-Some puzzles may wish to treat this differently (for example, a
-puzzle might want to use the numeric keypad as an eight-way
-directional pad), whereas others might not (a game involving numeric
-input probably just wants to treat the numeric keypad as numbers).
-
-\dt \cw{MOD_MASK}
-
-\dd This mask is the bitwise OR of all the available modifiers; you
-can bitwise-AND with \cw{~MOD_MASK} to strip all the modifiers off
-any input value.
-
-\S{backend-execute-move} \cw{execute_move()}
-
-\c game_state *(*execute_move)(const game_state *state, char *move);
-
-This function takes an input \c{game_state} and a move string as
-output from \cw{interpret_move()}. It returns a newly allocated
-\c{game_state} which contains the result of applying the specified
-move to the input game state.
-
-This function may return \cw{NULL} if it cannot parse the move
-string (and this is definitely preferable to crashing or failing an
-assertion, since one way this can happen is if loading a corrupt
-save file). However, it must not return \cw{NULL} for any move
-string that really was output from \cw{interpret_move()}: this is
-punishable by assertion failure in the mid-end.
-
-\S{backend-can-solve} \c{can_solve}
-
-\c bool can_solve;
-
-This field is set to \cw{true} if the game's \cw{solve()} function
-does something. If it's set to \cw{false}, the game will not even
-offer the \q{Solve} menu option.
-
-\S{backend-solve} \cw{solve()}
-
-\c char *(*solve)(const game_state *orig, const game_state *curr,
-\c                const char *aux, const char **error);
-
-This function is called when the user selects the \q{Solve} option
-from the menu.
-
-It is passed two input game states: \c{orig} is the game state from
-the very start of the puzzle, and \c{curr} is the current one.
-(Different games find one or other or both of these convenient.) It
-is also passed the \c{aux} string saved by \cw{new_desc()}
-(\k{backend-new-desc}), in case that encodes important information
-needed to provide the solution.
-
-If this function is unable to produce a solution (perhaps, for
-example, the game has no in-built solver so it can only solve
-puzzles it invented internally and has an \c{aux} string for) then
-it may return \cw{NULL}. If it does this, it must also set
-\c{*error} to an error message to be presented to the user (such as
-\q{Solution not known for this puzzle}); that error message is not
-expected to be dynamically allocated.
-
-If this function \e{does} produce a solution, it returns a move string
-suitable for feeding to \cw{execute_move()}
-(\k{backend-execute-move}). Like a (non-empty) string returned from
-\cw{interpret_move()}, the returned string should be dynamically
-allocated.
-
-\H{backend-drawing} Drawing the game graphics
-
-This section discusses the back end functions that deal with
-drawing.
-
-\S{backend-new-drawstate} \cw{new_drawstate()}
-
-\c game_drawstate *(*new_drawstate)(drawing *dr,
-\c                                  const game_state *state);
-
-This function allocates and returns a new \c{game_drawstate}
-structure for drawing a particular puzzle. It is passed a pointer to
-a \c{game_state}, in case it needs to refer to that when setting up
-any initial data.
-
-This function may not rely on the puzzle having been newly started;
-a new draw state can be constructed at any time if the front end
-requests a forced redraw. For games like Pattern, in which initial
-game states are much simpler than general ones, this might be
-important to keep in mind.
-
-The parameter \c{dr} is a drawing object (see \k{drawing}) which the
-function might need to use to allocate blitters. (However, this
-isn't recommended; it's usually more sensible to wait to allocate a
-blitter until \cw{set_size()} is called, because that way you can
-tailor it to the scale at which the puzzle is being drawn.)
-
-\S{backend-free-drawstate} \cw{free_drawstate()}
-
-\c void (*free_drawstate)(drawing *dr, game_drawstate *ds);
-
-This function frees a \c{game_drawstate} structure, and any
-subsidiary allocations contained within it.
-
-The parameter \c{dr} is a drawing object (see \k{drawing}), which
-might be required if you are freeing a blitter.
-
-\S{backend-preferred-tilesize} \c{preferred_tilesize}
-
-\c int preferred_tilesize;
-
-Each game is required to define a single integer parameter which
-expresses, in some sense, the scale at which it is drawn. This is
-described in the APIs as \cq{tilesize}, since most puzzles are on a
-square (or possibly triangular or hexagonal) grid and hence a
-sensible interpretation of this parameter is to define it as the
-size of one grid tile in pixels; however, there's no actual
-requirement that the \q{tile size} be proportional to the game
-window size. Window size is required to increase monotonically with
-\q{tile size}, however.
-
-The data element \c{preferred_tilesize} indicates the tile size
-which should be used in the absence of a good reason to do otherwise
-(such as the screen being too small, or the user explicitly
-requesting a resize if that ever gets implemented).
-
-\S{backend-compute-size} \cw{compute_size()}
-
-\c void (*compute_size)(const game_params *params, int tilesize,
-\c                      int *x, int *y);
-
-This function is passed a \c{game_params} structure and a tile size.
-It returns, in \c{*x} and \c{*y}, the size in pixels of the drawing
-area that would be required to render a puzzle with those parameters
-at that tile size.
-
-\S{backend-set-size} \cw{set_size()}
-
-\c void (*set_size)(drawing *dr, game_drawstate *ds,
-\c                  const game_params *params, int tilesize);
-
-This function is responsible for setting up a \c{game_drawstate} to
-draw at a given tile size. Typically this will simply involve
-copying the supplied \c{tilesize} parameter into a \c{tilesize}
-field inside the draw state; for some more complex games it might
-also involve setting up other dimension fields, or possibly
-allocating a blitter (see \k{drawing-blitter}).
-
-The parameter \c{dr} is a drawing object (see \k{drawing}), which is
-required if a blitter needs to be allocated.
-
-Back ends may assume (and may enforce by assertion) that this
-function will be called at most once for any \c{game_drawstate}. If
-a puzzle needs to be redrawn at a different size, the mid-end will
-create a fresh drawstate.
-
-\S{backend-colours} \cw{colours()}
-
-\c float *(*colours)(frontend *fe, int *ncolours);
-
-This function is responsible for telling the front end what colours
-the puzzle will need to draw itself.
-
-It returns the number of colours required in \c{*ncolours}, and the
-return value from the function itself is a dynamically allocated
-array of three times that many \c{float}s, containing the red, green
-and blue components of each colour respectively as numbers in the
-range [0,1].
-
-The second parameter passed to this function is a front end handle.
-The only things it is permitted to do with this handle are to call
-the front-end function called \cw{frontend_default_colour()} (see
-\k{frontend-default-colour}) or the utility function called
-\cw{game_mkhighlight()} (see \k{utils-game-mkhighlight}). (The
-latter is a wrapper on the former, so front end implementors only
-need to provide \cw{frontend_default_colour()}.) This allows
-\cw{colours()} to take local configuration into account when
-deciding on its own colour allocations. Most games use the front
-end's default colour as their background, apart from a few which
-depend on drawing relief highlights so they adjust the background
-colour if it's too light for highlights to show up against it.
-
-Note that the colours returned from this function are for
-\e{drawing}, not for printing. Printing has an entirely different
-colour allocation policy.
-
-\S{backend-anim-length} \cw{anim_length()}
-
-\c float (*anim_length)(const game_state *oldstate,
-\c                      const game_state *newstate,
-\c                      int dir, game_ui *ui);
-
-This function is called when a move is made, undone or redone. It is
-given the old and the new \c{game_state}, and its job is to decide
-whether the transition between the two needs to be animated or can
-be instant.
-
-\c{oldstate} is the state that was current until this call;
-\c{newstate} is the state that will be current after it. \c{dir}
-specifies the chronological order of those states: if it is
-positive, then the transition is the result of a move or a redo (and
-so \c{newstate} is the later of the two moves), whereas if it is
-negative then the transition is the result of an undo (so that
-\c{newstate} is the \e{earlier} move).
-
-If this function decides the transition should be animated, it
-returns the desired length of the animation in seconds. If not, it
-returns zero.
-
-State changes as a result of a Restart operation are never animated;
-the mid-end will handle them internally and never consult this
-function at all. State changes as a result of Solve operations are
-also not animated by default, although you can change this for a
-particular game by setting a flag in \c{flags} (\k{backend-flags}).
-
-The function is also passed a pointer to the local \c{game_ui}. It
-may refer to information in here to help with its decision (see
-\k{writing-conditional-anim} for an example of this), and/or it may
-\e{write} information about the nature of the animation which will
-be read later by \cw{redraw()}.
-
-When this function is called, it may rely on \cw{changed_state()}
-having been called previously, so if \cw{anim_length()} needs to
-refer to information in the \c{game_ui}, then \cw{changed_state()}
-is a reliable place to have set that information up.
-
-Move animations do not inhibit further input events. If the user
-continues playing before a move animation is complete, the animation
-will be abandoned and the display will jump straight to the final
-state.
-
-\S{backend-flash-length} \cw{flash_length()}
-
-\c float (*flash_length)(const game_state *oldstate,
-\c                       const game_state *newstate,
-\c                       int dir, game_ui *ui);
-
-This function is called when a move is completed. (\q{Completed}
-means that not only has the move been made, but any animation which
-accompanied it has finished.) It decides whether the transition from
-\c{oldstate} to \c{newstate} merits a \q{flash}.
-
-A flash is much like a move animation, but it is \e{not} interrupted
-by further user interface activity; it runs to completion in
-parallel with whatever else might be going on on the display. The
-only thing which will rush a flash to completion is another flash.
-
-The purpose of flashes is to indicate that the game has been
-completed. They were introduced as a separate concept from move
-animations because of Net: the habit of most Net players (and
-certainly me) is to rotate a tile into place and immediately lock
-it, then move on to another tile. When you make your last move, at
-the instant the final tile is rotated into place the screen starts
-to flash to indicate victory \dash but if you then press the lock
-button out of habit, then the move animation is cancelled, and the
-victory flash does not complete. (And if you \e{don't} press the
-lock button, the completed grid will look untidy because there will
-be one unlocked square.) Therefore, I introduced a specific concept
-of a \q{flash} which is separate from a move animation and can
-proceed in parallel with move animations and any other display
-activity, so that the victory flash in Net is not cancelled by that
-final locking move.
-
-The input parameters to \cw{flash_length()} are exactly the same as
-the ones to \cw{anim_length()}.
-
-Just like \cw{anim_length()}, when this function is called, it may
-rely on \cw{changed_state()} having been called previously, so if it
-needs to refer to information in the \c{game_ui} then
-\cw{changed_state()} is a reliable place to have set that
-information up.
-
-(Some games use flashes to indicate defeat as well as victory;
-Mines, for example, flashes in a different colour when you tread on
-a mine from the colour it uses when you complete the game. In order
-to achieve this, its \cw{flash_length()} function has to store a
-flag in the \c{game_ui} to indicate which flash type is required.)
-
-\S{backend-get-cursor-location} \cw{get_cursor_location()}
-
-\c void (*get_cursor_location)(const game_ui *ui,
-\c                             const game_drawstate *ds,
-\c                             const game_state *state,
-\c                             const game_params *params,
-\c                             int *x, int *y,
-\c                             int *w, int *h);
-
-This function queries the backend for the rectangular region
-containing the cursor (in games that have one), or other region of
-interest.
-
-This function is called by only
-\cw{midend_get_cursor_location()}(\k{midend-get-cursor-location}). Its
-purpose is to allow front ends to query the location of the backend's
-cursor. With knowledge of this location, a front end can, for example,
-ensure that the region of interest remains visible if the puzzle is
-too big to fit on the screen at once.
-
-On returning, \cw{*x}, \cw{*y} should be set to the X and Y
-coordinates of the upper-left corner of the rectangular region of
-interest, and \cw{*w} and \cw{*h} should be the width and height of
-that region, respectively. In the event that a cursor is not visible
-on screen, this function should return and leave the return parameters
-untouched \dash the midend will notice this. The backend need not
-bother checking that \cw{x}, \cw{y}, \cw{w} and \cw{h} are
-non-\cw{NULL} \dash the midend guarantees that they will not be.
-
-Defining what constitutes a \q{region of interest} is left up to the
-backend. If a game provides a conventional cursor \dash such as Mines,
-Solo, or any of the other grid-based games \dash the most logical
-choice is of course the location of the cursor itself. However, in
-other cases such as Cube or Inertia, there is no \q{cursor} in the
-conventional sense \dash the player instead controls an object moving
-around the screen. In these cases, it makes sense to define the region
-of interest as the bounding box of the player object or another
-sensible region \dash such as the grid square the player is sitting on
-in Cube.
-
-If a backend does not provide a cursor mechanism at all, the backend
-is free to provide an empty implementation of this function, or a
-\cw{NULL} pointer in the \cw{game} structure \dash the midend will
-notice either of these cases and behave appropriately.
-
-\S{backend-status} \cw{status()}
-
-\c int (*status)(const game_state *state);
-
-This function returns a status value indicating whether the current
-game is still in play, or has been won, or has been conclusively lost.
-The mid-end uses this to implement \cw{midend_status()}
-(\k{midend-status}).
-
-The return value should be +1 if the game has been successfully
-solved. If the game has been lost in a situation where further play is
-unlikely, the return value should be -1. If neither is true (so play
-is still ongoing), return zero.
-
-Front ends may wish to use a non-zero status as a cue to proactively
-offer the option of starting a new game. Therefore, back ends should
-not return -1 if the game has been \e{technically} lost but undoing
-and continuing is still a realistic possibility.
-
-(For instance, games with hidden information such as Guess or Mines
-might well return a non-zero status whenever they reveal the solution,
-whether or not the player guessed it correctly, on the grounds that a
-player would be unlikely to hide the solution and continue playing
-after the answer was spoiled. On the other hand, games where you can
-merely get into a dead end such as Same Game or Inertia might choose
-to return 0 in that situation, on the grounds that the player would
-quite likely press Undo and carry on playing.)
-
-\S{backend-redraw} \cw{redraw()}
-
-\c void (*redraw)(drawing *dr, game_drawstate *ds,
-\c                const game_state *oldstate,
-\c                const game_state *newstate,
-\c                int dir, const game_ui *ui,
-\c                float anim_time, float flash_time);
-
-This function is responsible for actually drawing the contents of
-the game window, and for redrawing every time the game state or the
-\c{game_ui} changes.
-
-The parameter \c{dr} is a drawing object which may be passed to the
-drawing API functions (see \k{drawing} for documentation of the
-drawing API). This function may not save \c{dr} and use it
-elsewhere; it must only use it for calling back to the drawing API
-functions within its own lifetime.
-
-\c{ds} is the local \c{game_drawstate}, of course, and \c{ui} is the
-local \c{game_ui}.
-
-\c{newstate} is the semantically-current game state, and is always
-non-\cw{NULL}. If \c{oldstate} is also non-\cw{NULL}, it means that
-a move has recently been made and the game is still in the process
-of displaying an animation linking the old and new states; in this
-situation, \c{anim_time} will give the length of time (in seconds)
-that the animation has already been running. If \c{oldstate} is
-\cw{NULL}, then \c{anim_time} is unused (and will hopefully be set
-to zero to avoid confusion).
-
-\c{flash_time}, if it is is non-zero, denotes that the game is in
-the middle of a flash, and gives the time since the start of the
-flash. See \k{backend-flash-length} for general discussion of
-flashes.
-
-The very first time this function is called for a new
-\c{game_drawstate}, it is expected to redraw the \e{entire} drawing
-area. Since this often involves drawing visual furniture which is
-never subsequently altered, it is often simplest to arrange this by
-having a special \q{first time} flag in the draw state, and
-resetting it after the first redraw.
-
-When this function (or any subfunction) calls the drawing API, it is
-expected to pass colour indices which were previously defined by the
-\cw{colours()} function.
-
-\H{backend-printing} Printing functions
-
-This section discusses the back end functions that deal with
-printing puzzles out on paper.
-
-\S{backend-can-print} \c{can_print}
-
-\c bool can_print;
-
-This flag is set to \cw{true} if the puzzle is capable of printing
-itself on paper. (This makes sense for some puzzles, such as Solo,
-which can be filled in with a pencil. Other puzzles, such as
-Twiddle, inherently involve moving things around and so would not
-make sense to print.)
-
-If this flag is \cw{false}, then the functions \cw{print_size()}
-and \cw{print()} will never be called.
-
-\S{backend-can-print-in-colour} \c{can_print_in_colour}
-
-\c bool can_print_in_colour;
-
-This flag is set to \cw{true} if the puzzle is capable of printing
-itself differently when colour is available. For example, Map can
-actually print coloured regions in different \e{colours} rather than
-resorting to cross-hatching.
-
-If the \c{can_print} flag is \cw{false}, then this flag will be
-ignored.
-
-\S{backend-print-size} \cw{print_size()}
-
-\c void (*print_size)(const game_params *params, float *x, float *y);
-
-This function is passed a \c{game_params} structure and a tile size.
-It returns, in \c{*x} and \c{*y}, the preferred size in
-\e{millimetres} of that puzzle if it were to be printed out on paper.
-
-If the \c{can_print} flag is \cw{FALSE}, this function will never be
-called.
-
-\S{backend-print} \cw{print()}
-
-\c void (*print)(drawing *dr, const game_state *state, int tilesize);
-
-This function is called when a puzzle is to be printed out on paper.
-It should use the drawing API functions (see \k{drawing}) to print
-itself.
-
-This function is separate from \cw{redraw()} because it is often
-very different:
-
-\b The printing function may not depend on pixel accuracy, since
-printer resolution is variable. Draw as if your canvas had infinite
-resolution.
-
-\b The printing function sometimes needs to display things in a
-completely different style. Net, for example, is very different as
-an on-screen puzzle and as a printed one.
-
-\b The printing function is often much simpler since it has no need
-to deal with repeated partial redraws.
-
-However, there's no reason the printing and redraw functions can't
-share some code if they want to.
-
-When this function (or any subfunction) calls the drawing API, the
-colour indices it passes should be colours which have been allocated
-by the \cw{print_*_colour()} functions within this execution of
-\cw{print()}. This is very different from the fixed small number of
-colours used in \cw{redraw()}, because printers do not have a
-limitation on the total number of colours that may be used. Some
-puzzles' printing functions might wish to allocate only one \q{ink}
-colour and use it for all drawing; others might wish to allocate
-\e{more} colours than are used on screen.
-
-One possible colour policy worth mentioning specifically is that a
-puzzle's printing function might want to allocate the \e{same}
-colour indices as are used by the redraw function, so that code
-shared between drawing and printing does not have to keep switching
-its colour indices. In order to do this, the simplest thing is to
-make use of the fact that colour indices returned from
-\cw{print_*_colour()} are guaranteed to be in increasing order from
-zero. So if you have declared an \c{enum} defining three colours
-\cw{COL_BACKGROUND}, \cw{COL_THIS} and \cw{COL_THAT}, you might then
-write
-
-\c int c;
-\c c = print_mono_colour(dr, 1); assert(c == COL_BACKGROUND);
-\c c = print_mono_colour(dr, 0); assert(c == COL_THIS);
-\c c = print_mono_colour(dr, 0); assert(c == COL_THAT);
-
-If the \c{can_print} flag is \cw{FALSE}, this function will never be
-called.
-
-\H{backend-misc} Miscellaneous
-
-\S{backend-can-format-as-text-ever} \c{can_format_as_text_ever}
-
-\c bool can_format_as_text_ever;
-
-This field is \cw{true} if the game supports formatting a
-game state as ASCII text (typically ASCII art) for copying to the
-clipboard and pasting into other applications. If it is \cw{false},
-front ends will not offer the \q{Copy} command at all.
-
-If this field is \cw{true}, the game does not necessarily have to
-support text formatting for \e{all} games: e.g. a game which can be
-played on a square grid or a triangular one might only support copy
-and paste for the former, because triangular grids in ASCII art are
-just too difficult.
-
-If this field is \cw{false}, the functions
-\cw{can_format_as_text_now()} (\k{backend-can-format-as-text-now})
-and \cw{text_format()} (\k{backend-text-format}) are never called.
-
-\S{backend-can-format-as-text-now} \c{can_format_as_text_now()}
-
-\c bool (*can_format_as_text_now)(const game_params *params);
-
-This function is passed a \c{game_params}, and returns \cw{true} if
-the game can support ASCII text output for this particular game type.
-If it returns \cw{false}, front ends will grey out or otherwise
-disable the \q{Copy} command.
-
-Games may enable and disable the copy-and-paste function for
-different game \e{parameters}, but are currently constrained to
-return the same answer from this function for all game \e{states}
-sharing the same parameters. In other words, the \q{Copy} function
-may enable or disable itself when the player changes game preset,
-but will never change during play of a single game or when another
-game of exactly the same type is generated.
-
-This function should not take into account aspects of the game
-parameters which are not encoded by \cw{encode_params()}
-(\k{backend-encode-params}) when the \c{full} parameter is set to
-\cw{FALSE}. Such parameters will not necessarily match up between a
-call to this function and a subsequent call to \cw{text_format()}
-itself. (For instance, game \e{difficulty} should not affect whether
-the game can be copied to the clipboard. Only the actual visible
-\e{shape} of the game can affect that.)
-
-\S{backend-text-format} \cw{text_format()}
-
-\c char *(*text_format)(const game_state *state);
-
-This function is passed a \c{game_state}, and returns a newly
-allocated C string containing an ASCII representation of that game
-state. It is used to implement the \q{Copy} operation in many front
-ends.
-
-This function will only ever be called if the back end field
-\c{can_format_as_text_ever} (\k{backend-can-format-as-text-ever}) is
-\cw{TRUE} \e{and} the function \cw{can_format_as_text_now()}
-(\k{backend-can-format-as-text-now}) has returned \cw{TRUE} for the
-currently selected game parameters.
-
-The returned string may contain line endings (and will probably want
-to), using the normal C internal \cq{\\n} convention. For
-consistency between puzzles, all multi-line textual puzzle
-representations should \e{end} with a newline as well as containing
-them internally. (There are currently no puzzles which have a
-one-line ASCII representation, so there's no precedent yet for
-whether that should come with a newline or not.)
-
-\S{backend-wants-statusbar} \cw{wants_statusbar}
-
-\c bool wants_statusbar;
-
-This field is set to \cw{true} if the puzzle has a use for a textual
-status line (to display score, completion status, currently active
-tiles, etc).
-
-\S{backend-is-timed} \c{is_timed}
-
-\c bool is_timed;
-
-This field is \cw{true} if the puzzle is time-critical. If
-so, the mid-end will maintain a game timer while the user plays.
-
-If this field is \cw{false}, then \cw{timing_state()} will never be
-called and need not do anything.
-
-\S{backend-timing-state} \cw{timing_state()}
-
-\c bool (*timing_state)(const game_state *state, game_ui *ui);
-
-This function is passed the current \c{game_state} and the local
-\c{game_ui}; it returns \cw{true} if the game timer should currently
-be running.
-
-A typical use for the \c{game_ui} in this function is to note when
-the game was first completed (by setting a flag in
-\cw{changed_state()} \dash see \k{backend-changed-state}), and
-freeze the timer thereafter so that the user can undo back through
-their solution process without altering their time.
-
-\S{backend-request-keys} \cw{request_keys()}
-
-\c key_label *(*request_keys)(const game_params *params, int *nkeys);
-
-This function returns a dynamically allocated array of \cw{key_label}
-items containing the buttons the back end deems absolutely
-\e{necessary} for gameplay, not an exhaustive list of every button the
-back end could accept. For example, Keen only returns the digits up to
-the game size and the backspace character, \cw{\\b}, even though it
-\e{could} accept \cw{M}, as only these buttons are actually needed to
-play the game. Each \cw{key_label} item contains the following fields:
-
-\c struct key_label {
-\c     const char *label; /* label for frontend use */
-\c     int button; /* button to pass to midend */
-\c } key_label;
-
-The \cw{label} field of this structure can (and often will) be set by
-the backend to \cw{NULL}, in which case the midend will instead call
-\c{button2label()} (\k{utils-button2label}) and fill in a generic
-label. The \cw{button} field is the associated code that can be passed
-to the midend when the frontend deems appropriate.
-
-The backend should set \cw{*nkeys} to the number of elements in the
-returned array.
-
-The field for this function pointer in the \cw{game} structure might
-be set to \cw{NULL} (and indeed it is for the majority of the games)
-to indicate that no additional buttons (apart from the cursor keys)
-are required to play the game.
-
-This function should not be called directly by frontends. Instead,
-frontends should use \cw{midend_request_keys()}
-(\k{midend-request-keys}).
-
-\S{backend-flags} \c{flags}
-
-\c int flags;
-
-This field contains miscellaneous per-backend flags. It consists of
-the bitwise OR of some combination of the following:
-
-\dt \cw{BUTTON_BEATS(x,y)}
-
-\dd Given any \cw{x} and \cw{y} from the set \{\cw{LEFT_BUTTON},
-\cw{MIDDLE_BUTTON}, \cw{RIGHT_BUTTON}\}, this macro evaluates to a
-bit flag which indicates that when buttons \cw{x} and \cw{y} are
-both pressed simultaneously, the mid-end should consider \cw{x} to
-have priority. (In the absence of any such flags, the mid-end will
-always consider the most recently pressed button to have priority.)
-
-\dt \cw{SOLVE_ANIMATES}
-
-\dd This flag indicates that moves generated by \cw{solve()}
-(\k{backend-solve}) are candidates for animation just like any other
-move. For most games, solve moves should not be animated, so the
-mid-end doesn't even bother calling \cw{anim_length()}
-(\k{backend-anim-length}), thus saving some special-case code in
-each game. On the rare occasion that animated solve moves are
-actually required, you can set this flag.
-
-\dt \cw{REQUIRE_RBUTTON}
-
-\dd This flag indicates that the puzzle cannot be usefully played
-without the use of mouse buttons other than the left one. On some
-PDA platforms, this flag is used by the front end to enable
-right-button emulation through an appropriate gesture. Note that a
-puzzle is not required to set this just because it \e{uses} the
-right button, but only if its use of the right button is critical to
-playing the game. (Slant, for example, uses the right button to
-cycle through the three square states in the opposite order from the
-left button, and hence can manage fine without it.)
-
-\dt \cw{REQUIRE_NUMPAD}
-
-\dd This flag indicates that the puzzle cannot be usefully played
-without the use of number-key input. On some PDA platforms it causes
-an emulated number pad to appear on the screen. Similarly to
-\cw{REQUIRE_RBUTTON}, a puzzle need not specify this simply if its
-use of the number keys is not critical.
-
-\H{backend-initiative} Things a back end may do on its own initiative
-
-This section describes a couple of things that a back end may choose
-to do by calling functions elsewhere in the program, which would not
-otherwise be obvious.
-
-\S{backend-newrs} Create a random state
-
-If a back end needs random numbers at some point during normal play,
-it can create a fresh \c{random_state} by first calling
-\c{get_random_seed} (\k{frontend-get-random-seed}) and then passing
-the returned seed data to \cw{random_new()}.
-
-This is likely not to be what you want. If a puzzle needs randomness
-in the middle of play, it's likely to be more sensible to store some
-sort of random state within the \c{game_state}, so that the random
-numbers are tied to the particular game state and hence the player
-can't simply keep undoing their move until they get numbers they
-like better.
-
-This facility is currently used only in Net, to implement the
-\q{jumble} command, which sets every unlocked tile to a new random
-orientation. This randomness \e{is} a reasonable use of the feature,
-because it's non-adversarial \dash there's no advantage to the user
-in getting different random numbers.
-
-\S{backend-supersede} Supersede its own game description
-
-In response to a move, a back end is (reluctantly) permitted to call
-\cw{midend_supersede_game_desc()}:
-
-\c void midend_supersede_game_desc(midend *me,
-\c                                 char *desc, char *privdesc);
-
-When the user selects \q{New Game}, the mid-end calls
-\cw{new_desc()} (\k{backend-new-desc}) to get a new game
-description, and (as well as using that to generate an initial game
-state) stores it for the save file and for telling to the user. The
-function above overwrites that game description, and also splits it
-in two. \c{desc} becomes the new game description which is provided
-to the user on request, and is also the one used to construct a new
-initial game state if the user selects \q{Restart}. \c{privdesc} is
-a \q{private} game description, used to reconstruct the game's
-initial state when reloading.
-
-The distinction between the two, as well as the need for this
-function at all, comes from Mines. Mines begins with a blank grid
-and no idea of where the mines actually are; \cw{new_desc()} does
-almost no work in interactive mode, and simply returns a string
-encoding the \c{random_state}. When the user first clicks to open a
-tile, \e{then} Mines generates the mine positions, in such a way
-that the game is soluble from that starting point. Then it uses this
-function to supersede the random-state game description with a
-proper one. But it needs two: one containing the initial click
-location (because that's what you want to happen if you restart the
-game, and also what you want to send to a friend so that they play
-\e{the same game} as you), and one without the initial click
-location (because when you save and reload the game, you expect to
-see the same blank initial state as you had before saving).
-
-I should stress again that this function is a horrid hack. Nobody
-should use it if they're not Mines; if you think you need to use it,
-think again repeatedly in the hope of finding a better way to do
-whatever it was you needed to do.
-
-\C{drawing} The drawing API
-
-The back end function \cw{redraw()} (\k{backend-redraw}) is required
-to draw the puzzle's graphics on the window's drawing area, or on
-paper if the puzzle is printable. To do this portably, it is
-provided with a drawing API allowing it to talk directly to the
-front end. In this chapter I document that API, both for the benefit
-of back end authors trying to use it and for front end authors
-trying to implement it.
-
-The drawing API as seen by the back end is a collection of global
-functions, each of which takes a pointer to a \c{drawing} structure
-(a \q{drawing object}). These objects are supplied as parameters to
-the back end's \cw{redraw()} and \cw{print()} functions.
-
-In fact these global functions are not implemented directly by the
-front end; instead, they are implemented centrally in \c{drawing.c}
-and form a small piece of middleware. The drawing API as supplied by
-the front end is a structure containing a set of function pointers,
-plus a \cq{void *} handle which is passed to each of those
-functions. This enables a single front end to switch between
-multiple implementations of the drawing API if necessary. For
-example, the Windows API supplies a printing mechanism integrated
-into the same GDI which deals with drawing in windows, and therefore
-the same API implementation can handle both drawing and printing;
-but on Unix, the most common way for applications to print is by
-producing PostScript output directly, and although it would be
-\e{possible} to write a single (say) \cw{draw_rect()} function which
-checked a global flag to decide whether to do GTK drawing operations
-or output PostScript to a file, it's much nicer to have two separate
-functions and switch between them as appropriate.
-
-When drawing, the puzzle window is indexed by pixel coordinates,
-with the top left pixel defined as \cw{(0,0)} and the bottom right
-pixel \cw{(w-1,h-1)}, where \c{w} and \c{h} are the width and height
-values returned by the back end function \cw{compute_size()}
-(\k{backend-compute-size}).
-
-When printing, the puzzle's print area is indexed in exactly the
-same way (with an arbitrary tile size provided by the printing
-module \c{printing.c}), to facilitate sharing of code between the
-drawing and printing routines. However, when printing, puzzles may
-no longer assume that the coordinate unit has any relationship to a
-pixel; the printer's actual resolution might very well not even be
-known at print time, so the coordinate unit might be smaller or
-larger than a pixel. Puzzles' print functions should restrict
-themselves to drawing geometric shapes rather than fiddly pixel
-manipulation.
-
-\e{Puzzles' redraw functions may assume that the surface they draw
-on is persistent}. It is the responsibility of every front end to
-preserve the puzzle's window contents in the face of GUI window
-expose issues and similar. It is not permissible to request that the
-back end redraw any part of a window that it has already drawn,
-unless something has actually changed as a result of making moves in
-the puzzle.
-
-Most front ends accomplish this by having the drawing routines draw
-on a stored bitmap rather than directly on the window, and copying
-the bitmap to the window every time a part of the window needs to be
-redrawn. Therefore, it is vitally important that whenever the back
-end does any drawing it informs the front end of which parts of the
-window it has accessed, and hence which parts need repainting. This
-is done by calling \cw{draw_update()} (\k{drawing-draw-update}).
-
-Persistence of old drawing is convenient. However, a puzzle should
-be very careful about how it updates its drawing area. The problem
-is that some front ends do anti-aliased drawing: rather than simply
-choosing between leaving each pixel untouched or painting it a
-specified colour, an antialiased drawing function will \e{blend} the
-original and new colours in pixels at a figure's boundary according
-to the proportion of the pixel occupied by the figure (probably
-modified by some heuristic fudge factors). All of this produces a
-smoother appearance for curves and diagonal lines.
-
-An unfortunate effect of drawing an anti-aliased figure repeatedly
-is that the pixels around the figure's boundary come steadily more
-saturated with \q{ink} and the boundary appears to \q{spread out}.
-Worse, redrawing a figure in a different colour won't fully paint
-over the old boundary pixels, so the end result is a rather ugly
-smudge.
-
-A good strategy to avoid unpleasant anti-aliasing artifacts is to
-identify a number of rectangular areas which need to be redrawn,
-clear them to the background colour, and then redraw their contents
-from scratch, being careful all the while not to stray beyond the
-boundaries of the original rectangles. The \cw{clip()} function
-(\k{drawing-clip}) comes in very handy here. Games based on a square
-grid can often do this fairly easily. Other games may need to be
-somewhat more careful. For example, Loopy's redraw function first
-identifies portions of the display which need to be updated. Then,
-if the changes are fairly well localised, it clears and redraws a
-rectangle containing each changed area. Otherwise, it gives up and
-redraws the entire grid from scratch.
-
-It is possible to avoid clearing to background and redrawing from
-scratch if one is very careful about which drawing functions one
-uses: if a function is documented as not anti-aliasing under some
-circumstances, you can rely on each pixel in a drawing either being
-left entirely alone or being set to the requested colour, with no
-blending being performed.
-
-In the following sections I first discuss the drawing API as seen by
-the back end, and then the \e{almost} identical function-pointer
-form seen by the front end.
-
-\H{drawing-backend} Drawing API as seen by the back end
-
-This section documents the back-end drawing API, in the form of
-functions which take a \c{drawing} object as an argument.
-
-\S{drawing-draw-rect} \cw{draw_rect()}
-
-\c void draw_rect(drawing *dr, int x, int y, int w, int h,
-\c                int colour);
-
-Draws a filled rectangle in the puzzle window.
-
-\c{x} and \c{y} give the coordinates of the top left pixel of the
-rectangle. \c{w} and \c{h} give its width and height. Thus, the
-horizontal extent of the rectangle runs from \c{x} to \c{x+w-1}
-inclusive, and the vertical extent from \c{y} to \c{y+h-1}
-inclusive.
-
-\c{colour} is an integer index into the colours array returned by
-the back end function \cw{colours()} (\k{backend-colours}).
-
-There is no separate pixel-plotting function. If you want to plot a
-single pixel, the approved method is to use \cw{draw_rect()} with
-width and height set to 1.
-
-Unlike many of the other drawing functions, this function is
-guaranteed to be pixel-perfect: the rectangle will be sharply
-defined and not anti-aliased or anything like that.
-
-This function may be used for both drawing and printing.
-
-\S{drawing-draw-rect-outline} \cw{draw_rect_outline()}
-
-\c void draw_rect_outline(drawing *dr, int x, int y, int w, int h,
-\c                        int colour);
-
-Draws an outline rectangle in the puzzle window.
-
-\c{x} and \c{y} give the coordinates of the top left pixel of the
-rectangle. \c{w} and \c{h} give its width and height. Thus, the
-horizontal extent of the rectangle runs from \c{x} to \c{x+w-1}
-inclusive, and the vertical extent from \c{y} to \c{y+h-1}
-inclusive.
-
-\c{colour} is an integer index into the colours array returned by
-the back end function \cw{colours()} (\k{backend-colours}).
-
-From a back end perspective, this function may be considered to be
-part of the drawing API. However, front ends are not required to
-implement it, since it is actually implemented centrally (in
-\cw{misc.c}) as a wrapper on \cw{draw_polygon()}.
-
-This function may be used for both drawing and printing.
-
-\S{drawing-draw-line} \cw{draw_line()}
-
-\c void draw_line(drawing *dr, int x1, int y1, int x2, int y2,
-\c                int colour);
-
-Draws a straight line in the puzzle window.
-
-\c{x1} and \c{y1} give the coordinates of one end of the line.
-\c{x2} and \c{y2} give the coordinates of the other end. The line
-drawn includes both those points.
-
-\c{colour} is an integer index into the colours array returned by
-the back end function \cw{colours()} (\k{backend-colours}).
-
-Some platforms may perform anti-aliasing on this function.
-Therefore, do not assume that you can erase a line by drawing the
-same line over it in the background colour; anti-aliasing might lead
-to perceptible ghost artefacts around the vanished line. Horizontal
-and vertical lines, however, are pixel-perfect and not anti-aliased.
-
-This function may be used for both drawing and printing.
-
-\S{drawing-draw-polygon} \cw{draw_polygon()}
-
-\c void draw_polygon(drawing *dr, int *coords, int npoints,
-\c                   int fillcolour, int outlinecolour);
-
-Draws an outlined or filled polygon in the puzzle window.
-
-\c{coords} is an array of \cw{(2*npoints)} integers, containing the
-\c{x} and \c{y} coordinates of \c{npoints} vertices.
-
-\c{fillcolour} and \c{outlinecolour} are integer indices into the
-colours array returned by the back end function \cw{colours()}
-(\k{backend-colours}). \c{fillcolour} may also be \cw{-1} to
-indicate that the polygon should be outlined only.
-
-The polygon defined by the specified list of vertices is first
-filled in \c{fillcolour}, if specified, and then outlined in
-\c{outlinecolour}.
-
-\c{outlinecolour} may \e{not} be \cw{-1}; it must be a valid colour
-(and front ends are permitted to enforce this by assertion). This is
-because different platforms disagree on whether a filled polygon
-should include its boundary line or not, so drawing \e{only} a
-filled polygon would have non-portable effects. If you want your
-filled polygon not to have a visible outline, you must set
-\c{outlinecolour} to the same as \c{fillcolour}.
-
-Some platforms may perform anti-aliasing on this function.
-Therefore, do not assume that you can erase a polygon by drawing the
-same polygon over it in the background colour. Also, be prepared for
-the polygon to extend a pixel beyond its obvious bounding box as a
-result of this; if you really need it not to do this to avoid
-interfering with other delicate graphics, you should probably use
-\cw{clip()} (\k{drawing-clip}). You can rely on horizontal and
-vertical lines not being anti-aliased.
-
-This function may be used for both drawing and printing.
-
-\S{drawing-draw-circle} \cw{draw_circle()}
-
-\c void draw_circle(drawing *dr, int cx, int cy, int radius,
-\c                  int fillcolour, int outlinecolour);
-
-Draws an outlined or filled circle in the puzzle window.
-
-\c{cx} and \c{cy} give the coordinates of the centre of the circle.
-\c{radius} gives its radius. The total horizontal pixel extent of
-the circle is from \c{cx-radius+1} to \c{cx+radius-1} inclusive, and
-the vertical extent similarly around \c{cy}.
-
-\c{fillcolour} and \c{outlinecolour} are integer indices into the
-colours array returned by the back end function \cw{colours()}
-(\k{backend-colours}). \c{fillcolour} may also be \cw{-1} to
-indicate that the circle should be outlined only.
-
-The circle is first filled in \c{fillcolour}, if specified, and then
-outlined in \c{outlinecolour}.
-
-\c{outlinecolour} may \e{not} be \cw{-1}; it must be a valid colour
-(and front ends are permitted to enforce this by assertion). This is
-because different platforms disagree on whether a filled circle
-should include its boundary line or not, so drawing \e{only} a
-filled circle would have non-portable effects. If you want your
-filled circle not to have a visible outline, you must set
-\c{outlinecolour} to the same as \c{fillcolour}.
-
-Some platforms may perform anti-aliasing on this function.
-Therefore, do not assume that you can erase a circle by drawing the
-same circle over it in the background colour. Also, be prepared for
-the circle to extend a pixel beyond its obvious bounding box as a
-result of this; if you really need it not to do this to avoid
-interfering with other delicate graphics, you should probably use
-\cw{clip()} (\k{drawing-clip}).
-
-This function may be used for both drawing and printing.
-
-\S{drawing-draw-thick-line} \cw{draw_thick_line()}
-
-\c void draw_thick_line(drawing *dr, float thickness,
-\c                      float x1, float y1, float x2, float y2,
-\c                      int colour)
-
-Draws a line in the puzzle window, giving control over the line's
-thickness.
-
-\c{x1} and \c{y1} give the coordinates of one end of the line.
-\c{x2} and \c{y2} give the coordinates of the other end.
-\c{thickness} gives the thickness of the line, in pixels.
-
-Note that the coordinates and thickness are floating-point: the
-continuous coordinate system is in effect here. It's important to
-be able to address points with better-than-pixel precision in this
-case, because one can't otherwise properly express the endpoints of
-lines with both odd and even thicknesses.
-
-Some platforms may perform anti-aliasing on this function. The
-precise pixels affected by a thick-line drawing operation may vary
-between platforms, and no particular guarantees are provided.
-Indeed, even horizontal or vertical lines may be anti-aliased.
-
-This function may be used for both drawing and printing.
-
-If the specified thickness is less than 1.0, 1.0 is used.
-This ensures that thin lines are visible even at small scales.
-
-\S{drawing-draw-text} \cw{draw_text()}
-
-\c void draw_text(drawing *dr, int x, int y, int fonttype,
-\c                int fontsize, int align, int colour,
-\c                const char *text);
-
-Draws text in the puzzle window.
-
-\c{x} and \c{y} give the coordinates of a point. The relation of
-this point to the location of the text is specified by \c{align},
-which is a bitwise OR of horizontal and vertical alignment flags:
-
-\dt \cw{ALIGN_VNORMAL}
-
-\dd Indicates that \c{y} is aligned with the baseline of the text.
-
-\dt \cw{ALIGN_VCENTRE}
-
-\dd Indicates that \c{y} is aligned with the vertical centre of the
-text. (In fact, it's aligned with the vertical centre of normal
-\e{capitalised} text: displaying two pieces of text with
-\cw{ALIGN_VCENTRE} at the same \cw{y}-coordinate will cause their
-baselines to be aligned with one another, even if one is an ascender
-and the other a descender.)
-
-\dt \cw{ALIGN_HLEFT}
-
-\dd Indicates that \c{x} is aligned with the left-hand end of the
-text.
-
-\dt \cw{ALIGN_HCENTRE}
-
-\dd Indicates that \c{x} is aligned with the horizontal centre of
-the text.
-
-\dt \cw{ALIGN_HRIGHT}
-
-\dd Indicates that \c{x} is aligned with the right-hand end of the
-text.
-
-\c{fonttype} is either \cw{FONT_FIXED} or \cw{FONT_VARIABLE}, for a
-monospaced or proportional font respectively. (No more detail than
-that may be specified; it would only lead to portability issues
-between different platforms.)
-
-\c{fontsize} is the desired size, in pixels, of the text. This size
-corresponds to the overall point size of the text, not to any
-internal dimension such as the cap-height.
-
-\c{colour} is an integer index into the colours array returned by
-the back end function \cw{colours()} (\k{backend-colours}).
-
-This function may be used for both drawing and printing.
-
-The character set used to encode the text passed to this function is
-specified \e{by the drawing object}, although it must be a superset
-of ASCII. If a puzzle wants to display text that is not contained in
-ASCII, it should use the \cw{text_fallback()} function
-(\k{drawing-text-fallback}) to query the drawing object for an
-appropriate representation of the characters it wants.
-
-\S{drawing-text-fallback} \cw{text_fallback()}
-
-\c char *text_fallback(drawing *dr, const char *const *strings,
-\c                     int nstrings);
-
-This function is used to request a translation of UTF-8 text into
-whatever character encoding is expected by the drawing object's
-implementation of \cw{draw_text()}.
-
-The input is a list of strings encoded in UTF-8: \cw{nstrings} gives
-the number of strings in the list, and \cw{strings[0]},
-\cw{strings[1]}, ..., \cw{strings[nstrings-1]} are the strings
-themselves.
-
-The returned string (which is dynamically allocated and must be
-freed when finished with) is derived from the first string in the
-list that the drawing object expects to be able to display reliably;
-it will consist of that string translated into the character set
-expected by \cw{draw_text()}.
-
-Drawing implementations are not required to handle anything outside
-ASCII, but are permitted to assume that \e{some} string will be
-successfully translated. So every call to this function must include
-a string somewhere in the list (presumably the last element) which
-consists of nothing but ASCII, to be used by any front end which
-cannot handle anything else.
-
-For example, if a puzzle wished to display a string including a
-multiplication sign (U+00D7 in Unicode, represented by the bytes C3
-97 in UTF-8), it might do something like this:
-
-\c static const char *const times_signs[] = { "\xC3\x97", "x" };
-\c char *times_sign = text_fallback(dr, times_signs, 2);
-\c sprintf(buffer, "%d%s%d", width, times_sign, height);
-\c draw_text(dr, x, y, font, size, align, colour, buffer);
-\c sfree(buffer);
-
-which would draw a string with a times sign in the middle on
-platforms that support it, and fall back to a simple ASCII \cq{x}
-where there was no alternative.
-
-\S{drawing-clip} \cw{clip()}
-
-\c void clip(drawing *dr, int x, int y, int w, int h);
-
-Establishes a clipping rectangle in the puzzle window.
-
-\c{x} and \c{y} give the coordinates of the top left pixel of the
-clipping rectangle. \c{w} and \c{h} give its width and height. Thus,
-the horizontal extent of the rectangle runs from \c{x} to \c{x+w-1}
-inclusive, and the vertical extent from \c{y} to \c{y+h-1}
-inclusive. (These are exactly the same semantics as
-\cw{draw_rect()}.)
-
-After this call, no drawing operation will affect anything outside
-the specified rectangle. The effect can be reversed by calling
-\cw{unclip()} (\k{drawing-unclip}). The clipping rectangle is
-pixel-perfect: pixels within the rectangle are affected as usual by
-drawing functions; pixels outside are completely untouched.
-
-Back ends should not assume that a clipping rectangle will be
-automatically cleared up by the front end if it's left lying around;
-that might work on current front ends, but shouldn't be relied upon.
-Always explicitly call \cw{unclip()}.
-
-This function may be used for both drawing and printing.
-
-\S{drawing-unclip} \cw{unclip()}
-
-\c void unclip(drawing *dr);
-
-Reverts the effect of a previous call to \cw{clip()}. After this
-call, all drawing operations will be able to affect the entire
-puzzle window again.
-
-This function may be used for both drawing and printing.
-
-\S{drawing-draw-update} \cw{draw_update()}
-
-\c void draw_update(drawing *dr, int x, int y, int w, int h);
-
-Informs the front end that a rectangular portion of the puzzle
-window has been drawn on and needs to be updated.
-
-\c{x} and \c{y} give the coordinates of the top left pixel of the
-update rectangle. \c{w} and \c{h} give its width and height. Thus,
-the horizontal extent of the rectangle runs from \c{x} to \c{x+w-1}
-inclusive, and the vertical extent from \c{y} to \c{y+h-1}
-inclusive. (These are exactly the same semantics as
-\cw{draw_rect()}.)
-
-The back end redraw function \e{must} call this function to report
-any changes it has made to the window. Otherwise, those changes may
-not become immediately visible, and may then appear at an
-unpredictable subsequent time such as the next time the window is
-covered and re-exposed.
-
-This function is only important when drawing. It may be called when
-printing as well, but doing so is not compulsory, and has no effect.
-(So if you have a shared piece of code between the drawing and
-printing routines, that code may safely call \cw{draw_update()}.)
-
-\S{drawing-status-bar} \cw{status_bar()}
-
-\c void status_bar(drawing *dr, const char *text);
-
-Sets the text in the game's status bar to \c{text}. The text is copied
-from the supplied buffer, so the caller is free to deallocate or
-modify the buffer after use.
-
-(This function is not exactly a \e{drawing} function, but it shares
-with the drawing API the property that it may only be called from
-within the back end redraw function, so this is as good a place as
-any to document it.)
-
-The supplied text is filtered through the mid-end for optional
-rewriting before being passed on to the front end; the mid-end will
-prepend the current game time if the game is timed (and may in
-future perform other rewriting if it seems like a good idea).
-
-This function is for drawing only; it must never be called during
-printing.
-
-\S{drawing-blitter} Blitter functions
-
-This section describes a group of related functions which save and
-restore a section of the puzzle window. This is most commonly used
-to implement user interfaces involving dragging a puzzle element
-around the window: at the end of each call to \cw{redraw()}, if an
-object is currently being dragged, the back end saves the window
-contents under that location and then draws the dragged object, and
-at the start of the next \cw{redraw()} the first thing it does is to
-restore the background.
-
-The front end defines an opaque type called a \c{blitter}, which is
-capable of storing a rectangular area of a specified size.
-
-Blitter functions are for drawing only; they must never be called
-during printing.
-
-\S2{drawing-blitter-new} \cw{blitter_new()}
-
-\c blitter *blitter_new(drawing *dr, int w, int h);
-
-Creates a new blitter object which stores a rectangle of size \c{w}
-by \c{h} pixels. Returns a pointer to the blitter object.
-
-Blitter objects are best stored in the \c{game_drawstate}. A good
-time to create them is in the \cw{set_size()} function
-(\k{backend-set-size}), since it is at this point that you first
-know how big a rectangle they will need to save.
-
-\S2{drawing-blitter-free} \cw{blitter_free()}
-
-\c void blitter_free(drawing *dr, blitter *bl);
-
-Disposes of a blitter object. Best called in \cw{free_drawstate()}.
-(However, check that the blitter object is not \cw{NULL} before
-attempting to free it; it is possible that a draw state might be
-created and freed without ever having \cw{set_size()} called on it
-in between.)
-
-\S2{drawing-blitter-save} \cw{blitter_save()}
-
-\c void blitter_save(drawing *dr, blitter *bl, int x, int y);
-
-This is a true drawing API function, in that it may only be called
-from within the game redraw routine. It saves a rectangular portion
-of the puzzle window into the specified blitter object.
-
-\c{x} and \c{y} give the coordinates of the top left corner of the
-saved rectangle. The rectangle's width and height are the ones
-specified when the blitter object was created.
-
-This function is required to cope and do the right thing if \c{x}
-and \c{y} are out of range. (The right thing probably means saving
-whatever part of the blitter rectangle overlaps with the visible
-area of the puzzle window.)
-
-\S2{drawing-blitter-load} \cw{blitter_load()}
-
-\c void blitter_load(drawing *dr, blitter *bl, int x, int y);
-
-This is a true drawing API function, in that it may only be called
-from within the game redraw routine. It restores a rectangular
-portion of the puzzle window from the specified blitter object.
-
-\c{x} and \c{y} give the coordinates of the top left corner of the
-rectangle to be restored. The rectangle's width and height are the
-ones specified when the blitter object was created.
-
-Alternatively, you can specify both \c{x} and \c{y} as the special
-value \cw{BLITTER_FROMSAVED}, in which case the rectangle will be
-restored to exactly where it was saved from. (This is probably what
-you want to do almost all the time, if you're using blitters to
-implement draggable puzzle elements.)
-
-This function is required to cope and do the right thing if \c{x}
-and \c{y} (or the equivalent ones saved in the blitter) are out of
-range. (The right thing probably means restoring whatever part of
-the blitter rectangle overlaps with the visible area of the puzzle
-window.)
-
-If this function is called on a blitter which had previously been
-saved from a partially out-of-range rectangle, then the parts of the
-saved bitmap which were not visible at save time are undefined. If
-the blitter is restored to a different position so as to make those
-parts visible, the effect on the drawing area is undefined.
-
-\S{print-mono-colour} \cw{print_mono_colour()}
-
-\c int print_mono_colour(drawing *dr, int grey);
-
-This function allocates a colour index for a simple monochrome
-colour during printing.
-
-\c{grey} must be 0 or 1. If \c{grey} is 0, the colour returned is
-black; if \c{grey} is 1, the colour is white.
-
-\S{print-grey-colour} \cw{print_grey_colour()}
-
-\c int print_grey_colour(drawing *dr, float grey);
-
-This function allocates a colour index for a grey-scale colour
-during printing.
-
-\c{grey} may be any number between 0 (black) and 1 (white); for
-example, 0.5 indicates a medium grey.
-
-The chosen colour will be rendered to the limits of the printer's
-halftoning capability.
-
-\S{print-hatched-colour} \cw{print_hatched_colour()}
-
-\c int print_hatched_colour(drawing *dr, int hatch);
-
-This function allocates a colour index which does not represent a
-literal \e{colour}. Instead, regions shaded in this colour will be
-hatched with parallel lines. The \c{hatch} parameter defines what
-type of hatching should be used in place of this colour:
-
-\dt \cw{HATCH_SLASH}
-
-\dd This colour will be hatched by lines slanting to the right at 45
-degrees. 
-
-\dt \cw{HATCH_BACKSLASH}
-
-\dd This colour will be hatched by lines slanting to the left at 45
-degrees.
-
-\dt \cw{HATCH_HORIZ}
-
-\dd This colour will be hatched by horizontal lines.
-
-\dt \cw{HATCH_VERT}
-
-\dd This colour will be hatched by vertical lines.
-
-\dt \cw{HATCH_PLUS}
-
-\dd This colour will be hatched by criss-crossing horizontal and
-vertical lines.
-
-\dt \cw{HATCH_X}
-
-\dd This colour will be hatched by criss-crossing diagonal lines.
-
-Colours defined to use hatching may not be used for drawing lines or
-text; they may only be used for filling areas. That is, they may be
-used as the \c{fillcolour} parameter to \cw{draw_circle()} and
-\cw{draw_polygon()}, and as the colour parameter to
-\cw{draw_rect()}, but may not be used as the \c{outlinecolour}
-parameter to \cw{draw_circle()} or \cw{draw_polygon()}, or with
-\cw{draw_line()} or \cw{draw_text()}.
-
-\S{print-rgb-mono-colour} \cw{print_rgb_mono_colour()}
-
-\c int print_rgb_mono_colour(drawing *dr, float r, float g,
-\c                           float b, float grey);
-
-This function allocates a colour index for a fully specified RGB
-colour during printing.
-
-\c{r}, \c{g} and \c{b} may each be anywhere in the range from 0 to 1.
-
-If printing in black and white only, these values will be ignored,
-and either pure black or pure white will be used instead, according
-to the \q{grey} parameter. (The fallback colour is the same as the
-one which would be allocated by \cw{print_mono_colour(grey)}.)
-
-\S{print-rgb-grey-colour} \cw{print_rgb_grey_colour()}
-
-\c int print_rgb_grey_colour(drawing *dr, float r, float g,
-\c                           float b, float grey);
-
-This function allocates a colour index for a fully specified RGB
-colour during printing.
-
-\c{r}, \c{g} and \c{b} may each be anywhere in the range from 0 to 1.
-
-If printing in black and white only, these values will be ignored,
-and a shade of grey given by the \c{grey} parameter will be used
-instead. (The fallback colour is the same as the one which would be
-allocated by \cw{print_grey_colour(grey)}.)
-
-\S{print-rgb-hatched-colour} \cw{print_rgb_hatched_colour()}
-
-\c int print_rgb_hatched_colour(drawing *dr, float r, float g,
-\c                              float b, float hatched);
-
-This function allocates a colour index for a fully specified RGB
-colour during printing.
-
-\c{r}, \c{g} and \c{b} may each be anywhere in the range from 0 to 1.
-
-If printing in black and white only, these values will be ignored,
-and a form of cross-hatching given by the \c{hatch} parameter will
-be used instead; see \k{print-hatched-colour} for the possible
-values of this parameter. (The fallback colour is the same as the
-one which would be allocated by \cw{print_hatched_colour(hatch)}.)
-
-\S{print-line-width} \cw{print_line_width()}
-
-\c void print_line_width(drawing *dr, int width);
-
-This function is called to set the thickness of lines drawn during
-printing. It is meaningless in drawing: all lines drawn by
-\cw{draw_line()}, \cw{draw_circle} and \cw{draw_polygon()} are one
-pixel in thickness. However, in printing there is no clear
-definition of a pixel and so line widths must be explicitly
-specified.
-
-The line width is specified in the usual coordinate system. Note,
-however, that it is a hint only: the central printing system may
-choose to vary line thicknesses at user request or due to printer
-capabilities.
-
-\S{print-line-dotted} \cw{print_line_dotted()}
-
-\c void print_line_dotted(drawing *dr, bool dotted);
-
-This function is called to toggle the drawing of dotted lines during
-printing. It is not supported during drawing.
-
-Setting \cq{dotted} to \cw{true} means that future lines drawn by
-\cw{draw_line()}, \cw{draw_circle} and \cw{draw_polygon()} will be
-dotted. Setting it to \cw{false} means that they will be solid.
-
-Some front ends may impose restrictions on the width of dotted
-lines. Asking for a dotted line via this front end will override any
-line width request if the front end requires it.
-
-\H{drawing-frontend} The drawing API as implemented by the front end
-
-This section describes the drawing API in the function-pointer form
-in which it is implemented by a front end.
-
-(It isn't only platform-specific front ends which implement this
-API; the platform-independent module \c{ps.c} also provides an
-implementation of it which outputs PostScript. Thus, any platform
-which wants to do PS printing can do so with minimum fuss.)
-
-The following entries all describe function pointer fields in a
-structure called \c{drawing_api}. Each of the functions takes a
-\cq{void *} context pointer, which it should internally cast back to
-a more useful type. Thus, a drawing \e{object} (\c{drawing *)}
-suitable for passing to the back end redraw or printing functions
-is constructed by passing a \c{drawing_api} and a \cq{void *} to the
-function \cw{drawing_new()} (see \k{drawing-new}).
-
-\S{drawingapi-draw-text} \cw{draw_text()}
-
-\c void (*draw_text)(void *handle, int x, int y, int fonttype,
-\c                   int fontsize, int align, int colour,
-\c                   const char *text);
-
-This function behaves exactly like the back end \cw{draw_text()}
-function; see \k{drawing-draw-text}.
-
-\S{drawingapi-draw-rect} \cw{draw_rect()}
-
-\c void (*draw_rect)(void *handle, int x, int y, int w, int h,
-\c                   int colour);
-
-This function behaves exactly like the back end \cw{draw_rect()}
-function; see \k{drawing-draw-rect}.
-
-\S{drawingapi-draw-line} \cw{draw_line()}
-
-\c void (*draw_line)(void *handle, int x1, int y1, int x2, int y2,
-\c                   int colour);
-
-This function behaves exactly like the back end \cw{draw_line()}
-function; see \k{drawing-draw-line}.
-
-\S{drawingapi-draw-polygon} \cw{draw_polygon()}
-
-\c void (*draw_polygon)(void *handle, int *coords, int npoints,
-\c                      int fillcolour, int outlinecolour);
-
-This function behaves exactly like the back end \cw{draw_polygon()}
-function; see \k{drawing-draw-polygon}.
-
-\S{drawingapi-draw-circle} \cw{draw_circle()}
-
-\c void (*draw_circle)(void *handle, int cx, int cy, int radius,
-\c                     int fillcolour, int outlinecolour);
-
-This function behaves exactly like the back end \cw{draw_circle()}
-function; see \k{drawing-draw-circle}.
-
-\S{drawingapi-draw-thick-line} \cw{draw_thick_line()}
-
-\c void draw_thick_line(drawing *dr, float thickness,
-\c                      float x1, float y1, float x2, float y2,
-\c                      int colour)
-
-This function behaves exactly like the back end
-\cw{draw_thick_line()} function; see \k{drawing-draw-thick-line}.
-
-An implementation of this API which doesn't provide high-quality
-rendering of thick lines is permitted to define this function
-pointer to be \cw{NULL}. The middleware in \cw{drawing.c} will notice
-and provide a low-quality alternative using \cw{draw_polygon()}.
-
-\S{drawingapi-draw-update} \cw{draw_update()}
-
-\c void (*draw_update)(void *handle, int x, int y, int w, int h);
-
-This function behaves exactly like the back end \cw{draw_update()}
-function; see \k{drawing-draw-update}.
-
-An implementation of this API which only supports printing is
-permitted to define this function pointer to be \cw{NULL} rather
-than bothering to define an empty function. The middleware in
-\cw{drawing.c} will notice and avoid calling it.
-
-\S{drawingapi-clip} \cw{clip()}
-
-\c void (*clip)(void *handle, int x, int y, int w, int h);
-
-This function behaves exactly like the back end \cw{clip()}
-function; see \k{drawing-clip}.
-
-\S{drawingapi-unclip} \cw{unclip()}
-
-\c void (*unclip)(void *handle);
-
-This function behaves exactly like the back end \cw{unclip()}
-function; see \k{drawing-unclip}.
-
-\S{drawingapi-start-draw} \cw{start_draw()}
-
-\c void (*start_draw)(void *handle);
-
-This function is called at the start of drawing. It allows the front
-end to initialise any temporary data required to draw with, such as
-device contexts.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-end-draw} \cw{end_draw()}
-
-\c void (*end_draw)(void *handle);
-
-This function is called at the end of drawing. It allows the front
-end to do cleanup tasks such as deallocating device contexts and
-scheduling appropriate GUI redraw events.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-status-bar} \cw{status_bar()}
-
-\c void (*status_bar)(void *handle, const char *text);
-
-This function behaves exactly like the back end \cw{status_bar()}
-function; see \k{drawing-status-bar}.
-
-Front ends implementing this function need not worry about it being
-called repeatedly with the same text; the middleware code in
-\cw{status_bar()} will take care of this.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-blitter-new} \cw{blitter_new()}
-
-\c blitter *(*blitter_new)(void *handle, int w, int h);
-
-This function behaves exactly like the back end \cw{blitter_new()}
-function; see \k{drawing-blitter-new}.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-blitter-free} \cw{blitter_free()}
-
-\c void (*blitter_free)(void *handle, blitter *bl);
-
-This function behaves exactly like the back end \cw{blitter_free()}
-function; see \k{drawing-blitter-free}.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-blitter-save} \cw{blitter_save()}
-
-\c void (*blitter_save)(void *handle, blitter *bl, int x, int y);
-
-This function behaves exactly like the back end \cw{blitter_save()}
-function; see \k{drawing-blitter-save}.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-blitter-load} \cw{blitter_load()}
-
-\c void (*blitter_load)(void *handle, blitter *bl, int x, int y);
-
-This function behaves exactly like the back end \cw{blitter_load()}
-function; see \k{drawing-blitter-load}.
-
-Implementations of this API which do not provide drawing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless drawing is attempted.
-
-\S{drawingapi-begin-doc} \cw{begin_doc()}
-
-\c void (*begin_doc)(void *handle, int pages);
-
-This function is called at the beginning of a printing run. It gives
-the front end an opportunity to initialise any required printing
-subsystem. It also provides the number of pages in advance.
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-begin-page} \cw{begin_page()}
-
-\c void (*begin_page)(void *handle, int number);
-
-This function is called during printing, at the beginning of each
-page. It gives the page number (numbered from 1 rather than 0, so
-suitable for use in user-visible contexts).
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-begin-puzzle} \cw{begin_puzzle()}
-
-\c void (*begin_puzzle)(void *handle, float xm, float xc,
-\c                      float ym, float yc, int pw, int ph, float wmm);
-
-This function is called during printing, just before printing a
-single puzzle on a page. It specifies the size and location of the
-puzzle on the page.
-
-\c{xm} and \c{xc} specify the horizontal position of the puzzle on
-the page, as a linear function of the page width. The front end is
-expected to multiply the page width by \c{xm}, add \c{xc} (measured
-in millimetres), and use the resulting x-coordinate as the left edge
-of the puzzle.
-
-Similarly, \c{ym} and \c{yc} specify the vertical position of the
-puzzle as a function of the page height: the page height times
-\c{ym}, plus \c{yc} millimetres, equals the desired distance from
-the top of the page to the top of the puzzle.
-
-(This unwieldy mechanism is required because not all printing
-systems can communicate the page size back to the software. The
-PostScript back end, for example, writes out PS which determines the
-page size at print time by means of calling \cq{clippath}, and
-centres the puzzles within that. Thus, exactly the same PS file
-works on A4 or on US Letter paper without needing local
-configuration, which simplifies matters.)
-
-\cw{pw} and \cw{ph} give the size of the puzzle in drawing API
-coordinates. The printing system will subsequently call the puzzle's
-own print function, which will in turn call drawing API functions in
-the expectation that an area \cw{pw} by \cw{ph} units is available
-to draw the puzzle on.
-
-Finally, \cw{wmm} gives the desired width of the puzzle in
-millimetres. (The aspect ratio is expected to be preserved, so if
-the desired puzzle height is also needed then it can be computed as
-\cw{wmm*ph/pw}.)
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-end-puzzle} \cw{end_puzzle()}
-
-\c void (*end_puzzle)(void *handle);
-
-This function is called after the printing of a specific puzzle is
-complete.
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-end-page} \cw{end_page()}
-
-\c void (*end_page)(void *handle, int number);
-
-This function is called after the printing of a page is finished.
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-end-doc} \cw{end_doc()}
-
-\c void (*end_doc)(void *handle);
-
-This function is called after the printing of the entire document is
-finished. This is the moment to close files, send things to the
-print spooler, or whatever the local convention is.
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-line-width} \cw{line_width()}
-
-\c void (*line_width)(void *handle, float width);
-
-This function is called to set the line thickness, during printing
-only. Note that the width is a \cw{float} here, where it was an
-\cw{int} as seen by the back end. This is because \cw{drawing.c} may
-have scaled it on the way past.
-
-However, the width is still specified in the same coordinate system
-as the rest of the drawing.
-
-Implementations of this API which do not provide printing services
-may define this function pointer to be \cw{NULL}; it will never be
-called unless printing is attempted.
-
-\S{drawingapi-text-fallback} \cw{text_fallback()}
-
-\c char *(*text_fallback)(void *handle, const char *const *strings,
-\c                        int nstrings);
-
-This function behaves exactly like the back end \cw{text_fallback()}
-function; see \k{drawing-text-fallback}.
-
-Implementations of this API which do not support any characters
-outside ASCII may define this function pointer to be \cw{NULL}, in
-which case the central code in \cw{drawing.c} will provide a default
-implementation.
-
-\H{drawingapi-frontend} The drawing API as called by the front end
-
-There are a small number of functions provided in \cw{drawing.c}
-which the front end needs to \e{call}, rather than helping to
-implement. They are described in this section.
-
-\S{drawing-new} \cw{drawing_new()}
-
-\c drawing *drawing_new(const drawing_api *api, midend *me,
-\c                      void *handle);
-
-This function creates a drawing object. It is passed a
-\c{drawing_api}, which is a structure containing nothing but
-function pointers; and also a \cq{void *} handle. The handle is
-passed back to each function pointer when it is called.
-
-The \c{midend} parameter is used for rewriting the status bar
-contents: \cw{status_bar()} (see \k{drawing-status-bar}) has to call
-a function in the mid-end which might rewrite the status bar text.
-If the drawing object is to be used only for printing, or if the
-game is known not to call \cw{status_bar()}, this parameter may be
-\cw{NULL}.
-
-\S{drawing-free} \cw{drawing_free()}
-
-\c void drawing_free(drawing *dr);
-
-This function frees a drawing object. Note that the \cq{void *}
-handle is not freed; if that needs cleaning up it must be done by
-the front end.
-
-\S{drawing-print-get-colour} \cw{print_get_colour()}
-
-\c void print_get_colour(drawing *dr, int colour, int printincolour,
-\c                       int *hatch, float *r, float *g, float *b)
-
-This function is called by the implementations of the drawing API
-functions when they are called in a printing context. It takes a
-colour index as input, and returns the description of the colour as
-requested by the back end.
-
-\c{printincolour} is \cw{TRUE} iff the implementation is printing in
-colour. This will alter the results returned if the colour in
-question was specified with a black-and-white fallback value.
-
-If the colour should be rendered by hatching, \c{*hatch} is filled
-with the type of hatching desired. See \k{print-grey-colour} for
-details of the values this integer can take.
-
-If the colour should be rendered as solid colour, \c{*hatch} is
-given a negative value, and \c{*r}, \c{*g} and \c{*b} are filled
-with the RGB values of the desired colour (if printing in colour),
-or all filled with the grey-scale value (if printing in black and
-white).
-
-\C{midend} The API provided by the mid-end
-
-This chapter documents the API provided by the mid-end to be called
-by the front end. You probably only need to read this if you are a
-front end implementor, i.e. you are porting Puzzles to a new
-platform. If you're only interested in writing new puzzles, you can
-safely skip this chapter.
-
-All the persistent state in the mid-end is encapsulated within a
-\c{midend} structure, to facilitate having multiple mid-ends in any
-port which supports multiple puzzle windows open simultaneously.
-Each \c{midend} is intended to handle the contents of a single
-puzzle window.
-
-\H{midend-new} \cw{midend_new()}
-
-\c midend *midend_new(frontend *fe, const game *ourgame,
-\c                    const drawing_api *drapi, void *drhandle)
-
-Allocates and returns a new mid-end structure.
-
-The \c{fe} argument is stored in the mid-end. It will be used when
-calling back to functions such as \cw{activate_timer()}
-(\k{frontend-activate-timer}), and will be passed on to the back end
-function \cw{colours()} (\k{backend-colours}).
-
-The parameters \c{drapi} and \c{drhandle} are passed to
-\cw{drawing_new()} (\k{drawing-new}) to construct a drawing object
-which will be passed to the back end function \cw{redraw()}
-(\k{backend-redraw}). Hence, all drawing-related function pointers
-defined in \c{drapi} can expect to be called with \c{drhandle} as
-their first argument.
-
-The \c{ourgame} argument points to a container structure describing
-a game back end. The mid-end thus created will only be capable of
-handling that one game. (So even in a monolithic front end
-containing all the games, this imposes the constraint that any
-individual puzzle window is tied to a single game. Unless, of
-course, you feel brave enough to change the mid-end for the window
-without closing the window...)
-
-\H{midend-free} \cw{midend_free()}
-
-\c void midend_free(midend *me);
-
-Frees a mid-end structure and all its associated data.
-
-\H{midend-tilesize} \cw{midend_tilesize()}
-
-\c int midend_tilesize(midend *me);
-
-Returns the \cq{tilesize} parameter being used to display the
-current puzzle (\k{backend-preferred-tilesize}).
-
-\H{midend-set-params} \cw{midend_set_params()}
-
-\c void midend_set_params(midend *me, game_params *params);
-
-Sets the current game parameters for a mid-end. Subsequent games
-generated by \cw{midend_new_game()} (\k{midend-new-game}) will use
-these parameters until further notice.
-
-The usual way in which the front end will have an actual
-\c{game_params} structure to pass to this function is if it had
-previously got it from \cw{midend_get_presets()}
-(\k{midend-get-presets}). Thus, this function is usually called in
-response to the user making a selection from the presets menu.
-
-\H{midend-get-params} \cw{midend_get_params()}
-
-\c game_params *midend_get_params(midend *me);
-
-Returns the current game parameters stored in this mid-end.
-
-The returned value is dynamically allocated, and should be freed
-when finished with by passing it to the game's own
-\cw{free_params()} function (see \k{backend-free-params}).
-
-\H{midend-size} \cw{midend_size()}
-
-\c void midend_size(midend *me, int *x, int *y, bool user_size);
-
-Tells the mid-end to figure out its window size.
-
-On input, \c{*x} and \c{*y} should contain the maximum or requested
-size for the window. (Typically this will be the size of the screen
-that the window has to fit on, or similar.) The mid-end will
-repeatedly call the back end function \cw{compute_size()}
-(\k{backend-compute-size}), searching for a tile size that best
-satisfies the requirements. On exit, \c{*x} and \c{*y} will contain
-the size needed for the puzzle window's drawing area. (It is of
-course up to the front end to adjust this for any additional window
-furniture such as menu bars and window borders, if necessary. The
-status bar is also not included in this size.)
-
-Use \c{user_size} to indicate whether \c{*x} and \c{*y} are a
-requested size, or just a maximum size.
-
-If \c{user_size} is set to \cw{true}, the mid-end will treat the
-input size as a request, and will pick a tile size which
-approximates it \e{as closely as possible}, going over the game's
-preferred tile size if necessary to achieve this. The mid-end will
-also use the resulting tile size as its preferred one until further
-notice, on the assumption that this size was explicitly requested
-by the user. Use this option if you want your front end to support
-dynamic resizing of the puzzle window with automatic scaling of the
-puzzle to fit.
-
-If \c{user_size} is set to \cw{FALSE}, then the game's tile size
-will never go over its preferred one, although it may go under in
-order to fit within the maximum bounds specified by \c{*x} and
-\c{*y}. This is the recommended approach when opening a new window
-at default size: the game will use its preferred size unless it has
-to use a smaller one to fit on the screen. If the tile size is
-shrunk for this reason, the change will not persist; if a smaller
-grid is subsequently chosen, the tile size will recover.
-
-The mid-end will try as hard as it can to return a size which is
-less than or equal to the input size, in both dimensions. In extreme
-circumstances it may fail (if even the lowest possible tile size
-gives window dimensions greater than the input), in which case it
-will return a size greater than the input size. Front ends should be
-prepared for this to happen (i.e. don't crash or fail an assertion),
-but may handle it in any way they see fit: by rejecting the game
-parameters which caused the problem, by opening a window larger than
-the screen regardless of inconvenience, by introducing scroll bars
-on the window, by drawing on a large bitmap and scaling it into a
-smaller window, or by any other means you can think of. It is likely
-that when the tile size is that small the game will be unplayable
-anyway, so don't put \e{too} much effort into handling it
-creatively.
-
-If your platform has no limit on window size (or if you're planning
-to use scroll bars for large puzzles), you can pass dimensions of
-\cw{INT_MAX} as input to this function. You should probably not do
-that \e{and} set the \c{user_size} flag, though!
-
-The midend relies on the frontend calling \cw{midend_new_game()}
-(\k{midend-new-game}) before calling \cw{midend_size()}.
-
-\H{midend-reset-tilesize} \cw{midend_reset_tilesize()}
-
-\c void midend_reset_tilesize(midend *me);
-
-This function resets the midend's preferred tile size to that of the
-standard puzzle.
-
-As discussed in \k{midend-size}, puzzle resizes are typically
-'sticky', in that once the user has dragged the puzzle to a different
-window size, the resulting tile size will be remembered and used when
-the puzzle configuration changes. If you \e{don't} want that, e.g. if
-you want to provide a command to explicitly reset the puzzle size back
-to its default, then you can call this just before calling
-\cw{midend_size()} (which, in turn, you would probably call with
-\c{user_size} set to \cw{FALSE}).
-
-\H{midend-new-game} \cw{midend_new_game()}
-
-\c void midend_new_game(midend *me);
-
-Causes the mid-end to begin a new game. Normally the game will be a
-new randomly generated puzzle. However, if you have previously
-called \cw{midend_game_id()} or \cw{midend_set_config()}, the game
-generated might be dictated by the results of those functions. (In
-particular, you \e{must} call \cw{midend_new_game()} after calling
-either of those functions, or else no immediate effect will be
-visible.)
-
-You will probably need to call \cw{midend_size()} after calling this
-function, because if the game parameters have been changed since the
-last new game then the window size might need to change. (If you
-know the parameters \e{haven't} changed, you don't need to do this.)
-
-This function will create a new \c{game_drawstate}, but does not
-actually perform a redraw (since you often need to call
-\cw{midend_size()} before the redraw can be done). So after calling
-this function and after calling \cw{midend_size()}, you should then
-call \cw{midend_redraw()}. (It is not necessary to call
-\cw{midend_force_redraw()}; that will discard the draw state and
-create a fresh one, which is unnecessary in this case since there's
-a fresh one already. It would work, but it's usually excessive.)
-
-\H{midend-restart-game} \cw{midend_restart_game()}
-
-\c void midend_restart_game(midend *me);
-
-This function causes the current game to be restarted. This is done
-by placing a new copy of the original game state on the end of the
-undo list (so that an accidental restart can be undone).
-
-This function automatically causes a redraw, i.e. the front end can
-expect its drawing API to be called from \e{within} a call to this
-function. Some back ends require that \cw{midend_size()}
-(\k{midend-size}) is called before \cw{midend_restart_game()}.
-
-\H{midend-force-redraw} \cw{midend_force_redraw()}
-
-\c void midend_force_redraw(midend *me);
-
-Forces a complete redraw of the puzzle window, by means of
-discarding the current \c{game_drawstate} and creating a new one
-from scratch before calling the game's \cw{redraw()} function.
-
-The front end can expect its drawing API to be called from within a
-call to this function. Some back ends require that \cw{midend_size()}
-(\k{midend-size}) is called before \cw{midend_force_redraw()}.
-
-\H{midend-redraw} \cw{midend_redraw()}
-
-\c void midend_redraw(midend *me);
-
-Causes a partial redraw of the puzzle window, by means of simply
-calling the game's \cw{redraw()} function. (That is, the only things
-redrawn will be things that have changed since the last redraw.)
-
-The front end can expect its drawing API to be called from within a
-call to this function. Some back ends require that \cw{midend_size()}
-(\k{midend-size}) is called before \cw{midend_redraw()}.
-
-\H{midend-process-key} \cw{midend_process_key()}
-
-\c bool midend_process_key(midend *me, int x, int y, int button);
-
-The front end calls this function to report a mouse or keyboard
-event. The parameters \c{x}, \c{y} and \c{button} are almost
-identical to the ones passed to the back end function
-\cw{interpret_move()} (\k{backend-interpret-move}), except that the
-front end is \e{not} required to provide the guarantees about mouse
-event ordering. The mid-end will sort out multiple simultaneous
-button presses and changes of button; the front end's responsibility
-is simply to pass on the mouse events it receives as accurately as
-possible.
-
-(Some platforms may need to emulate absent mouse buttons by means of
-using a modifier key such as Shift with another mouse button. This
-tends to mean that if Shift is pressed or released in the middle of
-a mouse drag, the mid-end will suddenly stop receiving, say,
-\cw{LEFT_DRAG} events and start receiving \cw{RIGHT_DRAG}s, with no
-intervening button release or press events. This too is something
-which the mid-end will sort out for you; the front end has no
-obligation to maintain sanity in this area.)
-
-The front end \e{should}, however, always eventually send some kind
-of button release. On some platforms this requires special effort:
-Windows, for example, requires a call to the system API function
-\cw{SetCapture()} in order to ensure that your window receives a
-mouse-up event even if the pointer has left the window by the time
-the mouse button is released. On any platform that requires this
-sort of thing, the front end \e{is} responsible for doing it.
-
-Calling this function is very likely to result in calls back to the
-front end's drawing API and/or \cw{activate_timer()}
-(\k{frontend-activate-timer}).
-
-The return value from \cw{midend_process_key()} is \cw{true} unless
-the effect of the keypress was to request termination of the program.
-A front end should shut down the puzzle in response to a \cw{false}
-return.
-
-\H{midend-request-keys} \cw{midend_request_keys()}
-
-\c key_label *midend_request_keys(midend *me, int *nkeys);
-
-This function behaves similarly to the backend's \cw{request_keys()}
-function (\k{backend-request-keys}). If the backend does not provide
-\cw{request_keys()}, this function will return \cw{NULL} and set
-\cw{*nkeys} to zero. Otherwise, this function will fill in the generic
-labels (i.e. the \cw{key_label} items that have their \cw{label}
-fields set to \cw{NULL}) by using \cw{button2label()}
-(\k{utils-button2label}).
-
-\H{midend-colours} \cw{midend_colours()}
-
-\c float *midend_colours(midend *me, int *ncolours);
-
-Returns an array of the colours required by the game, in exactly the
-same format as that returned by the back end function \cw{colours()}
-(\k{backend-colours}). Front ends should call this function rather
-than calling the back end's version directly, since the mid-end adds
-standard customisation facilities. (At the time of writing, those
-customisation facilities are implemented hackily by means of
-environment variables, but it's not impossible that they may become
-more full and formal in future.)
-
-\H{midend-timer} \cw{midend_timer()}
-
-\c void midend_timer(midend *me, float tplus);
-
-If the mid-end has called \cw{activate_timer()}
-(\k{frontend-activate-timer}) to request regular callbacks for
-purposes of animation or timing, this is the function the front end
-should call on a regular basis. The argument \c{tplus} gives the
-time, in seconds, since the last time either this function was
-called or \cw{activate_timer()} was invoked.
-
-One of the major purposes of timing in the mid-end is to perform
-move animation. Therefore, calling this function is very likely to
-result in calls back to the front end's drawing API.
-
-\H{midend-get-presets} \cw{midend_get_presets()}
-
-\c struct preset_menu *midend_get_presets(midend *me, int *id_limit);
-
-Returns a data structure describing this game's collection of preset
-game parameters, organised into a hierarchical structure of menus and
-submenus.
-
-The return value is a pointer to a data structure containing the
-following fields (among others, which are not intended for front end
-use):
-
-\c struct preset_menu {
-\c     int n_entries;
-\c     struct preset_menu_entry *entries;
-\c     /* and other things */
-\e     iiiiiiiiiiiiiiiiiiiiii
-\c };
-
-Those fields describe the intended contents of one particular menu in
-the hierarchy. \cq{entries} points to an array of \cq{n_entries}
-items, each of which is a structure containing the following fields:
-
-\c struct preset_menu_entry {
-\c     char *title;
-\c     game_params *params;
-\c     struct preset_menu *submenu;
-\c     int id;
-\c };
-
-Of these fields, \cq{title} and \cq{id} are present in every entry,
-giving (respectively) the textual name of the menu item and an integer
-identifier for it. The integer id will correspond to the one returned
-by \c{midend_which_preset} (\k{midend-which-preset}), when that preset
-is the one selected.
-
-The other two fields are mutually exclusive. Each \c{struct
-preset_menu_entry} will have one of those fields \cw{NULL} and the
-other one non-null. If the menu item is an actual preset, then
-\cq{params} will point to the set of game parameters that go with the
-name; if it's a submenu, then \cq{submenu} instead will be non-null,
-and will point at a subsidiary \c{struct preset_menu}.
-
-The complete hierarchy of these structures is owned by the mid-end,
-and will be freed when the mid-end is freed. The front end should not
-attempt to free any of it.
-
-The integer identifiers will be allocated densely from 0 upwards, so
-that it's reasonable for the front end to allocate an array which uses
-them as indices, if it needs to store information per preset menu
-item. For this purpose, the front end may pass the second parameter
-\cq{id_limit} to \cw{midend_get_presets} as the address of an \c{int}
-variable, into which \cw{midend_get_presets} will write an integer one
-larger than the largest id number actually used (i.e. the number of
-elements the front end would need in the array).
-
-Submenu-type entries also have integer identifiers.
-
-\H{midend-which-preset} \cw{midend_which_preset()}
-
-\c int midend_which_preset(midend *me);
-
-Returns the numeric index of the preset game parameter structure
-which matches the current game parameters, or a negative number if
-no preset matches. Front ends could use this to maintain a tick
-beside one of the items in the menu (or tick the \q{Custom} option
-if the return value is less than zero).
-
-The returned index value (if non-negative) will match the \c{id} field
-of the corresponding \cw{struct preset_menu_entry} returned by
-\c{midend_get_presets()} (\k{midend-get-presets}).
-
-\H{midend-wants-statusbar} \cw{midend_wants_statusbar()}
-
-\c bool midend_wants_statusbar(midend *me);
-
-This function returns \cw{true} if the puzzle has a use for a
-textual status line (to display score, completion status, currently
-active tiles, time, or anything else).
-
-Front ends should call this function rather than talking directly to
-the back end.
-
-\H{midend-get-config} \cw{midend_get_config()}
-
-\c config_item *midend_get_config(midend *me, int which,
-\c                                char **wintitle);
-
-Returns a dialog box description for user configuration.
-
-On input, \cw{which} should be set to one of three values, which
-select which of the various dialog box descriptions is returned:
-
-\dt \cw{CFG_SETTINGS}
-
-\dd Requests the GUI parameter configuration box generated by the
-puzzle itself. This should be used when the user selects \q{Custom}
-from the game types menu (or equivalent). The mid-end passes this
-request on to the back end function \cw{configure()}
-(\k{backend-configure}).
-
-\dt \cw{CFG_DESC}
-
-\dd Requests a box suitable for entering a descriptive game ID (and
-viewing the existing one). The mid-end generates this dialog box
-description itself. This should be used when the user selects
-\q{Specific} from the game menu (or equivalent).
-
-\dt \cw{CFG_SEED}
-
-\dd Requests a box suitable for entering a random-seed game ID (and
-viewing the existing one). The mid-end generates this dialog box
-description itself. This should be used when the user selects
-\q{Random Seed} from the game menu (or equivalent).
-
-The returned value is an array of \cw{config_item}s, exactly as
-described in \k{backend-configure}. Another returned value is an
-ASCII string giving a suitable title for the configuration window,
-in \c{*wintitle}.
-
-Both returned values are dynamically allocated and will need to be
-freed. The window title can be freed in the obvious way; the
-\cw{config_item} array is a slightly complex structure, so a utility
-function \cw{free_cfg()} is provided to free it for you. See
-\k{utils-free-cfg}.
-
-(Of course, you will probably not want to free the \cw{config_item}
-array until the dialog box is dismissed, because before then you
-will probably need to pass it to \cw{midend_set_config}.)
-
-\H{midend-set-config} \cw{midend_set_config()}
-
-\c const char *midend_set_config(midend *me, int which,
-\c                               config_item *cfg);
-
-Passes the mid-end the results of a configuration dialog box.
-\c{which} should have the same value which it had when
-\cw{midend_get_config()} was called; \c{cfg} should be the array of
-\c{config_item}s returned from \cw{midend_get_config()}, modified to
-contain the results of the user's editing operations.
-
-This function returns \cw{NULL} on success, or otherwise (if the
-configuration data was in some way invalid) an ASCII string
-containing an error message suitable for showing to the user.
-
-If the function succeeds, it is likely that the game parameters will
-have been changed and it is certain that a new game will be
-requested. The front end should therefore call
-\cw{midend_new_game()}, and probably also re-think the window size
-using \cw{midend_size()} and eventually perform a refresh using
-\cw{midend_redraw()}.
-
-\H{midend-game-id} \cw{midend_game_id()}
-
-\c const char *midend_game_id(midend *me, const char *id);
-
-Passes the mid-end a string game ID (of any of the valid forms
-\cq{params}, \cq{params:description} or \cq{params#seed}) which the
-mid-end will process and use for the next generated game.
-
-This function returns \cw{NULL} on success, or otherwise (if the
-configuration data was in some way invalid) an ASCII string
-containing an error message (not dynamically allocated) suitable for
-showing to the user. In the event of an error, the mid-end's
-internal state will be left exactly as it was before the call.
-
-If the function succeeds, it is likely that the game parameters will
-have been changed and it is certain that a new game will be
-requested. The front end should therefore call
-\cw{midend_new_game()}, and probably also re-think the window size
-using \cw{midend_size()} and eventually case a refresh using
-\cw{midend_redraw()}.
-
-\H{midend-get-game-id} \cw{midend_get_game_id()}
-
-\c char *midend_get_game_id(midend *me)
-
-Returns a descriptive game ID (i.e. one in the form
-\cq{params:description}) describing the game currently active in the
-mid-end. The returned string is dynamically allocated.
-
-\H{midend-get-random-seed} \cw{midend_get_random_seed()}
-
-\c char *midend_get_random_seed(midend *me)
-
-Returns a random game ID (i.e. one in the form \cq{params#seedstring})
-describing the game currently active in the mid-end, if there is one.
-If the game was created by entering a description, no random seed will
-currently exist and this function will return \cw{NULL}.
-
-The returned string, if it is non-\cw{NULL}, is dynamically allocated.
-
-\H{midend-can-format-as-text-now} \cw{midend_can_format_as_text_now()}
-
-\c bool midend_can_format_as_text_now(midend *me);
-
-Returns \cw{true} if the game code is capable of formatting puzzles
-of the currently selected game type as ASCII.
-
-If this returns \cw{false}, then \cw{midend_text_format()}
-(\k{midend-text-format}) will return \cw{NULL}.
-
-\H{midend-text-format} \cw{midend_text_format()}
-
-\c char *midend_text_format(midend *me);
-
-Formats the current game's current state as ASCII text suitable for
-copying to the clipboard. The returned string is dynamically
-allocated.
-
-If the game's \c{can_format_as_text_ever} flag is \cw{FALSE}, or if
-its \cw{can_format_as_text_now()} function returns \cw{FALSE}, then
-this function will return \cw{NULL}.
-
-If the returned string contains multiple lines (which is likely), it
-will use the normal C line ending convention (\cw{\\n} only). On
-platforms which use a different line ending convention for data in
-the clipboard, it is the front end's responsibility to perform the
-conversion.
-
-\H{midend-solve} \cw{midend_solve()}
-
-\c const char *midend_solve(midend *me);
-
-Requests the mid-end to perform a Solve operation.
-
-On success, \cw{NULL} is returned. On failure, an error message (not
-dynamically allocated) is returned, suitable for showing to the
-user.
-
-The front end can expect its drawing API and/or
-\cw{activate_timer()} to be called from within a call to this
-function.  Some back ends require that \cw{midend_size()}
-(\k{midend-size}) is called before \cw{midend_solve()}.
-
-\H{midend-get-cursor-location} \cw{midend_get_cursor_location()}
-
-\c bool midend_get_cursor_location(midend *me,
-\c                                 int *x, int *y,
-\c                                 int *w, int *h);
-
-This function requests the location of the back end's on-screen cursor
-or other region of interest.
-
-What exactly this region contains is up to the backend, but in general
-the region will be an area that the player is controlling with the
-cursor keys \dash such as the player location in Cube and Inertia, or
-the cursor in any of the conventional grid-based games. With knowledge
-of this location, a front end can, for example, ensure that the region
-of interest remains visible even if the entire puzzle is too big to
-fit on the screen.
-
-On success, this function returns \cw{true}, and the locations pointed
-to by \cw{x}, \cw{y}, \cw{w} and \cw{h} are updated to describe the
-cursor region, which has an upper-left corner located at \cw{(*x,*y)}
-and a size of \cw{*w} pixels wide by \cw{*h} pixels tall. The caller
-may pass \cw{NULL} for any number of these pointers, which will be
-ignored.
-
-On failure, this function returns \cw{false}. Failure can occur if
-there is currently no active cursor region, or if the back end lacks
-cursor support.
-
-\H{midend-status} \cw{midend_status()}
-
-\c int midend_status(midend *me);
-
-This function returns +1 if the midend is currently displaying a game
-in a solved state, -1 if the game is in a permanently lost state, or 0
-otherwise. This function just calls the back end's \cw{status()}
-function. Front ends may wish to use this as a cue to proactively
-offer the option of starting a new game.
-
-(See \k{backend-status} for more detail about the back end's
-\cw{status()} function and discussion of what should count as which
-status code.)
-
-\H{midend-can-undo} \cw{midend_can_undo()}
-
-\c bool midend_can_undo(midend *me);
-
-Returns \cw{true} if the midend is currently in a state where the undo
-operation is meaningful (i.e. at least one position exists on the undo
-chain before the present one). Front ends may wish to use this to
-visually activate and deactivate an undo button.
-
-\H{midend-can-redo} \cw{midend_can_redo()}
-
-\c bool midend_can_redo(midend *me);
-
-Returns \cw{true} if the midend is currently in a state where the redo
-operation is meaningful (i.e. at least one position exists on the redo
-chain after the present one). Front ends may wish to use this to
-visually activate and deactivate a redo button.
-
-\H{midend-serialise} \cw{midend_serialise()}
-
-\c void midend_serialise(midend *me,
-\c     void (*write)(void *ctx, const void *buf, int len), void *wctx);
-
-Calling this function causes the mid-end to convert its entire
-internal state into a long ASCII text string, and to pass that
-string (piece by piece) to the supplied \c{write} function.
-
-Desktop implementations can use this function to save a game in any
-state (including half-finished) to a disk file, by supplying a
-\c{write} function which is a wrapper on \cw{fwrite()} (or local
-equivalent). Other implementations may find other uses for it, such
-as compressing the large and sprawling mid-end state into a
-manageable amount of memory when a palmtop application is suspended
-so that another one can run; in this case \cw{write} might want to
-write to a memory buffer rather than a file. There may be other uses
-for it as well.
-
-This function will call back to the supplied \c{write} function a
-number of times, with the first parameter (\c{ctx}) equal to
-\c{wctx}, and the other two parameters pointing at a piece of the
-output string.
-
-\H{midend-deserialise} \cw{midend_deserialise()}
-
-\c const char *midend_deserialise(midend *me,
-\c     bool (*read)(void *ctx, void *buf, int len), void *rctx);
-
-This function is the counterpart to \cw{midend_serialise()}. It
-calls the supplied \cw{read} function repeatedly to read a quantity
-of data, and attempts to interpret that data as a serialised mid-end
-as output by \cw{midend_serialise()}.
-
-The \cw{read} function is called with the first parameter (\c{ctx})
-equal to \c{rctx}, and should attempt to read \c{len} bytes of data
-into the buffer pointed to by \c{buf}. It should return \cw{false}
-on failure or \cw{true} on success. It should not report success
-unless it has filled the entire buffer; on platforms which might be
-reading from a pipe or other blocking data source, \c{read} is
-responsible for looping until the whole buffer has been filled.
-
-If the de-serialisation operation is successful, the mid-end's
-internal data structures will be replaced by the results of the
-load, and \cw{NULL} will be returned. Otherwise, the mid-end's state
-will be completely unchanged and an error message (typically some
-variation on \q{save file is corrupt}) will be returned. As usual,
-the error message string is not dynamically allocated.
-
-If this function succeeds, it is likely that the game parameters
-will have been changed. The front end should therefore probably
-re-think the window size using \cw{midend_size()}, and probably
-cause a refresh using \cw{midend_redraw()}.
-
-Because each mid-end is tied to a specific game back end, this
-function will fail if you attempt to read in a save file generated by
-a different game from the one configured in this mid-end, even if your
-application is a monolithic one containing all the puzzles. See
-\k{identify-game} for a helper function which will allow you to
-identify a save file before you instantiate your mid-end in the first
-place.
-
-\H{identify-game} \cw{identify_game()}
-
-\c const char *identify_game(char **name,
-\c     bool (*read)(void *ctx, void *buf, int len), void *rctx);
-
-This function examines a serialised midend stream, of the same kind
-used by \cw{midend_serialise()} and \cw{midend_deserialise()}, and
-returns the \cw{name} field of the game back end from which it was
-saved.
-
-You might want this if your front end was a monolithic one containing
-all the puzzles, and you wanted to be able to load an arbitrary save
-file and automatically switch to the right game. Probably your next
-step would be to iterate through \cw{gamelist} (\k{frontend-backend})
-looking for a game structure whose \cw{name} field matched the
-returned string, and give an error if you didn't find one.
-
-On success, the return value of this function is \cw{NULL}, and the
-game name string is written into \cw{*name}. The caller should free
-that string after using it.
-
-On failure, \cw{*name} is \cw{NULL}, and the return value is an error
-message (which does not need freeing at all).
-
-(This isn't strictly speaking a midend function, since it doesn't
-accept or return a pointer to a midend. You'd probably call it just
-\e{before} deciding what kind of midend you wanted to instantiate.)
-
-\H{midend-request-id-changes} \cw{midend_request_id_changes()}
-
-\c void midend_request_id_changes(midend *me,
-\c                                void (*notify)(void *), void *ctx);
-
-This function is called by the front end to request notification by
-the mid-end when the current game IDs (either descriptive or
-random-seed) change. This can occur as a result of keypresses ('n' for
-New Game, for example) or when a puzzle supersedes its game
-description (see \k{backend-supersede}). After this function is
-called, any change of the game ids will cause the mid-end to call
-\cw{notify(ctx)} after the change.
-
-This is for use by puzzles which want to present the game description
-to the user constantly (e.g. as an HTML hyperlink) instead of only
-showing it when the user explicitly requests it.
-
-This is a function I anticipate few front ends needing to implement,
-so I make it a callback rather than a static function in order to
-relieve most front ends of the need to provide an empty
-implementation.
-
-\H{frontend-backend} Direct reference to the back end structure by
-the front end
-
-Although \e{most} things the front end needs done should be done by
-calling the mid-end, there are a few situations in which the front
-end needs to refer directly to the game back end structure.
-
-The most obvious of these is
-
-\b passing the game back end as a parameter to \cw{midend_new()}.
-
-There are a few other back end features which are not wrapped by the
-mid-end because there didn't seem much point in doing so:
-
-\b fetching the \c{name} field to use in window titles and similar
-
-\b reading the \c{can_configure}, \c{can_solve} and
-\c{can_format_as_text_ever} fields to decide whether to add those
-items to the menu bar or equivalent
-
-\b reading the \c{winhelp_topic} field (Windows only)
-
-\b the GTK front end provides a \cq{--generate} command-line option
-which directly calls the back end to do most of its work. This is
-not really part of the main front end code, though, and I'm not sure
-it counts.
-
-In order to find the game back end structure, the front end does one
-of two things:
-
-\b If the particular front end is compiling a separate binary per
-game, then the back end structure is a global variable with the
-standard name \cq{thegame}:
-
-\lcont{
-
-\c extern const game thegame;
-
-}
-
-\b If the front end is compiled as a monolithic application
-containing all the puzzles together (in which case the preprocessor
-symbol \cw{COMBINED} must be defined when compiling most of the code
-base), then there will be two global variables defined:
-
-\lcont{
-
-\c extern const game *gamelist[];
-\c extern const int gamecount;
-
-\c{gamelist} will be an array of \c{gamecount} game structures,
-declared in the automatically constructed source module \c{list.c}.
-The application should search that array for the game it wants,
-probably by reaching into each game structure and looking at its
-\c{name} field.
-
-}
-
-\H{frontend-api} Mid-end to front-end calls
-
-This section describes the small number of functions which a front
-end must provide to be called by the mid-end or other standard
-utility modules.
-
-\H{frontend-get-random-seed} \cw{get_random_seed()}
-
-\c void get_random_seed(void **randseed, int *randseedsize);
-
-This function is called by a new mid-end, and also occasionally by
-game back ends. Its job is to return a piece of data suitable for
-using as a seed for initialisation of a new \c{random_state}.
-
-On exit, \c{*randseed} should be set to point at a newly allocated
-piece of memory containing some seed data, and \c{*randseedsize}
-should be set to the length of that data.
-
-A simple and entirely adequate implementation is to return a piece
-of data containing the current system time at the highest
-conveniently available resolution.
-
-\H{frontend-activate-timer} \cw{activate_timer()}
-
-\c void activate_timer(frontend *fe);
-
-This is called by the mid-end to request that the front end begin
-calling it back at regular intervals.
-
-The timeout interval is left up to the front end; the finer it is,
-the smoother move animations will be, but the more CPU time will be
-used. Current front ends use values around 20ms (i.e. 50Hz).
-
-After this function is called, the mid-end will expect to receive
-calls to \cw{midend_timer()} on a regular basis.
-
-\H{frontend-deactivate-timer} \cw{deactivate_timer()}
-
-\c void deactivate_timer(frontend *fe);
-
-This is called by the mid-end to request that the front end stop
-calling \cw{midend_timer()}.
-
-\H{frontend-fatal} \cw{fatal()}
-
-\c void fatal(const char *fmt, ...);
-
-This is called by some utility functions if they encounter a
-genuinely fatal error such as running out of memory. It is a
-variadic function in the style of \cw{printf()}, and is expected to
-show the formatted error message to the user any way it can and then
-terminate the application. It must not return.
-
-\H{frontend-default-colour} \cw{frontend_default_colour()}
-
-\c void frontend_default_colour(frontend *fe, float *output);
-
-This function expects to be passed a pointer to an array of three
-\cw{float}s. It returns the platform's local preferred background
-colour in those three floats, as red, green and blue values (in that
-order) ranging from \cw{0.0} to \cw{1.0}.
-
-This function should only ever be called by the back end function
-\cw{colours()} (\k{backend-colours}). (Thus, it isn't a
-\e{midend}-to-frontend function as such, but there didn't seem to be
-anywhere else particularly good to put it. Sorry.)
-
-\C{utils} Utility APIs
-
-This chapter documents a variety of utility APIs provided for the
-general use of the rest of the Puzzles code.
-
-\H{utils-random} Random number generation
-
-Platforms' local random number generators vary widely in quality and
-seed size. Puzzles therefore supplies its own high-quality random
-number generator, with the additional advantage of giving the same
-results if fed the same seed data on different platforms. This
-allows game random seeds to be exchanged between different ports of
-Puzzles and still generate the same games.
-
-Unlike the ANSI C \cw{rand()} function, the Puzzles random number
-generator has an \e{explicit} state object called a
-\c{random_state}. One of these is managed by each mid-end, for
-example, and passed to the back end to generate a game with.
-
-\S{utils-random-init} \cw{random_new()}
-
-\c random_state *random_new(char *seed, int len);
-
-Allocates, initialises and returns a new \c{random_state}. The input
-data is used as the seed for the random number stream (i.e. using
-the same seed at a later time will generate the same stream).
-
-The seed data can be any data at all; there is no requirement to use
-printable ASCII, or NUL-terminated strings, or anything like that.
-
-\S{utils-random-copy} \cw{random_copy()}
-
-\c random_state *random_copy(random_state *tocopy);
-
-Allocates a new \c{random_state}, copies the contents of another
-\c{random_state} into it, and returns the new state.  If exactly the
-same sequence of functions is subseqently called on both the copy and
-the original, the results will be identical.  This may be useful for
-speculatively performing some operation using a given random state,
-and later replaying that operation precisely.
-
-\S{utils-random-free} \cw{random_free()}
-
-\c void random_free(random_state *state);
-
-Frees a \c{random_state}.
-
-\S{utils-random-bits} \cw{random_bits()}
-
-\c unsigned long random_bits(random_state *state, int bits);
-
-Returns a random number from 0 to \cw{2^bits-1} inclusive. \c{bits}
-should be between 1 and 32 inclusive.
-
-\S{utils-random-upto} \cw{random_upto()}
-
-\c unsigned long random_upto(random_state *state, unsigned long limit);
-
-Returns a random number from 0 to \cw{limit-1} inclusive.
-
-\S{utils-random-state-encode} \cw{random_state_encode()}
-
-\c char *random_state_encode(random_state *state);
-
-Encodes the entire contents of a \c{random_state} in printable
-ASCII. Returns a dynamically allocated string containing that
-encoding. This can subsequently be passed to
-\cw{random_state_decode()} to reconstruct the same \c{random_state}.
-
-\S{utils-random-state-decode} \cw{random_state_decode()}
-
-\c random_state *random_state_decode(char *input);
-
-Decodes a string generated by \cw{random_state_encode()} and
-reconstructs an equivalent \c{random_state} to the one encoded, i.e.
-it should produce the same stream of random numbers.
-
-This function has no error reporting; if you pass it an invalid
-string it will simply generate an arbitrary random state, which may
-turn out to be noticeably non-random.
-
-\S{utils-shuffle} \cw{shuffle()}
-
-\c void shuffle(void *array, int nelts, int eltsize, random_state *rs);
-
-Shuffles an array into a random order. The interface is much like
-ANSI C \cw{qsort()}, except that there's no need for a compare
-function.
-
-\c{array} is a pointer to the first element of the array. \c{nelts}
-is the number of elements in the array; \c{eltsize} is the size of a
-single element (typically measured using \c{sizeof}). \c{rs} is a
-\c{random_state} used to generate all the random numbers for the
-shuffling process.
-
-\H{utils-presets} Presets menu management
-
-The function \c{midend_get_presets()} (\k{midend-get-presets}) returns
-a data structure describing a menu hierarchy. Back ends can also
-choose to provide such a structure to the mid-end, if they want to
-group their presets hierarchically. To make this easy, there are a few
-utility functions to construct preset menu structures, and also one
-intended for front-end use.
-
-\S{utils-preset-menu-new} \cw{preset_menu_new()}
-
-\c struct preset_menu *preset_menu_new(void);
-
-Allocates a new \c{struct preset_menu}, and initialises it to hold no
-menu items.
-
-\S{utils-preset-menu-add_submenu} \cw{preset_menu_add_submenu()}
-
-\c struct preset_menu *preset_menu_add_submenu
-\c     (struct preset_menu *parent, char *title);
-
-Adds a new submenu to the end of an existing preset menu, and returns
-a pointer to a newly allocated \c{struct preset_menu} describing the
-submenu.
-
-The string parameter \cq{title} must be dynamically allocated by the
-caller. The preset-menu structure will take ownership of it, so the
-caller must not free it.
-
-\S{utils-preset-menu-add-preset} \cw{preset_menu_add_preset()}
-
-\c void preset_menu_add_preset
-\c     (struct preset_menu *menu, char *title, game_params *params);
-
-Adds a preset game configuration to the end of a preset menu.
-
-Both the string parameter \cq{title} and the game parameter structure
-\cq{params} itself must be dynamically allocated by the caller. The
-preset-menu structure will take ownership of it, so the caller must
-not free it.
-
-\S{utils-preset-menu-lookup-by-id} \cw{preset_menu_lookup_by_id()}
-
-\c game_params *preset_menu_lookup_by_id
-\c     (struct preset_menu *menu, int id);
-
-Given a numeric index, searches recursively through a preset menu
-hierarchy to find the corresponding menu entry, and returns a pointer
-to its existing \c{game_params} structure.
-
-This function is intended for front end use (but front ends need not
-use it if they prefer to do things another way). If a front end finds
-it inconvenient to store anything more than a numeric index alongside
-each menu item, then this function provides an easy way for the front
-end to get back the actual game parameters corresponding to a menu
-item that the user has selected.
-
-\H{utils-alloc} Memory allocation
-
-Puzzles has some central wrappers on the standard memory allocation
-functions, which provide compile-time type checking, and run-time
-error checking by means of quitting the application if it runs out
-of memory. This doesn't provide the best possible recovery from
-memory shortage, but on the other hand it greatly simplifies the
-rest of the code, because nothing else anywhere needs to worry about
-\cw{NULL} returns from allocation.
-
-\S{utils-snew} \cw{snew()}
-
-\c var = snew(type);
-\e iii        iiii
-
-This macro takes a single argument which is a \e{type name}. It
-allocates space for one object of that type. If allocation fails it
-will call \cw{fatal()} and not return; so if it does return, you can
-be confident that its return value is non-\cw{NULL}.
-
-The return value is cast to the specified type, so that the compiler
-will type-check it against the variable you assign it into. Thus,
-this ensures you don't accidentally allocate memory the size of the
-wrong type and assign it into a variable of the right one (or vice
-versa!).
-
-\S{utils-snewn} \cw{snewn()}
-
-\c var = snewn(n, type);
-\e iii         i  iiii
-
-This macro is the array form of \cw{snew()}. It takes two arguments;
-the first is a number, and the second is a type name. It allocates
-space for that many objects of that type, and returns a type-checked
-non-\cw{NULL} pointer just as \cw{snew()} does.
-
-\S{utils-sresize} \cw{sresize()}
-
-\c var = sresize(var, n, type);
-\e iii           iii  i  iiii
-
-This macro is a type-checked form of \cw{realloc()}. It takes three
-arguments: an input memory block, a new size in elements, and a
-type. It re-sizes the input memory block to a size sufficient to
-contain that many elements of that type. It returns a type-checked
-non-\cw{NULL} pointer, like \cw{snew()} and \cw{snewn()}.
-
-The input memory block can be \cw{NULL}, in which case this function
-will behave exactly like \cw{snewn()}. (In principle any
-ANSI-compliant \cw{realloc()} implementation ought to cope with
-this, but I've never quite trusted it to work everywhere.)
-
-\S{utils-sfree} \cw{sfree()}
-
-\c void sfree(void *p);
-
-This function is pretty much equivalent to \cw{free()}. It is
-provided with a dynamically allocated block, and frees it.
-
-The input memory block can be \cw{NULL}, in which case this function
-will do nothing. (In principle any ANSI-compliant \cw{free()}
-implementation ought to cope with this, but I've never quite trusted
-it to work everywhere.)
-
-\S{utils-dupstr} \cw{dupstr()}
-
-\c char *dupstr(const char *s);
-
-This function dynamically allocates a duplicate of a C string. Like
-the \cw{snew()} functions, it guarantees to return non-\cw{NULL} or
-not return at all.
-
-(Many platforms provide the function \cw{strdup()}. As well as
-guaranteeing never to return \cw{NULL}, my version has the advantage
-of being defined \e{everywhere}, rather than inconveniently not
-quite everywhere.)
-
-\S{utils-free-cfg} \cw{free_cfg()}
-
-\c void free_cfg(config_item *cfg);
-
-This function correctly frees an array of \c{config_item}s, including
-walking the array until it gets to the end and freeing any subsidiary
-data items in each \c{u} sub-union which are expected to be
-dynamically allocated.
-
-(See \k{backend-configure} for details of the \c{config_item}
-structure.)
-
-\H{utils-tree234} Sorted and counted tree functions
-
-Many games require complex algorithms for generating random puzzles,
-and some require moderately complex algorithms even during play. A
-common requirement during these algorithms is for a means of
-maintaining sorted or unsorted lists of items, such that items can
-be removed and added conveniently.
-
-For general use, Puzzles provides the following set of functions
-which maintain 2-3-4 trees in memory. (A 2-3-4 tree is a balanced
-tree structure, with the property that all lookups, insertions,
-deletions, splits and joins can be done in \cw{O(log N)} time.)
-
-All these functions expect you to be storing a tree of \c{void *}
-pointers. You can put anything you like in those pointers.
-
-By the use of per-node element counts, these tree structures have
-the slightly unusual ability to look elements up by their numeric
-index within the list represented by the tree. This means that they
-can be used to store an unsorted list (in which case, every time you
-insert a new element, you must explicitly specify the position where
-you wish to insert it). They can also do numeric lookups in a sorted
-tree, which might be useful for (for example) tracking the median of
-a changing data set.
-
-As well as storing sorted lists, these functions can be used for
-storing \q{maps} (associative arrays), by defining each element of a
-tree to be a (key, value) pair.
-
-\S{utils-newtree234} \cw{newtree234()}
-
-\c tree234 *newtree234(cmpfn234 cmp);
-
-Creates a new empty tree, and returns a pointer to it.
-
-The parameter \c{cmp} determines the sorting criterion on the tree.
-Its prototype is
-
-\c typedef int (*cmpfn234)(void *, void *);
-
-If you want a sorted tree, you should provide a function matching
-this prototype, which returns like \cw{strcmp()} does (negative if
-the first argument is smaller than the second, positive if it is
-bigger, zero if they compare equal). In this case, the function
-\cw{addpos234()} will not be usable on your tree (because all
-insertions must respect the sorting order).
-
-If you want an unsorted tree, pass \cw{NULL}. In this case you will
-not be able to use either \cw{add234()} or \cw{del234()}, or any
-other function such as \cw{find234()} which depends on a sorting
-order. Your tree will become something more like an array, except
-that it will efficiently support insertion and deletion as well as
-lookups by numeric index.
-
-\S{utils-freetree234} \cw{freetree234()}
-
-\c void freetree234(tree234 *t);
-
-Frees a tree. This function will not free the \e{elements} of the
-tree (because they might not be dynamically allocated, or you might
-be storing the same set of elements in more than one tree); it will
-just free the tree structure itself. If you want to free all the
-elements of a tree, you should empty it before passing it to
-\cw{freetree234()}, by means of code along the lines of
-
-\c while ((element = delpos234(tree, 0)) != NULL)
-\c     sfree(element); /* or some more complicated free function */
-\e                     iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-
-\S{utils-add234} \cw{add234()}
-
-\c void *add234(tree234 *t, void *e);
-
-Inserts a new element \c{e} into the tree \c{t}. This function
-expects the tree to be sorted; the new element is inserted according
-to the sort order.
-
-If an element comparing equal to \c{e} is already in the tree, then
-the insertion will fail, and the return value will be the existing
-element. Otherwise, the insertion succeeds, and \c{e} is returned.
-
-\S{utils-addpos234} \cw{addpos234()}
-
-\c void *addpos234(tree234 *t, void *e, int index);
-
-Inserts a new element into an unsorted tree. Since there is no
-sorting order to dictate where the new element goes, you must
-specify where you want it to go. Setting \c{index} to zero puts the
-new element right at the start of the list; setting \c{index} to the
-current number of elements in the tree puts the new element at the
-end.
-
-Return value is \c{e}, in line with \cw{add234()} (although this
-function cannot fail except by running out of memory, in which case
-it will bomb out and die rather than returning an error indication).
-
-\S{utils-index234} \cw{index234()}
-
-\c void *index234(tree234 *t, int index);
-
-Returns a pointer to the \c{index}th element of the tree, or
-\cw{NULL} if \c{index} is out of range. Elements of the tree are
-numbered from zero.
-
-\S{utils-find234} \cw{find234()}
-
-\c void *find234(tree234 *t, void *e, cmpfn234 cmp);
-
-Searches for an element comparing equal to \c{e} in a sorted tree.
-
-If \c{cmp} is \cw{NULL}, the tree's ordinary comparison function
-will be used to perform the search. However, sometimes you don't
-want that; suppose, for example, each of your elements is a big
-structure containing a \c{char *} name field, and you want to find
-the element with a given name. You \e{could} achieve this by
-constructing a fake element structure, setting its name field
-appropriately, and passing it to \cw{find234()}, but you might find
-it more convenient to pass \e{just} a name string to \cw{find234()},
-supplying an alternative comparison function which expects one of
-its arguments to be a bare name and the other to be a large
-structure containing a name field.
-
-Therefore, if \c{cmp} is not \cw{NULL}, then it will be used to
-compare \c{e} to elements of the tree. The first argument passed to
-\c{cmp} will always be \c{e}; the second will be an element of the
-tree.
-
-(See \k{utils-newtree234} for the definition of the \c{cmpfn234}
-function pointer type.)
-
-The returned value is the element found, or \cw{NULL} if the search
-is unsuccessful.
-
-\S{utils-findrel234} \cw{findrel234()}
-
-\c void *findrel234(tree234 *t, void *e, cmpfn234 cmp, int relation);
-
-This function is like \cw{find234()}, but has the additional ability
-to do a \e{relative} search. The additional parameter \c{relation}
-can be one of the following values:
-
-\dt \cw{REL234_EQ}
-
-\dd Find only an element that compares equal to \c{e}. This is
-exactly the behaviour of \cw{find234()}.
-
-\dt \cw{REL234_LT}
-
-\dd Find the greatest element that compares strictly less than
-\c{e}. \c{e} may be \cw{NULL}, in which case it finds the greatest
-element in the whole tree (which could also be done by
-\cw{index234(t, count234(t)-1)}).
-
-\dt \cw{REL234_LE}
-
-\dd Find the greatest element that compares less than or equal to
-\c{e}. (That is, find an element that compares equal to \c{e} if
-possible, but failing that settle for something just less than it.)
-
-\dt \cw{REL234_GT}
-
-\dd Find the smallest element that compares strictly greater than
-\c{e}. \c{e} may be \cw{NULL}, in which case it finds the smallest
-element in the whole tree (which could also be done by
-\cw{index234(t, 0)}).
-
-\dt \cw{REL234_GE}
-
-\dd Find the smallest element that compares greater than or equal to
-\c{e}. (That is, find an element that compares equal to \c{e} if
-possible, but failing that settle for something just bigger than
-it.)
-
-Return value, as before, is the element found or \cw{NULL} if no
-element satisfied the search criterion.
-
-\S{utils-findpos234} \cw{findpos234()}
-
-\c void *findpos234(tree234 *t, void *e, cmpfn234 cmp, int *index);
-
-This function is like \cw{find234()}, but has the additional feature
-of returning the index of the element found in the tree; that index
-is written to \c{*index} in the event of a successful search (a
-non-\cw{NULL} return value).
-
-\c{index} may be \cw{NULL}, in which case this function behaves
-exactly like \cw{find234()}.
-
-\S{utils-findrelpos234} \cw{findrelpos234()}
-
-\c void *findrelpos234(tree234 *t, void *e, cmpfn234 cmp, int relation,
-\c                     int *index);
-
-This function combines all the features of \cw{findrel234()} and
-\cw{findpos234()}.
-
-\S{utils-del234} \cw{del234()}
-
-\c void *del234(tree234 *t, void *e);
-
-Finds an element comparing equal to \c{e} in the tree, deletes it,
-and returns it.
-
-The input tree must be sorted.
-
-The element found might be \c{e} itself, or might merely compare
-equal to it.
-
-Return value is \cw{NULL} if no such element is found.
-
-\S{utils-delpos234} \cw{delpos234()}
-
-\c void *delpos234(tree234 *t, int index);
-
-Deletes the element at position \c{index} in the tree, and returns
-it.
-
-Return value is \cw{NULL} if the index is out of range.
-
-\S{utils-count234} \cw{count234()}
-
-\c int count234(tree234 *t);
-
-Returns the number of elements currently in the tree.
-
-\S{utils-splitpos234} \cw{splitpos234()}
-
-\c tree234 *splitpos234(tree234 *t, int index, bool before);
-
-Splits the input tree into two pieces at a given position, and
-creates a new tree containing all the elements on one side of that
-position.
-
-If \c{before} is \cw{true}, then all the items at or after position
-\c{index} are left in the input tree, and the items before that
-point are returned in the new tree. Otherwise, the reverse happens:
-all the items at or after \c{index} are moved into the new tree, and
-those before that point are left in the old one.
-
-If \c{index} is equal to 0 or to the number of elements in the input
-tree, then one of the two trees will end up empty (and this is not
-an error condition). If \c{index} is further out of range in either
-direction, the operation will fail completely and return \cw{NULL}.
-
-This operation completes in \cw{O(log N)} time, no matter how large
-the tree or how balanced or unbalanced the split.
-
-\S{utils-split234} \cw{split234()}
-
-\c tree234 *split234(tree234 *t, void *e, cmpfn234 cmp, int rel);
-
-Splits a sorted tree according to its sort order.
-
-\c{rel} can be any of the relation constants described in
-\k{utils-findrel234}, \e{except} for \cw{REL234_EQ}. All the
-elements having that relation to \c{e} will be transferred into the
-new tree; the rest will be left in the old one.
-
-The parameter \c{cmp} has the same semantics as it does in
-\cw{find234()}: if it is not \cw{NULL}, it will be used in place of
-the tree's own comparison function when comparing elements to \c{e},
-in such a way that \c{e} itself is always the first of its two
-operands.
-
-Again, this operation completes in \cw{O(log N)} time, no matter how
-large the tree or how balanced or unbalanced the split.
-
-\S{utils-join234} \cw{join234()}
-
-\c tree234 *join234(tree234 *t1, tree234 *t2);
-
-Joins two trees together by concatenating the lists they represent.
-All the elements of \c{t2} are moved into \c{t1}, in such a way that
-they appear \e{after} the elements of \c{t1}. The tree \c{t2} is
-freed; the return value is \c{t1}.
-
-If you apply this function to a sorted tree and it violates the sort
-order (i.e. the smallest element in \c{t2} is smaller than or equal
-to the largest element in \c{t1}), the operation will fail and
-return \cw{NULL}.
-
-This operation completes in \cw{O(log N)} time, no matter how large
-the trees being joined together.
-
-\S{utils-join234r} \cw{join234r()}
-
-\c tree234 *join234r(tree234 *t1, tree234 *t2);
-
-Joins two trees together in exactly the same way as \cw{join234()},
-but this time the combined tree is returned in \c{t2}, and \c{t1} is
-destroyed. The elements in \c{t1} still appear before those in
-\c{t2}.
-
-Again, this operation completes in \cw{O(log N)} time, no matter how
-large the trees being joined together.
-
-\S{utils-copytree234} \cw{copytree234()}
-
-\c tree234 *copytree234(tree234 *t, copyfn234 copyfn,
-\c                      void *copyfnstate);
-
-Makes a copy of an entire tree.
-
-If \c{copyfn} is \cw{NULL}, the tree will be copied but the elements
-will not be; i.e. the new tree will contain pointers to exactly the
-same physical elements as the old one.
-
-If you want to copy each actual element during the operation, you
-can instead pass a function in \c{copyfn} which makes a copy of each
-element. That function has the prototype
-
-\c typedef void *(*copyfn234)(void *state, void *element);
-
-and every time it is called, the \c{state} parameter will be set to
-the value you passed in as \c{copyfnstate}.
-
-\H{utils-misc} Miscellaneous utility functions and macros
-
-This section contains all the utility functions which didn't
-sensibly fit anywhere else.
-
-\S{utils-truefalse} \cw{TRUE} and \cw{FALSE}
-
-The main Puzzles header file defines the macros \cw{TRUE} and
-\cw{FALSE}, which are used throughout the code in place of 1 and 0
-(respectively) to indicate that the values are in a boolean context.
-For code base consistency, I'd prefer it if submissions of new code
-followed this convention as well.
-
-\S{utils-maxmin} \cw{max()} and \cw{min()}
-
-The main Puzzles header file defines the pretty standard macros
-\cw{max()} and \cw{min()}, each of which is given two arguments and
-returns the one which compares greater or less respectively.
-
-These macros may evaluate their arguments multiple times. Avoid side
-effects.
-
-\S{utils-pi} \cw{PI}
-
-The main Puzzles header file defines a macro \cw{PI} which expands
-to a floating-point constant representing pi.
-
-(I've never understood why ANSI's \cw{<math.h>} doesn't define this.
-It'd be so useful!)
-
-\S{utils-obfuscate-bitmap} \cw{obfuscate_bitmap()}
-
-\c void obfuscate_bitmap(unsigned char *bmp, int bits, int decode);
-
-This function obscures the contents of a piece of data, by
-cryptographic methods. It is useful for games of hidden information
-(such as Mines, Guess or Black Box), in which the game ID
-theoretically reveals all the information the player is supposed to
-be trying to guess. So in order that players should be able to send
-game IDs to one another without accidentally spoiling the resulting
-game by looking at them, these games obfuscate their game IDs using
-this function.
-
-Although the obfuscation function is cryptographic, it cannot
-properly be called encryption because it has no key. Therefore,
-anybody motivated enough can re-implement it, or hack it out of the
-Puzzles source, and strip the obfuscation off one of these game IDs
-to see what lies beneath. (Indeed, they could usually do it much
-more easily than that, by entering the game ID into their own copy
-of the puzzle and hitting Solve.) The aim is not to protect against
-a determined attacker; the aim is simply to protect people who
-wanted to play the game honestly from \e{accidentally} spoiling
-their own fun.
-
-The input argument \c{bmp} points at a piece of memory to be
-obfuscated. \c{bits} gives the length of the data. Note that that
-length is in \e{bits} rather than bytes: if you ask for obfuscation
-of a partial number of bytes, then you will get it. Bytes are
-considered to be used from the top down: thus, for example, setting
-\c{bits} to 10 will cover the whole of \cw{bmp[0]} and the \e{top
-two} bits of \cw{bmp[1]}. The remainder of a partially used byte is
-undefined (i.e. it may be corrupted by the function).
-
-The parameter \c{decode} is \cw{FALSE} for an encoding operation,
-and \cw{TRUE} for a decoding operation. Each is the inverse of the
-other. (There's no particular reason you shouldn't obfuscate by
-decoding and restore cleartext by encoding, if you really wanted to;
-it should still work.)
-
-The input bitmap is processed in place.
-
-\S{utils-bin2hex} \cw{bin2hex()}
-
-\c char *bin2hex(const unsigned char *in, int inlen);
-
-This function takes an input byte array and converts it into an
-ASCII string encoding those bytes in (lower-case) hex. It returns a
-dynamically allocated string containing that encoding.
-
-This function is useful for encoding the result of
-\cw{obfuscate_bitmap()} in printable ASCII for use in game IDs.
-
-\S{utils-hex2bin} \cw{hex2bin()}
-
-\c unsigned char *hex2bin(const char *in, int outlen);
-
-This function takes an ASCII string containing hex digits, and
-converts it back into a byte array of length \c{outlen}. If there
-aren't enough hex digits in the string, the contents of the
-resulting array will be undefined.
-
-This function is the inverse of \cw{bin2hex()}.
-
-\S{utils-game-mkhighlight} \cw{game_mkhighlight()}
-
-\c void game_mkhighlight(frontend *fe, float *ret,
-\c                       int background, int highlight, int lowlight);
-
-It's reasonably common for a puzzle game's graphics to use
-highlights and lowlights to indicate \q{raised} or \q{lowered}
-sections. Fifteen, Sixteen and Twiddle are good examples of this.
-
-Puzzles using this graphical style are running a risk if they just
-use whatever background colour is supplied to them by the front end,
-because that background colour might be too light to see any
-highlights on at all. (In particular, it's not unheard of for the
-front end to specify a default background colour of white.)
-
-Therefore, such puzzles can call this utility function from their
-\cw{colours()} routine (\k{backend-colours}). You pass it your front
-end handle, a pointer to the start of your return array, and three
-colour indices. It will:
-
-\b call \cw{frontend_default_colour()} (\k{frontend-default-colour})
-to fetch the front end's default background colour
-
-\b alter the brightness of that colour if it's unsuitable
-
-\b define brighter and darker variants of the colour to be used as
-highlights and lowlights
-
-\b write those results into the relevant positions in the \c{ret}
-array.
-
-Thus, \cw{ret[background*3]} to \cw{ret[background*3+2]} will be set
-to RGB values defining a sensible background colour, and similary
-\c{highlight} and \c{lowlight} will be set to sensible colours.
-
-\S{utils-button2label} \cw{button2label()}
-
-\c char *button2label(int button);
-
-This function generates a descriptive text label for \cw{button},
-which should be a button code that can be passed to the midend. For
-example, calling this function with \cw{CURSOR_UP} will result in the
-string \cw{"Up"}. This function should only be called when the
-\cw{key_label} item returned by a backend's \cw{request_keys()}
-(\k{backend-request-keys}) function has its \cw{label} field set to
-\cw{NULL}; in this case, the corresponding \cw{button} field can be
-passed to this function to obtain an appropriate label. If, however,
-the field is not \cw{NULL}, this function should not be called with
-the corresponding \cw{button} field.
-
-The returned string is dynamically allocated and should be
-\cw{sfree}'d by the caller.
-
-\C{writing} How to write a new puzzle
-
-This chapter gives a guide to how to actually write a new puzzle:
-where to start, what to do first, how to solve common problems.
-
-The previous chapters have been largely composed of facts. This one
-is mostly advice.
-
-\H{writing-editorial} Choosing a puzzle
-
-Before you start writing a puzzle, you have to choose one. Your
-taste in puzzle games is up to you, of course; and, in fact, you're
-probably reading this guide because you've \e{already} thought of a
-game you want to write. But if you want to get it accepted into the
-official Puzzles distribution, then there's a criterion it has to
-meet.
-
-The current Puzzles editorial policy is that all games should be
-\e{fair}. A fair game is one which a player can only fail to
-complete through demonstrable lack of skill \dash that is, such that
-a better player in the same situation would have \e{known} to do
-something different.
-
-For a start, that means every game presented to the user must have
-\e{at least one solution}. Giving the unsuspecting user a puzzle
-which is actually impossible is not acceptable. (There is an
-exception: if the user has selected some non-default option which is
-clearly labelled as potentially unfair, \e{then} you're allowed to
-generate possibly insoluble puzzles, because the user isn't
-unsuspecting any more. Same Game and Mines both have options of this
-type.)
-
-Also, this actually \e{rules out} games such as Klondike, or the
-normal form of Mahjong Solitaire. Those games have the property that
-even if there is a solution (i.e. some sequence of moves which will
-get from the start state to the solved state), the player doesn't
-necessarily have enough information to \e{find} that solution. In
-both games, it is possible to reach a dead end because you had an
-arbitrary choice to make and made it the wrong way. This violates
-the fairness criterion, because a better player couldn't have known
-they needed to make the other choice.
-
-(GNOME has a variant on Mahjong Solitaire which makes it fair: there
-is a Shuffle operation which randomly permutes all the remaining
-tiles without changing their positions, which allows you to get out
-of a sticky situation. Using this operation adds a 60-second penalty
-to your solution time, so it's to the player's advantage to try to
-minimise the chance of having to use it. It's still possible to
-render the game uncompletable if you end up with only two tiles
-vertically stacked, but that's easy to foresee and avoid using a
-shuffle operation. This form of the game \e{is} fair. Implementing
-it in Puzzles would require an infrastructure change so that the
-back end could communicate time penalties to the mid-end, but that
-would be easy enough.)
-
-Providing a \e{unique} solution is a little more negotiable; it
-depends on the puzzle. Solo would have been of unacceptably low
-quality if it didn't always have a unique solution, whereas Twiddle
-inherently has multiple solutions by its very nature and it would
-have been meaningless to even \e{suggest} making it uniquely
-soluble. Somewhere in between, Flip could reasonably be made to have
-unique solutions (by enforcing a zero-dimension kernel in every
-generated matrix) but it doesn't seem like a serious quality problem
-that it doesn't.
-
-Of course, you don't \e{have} to care about all this. There's
-nothing stopping you implementing any puzzle you want to if you're
-happy to maintain your puzzle yourself, distribute it from your own
-web site, fork the Puzzles code completely, or anything like that.
-It's free software; you can do what you like with it. But any game
-that you want to be accepted into \e{my} Puzzles code base has to
-satisfy the fairness criterion, which means all randomly generated
-puzzles must have a solution (unless the user has deliberately
-chosen otherwise) and it must be possible \e{in theory} to find that
-solution without having to guess.
-
-\H{writing-gs} Getting started
-
-The simplest way to start writing a new puzzle is to copy
-\c{nullgame.c}. This is a template puzzle source file which does
-almost nothing, but which contains all the back end function
-prototypes and declares the back end data structure correctly. It is
-built every time the rest of Puzzles is built, to ensure that it
-doesn't get out of sync with the code and remains buildable.
-
-So start by copying \c{nullgame.c} into your new source file. Then
-you'll gradually add functionality until the very boring Null Game
-turns into your real game.
-
-Next you'll need to add your puzzle to the Makefiles, in order to
-compile it conveniently. \e{Do not edit the Makefiles}: they are
-created automatically by the script \c{mkfiles.pl}, from the file
-called \c{Recipe}. Edit \c{Recipe}, and then re-run \c{mkfiles.pl}.
-
-Also, don't forget to add your puzzle to \c{list.c}: if you don't,
-then it will still run fine on platforms which build each puzzle
-separately, but Mac OS X and other monolithic platforms will not
-include your new puzzle in their single binary.
-
-Once your source file is building, you can move on to the fun bit.
-
-\S{writing-generation} Puzzle generation
-
-Randomly generating instances of your puzzle is almost certain to be
-the most difficult part of the code, and also the task with the
-highest chance of turning out to be completely infeasible. Therefore
-I strongly recommend doing it \e{first}, so that if it all goes
-horribly wrong you haven't wasted any more time than you absolutely
-had to. What I usually do is to take an unmodified \c{nullgame.c},
-and start adding code to \cw{new_game_desc()} which tries to
-generate a puzzle instance and print it out using \cw{printf()}.
-Once that's working, \e{then} I start connecting it up to the return
-value of \cw{new_game_desc()}, populating other structures like
-\c{game_params}, and generally writing the rest of the source file.
-
-There are many ways to generate a puzzle which is known to be
-soluble. In this section I list all the methods I currently know of,
-in case any of them can be applied to your puzzle. (Not all of these
-methods will work, or in some cases even make sense, for all
-puzzles.)
-
-Some puzzles are mathematically tractable, meaning you can work out
-in advance which instances are soluble. Sixteen, for example, has a
-parity constraint in some settings which renders exactly half the
-game space unreachable, but it can be mathematically proved that any
-position not in that half \e{is} reachable. Therefore, Sixteen's
-grid generation simply consists of selecting at random from a well
-defined subset of the game space. Cube in its default state is even
-easier: \e{every} possible arrangement of the blue squares and the
-cube's starting position is soluble!
-
-Another option is to redefine what you mean by \q{soluble}. Black
-Box takes this approach. There are layouts of balls in the box which
-are completely indistinguishable from one another no matter how many
-beams you fire into the box from which angles, which would normally
-be grounds for declaring those layouts unfair; but fortunately,
-detecting that indistinguishability is computationally easy. So
-Black Box doesn't demand that your ball placements match its own; it
-merely demands that your ball placements be \e{indistinguishable}
-from the ones it was thinking of. If you have an ambiguous puzzle,
-then any of the possible answers is considered to be a solution.
-Having redefined the rules in that way, any puzzle is soluble again.
-
-Those are the simple techniques. If they don't work, you have to get
-cleverer.
-
-One way to generate a soluble puzzle is to start from the solved
-state and make inverse moves until you reach a starting state. Then
-you know there's a solution, because you can just list the inverse
-moves you made and make them in the opposite order to return to the
-solved state.
-
-This method can be simple and effective for puzzles where you get to
-decide what's a starting state and what's not. In Pegs, for example,
-the generator begins with one peg in the centre of the board and
-makes inverse moves until it gets bored; in this puzzle, valid
-inverse moves are easy to detect, and \e{any} state that's reachable
-from the solved state by inverse moves is a reasonable starting
-position. So Pegs just continues making inverse moves until the
-board satisfies some criteria about extent and density, and then
-stops and declares itself done.
-
-For other puzzles, it can be a lot more difficult. Same Game uses
-this strategy too, and it's lucky to get away with it at all: valid
-inverse moves aren't easy to find (because although it's easy to
-insert additional squares in a Same Game position, it's difficult to
-arrange that \e{after} the insertion they aren't adjacent to any
-other squares of the same colour), so you're constantly at risk of
-running out of options and having to backtrack or start again. Also,
-Same Game grids never start off half-empty, which means you can't
-just stop when you run out of moves \dash you have to find a way to
-fill the grid up \e{completely}.
-
-The other way to generate a puzzle that's soluble is to start from
-the other end, and actually write a \e{solver}. This tends to ensure
-that a puzzle has a \e{unique} solution over and above having a
-solution at all, so it's a good technique to apply to puzzles for
-which that's important.
-
-One theoretical drawback of generating soluble puzzles by using a
-solver is that your puzzles are restricted in difficulty to those
-which the solver can handle. (Most solvers are not fully general:
-many sets of puzzle rules are NP-complete or otherwise nasty, so
-most solvers can only handle a subset of the theoretically soluble
-puzzles.) It's been my experience in practice, however, that this
-usually isn't a problem; computers are good at very different things
-from humans, and what the computer thinks is nice and easy might
-still be pleasantly challenging for a human. For example, when
-solving Dominosa puzzles I frequently find myself using a variety of
-reasoning techniques that my solver doesn't know about; in
-principle, therefore, I should be able to solve the puzzle using
-only those techniques it \e{does} know about, but this would involve
-repeatedly searching the entire grid for the one simple deduction I
-can make. Computers are good at this sort of exhaustive search, but
-it's been my experience that human solvers prefer to do more complex
-deductions than to spend ages searching for simple ones. So in many
-cases I don't find my own playing experience to be limited by the
-restrictions on the solver.
-
-(This isn't \e{always} the case. Solo is a counter-example;
-generating Solo puzzles using a simple solver does lead to
-qualitatively easier puzzles. Therefore I had to make the Solo
-solver rather more advanced than most of them.)
-
-There are several different ways to apply a solver to the problem of
-generating a soluble puzzle. I list a few of them below.
-
-The simplest approach is brute force: randomly generate a puzzle,
-use the solver to see if it's soluble, and if not, throw it away and
-try again until you get lucky. This is often a viable technique if
-all else fails, but it tends not to scale well: for many puzzle
-types, the probability of finding a uniquely soluble instance
-decreases sharply as puzzle size goes up, so this technique might
-work reasonably fast for small puzzles but take (almost) forever at
-larger sizes. Still, if there's no other alternative it can be
-usable: Pattern and Dominosa both use this technique. (However,
-Dominosa has a means of tweaking the randomly generated grids to
-increase the \e{probability} of them being soluble, by ruling out
-one of the most common ambiguous cases. This improved generation
-speed by over a factor of 10 on the highest preset!)
-
-An approach which can be more scalable involves generating a grid
-and then tweaking it to make it soluble. This is the technique used
-by Mines and also by Net: first a random puzzle is generated, and
-then the solver is run to see how far it gets. Sometimes the solver
-will get stuck; when that happens, examine the area it's having
-trouble with, and make a small random change in that area to allow
-it to make more progress. Continue solving (possibly even without
-restarting the solver), tweaking as necessary, until the solver
-finishes. Then restart the solver from the beginning to ensure that
-the tweaks haven't caused new problems in the process of solving old
-ones (which can sometimes happen).
-
-This strategy works well in situations where the usual solver
-failure mode is to get stuck in an easily localised spot. Thus it
-works well for Net and Mines, whose most common failure mode tends
-to be that most of the grid is fine but there are a few widely
-separated ambiguous sections; but it would work less well for
-Dominosa, in which the way you get stuck is to have scoured the
-whole grid and not found anything you can deduce \e{anywhere}. Also,
-it relies on there being a low probability that tweaking the grid
-introduces a new problem at the same time as solving the old one;
-Mines and Net also have the property that most of their deductions
-are local, so that it's very unlikely for a tweak to affect
-something half way across the grid from the location where it was
-applied. In Dominosa, by contrast, a lot of deductions use
-information about half the grid (\q{out of all the sixes, only one
-is next to a three}, which can depend on the values of up to 32 of
-the 56 squares in the default setting!), so this tweaking strategy
-would be rather less likely to work well.
-
-A more specialised strategy is that used in Solo and Slant. These
-puzzles have the property that they derive their difficulty from not
-presenting all the available clues. (In Solo's case, if all the
-possible clues were provided then the puzzle would already be
-solved; in Slant it would still require user action to fill in the
-lines, but it would present no challenge at all). Therefore, a
-simple generation technique is to leave the decision of which clues
-to provide until the last minute. In other words, first generate a
-random \e{filled} grid with all possible clues present, and then
-gradually remove clues for as long as the solver reports that it's
-still soluble. Unlike the methods described above, this technique
-\e{cannot} fail \dash once you've got a filled grid, nothing can
-stop you from being able to convert it into a viable puzzle.
-However, it wouldn't even be meaningful to apply this technique to
-(say) Pattern, in which clues can never be left out, so the only way
-to affect the set of clues is by altering the solution.
-
-(Unfortunately, Solo is complicated by the need to provide puzzles
-at varying difficulty levels. It's easy enough to generate a puzzle
-of \e{at most} a given level of difficulty; you just have a solver
-with configurable intelligence, and you set it to a given level and
-apply the above technique, thus guaranteeing that the resulting grid
-is solvable by someone with at most that much intelligence. However,
-generating a puzzle of \e{at least} a given level of difficulty is
-rather harder; if you go for \e{at most} Intermediate level, you're
-likely to find that you've accidentally generated a Trivial grid a
-lot of the time, because removing just one number is sufficient to
-take the puzzle from Trivial straight to Ambiguous. In that
-situation Solo has no remaining options but to throw the puzzle away
-and start again.)
-
-A final strategy is to use the solver \e{during} puzzle
-construction: lay out a bit of the grid, run the solver to see what
-it allows you to deduce, and then lay out a bit more to allow the
-solver to make more progress. There are articles on the web that
-recommend constructing Sudoku puzzles by this method (which is
-completely the opposite way round to how Solo does it); for Sudoku
-it has the advantage that you get to specify your clue squares in
-advance (so you can have them make pretty patterns).
-
-Rectangles uses a strategy along these lines. First it generates a
-grid by placing the actual rectangles; then it has to decide where
-in each rectangle to place a number. It uses a solver to help it
-place the numbers in such a way as to ensure a unique solution. It
-does this by means of running a test solver, but it runs the solver
-\e{before} it's placed any of the numbers \dash which means the
-solver must be capable of coping with uncertainty about exactly
-where the numbers are! It runs the solver as far as it can until it
-gets stuck; then it narrows down the possible positions of a number
-in order to allow the solver to make more progress, and so on. Most
-of the time this process terminates with the grid fully solved, at
-which point any remaining number-placement decisions can be made at
-random from the options not so far ruled out. Note that unlike the
-Net/Mines tweaking strategy described above, this algorithm does not
-require a checking run after it completes: if it finishes
-successfully at all, then it has definitely produced a uniquely
-soluble puzzle.
-
-Most of the strategies described above are not 100% reliable. Each
-one has a failure rate: every so often it has to throw out the whole
-grid and generate a fresh one from scratch. (Solo's strategy would
-be the exception, if it weren't for the need to provide configurable
-difficulty levels.) Occasional failures are not a fundamental
-problem in this sort of work, however: it's just a question of
-dividing the grid generation time by the success rate (if it takes
-10ms to generate a candidate grid and 1/5 of them work, then it will
-take 50ms on average to generate a viable one), and seeing whether
-the expected time taken to \e{successfully} generate a puzzle is
-unacceptably slow. Dominosa's generator has a very low success rate
-(about 1 out of 20 candidate grids turn out to be usable, and if you
-think \e{that's} bad then go and look at the source code and find
-the comment showing what the figures were before the generation-time
-tweaks!), but the generator itself is very fast so this doesn't
-matter. Rectangles has a slower generator, but fails well under 50%
-of the time.
-
-So don't be discouraged if you have an algorithm that doesn't always
-work: if it \e{nearly} always works, that's probably good enough.
-The one place where reliability is important is that your algorithm
-must never produce false positives: it must not claim a puzzle is
-soluble when it isn't. It can produce false negatives (failing to
-notice that a puzzle is soluble), and it can fail to generate a
-puzzle at all, provided it doesn't do either so often as to become
-slow.
-
-One last piece of advice: for grid-based puzzles, when writing and
-testing your generation algorithm, it's almost always a good idea
-\e{not} to test it initially on a grid that's square (i.e.
-\cw{w==h}), because if the grid is square then you won't notice if
-you mistakenly write \c{h} instead of \c{w} (or vice versa)
-somewhere in the code. Use a rectangular grid for testing, and any
-size of grid will be likely to work after that.
-
-\S{writing-textformats} Designing textual description formats
-
-Another aspect of writing a puzzle which is worth putting some
-thought into is the design of the various text description formats:
-the format of the game parameter encoding, the game description
-encoding, and the move encoding.
-
-The first two of these should be reasonably intuitive for a user to
-type in; so provide some flexibility where possible. Suppose, for
-example, your parameter format consists of two numbers separated by
-an \c{x} to specify the grid dimensions (\c{10x10} or \c{20x15}),
-and then has some suffixes to specify other aspects of the game
-type. It's almost always a good idea in this situation to arrange
-that \cw{decode_params()} can handle the suffixes appearing in any
-order, even if \cw{encode_params()} only ever generates them in one
-order.
-
-These formats will also be expected to be reasonably stable: users
-will expect to be able to exchange game IDs with other users who
-aren't running exactly the same version of your game. So make them
-robust and stable: don't build too many assumptions into the game ID
-format which will have to be changed every time something subtle
-changes in the puzzle code.
-
-\H{writing-howto} Common how-to questions
-
-This section lists some common things people want to do when writing
-a puzzle, and describes how to achieve them within the Puzzles
-framework.
-
-\S{writing-howto-cursor} Drawing objects at only one position
-
-A common phenomenon is to have an object described in the
-\c{game_state} or the \c{game_ui} which can only be at one position.
-A cursor \dash probably specified in the \c{game_ui} \dash is a good
-example.
-
-In the \c{game_ui}, it would \e{obviously} be silly to have an array
-covering the whole game grid with a boolean flag stating whether the
-cursor was at each position. Doing that would waste space, would
-make it difficult to find the cursor in order to do anything with
-it, and would introduce the potential for synchronisation bugs in
-which you ended up with two cursors or none. The obviously sensible
-way to store a cursor in the \c{game_ui} is to have fields directly
-encoding the cursor's coordinates.
-
-However, it is a mistake to assume that the same logic applies to
-the \c{game_drawstate}. If you replicate the cursor position fields
-in the draw state, the redraw code will get very complicated. In the
-draw state, in fact, it \e{is} probably the right thing to have a
-cursor flag for every position in the grid. You probably have an
-array for the whole grid in the drawstate already (stating what is
-currently displayed in the window at each position); the sensible
-approach is to add a \q{cursor} flag to each element of that array.
-Then the main redraw loop will look something like this
-(pseudo-code):
-
-\c for (y = 0; y < h; y++) {
-\c     for (x = 0; x < w; x++) {
-\c         int value = state->symbol_at_position[y][x];
-\c         if (x == ui->cursor_x && y == ui->cursor_y)
-\c             value |= CURSOR;
-\c         if (ds->symbol_at_position[y][x] != value) {
-\c             symbol_drawing_subroutine(dr, ds, x, y, value);
-\c             ds->symbol_at_position[y][x] = value;
-\c         }
-\c     }
-\c }
-
-This loop is very simple, pretty hard to get wrong, and
-\e{automatically} deals both with erasing the previous cursor and
-drawing the new one, with no special case code required.
-
-This type of loop is generally a sensible way to write a redraw
-function, in fact. The best thing is to ensure that the information
-stored in the draw state for each position tells you \e{everything}
-about what was drawn there. A good way to ensure that is to pass
-precisely the same information, and \e{only} that information, to a
-subroutine that does the actual drawing; then you know there's no
-additional information which affects the drawing but which you don't
-notice changes in.
-
-\S{writing-keyboard-cursor} Implementing a keyboard-controlled cursor
-
-It is often useful to provide a keyboard control method in a
-basically mouse-controlled game. A keyboard-controlled cursor is
-best implemented by storing its location in the \c{game_ui} (since
-if it were in the \c{game_state} then the user would have to
-separately undo every cursor move operation). So the procedure would
-be:
-
-\b Put cursor position fields in the \c{game_ui}.
-
-\b \cw{interpret_move()} responds to arrow keys by modifying the
-cursor position fields and returning \cw{""}.
-
-\b \cw{interpret_move()} responds to some sort of fire button by
-actually performing a move based on the current cursor location.
-
-\b You might want an additional \c{game_ui} field stating whether
-the cursor is currently visible, and having it disappear when a
-mouse action occurs (so that it doesn't clutter the display when not
-actually in use).
-
-\b You might also want to automatically hide the cursor in
-\cw{changed_state()} when the current game state changes to one in
-which there is no move to make (which is the case in some types of
-completed game).
-
-\b \cw{redraw()} draws the cursor using the technique described in
-\k{writing-howto-cursor}.
-
-\S{writing-howto-dragging} Implementing draggable sprites
-
-Some games have a user interface which involves dragging some sort
-of game element around using the mouse. If you need to show a
-graphic moving smoothly over the top of other graphics, use a
-blitter (see \k{drawing-blitter} for the blitter API) to save the
-background underneath it. The typical scenario goes:
-
-\b Have a blitter field in the \c{game_drawstate}.
-
-\b Set the blitter field to \cw{NULL} in the game's
-\cw{new_drawstate()} function, since you don't yet know how big the
-piece of saved background needs to be.
-
-\b In the game's \cw{set_size()} function, once you know the size of
-the object you'll be dragging around the display and hence the
-required size of the blitter, actually allocate the blitter.
-
-\b In \cw{free_drawstate()}, free the blitter if it's not \cw{NULL}.
-
-\b In \cw{interpret_move()}, respond to mouse-down and mouse-drag
-events by updating some fields in the \cw{game_ui} which indicate
-that a drag is in progress.
-
-\b At the \e{very end} of \cw{redraw()}, after all other drawing has
-been done, draw the moving object if there is one. First save the
-background under the object in the blitter; then set a clip
-rectangle covering precisely the area you just saved (just in case
-anti-aliasing or some other error causes your drawing to go beyond
-the area you saved). Then draw the object, and call \cw{unclip()}.
-Finally, set a flag in the \cw{game_drawstate} that indicates that
-the blitter needs restoring.
-
-\b At the very start of \cw{redraw()}, before doing anything else at
-all, check the flag in the \cw{game_drawstate}, and if it says the
-blitter needs restoring then restore it. (Then clear the flag, so
-that this won't happen again in the next redraw if no moving object
-is drawn this time.)
-
-This way, you will be able to write the rest of the redraw function
-completely ignoring the dragged object, as if it were floating above
-your bitmap and being completely separate.
-
-\S{writing-ref-counting} Sharing large invariant data between all
-game states
-
-In some puzzles, there is a large amount of data which never changes
-between game states. The array of numbers in Dominosa is a good
-example.
-
-You \e{could} dynamically allocate a copy of that array in every
-\c{game_state}, and have \cw{dup_game()} make a fresh copy of it for
-every new \c{game_state}; but it would waste memory and time. A
-more efficient way is to use a reference-counted structure.
-
-\b Define a structure type containing the data in question, and also
-containing an integer reference count.
-
-\b Have a field in \c{game_state} which is a pointer to this
-structure.
-
-\b In \cw{new_game()}, when creating a fresh game state at the start
-of a new game, create an instance of this structure, initialise it
-with the invariant data, and set its reference count to 1.
-
-\b In \cw{dup_game()}, rather than making a copy of the structure
-for the new game state, simply set the new game state to point at
-the same copy of the structure, and increment its reference count.
-
-\b In \cw{free_game()}, decrement the reference count in the
-structure pointed to by the game state; if the count reaches zero,
-free the structure.
-
-This way, the invariant data will persist for only as long as it's
-genuinely needed; \e{as soon} as the last game state for a
-particular puzzle instance is freed, the invariant data for that
-puzzle will vanish as well. Reference counting is a very efficient
-form of garbage collection, when it works at all. (Which it does in
-this instance, of course, because there's no possibility of circular
-references.)
-
-\S{writing-flash-types} Implementing multiple types of flash
-
-In some games you need to flash in more than one different way.
-Mines, for example, flashes white when you win, and flashes red when
-you tread on a mine and die.
-
-The simple way to do this is:
-
-\b Have a field in the \c{game_ui} which describes the type of flash.
-
-\b In \cw{flash_length()}, examine the old and new game states to
-decide whether a flash is required and what type. Write the type of
-flash to the \c{game_ui} field whenever you return non-zero.
-
-\b In \cw{redraw()}, when you detect that \c{flash_time} is
-non-zero, examine the field in \c{game_ui} to decide which type of
-flash to draw.
-
-\cw{redraw()} will never be called with \c{flash_time} non-zero
-unless \cw{flash_length()} was first called to tell the mid-end that
-a flash was required; so whenever \cw{redraw()} notices that
-\c{flash_time} is non-zero, you can be sure that the field in
-\c{game_ui} is correctly set.
-
-\S{writing-move-anim} Animating game moves
-
-A number of puzzle types benefit from a quick animation of each move
-you make.
-
-For some games, such as Fifteen, this is particularly easy. Whenever
-\cw{redraw()} is called with \c{oldstate} non-\cw{NULL}, Fifteen
-simply compares the position of each tile in the two game states,
-and if the tile is not in the same place then it draws it some
-fraction of the way from its old position to its new position. This
-method copes automatically with undo.
-
-Other games are less obvious. In Sixteen, for example, you can't
-just draw each tile a fraction of the way from its old to its new
-position: if you did that, the end tile would zip very rapidly past
-all the others to get to the other end and that would look silly.
-(Worse, it would look inconsistent if the end tile was drawn on top
-going one way and on the bottom going the other way.)
-
-A useful trick here is to define a field or two in the game state
-that indicates what the last move was.
-
-\b Add a \q{last move} field to the \c{game_state} (or two or more
-fields if the move is complex enough to need them).
-
-\b \cw{new_game()} initialises this field to a null value for a new
-game state.
-
-\b \cw{execute_move()} sets up the field to reflect the move it just
-performed.
-
-\b \cw{redraw()} now needs to examine its \c{dir} parameter. If
-\c{dir} is positive, it determines the move being animated by
-looking at the last-move field in \c{newstate}; but if \c{dir} is
-negative, it has to look at the last-move field in \c{oldstate}, and
-invert whatever move it finds there.
-
-Note also that Sixteen needs to store the \e{direction} of the move,
-because you can't quite determine it by examining the row or column
-in question. You can in almost all cases, but when the row is
-precisely two squares long it doesn't work since a move in either
-direction looks the same. (You could argue that since moving a
-2-element row left and right has the same effect, it doesn't matter
-which one you animate; but in fact it's very disorienting to click
-the arrow left and find the row moving right, and almost as bad to
-undo a move to the right and find the game animating \e{another}
-move to the right.)
-
-\S{writing-conditional-anim} Animating drag operations
-
-In Untangle, moves are made by dragging a node from an old position
-to a new position. Therefore, at the time when the move is initially
-made, it should not be animated, because the node has already been
-dragged to the right place and doesn't need moving there. However,
-it's nice to animate the same move if it's later undone or redone.
-This requires a bit of fiddling.
-
-The obvious approach is to have a flag in the \c{game_ui} which
-inhibits move animation, and to set that flag in
-\cw{interpret_move()}. The question is, when would the flag be reset
-again? The obvious place to do so is \cw{changed_state()}, which
-will be called once per move. But it will be called \e{before}
-\cw{anim_length()}, so if it resets the flag then \cw{anim_length()}
-will never see the flag set at all.
-
-The solution is to have \e{two} flags in a queue.
-
-\b Define two flags in \c{game_ui}; let's call them \q{current} and
-\q{next}.
-
-\b Set both to \cw{FALSE} in \c{new_ui()}.
-
-\b When a drag operation completes in \cw{interpret_move()}, set the
-\q{next} flag to \cw{TRUE}.
-
-\b Every time \cw{changed_state()} is called, set the value of
-\q{current} to the value in \q{next}, and then set the value of
-\q{next} to \cw{FALSE}.
-
-\b That way, \q{current} will be \cw{TRUE} \e{after} a call to
-\cw{changed_state()} if and only if that call to
-\cw{changed_state()} was the result of a drag operation processed by
-\cw{interpret_move()}. Any other call to \cw{changed_state()}, due
-to an Undo or a Redo or a Restart or a Solve, will leave \q{current}
-\cw{FALSE}.
-
-\b So now \cw{anim_length()} can request a move animation if and
-only if the \q{current} flag is \e{not} set.
-
-\S{writing-cheating} Inhibiting the victory flash when Solve is used
-
-Many games flash when you complete them, as a visual congratulation
-for having got to the end of the puzzle. It often seems like a good
-idea to disable that flash when the puzzle is brought to a solved
-state by means of the Solve operation.
-
-This is easily done:
-
-\b Add a \q{cheated} flag to the \c{game_state}.
-
-\b Set this flag to \cw{FALSE} in \cw{new_game()}.
-
-\b Have \cw{solve()} return a move description string which clearly
-identifies the move as a solve operation.
-
-\b Have \cw{execute_move()} respond to that clear identification by
-setting the \q{cheated} flag in the returned \c{game_state}. The
-flag will then be propagated to all subsequent game states, even if
-the user continues fiddling with the game after it is solved.
-
-\b \cw{flash_length()} now returns non-zero if \c{oldstate} is not
-completed and \c{newstate} is, \e{and} neither state has the
-\q{cheated} flag set.
-
-\H{writing-testing} Things to test once your puzzle is written
-
-Puzzle implementations written in this framework are self-testing as
-far as I could make them.
-
-Textual game and move descriptions, for example, are generated and
-parsed as part of the normal process of play. Therefore, if you can
-make moves in the game \e{at all} you can be reasonably confident
-that the mid-end serialisation interface will function correctly and
-you will be able to save your game. (By contrast, if I'd stuck with
-a single \cw{make_move()} function performing the jobs of both
-\cw{interpret_move()} and \cw{execute_move()}, and had separate
-functions to encode and decode a game state in string form, then
-those functions would not be used during normal play; so they could
-have been completely broken, and you'd never know it until you tried
-to save the game \dash which would have meant you'd have to test
-game saving \e{extensively} and make sure to test every possible
-type of game state. As an added bonus, doing it the way I did leads
-to smaller save files.)
-
-There is one exception to this, which is the string encoding of the
-\c{game_ui}. Most games do not store anything permanent in the
-\c{game_ui}, and hence do not need to put anything in its encode and
-decode functions; but if there is anything in there, you do need to
-test game loading and saving to ensure those functions work
-properly.
-
-It's also worth testing undo and redo of all operations, to ensure
-that the redraw and the animations (if any) work properly. Failing
-to animate undo properly seems to be a common error.
-
-Other than that, just use your common sense.
diff --git a/apps/plugins/puzzles/src/divvy.c b/apps/plugins/puzzles/src/divvy.c
index ea018010cf..61b04eb80d 100644
--- a/apps/plugins/puzzles/src/divvy.c
+++ b/apps/plugins/puzzles/src/divvy.c
@@ -260,9 +260,10 @@ static bool addremcommon(int w, int h, int x, int y, int *own, int val)
  * In both of the above suggested use cases, the user would
  * probably want w==h==k, but that isn't a requirement.
  */
-static int *divvy_internal(int w, int h, int k, random_state *rs)
+DSF *divvy_rectangle_attempt(int w, int h, int k, random_state *rs)
 {
-    int *order, *queue, *tmp, *own, *sizes, *addable, *retdsf;
+    int *order, *queue, *tmp, *own, *sizes, *addable;
+    DSF *retdsf, *tmpdsf;
     bool *removable;
     int wh = w*h;
     int i, j, n, x, y, qhead, qtail;
@@ -277,6 +278,7 @@ static int *divvy_internal(int w, int h, int k, random_state *rs)
     queue = snewn(n, int);
     addable = snewn(wh*4, int);
     removable = snewn(wh, bool);
+    retdsf = tmpdsf = NULL;
 
     /*
      * Permute the grid squares into a random order, which will be
@@ -609,7 +611,7 @@ static int *divvy_internal(int w, int h, int k, random_state *rs)
         assert(own[i] >= 0 && own[i] < n);
         tmp[own[i]] = i;
     }
-    retdsf = snew_dsf(wh);
+    retdsf = dsf_new(wh);
     for (i = 0; i < wh; i++) {
         dsf_merge(retdsf, i, tmp[own[i]]);
     }
@@ -619,18 +621,18 @@ static int *divvy_internal(int w, int h, int k, random_state *rs)
      * the ominoes really are k-ominoes and we haven't
      * accidentally split one into two disconnected pieces.
      */
-    dsf_init(tmp, wh);
+    tmpdsf = dsf_new(wh);
     for (y = 0; y < h; y++)
         for (x = 0; x+1 < w; x++)
             if (own[y*w+x] == own[y*w+(x+1)])
-                dsf_merge(tmp, y*w+x, y*w+(x+1));
+                dsf_merge(tmpdsf, y*w+x, y*w+(x+1));
     for (x = 0; x < w; x++)
         for (y = 0; y+1 < h; y++)
             if (own[y*w+x] == own[(y+1)*w+x])
-                dsf_merge(tmp, y*w+x, (y+1)*w+x);
+                dsf_merge(tmpdsf, y*w+x, (y+1)*w+x);
     for (i = 0; i < wh; i++) {
         j = dsf_canonify(retdsf, i);
-        assert(dsf_canonify(tmp, j) == dsf_canonify(tmp, i));
+        assert(dsf_equivalent(tmpdsf, j, i));
     }
 
     cleanup:
@@ -640,6 +642,7 @@ static int *divvy_internal(int w, int h, int k, random_state *rs)
      */
     sfree(order);
     sfree(tmp);
+    dsf_free(tmpdsf);
     sfree(own);
     sfree(sizes);
     sfree(queue);
@@ -652,131 +655,13 @@ static int *divvy_internal(int w, int h, int k, random_state *rs)
     return retdsf;
 }
 
-#ifdef TESTMODE
-static int fail_counter = 0;
-#endif
-
-int *divvy_rectangle(int w, int h, int k, random_state *rs)
+DSF *divvy_rectangle(int w, int h, int k, random_state *rs)
 {
-    int *ret;
+    DSF *ret;
 
     do {
-        ret = divvy_internal(w, h, k, rs);
-
-#ifdef TESTMODE
-        if (!ret)
-            fail_counter++;
-#endif
-
+        ret = divvy_rectangle_attempt(w, h, k, rs);
     } while (!ret);
 
     return ret;
 }
-
-#ifdef TESTMODE
-
-/*
- * gcc -g -O0 -DTESTMODE -I.. -o divvy divvy.c ../random.c ../malloc.c ../dsf.c ../misc.c ../nullfe.c
- * 
- * or to debug
- * 
- * gcc -g -O0 -DDIVVY_DIAGNOSTICS -DTESTMODE -I.. -o divvy divvy.c ../random.c ../malloc.c ../dsf.c ../misc.c ../nullfe.c
- */
-
-int main(int argc, char **argv)
-{
-    int *dsf;
-    int i;
-    int w = 9, h = 4, k = 6, tries = 100;
-    random_state *rs;
-
-    rs = random_new("123456", 6);
-
-    if (argc > 1)
-        w = atoi(argv[1]);
-    if (argc > 2)
-        h = atoi(argv[2]);
-    if (argc > 3)
-        k = atoi(argv[3]);
-    if (argc > 4)
-        tries = atoi(argv[4]);
-
-    for (i = 0; i < tries; i++) {
-        int x, y;
-
-        dsf = divvy_rectangle(w, h, k, rs);
-        assert(dsf);
-
-        for (y = 0; y <= 2*h; y++) {
-            for (x = 0; x <= 2*w; x++) {
-                int miny = y/2 - 1, maxy = y/2;
-                int minx = x/2 - 1, maxx = x/2;
-                int classes[4], tx, ty;
-                for (ty = 0; ty < 2; ty++)
-                    for (tx = 0; tx < 2; tx++) {
-                        int cx = minx+tx, cy = miny+ty;
-                        if (cx < 0 || cx >= w || cy < 0 || cy >= h)
-                            classes[ty*2+tx] = -1;
-                        else
-                            classes[ty*2+tx] = dsf_canonify(dsf, cy*w+cx);
-                    }
-                switch (y%2 * 2 + x%2) {
-                  case 0:              /* corner */
-                    /*
-                     * Cases for the corner:
-                     *
-                     *  - if all four surrounding squares belong
-                     *    to the same omino, we print a space.
-                     *
-                     *  - if the top two are the same and the
-                     *    bottom two are the same, we print a
-                     *    horizontal line.
-                     *
-                     *  - if the left two are the same and the
-                     *    right two are the same, we print a
-                     *    vertical line.
-                     *
-                     *  - otherwise, we print a cross.
-                     */
-                    if (classes[0] == classes[1] &&
-                        classes[1] == classes[2] &&
-                        classes[2] == classes[3])
-                        printf(" ");
-                    else if (classes[0] == classes[1] &&
-                             classes[2] == classes[3])
-                        printf("-");
-                    else if (classes[0] == classes[2] &&
-                             classes[1] == classes[3])
-                        printf("|");
-                    else
-                        printf("+");
-                    break;
-                  case 1:              /* horiz edge */
-                    if (classes[1] == classes[3])
-                        printf("  ");
-                    else
-                        printf("--");
-                    break;
-                  case 2:              /* vert edge */
-                    if (classes[2] == classes[3])
-                        printf(" ");
-                    else
-                        printf("|");
-                    break;
-                  case 3:              /* square centre */
-                    printf("  ");
-                    break;
-                }
-            }
-            printf("\n");
-        }
-        printf("\n");
-        sfree(dsf);
-    }
-
-    printf("%d retries needed for %d successes\n", fail_counter, tries);
-
-    return 0;
-}
-
-#endif
diff --git a/apps/plugins/puzzles/src/dominosa.R b/apps/plugins/puzzles/src/dominosa.R
deleted file mode 100644
index b85e7dc1e0..0000000000
--- a/apps/plugins/puzzles/src/dominosa.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-DOMINOSA_EXTRA = laydomino dsf sort findloop
-
-dominosa : [X] GTK COMMON dominosa DOMINOSA_EXTRA dominosa-icon|no-icon
-
-dominosa : [G] WINDOWS COMMON dominosa DOMINOSA_EXTRA dominosa.res|noicon.res
-
-ALL += dominosa[COMBINED] DOMINOSA_EXTRA
-
-dominosasolver :   [U] dominosa[STANDALONE_SOLVER] DOMINOSA_EXTRA STANDALONE
-dominosasolver :   [C] dominosa[STANDALONE_SOLVER] DOMINOSA_EXTRA STANDALONE
-
-!begin am gtk
-GAMES += dominosa
-!end
-
-!begin >list.c
-    A(dominosa) \
-!end
-
-!begin >gamedesc.txt
-dominosa:dominosa.exe:Dominosa:Domino tiling puzzle:Tile the rectangle with a full set of dominoes.
-!end
diff --git a/apps/plugins/puzzles/src/dominosa.c b/apps/plugins/puzzles/src/dominosa.c
index 758db4f506..3ac723e6e1 100644
--- a/apps/plugins/puzzles/src/dominosa.c
+++ b/apps/plugins/puzzles/src/dominosa.c
@@ -47,7 +47,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -243,6 +248,10 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->n < 1)
         return "Maximum face number must be at least one";
+    if (params->n > INT_MAX - 2 ||
+        params->n + 2 > INT_MAX / (params->n + 1))
+        return "Maximum face number must not be unreasonably large";
+
     if (params->diff >= DIFFCOUNT)
         return "Unknown difficulty rating";
     return NULL;
@@ -254,9 +263,9 @@ static const char *validate_params(const game_params *params, bool full)
 
 #ifdef STANDALONE_SOLVER
 #define SOLVER_DIAGNOSTICS
-bool solver_diagnostics = false;
+static bool solver_diagnostics = false;
 #elif defined SOLVER_DIAGNOSTICS
-const bool solver_diagnostics = true;
+static const bool solver_diagnostics = true;
 #endif
 
 struct solver_domino;
@@ -342,6 +351,7 @@ struct solver_scratch {
     struct findloopstate *fls;
     bool squares_by_number_initialised;
     int *wh_scratch, *pc_scratch, *pc_scratch2, *dc_scratch;
+    DSF *dsf_scratch;
 };
 
 static struct solver_scratch *solver_make_scratch(int n)
@@ -473,6 +483,7 @@ static struct solver_scratch *solver_make_scratch(int n)
     sc->wh_scratch = NULL;
     sc->pc_scratch = sc->pc_scratch2 = NULL;
     sc->dc_scratch = NULL;
+    sc->dsf_scratch = NULL;
 
     return sc;
 }
@@ -500,6 +511,7 @@ static void solver_free_scratch(struct solver_scratch *sc)
     sfree(sc->pc_scratch);
     sfree(sc->pc_scratch2);
     sfree(sc->dc_scratch);
+    dsf_free(sc->dsf_scratch);
     sfree(sc);
 }
 
@@ -925,7 +937,7 @@ struct parity_findloop_ctx {
     int i;
 };
 
-int parity_neighbour(int vertex, void *vctx)
+static int parity_neighbour(int vertex, void *vctx)
 {
     struct parity_findloop_ctx *ctx = (struct parity_findloop_ctx *)vctx;
     struct solver_placement *p;
@@ -1416,21 +1428,23 @@ static bool deduce_forcing_chain(struct solver_scratch *sc)
         sc->pc_scratch2 = snewn(sc->pc, int);
     if (!sc->dc_scratch)
         sc->dc_scratch = snewn(sc->dc, int);
+    if (!sc->dsf_scratch)
+        sc->dsf_scratch = dsf_new_flip(sc->pc);
 
     /*
      * Start by identifying chains of placements which must all occur
      * together if any of them occurs. We do this by making
-     * pc_scratch2 an edsf binding the placements into an equivalence
+     * dsf_scratch a flip dsf binding the placements into an equivalence
      * class for each entire forcing chain, with the two possible sets
      * of dominoes for the chain listed as inverses.
      */
-    dsf_init(sc->pc_scratch2, sc->pc);
+    dsf_reinit(sc->dsf_scratch);
     for (si = 0; si < sc->wh; si++) {
         struct solver_square *sq = &sc->squares[si];
         if (sq->nplacements == 2)
-            edsf_merge(sc->pc_scratch2,
-                       sq->placements[0]->index,
-                       sq->placements[1]->index, true);
+            dsf_merge_flip(sc->dsf_scratch,
+                           sq->placements[0]->index,
+                           sq->placements[1]->index, true);
     }
     /*
      * Now read out the whole dsf into pc_scratch, flattening its
@@ -1443,7 +1457,7 @@ static bool deduce_forcing_chain(struct solver_scratch *sc)
      */
     for (pi = 0; pi < sc->pc; pi++) {
         bool inv;
-        int c = edsf_canonify(sc->pc_scratch2, pi, &inv);
+        int c = dsf_canonify_flip(sc->dsf_scratch, pi, &inv);
         sc->pc_scratch[pi] = c * 2 + (inv ? 1 : 0);
     }
 
@@ -2708,7 +2722,7 @@ static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->highlight_1 = ui->highlight_2 = -1;
     return ui;
 }
@@ -2718,15 +2732,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
@@ -2734,6 +2739,33 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
         ui->cur_visible = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button)) {
+        int d1, d2, w = state->w;
+
+        if (!((ui->cur_x ^ ui->cur_y) & 1))
+            return "";         /* must have exactly one dimension odd */
+        d1 = (ui->cur_y / 2) * w + (ui->cur_x / 2);
+        d2 = ((ui->cur_y+1) / 2) * w + ((ui->cur_x+1) / 2);
+
+        /* We can't mark an edge next to any domino. */
+        if (button == CURSOR_SELECT2 &&
+            (state->grid[d1] != d1 || state->grid[d2] != d2))
+            return "";
+        if (button == CURSOR_SELECT) {
+            if (state->grid[d1] == d2) return "Remove";
+            return "Place";
+        } else {
+            int edge = d2 == d1 + 1 ? EDGE_R : EDGE_B;
+            if (state->edges[d1] & edge) return "Remove";
+            return "Line";
+        }
+    }
+    return "";
+}
+
 #define PREFERRED_TILESIZE 32
 #define TILESIZE (ds->tilesize)
 #define BORDER (TILESIZE * 3 / 4)
@@ -2746,7 +2778,6 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 #define FROMCOORD(x) ( ((x) - BORDER + TILESIZE) / TILESIZE - 1 )
 
 struct game_drawstate {
-    bool started;
     int w, h, tilesize;
     unsigned long *visible;
 };
@@ -2768,7 +2799,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         int d1, d2;
 
         if (tx < 0 || tx >= w || ty < 0 || ty >= h)
-            return NULL;
+            return MOVE_UNUSED;
 
         /*
          * Now we know which square the click was in, decide which
@@ -2786,29 +2817,26 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         else if (abs(dy) > abs(dx) && dy > 0 && ty+1 < h)
             d1 = t, d2 = t + w;        /* clicked in top half of domino */
         else
-            return NULL;
+            return MOVE_NO_EFFECT;     /* clicked precisely on a diagonal */
 
         /*
          * We can't mark an edge next to any domino.
          */
         if (button == RIGHT_BUTTON &&
             (state->grid[d1] != d1 || state->grid[d2] != d2))
-            return NULL;
+            return MOVE_NO_EFFECT;
 
         ui->cur_visible = false;
         sprintf(buf, "%c%d,%d", (int)(button == RIGHT_BUTTON ? 'E' : 'D'), d1, d2);
         return dupstr(buf);
     } else if (IS_CURSOR_MOVE(button)) {
-        ui->cur_visible = true;
-
-        move_cursor(button, &ui->cur_x, &ui->cur_y, 2*w-1, 2*h-1, false);
-
-        return UI_UPDATE;
+        return move_cursor(button, &ui->cur_x, &ui->cur_y, 2*w-1, 2*h-1, false,
+                    &ui->cur_visible);
     } else if (IS_CURSOR_SELECT(button)) {
         int d1, d2;
 
         if (!((ui->cur_x ^ ui->cur_y) & 1))
-            return NULL;               /* must have exactly one dimension odd */
+            return MOVE_NO_EFFECT; /* must have exactly one dimension odd */
         d1 = (ui->cur_y / 2) * w + (ui->cur_x / 2);
         d2 = ((ui->cur_y+1) / 2) * w + ((ui->cur_x+1) / 2);
 
@@ -2817,14 +2845,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
          */
         if (button == CURSOR_SELECT2 &&
             (state->grid[d1] != d1 || state->grid[d2] != d2))
-            return NULL;
+            return MOVE_NO_EFFECT;
 
         sprintf(buf, "%c%d,%d", (int)(button == CURSOR_SELECT2 ? 'E' : 'D'), d1, d2);
         return dupstr(buf);
     } else if (isdigit(button)) {
         int n = state->params.n, num = button - '0';
         if (num > n) {
-            return NULL;
+            return MOVE_UNUSED;
         } else if (ui->highlight_1 == num) {
             ui->highlight_1 = -1;
         } else if (ui->highlight_2 == num) {
@@ -2834,12 +2862,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         } else if (ui->highlight_2 == -1) {
             ui->highlight_2 = num;
         } else {
-            return NULL;
+            return MOVE_NO_EFFECT;
         }
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -2865,7 +2893,8 @@ static game_state *execute_move(const game_state *state, const char *move)
             move++;
         } else if (move[0] == 'D' &&
                    sscanf(move+1, "%d,%d%n", &d1, &d2, &p) == 2 &&
-                   d1 >= 0 && d1 < wh && d2 >= 0 && d2 < wh && d1 < d2) {
+                   d1 >= 0 && d1 < wh && d2 >= 0 && d2 < wh && d1 < d2 &&
+                   (d2 - d1 == 1 || d2 - d1 == w)) {
 
             /*
              * Toggle domino presence between d1 and d2.
@@ -2933,7 +2962,8 @@ static game_state *execute_move(const game_state *state, const char *move)
         } else if (move[0] == 'E' &&
                    sscanf(move+1, "%d,%d%n", &d1, &d2, &p) == 2 &&
                    d1 >= 0 && d1 < wh && d2 >= 0 && d2 < wh && d1 < d2 &&
-                   ret->grid[d1] == d1 && ret->grid[d2] == d2) {
+                   ret->grid[d1] == d1 && ret->grid[d2] == d2 &&
+                   (d2 - d1 == 1 || d2 - d1 == w)) {
 
             /*
              * Toggle edge presence between d1 and d2.
@@ -2998,7 +3028,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     int n = params->n, w = n+2, h = n+1;
 
@@ -3059,7 +3089,6 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     struct game_drawstate *ds = snew(struct game_drawstate);
     int i;
 
-    ds->started = false;
     ds->w = state->w;
     ds->h = state->h;
     ds->visible = snewn(ds->w * ds->h, unsigned long);
@@ -3225,14 +3254,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int x, y, i;
     unsigned char *used;
 
-    if (!ds->started) {
-        int pw, ph;
-        game_compute_size(&state->params, TILESIZE, &pw, &ph);
-        draw_rect(dr, 0, 0, pw, ph, COL_BACKGROUND);
-        draw_update(dr, 0, 0, pw, ph);
-        ds->started = true;
-    }
-
     /*
      * See how many dominoes of each type there are, so we can
      * highlight clashes in red.
@@ -3347,24 +3368,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->w, h = state->h;
     int c, x, y;
@@ -3421,12 +3439,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_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,
@@ -3440,7 +3460,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/draw-poly.c b/apps/plugins/puzzles/src/draw-poly.c
new file mode 100644
index 0000000000..d4c9975d97
--- /dev/null
+++ b/apps/plugins/puzzles/src/draw-poly.c
@@ -0,0 +1,302 @@
+/*
+ * draw-poly.c: Fallback polygon drawing function.
+ */
+
+#include <assert.h>
+
+#include "puzzles.h"
+
+struct edge {
+    int x1, y1;
+    int x2, y2;
+    bool active;
+
+    /* whether y1 is a closed endpoint (i.e. this edge should be
+     * active when y == y1) */
+    bool closed_y1;
+
+    /* (x2 - x1) / (y2 - y1) as 16.16 signed fixed point; precomputed
+     * for speed */
+    long inverse_slope;
+};
+
+#define FRACBITS 16
+#define ONEHALF (1 << (FRACBITS-1))
+
+void draw_polygon_fallback(drawing *dr, const int *coords, int npoints,
+                           int fillcolour, int outlinecolour)
+{
+    struct edge *edges;
+    int min_y = INT_MAX, max_y = INT_MIN, i, y;
+    int n_edges = 0;
+    int *intersections;
+
+    if(npoints < 3)
+        return;
+
+    if(fillcolour < 0)
+        goto draw_outline;
+
+    /* This uses a basic scanline rasterization algorithm for polygon
+     * filling. First, an "edge table" is constructed for each pair of
+     * neighboring points. Horizontal edges are excluded. Then, the
+     * algorithm iterates a horizontal "scan line" over the vertical
+     * (Y) extent of the polygon. At each Y level, it maintains a set
+     * of "active" edges, which are those which intersect the scan
+     * line at the current Y level. The X coordinates where the scan
+     * line intersects each active edge are then computed via
+     * fixed-point arithmetic and stored. Finally, horizontal lines
+     * are drawn between each successive pair of intersection points,
+     * in the order of ascending X coordinate. This has the effect of
+     * "even-odd" filling when the polygon is self-intersecting.
+     *
+     * I (vaguely) based this implementation off the slides below:
+     *
+     * https://www.khoury.northeastern.edu/home/fell/CS4300/Lectures/CS4300F2012-9-ScanLineFill.pdf
+     *
+     * I'm fairly confident that this current implementation is
+     * correct (i.e. draws the right polygon, free from artifacts),
+     * but it isn't quite as efficient as it could be. Namely, it
+     * currently maintains the active edge set by setting the `active`
+     * flag in the `edge` array, which is quite inefficient. Perhaps
+     * future optimization could see this replaced with a tree
+     * set. Additionally, one could perhaps replace the current linear
+     * search for edge endpoints (i.e. the inner loop over `edges`) by
+     * sorting the edge table by upper and lower Y coordinate.
+     *
+     * A final caveat comes from the use of fixed point arithmetic,
+     * which is motivated by performance considerations on FPU-less
+     * platforms (e.g. most Rockbox devices, and maybe others?). I'm
+     * currently using 16 fractional bits to compute the edge
+     * intersections, which (in the case of a 32-bit int) limits the
+     * acceptable range of coordinates to roughly (-2^14, +2^14). This
+     * ought to be acceptable for the forseeable future, but
+     * ultra-high DPI screens might one day exceed this. In that case,
+     * options include switching to int64_t (but that comes with its
+     * own portability headaches), reducing the number of fractional
+     * bits, or just giving up and using floating point.
+     */
+
+    /* Build edge table from coords. Horizontal edges are filtered
+     * out, so n_edges <= n_points in general. */
+    edges = smalloc(npoints * sizeof(struct edge));
+
+    for(i = 0; i < npoints; i++) {
+        int x1, y1, x2, y2;
+
+        x1 = coords[(2*i+0)];
+        y1 = coords[(2*i+1)];
+        x2 = coords[(2*i+2) % (npoints * 2)];
+        y2 = coords[(2*i+3) % (npoints * 2)];
+
+        if(y1 < min_y)
+            min_y = y1;
+        if(y1 > max_y)
+            max_y = y1;
+
+#define COORD_LIMIT (1<<(sizeof(int)*CHAR_BIT-2 - FRACBITS))
+        /* Prevent integer overflow when computing `inverse_slope',
+         * which shifts the coordinates left by FRACBITS, and for
+         * which we'd like to avoid relying on `long long'. */
+        /* If this ever causes issues, see the above comment about
+           possible solutions. */
+        assert(x1 < COORD_LIMIT && y1 < COORD_LIMIT);
+
+        /* Only create non-horizontal edges, and require y1 < y2. */
+        if(y1 != y2) {
+            bool swap = y1 > y2;
+            int lower_endpoint = swap ? (i + 1) : i;
+
+            /* Compute index of the point adjacent to lower end of
+             * this edge (which is not the upper end of this edge). */
+            int lower_neighbor = swap ? (lower_endpoint + 1) % npoints : (lower_endpoint + npoints - 1) % npoints;
+
+            struct edge *edge = edges + (n_edges++);
+
+            edge->active = false;
+            edge->x1 = swap ? x2 : x1;
+            edge->y1 = swap ? y2 : y1;
+            edge->x2 = swap ? x1 : x2;
+            edge->y2 = swap ? y1 : y2;
+            edge->inverse_slope = ((edge->x2 - edge->x1) << FRACBITS) / (edge->y2 - edge->y1);
+            edge->closed_y1 = edge->y1 < coords[2*lower_neighbor+1];
+        }
+    }
+
+    /* a generous upper bound on number of intersections is n_edges */
+    intersections = smalloc(n_edges * sizeof(int));
+
+    for(y = min_y; y <= max_y; y++) {
+        int n_intersections = 0;
+        for(i = 0; i < n_edges; i++) {
+            struct edge *edge = edges + i;
+            /* Update active edge set. These conditions are mutually
+             * exclusive because of the invariant that y1 < y2. */
+            if(edge->y1 + (edge->closed_y1 ? 0 : 1) == y)
+                edge->active = true;
+            else if(edge->y2 + 1 == y)
+                edge->active = false;
+
+            if(edge->active) {
+                int x = edges[i].x1;
+                x += (edges[i].inverse_slope * (y - edges[i].y1) + ONEHALF) >> FRACBITS;
+                intersections[n_intersections++] = x;
+            }
+        }
+
+        qsort(intersections, n_intersections, sizeof(int), compare_integers);
+
+        assert(n_intersections % 2 == 0);
+        assert(n_intersections <= n_edges);
+
+        /* Draw horizontal lines between successive pairs of
+         * intersections of the scanline with active edges. */
+        for(i = 0; i + 1 < n_intersections; i += 2) {
+            draw_line(dr,
+                      intersections[i], y,
+                      intersections[i+1], y,
+                      fillcolour);
+        }
+    }
+
+    sfree(intersections);
+    sfree(edges);
+
+draw_outline:
+    assert(outlinecolour >= 0);
+    for (i = 0; i < 2 * npoints; i += 2)
+        draw_line(dr,
+                  coords[i], coords[i+1],
+                  coords[(i+2)%(2*npoints)], coords[(i+3)%(2*npoints)],
+                  outlinecolour);
+}
+
+#ifdef STANDALONE_POLYGON
+
+/*
+ * Standalone program to test draw_polygon_fallback(). By default,
+ * creates a window and allows clicking points to build a
+ * polygon. Optionally, can draw a randomly growing polygon in
+ * "screensaver" mode.
+ */
+
+#include <SDL.h>
+
+void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour)
+{
+    SDL_Renderer *renderer = GET_HANDLE_AS_TYPE(dr, SDL_Renderer);
+    SDL_RenderDrawLine(renderer, x1, y1, x2, y2);
+}
+
+#define WINDOW_WIDTH 800
+#define WINDOW_HEIGHT 600
+#define MAX_SCREENSAVER_POINTS 1000
+
+int main(int argc, char *argv[]) {
+    SDL_Window* window = NULL;
+    SDL_Event event;
+    SDL_Renderer *renderer = NULL;
+    int running = 1;
+    int i;
+    drawing dr;
+    bool screensaver = false;
+
+    if(argc >= 2) {
+        if(!strcmp(argv[1], "--screensaver"))
+            screensaver = true;
+        else
+            printf("usage: %s [--screensaver]\n", argv[0]);
+    }
+
+    int *poly = NULL;
+    int n_points = 0;
+
+    /* Initialize SDL */
+    if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+        printf("SDL could not initialize! SDL_Error: %s\n", SDL_GetError());
+        return 1;
+    }
+
+    /* Create window */
+    window = SDL_CreateWindow("Polygon Drawing Test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN);
+    if (!window) {
+        printf("Window could not be created! SDL_Error: %s\n", SDL_GetError());
+        SDL_Quit();
+        return 1;
+    }
+
+    /* Create renderer */
+    renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+    if (!renderer) {
+        printf("Renderer could not be created! SDL_Error: %s\n", SDL_GetError());
+        SDL_DestroyWindow(window);
+        SDL_Quit();
+        return 1;
+    }
+
+    dr.handle = renderer;
+
+    if(!screensaver)
+        printf("Click points in the window to create vertices. Pressing C resets.\n");
+
+    while (running) {
+        while (SDL_PollEvent(&event) != 0) {
+            if (event.type == SDL_QUIT) {
+                running = 0;
+            }
+            else if (event.type == SDL_MOUSEBUTTONDOWN) {
+                if (event.button.button == SDL_BUTTON_LEFT) {
+                    int mouseX = event.button.x;
+                    int mouseY = event.button.y;
+
+                    poly = realloc(poly, ++n_points * 2 * sizeof(int));
+                    poly[2 * (n_points - 1)] = mouseX;
+                    poly[2 * (n_points - 1) + 1] = mouseY;
+                }
+            }
+            else if (event.type == SDL_KEYDOWN) {
+                if (event.key.keysym.sym == SDLK_c) {
+                    free(poly);
+                    poly = NULL;
+                    n_points = 0;
+                }
+            }
+        }
+
+        if(screensaver) {
+            poly = realloc(poly, ++n_points * 2 * sizeof(int));
+            poly[2 * (n_points - 1)] = rand() % WINDOW_WIDTH;
+            poly[2 * (n_points - 1) + 1] = rand() % WINDOW_HEIGHT;
+
+            if(n_points >= MAX_SCREENSAVER_POINTS) {
+                free(poly);
+                poly = NULL;
+                n_points = 0;
+            }
+        }
+
+        /* Clear the screen with a black color */
+        SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+        SDL_RenderClear(renderer);
+
+        /* Set draw color to white */
+        SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
+
+        draw_polygon_fallback(&dr, poly, n_points, 1, 1);
+
+        SDL_SetRenderDrawColor(renderer, 255, 0, 0, 255);
+        for(i = 0; i < 2*n_points; i+=2)
+            SDL_RenderDrawPoint(renderer, poly[i], poly[i+1]);
+
+        /* Present the back buffer */
+        SDL_RenderPresent(renderer);
+    }
+
+    /* Clean up and quit SDL */
+    SDL_DestroyRenderer(renderer);
+    SDL_DestroyWindow(window);
+    SDL_Quit();
+
+    return 0;
+}
+#endif
diff --git a/apps/plugins/puzzles/src/drawing.c b/apps/plugins/puzzles/src/drawing.c
index a8eb8cfd5f..a754b068f3 100644
--- a/apps/plugins/puzzles/src/drawing.c
+++ b/apps/plugins/puzzles/src/drawing.c
@@ -27,7 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -38,9 +42,12 @@ struct print_colour {
     float grey;
 };
 
-struct drawing {
-    const drawing_api *api;
-    void *handle;
+typedef struct drawing_internal {
+    /* we implement data hiding by casting `struct drawing*` pointers
+     * to `struct drawing_internal*` */
+    struct drawing pub;
+
+    /* private data */
     struct print_colour *colours;
     int ncolours, coloursize;
     float scale;
@@ -48,61 +55,78 @@ struct drawing {
      * this may set it to NULL. */
     midend *me;
     char *laststatus;
-};
+} drawing_internal;
+
+#define PRIVATE_CAST(dr) ((drawing_internal*)(dr))
+#define PUBLIC_CAST(dri) ((drawing*)(dri))
+
+/* See puzzles.h for a description of the version number. */
+#define DRAWING_API_VERSION 1
 
 drawing *drawing_new(const drawing_api *api, midend *me, void *handle)
 {
-    drawing *dr = snew(drawing);
-    dr->api = api;
-    dr->handle = handle;
-    dr->colours = NULL;
-    dr->ncolours = dr->coloursize = 0;
-    dr->scale = 1.0F;
-    dr->me = me;
-    dr->laststatus = NULL;
-    return dr;
+    if(api->version != DRAWING_API_VERSION) {
+        fatal("Drawing API version mismatch: expected: %d, actual: %d\n", DRAWING_API_VERSION, api->version);
+        /* shouldn't get here */
+        return NULL;
+    }
+
+    drawing_internal *dri = snew(drawing_internal);
+    dri->pub.api = api;
+    dri->pub.handle = handle;
+    dri->colours = NULL;
+    dri->ncolours = dri->coloursize = 0;
+    dri->scale = 1.0F;
+    dri->me = me;
+    dri->laststatus = NULL;
+    return PUBLIC_CAST(dri);
 }
 
 void drawing_free(drawing *dr)
 {
-    sfree(dr->laststatus);
-    sfree(dr->colours);
-    sfree(dr);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    sfree(dri->laststatus);
+    sfree(dri->colours);
+    sfree(dri);
 }
 
 void draw_text(drawing *dr, int x, int y, int fonttype, int fontsize,
                int align, int colour, const char *text)
 {
-    dr->api->draw_text(dr->handle, x, y, fonttype, fontsize, align,
-                       colour, text);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->draw_text(dr, x, y, fonttype, fontsize, align,
+                            colour, text);
 }
 
 void draw_rect(drawing *dr, int x, int y, int w, int h, int colour)
 {
-    dr->api->draw_rect(dr->handle, x, y, w, h, colour);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->draw_rect(dr, x, y, w, h, colour);
 }
 
 void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour)
 {
-    dr->api->draw_line(dr->handle, x1, y1, x2, y2, colour);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->draw_line(dr, x1, y1, x2, y2, colour);
 }
 
 void draw_thick_line(drawing *dr, float thickness,
                      float x1, float y1, float x2, float y2, int colour)
 {
-    if (thickness < 1.0)
-        thickness = 1.0;
-    if (dr->api->draw_thick_line) {
-        dr->api->draw_thick_line(dr->handle, thickness,
-                                 x1, y1, x2, y2, colour);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    if (thickness < 1.0F)
+        thickness = 1.0F;
+    if (dri->pub.api->draw_thick_line) {
+        dri->pub.api->draw_thick_line(dr, thickness,
+                                      x1, y1, x2, y2, colour);
     } else {
         /* We'll fake it up with a filled polygon.  The tweak to the
          * thickness empirically compensates for rounding errors, because
          * polygon rendering uses integer coordinates.
          */
         float len = sqrt((x2 - x1)*(x2 - x1) + (y2 - y1)*(y2 - y1));
-        float tvhatx = (x2 - x1)/len * (thickness/2 - 0.2);
-        float tvhaty = (y2 - y1)/len * (thickness/2 - 0.2);
+        float tvhatx = (x2 - x1)/len * (thickness/2 - 0.2F);
+        float tvhaty = (y2 - y1)/len * (thickness/2 - 0.2F);
         int p[8];
 
         p[0] = x1 - tvhaty;
@@ -113,59 +137,67 @@ void draw_thick_line(drawing *dr, float thickness,
         p[5] = y2 - tvhatx;
         p[6] = x1 + tvhaty;
         p[7] = y1 - tvhatx;
-        dr->api->draw_polygon(dr->handle, p, 4, colour, colour);
+        dri->pub.api->draw_polygon(dr, p, 4, colour, colour);
     }
 }
 
-void draw_polygon(drawing *dr, int *coords, int npoints,
+void draw_polygon(drawing *dr, const int *coords, int npoints,
                   int fillcolour, int outlinecolour)
 {
-    dr->api->draw_polygon(dr->handle, coords, npoints, fillcolour,
-                          outlinecolour);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->draw_polygon(dr, coords, npoints, fillcolour,
+                               outlinecolour);
 }
 
 void draw_circle(drawing *dr, int cx, int cy, int radius,
                  int fillcolour, int outlinecolour)
 {
-    dr->api->draw_circle(dr->handle, cx, cy, radius, fillcolour,
-                         outlinecolour);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->draw_circle(dr, cx, cy, radius, fillcolour,
+                              outlinecolour);
 }
 
 void draw_update(drawing *dr, int x, int y, int w, int h)
 {
-    if (dr->api->draw_update)
-        dr->api->draw_update(dr->handle, x, y, w, h);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    if (dri->pub.api->draw_update)
+        dri->pub.api->draw_update(dr, x, y, w, h);
 }
 
 void clip(drawing *dr, int x, int y, int w, int h)
 {
-    dr->api->clip(dr->handle, x, y, w, h);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->clip(dr, x, y, w, h);
 }
 
 void unclip(drawing *dr)
 {
-    dr->api->unclip(dr->handle);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->unclip(dr);
 }
 
 void start_draw(drawing *dr)
 {
-    dr->api->start_draw(dr->handle);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->start_draw(dr);
 }
 
 void end_draw(drawing *dr)
 {
-    dr->api->end_draw(dr->handle);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->end_draw(dr);
 }
 
 char *text_fallback(drawing *dr, const char *const *strings, int nstrings)
 {
+    drawing_internal *dri = PRIVATE_CAST(dr);
     int i;
 
     /*
      * If the drawing implementation provides one of these, use it.
      */
-    if (dr && dr->api->text_fallback)
-        return dr->api->text_fallback(dr->handle, strings, nstrings);
+    if (dr && dri->pub.api->text_fallback)
+        return dri->pub.api->text_fallback(dr, strings, nstrings);
 
     /*
      * Otherwise, do the simple thing and just pick the first string
@@ -192,18 +224,19 @@ char *text_fallback(drawing *dr, const char *const *strings, int nstrings)
 
 void status_bar(drawing *dr, const char *text)
 {
+    drawing_internal *dri = PRIVATE_CAST(dr);
     char *rewritten;
 
-    if (!dr->api->status_bar)
+    if (!dri->pub.api->status_bar)
         return;
 
-    assert(dr->me);
+    assert(dri->me);
 
-    rewritten = midend_rewrite_statusbar(dr->me, text);
-    if (!dr->laststatus || strcmp(rewritten, dr->laststatus)) {
-        dr->api->status_bar(dr->handle, rewritten);
-        sfree(dr->laststatus);
-        dr->laststatus = rewritten;
+    rewritten = midend_rewrite_statusbar(dri->me, text);
+    if (!dri->laststatus || strcmp(rewritten, dri->laststatus)) {
+        dri->pub.api->status_bar(dr, rewritten);
+        sfree(dri->laststatus);
+        dri->laststatus = rewritten;
     } else {
         sfree(rewritten);
     }
@@ -211,74 +244,85 @@ void status_bar(drawing *dr, const char *text)
 
 blitter *blitter_new(drawing *dr, int w, int h)
 {
-    return dr->api->blitter_new(dr->handle, w, h);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    return dri->pub.api->blitter_new(dr, w, h);
 }
 
 void blitter_free(drawing *dr, blitter *bl)
 {
-    dr->api->blitter_free(dr->handle, bl);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->blitter_free(dr, bl);
 }
 
 void blitter_save(drawing *dr, blitter *bl, int x, int y)
 {
-    dr->api->blitter_save(dr->handle, bl, x, y);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->blitter_save(dr, bl, x, y);
 }
 
 void blitter_load(drawing *dr, blitter *bl, int x, int y)
 {
-    dr->api->blitter_load(dr->handle, bl, x, y);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->blitter_load(dr, bl, x, y);
 }
 
 void print_begin_doc(drawing *dr, int pages)
 {
-    dr->api->begin_doc(dr->handle, pages);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->begin_doc(dr, pages);
 }
 
 void print_begin_page(drawing *dr, int number)
 {
-    dr->api->begin_page(dr->handle, number);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->begin_page(dr, number);
 }
 
 void print_begin_puzzle(drawing *dr, float xm, float xc,
                         float ym, float yc, int pw, int ph, float wmm,
                         float scale)
 {
-    dr->scale = scale;
-    dr->ncolours = 0;
-    dr->api->begin_puzzle(dr->handle, xm, xc, ym, yc, pw, ph, wmm);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->scale = scale;
+    dri->ncolours = 0;
+    dri->pub.api->begin_puzzle(dr, xm, xc, ym, yc, pw, ph, wmm);
 }
 
 void print_end_puzzle(drawing *dr)
 {
-    dr->api->end_puzzle(dr->handle);
-    dr->scale = 1.0F;
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->end_puzzle(dr);
+    dri->scale = 1.0F;
 }
 
 void print_end_page(drawing *dr, int number)
 {
-    dr->api->end_page(dr->handle, number);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->end_page(dr, number);
 }
 
 void print_end_doc(drawing *dr)
 {
-    dr->api->end_doc(dr->handle);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->end_doc(dr);
 }
 
 void print_get_colour(drawing *dr, int colour, bool printing_in_colour,
                       int *hatch, float *r, float *g, float *b)
 {
-    assert(colour >= 0 && colour < dr->ncolours);
-    if (dr->colours[colour].hatch_when == 2 ||
-        (dr->colours[colour].hatch_when == 1 && !printing_in_colour)) {
-        *hatch = dr->colours[colour].hatch;
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    assert(colour >= 0 && colour < dri->ncolours);
+    if (dri->colours[colour].hatch_when == 2 ||
+        (dri->colours[colour].hatch_when == 1 && !printing_in_colour)) {
+        *hatch = dri->colours[colour].hatch;
     } else {
         *hatch = -1;
         if (printing_in_colour) {
-            *r = dr->colours[colour].r;
-            *g = dr->colours[colour].g;
-            *b = dr->colours[colour].b;
+            *r = dri->colours[colour].r;
+            *g = dri->colours[colour].g;
+            *b = dri->colours[colour].b;
         } else {
-            *r = *g = *b = dr->colours[colour].grey;
+            *r = *g = *b = dri->colours[colour].grey;
         }
     }
 }
@@ -286,18 +330,19 @@ void print_get_colour(drawing *dr, int colour, bool printing_in_colour,
 static int print_generic_colour(drawing *dr, float r, float g, float b,
                                 float grey, int hatch, int hatch_when)
 {
-    if (dr->ncolours >= dr->coloursize) {
-        dr->coloursize = dr->ncolours + 16;
-        dr->colours = sresize(dr->colours, dr->coloursize,
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    if (dri->ncolours >= dri->coloursize) {
+        dri->coloursize = dri->ncolours + 16;
+        dri->colours = sresize(dri->colours, dri->coloursize,
                               struct print_colour);
     }
-    dr->colours[dr->ncolours].hatch = hatch;
-    dr->colours[dr->ncolours].hatch_when = hatch_when;
-    dr->colours[dr->ncolours].r = r;
-    dr->colours[dr->ncolours].g = g;
-    dr->colours[dr->ncolours].b = b;
-    dr->colours[dr->ncolours].grey = grey;
-    return dr->ncolours++;
+    dri->colours[dri->ncolours].hatch = hatch;
+    dri->colours[dri->ncolours].hatch_when = hatch_when;
+    dri->colours[dri->ncolours].r = r;
+    dri->colours[dri->ncolours].g = g;
+    dri->colours[dri->ncolours].b = b;
+    dri->colours[dri->ncolours].grey = grey;
+    return dri->ncolours++;
 }
 
 int print_mono_colour(drawing *dr, int grey)
@@ -332,6 +377,8 @@ int print_rgb_hatched_colour(drawing *dr, float r, float g, float b, int hatch)
 
 void print_line_width(drawing *dr, int width)
 {
+    drawing_internal *dri = PRIVATE_CAST(dr);
+
     /*
      * I don't think it's entirely sensible to have line widths be
      * entirely relative to the puzzle size; there is a point
@@ -344,10 +391,11 @@ void print_line_width(drawing *dr, int width)
      * _square root_ of the main puzzle scale. Double the puzzle
      * size, and the line width multiplies by 1.4.
      */
-    dr->api->line_width(dr->handle, (float)sqrt(dr->scale) * width);
+    dri->pub.api->line_width(dr, (float)sqrt(dri->scale) * width);
 }
 
 void print_line_dotted(drawing *dr, bool dotted)
 {
-    dr->api->line_dotted(dr->handle, dotted);
+    drawing_internal *dri = PRIVATE_CAST(dr);
+    dri->pub.api->line_dotted(dr, dotted);
 }
diff --git a/apps/plugins/puzzles/src/dsf.c b/apps/plugins/puzzles/src/dsf.c
index 832bb3005a..bed564f8ec 100644
--- a/apps/plugins/puzzles/src/dsf.c
+++ b/apps/plugins/puzzles/src/dsf.c
@@ -5,188 +5,301 @@
  */
 
 #include <assert.h>
+#include <limits.h>
 #include <string.h>
 
 #include "puzzles.h"
 
-/*void print_dsf(int *dsf, int size)
+#define DSF_INDEX_MASK (UINT_MAX >> 1)
+#define DSF_FLAG_CANONICAL (UINT_MAX & ~(UINT_MAX >> 1))
+#define DSF_MAX (DSF_INDEX_MASK + 1)
+
+struct DSF {
+    /*
+     * Size of the dsf.
+     */
+    size_t size;
+
+    /*
+     * Main array storing the data structure.
+     *
+     * If n is the canonical element of an equivalence class,
+     * parent_or_size[n] holds the number of elements in that class,
+     * bitwise-ORed with DSF_FLAG_CANONICAL.
+     *
+     * If n is not the canonical element, parent_or_size[n] holds the
+     * index of another element nearer to the root of the tree for
+     * that class.
+     */
+    unsigned *parent_or_size;
+
+    /*
+     * Extra storage for flip tracking.
+     *
+     * If n is not a canonical element, flip[n] indicates whether the
+     * sense of this element is flipped relative to parent_or_size[n].
+     *
+     * If n is a canonical element, flip[n] is unused.
+     */
+    unsigned char *flip;
+
+    /*
+     * Extra storage for minimal-element tracking.
+     *
+     * If n is a canonical element, min[n] holds the index of the
+     * smallest value in n's equivalence class.
+     *
+     * If n is not a canonical element, min[n] is unused.
+     */
+    unsigned *min;
+};
+
+static DSF *dsf_new_internal(int size, bool flip, bool min)
 {
-    int *printed_elements = snewn(size, int);
-    int *equal_elements = snewn(size, int);
-    int *inverse_elements = snewn(size, int);
-    int printed_count = 0, equal_count, inverse_count;
-    int i, n;
-    bool inverse;
+    DSF *dsf;
 
-    memset(printed_elements, -1, sizeof(int) * size);
+    assert(0 < size && size <= DSF_MAX && "Bad dsf size");
 
-    while (1) {
-        equal_count = 0;
-        inverse_count = 0;
-        for (i = 0; i < size; ++i) {
-            if (!memchr(printed_elements, i, sizeof(int) * size)) 
-                break;
-        }
-        if (i == size)
-            goto done;
-
-        i = dsf_canonify(dsf, i);
-
-        for (n = 0; n < size; ++n) {
-            if (edsf_canonify(dsf, n, &inverse) == i) {
-               if (inverse)
-                   inverse_elements[inverse_count++] = n;
-               else
-                   equal_elements[equal_count++] = n;
-            }
-        }
-        
-        for (n = 0; n < equal_count; ++n) {
-            fprintf(stderr, "%d ", equal_elements[n]);
-            printed_elements[printed_count++] = equal_elements[n];
-        }
-        if (inverse_count) {
-            fprintf(stderr, "!= ");
-            for (n = 0; n < inverse_count; ++n) {
-                fprintf(stderr, "%d ", inverse_elements[n]);
-                printed_elements[printed_count++] = inverse_elements[n];
-            }
-        }
-        fprintf(stderr, "\n");
-    }
-done:
+    dsf = snew(DSF);
+    dsf->size = size;
+    dsf->parent_or_size = snewn(size, unsigned);
+    dsf->flip = flip ? snewn(size, unsigned char) : NULL;
+    dsf->min = min ? snewn(size, unsigned) : NULL;
+
+    dsf_reinit(dsf);
 
-    sfree(printed_elements);
-    sfree(equal_elements);
-    sfree(inverse_elements);
-}*/
+    return dsf;
+}
 
-void dsf_init(int *dsf, int size)
+DSF *dsf_new(int size)
 {
-    int i;
+    return dsf_new_internal(size, false, false);
+}
 
-    for (i = 0; i < size; i++) dsf[i] = 6;
-    /* Bottom bit of each element of this array stores whether that
-     * element is opposite to its parent, which starts off as
-     * false. Second bit of each element stores whether that element
-     * is the root of its tree or not.  If it's not the root, the
-     * remaining 30 bits are the parent, otherwise the remaining 30
-     * bits are the number of elements in the tree.  */
+DSF *dsf_new_flip(int size)
+{
+    return dsf_new_internal(size, true, false);
 }
 
-int *snew_dsf(int size)
+DSF *dsf_new_min(int size)
 {
-    int *ret;
-    
-    ret = snewn(size, int);
-    dsf_init(ret, size);
+    return dsf_new_internal(size, false, true);
+}
+
+void dsf_reinit(DSF *dsf)
+{
+    size_t i;
+
+    /* Every element starts as the root of an equivalence class of size 1 */
+    for (i = 0; i < dsf->size; i++)
+        dsf->parent_or_size[i] = DSF_FLAG_CANONICAL | 1;
 
-    /*print_dsf(ret, size); */
+    /* If we're tracking minima then every element is also its own min */
+    if (dsf->min)
+        for (i = 0; i < dsf->size; i++)
+            dsf->min[i] = i;
 
-    return ret;
+    /* No need to initialise dsf->flip, even if it exists, because
+     * only the entries for non-root elements are meaningful, and
+     * currently there are none. */
 }
 
-int dsf_canonify(int *dsf, int index)
+void dsf_copy(DSF *to, DSF *from)
 {
-    return edsf_canonify(dsf, index, NULL);
+    assert(to->size == from->size && "Mismatch in dsf_copy");
+    memcpy(to->parent_or_size, from->parent_or_size,
+           to->size * sizeof(*to->parent_or_size));
+    if (to->flip) {
+        assert(from->flip && "Copying a non-flip dsf to a flip one");
+        memcpy(to->flip, from->flip, to->size * sizeof(*to->flip));
+    }
+    if (to->min) {
+        assert(from->min && "Copying a non-min dsf to a min one");
+        memcpy(to->min, from->min, to->size * sizeof(*to->min));
+    }
 }
 
-void dsf_merge(int *dsf, int v1, int v2)
+
+void dsf_free(DSF *dsf)
 {
-    edsf_merge(dsf, v1, v2, false);
+    if (dsf) {
+        sfree(dsf->parent_or_size);
+        sfree(dsf->flip);
+        sfree(dsf->min);
+        sfree(dsf);
+    }
 }
 
-int dsf_size(int *dsf, int index) {
-    return dsf[dsf_canonify(dsf, index)] >> 2;
+static inline size_t dsf_find_root(DSF *dsf, size_t n)
+{
+    while (!(dsf->parent_or_size[n] & DSF_FLAG_CANONICAL))
+        n = dsf->parent_or_size[n];
+    return n;
+}
+
+static inline void dsf_path_compress(DSF *dsf, size_t n, size_t root)
+{
+    while (!(dsf->parent_or_size[n] & DSF_FLAG_CANONICAL)) {
+        size_t prev = n;
+        n = dsf->parent_or_size[n];
+        dsf->parent_or_size[prev] = root;
+    }
+    assert(n == root);
 }
 
-int edsf_canonify(int *dsf, int index, bool *inverse_return)
+int dsf_canonify(DSF *dsf, int n)
 {
-    int start_index = index, canonical_index;
-    bool inverse = false;
+    size_t root;
 
-/*    fprintf(stderr, "dsf = %p\n", dsf); */
-/*    fprintf(stderr, "Canonify %2d\n", index); */
+    assert(0 <= n && n < dsf->size && "Overrun in dsf_canonify");
 
-    assert(index >= 0);
+    root = dsf_find_root(dsf, n);
+    dsf_path_compress(dsf, n, root);
+    return root;
+}
+
+void dsf_merge(DSF *dsf, int n1, int n2)
+{
+    size_t r1, r2, s1, s2, root;
+
+    assert(0 <= n1 && n1 < dsf->size && "Overrun in dsf_merge");
+    assert(0 <= n2 && n2 < dsf->size && "Overrun in dsf_merge");
+    assert(!dsf->flip && "dsf_merge on a flip dsf");
+
+    /* Find the root elements */
+    r1 = dsf_find_root(dsf, n1);
+    r2 = dsf_find_root(dsf, n2);
+
+    if (r1 == r2) {
+        /* Classes are already the same, so we have a common root */
+        root = r1;
+    } else {
+        /* Classes must be merged */
+
+        /* Decide which one to use as the overall root, based on size */
+        s1 = dsf->parent_or_size[r1] & DSF_INDEX_MASK;
+        s2 = dsf->parent_or_size[r2] & DSF_INDEX_MASK;
+        if (s1 > s2) {
+            dsf->parent_or_size[r2] = root = r1;
+        } else {
+            dsf->parent_or_size[r1] = root = r2;
+        }
+        dsf->parent_or_size[root] = (s1 + s2) | DSF_FLAG_CANONICAL;
 
-    /* Find the index of the canonical element of the 'equivalence class' of
-     * which start_index is a member, and figure out whether start_index is the
-     * same as or inverse to that. */
-    while ((dsf[index] & 2) == 0) {
-        inverse ^= (dsf[index] & 1);
-        index = dsf[index] >> 2;
-/*        fprintf(stderr, "index = %2d, ", index); */
-/*        fprintf(stderr, "inverse = %d\n", inverse); */
+        if (dsf->min) {
+            /* Update the min of the merged class */
+            unsigned m1 = dsf->min[r1], m2 = dsf->min[r2];
+            dsf->min[root] = m1 < m2 ? m1 : m2;
+        }
     }
-    canonical_index = index;
-    
-    if (inverse_return)
-        *inverse_return = inverse;
-    
-    /* Update every member of this 'equivalence class' to point directly at the
-     * canonical member. */
-    index = start_index;
-    while (index != canonical_index) {
-        int nextindex = dsf[index] >> 2;
-        bool nextinverse = inverse ^ (dsf[index] & 1);
-        dsf[index] = (canonical_index << 2) | inverse;
-        inverse = nextinverse;
-        index = nextindex;
+
+    /* Path-compress both paths from n1 and n2 so they point at the new root */
+    dsf_path_compress(dsf, n1, root);
+    dsf_path_compress(dsf, n2, root);
+}
+
+bool dsf_equivalent(DSF *dsf, int n1, int n2)
+{
+    return dsf_canonify(dsf, n1) == dsf_canonify(dsf, n2);
+}
+
+int dsf_size(DSF *dsf, int n)
+{
+    size_t root = dsf_canonify(dsf, n);
+    return dsf->parent_or_size[root] & DSF_INDEX_MASK;
+}
+
+static inline size_t dsf_find_root_flip(DSF *dsf, size_t n, unsigned *flip)
+{
+    *flip = 0;
+    while (!(dsf->parent_or_size[n] & DSF_FLAG_CANONICAL)) {
+        *flip ^= dsf->flip[n];
+        n = dsf->parent_or_size[n];
+    }
+    return n;
+}
+
+static inline void dsf_path_compress_flip(DSF *dsf, size_t n, size_t root,
+                                          unsigned flip)
+{
+    while (!(dsf->parent_or_size[n] & DSF_FLAG_CANONICAL)) {
+        size_t prev = n;
+        unsigned flip_prev = flip;
+        n = dsf->parent_or_size[n];
+        flip ^= dsf->flip[prev];
+        dsf->flip[prev] = flip_prev;
+        dsf->parent_or_size[prev] = root;
     }
+    assert(n == root);
+}
+
+int dsf_canonify_flip(DSF *dsf, int n, bool *inverse)
+{
+    size_t root;
+    unsigned flip;
+
+    assert(0 <= n && n < dsf->size && "Overrun in dsf_canonify_flip");
+    assert(dsf->flip && "dsf_canonify_flip on a non-flip dsf");
+
+    root = dsf_find_root_flip(dsf, n, &flip);
+    dsf_path_compress_flip(dsf, n, root, flip);
+    *inverse = flip;
+    return root;
+}
+
+void dsf_merge_flip(DSF *dsf, int n1, int n2, bool inverse)
+{
+    size_t r1, r2, s1, s2, root;
+    unsigned f1, f2;
+
+    assert(0 <= n1 && n1 < dsf->size && "Overrun in dsf_merge_flip");
+    assert(0 <= n2 && n2 < dsf->size && "Overrun in dsf_merge_flip");
+    assert(dsf->flip && "dsf_merge_flip on a non-flip dsf");
+
+    /* Find the root elements */
+    r1 = dsf_find_root_flip(dsf, n1, &f1);
+    r2 = dsf_find_root_flip(dsf, n2, &f2);
+
+    if (r1 == r2) {
+        /* Classes are already the same, so we have a common root */
+        assert((f1 ^ f2 ^ inverse) == 0 && "Inconsistency in dsf_merge_flip");
+        root = r1;
+    } else {
+        /* Classes must be merged */
 
-    assert(!inverse);
-
-/*    fprintf(stderr, "Return %2d\n", index); */
-    
-    return index;
-}
-
-void edsf_merge(int *dsf, int v1, int v2, bool inverse)
-{
-    bool i1, i2;
-
-/*    fprintf(stderr, "dsf = %p\n", dsf); */
-/*    fprintf(stderr, "Merge [%2d,%2d], %d\n", v1, v2, inverse); */
-    
-    v1 = edsf_canonify(dsf, v1, &i1);
-    assert(dsf[v1] & 2);
-    inverse ^= i1;
-    v2 = edsf_canonify(dsf, v2, &i2);
-    assert(dsf[v2] & 2);
-    inverse ^= i2;
-
-/*    fprintf(stderr, "Doing [%2d,%2d], %d\n", v1, v2, inverse); */
-
-    if (v1 == v2)
-        assert(!inverse);
-    else {
-        /*
-         * We always make the smaller of v1 and v2 the new canonical
-         * element. This ensures that the canonical element of any
-         * class in this structure is always the first element in
-         * it. 'Keen' depends critically on this property.
-         *
-         * (Jonas Koelker previously had this code choosing which
-         * way round to connect the trees by examining the sizes of
-         * the classes being merged, so that the root of the
-         * larger-sized class became the new root. This gives better
-         * asymptotic performance, but I've changed it to do it this
-         * way because I like having a deterministic canonical
-         * element.)
-         */
-        if (v1 > v2) {
-            int v3 = v1;
-            v1 = v2;
-            v2 = v3;
-        }
-        dsf[v1] += (dsf[v2] >> 2) << 2;
-        dsf[v2] = (v1 << 2) | inverse;
+        /* Decide which one to use as the overall root, based on size */
+        s1 = dsf->parent_or_size[r1] & DSF_INDEX_MASK;
+        s2 = dsf->parent_or_size[r2] & DSF_INDEX_MASK;
+        if (s1 > s2) {
+            dsf->parent_or_size[r2] = root = r1;
+            dsf->flip[r2] = f1 ^ f2 ^ inverse;
+            f2 ^= dsf->flip[r2];
+        } else {
+            root = r2;
+            dsf->parent_or_size[r1] = root = r2;
+            dsf->flip[r1] = f1 ^ f2 ^ inverse;
+            f1 ^= dsf->flip[r1];
+        }
+        dsf->parent_or_size[root] = (s1 + s2) | DSF_FLAG_CANONICAL;
+
+        if (dsf->min) {
+            /* Update the min of the merged class */
+            unsigned m1 = dsf->min[r1], m2 = dsf->min[r2];
+            dsf->min[root] = m1 < m2 ? m1 : m2;
+        }
     }
-    
-    v2 = edsf_canonify(dsf, v2, &i2);
-    assert(v2 == v1);
-    assert(i2 == inverse);
 
-/*    fprintf(stderr, "dsf[%2d] = %2d\n", v2, dsf[v2]); */
+    /* Path-compress both paths from n1 and n2 so they point at the new root */
+    dsf_path_compress_flip(dsf, n1, root, f1);
+    dsf_path_compress_flip(dsf, n2, root, f2);
+}
+
+int dsf_minimal(DSF *dsf, int n)
+{
+    size_t root;
+
+    assert(dsf->min && "dsf_minimal on a non-min dsf");
+
+    root = dsf_canonify(dsf, n);
+    return dsf->min[root];
 }
diff --git a/apps/plugins/puzzles/src/emcc.c b/apps/plugins/puzzles/src/emcc.c
deleted file mode 100644
index 9a6c742482..0000000000
--- a/apps/plugins/puzzles/src/emcc.c
+++ /dev/null
@@ -1,978 +0,0 @@
-/*
- * emcc.c: the C component of an Emscripten-based web/Javascript front
- * end for Puzzles.
- *
- * The Javascript parts of this system live in emcclib.js and
- * emccpre.js. It also depends on being run in the context of a web
- * page containing an appropriate collection of bits and pieces (a
- * canvas, some buttons and links etc), which is generated for each
- * puzzle by the script html/jspage.pl.
- */
-
-/*
- * Further thoughts on possible enhancements:
- *
- *  - I think it might be feasible to have these JS puzzles permit
- *    loading and saving games in disk files. Saving would be done by
- *    constructing a data: URI encapsulating the save file, and then
- *    telling the browser to visit that URI with the effect that it
- *    would naturally pop up a 'where would you like to save this'
- *    dialog box. Loading, more or less similarly, might be feasible
- *    by using the DOM File API to ask the user to select a file and
- *    permit us to see its contents.
- *
- *  - I should think about whether these webified puzzles can support
- *    touchscreen-based tablet browsers (assuming there are any that
- *    can cope with the reasonably modern JS and run it fast enough to
- *    be worthwhile).
- *
- *  - think about making use of localStorage. It might be useful to
- *    let the user save games into there as an alternative to disk
- *    files - disk files are all very well for getting the save right
- *    out of your browser to (e.g.) email to me as a bug report, but
- *    for just resuming a game you were in the middle of, you'd
- *    probably rather have a nice simple 'quick save' and 'quick load'
- *    button pair. Also, that might be a useful place to store
- *    preferences, if I ever get round to writing a preferences UI.
- *
- *  - some CSS to make the button bar and configuration dialogs a
- *    little less ugly would probably not go amiss.
- *
- *  - this is a downright silly idea, but it does occur to me that if
- *    I were to write a PDF output driver for the Puzzles printing
- *    API, then I might be able to implement a sort of 'printing'
- *    feature in this front end, using data: URIs again. (Ask the user
- *    exactly what they want printed, then construct an appropriate
- *    PDF and embed it in a gigantic data: URI. Then they can print
- *    that using whatever they normally use to print PDFs!)
- */
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#include "puzzles.h"
-
-/*
- * Extern references to Javascript functions provided in emcclib.js.
- */
-extern void js_debug(const char *);
-extern void js_error_box(const char *message);
-extern void js_remove_type_dropdown(void);
-extern void js_remove_solve_button(void);
-extern void js_add_preset(int menuid, const char *name, int value);
-extern int js_add_preset_submenu(int menuid, const char *name);
-extern int js_get_selected_preset(void);
-extern void js_select_preset(int n);
-extern void js_get_date_64(unsigned *p);
-extern void js_update_permalinks(const char *desc, const char *seed);
-extern void js_enable_undo_redo(bool undo, bool redo);
-extern void js_activate_timer();
-extern void js_deactivate_timer();
-extern void js_canvas_start_draw(void);
-extern void js_canvas_draw_update(int x, int y, int w, int h);
-extern void js_canvas_end_draw(void);
-extern void js_canvas_draw_rect(int x, int y, int w, int h,
-                                const char *colour);
-extern void js_canvas_clip_rect(int x, int y, int w, int h);
-extern void js_canvas_unclip(void);
-extern void js_canvas_draw_line(float x1, float y1, float x2, float y2,
-                                int width, const char *colour);
-extern void js_canvas_draw_poly(int *points, int npoints,
-                                const char *fillcolour,
-                                const char *outlinecolour);
-extern void js_canvas_draw_circle(int x, int y, int r,
-                                  const char *fillcolour,
-                                  const char *outlinecolour);
-extern int js_canvas_find_font_midpoint(int height, const char *fontptr);
-extern void js_canvas_draw_text(int x, int y, int halign,
-                                const char *colptr, const char *fontptr,
-                                const char *text);
-extern int js_canvas_new_blitter(int w, int h);
-extern void js_canvas_free_blitter(int id);
-extern void js_canvas_copy_to_blitter(int id, int x, int y, int w, int h);
-extern void js_canvas_copy_from_blitter(int id, int x, int y, int w, int h);
-extern void js_canvas_make_statusbar(void);
-extern void js_canvas_set_statusbar(const char *text);
-extern void js_canvas_set_size(int w, int h);
-
-extern void js_dialog_init(const char *title);
-extern void js_dialog_string(int i, const char *title, const char *initvalue);
-extern void js_dialog_choices(int i, const char *title, const char *choicelist,
-                              int initvalue);
-extern void js_dialog_boolean(int i, const char *title, bool initvalue);
-extern void js_dialog_launch(void);
-extern void js_dialog_cleanup(void);
-extern void js_focus_canvas(void);
-
-/*
- * Call JS to get the date, and use that to initialise our random
- * number generator to invent the first game seed.
- */
-void get_random_seed(void **randseed, int *randseedsize)
-{
-    unsigned *ret = snewn(2, unsigned);
-    js_get_date_64(ret);
-    *randseed = ret;
-    *randseedsize = 2*sizeof(unsigned);
-}
-
-/*
- * Fatal error, called in cases of complete despair such as when
- * malloc() has returned NULL.
- */
-void fatal(const char *fmt, ...)
-{
-    char buf[512];
-    va_list ap;
-
-    strcpy(buf, "puzzle fatal error: ");
-
-    va_start(ap, fmt);
-    vsnprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), fmt, ap);
-    va_end(ap);
-
-    js_error_box(buf);
-}
-
-void debug_printf(const char *fmt, ...)
-{
-    char buf[512];
-    va_list ap;
-    va_start(ap, fmt);
-    vsnprintf(buf, sizeof(buf), fmt, ap);
-    va_end(ap);
-    js_debug(buf);
-}
-
-/*
- * Helper function that makes it easy to test strings that might be
- * NULL.
- */
-int strnullcmp(const char *a, const char *b)
-{
-    if (a == NULL || b == NULL)
-        return a != NULL ? +1 : b != NULL ? -1 : 0;
-    return strcmp(a, b);
-}
-
-/*
- * HTMLish names for the colours allocated by the puzzle.
- */
-char **colour_strings;
-int ncolours;
-
-/*
- * The global midend object.
- */
-midend *me;
-
-/* ----------------------------------------------------------------------
- * Timing functions.
- */
-bool timer_active = false;
-void deactivate_timer(frontend *fe)
-{
-    js_deactivate_timer();
-    timer_active = false;
-}
-void activate_timer(frontend *fe)
-{
-    if (!timer_active) {
-        js_activate_timer();
-        timer_active = true;
-    }
-}
-void timer_callback(double tplus)
-{
-    if (timer_active)
-        midend_timer(me, tplus);
-}
-
-/* ----------------------------------------------------------------------
- * Helper functions to resize the canvas, and variables to remember
- * its size for other functions (e.g. trimming blitter rectangles).
- */
-static int canvas_w, canvas_h;
-
-/* Called when we resize as a result of changing puzzle settings */
-static void resize(void)
-{
-    int w, h;
-    w = h = INT_MAX;
-    midend_size(me, &w, &h, false);
-    js_canvas_set_size(w, h);
-    canvas_w = w;
-    canvas_h = h;
-}
-
-/* Called from JS when the user uses the resize handle */
-void resize_puzzle(int w, int h)
-{
-    midend_size(me, &w, &h, true);
-    if (canvas_w != w || canvas_h != h) { 
-        js_canvas_set_size(w, h);
-        canvas_w = w;
-        canvas_h = h;
-        midend_force_redraw(me);
-    }
-}
-
-/* Called from JS when the user uses the restore button */
-void restore_puzzle_size(int w, int h)
-{
-    midend_reset_tilesize(me);
-    resize();
-    midend_force_redraw(me);
-}
-
-/*
- * HTML doesn't give us a default frontend colour of its own, so we
- * just make up a lightish grey ourselves.
- */
-void frontend_default_colour(frontend *fe, float *output)
-{
-    output[0] = output[1] = output[2] = 0.9F;
-}
-
-/*
- * Helper function called from all over the place to ensure the undo
- * and redo buttons get properly enabled and disabled after every move
- * or undo or new-game event.
- */
-static void update_undo_redo(void)
-{
-    js_enable_undo_redo(midend_can_undo(me), midend_can_redo(me));
-}
-
-/*
- * Mouse event handlers called from JS.
- */
-void mousedown(int x, int y, int button)
-{
-    button = (button == 0 ? LEFT_BUTTON :
-              button == 1 ? MIDDLE_BUTTON : RIGHT_BUTTON);
-    midend_process_key(me, x, y, button);
-    update_undo_redo();
-}
-
-void mouseup(int x, int y, int button)
-{
-    button = (button == 0 ? LEFT_RELEASE :
-              button == 1 ? MIDDLE_RELEASE : RIGHT_RELEASE);
-    midend_process_key(me, x, y, button);
-    update_undo_redo();
-}
-
-void mousemove(int x, int y, int buttons)
-{
-    int button = (buttons & 2 ? MIDDLE_DRAG :
-                  buttons & 4 ? RIGHT_DRAG : LEFT_DRAG);
-    midend_process_key(me, x, y, button);
-    update_undo_redo();
-}
-
-/*
- * Keyboard handler called from JS.
- */
-void key(int keycode, int charcode, const char *key, const char *chr,
-         bool shift, bool ctrl)
-{
-    int keyevent = -1;
-
-    if (!strnullcmp(key, "Backspace") || !strnullcmp(key, "Del") ||
-        keycode == 8 || keycode == 46) {
-        keyevent = 127;                /* Backspace / Delete */
-    } else if (!strnullcmp(key, "Enter") || keycode == 13) {
-        keyevent = 13;             /* return */
-    } else if (!strnullcmp(key, "Left") || keycode == 37) {
-        keyevent = CURSOR_LEFT;
-    } else if (!strnullcmp(key, "Up") || keycode == 38) {
-        keyevent = CURSOR_UP;
-    } else if (!strnullcmp(key, "Right") || keycode == 39) {
-        keyevent = CURSOR_RIGHT;
-    } else if (!strnullcmp(key, "Down") || keycode == 40) {
-        keyevent = CURSOR_DOWN;
-    } else if (!strnullcmp(key, "End") || keycode == 35) {
-        /*
-         * We interpret Home, End, PgUp and PgDn as numeric keypad
-         * controls regardless of whether they're the ones on the
-         * numeric keypad (since we can't tell). The effect of
-         * this should only be that the non-numeric-pad versions
-         * of those keys generate directions in 8-way movement
-         * puzzles like Cube and Inertia.
-         */
-        keyevent = MOD_NUM_KEYPAD | '1';
-    } else if (!strnullcmp(key, "PageDown") || keycode==34) {
-        keyevent = MOD_NUM_KEYPAD | '3';
-    } else if (!strnullcmp(key, "Home") || keycode==36) {
-        keyevent = MOD_NUM_KEYPAD | '7';
-    } else if (!strnullcmp(key, "PageUp") || keycode==33) {
-        keyevent = MOD_NUM_KEYPAD | '9';
-    } else if (shift && ctrl && (keycode & 0x1F) == 26) {
-        keyevent = UI_REDO;
-    } else if (chr && chr[0] && !chr[1]) {
-        keyevent = chr[0] & 0xFF;
-    } else if (keycode >= 96 && keycode < 106) {
-        keyevent = MOD_NUM_KEYPAD | ('0' + keycode - 96);
-    } else if (keycode >= 65 && keycode <= 90) {
-        keyevent = keycode + (shift ? 0 : 32);
-    } else if (keycode >= 48 && keycode <= 57) {
-        keyevent = keycode;
-    } else if (keycode == 32) {        /* space / CURSOR_SELECT2 */
-        keyevent = keycode;
-    }
-
-    if (keyevent >= 0) {
-        if (shift && (keyevent >= 0x100 && !IS_UI_FAKE_KEY(keyevent)))
-            keyevent |= MOD_SHFT;
-
-        if (ctrl && !IS_UI_FAKE_KEY(keyevent)) {
-            if (keyevent >= 0x100)
-                keyevent |= MOD_CTRL;
-            else
-                keyevent &= 0x1F;
-        }
-
-        midend_process_key(me, 0, 0, keyevent);
-        update_undo_redo();
-    }
-}
-
-/*
- * Helper function called from several places to update the permalinks
- * whenever a new game is created.
- */
-static void update_permalinks(void)
-{
-    char *desc, *seed;
-    desc = midend_get_game_id(me);
-    seed = midend_get_random_seed(me);
-    js_update_permalinks(desc, seed);
-    sfree(desc);
-    sfree(seed);
-}
-
-/*
- * Callback from the midend when the game ids change, so we can update
- * the permalinks.
- */
-static void ids_changed(void *ignored)
-{
-    update_permalinks();
-}
-
-/* ----------------------------------------------------------------------
- * Implementation of the drawing API by calling Javascript canvas
- * drawing functions. (Well, half of it; the other half is on the JS
- * side.)
- */
-static void js_start_draw(void *handle)
-{
-    js_canvas_start_draw();
-}
-
-static void js_clip(void *handle, int x, int y, int w, int h)
-{
-    js_canvas_clip_rect(x, y, w, h);
-}
-
-static void js_unclip(void *handle)
-{
-    js_canvas_unclip();
-}
-
-static void js_draw_text(void *handle, int x, int y, int fonttype,
-                         int fontsize, int align, int colour,
-                         const char *text)
-{
-    char fontstyle[80];
-    int halign;
-
-    sprintf(fontstyle, "%dpx %s", fontsize,
-            fonttype == FONT_FIXED ? "monospace" : "sans-serif");
-
-    if (align & ALIGN_VCENTRE)
-        y += js_canvas_find_font_midpoint(fontsize, fontstyle);
-
-    if (align & ALIGN_HCENTRE)
-        halign = 1;
-    else if (align & ALIGN_HRIGHT)
-        halign = 2;
-    else
-        halign = 0;
-
-    js_canvas_draw_text(x, y, halign, colour_strings[colour], fontstyle, text);
-}
-
-static void js_draw_rect(void *handle, int x, int y, int w, int h, int colour)
-{
-    js_canvas_draw_rect(x, y, w, h, colour_strings[colour]);
-}
-
-static void js_draw_line(void *handle, int x1, int y1, int x2, int y2,
-                         int colour)
-{
-    js_canvas_draw_line(x1, y1, x2, y2, 1, colour_strings[colour]);
-}
-
-static void js_draw_thick_line(void *handle, float thickness,
-                               float x1, float y1, float x2, float y2,
-                               int colour)
-{
-    js_canvas_draw_line(x1, y1, x2, y2, thickness, colour_strings[colour]);
-}
-
-static void js_draw_poly(void *handle, int *coords, int npoints,
-                         int fillcolour, int outlinecolour)
-{
-    js_canvas_draw_poly(coords, npoints,
-                        fillcolour >= 0 ? colour_strings[fillcolour] : NULL,
-                        colour_strings[outlinecolour]);
-}
-
-static void js_draw_circle(void *handle, int cx, int cy, int radius,
-                           int fillcolour, int outlinecolour)
-{
-    js_canvas_draw_circle(cx, cy, radius,
-                          fillcolour >= 0 ? colour_strings[fillcolour] : NULL,
-                          colour_strings[outlinecolour]);
-}
-
-struct blitter {
-    int id;                            /* allocated on the js side */
-    int w, h;                          /* easier to retain here */
-};
-
-static blitter *js_blitter_new(void *handle, int w, int h)
-{
-    blitter *bl = snew(blitter);
-    bl->w = w;
-    bl->h = h;
-    bl->id = js_canvas_new_blitter(w, h);
-    return bl;
-}
-
-static void js_blitter_free(void *handle, blitter *bl)
-{
-    js_canvas_free_blitter(bl->id);
-    sfree(bl);
-}
-
-static void trim_rect(int *x, int *y, int *w, int *h)
-{
-    int x0, x1, y0, y1;
-
-    /*
-     * Reduce the size of the copied rectangle to stop it going
-     * outside the bounds of the canvas.
-     */
-
-    /* Transform from x,y,w,h form into coordinates of all edges */
-    x0 = *x;
-    y0 = *y;
-    x1 = *x + *w;
-    y1 = *y + *h;
-
-    /* Clip each coordinate at both extremes of the canvas */
-    x0 = (x0 < 0 ? 0 : x0 > canvas_w ? canvas_w : x0);
-    x1 = (x1 < 0 ? 0 : x1 > canvas_w ? canvas_w : x1);
-    y0 = (y0 < 0 ? 0 : y0 > canvas_h ? canvas_h : y0);
-    y1 = (y1 < 0 ? 0 : y1 > canvas_h ? canvas_h : y1); 
-
-    /* Transform back into x,y,w,h to return */
-    *x = x0;
-    *y = y0;
-    *w = x1 - x0;
-    *h = y1 - y0;
-}
-
-static void js_blitter_save(void *handle, blitter *bl, int x, int y)
-{
-    int w = bl->w, h = bl->h;
-    trim_rect(&x, &y, &w, &h);
-    if (w > 0 && h > 0)
-        js_canvas_copy_to_blitter(bl->id, x, y, w, h);
-}
-
-static void js_blitter_load(void *handle, blitter *bl, int x, int y)
-{
-    int w = bl->w, h = bl->h;
-    trim_rect(&x, &y, &w, &h);
-    if (w > 0 && h > 0)
-        js_canvas_copy_from_blitter(bl->id, x, y, w, h);
-}
-
-static void js_draw_update(void *handle, int x, int y, int w, int h)
-{
-    trim_rect(&x, &y, &w, &h);
-    if (w > 0 && h > 0)
-        js_canvas_draw_update(x, y, w, h);
-}
-
-static void js_end_draw(void *handle)
-{
-    js_canvas_end_draw();
-}
-
-static void js_status_bar(void *handle, const char *text)
-{
-    js_canvas_set_statusbar(text);
-}
-
-static char *js_text_fallback(void *handle, const char *const *strings,
-                              int nstrings)
-{
-    return dupstr(strings[0]); /* Emscripten has no trouble with UTF-8 */
-}
-
-const struct drawing_api js_drawing = {
-    js_draw_text,
-    js_draw_rect,
-    js_draw_line,
-    js_draw_poly,
-    js_draw_circle,
-    js_draw_update,
-    js_clip,
-    js_unclip,
-    js_start_draw,
-    js_end_draw,
-    js_status_bar,
-    js_blitter_new,
-    js_blitter_free,
-    js_blitter_save,
-    js_blitter_load,
-    NULL, NULL, NULL, NULL, NULL, NULL, /* {begin,end}_{doc,page,puzzle} */
-    NULL, NULL,                        /* line_width, line_dotted */
-    js_text_fallback,
-    js_draw_thick_line,
-};
-
-/* ----------------------------------------------------------------------
- * Presets and game-configuration dialog support.
- */
-static game_params **presets;
-static int npresets;
-bool have_presets_dropdown;
-
-void populate_js_preset_menu(int menuid, struct preset_menu *menu)
-{
-    int i;
-    for (i = 0; i < menu->n_entries; i++) {
-        struct preset_menu_entry *entry = &menu->entries[i];
-        if (entry->params) {
-            presets[entry->id] = entry->params;
-            js_add_preset(menuid, entry->title, entry->id);
-        } else {
-            int js_submenu = js_add_preset_submenu(menuid, entry->title);
-            populate_js_preset_menu(js_submenu, entry->submenu);
-        }
-    }
-}
-
-void select_appropriate_preset(void)
-{
-    if (have_presets_dropdown) {
-        int preset = midend_which_preset(me);
-        js_select_preset(preset < 0 ? -1 : preset);
-    }
-}
-
-static config_item *cfg = NULL;
-static int cfg_which;
-
-/*
- * Set up a dialog box. This is pretty easy on the C side; most of the
- * work is done in JS.
- */
-static void cfg_start(int which)
-{
-    char *title;
-    int i;
-
-    cfg = midend_get_config(me, which, &title);
-    cfg_which = which;
-
-    js_dialog_init(title);
-    sfree(title);
-
-    for (i = 0; cfg[i].type != C_END; i++) {
-        switch (cfg[i].type) {
-          case C_STRING:
-            js_dialog_string(i, cfg[i].name, cfg[i].u.string.sval);
-            break;
-          case C_BOOLEAN:
-            js_dialog_boolean(i, cfg[i].name, cfg[i].u.boolean.bval);
-            break;
-          case C_CHOICES:
-            js_dialog_choices(i, cfg[i].name, cfg[i].u.choices.choicenames,
-                              cfg[i].u.choices.selected);
-            break;
-        }
-    }
-
-    js_dialog_launch();
-}
-
-/*
- * Callbacks from JS when the OK button is clicked, to return the
- * final state of each control.
- */
-void dlg_return_sval(int index, const char *val)
-{
-    config_item *i = cfg + index;
-    switch (i->type) {
-      case C_STRING:
-        sfree(i->u.string.sval);
-        i->u.string.sval = dupstr(val);
-        break;
-      default:
-        assert(0 && "Bad type for return_sval");
-    }
-}
-void dlg_return_ival(int index, int val)
-{
-    config_item *i = cfg + index;
-    switch (i->type) {
-      case C_BOOLEAN:
-        i->u.boolean.bval = val;
-        break;
-      case C_CHOICES:
-        i->u.choices.selected = val;
-        break;
-      default:
-        assert(0 && "Bad type for return_ival");
-    }
-}
-
-/*
- * Called when the user clicks OK or Cancel. use_results will be true
- * or false respectively, in those cases. We terminate the dialog box,
- * unless the user selected an invalid combination of parameters.
- */
-static void cfg_end(bool use_results)
-{
-    if (use_results) {
-        /*
-         * User hit OK.
-         */
-        const char *err = midend_set_config(me, cfg_which, cfg);
-
-        if (err) {
-            /*
-             * The settings were unacceptable, so leave the config box
-             * open for the user to adjust them and try again.
-             */
-            js_error_box(err);
-        } else {
-            /*
-             * New settings are fine; start a new game and close the
-             * dialog.
-             */
-            select_appropriate_preset();
-            midend_new_game(me);
-            resize();
-            midend_redraw(me);
-            free_cfg(cfg);
-            js_dialog_cleanup();
-        }
-    } else {
-        /*
-         * User hit Cancel. Close the dialog, but also we must still
-         * reselect the right element of the dropdown list.
-         *
-         * (Because: imagine you have a preset selected, and then you
-         * select Custom from the list, but change your mind and hit
-         * Esc. The Custom option will now still be selected in the
-         * list, whereas obviously it should show the preset you still
-         * _actually_ have selected. Worse still, it'll be the visible
-         * rather than invisible Custom option - see the comment in
-         * js_add_preset in emcclib.js - so you won't even be able to
-         * select Custom without a faffy workaround.)
-         */
-        select_appropriate_preset();
-
-        free_cfg(cfg);
-        js_dialog_cleanup();
-    }
-}
-
-/* ----------------------------------------------------------------------
- * Called from JS when a command is given to the puzzle by clicking a
- * button or control of some sort.
- */
-void command(int n)
-{
-    switch (n) {
-      case 0:                          /* specific game ID */
-        cfg_start(CFG_DESC);
-        break;
-      case 1:                          /* random game seed */
-        cfg_start(CFG_SEED);
-        break;
-      case 2:                          /* game parameter dropdown changed */
-        {
-            int i = js_get_selected_preset();
-            if (i < 0) {
-                /*
-                 * The user selected 'Custom', so launch the config
-                 * box.
-                 */
-                if (thegame.can_configure) /* (double-check just in case) */
-                    cfg_start(CFG_SETTINGS);
-            } else {
-                /*
-                 * The user selected a preset, so just switch straight
-                 * to that.
-                 */
-                assert(i < npresets);
-                midend_set_params(me, presets[i]);
-                midend_new_game(me);
-                resize();
-                midend_redraw(me);
-                update_undo_redo();
-                js_focus_canvas();
-                select_appropriate_preset();
-            }
-        }
-        break;
-      case 3:                          /* OK clicked in a config box */
-        cfg_end(true);
-        update_undo_redo();
-        break;
-      case 4:                          /* Cancel clicked in a config box */
-        cfg_end(false);
-        update_undo_redo();
-        break;
-      case 5:                          /* New Game */
-        midend_process_key(me, 0, 0, UI_NEWGAME);
-        update_undo_redo();
-        js_focus_canvas();
-        break;
-      case 6:                          /* Restart */
-        midend_restart_game(me);
-        update_undo_redo();
-        js_focus_canvas();
-        break;
-      case 7:                          /* Undo */
-        midend_process_key(me, 0, 0, UI_UNDO);
-        update_undo_redo();
-        js_focus_canvas();
-        break;
-      case 8:                          /* Redo */
-        midend_process_key(me, 0, 0, UI_REDO);
-        update_undo_redo();
-        js_focus_canvas();
-        break;
-      case 9:                          /* Solve */
-        if (thegame.can_solve) {
-            const char *msg = midend_solve(me);
-            if (msg)
-                js_error_box(msg);
-        }
-        update_undo_redo();
-        js_focus_canvas();
-        break;
-    }
-}
-
-/* ----------------------------------------------------------------------
- * Called from JS to prepare a save-game file, and free one after it's
- * been used.
- */
-
-struct savefile_write_ctx {
-    char *buffer;
-    size_t pos;
-};
-
-static void savefile_write(void *vctx, const void *buf, int len)
-{
-    struct savefile_write_ctx *ctx = (struct savefile_write_ctx *)vctx;
-    if (ctx->buffer)
-        memcpy(ctx->buffer + ctx->pos, buf, len);
-    ctx->pos += len;
-}
-
-char *get_save_file(void)
-{
-    struct savefile_write_ctx ctx;
-    size_t size;
-
-    /* First pass, to count up the size */
-    ctx.buffer = NULL;
-    ctx.pos = 0;
-    midend_serialise(me, savefile_write, &ctx);
-    size = ctx.pos;
-
-    /* Second pass, to actually write out the data. We have to put a
-     * terminating \0 on the end (which we expect never to show up in
-     * the actual serialisation format - it's text, not binary) so
-     * that the Javascript side can easily find out the length. */
-    ctx.buffer = snewn(size+1, char);
-    ctx.pos = 0;
-    midend_serialise(me, savefile_write, &ctx);
-    assert(ctx.pos == size);
-    ctx.buffer[ctx.pos] = '\0';
-
-    return ctx.buffer;
-}
-
-void free_save_file(char *buffer)
-{
-    sfree(buffer);
-}
-
-struct savefile_read_ctx {
-    const char *buffer;
-    int len_remaining;
-};
-
-static bool savefile_read(void *vctx, void *buf, int len)
-{
-    struct savefile_read_ctx *ctx = (struct savefile_read_ctx *)vctx;
-    if (ctx->len_remaining < len)
-        return false;
-    memcpy(buf, ctx->buffer, len);
-    ctx->len_remaining -= len;
-    ctx->buffer += len;
-    return true;
-}
-
-void load_game(const char *buffer, int len)
-{
-    struct savefile_read_ctx ctx;
-    const char *err;
-
-    ctx.buffer = buffer;
-    ctx.len_remaining = len;
-    err = midend_deserialise(me, savefile_read, &ctx);
-
-    if (err) {
-        js_error_box(err);
-    } else {
-        select_appropriate_preset();
-        resize();
-        midend_redraw(me);
-    }
-}
-
-/* ----------------------------------------------------------------------
- * Setup function called at page load time. It's called main() because
- * that's the most convenient thing in Emscripten, but it's not main()
- * in the usual sense of bounding the program's entire execution.
- * Instead, this function returns once the initial puzzle is set up
- * and working, and everything thereafter happens by means of JS event
- * handlers sending us callbacks.
- */
-int main(int argc, char **argv)
-{
-    const char *param_err;
-    float *colours;
-    int i;
-
-    /*
-     * Instantiate a midend.
-     */
-    me = midend_new(NULL, &thegame, &js_drawing, NULL);
-
-    /*
-     * Chuck in the HTML fragment ID if we have one (trimming the
-     * leading # off the front first). If that's invalid, we retain
-     * the error message and will display it at the end, after setting
-     * up a random puzzle as usual.
-     */
-    if (argc > 1 && argv[1][0] == '#' && argv[1][1] != '\0')
-        param_err = midend_game_id(me, argv[1] + 1);
-    else
-        param_err = NULL;
-
-    /*
-     * Create either a random game or the specified one, and set the
-     * canvas size appropriately.
-     */
-    midend_new_game(me);
-    resize();
-
-    /*
-     * Create a status bar, if needed.
-     */
-    if (midend_wants_statusbar(me))
-        js_canvas_make_statusbar();
-
-    /*
-     * Set up the game-type dropdown with presets and/or the Custom
-     * option.
-     */
-    {
-        struct preset_menu *menu = midend_get_presets(me, &npresets);
-        presets = snewn(npresets, game_params *);
-        for (i = 0; i < npresets; i++)
-            presets[i] = NULL;
-
-        populate_js_preset_menu(0, menu);
-
-        if (thegame.can_configure)
-            js_add_preset(0, "Custom", -1);
-
-        have_presets_dropdown = true;
-
-        /*
-         * Now ensure the appropriate element of the presets menu
-         * starts off selected, in case it isn't the first one in the
-         * list (e.g. Slant).
-         */
-        select_appropriate_preset();
-    }
-
-    /*
-     * Remove the Solve button if the game doesn't support it.
-     */
-    if (!thegame.can_solve)
-        js_remove_solve_button();
-
-    /*
-     * Retrieve the game's colours, and convert them into #abcdef type
-     * hex ID strings.
-     */
-    colours = midend_colours(me, &ncolours);
-    colour_strings = snewn(ncolours, char *);
-    for (i = 0; i < ncolours; i++) {
-        char col[40];
-        sprintf(col, "#%02x%02x%02x",
-                (unsigned)(0.5 + 255 * colours[i*3+0]),
-                (unsigned)(0.5 + 255 * colours[i*3+1]),
-                (unsigned)(0.5 + 255 * colours[i*3+2]));
-        colour_strings[i] = dupstr(col);
-    }
-
-    /*
-     * Request notification when the game ids change (e.g. if the user
-     * presses 'n', and also when Mines supersedes its game
-     * description), so that we can proactively update the permalink.
-     */
-    midend_request_id_changes(me, ids_changed, NULL);
-
-    /*
-     * Draw the puzzle's initial state, and set up the permalinks and
-     * undo/redo greying out.
-     */
-    midend_redraw(me);
-    update_permalinks();
-    update_undo_redo();
-
-    /*
-     * If we were given an erroneous game ID in argv[1], now's the
-     * time to put up the error box about it, after we've fully set up
-     * a random puzzle. Then when the user clicks 'ok', we have a
-     * puzzle for them.
-     */
-    if (param_err)
-        js_error_box(param_err);
-
-    /*
-     * Done. Return to JS, and await callbacks!
-     */
-    return 0;
-}
diff --git a/apps/plugins/puzzles/src/fifteen.R b/apps/plugins/puzzles/src/fifteen.R
deleted file mode 100644
index b2292acc69..0000000000
--- a/apps/plugins/puzzles/src/fifteen.R
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- makefile -*-
-
-fifteen  : [X] GTK COMMON fifteen fifteen-icon|no-icon
-
-fifteen  : [G] WINDOWS COMMON fifteen fifteen.res|noicon.res
-
-fifteensolver :    [U] fifteen[STANDALONE_SOLVER] STANDALONE
-fifteensolver :    [C] fifteen[STANDALONE_SOLVER] STANDALONE
-
-ALL += fifteen[COMBINED]
-
-!begin am gtk
-GAMES += fifteen
-!end
-
-!begin >list.c
-    A(fifteen) \
-!end
-
-!begin >gamedesc.txt
-fifteen:fifteen.exe:Fifteen:Sliding block puzzle:Slide the tiles around to arrange them into order.
-!end
diff --git a/apps/plugins/puzzles/src/fifteen.c b/apps/plugins/puzzles/src/fifteen.c
index 4b877dc098..a2a9554523 100644
--- a/apps/plugins/puzzles/src/fifteen.c
+++ b/apps/plugins/puzzles/src/fifteen.c
@@ -7,7 +7,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -138,6 +143,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 2 || params->h < 2)
         return "Width and height must both be at least two";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
 
     return NULL;
 }
@@ -156,6 +163,14 @@ static int perm_parity(int *perm, int n)
     return ret;
 }
 
+static int is_completed(int *tiles, int n) {
+    int p;
+    for (p = 0; p < n; p++)
+        if (tiles[p] != (p < n-1 ? p+1 : 0))
+            return 0;
+    return 1;
+}
+
 static char *new_game_desc(const game_params *params, random_state *rs,
                            char **aux, bool interactive)
 {
@@ -171,81 +186,83 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     tiles = snewn(n, int);
     used = snewn(n, bool);
 
-    for (i = 0; i < n; i++) {
-        tiles[i] = -1;
-        used[i] = false;
-    }
+    do {
+        for (i = 0; i < n; i++) {
+            tiles[i] = -1;
+            used[i] = false;
+        }
 
-    gap = random_upto(rs, n);
-    tiles[gap] = 0;
-    used[0] = true;
+        gap = random_upto(rs, n);
+        tiles[gap] = 0;
+        used[0] = true;
 
-    /*
-     * Place everything else except the last two tiles.
-     */
-    for (x = 0, i = n-1; i > 2; i--) {
-        int k = random_upto(rs, i);
-        int j;
+        /*
+         * Place everything else except the last two tiles.
+         */
+        for (x = 0, i = n - 1; i > 2; i--) {
+            int k = random_upto(rs, i);
+            int j;
 
-        for (j = 0; j < n; j++)
-            if (!used[j] && (k-- == 0))
-                break;
+            for (j = 0; j < n; j++)
+                if (!used[j] && (k-- == 0))
+                    break;
 
-        assert(j < n && !used[j]);
-        used[j] = true;
+            assert(j < n && !used[j]);
+            used[j] = true;
+
+            while (tiles[x] >= 0)
+                x++;
+            assert(x < n);
+            tiles[x] = j;
+        }
 
+        /*
+         * Find the last two locations, and the last two pieces.
+         */
         while (tiles[x] >= 0)
             x++;
         assert(x < n);
-        tiles[x] = j;
-    }
-
-    /*
-     * Find the last two locations, and the last two pieces.
-     */
-    while (tiles[x] >= 0)
-        x++;
-    assert(x < n);
-    x1 = x;
-    x++;
-    while (tiles[x] >= 0)
+        x1 = x;
         x++;
-    assert(x < n);
-    x2 = x;
-
-    for (i = 0; i < n; i++)
-        if (!used[i])
-            break;
-    p1 = i;
-    for (i = p1+1; i < n; i++)
-        if (!used[i])
-            break;
-    p2 = i;
+        while (tiles[x] >= 0)
+            x++;
+        assert(x < n);
+        x2 = x;
 
-    /*
-     * Determine the required parity of the overall permutation.
-     * This is the XOR of:
-     * 
-     *  - The chessboard parity ((x^y)&1) of the gap square. The
-     *    bottom right counts as even.
-     * 
-     *  - The parity of n. (The target permutation is 1,...,n-1,0
-     *    rather than 0,...,n-1; this is a cyclic permutation of
-     *    the starting point and hence is odd iff n is even.)
-     */
-    parity = PARITY_P(params, gap);
+        for (i = 0; i < n; i++)
+            if (!used[i])
+                break;
+        p1 = i;
+        for (i = p1 + 1; i < n; i++)
+            if (!used[i])
+                break;
+        p2 = i;
 
-    /*
-     * Try the last two tiles one way round. If that fails, swap
-     * them.
-     */
-    tiles[x1] = p1;
-    tiles[x2] = p2;
-    if (perm_parity(tiles, n) != parity) {
-        tiles[x1] = p2;
-        tiles[x2] = p1;
-        assert(perm_parity(tiles, n) == parity);
-    }
+        /*
+         * Determine the required parity of the overall permutation.
+         * This is the XOR of:
+         *
+         *      - The chessboard parity ((x^y)&1) of the gap square. The
+         *        bottom right counts as even.
+         *
+         *  - The parity of n. (The target permutation is 1,...,n-1,0
+         *    rather than 0,...,n-1; this is a cyclic permutation of
+         *    the starting point and hence is odd iff n is even.)
+         */
+        parity = PARITY_P(params, gap);
+
+        /*
+         * Try the last two tiles one way round. If that fails, swap
+         * them.
+         */
+        tiles[x1] = p1;
+        tiles[x2] = p2;
+        if (perm_parity(tiles, n) != parity) {
+            tiles[x1] = p2;
+            tiles[x2] = p1;
+            assert(perm_parity(tiles, n) == parity);
+        }
+    } while (is_completed(tiles, n));
 
     /*
      * Now construct the game description, by describing the tile
@@ -432,22 +449,68 @@ static char *game_text_format(const game_state *state)
     return ret;
 }
 
+struct game_ui {
+    /*
+     * User-preference option: invert the direction of arrow-key
+     * control, so that the arrow on the key you press indicates in
+     * which direction you want the _space_ to move, rather than in
+     * which direction you want a tile to move to fill the space.
+     */
+    bool invert_cursor;
+};
+
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int invert_cursor = -1;
+
+    if (!initialised) {
+        initialised = true;
+        invert_cursor = getenv_bool("FIFTEEN_INVERT_CURSOR", -1);
+    }
+
+    if (invert_cursor != -1)
+        ui_out->invert_cursor = invert_cursor;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
-    return NULL;
+    struct game_ui *ui = snew(struct game_ui);
+
+    ui->invert_cursor = false;
+
+    legacy_prefs_override(ui);
+
+    return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Sense of arrow keys";
+    ret[0].kw = "arrow-semantics";
+    ret[0].type = C_CHOICES;
+    ret[0].u.choices.choicenames = ":Move the tile:Move the gap";
+    ret[0].u.choices.choicekws = ":tile:gap";
+    ret[0].u.choices.selected = ui->invert_cursor;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->invert_cursor = cfg[0].u.choices.selected;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -692,28 +755,23 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int cy = Y(state, state->gap_pos), ny = cy;
     char buf[80];
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (button == LEFT_BUTTON) {
         nx = FROMCOORD(x);
         ny = FROMCOORD(y);
         if (nx < 0 || nx >= state->w || ny < 0 || ny >= state->h)
-            return NULL;               /* out of bounds */
+            return MOVE_UNUSED;               /* out of bounds */
     } else if (IS_CURSOR_MOVE(button)) {
-        static int invert_cursor = -1;
-        if (invert_cursor == -1) {
-            char *env = getenv("FIFTEEN_INVERT_CURSOR");
-            invert_cursor = (env && (env[0] == 'y' || env[0] == 'Y'));
-        }
         button = flip_cursor(button); /* the default */
-        if (invert_cursor)
+        if (ui->invert_cursor)
             button = flip_cursor(button); /* undoes the first flip */
-        move_cursor(button, &nx, &ny, state->w, state->h, false);
+        move_cursor(button, &nx, &ny, state->w, state->h, false, NULL);
     } else if ((button == 'h' || button == 'H') && !state->completed) {
         if (!compute_hint(state, &nx, &ny))
-            return NULL; /* shouldn't happen, since ^^we^^checked^^ */
+            return MOVE_NO_EFFECT;/* shouldn't happen, since ^^we^^checked^^ */
     } else
-        return NULL;                   /* no move */
+        return MOVE_UNUSED;                   /* no move */
 
     /*
      * Any click location should be equal to the gap location
@@ -724,7 +782,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         return dupstr(buf);
     }
 
-    return NULL;
+    return MOVE_NO_EFFECT;
 }
 
 static game_state *execute_move(const game_state *from, const char *move)
@@ -786,11 +844,8 @@ static game_state *execute_move(const game_state *from, const char *move)
     /*
      * See if the game has been completed.
      */
-    if (!ret->completed) {
+    if (!ret->completed && is_completed(ret->tiles, ret->n)) {
         ret->completed = ret->movecount;
-        for (p = 0; p < ret->n; p++)
-            if (ret->tiles[p] != (p < ret->n-1 ? p+1 : 0))
-                ret->completed = 0;
     }
 
     return ret;
@@ -801,7 +856,7 @@ static game_state *execute_move(const game_state *from, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -904,13 +959,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int coords[10];
 
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * state->w + 2 * BORDER,
-                  TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND);
-        draw_update(dr, 0, 0,
-                    TILE_SIZE * state->w + 2 * BORDER,
-                    TILE_SIZE * state->h + 2 * BORDER);
-
         /*
          * Recessed area containing the whole puzzle.
          */
@@ -1077,19 +1125,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame fifteen
 #endif
@@ -1111,12 +1146,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    NULL, /* current_key_label */
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1128,9 +1165,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/filling.R b/apps/plugins/puzzles/src/filling.R
deleted file mode 100644
index cffbafaa0a..0000000000
--- a/apps/plugins/puzzles/src/filling.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-FILLING_EXTRA = dsf
-
-fillingsolver : [U] filling[STANDALONE_SOLVER] FILLING_EXTRA STANDALONE
-fillingsolver : [C] filling[STANDALONE_SOLVER] FILLING_EXTRA STANDALONE
-
-filling : [X] GTK COMMON filling FILLING_EXTRA filling-icon|no-icon
-
-filling : [G] WINDOWS COMMON filling FILLING_EXTRA filling.res|noicon.res
-
-ALL += filling[COMBINED] FILLING_EXTRA
-
-!begin am gtk
-GAMES += filling
-!end
-
-!begin >list.c
-    A(filling) \
-!end
-
-!begin >gamedesc.txt
-filling:filling.exe:Filling:Polyomino puzzle:Mark every square with the area of its containing region.
-!end
diff --git a/apps/plugins/puzzles/src/filling.c b/apps/plugins/puzzles/src/filling.c
index 6d9beb5c28..a0c144714b 100644
--- a/apps/plugins/puzzles/src/filling.c
+++ b/apps/plugins/puzzles/src/filling.c
@@ -1,4 +1,4 @@
-/* -*- tab-width: 8; indent-tabs-mode: t -*-
+/*
  * filling.c: An implementation of the Nikoli game fillomino.
  * Copyright (C) 2007 Jonas Kölker.  See LICENSE for the license.
  */
@@ -58,7 +58,11 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -68,16 +72,11 @@
 
 static bool verbose;
 
-static void printv(const char *fmt, ...) {
-#if !defined(PALM) && !defined(ROCKBOX)
-    if (verbose) {
-        va_list va;
-        va_start(va, fmt);
-        vprintf(fmt, va);
-        va_end(va);
-    }
+#ifdef STANDALONE_SOLVER
+#define printv    if (!verbose); else printf
+#else
+#define printv(...)
 #endif
-}
 
 /*****************************************************************************
  * GAME CONFIGURATION AND PARAMETERS                                         *
@@ -188,6 +187,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 1) return "Width must be at least one";
     if (params->h < 1) return "Height must be at least one";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
 
     return NULL;
 }
@@ -289,14 +290,15 @@ static const int dy[4] = {0, 0, -1, 1};
 
 struct solver_state
 {
-    int *dsf;
+    DSF *dsf;
     int *board;
     int *connected;
     int nempty;
 
     /* Used internally by learn_bitmap_deductions; kept here to avoid
      * mallocing/freeing them every time that function is called. */
-    int *bm, *bmdsf, *bmminsize;
+    int *bm, *bmminsize;
+    DSF *bmdsf;
 };
 
 static void print_board(int *board, int w, int h) {
@@ -310,7 +312,7 @@ static void print_board(int *board, int w, int h) {
 static game_state *new_game(midend *, const game_params *, const char *);
 static void free_game(game_state *);
 
-#define SENTINEL sz
+#define SENTINEL (sz+1)
 
 static bool mark_region(int *board, int w, int h, int i, int n, int m) {
     int j;
@@ -390,7 +392,8 @@ static void make_board(int *board, int w, int h, random_state *rs) {
     /* Note that if 1 in {w, h} then it's impossible to have a region
      * of size > w*h, so the special case only affects w=h=2. */
 
-    int i, *dsf;
+    int i;
+    DSF *dsf;
     bool change;
 
     assert(w >= 1);
@@ -401,9 +404,9 @@ static void make_board(int *board, int w, int h, random_state *rs) {
      * contains a shuffled list of numbers {0, ..., sz-1}. */
     for (i = 0; i < sz; ++i) board[i] = i;
 
-    dsf = snewn(sz, int);
+    dsf = dsf_new(sz);
 retry:
-    dsf_init(dsf, sz);
+    dsf_reinit(dsf);
     shuffle(board, sz, sizeof (int), rs);
 
     do {
@@ -414,10 +417,15 @@ retry:
             int merge = SENTINEL, min = maxsize - size + 1;
             bool error = false;
             int neighbour, neighbour_size, j;
+            int directions[4];
+
+            for (j = 0; j < 4; ++j)
+                directions[j] = j;
+            shuffle(directions, 4, sizeof(int), rs);
 
             for (j = 0; j < 4; ++j) {
-                const int x = (board[i] % w) + dx[j];
-                const int y = (board[i] / w) + dy[j];
+                const int x = (board[i] % w) + dx[directions[j]];
+                const int y = (board[i] / w) + dy[directions[j]];
                 if (x < 0 || x >= w || y < 0 || y >= h) continue;
 
                 neighbour = dsf_canonify(dsf, w*y + x);
@@ -429,7 +437,7 @@ retry:
                 /* find the smallest neighbour to merge with, which
                  * wouldn't make the region too large.  (This is
                  * guaranteed by the initial value of `min'.) */
-                if (neighbour_size < min) {
+                if (neighbour_size < min && random_upto(rs, 10)) {
                     min = neighbour_size;
                     merge = neighbour;
                 }
@@ -453,10 +461,10 @@ retry:
     for (i = 0; i < sz; ++i) board[i] = dsf_size(dsf, i);
     merge_ones(board, w, h);
 
-    sfree(dsf);
+    dsf_free(dsf);
 }
 
-static void merge(int *dsf, int *connected, int a, int b) {
+static void merge(DSF *dsf, int *connected, int a, int b) {
     int c;
     assert(dsf);
     assert(connected);
@@ -532,7 +540,7 @@ static bool check_capacity(int *board, int w, int h, int i) {
     return n == 0;
 }
 
-static int expandsize(const int *board, int *dsf, int w, int h, int i, int n) {
+static int expandsize(const int *board, DSF *dsf, int w, int h, int i, int n) {
     int j;
     int nhits = 0;
     int hits[4];
@@ -548,7 +556,7 @@ static int expandsize(const int *board, int *dsf, int w, int h, int i, int n) {
         root = dsf_canonify(dsf, idx);
         for (m = 0; m < nhits && root != hits[m]; ++m);
         if (m < nhits) continue;
-        printv("\t  (%d, %d) contrib %d to size\n", x, y, dsf[root] >> 2);
+        printv("\t  (%d, %d) contrib %d to size\n", x, y, dsf_size(dsf, root));
         size += dsf_size(dsf, root);
         assert(dsf_size(dsf, root) >= 1);
         hits[nhits++] = root;
@@ -833,7 +841,7 @@ static bool learn_bitmap_deductions(struct solver_state *s, int w, int h)
 {
     const int sz = w * h;
     int *bm = s->bm;
-    int *dsf = s->bmdsf;
+    DSF *dsf = s->bmdsf;
     int *minsize = s->bmminsize;
     int x, y, i, j, n;
     bool learn = false;
@@ -933,7 +941,7 @@ static bool learn_bitmap_deductions(struct solver_state *s, int w, int h)
      * have a completely new n-region in it.
      */
     for (n = 1; n <= 9; n++) {
-        dsf_init(dsf, sz);
+        dsf_reinit(dsf);
 
         /* Build the dsf */
         for (y = 0; y < h; y++)
@@ -1076,12 +1084,12 @@ static bool solver(const int *orig, int w, int h, char **solution) {
 
     struct solver_state ss;
     ss.board = memdup(orig, sz, sizeof (int));
-    ss.dsf = snew_dsf(sz); /* eqv classes: connected components */
+    ss.dsf = dsf_new(sz); /* eqv classes: connected components */
     ss.connected = snewn(sz, int); /* connected[n] := n.next; */
     /* cyclic disjoint singly linked lists, same partitioning as dsf.
      * The lists lets you iterate over a partition given any member */
     ss.bm = snewn(sz, int);
-    ss.bmdsf = snew_dsf(sz);
+    ss.bmdsf = dsf_new(sz);
     ss.bmminsize = snewn(sz, int);
 
     printv("trying to solve this:\n");
@@ -1105,28 +1113,26 @@ static bool solver(const int *orig, int w, int h, char **solution) {
         **solution = 's';
         for (i = 0; i < sz; ++i) (*solution)[i + 1] = ss.board[i] + '0';
         (*solution)[sz + 1] = '\0';
-        /* We don't need the \0 for execute_move (the only user)
-         * I'm just being printf-friendly in case I wanna print */
     }
 
-    sfree(ss.dsf);
+    dsf_free(ss.dsf);
     sfree(ss.board);
     sfree(ss.connected);
     sfree(ss.bm);
-    sfree(ss.bmdsf);
+    dsf_free(ss.bmdsf);
     sfree(ss.bmminsize);
 
     return !ss.nempty;
 }
 
-static int *make_dsf(int *dsf, int *board, const int w, const int h) {
+static DSF *make_dsf(DSF *dsf, int *board, const int w, const int h) {
     const int sz = w * h;
     int i;
 
     if (!dsf)
-        dsf = snew_dsf(w * h);
+        dsf = dsf_new_min(w * h);
     else
-        dsf_init(dsf, w * h);
+        dsf_reinit(dsf);
 
     for (i = 0; i < sz; ++i) {
         int j;
@@ -1145,7 +1151,8 @@ static void minimize_clue_set(int *board, int w, int h, random_state *rs)
 {
     const int sz = w * h;
     int *shuf = snewn(sz, int), i;
-    int *dsf, *next;
+    DSF *dsf;
+    int *next;
 
     for (i = 0; i < sz; ++i) shuf[i] = i;
     shuffle(shuf, sz, sizeof (int), rs);
@@ -1162,14 +1169,14 @@ static void minimize_clue_set(int *board, int w, int h, random_state *rs)
     dsf = make_dsf(NULL, board, w, h);
     next = snewn(sz, int);
     for (i = 0; i < sz; ++i) {
-        int j = dsf_canonify(dsf, i);
+        int j = dsf_minimal(dsf, i);
         if (i == j) {
             /* First cell of a region; set next[i] = -1 to indicate
              * end-of-list. */
             next[i] = -1;
         } else {
             /* Add this cell to a region which already has a
-             * linked-list head, by pointing the canonical element j
+             * linked-list head, by pointing the minimal element j
              * at this one, and pointing this one in turn at wherever
              * j previously pointed. (This should end up with the
              * elements linked in the order 1,n,n-1,n-2,...,2, which
@@ -1197,7 +1204,7 @@ static void minimize_clue_set(int *board, int w, int h, random_state *rs)
      * if we can.
      */
     for (i = 0; i < sz; ++i) {
-        int j = dsf_canonify(dsf, shuf[i]);
+        int j = dsf_minimal(dsf, shuf[i]);
         if (next[j] != -2) {
             int tmp = board[j];
             int k;
@@ -1217,7 +1224,7 @@ static void minimize_clue_set(int *board, int w, int h, random_state *rs)
         }
     }
     sfree(next);
-    sfree(dsf);
+    dsf_free(dsf);
 
     /*
      * Now go through individual cells, in the same shuffled order,
@@ -1391,7 +1398,7 @@ static game_ui *new_ui(const game_state *state)
 
     ui->sel = NULL;
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->keydragging = false;
 
     return ui;
@@ -1404,15 +1411,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
@@ -1424,6 +1422,23 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     ui->keydragging = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    const int w = state->shared->params.w;
+
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible) {
+        if (button == CURSOR_SELECT) {
+            if (ui->keydragging) return "Stop";
+            return "Multiselect";
+        }
+        if (button == CURSOR_SELECT2 &&
+            !state->shared->clues[w*ui->cur_y + ui->cur_x])
+            return (ui->sel[w*ui->cur_y + ui->cur_x]) ? "Deselect" : "Select";
+    }
+    return "";
+}
+
 #define PREFERRED_TILE_SIZE 32
 #define TILE_SIZE (ds->tilesize)
 #define BORDER (TILE_SIZE / 2)
@@ -1434,7 +1449,8 @@ struct game_drawstate {
     int tilesize;
     bool started;
     int *v, *flags;
-    int *dsf_scratch, *border_scratch;
+    DSF *dsf_scratch;
+    int *border_scratch;
 };
 
 static char *interpret_move(const game_state *state, game_ui *ui,
@@ -1453,7 +1469,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     assert(ui);
     assert(ds);
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (button == LEFT_BUTTON || button == LEFT_DRAG) {
         /* A left-click anywhere will clear the current selection. */
@@ -1472,22 +1488,22 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->sel[w*ty+tx] = true;
         }
         ui->cur_visible = false;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_CURSOR_MOVE(button)) {
         ui->cur_visible = true;
-        move_cursor(button, &ui->cur_x, &ui->cur_y, w, h, false);
+        move_cursor(button, &ui->cur_x, &ui->cur_y, w, h, false, NULL);
         if (ui->keydragging) goto select_square;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
     if (button == CURSOR_SELECT) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         ui->keydragging = !ui->keydragging;
-        if (!ui->keydragging) return UI_UPDATE;
+        if (!ui->keydragging) return MOVE_UI_UPDATE;
 
       select_square:
         if (!ui->sel) {
@@ -1496,12 +1512,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
         if (!state->shared->clues[w*ui->cur_y + ui->cur_x])
             ui->sel[w*ui->cur_y + ui->cur_x] = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
     if (button == CURSOR_SELECT2) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (!ui->sel) {
             ui->sel = snewn(w*h, bool);
@@ -1515,19 +1531,19 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             sfree(ui->sel);
             ui->sel = NULL;
         }
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (button == '\b' || button == 27) {
         sfree(ui->sel);
         ui->sel = NULL;
         ui->keydragging = false;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
-    if (button < '0' || button > '9') return NULL;
+    if (button < '0' || button > '9') return MOVE_UNUSED;
     button -= '0';
-    if (button > (w == 2 && h == 2 ? 3 : max(w, h))) return NULL;
+    if (button > (w == 2 && h == 2 ? 3 : max(w, h))) return MOVE_UNUSED;
     ui->keydragging = false;
 
     for (i = 0; i < w*h; i++) {
@@ -1553,11 +1569,11 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         move = srealloc(move, strlen(move)+strlen(buf)+1);
         strcat(move, buf);
     }
-    if (!ui->sel) return move ? move : NULL;
+    if (!ui->sel) return move ? move : MOVE_NO_EFFECT;
     sfree(ui->sel);
     ui->sel = NULL;
     /* Need to update UI at least, as we cleared the selection */
-    return move ? move : UI_UPDATE;
+    return move ? move : MOVE_UI_UPDATE;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -1567,6 +1583,7 @@ static game_state *execute_move(const game_state *state, const char *move)
 
     if (*move == 's') {
         int i = 0;
+        if (strlen(move) != sz + 1) return NULL;
         new_state = dup_game(state);
         for (++move; i < sz; ++i) new_state->board[i] = move[i] - '0';
         new_state->cheated = true;
@@ -1596,10 +1613,10 @@ static game_state *execute_move(const game_state *state, const char *move)
         const int w = new_state->shared->params.w;
         const int h = new_state->shared->params.h;
         const int sz = w * h;
-        int *dsf = make_dsf(NULL, new_state->board, w, h);
+        DSF *dsf = make_dsf(NULL, new_state->board, w, h);
         int i;
         for (i = 0; i < sz && new_state->board[i] == dsf_size(dsf, i); ++i);
-        sfree(dsf);
+        dsf_free(dsf);
         if (i == sz)
             new_state->completed = true;
     }
@@ -1630,7 +1647,7 @@ enum {
 };
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     *x = (params->w + 1) * tilesize;
     *y = (params->h + 1) * tilesize;
@@ -1652,9 +1669,9 @@ static float *game_colours(frontend *fe, int *ncolours)
     ret[COL_GRID * 3 + 1] = 0.0F;
     ret[COL_GRID * 3 + 2] = 0.0F;
 
-    ret[COL_HIGHLIGHT * 3 + 0] = 0.85F * ret[COL_BACKGROUND * 3 + 0];
-    ret[COL_HIGHLIGHT * 3 + 1] = 0.85F * ret[COL_BACKGROUND * 3 + 1];
-    ret[COL_HIGHLIGHT * 3 + 2] = 0.85F * ret[COL_BACKGROUND * 3 + 2];
+    ret[COL_HIGHLIGHT * 3 + 0] = 0.7F * ret[COL_BACKGROUND * 3 + 0];
+    ret[COL_HIGHLIGHT * 3 + 1] = 0.7F * ret[COL_BACKGROUND * 3 + 1];
+    ret[COL_HIGHLIGHT * 3 + 2] = 0.7F * ret[COL_BACKGROUND * 3 + 2];
 
     ret[COL_CORRECT * 3 + 0] = 0.9F * ret[COL_BACKGROUND * 3 + 0];
     ret[COL_CORRECT * 3 + 1] = 0.9F * ret[COL_BACKGROUND * 3 + 1];
@@ -1699,7 +1716,7 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
     sfree(ds->v);
     sfree(ds->flags);
     sfree(ds->border_scratch);
-    sfree(ds->dsf_scratch);
+    dsf_free(ds->dsf_scratch);
     sfree(ds);
 }
 
@@ -2016,17 +2033,8 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         (flashtime <= FLASH_TIME/3 || flashtime >= FLASH_TIME*2/3);
 
     if (!ds->started) {
-        /*
-         * The initial contents of the window are not guaranteed and
-         * can vary with front ends. To be on the safe side, all games
-         * should start by drawing a big background-colour rectangle
-         * covering the whole window.
-         */
-        draw_rect(dr, 0, 0, w*TILE_SIZE + 2*BORDER, h*TILE_SIZE + 2*BORDER,
-                  COL_BACKGROUND);
-
         /*
-         * Smaller black rectangle which is the main grid.
+         * Black rectangle which is the main grid.
          */
         draw_rect(dr, BORDER - BORDER_WIDTH, BORDER - BORDER_WIDTH,
                   w*TILE_SIZE + 2*BORDER_WIDTH + 1,
@@ -2079,24 +2087,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     const int w = state->shared->params.w;
     const int h = state->shared->params.h;
@@ -2164,12 +2169,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     game_request_keys,
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2183,13 +2190,18 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                                 /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_NUMPAD,                    /* flags */
 };
 
 #ifdef STANDALONE_SOLVER /* solver? hah! */
 
 int main(int argc, char **argv) {
+    if (!strcmp(argv[1], "--verbose")) {
+        verbose = true;
+        argv++;
+    }
+
     while (*++argv) {
         game_params *params;
         game_state *state;
diff --git a/apps/plugins/puzzles/src/flip.R b/apps/plugins/puzzles/src/flip.R
deleted file mode 100644
index 03241f015b..0000000000
--- a/apps/plugins/puzzles/src/flip.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-FLIP_EXTRA = tree234
-
-flip     : [X] GTK COMMON flip FLIP_EXTRA flip-icon|no-icon
-
-flip     : [G] WINDOWS COMMON flip FLIP_EXTRA flip.res|noicon.res
-
-ALL += flip[COMBINED] FLIP_EXTRA
-
-!begin am gtk
-GAMES += flip
-!end
-
-!begin >list.c
-    A(flip) \
-!end
-
-!begin >gamedesc.txt
-flip:flip.exe:Flip:Tile inversion puzzle:Flip groups of squares to light them all up at once.
-!end
diff --git a/apps/plugins/puzzles/src/flip.c b/apps/plugins/puzzles/src/flip.c
index 5d4f2250aa..044d6c30c3 100644
--- a/apps/plugins/puzzles/src/flip.c
+++ b/apps/plugins/puzzles/src/flip.c
@@ -8,7 +8,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -181,9 +186,16 @@ static game_params *custom_params(const config_item *cfg)
 
 static const char *validate_params(const game_params *params, bool full)
 {
+    int wh;
+
     if (params->w <= 0 || params->h <= 0)
         return "Width and height must both be greater than zero";
-    return NULL;
+    if (params->w > (INT_MAX - 3) / params->h)
+        return "Width times height must not be unreasonably large";
+    wh = params->w * params->h;
+    if (wh > (INT_MAX - 3) / wh)
+        return "Width times height is too large";    
+   return NULL;
 }
 
 static char *encode_bitmap(unsigned char *bmp, int len)
@@ -905,7 +917,7 @@ static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     ui->cx = ui->cy = 0;
-    ui->cdraw = false;
+    ui->cdraw = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     return ui;
 }
 
@@ -914,18 +926,16 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    if (IS_CURSOR_SELECT(button)) return "Flip";
+    return "";
 }
 
 struct game_drawstate {
@@ -940,7 +950,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                             int x, int y, int button)
 {
     int w = state->w, h = state->h, wh = w * h;
-    char buf[80], *nullret = NULL;
+    char buf[80], *nullret = MOVE_UNUSED;
 
     if (button == LEFT_BUTTON || IS_CURSOR_SELECT(button)) {
         int tx, ty;
@@ -951,7 +961,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             tx = ui->cx; ty = ui->cy;
             ui->cdraw = true;
         }
-        nullret = UI_UPDATE;
+        nullret = MOVE_UI_UPDATE;
 
         if (tx >= 0 && tx < w && ty >= 0 && ty < h) {
             /*
@@ -969,25 +979,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 sprintf(buf, "M%d,%d", tx, ty);
                 return dupstr(buf);
             } else {
-                return NULL;
+                return MOVE_NO_EFFECT;
             }
         }
-    }
-    else if (IS_CURSOR_MOVE(button)) {
-        int dx = 0, dy = 0;
-        switch (button) {
-        case CURSOR_UP:         dy = -1; break;
-        case CURSOR_DOWN:       dy = 1; break;
-        case CURSOR_RIGHT:      dx = 1; break;
-        case CURSOR_LEFT:       dx = -1; break;
-        default: assert(!"shouldn't get here");
-        }
-        ui->cx += dx; ui->cy += dy;
-        ui->cx = min(max(ui->cx, 0), state->w - 1);
-        ui->cy = min(max(ui->cy, 0), state->h - 1);
-        ui->cdraw = true;
-        nullret = UI_UPDATE;
-    }
+    } else if (IS_CURSOR_MOVE(button))
+        nullret = move_cursor(button, &ui->cx, &ui->cy, state->w, state->h,
+                              false, &ui->cdraw);
 
     return nullret;
 }
@@ -1045,7 +1042,7 @@ static game_state *execute_move(const game_state *from, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1145,7 +1142,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, const game_state *state,
         coords[7] = by + TILE_SIZE - (int)((float)TILE_SIZE * animtime);
 
         colour = (tile & 1 ? COL_WRONG : COL_RIGHT);
-        if (animtime < 0.5)
+        if (animtime < 0.5F)
             colour = COL_WRONG + COL_RIGHT - colour;
 
         draw_polygon(dr, coords, 4, colour, COL_GRID);
@@ -1159,7 +1156,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, const game_state *state,
         for (j = 0; j < w; j++)
             if (state->matrix->matrix[(y*w+x)*wh + i*w+j]) {
                 int ox = j - x, oy = i - y;
-                int td = TILE_SIZE / 16;
+                int td = TILE_SIZE / 16 ? TILE_SIZE / 16 : 1;
                 int cx = (bx + TILE_SIZE/2) + (2 * ox - 1) * td;
                 int cy = (by + TILE_SIZE/2) + (2 * oy - 1) * td;
                 if (ox == 0 && oy == 0)
@@ -1202,9 +1199,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int i, flashframe;
 
     if (!ds->started) {
-        draw_rect(dr, 0, 0, TILE_SIZE * w + 2 * BORDER,
-                  TILE_SIZE * h + 2 * BORDER, COL_BACKGROUND);
-
         /*
          * Draw the grid lines.
          */
@@ -1309,19 +1303,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame flip
 #endif
@@ -1343,12 +1324,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1360,8 +1343,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
diff --git a/apps/plugins/puzzles/src/flood.R b/apps/plugins/puzzles/src/flood.R
deleted file mode 100644
index 359bbb5dce..0000000000
--- a/apps/plugins/puzzles/src/flood.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-flood     : [X] GTK COMMON flood flood-icon|no-icon
-
-flood     : [G] WINDOWS COMMON flood flood.res|noicon.res
-
-ALL += flood[COMBINED]
-
-!begin am gtk
-GAMES += flood
-!end
-
-!begin >list.c
-    A(flood) \
-!end
-
-!begin >gamedesc.txt
-flood:flood.exe:Flood:Flood-filling puzzle:Turn the grid the same colour in as few flood fills as possible.
-!end
diff --git a/apps/plugins/puzzles/src/flood.c b/apps/plugins/puzzles/src/flood.c
index 74214a50b6..fe809745db 100644
--- a/apps/plugins/puzzles/src/flood.c
+++ b/apps/plugins/puzzles/src/flood.c
@@ -31,7 +31,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -140,13 +145,13 @@ static void decode_params(game_params *ret, char const *string)
         if (*string == 'c') {
             string++;
             ret->colours = atoi(string);
-            while (string[1] && isdigit((unsigned char)string[1])) string++;
+            while (*string && isdigit((unsigned char)*string)) string++;
         } else if (*string == 'm') {
             string++;
             ret->leniency = atoi(string);
-            while (string[1] && isdigit((unsigned char)string[1])) string++;
-        }
-        string++;
+            while (*string && isdigit((unsigned char)*string)) string++;
+        } else
+            string++;
     }
 }
 
@@ -210,7 +215,9 @@ static const char *validate_params(const game_params *params, bool full)
     if (params->w * params->h < 2)
         return "Grid must contain at least two squares";
     if (params->w < 1 || params->h < 1)
-        return "Width and height must both be at least one";
+        return "Width and height must be at least one";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->colours < 3 || params->colours > 10)
         return "Must have between 3 and 10 colours";
     if (params->leniency < 0)
@@ -554,8 +561,10 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     /*
      * Invent a random grid.
      */
-    for (i = 0; i < wh; i++)
-        scratch->grid[i] = random_upto(rs, params->colours);
+    do {
+        for (i = 0; i < wh; i++)
+            scratch->grid[i] = random_upto(rs, params->colours);
+    } while (completed(w, h, scratch->grid));
 
     /*
      * Run the solver, and count how many moves it uses.
@@ -770,7 +779,7 @@ struct game_ui {
 static game_ui *new_ui(const game_state *state)
 {
     struct game_ui *ui = snew(struct game_ui);
-    ui->cursor_visible = false;
+    ui->cursor_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->cx = FILLX;
     ui->cy = FILLY;
     return ui;
@@ -781,18 +790,21 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    if (button == CURSOR_SELECT &&
+        state->grid[0] != state->grid[ui->cy*state->w+ui->cx])
+        return "Fill";
+    if (button == CURSOR_SELECT2 &&
+        state->soln && state->solnpos < state->soln->nmoves)
+        return "Advance";
+    return "";
 }
 
 struct game_drawstate {
@@ -818,35 +830,26 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 {
     int w = state->w, h = state->h;
     int tx = -1, ty = -1, move = -1;
+    char *nullret = MOVE_NO_EFFECT;
 
     if (button == LEFT_BUTTON) {
         tx = FROMCOORD(x);
         ty = FROMCOORD(y);
-        ui->cursor_visible = false;
-    } else if (button == CURSOR_LEFT && ui->cx > 0) {
-        ui->cx--;
-        ui->cursor_visible = true;
-        return UI_UPDATE;
-    } else if (button == CURSOR_RIGHT && ui->cx+1 < w) {
-        ui->cx++;
-        ui->cursor_visible = true;
-        return UI_UPDATE;
-    } else if (button == CURSOR_UP && ui->cy > 0) {
-        ui->cy--;
-        ui->cursor_visible = true;
-        return UI_UPDATE;
-    } else if (button == CURSOR_DOWN && ui->cy+1 < h) {
-        ui->cy++;
-        ui->cursor_visible = true;
-        return UI_UPDATE;
+        if (ui->cursor_visible) {
+            ui->cursor_visible = false;
+            nullret = MOVE_UI_UPDATE;
+        }
+    } else if (IS_CURSOR_MOVE(button)) {
+        return move_cursor(button, &ui->cx, &ui->cy, w, h, false,
+                           &ui->cursor_visible);
     } else if (button == CURSOR_SELECT) {
         tx = ui->cx;
         ty = ui->cy;
-    } else if (button == CURSOR_SELECT2 &&
-               state->soln && state->solnpos < state->soln->nmoves) {
-        move = state->soln->moves[state->solnpos];
+    } else if (button == CURSOR_SELECT2) {
+        if (state->soln && state->solnpos < state->soln->nmoves)
+            move = state->soln->moves[state->solnpos];
     } else {
-        return NULL;
+        return MOVE_UNUSED;
     }
 
     if (tx >= 0 && tx < w && ty >= 0 && ty < h &&
@@ -859,7 +862,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         return dupstr(buf);
     }
 
-    return NULL;
+    return nullret;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -869,7 +872,8 @@ static game_state *execute_move(const game_state *state, const char *move)
 
     if (move[0] == 'M' &&
         sscanf(move+1, "%d", &c) == 1 &&
-        c >= 0 &&
+        c >= 0 && c < state->colours &&
+        c != state->grid[FILLY * state->w + FILLX] &&
         !state->complete) {
         int *queue = snewn(state->w * state->h, int);
         ret = dup_game(state);
@@ -920,11 +924,23 @@ static game_state *execute_move(const game_state *state, const char *move)
 
         sol->moves = snewn(sol->nmoves, char);
         for (i = 0, p = move; i < sol->nmoves; i++) {
-            assert(*p);
+            if (!*p) {
+              badsolve:
+                sfree(sol->moves);
+                sfree(sol);
+                return NULL;
+            };
             sol->moves[i] = atoi(p);
+            if (sol->moves[i] < 0 || sol->moves[i] >= state->colours ||
+                (i == 0 ?
+                 sol->moves[i] == state->grid[FILLY * state->w + FILLX] :
+                 sol->moves[i] == sol->moves[i-1]))
+                /* Solution contains a fill with an invalid colour or
+                 * the current colour. */
+                goto badsolve;
             p += strspn(p, "0123456789");
             if (*p) {
-                assert(*p == ',');
+                if (*p != ',') goto badsolve;
                 p++;
             }
         }
@@ -949,7 +965,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1076,31 +1092,33 @@ static void draw_tile(drawing *dr, game_drawstate *ds,
         colour += COL_1;
     draw_rect(dr, tx, ty, TILESIZE, TILESIZE, colour);
 
-    if (tile & BORDER_L)
-        draw_rect(dr, tx, ty,
-                  SEP_WIDTH, TILESIZE, COL_SEPARATOR);
-    if (tile & BORDER_R)
-        draw_rect(dr, tx + TILESIZE - SEP_WIDTH, ty,
-                  SEP_WIDTH, TILESIZE, COL_SEPARATOR);
-    if (tile & BORDER_U)
-        draw_rect(dr, tx, ty,
-                  TILESIZE, SEP_WIDTH, COL_SEPARATOR);
-    if (tile & BORDER_D)
-        draw_rect(dr, tx, ty + TILESIZE - SEP_WIDTH,
-                  TILESIZE, SEP_WIDTH, COL_SEPARATOR);
-
-    if (tile & CORNER_UL)
-        draw_rect(dr, tx, ty,
-                  SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
-    if (tile & CORNER_UR)
-        draw_rect(dr, tx + TILESIZE - SEP_WIDTH, ty,
-                  SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
-    if (tile & CORNER_DL)
-        draw_rect(dr, tx, ty + TILESIZE - SEP_WIDTH,
-                  SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
-    if (tile & CORNER_DR)
-        draw_rect(dr, tx + TILESIZE - SEP_WIDTH, ty + TILESIZE - SEP_WIDTH,
-                  SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
+    if (SEP_WIDTH > 0) {
+        if (tile & BORDER_L)
+            draw_rect(dr, tx, ty,
+                      SEP_WIDTH, TILESIZE, COL_SEPARATOR);
+        if (tile & BORDER_R)
+            draw_rect(dr, tx + TILESIZE - SEP_WIDTH, ty,
+                      SEP_WIDTH, TILESIZE, COL_SEPARATOR);
+        if (tile & BORDER_U)
+            draw_rect(dr, tx, ty,
+                      TILESIZE, SEP_WIDTH, COL_SEPARATOR);
+        if (tile & BORDER_D)
+            draw_rect(dr, tx, ty + TILESIZE - SEP_WIDTH,
+                      TILESIZE, SEP_WIDTH, COL_SEPARATOR);
+
+        if (tile & CORNER_UL)
+            draw_rect(dr, tx, ty,
+                      SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
+        if (tile & CORNER_UR)
+            draw_rect(dr, tx + TILESIZE - SEP_WIDTH, ty,
+                      SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
+        if (tile & CORNER_DL)
+            draw_rect(dr, tx, ty + TILESIZE - SEP_WIDTH,
+                      SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
+        if (tile & CORNER_DR)
+            draw_rect(dr, tx + TILESIZE - SEP_WIDTH, ty + TILESIZE - SEP_WIDTH,
+                      SEP_WIDTH, SEP_WIDTH, COL_SEPARATOR);
+    }
 
     if (tile & CURSOR)
         draw_rect_outline(dr, tx + CURSOR_INSET, ty + CURSOR_INSET,
@@ -1130,13 +1148,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int coords[10];
 
-        draw_rect(dr, 0, 0,
-                  TILESIZE * w + 2 * BORDER,
-                  TILESIZE * h + 2 * BORDER, COL_BACKGROUND);
-        draw_update(dr, 0, 0,
-                    TILESIZE * w + 2 * BORDER,
-                    TILESIZE * h + 2 * BORDER);
-
         /*
          * Recessed area containing the whole puzzle.
          */
@@ -1326,19 +1337,6 @@ static float game_flash_length(const game_state *oldstate,
     return 0.0F;
 }
 
-static bool game_timing_state(const game_state *state, game_ui *ui)
-{
-    return true;
-}
-
-static void game_print_size(const game_params *params, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame flood
 #endif
@@ -1360,12 +1358,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_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,
@@ -1377,8 +1377,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
diff --git a/apps/plugins/puzzles/src/galaxies.R b/apps/plugins/puzzles/src/galaxies.R
deleted file mode 100644
index 957e5dad90..0000000000
--- a/apps/plugins/puzzles/src/galaxies.R
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- makefile -*-
-
-GALAXIES_EXTRA = dsf
-
-galaxies : [X] GTK COMMON galaxies GALAXIES_EXTRA galaxies-icon|no-icon
-
-galaxies : [G] WINDOWS COMMON galaxies GALAXIES_EXTRA galaxies.res|noicon.res
-
-galaxiessolver : [U] galaxies[STANDALONE_SOLVER] GALAXIES_EXTRA STANDALONE m.lib
-galaxiessolver : [C] galaxies[STANDALONE_SOLVER] GALAXIES_EXTRA STANDALONE
-
-galaxiespicture : [U] galaxies[STANDALONE_PICTURE_GENERATOR] GALAXIES_EXTRA STANDALONE
-                + m.lib
-galaxiespicture : [C] galaxies[STANDALONE_PICTURE_GENERATOR] GALAXIES_EXTRA STANDALONE
-
-ALL += galaxies[COMBINED] GALAXIES_EXTRA
-
-!begin am gtk
-GAMES += galaxies
-!end
-
-!begin >list.c
-    A(galaxies) \
-!end
-
-!begin >gamedesc.txt
-galaxies:galaxies.exe:Galaxies:Symmetric polyomino puzzle:Divide the grid into rotationally symmetric regions each centred on a dot.
-!end
diff --git a/apps/plugins/puzzles/src/galaxies.c b/apps/plugins/puzzles/src/galaxies.c
index 9172b90e12..8859917558 100644
--- a/apps/plugins/puzzles/src/galaxies.c
+++ b/apps/plugins/puzzles/src/galaxies.c
@@ -13,9 +13,46 @@
  * Edges have on/off state; obviously the actual edges of the
  * board are fixed to on, and everything else starts as off.
  *
- * TTD:
-   * Cleverer solver
-   * Think about how to display remote groups of tiles?
+ * Future solver directions:
+ *
+ *  - Non-local version of the exclave extension? Suppose you have an
+ *    exclave with multiple potential paths back home, but all of them
+ *    go through the same tile somewhere in the middle of the path.
+ *    Then _that_ critical square can be assigned to the home dot,
+ *    even if we don't yet know the details of the path from it to
+ *    either existing region.
+ *
+ *  - Permit non-simply-connected puzzle instances in sub-Unreasonable
+ *    mode? Even the simplest case 5x3:ubb is graded Unreasonable at
+ *    present, because we have no solution technique short of
+ *    recursion that can handle it.
+ *
+ *    The reasoning a human uses for that puzzle is to observe that
+ *    the centre left square has to connect to the centre dot, so it
+ *    must have _some_ path back there. It could go round either side
+ *    of the dot in the way. But _whichever_ way it goes, that rules
+ *    out the left dot extending to the squares above and below it,
+ *    because if it did that, that would block _both_ routes back to
+ *    the centre.
+ *
+ *    But the exclave-extending deduction we have at present is only
+ *    capable of extending an exclave with _one_ liberty. This has
+ *    two, so the only technique we have available is to try them one
+ *    by one via recursion.
+ *
+ *    My vague plan to fix this would be to re-run the exclave
+ *    extension on a per-dot basis (probably after working out a
+ *    non-local version as described above): instead of trying to find
+ *    all exclaves at once, try it for one exclave at a time, or
+ *    perhaps all exclaves relating to a particular home dot H. The
+ *    point of this is that then you could spot pairs of squares with
+ *    _two_ possible dots, one of which is H, and which are opposite
+ *    to each other with respect to their other dot D (such as the
+ *    squares above/below the left dot in this example). And then you
+ *    merge those into one vertex of the connectivity graph, on the
+ *    grounds that they're either both H or both D - and _then_ you
+ *    have an exclave with only one path back home, and can make
+ *    progress.
  *
  * Bugs:
  *
@@ -42,15 +79,22 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
 #ifdef DEBUGGING
 #define solvep debug
-#else
+#elif defined STANDALONE_SOLVER
 static bool solver_show_working;
 #define solvep(x) do { if (solver_show_working) { printf x; } } while(0)
+#else
+#define solvep(x) ((void)0)
 #endif
 
 #ifdef STANDALONE_PICTURE_GENERATOR
@@ -148,13 +192,15 @@ struct game_state {
                            or -1 if stale. */
 };
 
-static bool check_complete(const game_state *state, int *dsf, int *colours);
+static bool check_complete(const game_state *state, DSF *dsf, int *colours);
+static int solver_state_inner(game_state *state, int maxdiff, int depth);
 static int solver_state(game_state *state, int maxdiff);
 static int solver_obvious(game_state *state);
 static int solver_obvious_dot(game_state *state, space *dot);
 static space *space_opposite_dot(const game_state *state, const space *sp,
                                  const space *dot);
 static space *tile_opposite(const game_state *state, const space *sp);
+static game_state *execute_move(const game_state *state, const char *move);
 
 /* ----------------------------------------------------------
  * Game parameters and presets
@@ -168,7 +214,9 @@ static const game_params galaxies_presets[] = {
     {  7,  7, DIFF_NORMAL },
     {  7,  7, DIFF_UNREASONABLE },
     { 10, 10, DIFF_NORMAL },
+    { 10, 10, DIFF_UNREASONABLE },
     { 15, 15, DIFF_NORMAL },
+    { 15, 15, DIFF_UNREASONABLE },
 };
 
 static bool game_fetch_preset(int i, char **name, game_params **params)
@@ -281,6 +329,10 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 3 || params->h < 3)
         return "Width and height must both be at least 3";
+    if (params->w > INT_MAX / 2 || params->h > INT_MAX / 2 ||
+        params->w > (INT_MAX - params->w*2 - params->h*2 - 1) / 4 / params->h)
+        return "Width times height must not be unreasonably large";
+
     /*
      * This shouldn't be able to happen at all, since decode_params
      * and custom_params will never generate anything that isn't
@@ -352,6 +404,8 @@ static bool ok_to_add_assoc_with_opposite_internal(
     int *colors;
     bool toret;
 
+    if (tile->type != s_tile)
+        return false;
     if (tile->flags & F_DOT)
         return false;
     if (opposite == NULL)
@@ -372,20 +426,21 @@ static bool ok_to_add_assoc_with_opposite_internal(
     return toret;
 }
 
+#ifndef EDITOR
 static bool ok_to_add_assoc_with_opposite(
     const game_state *state, space *tile, space *dot)
 {
     space *opposite = space_opposite_dot(state, tile, dot);
     return ok_to_add_assoc_with_opposite_internal(state, tile, opposite);
 }
+#endif
 
 static void add_assoc_with_opposite(game_state *state, space *tile, space *dot) {
     space *opposite = space_opposite_dot(state, tile, dot);
 
-    if(opposite)
+    if(opposite && ok_to_add_assoc_with_opposite_internal(
+           state, tile, opposite))
     {
-        assert(ok_to_add_assoc_with_opposite_internal(state, tile, opposite));
-
         remove_assoc_with_opposite(state, tile);
         add_assoc(state, tile, dot);
         remove_assoc_with_opposite(state, opposite);
@@ -393,12 +448,14 @@ static void add_assoc_with_opposite(game_state *state, space *tile, space *dot)
     }
 }
 
+#ifndef EDITOR
 static space *sp2dot(const game_state *state, int x, int y)
 {
     space *sp = &SPACE(state, x, y);
     if (!(sp->flags & F_TILE_ASSOC)) return NULL;
     return &SPACE(state, sp->dotx, sp->doty);
 }
+#endif
 
 #define IS_VERTICAL_EDGE(x) ((x % 2) == 0)
 
@@ -407,8 +464,24 @@ static bool game_can_format_as_text_now(const game_params *params)
     return true;
 }
 
+static char *encode_game(const game_state *state);
+
 static char *game_text_format(const game_state *state)
 {
+#ifdef EDITOR
+    game_params par;
+    char *params, *desc, *ret;
+    par.w = state->w;
+    par.h = state->h;
+    par.diff = DIFF_MAX;               /* shouldn't be used */
+    params = encode_params(&par, false);
+    desc = encode_game(state);
+    ret = snewn(strlen(params) + strlen(desc) + 2, char);
+    sprintf(ret, "%s:%s", params, desc);
+    sfree(params);
+    sfree(desc);
+    return ret;
+#else
     int maxlen = (state->sx+1)*state->sy, x, y;
     char *ret, *p;
     space *sp;
@@ -462,6 +535,7 @@ static char *game_text_format(const game_state *state)
     *p = '\0';
 
     return ret;
+#endif
 }
 
 static void dbg_state(const game_state *state)
@@ -684,7 +758,7 @@ static void tiles_from_edge(game_state *state, space *sp, space **ts)
 /* Returns a move string for use by 'solve', including the initial
  * 'S' if issolve is true. */
 static char *diff_game(const game_state *src, const game_state *dest,
-                       bool issolve)
+                       bool issolve, int set_cdiff)
 {
     int movelen = 0, movesize = 256, x, y, len;
     char *move = snewn(movesize, char), buf[80];
@@ -698,6 +772,26 @@ static char *diff_game(const game_state *src, const game_state *dest,
         move[movelen++] = 'S';
         sep = ";";
     }
+#ifdef EDITOR
+    if (set_cdiff >= 0) {
+        switch (set_cdiff) {
+          case DIFF_IMPOSSIBLE:
+            movelen += sprintf(move+movelen, "%sII", sep);
+            break;
+          case DIFF_AMBIGUOUS:
+            movelen += sprintf(move+movelen, "%sIA", sep);
+            break;
+          case DIFF_UNFINISHED:
+            movelen += sprintf(move+movelen, "%sIU", sep);
+            break;
+          default:
+            movelen += sprintf(move+movelen, "%si%c",
+                               sep, galaxies_diffchars[set_cdiff]);
+            break;
+        }
+        sep = ";";
+    }
+#endif
     move[movelen] = '\0';
     for (x = 0; x < src->sx; x++) {
         for (y = 0; y < src->sy; y++) {
@@ -747,7 +841,8 @@ static char *diff_game(const game_state *src, const game_state *dest,
 
 /* Returns true if a dot here would not be too close to any other dots
  * (and would avoid other game furniture). */
-static bool dot_is_possible(game_state *state, space *sp, bool allow_assoc)
+static bool dot_is_possible(const game_state *state, space *sp,
+                            bool allow_assoc)
 {
     int bx = 0, by = 0, dx, dy;
     space *adj;
@@ -921,7 +1016,7 @@ static void free_game(game_state *state)
  * an edit mode.
  */
 
-static char *encode_game(game_state *state)
+static char *encode_game(const game_state *state)
 {
     char *desc, *p;
     int run, x, y, area;
@@ -1229,10 +1324,7 @@ static bool generate_try_block(game_state *state, random_state *rs,
 }
 
 #ifdef STANDALONE_SOLVER
-int maxtries;
-#define MAXTRIES maxtries
-#else
-#define MAXTRIES 50
+static bool one_try; /* override for soak testing */
 #endif
 
 #define GP_DOTS   1
@@ -1242,6 +1334,8 @@ static void generate_pass(game_state *state, random_state *rs, int *scratch,
 {
     int sz = state->sx*state->sy, nspc, i, ret;
 
+    /* Random list of squares to try and process, one-by-one. */
+    for (i = 0; i < sz; i++) scratch[i] = i;
     shuffle(scratch, sz, sizeof(int), rs);
 
     /* This bug took me a, er, little while to track down. On PalmOS,
@@ -1297,30 +1391,94 @@ static void generate_pass(game_state *state, random_state *rs, int *scratch,
     dbg_state(state);
 }
 
+/*
+ * We try several times to generate a grid at all, before even feeding
+ * it to the solver. Then we pick whichever of the resulting grids was
+ * the most 'wiggly', as measured by the number of inward corners in
+ * the shape of any region.
+ *
+ * Rationale: wiggly shapes are what make this puzzle fun, and it's
+ * disappointing to be served a game whose entire solution is a
+ * collection of rectangles. But we also don't want to introduce a
+ * _hard requirement_ of wiggliness, because a player who knew that
+ * was there would be able to use it as an extra clue. This way, we
+ * just probabilistically skew in favour of wiggliness.
+ */
+#define GENERATE_TRIES 10
+
+static bool is_wiggle(const game_state *state, int x, int y, int dx, int dy)
+{
+    int x1 = x+2*dx, y1 = y+2*dy;
+    int x2 = x-2*dy, y2 = y+2*dx;
+    space *t, *t1, *t2;
+
+    if (!INGRID(state, x1, y1) || !INGRID(state, x2, y2))
+        return false;
+
+    t = &SPACE(state, x, y);
+    t1 = &SPACE(state, x1, y1);
+    t2 = &SPACE(state, x2, y2);
+    return ((t1->dotx == t2->dotx && t1->doty == t2->doty) &&
+            !(t1->dotx == t->dotx && t1->doty == t->doty));
+}
+
+static int measure_wiggliness(const game_state *state, int *scratch)
+{
+    int sz = state->sx*state->sy;
+    int x, y, nwiggles = 0;
+    memset(scratch, 0, sz);
+
+    for (y = 1; y < state->sy; y += 2) {
+        for (x = 1; x < state->sx; x += 2) {
+            if (y+2 < state->sy) {
+                nwiggles += is_wiggle(state, x, y, 0, +1);
+                nwiggles += is_wiggle(state, x, y, 0, -1);
+                nwiggles += is_wiggle(state, x, y, +1, 0);
+                nwiggles += is_wiggle(state, x, y, -1, 0);
+            }
+        }
+    }
+
+    return nwiggles;
+}
+
 static char *new_game_desc(const game_params *params, random_state *rs,
                            char **aux, bool interactive)
 {
     game_state *state = blank_game(params->w, params->h), *copy;
     char *desc;
     int *scratch, sz = state->sx*state->sy, i;
-    int diff, ntries = 0;
+    int diff, best_wiggliness;
     bool cc;
 
-    /* Random list of squares to try and process, one-by-one. */
     scratch = snewn(sz, int);
-    for (i = 0; i < sz; i++) scratch[i] = i;
 
 generate:
-    clear_game(state, true);
-    ntries++;
-
-    /* generate_pass(state, rs, scratch, 10, GP_DOTS); */
-    /* generate_pass(state, rs, scratch, 100, 0); */
-    generate_pass(state, rs, scratch, 100, GP_DOTS);
-
-    game_update_dots(state);
-
-    if (state->ndots == 1) goto generate;
+    best_wiggliness = -1;
+    copy = NULL;
+    for (i = 0; i < GENERATE_TRIES; i++) {
+        int this_wiggliness;
+
+        do {
+            clear_game(state, true);
+            generate_pass(state, rs, scratch, 100, GP_DOTS);
+            game_update_dots(state);
+        } while (state->ndots == 1);
+
+        this_wiggliness = measure_wiggliness(state, scratch);
+        debug(("Grid gen #%d: wiggliness=%d", i, this_wiggliness));
+        if (this_wiggliness > best_wiggliness) {
+            best_wiggliness = this_wiggliness;
+            if (copy)
+                free_game(copy);
+            copy = dup_game(state);
+            debug((" new best"));
+        }
+        debug(("\n"));
+    }
+    assert(copy);
+    free_game(state);
+    state = copy;
 
 #ifdef DEBUGGING
     {
@@ -1345,12 +1503,17 @@ generate:
     assert(diff != DIFF_IMPOSSIBLE);
     if (diff != params->diff) {
         /*
-         * We'll grudgingly accept a too-easy puzzle, but we must
-         * _not_ permit a too-hard one (one which the solver
-         * couldn't handle at all).
+         * If the puzzle was insoluble at this difficulty level (i.e.
+         * too hard), _or_ soluble at a lower level (too easy), go
+         * round again.
+         *
+         * An exception is in soak-testing mode, where we return the
+         * first puzzle we got regardless.
          */
-        if (diff > params->diff ||
-            ntries < MAXTRIES) goto generate;
+#ifdef STANDALONE_SOLVER
+        if (!one_try)
+#endif
+            goto generate;
     }
 
 #ifdef STANDALONE_PICTURE_GENERATOR
@@ -1527,6 +1690,10 @@ generate:
     dbg_state(state);
 #endif
 
+    game_state *blank = blank_game(params->w, params->h);
+    *aux = diff_game(blank, state, true, -1);
+    free_game(blank);
+
     free_game(state);
     sfree(scratch);
 
@@ -1623,13 +1790,17 @@ static game_state *new_game(midend *me, const game_params *params,
  * Solver and all its little wizards.
  */
 
+#if defined DEBUGGING || defined STANDALONE_SOLVER
 static int solver_recurse_depth;
+#define STATIC_RECURSION_DEPTH
+#endif
 
 typedef struct solver_ctx {
     game_state *state;
     int sz;             /* state->sx * state->sy */
     space **scratch;    /* size sz */
-
+    DSF *dsf;           /* size sz */
+    int *iscratch;      /* size sz */
 } solver_ctx;
 
 static solver_ctx *new_solver(game_state *state)
@@ -1638,12 +1809,16 @@ static solver_ctx *new_solver(game_state *state)
     sctx->state = state;
     sctx->sz = state->sx*state->sy;
     sctx->scratch = snewn(sctx->sz, space *);
+    sctx->dsf = dsf_new(sctx->sz);
+    sctx->iscratch = snewn(sctx->sz, int);
     return sctx;
 }
 
 static void free_solver(solver_ctx *sctx)
 {
     sfree(sctx->scratch);
+    dsf_free(sctx->dsf);
+    sfree(sctx->iscratch);
     sfree(sctx);
 }
 
@@ -1804,7 +1979,7 @@ static int solver_lines_opposite_cb(game_state *state, space *edge, void *ctx)
         if (!(edge_opp->flags & F_EDGE_SET)) {
             solvep(("%*sSetting edge %d,%d as opposite %d,%d\n",
                    solver_recurse_depth*4, "",
-                   tile_opp->x-dx, tile_opp->y-dy, edge->x, edge->y));
+                   tile_opp->x+dx, tile_opp->y+dy, edge->x, edge->y));
             edge_opp->flags |= F_EDGE_SET;
             didsth = 1;
         }
@@ -2097,6 +2272,177 @@ static int solver_expand_dots(game_state *state, solver_ctx *sctx)
     return foreach_tile(state, solver_expand_postcb, IMPOSSIBLE_QUITS, sctx);
 }
 
+static int solver_extend_exclaves(game_state *state, solver_ctx *sctx)
+{
+    int x, y, done_something = 0;
+
+    /*
+     * Make a dsf by unifying any two adjacent tiles associated with
+     * the same dot. This will identify separate connected components
+     * of the tiles belonging to a given dot. Any such component that
+     * doesn't contain its own dot is an 'exclave', and will need some
+     * kind of path of tiles to connect it back to the dot.
+     */
+    dsf_reinit(sctx->dsf);
+    for (x = 1; x < state->sx; x += 2) {
+        for (y = 1; y < state->sy; y += 2) {
+            int dotx, doty;
+            space *tile, *othertile;
+
+            tile = &SPACE(state, x, y);
+            if (!(tile->flags & F_TILE_ASSOC))
+                continue;              /* not associated with any dot */
+            dotx = tile->dotx;
+            doty = tile->doty;
+
+            if (INGRID(state, x+2, y)) {
+                othertile = &SPACE(state, x+2, y);
+                if ((othertile->flags & F_TILE_ASSOC) &&
+                    othertile->dotx == dotx && othertile->doty == doty)
+                    dsf_merge(sctx->dsf, y*state->sx+x, y*state->sx+(x+2));
+            }
+
+            if (INGRID(state, x, y+2)) {
+                othertile = &SPACE(state, x, y+2);
+                if ((othertile->flags & F_TILE_ASSOC) &&
+                    othertile->dotx == dotx && othertile->doty == doty)
+                    dsf_merge(sctx->dsf, y*state->sx+x, (y+2)*state->sx+x);
+            }
+        }
+    }
+
+    /*
+     * Go through the grid again, and count the 'liberties' of each
+     * connected component, in the Go sense, i.e. the number of
+     * currently unassociated squares adjacent to the component. The
+     * idea is that if an exclave has just one liberty, then that
+     * square _must_ extend the exclave, or else it will be completely
+     * cut off from connecting back to its home dot.
+     *
+     * We need to count each adjacent square just once, even if it
+     * borders the component on multiple edges. So we'll go through
+     * each unassociated square, check all four of its neighbours, and
+     * de-duplicate them.
+     *
+     * We'll store the count of liberties in the entry of iscratch
+     * corresponding to the square centre (i.e. with odd coordinates).
+     * Every time we find a liberty, we store its index in the square
+     * to the left of that, so that when a component has exactly one
+     * liberty we can remember what it was.
+     *
+     * Square centres that are not the canonical dsf element of a
+     * connected component will get their liberty count set to -1,
+     * which will allow us to identify them in the later loop (after
+     * we start making changes and need to spot that an associated
+     * square _now_ was not associated when the dsf was built).
+     */
+
+    /* Initialise iscratch */
+    for (x = 1; x < state->sx; x += 2) {
+        for (y = 1; y < state->sy; y += 2) {
+            int index = y * state->sx + x;
+            if (!(SPACE(state, x, y).flags & F_TILE_ASSOC) ||
+                dsf_canonify(sctx->dsf, index) != index) {
+                sctx->iscratch[index] = -1; /* mark as not a component */
+            } else {
+                sctx->iscratch[index] = 0; /* zero liberty count */
+                sctx->iscratch[index-1] = 0; /* initialise neighbour id */
+            }
+        }
+    }
+
+    /* Find each unassociated square and see what it's a liberty of */
+    for (x = 1; x < state->sx; x += 2) {
+        for (y = 1; y < state->sy; y += 2) {
+            int dx, dy, ni[4], nn, i;
+
+            if ((SPACE(state, x, y).flags & F_TILE_ASSOC))
+                continue;              /* not an unassociated square */
+
+            /* Find distinct indices of adjacent components */
+            nn = 0;
+            for (dx = -1; dx <= 1; dx++) {
+                for (dy = -1; dy <= 1; dy++) {
+                    if (dx != 0 && dy != 0) continue;
+                    if (dx == 0 && dy == 0) continue;
+
+                    if (INGRID(state, x+2*dx, y+2*dy) &&
+                        (SPACE(state, x+2*dx, y+2*dy).flags & F_TILE_ASSOC)) {
+                        /* Find id of the component adjacent to x,y */
+                        int nindex = (y+2*dy) * state->sx + (x+2*dx);
+                        nindex = dsf_canonify(sctx->dsf, nindex);
+
+                        /* See if we've seen it before in another direction */
+                        for (i = 0; i < nn; i++)
+                            if (ni[i] == nindex)
+                                break;
+                        if (i == nn) {
+                            /* No, it's new. Mark x,y as a liberty of it */
+                            sctx->iscratch[nindex]++;
+                            assert(nindex > 0);
+                            sctx->iscratch[nindex-1] = y * state->sx + x;
+
+                            /* And record this component as having been seen */
+                            ni[nn++] = nindex;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /*
+     * Now we have all the data we need to find exclaves with exactly
+     * one liberty. In each case, associate the unique liberty square
+     * with the same dot.
+     */
+    for (x = 1; x < state->sx; x += 2) {
+        for (y = 1; y < state->sy; y += 2) {
+            int index, dotx, doty, ex, ey, added;
+            space *tile;
+
+            index = y*state->sx+x;
+            if (sctx->iscratch[index] == -1)
+                continue;    /* wasn't canonical when dsf was built */
+
+            tile = &SPACE(state, x, y);
+            if (!(tile->flags & F_TILE_ASSOC))
+                continue;              /* not associated with any dot */
+            dotx = tile->dotx;
+            doty = tile->doty;
+
+            if (index == dsf_canonify(
+                    sctx->dsf, (doty | 1) * state->sx + (dotx | 1)))
+                continue;    /* not an exclave - contains its own dot */
+
+            if (sctx->iscratch[index] == 0) {
+                solvep(("%*sExclave at %d,%d has no liberties!\n",
+                        solver_recurse_depth*4, "", x, y));
+                return -1;
+            }
+
+            if (sctx->iscratch[index] != 1)
+                continue; /* more than one liberty, can't be sure which */
+
+            assert(sctx->iscratch[index-1] != 0);
+            ex = sctx->iscratch[index-1] % state->sx;
+            ey = sctx->iscratch[index-1] / state->sx;
+            tile = &SPACE(state, ex, ey);
+            if (tile->flags & F_TILE_ASSOC)
+                continue; /* already done by earlier iteration of this loop */
+
+            added = solver_add_assoc(state, tile, dotx, doty,
+                                     "to connect exclave");
+            if (added < 0)
+                return -1;
+            if (added > 0)
+                done_something = 1;
+        }
+    }
+
+    return done_something;
+}
+
 struct recurse_ctx {
     space *best;
     int bestn;
@@ -2124,14 +2470,14 @@ static int solver_recurse_cb(game_state *state, space *tile, void *ctx)
 
 #define MAXRECURSE 5
 
-static int solver_recurse(game_state *state, int maxdiff)
+static int solver_recurse(game_state *state, int maxdiff, int depth)
 {
     int diff = DIFF_IMPOSSIBLE, ret, n, gsz = state->sx * state->sy;
     space *ingrid, *outgrid = NULL, *bestopp;
     struct recurse_ctx rctx;
 
-    if (solver_recurse_depth >= MAXRECURSE) {
-        solvep(("Limiting recursion to %d, returning.", MAXRECURSE));
+    if (depth >= MAXRECURSE) {
+        solvep(("Limiting recursion to %d, returning.\n", MAXRECURSE));
         return DIFF_UNFINISHED;
     }
 
@@ -2149,10 +2495,6 @@ static int solver_recurse(game_state *state, int maxdiff)
            solver_recurse_depth*4, "",
            rctx.best->x, rctx.best->y, rctx.bestn));
 
-#ifdef STANDALONE_SOLVER
-    solver_recurse_depth++;
-#endif
-
     ingrid = snewn(gsz, space);
     memcpy(ingrid, state->grid, gsz * sizeof(space));
 
@@ -2166,7 +2508,11 @@ static int solver_recurse(game_state *state, int maxdiff)
                          state->dots[n]->x, state->dots[n]->y,
                          "Attempting for recursion");
 
-        ret = solver_state(state, maxdiff);
+        ret = solver_state_inner(state, maxdiff, depth + 1);
+
+#ifdef STATIC_RECURSION_DEPTH
+        solver_recurse_depth = depth;  /* restore after recursion returns */
+#endif
 
         if (diff == DIFF_IMPOSSIBLE && ret != DIFF_IMPOSSIBLE) {
             /* we found our first solved grid; copy it away. */
@@ -2198,10 +2544,6 @@ static int solver_recurse(game_state *state, int maxdiff)
             break;
     }
 
-#ifdef STANDALONE_SOLVER
-    solver_recurse_depth--;
-#endif
-
     if (outgrid) {
         /* we found (at least one) soln; copy it back to state */
         memcpy(state->grid, outgrid, gsz * sizeof(space));
@@ -2211,7 +2553,7 @@ static int solver_recurse(game_state *state, int maxdiff)
     return diff;
 }
 
-static int solver_state(game_state *state, int maxdiff)
+static int solver_state_inner(game_state *state, int maxdiff, int depth)
 {
     solver_ctx *sctx = new_solver(state);
     int ret, diff = DIFF_NORMAL;
@@ -2223,6 +2565,10 @@ static int solver_state(game_state *state, int maxdiff)
     picture = NULL;
 #endif
 
+#ifdef STATIC_RECURSION_DEPTH
+    solver_recurse_depth = depth;
+#endif
+
     ret = solver_obvious(state);
     if (ret < 0) {
         diff = DIFF_IMPOSSIBLE;
@@ -2247,6 +2593,9 @@ cont:
         ret = solver_expand_dots(state, sctx);
         CHECKRET(DIFF_NORMAL);
 
+        ret = solver_extend_exclaves(state, sctx);
+        CHECKRET(DIFF_NORMAL);
+
         if (maxdiff <= DIFF_NORMAL)
             break;
 
@@ -2259,7 +2608,7 @@ cont:
     if (check_complete(state, NULL, NULL)) goto got_result;
 
     diff = (maxdiff >= DIFF_UNREASONABLE) ?
-        solver_recurse(state, maxdiff) : DIFF_UNFINISHED;
+        solver_recurse(state, maxdiff, depth) : DIFF_UNFINISHED;
 
 got_result:
     free_solver(sctx);
@@ -2275,6 +2624,11 @@ got_result:
     return diff;
 }
 
+static int solver_state(game_state *state, int maxdiff)
+{
+    return solver_state_inner(state, maxdiff, 0);
+}
+
 #ifndef EDITOR
 static char *solve_game(const game_state *state, const game_state *currstate,
                         const char *aux, const char **error)
@@ -2284,21 +2638,26 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     int i;
     int diff;
 
-    tosolve = dup_game(currstate);
-    diff = solver_state(tosolve, DIFF_UNREASONABLE);
-    if (diff != DIFF_UNFINISHED && diff != DIFF_IMPOSSIBLE) {
-        debug(("solve_game solved with current state.\n"));
+    if (aux) {
+        tosolve = execute_move(state, aux);
         goto solved;
-    }
-    free_game(tosolve);
+    } else {
+        tosolve = dup_game(currstate);
+        diff = solver_state(tosolve, DIFF_UNREASONABLE);
+        if (diff != DIFF_UNFINISHED && diff != DIFF_IMPOSSIBLE) {
+            debug(("solve_game solved with current state.\n"));
+            goto solved;
+        }
+        free_game(tosolve);
 
-    tosolve = dup_game(state);
-    diff = solver_state(tosolve, DIFF_UNREASONABLE);
-    if (diff != DIFF_UNFINISHED && diff != DIFF_IMPOSSIBLE) {
-        debug(("solve_game solved with original state.\n"));
-        goto solved;
+        tosolve = dup_game(state);
+        diff = solver_state(tosolve, DIFF_UNREASONABLE);
+        if (diff != DIFF_UNFINISHED && diff != DIFF_IMPOSSIBLE) {
+            debug(("solve_game solved with original state.\n"));
+            goto solved;
+        }
+        free_game(tosolve);
     }
-    free_game(tosolve);
 
     return NULL;
 
@@ -2309,7 +2668,7 @@ solved:
      */
     for (i = 0; i < tosolve->sx*tosolve->sy; i++)
         tosolve->grid[i].flags &= ~F_TILE_ASSOC;
-    ret = diff_game(currstate, tosolve, true);
+    ret = diff_game(currstate, tosolve, true, -1);
     free_game(tosolve);
     return ret;
 }
@@ -2333,7 +2692,7 @@ static game_ui *new_ui(const game_state *state)
     game_ui *ui = snew(game_ui);
     ui->dragging = false;
     ui->cur_x = ui->cur_y = 1;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     return ui;
 }
 
@@ -2342,15 +2701,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
@@ -2383,7 +2733,7 @@ struct game_drawstate {
     blitter *blmirror;
 
     bool dragging;
-    int dragx, dragy;
+    int dragx, dragy, oppx, oppy;
 
     int *colour_scratch;
 
@@ -2445,34 +2795,74 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int px, py;
     space *sp;
 
-    px = 2*FROMCOORD((float)x) + 0.5;
-    py = 2*FROMCOORD((float)y) + 0.5;
-
-    state->cdiff = -1;
+    px = 2*FROMCOORD((float)x) + 0.5F;
+    py = 2*FROMCOORD((float)y) + 0.5F;
 
     if (button == 'C' || button == 'c') return dupstr("C");
 
     if (button == 'S' || button == 's') {
         char *ret;
         game_state *tmp = dup_game(state);
-        state->cdiff = solver_state(tmp, DIFF_UNREASONABLE-1);
-        ret = diff_game(state, tmp, 0);
+        int cdiff = solver_state(tmp, DIFF_UNREASONABLE-1);
+        ret = diff_game(state, tmp, 0, cdiff);
         free_game(tmp);
         return ret;
     }
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
-        if (!INUI(state, px, py)) return NULL;
+        if (!INUI(state, px, py)) return MOVE_UNUSED;
         sp = &SPACE(state, px, py);
-        if (!dot_is_possible(state, sp, 1)) return NULL;
+        if (!dot_is_possible(state, sp, 1)) return MOVE_NO_EFFECT;
         sprintf(buf, "%c%d,%d",
                 (char)((button == LEFT_BUTTON) ? 'D' : 'd'), px, py);
         return dupstr(buf);
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 #else
+static bool edge_placement_legal(const game_state *state, int x, int y)
+{
+    space *sp = &SPACE(state, x, y);
+    if (sp->type != s_edge)
+        return false;   /* this is a face-centre or a grid vertex */
+
+    /* Check this line doesn't actually intersect a dot */
+    unsigned int flags = (GRID(state, grid, x, y).flags |
+                          GRID(state, grid, x & ~1U, y & ~1U).flags |
+                          GRID(state, grid, (x+1) & ~1U, (y+1) & ~1U).flags);
+    if (flags & F_DOT)
+        return false;
+    return true;
+}
+
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    space *sp;
+
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible) {
+        sp = &SPACE(state, ui->cur_x, ui->cur_y);
+        if (ui->dragging) {
+            if (ui->cur_x == ui->srcx && ui->cur_y == ui->srcy)
+                return "Cancel";
+            if (ok_to_add_assoc_with_opposite(
+                    state, &SPACE(state, ui->cur_x, ui->cur_y),
+                    &SPACE(state, ui->dotx, ui->doty)))
+                return "Place";
+            return (ui->srcx == ui->dotx && ui->srcy == ui->doty) ?
+                "Cancel" : "Remove";
+        } else if (sp->flags & F_DOT)
+            return "New arrow";
+        else if (sp->flags & F_TILE_ASSOC)
+            return "Move arrow";
+        else if (sp->type == s_edge &&
+                 edge_placement_legal(state, ui->cur_x, ui->cur_y))
+            return (sp->flags & F_EDGE_SET) ? "Clear" : "Edge";
+    }
+    return "";
+}
+
 static char *interpret_move(const game_state *state, game_ui *ui,
                             const game_drawstate *ds,
                             int x, int y, int button)
@@ -2499,7 +2889,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         char *ret;
         game_state *tmp = dup_game(state);
         solver_obvious(tmp);
-        ret = diff_game(state, tmp, false);
+        ret = diff_game(state, tmp, false, -1);
         free_game(tmp);
         return ret;
     }
@@ -2509,21 +2899,19 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         coord_round_to_edge(FROMCOORD((float)x), FROMCOORD((float)y),
                             &px, &py);
 
-        if (!INUI(state, px, py)) return NULL;
+        if (!INUI(state, px, py)) return MOVE_UNUSED;
+        if (!edge_placement_legal(state, px, py))
+            return MOVE_NO_EFFECT;
 
-        sp = &SPACE(state, px, py);
-        assert(sp->type == s_edge);
-        {
-            sprintf(buf, "E%d,%d", px, py);
-            return dupstr(buf);
-        }
+        sprintf(buf, "E%d,%d", px, py);
+        return dupstr(buf);
     } else if (button == RIGHT_BUTTON) {
         int px1, py1;
 
         ui->cur_visible = false;
 
-        px = (int)(2*FROMCOORD((float)x) + 0.5);
-        py = (int)(2*FROMCOORD((float)y) + 0.5);
+        px = (int)(2*FROMCOORD((float)x) + 0.5F);
+        py = (int)(2*FROMCOORD((float)y) + 0.5F);
 
         dot = NULL;
 
@@ -2575,28 +2963,29 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             ui->dy = y;
             ui->dotx = dot->x;
             ui->doty = dot->y;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
+        return MOVE_NO_EFFECT;
     } else if (button == RIGHT_DRAG && ui->dragging) {
         /* just move the drag coords. */
         ui->dx = x;
         ui->dy = y;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else if (button == RIGHT_RELEASE && ui->dragging) {
-        ui->dragging = false;
-
         /*
          * Drags are always targeted at a single square.
          */
         px = 2*FROMCOORD(x+TILE_SIZE) - 1;
         py = 2*FROMCOORD(y+TILE_SIZE) - 1;
 
+        dropped: /* We arrive here from the end of a keyboard drag. */
+        ui->dragging = false;
         /*
          * Dragging an arrow on to the same square it started from
          * is a null move; just update the ui and finish.
          */
         if (px == ui->srcx && py == ui->srcy)
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
 
         /*
          * Otherwise, we remove the arrow from its starting
@@ -2630,43 +3019,33 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (buf[0])
             return dupstr(buf);
         else
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
     } else if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cur_x, &ui->cur_y, state->sx-1, state->sy-1, false);
-        if (ui->cur_x < 1) ui->cur_x = 1;
-        if (ui->cur_y < 1) ui->cur_y = 1;
-        ui->cur_visible = true;
+        int cx = ui->cur_x - 1, cy = ui->cur_y - 1;
+        char *ret = move_cursor(button, &cx, &cy, state->sx-2, state->sy-2,
+                                false, &ui->cur_visible);
+        ui->cur_x = cx + 1, ui->cur_y = cy + 1;
         if (ui->dragging) {
             ui->dx = SCOORD(ui->cur_x);
             ui->dy = SCOORD(ui->cur_y);
         }
-        return UI_UPDATE;
+        return ret;
     } else if (IS_CURSOR_SELECT(button)) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         sp = &SPACE(state, ui->cur_x, ui->cur_y);
         if (ui->dragging) {
-            ui->dragging = false;
-
-            if ((ui->srcx != ui->dotx || ui->srcy != ui->doty) &&
-                SPACE(state, ui->srcx, ui->srcy).flags & F_TILE_ASSOC) {
-                sprintf(buf, "%sU%d,%d", sep, ui->srcx, ui->srcy);
-                sep = ";";
-            }
-            if (sp->type == s_tile && !(sp->flags & F_DOT) && !(sp->flags & F_TILE_ASSOC)) {
-                sprintf(buf + strlen(buf), "%sA%d,%d,%d,%d",
-                        sep, ui->cur_x, ui->cur_y, ui->dotx, ui->doty);
-            }
-            return dupstr(buf);
+            px = ui->cur_x; py = ui->cur_y;
+            goto dropped;
         } else if (sp->flags & F_DOT) {
             ui->dragging = true;
             ui->dx = SCOORD(ui->cur_x);
             ui->dy = SCOORD(ui->cur_y);
             ui->dotx = ui->srcx = ui->cur_x;
             ui->doty = ui->srcy = ui->cur_y;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         } else if (sp->flags & F_TILE_ASSOC) {
             assert(sp->type == s_tile);
             ui->dragging = true;
@@ -2676,18 +3055,19 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             ui->doty = sp->doty;
             ui->srcx = ui->cur_x;
             ui->srcy = ui->cur_y;
-            return UI_UPDATE;
-        } else if (sp->type == s_edge) {
+            return MOVE_UI_UPDATE;
+        } else if (sp->type == s_edge &&
+                   edge_placement_legal(state, ui->cur_x, ui->cur_y)) {
             sprintf(buf, "E%d,%d", ui->cur_x, ui->cur_y);
             return dupstr(buf);
         }
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 #endif
 
-static bool check_complete(const game_state *state, int *dsf, int *colours)
+static bool check_complete(const game_state *state, DSF *dsf, int *colours)
 {
     int w = state->w, h = state->h;
     int x, y, i;
@@ -2702,10 +3082,10 @@ static bool check_complete(const game_state *state, int *dsf, int *colours)
     } *sqdata;
 
     if (!dsf) {
-        dsf = snew_dsf(w*h);
+        dsf = dsf_new(w*h);
         free_dsf = true;
     } else {
-        dsf_init(dsf, w*h);
+        dsf_reinit(dsf);
         free_dsf = false;
     }
 
@@ -2861,7 +3241,7 @@ static bool check_complete(const game_state *state, int *dsf, int *colours)
 
     sfree(sqdata);
     if (free_dsf)
-        sfree(dsf);
+        dsf_free(dsf);
 
     return ret;
 }
@@ -2959,6 +3339,35 @@ static game_state *execute_move(const game_state *state, const char *move)
         } else if (c == 'C') {
             move++;
             clear_game(ret, true);
+        } else if (c == 'i') {
+            int diff;
+            move++;
+            for (diff = 0; diff <= DIFF_UNREASONABLE; diff++)
+                if (*move == galaxies_diffchars[diff])
+                    break;
+            if (diff > DIFF_UNREASONABLE)
+                goto badmove;
+
+            ret->cdiff = diff;
+            move++;
+        } else if (c == 'I') {
+            int diff;
+            move++;
+            switch (*move) {
+              case 'A':
+                diff = DIFF_AMBIGUOUS;
+                break;
+              case 'I':
+                diff = DIFF_IMPOSSIBLE;
+                break;
+              case 'U':
+                diff = DIFF_UNFINISHED;
+                break;
+              default:
+                goto badmove;
+            }
+            ret->cdiff = diff;
+            move++;
 #endif
         } else if (c == 'S') {
             move++;
@@ -2997,7 +3406,7 @@ badmove:
  */
 
 static void game_compute_size(const game_params *params, int sz,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     struct { int tilesize, w, h; } ads, *ds = &ads;
 
@@ -3098,7 +3507,7 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     ds->bl = NULL;
     ds->blmirror = NULL;
     ds->dragging = false;
-    ds->dragx = ds->dragy = 0;
+    ds->dragx = ds->dragy = ds->oppx = ds->oppy = 0;
 
     ds->colour_scratch = snewn(ds->w * ds->h, int);
 
@@ -3145,7 +3554,10 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 static void draw_arrow(drawing *dr, game_drawstate *ds,
                        int cx, int cy, int ddx, int ddy, int col)
 {
-    float vlen = (float)sqrt(ddx*ddx+ddy*ddy);
+    int sqdist = ddx*ddx+ddy*ddy;
+    if (sqdist == 0)
+        return;                        /* avoid division by zero */
+    float vlen = (float)sqrt(sqdist);
     float xdx = ddx/vlen, xdy = ddy/vlen;
     float ydx = -xdy, ydy = xdx;
     int e1x = cx + (int)(xdx*TILE_SIZE/3), e1y = cy + (int)(xdy*TILE_SIZE/3);
@@ -3257,7 +3669,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int w = ds->w, h = ds->h;
     int x, y;
     bool flashing = false;
-    int oppx, oppy;
 
     if (flashtime > 0) {
         int frame = (int)(flashtime / FLASH_TIME);
@@ -3267,14 +3678,10 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (ds->dragging) {
         assert(ds->bl);
         assert(ds->blmirror);
-        calculate_opposite_point(ui, ds, ds->dragx + TILE_SIZE/2,
-                                 ds->dragy + TILE_SIZE/2, &oppx, &oppy);
-        oppx -= TILE_SIZE/2;
-        oppy -= TILE_SIZE/2;
+        blitter_load(dr, ds->blmirror, ds->oppx, ds->oppy);
+        draw_update(dr, ds->oppx, ds->oppy, TILE_SIZE, TILE_SIZE);
         blitter_load(dr, ds->bl, ds->dragx, ds->dragy);
         draw_update(dr, ds->dragx, ds->dragy, TILE_SIZE, TILE_SIZE);
-        blitter_load(dr, ds->blmirror, oppx, oppy);
-        draw_update(dr, oppx, oppy, TILE_SIZE, TILE_SIZE);
         ds->dragging = false;
     }
     if (ds->cur_visible) {
@@ -3285,7 +3692,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     }
 
     if (!ds->started) {
-        draw_rect(dr, 0, 0, DRAW_WIDTH, DRAW_HEIGHT, COL_BACKGROUND);
         draw_rect(dr, BORDER - EDGE_THICKNESS + 1, BORDER - EDGE_THICKNESS + 1,
                   w*TILE_SIZE + EDGE_THICKNESS*2 - 1,
                   h*TILE_SIZE + EDGE_THICKNESS*2 - 1, COL_EDGE);
@@ -3433,16 +3839,28 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     }
 
     if (ui->dragging) {
+        int oppx, oppy;
+
         ds->dragging = true;
         ds->dragx = ui->dx - TILE_SIZE/2;
         ds->dragy = ui->dy - TILE_SIZE/2;
         calculate_opposite_point(ui, ds, ui->dx, ui->dy, &oppx, &oppy);
+        ds->oppx = oppx - TILE_SIZE/2;
+        ds->oppy = oppy - TILE_SIZE/2;
+
         blitter_save(dr, ds->bl, ds->dragx, ds->dragy);
-        blitter_save(dr, ds->blmirror, oppx - TILE_SIZE/2, oppy - TILE_SIZE/2);
+        clip(dr, ds->dragx, ds->dragy, TILE_SIZE, TILE_SIZE);
         draw_arrow(dr, ds, ui->dx, ui->dy, SCOORD(ui->dotx) - ui->dx,
                    SCOORD(ui->doty) - ui->dy, COL_ARROW);
+        unclip(dr);
+        draw_update(dr, ds->dragx, ds->dragy, TILE_SIZE, TILE_SIZE);
+
+        blitter_save(dr, ds->blmirror, ds->oppx, ds->oppy);
+        clip(dr, ds->oppx, ds->oppy, TILE_SIZE, TILE_SIZE);
         draw_arrow(dr, ds, oppx, oppy, SCOORD(ui->dotx) - oppx,
                    SCOORD(ui->doty) - oppy, COL_ARROW);
+        unclip(dr);
+        draw_update(dr, ds->oppx, ds->oppy, TILE_SIZE, TILE_SIZE);
     }
 #ifdef EDITOR
     {
@@ -3508,13 +3926,9 @@ 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;
-}
-
 #ifndef EDITOR
-static void game_print_size(const game_params *params, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
    int pw, ph;
 
@@ -3522,17 +3936,19 @@ static void game_print_size(const game_params *params, float *x, float *y)
     * 8mm squares by default. (There isn't all that much detail
     * that needs to go in each square.)
     */
-   game_compute_size(params, 800, &pw, &ph);
+   game_compute_size(params, 800, ui, &pw, &ph);
    *x = pw / 100.0F;
    *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int sz)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int sz)
 {
     int w = state->w, h = state->h;
     int white, black, blackish;
     int x, y, i, j;
-    int *colours, *dsf;
+    int *colours;
+    DSF *dsf;
     int *coords = NULL;
     int ncoords = 0, coordsize = 0;
 
@@ -3547,7 +3963,7 @@ static void game_print(drawing *dr, const game_state *state, int sz)
     /*
      * Get the completion information.
      */
-    dsf = snewn(w * h, int);
+    dsf = dsf_new(w * h);
     colours = snewn(w * h, int);
     check_complete(state, dsf, colours);
 
@@ -3683,7 +4099,7 @@ static void game_print(drawing *dr, const game_state *state, int sz)
                              black : white), black);
             }
 
-    sfree(dsf);
+    dsf_free(dsf);
     sfree(colours);
     sfree(coords);
 }
@@ -3714,12 +4130,18 @@ const struct game thegame = {
     true, solve_game,
 #endif
     true, game_can_format_as_text_now, game_text_format,
+    NULL, NULL, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+#ifdef EDITOR
+    NULL,
+#else
+    current_key_label,
+#endif
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -3738,13 +4160,13 @@ const struct game thegame = {
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
 #endif
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
 #ifdef STANDALONE_SOLVER
 
-const char *quis;
+static const char *quis;
 
 #include <time.h>
 
@@ -3802,7 +4224,7 @@ static void soak(game_params *p, random_state *rs)
 #endif
     tt_start = tt_now = time(NULL);
     for (i = 0; i < DIFF_MAX; i++) diffs[i] = 0;
-    maxtries = 1;
+    one_try = true;
 
     printf("Soak-generating a %dx%d grid, max. diff %s.\n",
            p->w, p->h, galaxies_diffnames[p->diff]);
@@ -3812,7 +4234,9 @@ static void soak(game_params *p, random_state *rs)
     printf("]\n");
 
     while (1) {
-        desc = new_game_desc(p, rs, NULL, false);
+        char *aux;
+        desc = new_game_desc(p, rs, &aux, false);
+        sfree(aux);
         st = new_game(NULL, p, desc);
         diff = solver_state(st, p->diff);
         nspaces += st->w*st->h;
@@ -3866,8 +4290,6 @@ int main(int argc, char **argv)
         }
     }
 
-    maxtries = 50;
-
     p = default_params();
     rs = random_new((void*)&seed, sizeof(time_t));
 
diff --git a/apps/plugins/puzzles/src/grid.c b/apps/plugins/puzzles/src/grid.c
index 5ea37439d4..04bb8a36cd 100644
--- a/apps/plugins/puzzles/src/grid.c
+++ b/apps/plugins/puzzles/src/grid.c
@@ -11,13 +11,21 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
 #include <float.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
 #include "grid.h"
+#include "penrose-legacy.h"
 #include "penrose.h"
+#include "hat.h"
+#include "spectre.h"
 
 /* Debugging options */
 
@@ -36,12 +44,17 @@ void grid_free(grid *g)
     if (g->refcount == 0) {
         int i;
         for (i = 0; i < g->num_faces; i++) {
-            sfree(g->faces[i].dots);
-            sfree(g->faces[i].edges);
+            sfree(g->faces[i]->dots);
+            sfree(g->faces[i]->edges);
+            sfree(g->faces[i]);
         }
         for (i = 0; i < g->num_dots; i++) {
-            sfree(g->dots[i].faces);
-            sfree(g->dots[i].edges);
+            sfree(g->dots[i]->faces);
+            sfree(g->dots[i]->edges);
+            sfree(g->dots[i]);
+        }
+        for (i = 0; i < g->num_edges; i++) {
+            sfree(g->edges[i]);
         }
         sfree(g->faces);
         sfree(g->edges);
@@ -59,6 +72,7 @@ static grid *grid_empty(void)
     g->edges = NULL;
     g->dots = NULL;
     g->num_faces = g->num_edges = g->num_dots = 0;
+    g->size_faces = g->size_edges = g->size_dots = 0;
     g->refcount = 1;
     g->lowest_x = g->lowest_y = g->highest_x = g->highest_y = 0;
     return g;
@@ -116,7 +130,7 @@ grid_edge *grid_nearest_edge(grid *g, int x, int y)
     best_edge = NULL;
 
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = &g->edges[i];
+        grid_edge *e = g->edges[i];
         long e2; /* squared length of edge */
         long a2, b2; /* squared lengths of other sides */
         double dist;
@@ -185,7 +199,7 @@ xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n\n");
     if (which & SVG_FACES) {
         fprintf(fp, "<g>\n");
         for (i = 0; i < g->num_faces; i++) {
-            grid_face *f = g->faces + i;
+            grid_face *f = g->faces[i];
             fprintf(fp, "<polygon points=\"");
             for (j = 0; j < f->order; j++) {
                 grid_dot *d = f->dots[j];
@@ -200,7 +214,7 @@ xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n\n");
     if (which & SVG_EDGES) {
         fprintf(fp, "<g>\n");
         for (i = 0; i < g->num_edges; i++) {
-            grid_edge *e = g->edges + i;
+            grid_edge *e = g->edges[i];
             grid_dot *d1 = e->dot1, *d2 = e->dot2;
 
             fprintf(fp, "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" "
@@ -213,7 +227,7 @@ xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n\n");
     if (which & SVG_DOTS) {
         fprintf(fp, "<g>\n");
         for (i = 0; i < g->num_dots; i++) {
-            grid_dot *d = g->dots + i;
+            grid_dot *d = g->dots[i];
             fprintf(fp, "<ellipse cx=\"%d\" cy=\"%d\" rx=\"%d\" ry=\"%d\" fill=\"%s\" />",
                     d->x, d->y, g->tilesize/20, g->tilesize/20, DOT_COLOUR);
         }
@@ -251,13 +265,17 @@ static void grid_debug_basic(grid *g)
 #ifdef DEBUG_GRID
     int i;
     printf("--- Basic Grid Data ---\n");
+    for (i = 0; i < g->num_dots; i++) {
+        grid_dot *d = g->dots[i];
+        printf("Dot %d at (%d,%d)\n", i, d->x, d->y);
+    }
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         printf("Face %d: dots[", i);
         int j;
         for (j = 0; j < f->order; j++) {
             grid_dot *d = f->dots[j];
-            printf("%s%d", j ? "," : "", (int)(d - g->dots)); 
+            printf("%s%d", j ? "," : "", (int)(d->index));
         }
         printf("]\n");
     }
@@ -275,38 +293,38 @@ static void grid_debug_derived(grid *g)
     int i;
     printf("--- Derived Grid Data ---\n");
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         printf("Edge %d: dots[%d,%d] faces[%d,%d]\n",
-            i, (int)(e->dot1 - g->dots), (int)(e->dot2 - g->dots),
-            e->face1 ? (int)(e->face1 - g->faces) : -1,
-            e->face2 ? (int)(e->face2 - g->faces) : -1);
+            i, (int)(e->dot1->index), (int)(e->dot2->index),
+            e->face1 ? (int)(e->face1->index) : -1,
+            e->face2 ? (int)(e->face2->index) : -1);
     }
     /* faces */
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int j;
         printf("Face %d: faces[", i);
         for (j = 0; j < f->order; j++) {
             grid_edge *e = f->edges[j];
             grid_face *f2 = (e->face1 == f) ? e->face2 : e->face1;
-            printf("%s%d", j ? "," : "", f2 ? (int)(f2 - g->faces) : -1);
+            printf("%s%d", j ? "," : "", f2 ? f2->index : -1);
         }
         printf("]\n");
     }
     /* dots */
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         int j;
         printf("Dot %d: dots[", i);
         for (j = 0; j < d->order; j++) {
             grid_edge *e = d->edges[j];
             grid_dot *d2 = (e->dot1 == d) ? e->dot2 : e->dot1;
-            printf("%s%d", j ? "," : "", (int)(d2 - g->dots));
+            printf("%s%d", j ? "," : "", d2->index);
         }
         printf("] faces[");
         for (j = 0; j < d->order; j++) {
             grid_face *f = d->faces[j];
-            printf("%s%d", j ? "," : "", f ? (int)(f - g->faces) : -1);
+            printf("%s%d", j ? "," : "", f ? f->index : -1);
         }
         printf("]\n");
     }
@@ -324,21 +342,23 @@ static int grid_edge_bydots_cmpfn(void *v1, void *v2)
     grid_edge *b = v2;
     grid_dot *da, *db;
 
-    /* Pointer subtraction is valid here, because all dots point into the
-     * same dot-list (g->dots).
-     * Edges are not "normalised" - the 2 dots could be stored in any order,
+    /* Edges are not "normalised" - the 2 dots could be stored in any order,
      * so we need to take this into account when comparing edges. */
 
     /* Compare first dots */
     da = (a->dot1 < a->dot2) ? a->dot1 : a->dot2;
     db = (b->dot1 < b->dot2) ? b->dot1 : b->dot2;
-    if (da != db)
-        return db - da;
+    if (da->index < db->index)
+        return -1;
+    if (da->index > db->index)
+        return +1;
     /* Compare last dots */
     da = (a->dot1 < a->dot2) ? a->dot2 : a->dot1;
     db = (b->dot1 < b->dot2) ? b->dot2 : b->dot1;
-    if (da != db)
-        return db - da;
+    if (da->index < db->index)
+        return -1;
+    if (da->index > db->index)
+        return +1;
 
     return 0;
 }
@@ -358,7 +378,7 @@ static int grid_edge_bydots_cmpfn(void *v1, void *v2)
 static void grid_trim_vigorously(grid *g)
 {
     int *dotpairs, *faces, *dots;
-    int *dsf;
+    DSF *dsf;
     int i, j, k, size, newfaces, newdots;
 
     /*
@@ -371,10 +391,10 @@ static void grid_trim_vigorously(grid *g)
         for (j = 0; j < g->num_dots; j++)
             dotpairs[i*g->num_dots+j] = -1;
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
-        int dot0 = f->dots[f->order-1] - g->dots;
+        grid_face *f = g->faces[i];
+        int dot0 = f->dots[f->order-1]->index;
         for (j = 0; j < f->order; j++) {
-            int dot1 = f->dots[j] - g->dots;
+            int dot1 = f->dots[j]->index;
             dotpairs[dot0 * g->num_dots + dot1] = i;
             dot0 = dot1;
         }
@@ -398,7 +418,7 @@ static void grid_trim_vigorously(grid *g)
      * Now identify connected pairs of landlocked dots, and form a dsf
      * unifying them.
      */
-    dsf = snew_dsf(g->num_dots);
+    dsf = dsf_new(g->num_dots);
     for (i = 0; i < g->num_dots; i++)
         for (j = 0; j < i; j++)
             if (dots[i] && dots[j] &&
@@ -434,60 +454,52 @@ static void grid_trim_vigorously(grid *g)
     for (i = 0; i < g->num_dots; i++)
         dots[i] = 0;
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         bool keep = false;
         for (k = 0; k < f->order; k++)
-            if (dsf_canonify(dsf, f->dots[k] - g->dots) == j)
+            if (dsf_canonify(dsf, f->dots[k]->index) == j)
                 keep = true;
         if (keep) {
             faces[i] = 1;
             for (k = 0; k < f->order; k++)
-                dots[f->dots[k]-g->dots] = 1;
+                dots[f->dots[k]->index] = 1;
         }
     }
 
     /*
-     * Work out the new indices of those faces and dots, when we
-     * compact the arrays containing them.
-     */
-    for (i = newfaces = 0; i < g->num_faces; i++)
-        faces[i] = (faces[i] ? newfaces++ : -1);
-    for (i = newdots = 0; i < g->num_dots; i++)
-        dots[i] = (dots[i] ? newdots++ : -1);
-
-    /*
-     * Free the dynamically allocated 'dots' pointer lists in faces
-     * we're going to discard.
+     * Compact the faces array, rewriting the faces' indices and
+     * freeing the unwanted ones.
      */
-    for (i = 0; i < g->num_faces; i++)
-        if (faces[i] < 0)
-            sfree(g->faces[i].dots);
+    for (i = newfaces = 0; i < g->num_faces; i++) {
+        grid_face *f = g->faces[i];
+        if (faces[i]) {
+            f->index = newfaces++;
+            g->faces[f->index] = f;
+        } else {
+            sfree(f->dots);
+            sfree(f);
+        }
+    }
+    g->num_faces = newfaces;
 
     /*
-     * Go through and compact the arrays.
+     * Compact the dots array, similarly.
      */
-    for (i = 0; i < g->num_dots; i++)
-        if (dots[i] >= 0) {
-            grid_dot *dnew = g->dots + dots[i], *dold = g->dots + i;
-            *dnew = *dold;             /* structure copy */
-        }
-    for (i = 0; i < g->num_faces; i++)
-        if (faces[i] >= 0) {
-            grid_face *fnew = g->faces + faces[i], *fold = g->faces + i;
-            *fnew = *fold;             /* structure copy */
-            for (j = 0; j < fnew->order; j++) {
-                /*
-                 * Reindex the dots in this face.
-                 */
-                k = fnew->dots[j] - g->dots;
-                fnew->dots[j] = g->dots + dots[k];
-            }
+    for (i = newdots = 0; i < g->num_dots; i++) {
+        grid_dot *d = g->dots[i];
+        if (dots[i]) {
+            d->index = newdots++;
+            g->dots[d->index] = d;
+        } else {
+            sfree(d->edges);
+            sfree(d->faces);
+            sfree(d);
         }
-    g->num_faces = newfaces;
+    }
     g->num_dots = newdots;
 
     sfree(dotpairs);
-    sfree(dsf);
+    dsf_free(dsf);
     sfree(dots);
     sfree(faces);
 }
@@ -505,7 +517,6 @@ static void grid_make_consistent(grid *g)
 {
     int i;
     tree234 *incomplete_edges;
-    grid_edge *next_new_edge; /* Where new edge will go into g->edges */
 
     grid_debug_basic(g);
 
@@ -513,14 +524,6 @@ static void grid_make_consistent(grid *g)
      * Generate edges
      */
 
-    /* We know how many dots and faces there are, so we can find the exact
-     * number of edges from Euler's polyhedral formula: F + V = E + 2 .
-     * We use "-1", not "-2" here, because Euler's formula includes the
-     * infinite face, which we don't count. */
-    g->num_edges = g->num_faces + g->num_dots - 1;
-    g->edges = snewn(g->num_edges, grid_edge);
-    next_new_edge = g->edges;
-
     /* Iterate over faces, and over each face's dots, generating edges as we
      * go.  As we find each new edge, we can immediately fill in the edge's
      * dots, but only one of the edge's faces.  Later on in the iteration, we
@@ -530,7 +533,7 @@ static void grid_make_consistent(grid *g)
      * their dots. */
     incomplete_edges = newtree234(grid_edge_bydots_cmpfn);
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int j;
         for (j = 0; j < f->order; j++) {
             grid_edge e; /* fake edge for searching */
@@ -548,18 +551,28 @@ static void grid_make_consistent(grid *g)
                  * Edge is already removed from incomplete_edges. */
                 edge_found->face2 = f;
             } else {
-                assert(next_new_edge - g->edges < g->num_edges);
-                next_new_edge->dot1 = e.dot1;
-                next_new_edge->dot2 = e.dot2;
-                next_new_edge->face1 = f;
-                next_new_edge->face2 = NULL; /* potentially infinite face */
-                add234(incomplete_edges, next_new_edge);
-                ++next_new_edge;
+                grid_edge *new_edge = snew(grid_edge);
+                new_edge->dot1 = e.dot1;
+                new_edge->dot2 = e.dot2;
+                new_edge->face1 = f;
+                new_edge->face2 = NULL; /* potentially infinite face */
+                add234(incomplete_edges, new_edge);
+
+                /* And add it to g->edges. */
+                if (g->num_edges >= g->size_edges) {
+                    int increment = g->num_edges / 4 + 128;
+                    g->size_edges = (increment < INT_MAX - g->num_edges ?
+                                     g->num_edges + increment : INT_MAX);
+                    g->edges = sresize(g->edges, g->size_edges, grid_edge *);
+                }
+                assert(g->num_edges < INT_MAX);
+                new_edge->index = g->num_edges++;
+                g->edges[new_edge->index] = new_edge;
             }
         }
     }
     freetree234(incomplete_edges);
-    
+
     /* ====== Stage 2 ======
      * For each face, build its edge list.
      */
@@ -567,7 +580,7 @@ static void grid_make_consistent(grid *g)
     /* Allocate space for each edge list.  Can do this, because each face's
      * edge-list is the same size as its dot-list. */
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int j;
         f->edges = snewn(f->order, grid_edge*);
         /* Preload with NULLs, to help detect potential bugs. */
@@ -579,7 +592,7 @@ static void grid_make_consistent(grid *g)
      * the face's edge-list, after finding where it should go in the
      * sequence. */
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         int j;
         for (j = 0; j < 2; j++) {
             grid_face *f = j ? e->face2 : e->face1;
@@ -641,16 +654,16 @@ static void grid_make_consistent(grid *g)
      * allocate the right space for these lists.  Pre-compute the sizes by
      * iterating over each edge and recording a tally against each dot. */
     for (i = 0; i < g->num_dots; i++) {
-        g->dots[i].order = 0;
+        g->dots[i]->order = 0;
     }
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         ++(e->dot1->order);
         ++(e->dot2->order);
     }
     /* Now we have the sizes, pre-allocate the edge and face lists. */
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         int j;
         assert(d->order >= 2); /* sanity check */
         d->edges = snewn(d->order, grid_edge*);
@@ -663,7 +676,7 @@ static void grid_make_consistent(grid *g)
     /* For each dot, need to find a face that touches it, so we can seed
      * the edge-face-edge-face process around each dot. */
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int j;
         for (j = 0; j < f->order; j++) {
             grid_dot *d = f->dots[j];
@@ -677,7 +690,7 @@ static void grid_make_consistent(grid *g)
      * blocks progress.  But there's only one such face, so we will
      * succeed in finding every edge and face this way. */
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         int current_face1 = 0; /* ascends clockwise */
         int current_face2 = 0; /* descends anticlockwise */
         
@@ -774,7 +787,7 @@ static void grid_make_consistent(grid *g)
 
     /* Bounding rectangle */
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         if (i == 0) {
             g->lowest_x = g->highest_x = d->x;
             g->lowest_y = g->highest_y = d->y;
@@ -802,36 +815,52 @@ static int grid_point_cmp_fn(void *v1, void *v2)
     else
         return p2->x - p1->x;
 }
-/* Add a new face to the grid, with its dot list allocated.
- * Assumes there's enough space allocated for the new face in grid->faces */
+/* Add a new face to the grid, with its dot list allocated. */
 static void grid_face_add_new(grid *g, int face_size)
 {
     int i;
-    grid_face *new_face = g->faces + g->num_faces;
+    grid_face *new_face = snew(grid_face);
+    assert(g->num_faces < INT_MAX);
+    if (g->num_faces >= g->size_faces) {
+        int increment = g->num_faces / 4 + 128;
+        g->size_faces = (increment < INT_MAX - g->num_faces ?
+                         g->num_faces + increment : INT_MAX);
+        g->faces = sresize(g->faces, g->size_faces, grid_face *);
+    }
+    new_face->index = g->num_faces++;
+    g->faces[new_face->index] = new_face;
+
     new_face->order = face_size;
     new_face->dots = snewn(face_size, grid_dot*);
     for (i = 0; i < face_size; i++)
         new_face->dots[i] = NULL;
     new_face->edges = NULL;
     new_face->has_incentre = false;
-    g->num_faces++;
 }
-/* Assumes dot list has enough space */
 static grid_dot *grid_dot_add_new(grid *g, int x, int y)
 {
-    grid_dot *new_dot = g->dots + g->num_dots;
+    grid_dot *new_dot = snew(grid_dot);
+    if (g->num_dots >= g->size_dots) {
+        int increment = g->num_dots / 4 + 128;
+        g->size_dots = (increment < INT_MAX - g->num_dots ?
+                         g->num_dots + increment : INT_MAX);
+        g->dots = sresize(g->dots, g->size_dots, grid_dot *);
+    }
+    assert(g->num_dots < INT_MAX);
+    new_dot->index = g->num_dots++;
+    g->dots[new_dot->index] = new_dot;
+
     new_dot->order = 0;
     new_dot->edges = NULL;
     new_dot->faces = NULL;
     new_dot->x = x;
     new_dot->y = y;
-    g->num_dots++;
+
     return new_dot;
 }
 /* Retrieve a dot with these (x,y) coordinates.  Either return an existing dot
  * in the dot_list, or add a new dot to the grid (and the dot_list) and
- * return that.
- * Assumes g->dots has enough capacity allocated */
+ * return that. */
 static grid_dot *grid_get_dot(grid *g, tree234 *dot_list, int x, int y)
 {
     grid_dot test, *ret;
@@ -855,7 +884,7 @@ static grid_dot *grid_get_dot(grid *g, tree234 *dot_list, int x, int y)
  * previously been added, with the required number of dots allocated) */
 static void grid_face_set_dot(grid *g, grid_dot *d, int position)
 {
-    grid_face *last_face = g->faces + g->num_faces - 1;
+    grid_face *last_face = g->faces[g->num_faces - 1];
     last_face->dots[position] = d;
 }
 
@@ -1388,6 +1417,15 @@ void grid_find_incentre(grid_face *f)
 
 #define SQUARE_TILESIZE 20
 
+static const char *grid_validate_params_square(int width, int height)
+{
+    if (width > INT_MAX / SQUARE_TILESIZE ||  /* xextent */
+        height > INT_MAX / SQUARE_TILESIZE || /* yextent */
+        width + 1 > INT_MAX / (height + 1))   /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_square(int width, int height,
                       int *tilesize, int *xextent, int *yextent)
 {
@@ -1404,16 +1442,10 @@ static grid *grid_new_square(int width, int height, const char *desc)
     /* Side length */
     int a = SQUARE_TILESIZE;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = width * height;
-    int max_dots = (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = a;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -1438,8 +1470,6 @@ static grid *grid_new_square(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -1450,6 +1480,18 @@ static grid *grid_new_square(int width, int height, const char *desc)
 #define HONEY_A 15
 #define HONEY_B 26
 
+static const char *grid_validate_params_honeycomb(int width, int height)
+{
+    int a = HONEY_A;
+    int b = HONEY_B;
+
+    if (width - 1 > (INT_MAX - 4*a) / (3 * a) ||  /* xextent */
+        height - 1 > (INT_MAX - 3*b) / (2 * b) || /* yextent */
+        width + 1 > INT_MAX / 2 / (height + 1))   /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_honeycomb(int width, int height,
                          int *tilesize, int *xextent, int *yextent)
 {
@@ -1467,16 +1509,10 @@ static grid *grid_new_honeycomb(int width, int height, const char *desc)
     int a = HONEY_A;
     int b = HONEY_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = width * height;
-    int max_dots = 2 * (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = HONEY_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -1507,8 +1543,6 @@ static grid *grid_new_honeycomb(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -1519,6 +1553,18 @@ static grid *grid_new_honeycomb(int width, int height, const char *desc)
 #define TRIANGLE_VEC_X 15
 #define TRIANGLE_VEC_Y 26
 
+static const char *grid_validate_params_triangular(int width, int height)
+{
+    int vec_x = TRIANGLE_VEC_X;
+    int vec_y = TRIANGLE_VEC_Y;
+
+    if (width > INT_MAX / (2 * vec_x) - 1 ||    /* xextent */
+        height > INT_MAX / vec_y ||             /* yextent */
+        width + 1 > INT_MAX / 4 / (height + 1)) /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_triangular(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -1582,16 +1628,18 @@ static grid *grid_new_triangular(int width, int height, const char *desc)
          *   5x6t1:a022a212h1a1d1a12c2b11a012b1a20d1a0a12e
          */
 
-        g->num_faces = width * height * 2;
-        g->num_dots = (width + 1) * (height + 1);
-        g->faces = snewn(g->num_faces, grid_face);
-        g->dots = snewn(g->num_dots, grid_dot);
+        g->num_faces = g->size_faces = width * height * 2;
+        g->num_dots = g->size_dots = (width + 1) * (height + 1);
+        g->faces = snewn(g->size_faces, grid_face *);
+        g->dots = snewn(g->size_dots, grid_dot *);
 
         /* generate dots */
         index = 0;
         for (y = 0; y <= height; y++) {
             for (x = 0; x <= width; x++) {
-                grid_dot *d = g->dots + index;
+                grid_dot *d = snew(grid_dot);
+                d->index = index;
+                g->dots[d->index] = d;
                 /* odd rows are offset to the right */
                 d->order = 0;
                 d->edges = NULL;
@@ -1607,8 +1655,11 @@ static grid *grid_new_triangular(int width, int height, const char *desc)
         for (y = 0; y < height; y++) {
             for (x = 0; x < width; x++) {
                 /* initialise two faces for this (x,y) */
-                grid_face *f1 = g->faces + index;
-                grid_face *f2 = f1 + 1;
+                grid_face *f1 = snew(grid_face), *f2 = snew(grid_face);
+                f1->index = index;
+                f2->index = index + 1;
+                g->faces[f1->index] = f1;
+                g->faces[f2->index] = f2;
                 f1->edges = NULL;
                 f1->order = 3;
                 f1->dots = snewn(f1->order, grid_dot*);
@@ -1621,19 +1672,19 @@ static grid *grid_new_triangular(int width, int height, const char *desc)
                 /* face descriptions depend on whether the row-number is
                  * odd or even */
                 if (y % 2) {
-                    f1->dots[0] = g->dots + y       * w + x;
-                    f1->dots[1] = g->dots + (y + 1) * w + x + 1;
-                    f1->dots[2] = g->dots + (y + 1) * w + x;
-                    f2->dots[0] = g->dots + y       * w + x;
-                    f2->dots[1] = g->dots + y       * w + x + 1;
-                    f2->dots[2] = g->dots + (y + 1) * w + x + 1;
+                    f1->dots[0] = g->dots[y       * w + x];
+                    f1->dots[1] = g->dots[(y + 1) * w + x + 1];
+                    f1->dots[2] = g->dots[(y + 1) * w + x];
+                    f2->dots[0] = g->dots[y       * w + x];
+                    f2->dots[1] = g->dots[y       * w + x + 1];
+                    f2->dots[2] = g->dots[(y + 1) * w + x + 1];
                 } else {
-                    f1->dots[0] = g->dots + y       * w + x;
-                    f1->dots[1] = g->dots + y       * w + x + 1;
-                    f1->dots[2] = g->dots + (y + 1) * w + x;
-                    f2->dots[0] = g->dots + y       * w + x + 1;
-                    f2->dots[1] = g->dots + (y + 1) * w + x + 1;
-                    f2->dots[2] = g->dots + (y + 1) * w + x;
+                    f1->dots[0] = g->dots[y       * w + x];
+                    f1->dots[1] = g->dots[y       * w + x + 1];
+                    f1->dots[2] = g->dots[(y + 1) * w + x];
+                    f2->dots[0] = g->dots[y       * w + x + 1];
+                    f2->dots[1] = g->dots[(y + 1) * w + x + 1];
+                    f2->dots[2] = g->dots[(y + 1) * w + x];
                 }
                 index += 2;
             }
@@ -1650,12 +1701,6 @@ static grid *grid_new_triangular(int width, int height, const char *desc)
          *   5x6t1:0_a1212c22c2a02a2f22a0c12a110d0e1c0c0a101121a1
          */
         tree234 *points = newtree234(grid_point_cmp_fn);
-        /* Upper bounds - don't have to be exact */
-        int max_faces = height * (2*width+1);
-        int max_dots = (height+1) * (width+1) * 4;
-
-        g->faces = snewn(max_faces, grid_face);
-        g->dots = snewn(max_dots, grid_dot);
 
         for (y = 0; y < height; y++) {
             /*
@@ -1703,8 +1748,6 @@ static grid *grid_new_triangular(int width, int height, const char *desc)
         }
 
         freetree234(points);
-        assert(g->num_faces <= max_faces);
-        assert(g->num_dots <= max_dots);
     }
 
     grid_make_consistent(g);
@@ -1716,6 +1759,19 @@ static grid *grid_new_triangular(int width, int height, const char *desc)
 #define SNUBSQUARE_A 15
 #define SNUBSQUARE_B 26
 
+static const char *grid_validate_params_snubsquare(int width, int height)
+{
+    int a = SNUBSQUARE_A;
+    int b = SNUBSQUARE_B;
+
+    if (width-1 > (INT_MAX - (a + b)) / (a+b) || /* xextent */
+        height > (INT_MAX - (a + b)) / (a+b) ||  /* yextent */
+        width > INT_MAX / 3 / height ||          /* max_faces */
+        width + 1 > INT_MAX / 2 / (height + 1))  /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_snubsquare(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -1733,16 +1789,10 @@ static grid *grid_new_snubsquare(int width, int height, const char *desc)
     int a = SNUBSQUARE_A;
     int b = SNUBSQUARE_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 3 * width * height;
-    int max_dots = 2 * (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = SNUBSQUARE_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -1818,8 +1868,6 @@ static grid *grid_new_snubsquare(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -1830,6 +1878,18 @@ static grid *grid_new_snubsquare(int width, int height, const char *desc)
 #define CAIRO_A 14
 #define CAIRO_B 31
 
+static const char *grid_validate_params_cairo(int width, int height)
+{
+    int b = CAIRO_B; /* a unused in determining grid size. */
+
+    if (width - 1 > (INT_MAX - 2*b) / (2*b) ||  /* xextent */
+        height - 1 > (INT_MAX - 2*b) / (2*b) || /* yextent */
+        width > INT_MAX / 2 / height ||         /* max_faces */
+        width + 1 > INT_MAX / 3 / (height + 1)) /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_cairo(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -1846,16 +1906,10 @@ static grid *grid_new_cairo(int width, int height, const char *desc)
     int a = CAIRO_A;
     int b = CAIRO_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 2 * width * height;
-    int max_dots = 3 * (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = CAIRO_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -1924,8 +1978,6 @@ static grid *grid_new_cairo(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -1936,6 +1988,18 @@ static grid *grid_new_cairo(int width, int height, const char *desc)
 #define GREATHEX_A 15
 #define GREATHEX_B 26
 
+static const char *grid_validate_params_greathexagonal(int width, int height)
+{
+    int a = GREATHEX_A;
+    int b = GREATHEX_B;
+
+    if (width-1 > (INT_MAX - 4*a) / (3*a + b) ||          /* xextent */
+        height-1 > (INT_MAX - (3*b + a)) / (2*a + 2*b) || /* yextent */
+        width + 1 > INT_MAX / 6 / (height + 1))           /* max_faces */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_greathexagonal(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -1953,16 +2017,10 @@ static grid *grid_new_greathexagonal(int width, int height, const char *desc)
     int a = GREATHEX_A;
     int b = GREATHEX_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 6 * (width + 1) * (height + 1);
-    int max_dots = 6 * width * height;
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = GREATHEX_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2054,8 +2112,6 @@ static grid *grid_new_greathexagonal(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -2066,6 +2122,18 @@ static grid *grid_new_greathexagonal(int width, int height, const char *desc)
 #define KAGOME_A 15
 #define KAGOME_B 26
 
+static const char *grid_validate_params_kagome(int width, int height)
+{
+    int a = KAGOME_A;
+    int b = KAGOME_B;
+
+    if (width-1 > (INT_MAX - 6*a) / (4*a) ||    /* xextent */
+        height-1 > (INT_MAX - 2*b) / (2*b) ||   /* yextent */
+        width + 1 > INT_MAX / 6 / (height + 1)) /* max_faces */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_kagome(int width, int height,
                              int *tilesize, int *xextent, int *yextent)
 {
@@ -2083,16 +2151,10 @@ static grid *grid_new_kagome(int width, int height, const char *desc)
     int a = KAGOME_A;
     int b = KAGOME_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 6 * (width + 1) * (height + 1);
-    int max_dots = 6 * width * height;
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = KAGOME_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2150,8 +2212,6 @@ static grid *grid_new_kagome(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -2162,6 +2222,18 @@ static grid *grid_new_kagome(int width, int height, const char *desc)
 #define OCTAGONAL_A 29
 #define OCTAGONAL_B 41
 
+static const char *grid_validate_params_octagonal(int width, int height)
+{
+    int a = OCTAGONAL_A;
+    int b = OCTAGONAL_B;
+
+    if (width > INT_MAX / (2*a + b) ||          /* xextent */
+        height > INT_MAX / (2*a + b) ||         /* yextent */
+        height + 1 > INT_MAX / 4 / (width + 1)) /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_octagonal(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -2179,16 +2251,10 @@ static grid *grid_new_octagonal(int width, int height, const char *desc)
     int a = OCTAGONAL_A;
     int b = OCTAGONAL_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 2 * width * height;
-    int max_dots = 4 * (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = OCTAGONAL_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2233,8 +2299,6 @@ static grid *grid_new_octagonal(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -2245,6 +2309,18 @@ static grid *grid_new_octagonal(int width, int height, const char *desc)
 #define KITE_A 15
 #define KITE_B 26
 
+static const char *grid_validate_params_kites(int width, int height)
+{
+    int a = KITE_A;
+    int b = KITE_B;
+
+    if (width > (INT_MAX - 2*b) / (4*b) ||      /* xextent */
+        height - 1 > (INT_MAX - 8*a) / (6*a) || /* yextent */
+        width + 1 > INT_MAX / 6 / (height + 1)) /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_kites(int width, int height,
                      int *tilesize, int *xextent, int *yextent)
 {
@@ -2262,16 +2338,10 @@ static grid *grid_new_kites(int width, int height, const char *desc)
     int a = KITE_A;
     int b = KITE_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 6 * width * height;
-    int max_dots = 6 * (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = KITE_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2353,8 +2423,6 @@ static grid *grid_new_kites(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -2367,6 +2435,20 @@ static grid *grid_new_kites(int width, int height, const char *desc)
 #define FLORET_PX 75
 #define FLORET_PY -26
 
+static const char *grid_validate_params_floret(int width, int height)
+{
+    int px = FLORET_PX, py = FLORET_PY;         /* |( 75, -26)| = 79.43 */
+    int qx = 4*px/5, qy = -py*2;                /* |( 60,  52)| = 79.40 */
+    int ry = qy-py;
+    /* rx unused in determining grid size. */
+
+    if (width - 1 > (INT_MAX - (4*qx + 2*px)) / ((6*px+3*qx)/2) ||/* xextent */
+        height - 1 > (INT_MAX - (4*qy + 2*ry)) / (5*qy-4*py) ||   /* yextent */
+        width + 1 > INT_MAX / 9 / (height + 1))                  /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_floret(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -2393,16 +2475,10 @@ static grid *grid_new_floret(int width, int height, const char *desc)
     int qx = 4*px/5, qy = -py*2;                /* |( 60,  52)| = 79.40 */
     int rx = qx-px, ry = qy-py;                 /* |(-15,  78)| = 79.38 */
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 6 * width * height;
-    int max_dots = 9 * (width + 1) * (height + 1);
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = FLORET_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2463,8 +2539,6 @@ static grid *grid_new_floret(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
@@ -2476,6 +2550,18 @@ static grid *grid_new_floret(int width, int height, const char *desc)
 #define DODEC_A 15
 #define DODEC_B 26
 
+static const char *grid_validate_params_dodecagonal(int width, int height)
+{
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    if (width - 1 > (INT_MAX - 3*(2*a + b)) / (4*a + 2*b) ||  /* xextent */
+        height - 1 > (INT_MAX - 2*(2*a + b)) / (3*a + 2*b) || /* yextent */
+        width > INT_MAX / 14 / height)                        /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_dodecagonal(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -2493,16 +2579,10 @@ static grid *grid_new_dodecagonal(int width, int height, const char *desc)
     int a = DODEC_A;
     int b = DODEC_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 3 * width * height;
-    int max_dots = 14 * width * height;
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = DODEC_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2549,13 +2629,23 @@ static grid *grid_new_dodecagonal(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
 }
 
+static const char *grid_validate_params_greatdodecagonal(int width, int height)
+{
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    if (width - 1 > (INT_MAX - (2*(2*a + b) + 3*a + b)) / (6*a + 2*b) ||
+        height - 1 > (INT_MAX - 2*(2*a + b)) / (3*a + 3*b) || /* yextent */
+        width > INT_MAX / 200 / height) /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_greatdodecagonal(int width, int height,
                           int *tilesize, int *xextent, int *yextent)
 {
@@ -2574,16 +2664,10 @@ static grid *grid_new_greatdodecagonal(int width, int height, const char *desc)
     int a = DODEC_A;
     int b = DODEC_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 30 * width * height;
-    int max_dots = 200 * width * height;
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = DODEC_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2663,13 +2747,24 @@ static grid *grid_new_greatdodecagonal(int width, int height, const char *desc)
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
 }
 
+static const char *grid_validate_params_greatgreatdodecagonal(
+    int width, int height)
+{
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    if (width-1 > (INT_MAX - (2*(2*a + b) + 2*a + 2*b)) / (4*a + 4*b) ||
+        height-1 > (INT_MAX - 2*(2*a + b)) / (6*a + 2*b) || /* yextent */
+        width > INT_MAX / 300 / height) /* max_dots */
+        return "Grid size must not be unreasonably large";
+    return NULL;
+}
+
 static void grid_size_greatgreatdodecagonal(int width, int height,
                                             int *tilesize, int *xextent, int *yextent)
 {
@@ -2688,16 +2783,10 @@ static grid *grid_new_greatgreatdodecagonal(int width, int height, const char *d
     int a = DODEC_A;
     int b = DODEC_B;
 
-    /* Upper bounds - don't have to be exact */
-    int max_faces = 50 * width * height;
-    int max_dots = 300 * width * height;
-
     tree234 *points;
 
     grid *g = grid_empty();
     g->tilesize = DODEC_TILESIZE;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -2747,7 +2836,7 @@ static grid *grid_new_greatgreatdodecagonal(int width, int height, const char *d
                 d = grid_get_dot(g, points, px + (2*a + 2*b), py - 2*a); grid_face_set_dot(g, d, 5);
             }
 
-            /* hexagon on bottom right  of dodecagon */
+            /* hexagon on bottom right of dodecagon */
             if ((y < height - 1) && (x < width - 1 || !(y % 2))) {
                 grid_face_add_new(g, 6);
                 d = grid_get_dot(g, points, px + (a + 2*b), py + (2*a + b)); grid_face_set_dot(g, d, 0);
@@ -2832,29 +2921,165 @@ static grid *grid_new_greatgreatdodecagonal(int width, int height, const char *d
     }
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     grid_make_consistent(g);
     return g;
 }
 
-typedef struct setface_ctx
+static const char *grid_validate_params_compassdodecagonal(
+    int width, int height)
+{
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    if (width > INT_MAX / (4*a + 2*b) ||  /* xextent */
+        height > INT_MAX / (4*a + 2*b) || /* yextent */
+        width > INT_MAX / 18 / height)    /* max_dots */
+        return "Grid must not be unreasonably large";
+    return NULL;
+}
+
+static void grid_size_compassdodecagonal(int width, int height,
+                                         int *tilesize, int *xextent, int *yextent)
+{
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    *tilesize = DODEC_TILESIZE;
+    *xextent = (4*a + 2*b) * width;
+    *yextent = (4*a + 2*b) * height;
+}
+
+static grid *grid_new_compassdodecagonal(int width, int height, const char *desc)
 {
+    int x, y;
+    /* Vector for side of triangle - ratio is close to sqrt(3) */
+    int a = DODEC_A;
+    int b = DODEC_B;
+
+    tree234 *points;
+
+    grid *g = grid_empty();
+    g->tilesize = DODEC_TILESIZE;
+
+    points = newtree234(grid_point_cmp_fn);
+
+    for (y = 0; y < height; y++) {
+        for (x = 0; x < width; x++) {
+            grid_dot *d;
+            /* centre of dodecagon */
+            int px = (4*a + 2*b) * x;
+            int py = (4*a + 2*b) * y;
+
+            /* dodecagon */
+            grid_face_add_new(g, 12);
+            d = grid_get_dot(g, points, px + (  a    ), py - (2*a + b)); grid_face_set_dot(g, d, 0);
+            d = grid_get_dot(g, points, px + (  a + b), py - (  a + b)); grid_face_set_dot(g, d, 1);
+            d = grid_get_dot(g, points, px + (2*a + b), py - (  a    )); grid_face_set_dot(g, d, 2);
+            d = grid_get_dot(g, points, px + (2*a + b), py + (  a    )); grid_face_set_dot(g, d, 3);
+            d = grid_get_dot(g, points, px + (  a + b), py + (  a + b)); grid_face_set_dot(g, d, 4);
+            d = grid_get_dot(g, points, px + (  a    ), py + (2*a + b)); grid_face_set_dot(g, d, 5);
+            d = grid_get_dot(g, points, px - (  a    ), py + (2*a + b)); grid_face_set_dot(g, d, 6);
+            d = grid_get_dot(g, points, px - (  a + b), py + (  a + b)); grid_face_set_dot(g, d, 7);
+            d = grid_get_dot(g, points, px - (2*a + b), py + (  a    )); grid_face_set_dot(g, d, 8);
+            d = grid_get_dot(g, points, px - (2*a + b), py - (  a    )); grid_face_set_dot(g, d, 9);
+            d = grid_get_dot(g, points, px - (  a + b), py - (  a + b)); grid_face_set_dot(g, d, 10);
+            d = grid_get_dot(g, points, px - (  a    ), py - (2*a + b)); grid_face_set_dot(g, d, 11);
+
+            if (x < width - 1 && y < height - 1) {
+                /* north triangle */
+                grid_face_add_new(g, 3);
+                d = grid_get_dot(g, points, px + (2*a + b), py + (  a    )); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (3*a + b), py + (  a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (  a + b), py + (  a + b)); grid_face_set_dot(g, d, 2);
+
+                /* east triangle */
+                grid_face_add_new(g, 3);
+                d = grid_get_dot(g, points, px + (3*a + 2*b), py + (2*a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (3*a +   b), py + (3*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (3*a +   b), py + (  a + b)); grid_face_set_dot(g, d, 2);
+
+                /* south triangle */
+                grid_face_add_new(g, 3);
+                d = grid_get_dot(g, points, px + (3*a + b), py + (3*a +   b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (2*a + b), py + (3*a + 2*b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (  a + b), py + (3*a +   b)); grid_face_set_dot(g, d, 2);
+
+                /* west triangle */
+                grid_face_add_new(g, 3);
+                d = grid_get_dot(g, points, px + (a + b), py + (  a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (a + b), py + (3*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (a    ), py + (2*a + b)); grid_face_set_dot(g, d, 2);
+
+                /* square in center */
+                grid_face_add_new(g, 4);
+                d = grid_get_dot(g, points, px + (3*a + b), py + (  a + b)); grid_face_set_dot(g, d, 0);
+                d = grid_get_dot(g, points, px + (3*a + b), py + (3*a + b)); grid_face_set_dot(g, d, 1);
+                d = grid_get_dot(g, points, px + (  a + b), py + (3*a + b)); grid_face_set_dot(g, d, 2);
+                d = grid_get_dot(g, points, px + (  a + b), py + (  a + b)); grid_face_set_dot(g, d, 3);
+            }
+        }
+    }
+
+    freetree234(points);
+
+    grid_make_consistent(g);
+    return g;
+}
+
+/*
+ * Penrose tilings. For historical reasons, we support two totally
+ * different generation algorithms: the legacy one is only supported
+ * by grid_new_penrose, for backwards compatibility with game
+ * descriptions generated before we switched. New grid generation uses
+ * only the new system.
+ */
+
+#define PENROSE_TILESIZE 100
+
+static const char *grid_validate_params_penrose(int width, int height)
+{
+    int l = PENROSE_TILESIZE;
+
+    if (width > INT_MAX / l ||                  /* xextent */
+        height > INT_MAX / l ||                 /* yextent */
+        width > INT_MAX / (3 * 3 * 4 * height)) /* max_dots */
+        return "Grid must not be unreasonably large";
+    return NULL;
+}
+
+static void grid_size_penrose(int width, int height,
+                              int *tilesize, int *xextent, int *yextent)
+{
+    int l = PENROSE_TILESIZE;
+
+    *tilesize = l;
+    *xextent = l * width;
+    *yextent = l * height;
+}
+
+/*
+ * Legacy generation by selecting a patch of tiling from the expansion
+ * of a big triangle.
+ */
+
+typedef struct penrose_legacy_set_faces_ctx {
     int xmin, xmax, ymin, ymax;
 
     grid *g;
     tree234 *points;
-} setface_ctx;
+} penrose_legacy_set_faces_ctx;
 
 static double round_int_nearest_away(double r)
 {
     return (r > 0.0) ? floor(r + 0.5) : ceil(r - 0.5);
 }
 
-static int set_faces(penrose_state *state, vector *vs, int n, int depth)
+static int penrose_legacy_set_faces(penrose_legacy_state *state, vector *vs,
+                                    int n, int depth)
 {
-    setface_ctx *sf_ctx = (setface_ctx *)state->ctx;
+    penrose_legacy_set_faces_ctx *sf_ctx =
+        (penrose_legacy_set_faces_ctx *)state->ctx;
     int i;
     int xs[4], ys[4];
 
@@ -2864,7 +3089,7 @@ static int set_faces(penrose_state *state, vector *vs, int n, int depth)
 #endif
 
     for (i = 0; i < n; i++) {
-        double tx = v_x(vs, i), ty = v_y(vs, i);
+        double tx = penrose_legacy_vx(vs, i), ty = penrose_legacy_vy(vs, i);
 
         xs[i] = (int)round_int_nearest_away(tx);
         ys[i] = (int)round_int_nearest_away(ty);
@@ -2875,88 +3100,24 @@ static int set_faces(penrose_state *state, vector *vs, int n, int depth)
 
     grid_face_add_new(sf_ctx->g, n);
     debug(("penrose: new face l=%f gen=%d...",
-           penrose_side_length(state->start_size, depth), depth));
+           penrose_legacy_side_length(state->start_size, depth), depth));
     for (i = 0; i < n; i++) {
         grid_dot *d = grid_get_dot(sf_ctx->g, sf_ctx->points,
                                    xs[i], ys[i]);
         grid_face_set_dot(sf_ctx->g, d, i);
         debug((" ... dot 0x%x (%d,%d) (was %2.2f,%2.2f)",
-               d, d->x, d->y, v_x(vs, i), v_y(vs, i)));
+               d, d->x, d->y, penrose_legacy_vx(vs, i),
+               penrose_legacy_vy(vs, i)));
     }
 
     return 0;
 }
 
-#define PENROSE_TILESIZE 100
-
-static void grid_size_penrose(int width, int height,
-                       int *tilesize, int *xextent, int *yextent)
-{
-    int l = PENROSE_TILESIZE;
-
-    *tilesize = l;
-    *xextent = l * width;
-    *yextent = l * height;
-}
-
-static grid *grid_new_penrose(int width, int height, int which, const char *desc); /* forward reference */
-
-static char *grid_new_desc_penrose(grid_type type, int width, int height, random_state *rs)
-{
-    int tilesize = PENROSE_TILESIZE, startsz, depth, xoff, yoff, aoff;
-    double outer_radius;
-    int inner_radius;
-    char gd[255];
-    int which = (type == GRID_PENROSE_P2 ? PENROSE_P2 : PENROSE_P3);
-    grid *g;
-
-    while (1) {
-        /* We want to produce a random bit of penrose tiling, so we
-         * calculate a random offset (within the patch that penrose.c
-         * calculates for us) and an angle (multiple of 36) to rotate
-         * the patch. */
-
-        penrose_calculate_size(which, tilesize, width, height,
-                               &outer_radius, &startsz, &depth);
-
-        /* Calculate radius of (circumcircle of) patch, subtract from
-         * radius calculated. */
-        inner_radius = (int)(outer_radius - sqrt(width*width + height*height));
-
-        /* Pick a random offset (the easy way: choose within outer
-         * square, discarding while it's outside the circle) */
-        do {
-            xoff = random_upto(rs, 2*inner_radius) - inner_radius;
-            yoff = random_upto(rs, 2*inner_radius) - inner_radius;
-        } while (sqrt(xoff*xoff+yoff*yoff) > inner_radius);
-
-        aoff = random_upto(rs, 360/36) * 36;
-
-        debug(("grid_desc: ts %d, %dx%d patch, orad %2.2f irad %d",
-               tilesize, width, height, outer_radius, inner_radius));
-        debug(("    -> xoff %d yoff %d aoff %d", xoff, yoff, aoff));
-
-        sprintf(gd, "G%d,%d,%d", xoff, yoff, aoff);
-
-        /*
-         * Now test-generate our grid, to make sure it actually
-         * produces something.
-         */
-        g = grid_new_penrose(width, height, which, gd);
-        if (g) {
-            grid_free(g);
-            break;
-        }
-        /* If not, go back to the top of this while loop and try again
-         * with a different random offset. */
-    }
-
-    return dupstr(gd);
-}
+static grid *grid_new_penrose_legacy(int width, int height, int which,
+                                     const char *desc);
 
-static const char *grid_validate_desc_penrose(grid_type type,
-                                              int width, int height,
-                                              const char *desc)
+static const char *grid_validate_desc_penrose_legacy(
+    grid_type type, int width, int height, const char *desc)
 {
     int tilesize = PENROSE_TILESIZE, startsz, depth, xoff, yoff, aoff, inner_radius;
     double outer_radius;
@@ -2966,8 +3127,8 @@ static const char *grid_validate_desc_penrose(grid_type type,
     if (!desc)
         return "Missing grid description string.";
 
-    penrose_calculate_size(which, tilesize, width, height,
-                           &outer_radius, &startsz, &depth);
+    penrose_legacy_calculate_size(which, tilesize, width, height,
+                                  &outer_radius, &startsz, &depth);
     inner_radius = (int)(outer_radius - sqrt(width*width + height*height));
 
     if (sscanf(desc, "G%d,%d,%d", &xoff, &yoff, &aoff) != 3)
@@ -2982,7 +3143,7 @@ static const char *grid_validate_desc_penrose(grid_type type,
      * Test-generate to ensure these parameters don't end us up with
      * no grid at all.
      */
-    g = grid_new_penrose(width, height, which, desc);
+    g = grid_new_penrose_legacy(width, height, which, desc);
     if (!g)
         return "Patch coordinates do not identify a usable grid fragment";
     grid_free(g);
@@ -2990,40 +3151,30 @@ static const char *grid_validate_desc_penrose(grid_type type,
     return NULL;
 }
 
-/*
- * We're asked for a grid of a particular size, and we generate enough
- * of the tiling so we can be sure to have enough random grid from which
- * to pick.
- */
-
-static grid *grid_new_penrose(int width, int height, int which, const char *desc)
+static grid *grid_new_penrose_legacy(int width, int height, int which,
+                                     const char *desc)
 {
-    int max_faces, max_dots, tilesize = PENROSE_TILESIZE;
+    int tilesize = PENROSE_TILESIZE;
     int xsz, ysz, xoff, yoff, aoff;
     double rradius;
 
     tree234 *points;
     grid *g;
 
-    penrose_state ps;
-    setface_ctx sf_ctx;
+    penrose_legacy_state ps;
+    penrose_legacy_set_faces_ctx sf_ctx;
 
-    penrose_calculate_size(which, tilesize, width, height,
-                           &rradius, &ps.start_size, &ps.max_depth);
+    penrose_legacy_calculate_size(which, tilesize, width, height,
+                                  &rradius, &ps.start_size, &ps.max_depth);
 
     debug(("penrose: w%d h%d, tile size %d, start size %d, depth %d",
            width, height, tilesize, ps.start_size, ps.max_depth));
 
-    ps.new_tile = set_faces;
+    ps.new_tile = penrose_legacy_set_faces;
     ps.ctx = &sf_ctx;
 
-    max_faces = (width*3) * (height*3); /* somewhat paranoid... */
-    max_dots = max_faces * 4; /* ditto... */
-
     g = grid_empty();
     g->tilesize = tilesize;
-    g->faces = snewn(max_faces, grid_face);
-    g->dots = snewn(max_dots, grid_dot);
 
     points = newtree234(grid_point_cmp_fn);
 
@@ -3051,11 +3202,9 @@ static grid *grid_new_penrose(int width, int height, int which, const char *desc
     debug(("penrose: x range (%f --> %f), y range (%f --> %f)",
            sf_ctx.xmin, sf_ctx.xmax, sf_ctx.ymin, sf_ctx.ymax));
 
-    penrose(&ps, which, aoff);
+    penrose_legacy(&ps, which, aoff);
 
     freetree234(points);
-    assert(g->num_faces <= max_faces);
-    assert(g->num_dots <= max_dots);
 
     debug(("penrose: %d faces total (equivalent to %d wide by %d high)",
            g->num_faces, g->num_faces/height, g->num_faces/width));
@@ -3091,6 +3240,223 @@ static grid *grid_new_penrose(int width, int height, int which, const char *desc
     return g;
 }
 
+/*
+ * Combinatorial-coordinate generation.
+ *
+ * We receive coordinates from the generator in the form of x,y pairs
+ * each of which is an integer combination of 1 and sqrt(5), but those
+ * pairs have different scale units in the x and y directions. The
+ * scale units are 1/4 for x and sin(pi/5)/2 for y, which makes their
+ * ratio equal to 2 sin(pi/5) ~= 1.1756. We fudge that irrational
+ * aspect ratio into a rational approximation, by simply taking a pair
+ * of integer scale factors for the x and y dimensions; this distorts
+ * the output tiling slightly, but the distortion is consistent, and
+ * doesn't accumulate over a large patch of tiling, so it won't make
+ * anything end up totally out of place.
+ *
+ * (However, we compute the subsequent combination of 1 and sqrt(5)
+ * exactly, because using an approximation to sqrt(5) _could_ mean
+ * that in a sufficiently large patch of tiling two such combinations
+ * ended up misordered.)
+ *
+ * Adding to the confusion, we also flip round the x and y
+ * coordinates, because it's slightly nicer to have vertical edges in
+ * the tiling rather than horizontal ones. (Both for aesthetics, and
+ * also because if two P3 thin rhombs are separated by a horizontal
+ * line and both contain numeric clues then the clue numbers look a
+ * bit crowded, due to digits being taller than they are wide.)
+ *
+ * Finally, we have different base unit sizes for the two tiling
+ * types, because sensible sizes for the two are actually different.
+ * Each of P2 and P3 can be subdivided into the other, via dividing
+ * the larger triangle type in two, so that L large and S small become
+ * L+S large and L small. In the limit, this means that you expect the
+ * number of triangles (hence tiles) to grow by a factor of phi in
+ * each of those subdivisions (and hence by a factor of phi^2 in a
+ * full subdivision of P2 to a finer P2). So a sensible size ratio
+ * between the two tilings is one that makes them fit about the same
+ * number of tiles into the same area - and since tile area is
+ * proportional to _square_ of length, it follows that the P2 and P3
+ * length unit should differ by a factor of sqrt(phi).
+ */
+#define PENROSE_XUNIT_P2 37
+#define PENROSE_YUNIT_P2 44
+#define PENROSE_XUNIT_P3 30
+#define PENROSE_YUNIT_P3 35
+
+struct size { int w, h; };
+static struct size api_size_penrose(int width, int height, int which)
+{
+    int xunit = (which == PENROSE_P2 ? PENROSE_XUNIT_P2 : PENROSE_XUNIT_P3);
+    int yunit = (which == PENROSE_P2 ? PENROSE_YUNIT_P2 : PENROSE_YUNIT_P3);
+    struct size size = {
+        width * PENROSE_TILESIZE / yunit,
+        height * PENROSE_TILESIZE / xunit,
+    };
+    return size;
+}
+
+static grid *grid_new_penrose(int width, int height, int which,
+                              const char *desc); /* forward reference */
+
+static char *grid_new_desc_penrose(grid_type type, int width, int height,
+                                   random_state *rs)
+{
+    char *buf;
+    struct PenrosePatchParams params;
+    int which = (type == GRID_PENROSE_P2 ? PENROSE_P2 : PENROSE_P3);
+    struct size size = api_size_penrose(width, height, which);
+
+    penrose_tiling_randomise(&params, which, size.h, size.w, rs);
+
+    buf = snewn(params.ncoords + 3, char);
+    buf[0] = '0' + params.orientation;
+    buf[1] = '0' + params.start_vertex;
+    memcpy(buf + 2, params.coords, params.ncoords);
+    buf[2 + params.ncoords] = '\0';
+
+    sfree(params.coords);
+    return buf;
+}
+
+/* Shared code between validating and reading grid descs.
+ * Always allocates params->coords, whether or not it returns an error. */
+static const char *grid_desc_to_penrose_params(
+    const char *desc, int which, struct PenrosePatchParams *params)
+{
+    int i;
+
+    if (!*desc)
+        return "empty grid description";
+
+    params->ncoords = strlen(desc) - 2;
+    params->coords = snewn(params->ncoords, char);
+
+    {
+        char c = desc[0];
+        if (isdigit((unsigned char)c))
+            params->orientation = c - '0';
+        else
+            return "expected digit at start of grid description";
+
+        c = desc[1];
+        if (c >= '0' && c < '3')
+            params->start_vertex = c - '0';
+        else
+            return "expected digit as second char of grid description";
+    }
+
+    for (i = 0; i < params->ncoords; i++) {
+        char c = desc[i+2];
+        if (!penrose_valid_letter(c, which))
+            return "expected tile letter in grid description";
+        params->coords[i] = c;
+    }
+
+    return NULL;
+}
+
+static const char *grid_validate_desc_penrose(grid_type type,
+                                              int width, int height,
+                                              const char *desc)
+{
+    struct PenrosePatchParams params;
+    const char *error = NULL;
+    int which = (type == GRID_PENROSE_P2 ? PENROSE_P2 : PENROSE_P3);
+
+    if (!desc)
+        return "Missing grid description string.";
+
+    if (*desc == 'G')
+        return grid_validate_desc_penrose_legacy(type, width, height, desc);
+
+    error = grid_desc_to_penrose_params(desc, which, &params);
+    if (!error)
+        error = penrose_tiling_params_invalid(&params, which);
+
+    sfree(params.coords);
+    return error;
+}
+
+struct penrosecontext {
+    grid *g;
+    tree234 *points;
+    int xunit, yunit;
+};
+
+static void grid_penrose_callback(void *vctx, const int *coords)
+{
+    struct penrosecontext *ctx = (struct penrosecontext *)vctx;
+    size_t i;
+
+    grid_face_add_new(ctx->g, 4);
+    for (i = 0; i < 4; i++) {
+        grid_dot *d = grid_get_dot(
+            ctx->g, ctx->points,
+            coords[4*i+2] * ctx->yunit + n_times_root_k(
+                coords[4*i+3] * ctx->yunit, 5),
+            coords[4*i+0] * ctx->xunit + n_times_root_k(
+                coords[4*i+1] * ctx->xunit, 5));
+        grid_face_set_dot(ctx->g, d, i);
+    }
+}
+
+static grid *grid_new_penrose(int width, int height, int which,
+                              const char *desc)
+{
+    struct PenrosePatchParams params;
+    const char *error = NULL;
+    struct penrosecontext ctx[1];
+    struct size size;
+
+    if (*desc == 'G')
+        return grid_new_penrose_legacy(width, height, which, desc);
+
+    error = grid_desc_to_penrose_params(desc, which, &params);
+    assert(error == NULL && "grid_validate_desc_penrose should have failed");
+
+    ctx->g = grid_empty();
+    ctx->g->tilesize = PENROSE_TILESIZE;
+
+    ctx->points = newtree234(grid_point_cmp_fn);
+
+    ctx->xunit = (which == PENROSE_P2 ? PENROSE_XUNIT_P2 : PENROSE_XUNIT_P3);
+    ctx->yunit = (which == PENROSE_P2 ? PENROSE_YUNIT_P2 : PENROSE_YUNIT_P3);
+
+    size = api_size_penrose(width, height, which);
+    penrose_tiling_generate(&params, size.h, size.w,
+                            grid_penrose_callback, ctx);
+
+    freetree234(ctx->points);
+    sfree(params.coords);
+
+    grid_trim_vigorously(ctx->g);
+    grid_make_consistent(ctx->g);
+
+    /*
+     * Centre the grid in its originally promised rectangle.
+     */
+    {
+        int w = width * PENROSE_TILESIZE, h = height * PENROSE_TILESIZE;
+        ctx->g->lowest_x -= (w - (ctx->g->highest_x - ctx->g->lowest_x))/2;
+        ctx->g->lowest_y -= (h - (ctx->g->highest_y - ctx->g->lowest_y))/2;
+        ctx->g->highest_x = ctx->g->lowest_x + w;
+        ctx->g->highest_y = ctx->g->lowest_y + h;
+    }
+
+    return ctx->g;
+}
+
+static const char *grid_validate_params_penrose_p2_kite(int width, int height)
+{
+    return grid_validate_params_penrose(width, height);
+}
+
+static const char *grid_validate_params_penrose_p3_thick(int width, int height)
+{
+    return grid_validate_params_penrose(width, height);
+}
+
 static void grid_size_penrose_p2_kite(int width, int height,
                        int *tilesize, int *xextent, int *yextent)
 {
@@ -3113,18 +3479,349 @@ static grid *grid_new_penrose_p3_thick(int width, int height, const char *desc)
     return grid_new_penrose(width, height, PENROSE_P3, desc);
 }
 
+#define HATS_TILESIZE 32
+#define HATS_XSQUARELEN 4
+#define HATS_YSQUARELEN 6
+#define HATS_XUNIT 14
+#define HATS_YUNIT 8
+
+static const char *grid_validate_params_hats(
+    int width, int height)
+{
+    int l = HATS_TILESIZE;
+
+    if (width > INT_MAX / l ||                  /* xextent */
+        height > INT_MAX / l ||                 /* yextent */
+        width > INT_MAX / (6 * height))         /* max_dots */
+        return "Grid must not be unreasonably large";
+    return NULL;
+}
+
+static void grid_size_hats(int width, int height,
+                           int *tilesize, int *xextent, int *yextent)
+{
+    *tilesize = HATS_TILESIZE;
+    *xextent = width * HATS_XUNIT * HATS_XSQUARELEN;
+    *yextent = height * HATS_YUNIT * HATS_YSQUARELEN;
+}
+
+static char *grid_new_desc_hats(
+    grid_type type, int width, int height, random_state *rs)
+{
+    char *buf, *p;
+    size_t bufmax, i;
+    struct HatPatchParams hp;
+
+    hat_tiling_randomise(&hp, width, height, rs);
+
+    bufmax = 3 * hp.ncoords + 2;
+    buf = snewn(bufmax, char);
+    p = buf;
+    for (i = 0; i < hp.ncoords; i++) {
+        assert(hp.coords[i] < 100);    /* at most 2 digits */
+        assert(p - buf <= bufmax-4);   /* room for 2 digits, comma and NUL */
+        p += sprintf(p, "%d,", (int)hp.coords[i]);
+    }
+    assert(p - buf <= bufmax-2);       /* room for final letter and NUL */
+    p[0] = hp.final_metatile;
+    p[1] = '\0';
+
+    sfree(hp.coords);
+    return buf;
+}
+
+/* Shared code between validating and reading grid descs.
+ * Always allocates hp->coords, whether or not it returns an error. */
+static const char *grid_desc_to_hat_params(
+    const char *desc, struct HatPatchParams *hp)
+{
+    size_t maxcoords;
+    const char *p = desc;
+
+    maxcoords = (strlen(desc) + 1) / 2;
+    hp->coords = snewn(maxcoords, unsigned char);
+    hp->ncoords = 0;
+
+    while (isdigit((unsigned char)*p)) {
+        const char *p_orig = p;
+        int n = atoi(p);
+        while (*p && isdigit((unsigned char)*p)) p++;
+        if (*p != ',')
+            return "expected ',' in grid description";
+        if (p - p_orig > 2 || n > 0xFF)
+            return "too-large coordinate in grid description";
+        p++; /* eat the comma */
+
+        /* This assert should be guaranteed by the way we calculated
+         * maxcoords, so a failure of this check is a bug in this
+         * function, not an indication of an invalid input string */
+        assert(hp->ncoords < maxcoords);
+        hp->coords[hp->ncoords++] = n;
+    }
+
+    if (*p == 'H' || *p == 'T' || *p == 'P' || *p == 'F')
+        hp->final_metatile = *p;
+    else
+        return "invalid character in grid description";
+
+    return NULL;
+}
+
+static const char *grid_validate_desc_hats(
+    grid_type type, int width, int height, const char *desc)
+{
+    struct HatPatchParams hp;
+    const char *error = NULL;
+
+    if (!desc)
+        return "Missing grid description string.";
+
+    error = grid_desc_to_hat_params(desc, &hp);
+    if (!error)
+        error = hat_tiling_params_invalid(&hp);
+
+    sfree(hp.coords);
+    return error;
+}
+
+struct hatcontext {
+    grid *g;
+    tree234 *points;
+};
+
+static void grid_hats_callback(void *vctx, size_t nvertices, int *coords)
+{
+    struct hatcontext *ctx = (struct hatcontext *)vctx;
+    size_t i;
+
+    grid_face_add_new(ctx->g, nvertices);
+    for (i = 0; i < nvertices; i++) {
+        grid_dot *d = grid_get_dot(
+            ctx->g, ctx->points,
+            coords[2*i] * HATS_XUNIT,
+            coords[2*i+1] * HATS_YUNIT);
+        grid_face_set_dot(ctx->g, d, i);
+    }
+}
+
+static grid *grid_new_hats(int width, int height, const char *desc)
+{
+    struct HatPatchParams hp;
+    const char *error = NULL;
+
+    error = grid_desc_to_hat_params(desc, &hp);
+    assert(error == NULL && "grid_validate_desc_hats should have failed");
+
+    struct hatcontext ctx[1];
+
+    ctx->g = grid_empty();
+    ctx->g->tilesize = HATS_TILESIZE;
+
+    ctx->points = newtree234(grid_point_cmp_fn);
+
+    hat_tiling_generate(&hp, width, height, grid_hats_callback, ctx);
+
+    freetree234(ctx->points);
+    sfree(hp.coords);
+
+    grid_trim_vigorously(ctx->g);
+    grid_make_consistent(ctx->g);
+    return ctx->g;
+}
+
+#define SPECTRE_TILESIZE 32
+#define SPECTRE_SQUARELEN 7
+#define SPECTRE_UNIT 8
+
+static const char *grid_validate_params_spectres(
+    int width, int height)
+{
+    int l = SPECTRE_UNIT * SPECTRE_SQUARELEN;
+
+    if (width > INT_MAX / l ||                  /* xextent */
+        height > INT_MAX / l ||                 /* yextent */
+        width > (INT_MAX / SPECTRE_SQUARELEN /
+                 SPECTRE_SQUARELEN / height))   /* max_faces */
+        return "Grid must not be unreasonably large";
+    return NULL;
+}
+
+static void grid_size_spectres(int width, int height,
+                               int *tilesize, int *xextent, int *yextent)
+{
+    *tilesize = SPECTRE_TILESIZE;
+    *xextent = width * SPECTRE_UNIT * SPECTRE_SQUARELEN;
+    *yextent = height * SPECTRE_UNIT * SPECTRE_SQUARELEN;
+}
+
+static char *grid_new_desc_spectres(
+    grid_type type, int width, int height, random_state *rs)
+{
+    char *buf;
+    size_t i;
+    struct SpectrePatchParams sp;
+
+    spectre_tiling_randomise(&sp, width * SPECTRE_SQUARELEN,
+                             height * SPECTRE_SQUARELEN, rs);
+
+    buf = snewn(sp.ncoords + 3, char);
+    buf[0] = (sp.orientation < 10 ? '0' + sp.orientation :
+              'A' + sp.orientation - 10);
+    for (i = 0; i < sp.ncoords; i++) {
+        assert(sp.coords[i] < 10);    /* all indices are 1 digit */
+        buf[i+1] = '0' + sp.coords[i];
+    }
+    buf[sp.ncoords+1] = sp.final_hex;
+    buf[sp.ncoords+2] = '\0';
+
+    sfree(sp.coords);
+    return buf;
+}
+
+/* Shared code between validating and reading grid descs.
+ * Always allocates sp->coords, whether or not it returns an error. */
+static const char *grid_desc_to_spectre_params(
+    const char *desc, struct SpectrePatchParams *sp)
+{
+    size_t i;
+
+    if (!*desc)
+        return "empty grid description";
+
+    sp->ncoords = strlen(desc) - 2;
+    sp->coords = snewn(sp->ncoords, unsigned char);
+
+    {
+        char c = desc[0];
+        if (isdigit((unsigned char)c))
+            sp->orientation = c - '0';
+        else if (c == 'A' || c == 'B')
+            sp->orientation = 10 + c - 'A';
+        else
+            return "expected digit or A,B at start of grid description";
+    }
+
+    for (i = 0; i < sp->ncoords; i++) {
+        char c = desc[i+1];
+        if (!isdigit((unsigned char)c))
+            return "expected digit in grid description";
+        sp->coords[i] = c - '0';
+    }
+
+    sp->final_hex = desc[sp->ncoords+1];
+
+    return NULL;
+}
+
+static const char *grid_validate_desc_spectres(
+    grid_type type, int width, int height, const char *desc)
+{
+    struct SpectrePatchParams sp;
+    const char *error = NULL;
+
+    if (!desc)
+        return "Missing grid description string.";
+
+    error = grid_desc_to_spectre_params(desc, &sp);
+    if (!error)
+        error = spectre_tiling_params_invalid(&sp);
+
+    sfree(sp.coords);
+    return error;
+}
+
+struct spectrecontext {
+    grid *g;
+    tree234 *points;
+};
+
+static void grid_spectres_callback(void *vctx, const int *coords)
+{
+    struct spectrecontext *ctx = (struct spectrecontext *)vctx;
+    size_t i;
+
+    grid_face_add_new(ctx->g, SPECTRE_NVERTICES);
+    for (i = 0; i < SPECTRE_NVERTICES; i++) {
+        grid_dot *d = grid_get_dot(
+            ctx->g, ctx->points,
+            (coords[4*i+0] * SPECTRE_UNIT +
+             n_times_root_k(coords[4*i+1] * SPECTRE_UNIT, 3)),
+            (coords[4*i+2] * SPECTRE_UNIT +
+             n_times_root_k(coords[4*i+3] * SPECTRE_UNIT, 3)));
+        grid_face_set_dot(ctx->g, d, i);
+    }
+}
+
+static grid *grid_new_spectres(int width, int height, const char *desc)
+{
+    struct SpectrePatchParams sp;
+    const char *error = NULL;
+    int width2 = width * SPECTRE_SQUARELEN;
+    int height2 = height * SPECTRE_SQUARELEN;
+
+    error = grid_desc_to_spectre_params(desc, &sp);
+    assert(error == NULL && "grid_validate_desc_spectres should have failed");
+
+    struct spectrecontext ctx[1];
+
+    ctx->g = grid_empty();
+    ctx->g->tilesize = SPECTRE_TILESIZE;
+
+    ctx->points = newtree234(grid_point_cmp_fn);
+
+    spectre_tiling_generate(&sp, width2, height2, grid_spectres_callback, ctx);
+
+    freetree234(ctx->points);
+    sfree(sp.coords);
+
+    grid_trim_vigorously(ctx->g);
+    grid_make_consistent(ctx->g);
+
+    /*
+     * As with the Penrose tiling, we're likely to have different
+     * sized margins due to the lack of a neat grid that this tiling
+     * fits on. So now we know what tiles we're left with, recentre
+     * them.
+     */
+    {
+        int w = width2 * SPECTRE_UNIT, h = height2 * SPECTRE_UNIT;
+        ctx->g->lowest_x -= (w - (ctx->g->highest_x - ctx->g->lowest_x))/2;
+        ctx->g->lowest_y -= (h - (ctx->g->highest_y - ctx->g->lowest_y))/2;
+        ctx->g->highest_x = ctx->g->lowest_x + w;
+        ctx->g->highest_y = ctx->g->lowest_y + h;
+    }
+
+    return ctx->g;
+}
+
 /* ----------- End of grid generators ------------- */
 
+#define FNVAL(upper,lower) &grid_validate_params_ ## lower,
 #define FNNEW(upper,lower) &grid_new_ ## lower,
 #define FNSZ(upper,lower) &grid_size_ ## lower,
 
+static const char *(*(grid_validate_paramses[]))(int, int) =
+    { GRIDGEN_LIST(FNVAL) };
 static grid *(*(grid_news[]))(int, int, const char*) = { GRIDGEN_LIST(FNNEW) };
 static void(*(grid_sizes[]))(int, int, int*, int*, int*) = { GRIDGEN_LIST(FNSZ) };
 
+/* Work out if a grid can be made, and complain if not. */
+
+const char *grid_validate_params(grid_type type, int width, int height)
+{
+    if (width <= 0 || height <= 0)
+        return "Width and height must both be positive";
+    return grid_validate_paramses[type](width, height);
+}
+
 char *grid_new_desc(grid_type type, int width, int height, random_state *rs)
 {
     if (type == GRID_PENROSE_P2 || type == GRID_PENROSE_P3) {
         return grid_new_desc_penrose(type, width, height, rs);
+    } else if (type == GRID_HATS) {
+        return grid_new_desc_hats(type, width, height, rs);
+    } else if (type == GRID_SPECTRES) {
+        return grid_new_desc_spectres(type, width, height, rs);
     } else if (type == GRID_TRIANGULAR) {
         return dupstr("0"); /* up-to-date version of triangular grid */
     } else {
@@ -3137,6 +3834,10 @@ const char *grid_validate_desc(grid_type type, int width, int height,
 {
     if (type == GRID_PENROSE_P2 || type == GRID_PENROSE_P3) {
         return grid_validate_desc_penrose(type, width, height, desc);
+    } else if (type == GRID_HATS) {
+        return grid_validate_desc_hats(type, width, height, desc);
+    } else if (type == GRID_SPECTRES) {
+        return grid_validate_desc_spectres(type, width, height, desc);
     } else if (type == GRID_TRIANGULAR) {
         return grid_validate_desc_triangular(type, width, height, desc);
     } else {
diff --git a/apps/plugins/puzzles/src/grid.h b/apps/plugins/puzzles/src/grid.h
index 7ca3ff1d5f..77c8dd800f 100644
--- a/apps/plugins/puzzles/src/grid.h
+++ b/apps/plugins/puzzles/src/grid.h
@@ -33,6 +33,7 @@ typedef struct grid_edge grid_edge;
 typedef struct grid_dot grid_dot;
 
 struct grid_face {
+  int index; /* index in grid->faces[] where this face appears */
   int order; /* Number of edges, also the number of dots */
   grid_edge **edges; /* edges around this face */
   grid_dot **dots; /* corners of this face */
@@ -56,8 +57,10 @@ struct grid_face {
 struct grid_edge {
   grid_dot *dot1, *dot2;
   grid_face *face1, *face2; /* Use NULL for the infinite outside face */
+  int index; /* index in grid->edges[] where this edge appears */
 };
 struct grid_dot {
+  int index; /* index in grid->dots[] where this dot appears */
   int order;
   grid_edge **edges;
   grid_face **faces; /* A NULL grid_face* means infinite outside face */
@@ -69,11 +72,13 @@ struct grid_dot {
   int x, y;
 };
 typedef struct grid {
-  /* These are (dynamically allocated) arrays of all the
-   * faces, edges, dots that are in the grid. */
-  int num_faces; grid_face *faces;
-  int num_edges; grid_edge *edges;
-  int num_dots;  grid_dot *dots;
+  /* Arrays of all the faces, edges, dots that are in the grid.
+   * The arrays themselves are dynamically allocated, and so is each object
+   * inside them. num_foo indicates the number of things actually stored,
+   * and size_foo indicates the allocated size of the array. */
+  int num_faces, size_faces; grid_face **faces;
+  int num_edges, size_edges; grid_edge **edges;
+  int num_dots,  size_dots;  grid_dot **dots;
 
   /* Cache the bounding-box of the grid, so the drawing-code can quickly
    * figure out the proper scaling to draw onto a given area. */
@@ -107,13 +112,19 @@ typedef struct grid {
   A(DODECAGONAL,dodecagonal) \
   A(GREATDODECAGONAL,greatdodecagonal) \
   A(GREATGREATDODECAGONAL,greatgreatdodecagonal) \
+  A(COMPASSDODECAGONAL,compassdodecagonal) \
   A(PENROSE_P2,penrose_p2_kite) \
-  A(PENROSE_P3,penrose_p3_thick)
+  A(PENROSE_P3,penrose_p3_thick) \
+  A(HATS,hats) \
+  A(SPECTRES,spectres) \
+  /* end of list */
 
 #define ENUM(upper,lower) GRID_ ## upper,
 typedef enum grid_type { GRIDGEN_LIST(ENUM) GRID_TYPE_MAX } grid_type;
 #undef ENUM
 
+const char *grid_validate_params(grid_type type, int width, int height);
+
 /* Free directly after use if non-NULL. Will never contain an underscore
  * (so clients can safely use that as a separator). */
 char *grid_new_desc(grid_type type, int width, int height, random_state *rs);
diff --git a/apps/plugins/puzzles/src/gtk.c b/apps/plugins/puzzles/src/gtk.c
deleted file mode 100644
index 7588ee0dc6..0000000000
--- a/apps/plugins/puzzles/src/gtk.c
+++ /dev/null
@@ -1,4031 +0,0 @@
-/*
- * gtk.c: GTK front end for my puzzle collection.
- */
-
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-#include <math.h>
-
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-
-#include "puzzles.h"
-
-#if GTK_CHECK_VERSION(2,0,0)
-# define USE_PANGO
-# ifdef PANGO_VERSION_CHECK
-#  if PANGO_VERSION_CHECK(1,8,0)
-#   define HAVE_SENSIBLE_ABSOLUTE_SIZE_FUNCTION
-#  endif
-# endif
-#endif
-#if !GTK_CHECK_VERSION(2,4,0)
-# define OLD_FILESEL
-#endif
-#if GTK_CHECK_VERSION(2,8,0)
-# define USE_CAIRO
-# if GTK_CHECK_VERSION(3,0,0) || defined(GDK_DISABLE_DEPRECATED)
-#  define USE_CAIRO_WITHOUT_PIXMAP
-# endif
-#endif
-
-#if defined USE_CAIRO && GTK_CHECK_VERSION(2,10,0)
-/* We can only use printing if we are using Cairo for drawing and we
-   have a GTK version >= 2.10 (when GtkPrintOperation was added). */
-# define USE_PRINTING
-# if GTK_CHECK_VERSION(2,18,0)
-/* We can embed the page setup. Before 2.18, we needed to have a
-   separate page setup. */
-#  define USE_EMBED_PAGE_SETUP
-# endif
-#endif
-
-#if GTK_CHECK_VERSION(3,0,0)
-/* The old names are still more concise! */
-#define gtk_hbox_new(x,y) gtk_box_new(GTK_ORIENTATION_HORIZONTAL,y)
-#define gtk_vbox_new(x,y) gtk_box_new(GTK_ORIENTATION_VERTICAL,y)
-/* GTK 3 has retired stock button labels */
-#define LABEL_OK "_OK"
-#define LABEL_CANCEL "_Cancel"
-#define LABEL_NO "_No"
-#define LABEL_YES "_Yes"
-#define LABEL_SAVE "_Save"
-#define LABEL_OPEN "_Open"
-#define gtk_button_new_with_our_label gtk_button_new_with_mnemonic
-#else
-#define LABEL_OK GTK_STOCK_OK
-#define LABEL_CANCEL GTK_STOCK_CANCEL
-#define LABEL_NO GTK_STOCK_NO
-#define LABEL_YES GTK_STOCK_YES
-#define LABEL_SAVE GTK_STOCK_SAVE
-#define LABEL_OPEN GTK_STOCK_OPEN
-#define gtk_button_new_with_our_label gtk_button_new_from_stock
-#endif
-
-/* #undef USE_CAIRO */
-/* #define NO_THICK_LINE */
-#ifdef DEBUGGING
-static FILE *debug_fp = NULL;
-
-void dputs(const char *buf)
-{
-    if (!debug_fp) {
-        debug_fp = fopen("debug.log", "w");
-    }
-
-    fputs(buf, stderr);
-
-    if (debug_fp) {
-        fputs(buf, debug_fp);
-        fflush(debug_fp);
-    }
-}
-
-void debug_printf(const char *fmt, ...)
-{
-    char buf[4096];
-    va_list ap;
-
-    va_start(ap, fmt);
-    vsprintf(buf, fmt, ap);
-    dputs(buf);
-    va_end(ap);
-}
-#endif
-
-/* ----------------------------------------------------------------------
- * Error reporting functions used elsewhere.
- */
-
-void fatal(const char *fmt, ...)
-{
-    va_list ap;
-
-    fprintf(stderr, "fatal error: ");
-
-    va_start(ap, fmt);
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-
-    fprintf(stderr, "\n");
-    exit(1);
-}
-
-/* ----------------------------------------------------------------------
- * GTK front end to puzzles.
- */
-
-static void changed_preset(frontend *fe);
-
-struct font {
-#ifdef USE_PANGO
-    PangoFontDescription *desc;
-#else
-    GdkFont *font;
-#endif
-    int type;
-    int size;
-};
-
-/*
- * An internal API for functions which need to be different for
- * printing and drawing.
- */
-struct internal_drawing_api {
-    void (*set_colour)(frontend *fe, int colour);
-#ifdef USE_CAIRO
-    void (*fill)(frontend *fe);
-    void (*fill_preserve)(frontend *fe);
-#endif
-};
-
-/*
- * This structure holds all the data relevant to a single window.
- * In principle this would allow us to open multiple independent
- * puzzle windows, although I can't currently see any real point in
- * doing so. I'm just coding cleanly because there's no
- * particularly good reason not to.
- */
-struct frontend {
-    bool headless; /* true if we're running without GTK, for --screenshot */
-
-    GtkWidget *window;
-    GtkAccelGroup *dummy_accelgroup;
-    GtkWidget *area;
-    GtkWidget *statusbar;
-    GtkWidget *menubar;
-#if GTK_CHECK_VERSION(3,20,0)
-    GtkCssProvider *css_provider;
-#endif
-    guint statusctx;
-    int w, h;
-    midend *me;
-#ifdef USE_CAIRO
-    const float *colours;
-    cairo_t *cr;
-    cairo_surface_t *image;
-#ifndef USE_CAIRO_WITHOUT_PIXMAP
-    GdkPixmap *pixmap;
-#endif
-    GdkColor background;               /* for painting outside puzzle area */
-#else
-    GdkPixmap *pixmap;
-    GdkGC *gc;
-    GdkColor *colours;
-    GdkColormap *colmap;
-    int backgroundindex;               /* which of colours[] is background */
-#endif
-    int ncolours;
-    int bbox_l, bbox_r, bbox_u, bbox_d;
-    bool timer_active;
-    int timer_id;
-    struct timeval last_time;
-    struct font *fonts;
-    int nfonts, fontsize;
-    config_item *cfg;
-    int cfg_which;
-    bool cfgret;
-    GtkWidget *cfgbox;
-    void *paste_data;
-    int paste_data_len;
-    int pw, ph, ps;  /* pixmap size (w, h are area size, s is GDK scale) */
-    int ox, oy;                        /* offset of pixmap in drawing area */
-#ifdef OLD_FILESEL
-    char *filesel_name;
-#endif
-    GSList *preset_radio;
-    bool preset_threaded;
-    GtkWidget *preset_custom;
-    GtkWidget *copy_menu_item;
-#if !GTK_CHECK_VERSION(3,0,0)
-    bool drawing_area_shrink_pending;
-    bool menubar_is_local;
-#endif
-#if GTK_CHECK_VERSION(3,0,0)
-    /*
-     * This is used to get round an annoying lack of GTK notification
-     * message. If we request a window resize with
-     * gtk_window_resize(), we normally get back a "configure" event
-     * on the window and on its drawing area, and we respond to the
-     * latter by doing an appropriate resize of the puzzle. If the
-     * window is maximised, so that gtk_window_resize() _doesn't_
-     * change its size, then that configure event never shows up. But
-     * if we requested the resize in response to a change of puzzle
-     * parameters (say, the user selected a differently-sized preset
-     * from the menu), then we would still like to be _notified_ that
-     * the window size was staying the same, so that we can respond by
-     * choosing an appropriate tile size for the new puzzle preset in
-     * the existing window size.
-     *
-     * Fortunately, in GTK 3, we may not get a "configure" event on
-     * the drawing area in this situation, but we still get a
-     * "size_allocate" event on the whole window (which, in other
-     * situations when we _do_ get a "configure" on the area, turns up
-     * second). So we treat _that_ event as indicating that if the
-     * "configure" event hasn't already shown up then it's not going
-     * to arrive.
-     *
-     * This flag is where we bookkeep this system. On
-     * gtk_window_resize we set this flag to true; the area's
-     * configure handler sets it back to false; then if that doesn't
-     * happen, the window's size_allocate handler does a fallback
-     * puzzle resize when it sees this flag still set to true.
-     */
-    bool awaiting_resize_ack;
-#endif
-#ifdef USE_CAIRO
-    int printcount, printw, printh;
-    float printscale;
-    bool printsolns, printcolour;
-    int hatch;
-    float hatchthick, hatchspace;
-    drawing *print_dr;
-    document *doc;
-#endif
-#ifdef USE_PRINTING
-    GtkPrintOperation *printop;
-    GtkPrintContext *printcontext;
-    GtkSpinButton *printcount_spin_button, *printw_spin_button,
-        *printh_spin_button, *printscale_spin_button;
-    GtkCheckButton *soln_check_button, *colour_check_button;
-#endif
-    const struct internal_drawing_api *dr_api;
-};
-
-struct blitter {
-#ifdef USE_CAIRO
-    cairo_surface_t *image;
-#else
-    GdkPixmap *pixmap;
-#endif
-    int w, h, x, y;
-};
-
-void get_random_seed(void **randseed, int *randseedsize)
-{
-    struct timeval *tvp = snew(struct timeval);
-    gettimeofday(tvp, NULL);
-    *randseed = (void *)tvp;
-    *randseedsize = sizeof(struct timeval);
-}
-
-void frontend_default_colour(frontend *fe, float *output)
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-    if (!fe->headless) {
-        /*
-         * If we have a widget and it has a style that specifies a
-         * default background colour, use that as the background for
-         * the puzzle drawing area.
-         */
-        GdkColor col = gtk_widget_get_style(fe->window)->bg[GTK_STATE_NORMAL];
-        output[0] = col.red / 65535.0;
-        output[1] = col.green / 65535.0;
-        output[2] = col.blue / 65535.0;
-    }
-#endif
-
-    /*
-     * GTK 3 has decided that there's no such thing as a 'default
-     * background colour' any more, because widget styles might set
-     * the background to something more complicated like a background
-     * image. We don't want to get into overlaying our entire puzzle
-     * on an arbitrary background image, so we'll just make up a
-     * reasonable shade of grey.
-     *
-     * This is also what we do on GTK 2 in headless mode, where we
-     * don't have a widget style to query.
-     */
-    output[0] = output[1] = output[2] = 0.9F;
-}
-
-void gtk_status_bar(void *handle, const char *text)
-{
-    frontend *fe = (frontend *)handle;
-
-    if (fe->headless)
-        return;
-
-    assert(fe->statusbar);
-
-    gtk_statusbar_pop(GTK_STATUSBAR(fe->statusbar), fe->statusctx);
-    gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx, text);
-}
-
-/* ----------------------------------------------------------------------
- * Cairo drawing functions.
- */
-
-#ifdef USE_CAIRO
-
-static void setup_drawing(frontend *fe)
-{
-    fe->cr = cairo_create(fe->image);
-    cairo_scale(fe->cr, fe->ps, fe->ps);
-    cairo_set_antialias(fe->cr, CAIRO_ANTIALIAS_GRAY);
-    cairo_set_line_width(fe->cr, 1.0);
-    cairo_set_line_cap(fe->cr, CAIRO_LINE_CAP_SQUARE);
-    cairo_set_line_join(fe->cr, CAIRO_LINE_JOIN_ROUND);
-}
-
-static void teardown_drawing(frontend *fe)
-{
-    cairo_destroy(fe->cr);
-    fe->cr = NULL;
-
-#ifndef USE_CAIRO_WITHOUT_PIXMAP
-    if (!fe->headless) {
-        cairo_t *cr = gdk_cairo_create(fe->pixmap);
-        cairo_set_source_surface(cr, fe->image, 0, 0);
-        cairo_rectangle(cr,
-                        fe->bbox_l - 1,
-                        fe->bbox_u - 1,
-                        fe->bbox_r - fe->bbox_l + 2,
-                        fe->bbox_d - fe->bbox_u + 2);
-        cairo_fill(cr);
-        cairo_destroy(cr);
-    }
-#endif
-}
-
-static void snaffle_colours(frontend *fe)
-{
-    fe->colours = midend_colours(fe->me, &fe->ncolours);
-}
-
-static void draw_set_colour(frontend *fe, int colour)
-{
-    cairo_set_source_rgb(fe->cr,
-                         fe->colours[3*colour + 0],
-                         fe->colours[3*colour + 1],
-                         fe->colours[3*colour + 2]);
-}
-
-static void print_set_colour(frontend *fe, int colour)
-{
-    float r, g, b;
-
-    print_get_colour(fe->print_dr, colour, fe->printcolour,
-                     &(fe->hatch), &r, &g, &b);
-
-    if (fe->hatch < 0)
-        cairo_set_source_rgb(fe->cr, r, g, b);
-}
-
-static void set_window_background(frontend *fe, int colour)
-{
-#if GTK_CHECK_VERSION(3,20,0)
-    char css_buf[512];
-    sprintf(css_buf, ".background { "
-            "background-color: #%02x%02x%02x; }",
-            (unsigned)(fe->colours[3*colour + 0] * 255),
-            (unsigned)(fe->colours[3*colour + 1] * 255),
-            (unsigned)(fe->colours[3*colour + 2] * 255));
-    if (!fe->css_provider)
-        fe->css_provider = gtk_css_provider_new();
-    if (!gtk_css_provider_load_from_data(
-            GTK_CSS_PROVIDER(fe->css_provider), css_buf, -1, NULL))
-        assert(0 && "Couldn't load CSS");
-    gtk_style_context_add_provider(
-        gtk_widget_get_style_context(fe->window),
-        GTK_STYLE_PROVIDER(fe->css_provider),
-        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    gtk_style_context_add_provider(
-        gtk_widget_get_style_context(fe->area),
-        GTK_STYLE_PROVIDER(fe->css_provider),
-        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-#elif GTK_CHECK_VERSION(3,0,0)
-    GdkRGBA rgba;
-    rgba.red = fe->colours[3*colour + 0];
-    rgba.green = fe->colours[3*colour + 1];
-    rgba.blue = fe->colours[3*colour + 2];
-    rgba.alpha = 1.0;
-    gdk_window_set_background_rgba(gtk_widget_get_window(fe->area), &rgba);
-    gdk_window_set_background_rgba(gtk_widget_get_window(fe->window), &rgba);
-#else
-    GdkColormap *colmap;
-
-    colmap = gdk_colormap_get_system();
-    fe->background.red = fe->colours[3*colour + 0] * 65535;
-    fe->background.green = fe->colours[3*colour + 1] * 65535;
-    fe->background.blue = fe->colours[3*colour + 2] * 65535;
-    if (!gdk_colormap_alloc_color(colmap, &fe->background, false, false)) {
-        g_error("couldn't allocate background (#%02x%02x%02x)\n",
-                fe->background.red >> 8, fe->background.green >> 8,
-                fe->background.blue >> 8);
-    }
-    gdk_window_set_background(gtk_widget_get_window(fe->area),
-                              &fe->background);
-    gdk_window_set_background(gtk_widget_get_window(fe->window),
-                              &fe->background);
-#endif
-}
-
-static PangoLayout *make_pango_layout(frontend *fe)
-{
-    return (pango_cairo_create_layout(fe->cr));
-}
-
-static void draw_pango_layout(frontend *fe, PangoLayout *layout,
-                              int x, int y)
-{
-    cairo_move_to(fe->cr, x, y);
-    pango_cairo_show_layout(fe->cr, layout);
-}
-
-static void save_screenshot_png(frontend *fe, const char *screenshot_file)
-{
-    cairo_surface_write_to_png(fe->image, screenshot_file);
-}
-
-static void do_hatch(frontend *fe)
-{
-    double i, x, y, width, height, maxdim;
-
-    /* Get the dimensions of the region to be hatched. */
-    cairo_path_extents(fe->cr, &x, &y, &width, &height);
-
-    maxdim = max(width, height);
-
-    cairo_save(fe->cr);
-
-    /* Set the line color and width. */
-    cairo_set_source_rgb(fe->cr, 0, 0, 0);
-    cairo_set_line_width(fe->cr, fe->hatchthick);
-    /* Clip to the region. */
-    cairo_clip(fe->cr);
-    /* Hatch the bounding area of the fill region. */
-    if (fe->hatch == HATCH_VERT || fe->hatch == HATCH_PLUS) {
-        for (i = 0.0; i <= width; i += fe->hatchspace) {
-            cairo_move_to(fe->cr, i, 0);
-            cairo_rel_line_to(fe->cr, 0, height);
-        }
-    }
-    if (fe->hatch == HATCH_HORIZ || fe->hatch == HATCH_PLUS) {
-        for (i = 0.0; i <= height; i += fe->hatchspace) {
-            cairo_move_to(fe->cr, 0, i);
-            cairo_rel_line_to(fe->cr, width, 0);
-        }
-    }
-    if (fe->hatch == HATCH_SLASH || fe->hatch == HATCH_X) {
-        for (i = -height; i <= width; i += fe->hatchspace * ROOT2) {
-            cairo_move_to(fe->cr, i, 0);
-            cairo_rel_line_to(fe->cr, maxdim, maxdim);
-        }
-    }
-    if (fe->hatch == HATCH_BACKSLASH || fe->hatch == HATCH_X) {
-        for (i = 0.0; i <= width + height; i += fe->hatchspace * ROOT2) {
-            cairo_move_to(fe->cr, i, 0);
-            cairo_rel_line_to(fe->cr, -maxdim, maxdim);
-        }
-    }
-    cairo_stroke(fe->cr);
-
-    cairo_restore(fe->cr);
-}
-
-static void do_draw_fill(frontend *fe)
-{
-    cairo_fill(fe->cr);
-}
-
-static void do_draw_fill_preserve(frontend *fe)
-{
-    cairo_fill_preserve(fe->cr);
-}
-
-static void do_print_fill(frontend *fe)
-{
-    if (fe->hatch < 0)
-        cairo_fill(fe->cr);
-    else
-        do_hatch(fe);
-}
-
-static void do_print_fill_preserve(frontend *fe)
-{
-    if (fe->hatch < 0) {
-        cairo_fill_preserve(fe->cr);
-    } else {
-        cairo_path_t *oldpath;
-        oldpath = cairo_copy_path(fe->cr);
-        do_hatch(fe);
-        cairo_append_path(fe->cr, oldpath);
-    }
-}
-
-static void do_clip(frontend *fe, int x, int y, int w, int h)
-{
-    cairo_new_path(fe->cr);
-    cairo_rectangle(fe->cr, x, y, w, h);
-    cairo_clip(fe->cr);
-}
-
-static void do_unclip(frontend *fe)
-{
-    cairo_reset_clip(fe->cr);
-}
-
-static void do_draw_rect(frontend *fe, int x, int y, int w, int h)
-{
-    cairo_save(fe->cr);
-    cairo_new_path(fe->cr);
-    cairo_set_antialias(fe->cr, CAIRO_ANTIALIAS_NONE);
-    cairo_rectangle(fe->cr, x, y, w, h);
-    fe->dr_api->fill(fe);
-    cairo_restore(fe->cr);
-}
-
-static void do_draw_line(frontend *fe, int x1, int y1, int x2, int y2)
-{
-    cairo_new_path(fe->cr);
-    cairo_move_to(fe->cr, x1 + 0.5, y1 + 0.5);
-    cairo_line_to(fe->cr, x2 + 0.5, y2 + 0.5);
-    cairo_stroke(fe->cr);
-}
-
-static void do_draw_thick_line(frontend *fe, float thickness,
-                               float x1, float y1, float x2, float y2)
-{
-    cairo_save(fe->cr);
-    cairo_set_line_width(fe->cr, thickness);
-    cairo_new_path(fe->cr);
-    cairo_move_to(fe->cr, x1, y1);
-    cairo_line_to(fe->cr, x2, y2);
-    cairo_stroke(fe->cr);
-    cairo_restore(fe->cr);
-}
-
-static void do_draw_poly(frontend *fe, int *coords, int npoints,
-                         int fillcolour, int outlinecolour)
-{
-    int i;
-
-    cairo_new_path(fe->cr);
-    for (i = 0; i < npoints; i++)
-        cairo_line_to(fe->cr, coords[i*2] + 0.5, coords[i*2 + 1] + 0.5);
-    cairo_close_path(fe->cr);
-    if (fillcolour >= 0) {
-        fe->dr_api->set_colour(fe, fillcolour);
-        fe->dr_api->fill_preserve(fe);
-    }
-    assert(outlinecolour >= 0);
-    fe->dr_api->set_colour(fe, outlinecolour);
-    cairo_stroke(fe->cr);
-}
-
-static void do_draw_circle(frontend *fe, int cx, int cy, int radius,
-                           int fillcolour, int outlinecolour)
-{
-    cairo_new_path(fe->cr);
-    cairo_arc(fe->cr, cx + 0.5, cy + 0.5, radius, 0, 2*PI);
-    cairo_close_path(fe->cr);           /* Just in case... */
-    if (fillcolour >= 0) {
-        fe->dr_api->set_colour(fe, fillcolour);
-        fe->dr_api->fill_preserve(fe);
-    }
-    assert(outlinecolour >= 0);
-    fe->dr_api->set_colour(fe, outlinecolour);
-    cairo_stroke(fe->cr);
-}
-
-static void setup_blitter(blitter *bl, int w, int h)
-{
-    bl->image = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h);
-}
-
-static void teardown_blitter(blitter *bl)
-{
-    cairo_surface_destroy(bl->image);
-}
-
-static void do_blitter_save(frontend *fe, blitter *bl, int x, int y)
-{
-    cairo_t *cr = cairo_create(bl->image);
-
-    cairo_set_source_surface(cr, fe->image, -x, -y);
-    cairo_paint(cr);
-    cairo_destroy(cr);
-}
-
-static void do_blitter_load(frontend *fe, blitter *bl, int x, int y)
-{
-    cairo_set_source_surface(fe->cr, bl->image, x, y);
-    cairo_paint(fe->cr);
-}
-
-static void clear_backing_store(frontend *fe)
-{
-    fe->image = NULL;
-}
-
-static void wipe_and_maybe_destroy_cairo(frontend *fe, cairo_t *cr,
-                                         bool destroy)
-{
-    cairo_set_source_rgb(cr, fe->colours[0], fe->colours[1], fe->colours[2]);
-    cairo_paint(cr);
-    if (destroy)
-        cairo_destroy(cr);
-}
-
-static void setup_backing_store(frontend *fe)
-{
-#ifndef USE_CAIRO_WITHOUT_PIXMAP
-    if (!fe->headless) {
-        fe->pixmap = gdk_pixmap_new(gtk_widget_get_window(fe->area),
-                                    fe->pw*fe->ps, fe->ph*fe->ps, -1);
-    } else {
-        fe->pixmap = NULL;
-    }
-#endif
-
-    fe->image = cairo_image_surface_create(CAIRO_FORMAT_RGB24,
-                                           fe->pw*fe->ps, fe->ph*fe->ps);
-
-    wipe_and_maybe_destroy_cairo(fe, cairo_create(fe->image), true);
-#ifndef USE_CAIRO_WITHOUT_PIXMAP
-    if (!fe->headless)
-        wipe_and_maybe_destroy_cairo(fe, gdk_cairo_create(fe->pixmap), true);
-#endif
-    if (!fe->headless) {
-#if GTK_CHECK_VERSION(3,22,0)
-        GdkWindow *gdkwin;
-        cairo_region_t *region;
-        GdkDrawingContext *drawctx;
-        cairo_t *cr;
-
-        gdkwin = gtk_widget_get_window(fe->area);
-        region = gdk_window_get_clip_region(gdkwin);
-        drawctx = gdk_window_begin_draw_frame(gdkwin, region);
-        cr = gdk_drawing_context_get_cairo_context(drawctx);
-        wipe_and_maybe_destroy_cairo(fe, cr, false);
-        gdk_window_end_draw_frame(gdkwin, drawctx);
-        cairo_region_destroy(region);
-#else
-        wipe_and_maybe_destroy_cairo(
-            fe, gdk_cairo_create(gtk_widget_get_window(fe->area)), true);
-#endif
-    }
-}
-
-static bool backing_store_ok(frontend *fe)
-{
-    return fe->image != NULL;
-}
-
-static void teardown_backing_store(frontend *fe)
-{
-    cairo_surface_destroy(fe->image);
-#ifndef USE_CAIRO_WITHOUT_PIXMAP
-    gdk_pixmap_unref(fe->pixmap);
-#endif
-    fe->image = NULL;
-}
-
-#endif
-
-/* ----------------------------------------------------------------------
- * GDK drawing functions.
- */
-
-#ifndef USE_CAIRO
-
-static void setup_drawing(frontend *fe)
-{
-    fe->gc = gdk_gc_new(fe->area->window);
-}
-
-static void teardown_drawing(frontend *fe)
-{
-    gdk_gc_unref(fe->gc);
-    fe->gc = NULL;
-}
-
-static void snaffle_colours(frontend *fe)
-{
-    int i, ncolours;
-    float *colours;
-    gboolean *success;
-
-    fe->colmap = gdk_colormap_get_system();
-    colours = midend_colours(fe->me, &ncolours);
-    fe->ncolours = ncolours;
-    fe->colours = snewn(ncolours, GdkColor);
-    for (i = 0; i < ncolours; i++) {
-        fe->colours[i].red = colours[i*3] * 0xFFFF;
-        fe->colours[i].green = colours[i*3+1] * 0xFFFF;
-        fe->colours[i].blue = colours[i*3+2] * 0xFFFF;
-    }
-    success = snewn(ncolours, gboolean);
-    gdk_colormap_alloc_colors(fe->colmap, fe->colours, ncolours,
-                              false, false, success);
-    for (i = 0; i < ncolours; i++) {
-        if (!success[i]) {
-            g_error("couldn't allocate colour %d (#%02x%02x%02x)\n",
-                    i, fe->colours[i].red >> 8,
-                    fe->colours[i].green >> 8,
-                    fe->colours[i].blue >> 8);
-        }
-    }
-}
-
-static void set_window_background(frontend *fe, int colour)
-{
-    fe->backgroundindex = colour;
-    gdk_window_set_background(fe->area->window, &fe->colours[colour]);
-    gdk_window_set_background(fe->window->window, &fe->colours[colour]);
-}
-
-static void draw_set_colour(frontend *fe, int colour)
-{
-    gdk_gc_set_foreground(fe->gc, &fe->colours[colour]);
-}
-
-#ifdef USE_PANGO
-static PangoLayout *make_pango_layout(frontend *fe)
-{
-    return (pango_layout_new(gtk_widget_get_pango_context(fe->area)));
-}
-
-static void draw_pango_layout(frontend *fe, PangoLayout *layout,
-                              int x, int y)
-{
-    gdk_draw_layout(fe->pixmap, fe->gc, x, y, layout);
-}
-#endif
-
-static void save_screenshot_png(frontend *fe, const char *screenshot_file)
-{
-    GdkPixbuf *pb;
-    GError *gerror = NULL;
-
-    midend_redraw(fe->me);
-
-    pb = gdk_pixbuf_get_from_drawable(NULL, fe->pixmap,
-                                      NULL, 0, 0, 0, 0, -1, -1);
-    gdk_pixbuf_save(pb, screenshot_file, "png", &gerror, NULL);
-}
-
-static void do_clip(frontend *fe, int x, int y, int w, int h)
-{
-    GdkRectangle rect;
-
-    rect.x = x;
-    rect.y = y;
-    rect.width = w;
-    rect.height = h;
-    gdk_gc_set_clip_rectangle(fe->gc, &rect);
-}
-
-static void do_unclip(frontend *fe)
-{
-    GdkRectangle rect;
-
-    rect.x = 0;
-    rect.y = 0;
-    rect.width = fe->w;
-    rect.height = fe->h;
-    gdk_gc_set_clip_rectangle(fe->gc, &rect);
-}
-
-static void do_draw_rect(frontend *fe, int x, int y, int w, int h)
-{
-    gdk_draw_rectangle(fe->pixmap, fe->gc, 1, x, y, w, h);
-}
-
-static void do_draw_line(frontend *fe, int x1, int y1, int x2, int y2)
-{
-    gdk_draw_line(fe->pixmap, fe->gc, x1, y1, x2, y2);
-}
-
-static void do_draw_thick_line(frontend *fe, float thickness,
-                               float x1, float y1, float x2, float y2)
-{
-    GdkGCValues save;
-
-    gdk_gc_get_values(fe->gc, &save);
-    gdk_gc_set_line_attributes(fe->gc,
-                               thickness,
-                               GDK_LINE_SOLID,
-                               GDK_CAP_BUTT,
-                               GDK_JOIN_BEVEL);
-    gdk_draw_line(fe->pixmap, fe->gc, x1, y1, x2, y2);
-    gdk_gc_set_line_attributes(fe->gc,
-                               save.line_width,
-                               save.line_style,
-                               save.cap_style,
-                               save.join_style);
-}
-
-static void do_draw_poly(frontend *fe, int *coords, int npoints,
-                         int fillcolour, int outlinecolour)
-{
-    GdkPoint *points = snewn(npoints, GdkPoint);
-    int i;
-
-    for (i = 0; i < npoints; i++) {
-        points[i].x = coords[i*2];
-        points[i].y = coords[i*2+1];
-    }
-
-    if (fillcolour >= 0) {
-        fe->dr_api->set_colour(fe, fillcolour);
-        gdk_draw_polygon(fe->pixmap, fe->gc, true, points, npoints);
-    }
-    assert(outlinecolour >= 0);
-    fe->dr_api->set_colour(fe, outlinecolour);
-
-    /*
-     * In principle we ought to be able to use gdk_draw_polygon for
-     * the outline as well. In fact, it turns out to interact badly
-     * with a clipping region, for no terribly obvious reason, so I
-     * draw the outline as a sequence of lines instead.
-     */
-    for (i = 0; i < npoints; i++)
-        gdk_draw_line(fe->pixmap, fe->gc,
-                      points[i].x, points[i].y,
-                      points[(i+1)%npoints].x, points[(i+1)%npoints].y);
-
-    sfree(points);
-}
-
-static void do_draw_circle(frontend *fe, int cx, int cy, int radius,
-                           int fillcolour, int outlinecolour)
-{
-    if (fillcolour >= 0) {
-        fe->dr_api->set_colour(fe, fillcolour);
-        gdk_draw_arc(fe->pixmap, fe->gc, true,
-                     cx - radius, cy - radius,
-                     2 * radius, 2 * radius, 0, 360 * 64);
-    }
-
-    assert(outlinecolour >= 0);
-    fe->dr_api->set_colour(fe, outlinecolour);
-    gdk_draw_arc(fe->pixmap, fe->gc, false,
-                 cx - radius, cy - radius,
-                 2 * radius, 2 * radius, 0, 360 * 64);
-}
-
-static void setup_blitter(blitter *bl, int w, int h)
-{
-    /*
-     * We can't create the pixmap right now, because fe->window
-     * might not yet exist. So we just cache w and h and create it
-     * during the firs call to blitter_save.
-     */
-    bl->pixmap = NULL;
-}
-
-static void teardown_blitter(blitter *bl)
-{
-    if (bl->pixmap)
-        gdk_pixmap_unref(bl->pixmap);
-}
-
-static void do_blitter_save(frontend *fe, blitter *bl, int x, int y)
-{
-    if (!bl->pixmap)
-        bl->pixmap = gdk_pixmap_new(fe->area->window, bl->w, bl->h, -1);
-    gdk_draw_pixmap(bl->pixmap,
-                    fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
-                    fe->pixmap,
-                    x, y, 0, 0, bl->w, bl->h);
-}
-
-static void do_blitter_load(frontend *fe, blitter *bl, int x, int y)
-{
-    assert(bl->pixmap);
-    gdk_draw_pixmap(fe->pixmap,
-                    fe->area->style->fg_gc[GTK_WIDGET_STATE(fe->area)],
-                    bl->pixmap,
-                    0, 0, x, y, bl->w, bl->h);
-}
-
-static void clear_backing_store(frontend *fe)
-{
-    fe->pixmap = NULL;
-}
-
-static void setup_backing_store(frontend *fe)
-{
-    GdkGC *gc;
-
-    if (fe->headless) {
-        fprintf(stderr, "headless mode does not work with GDK drawing\n");
-        exit(1);
-    }
-
-    fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1);
-
-    gc = gdk_gc_new(fe->area->window);
-    gdk_gc_set_foreground(gc, &fe->colours[0]);
-    gdk_draw_rectangle(fe->pixmap, gc, 1, 0, 0, fe->pw, fe->ph);
-    gdk_draw_rectangle(fe->area->window, gc, 1, 0, 0, fe->w, fe->h);
-    gdk_gc_unref(gc);
-}
-
-static int backing_store_ok(frontend *fe)
-{
-    return (!!fe->pixmap);
-}
-
-static void teardown_backing_store(frontend *fe)
-{
-    gdk_pixmap_unref(fe->pixmap);
-    fe->pixmap = NULL;
-}
-
-#endif
-
-#ifndef USE_CAIRO_WITHOUT_PIXMAP
-static void repaint_rectangle(frontend *fe, GtkWidget *widget,
-                              int x, int y, int w, int h)
-{
-    GdkGC *gc = gdk_gc_new(gtk_widget_get_window(widget));
-#ifdef USE_CAIRO
-    gdk_gc_set_foreground(gc, &fe->background);
-#else
-    gdk_gc_set_foreground(gc, &fe->colours[fe->backgroundindex]);
-#endif
-    if (x < fe->ox) {
-        gdk_draw_rectangle(gtk_widget_get_window(widget), gc,
-                           true, x, y, fe->ox - x, h);
-        w -= (fe->ox - x);
-        x = fe->ox;
-    }
-    if (y < fe->oy) {
-        gdk_draw_rectangle(gtk_widget_get_window(widget), gc,
-                           true, x, y, w, fe->oy - y);
-        h -= (fe->oy - y);
-        y = fe->oy;
-    }
-    if (w > fe->pw) {
-        gdk_draw_rectangle(gtk_widget_get_window(widget), gc,
-                           true, x + fe->pw, y, w - fe->pw, h);
-        w = fe->pw;
-    }
-    if (h > fe->ph) {
-        gdk_draw_rectangle(gtk_widget_get_window(widget), gc,
-                           true, x, y + fe->ph, w, h - fe->ph);
-        h = fe->ph;
-    }
-    gdk_draw_pixmap(gtk_widget_get_window(widget), gc, fe->pixmap,
-                    x - fe->ox, y - fe->oy, x, y, w, h);
-    gdk_gc_unref(gc);
-}
-#endif
-
-/* ----------------------------------------------------------------------
- * Pango font functions.
- */
-
-#ifdef USE_PANGO
-
-static void add_font(frontend *fe, int index, int fonttype, int fontsize)
-{
-    /*
-     * Use Pango to find the closest match to the requested
-     * font.
-     */
-    PangoFontDescription *fd;
-
-    fd = pango_font_description_new();
-    /* `Monospace' and `Sans' are meta-families guaranteed to exist */
-    pango_font_description_set_family(fd, fonttype == FONT_FIXED ?
-                                      "Monospace" : "Sans");
-    pango_font_description_set_weight(fd, PANGO_WEIGHT_BOLD);
-    /*
-     * I found some online Pango documentation which
-     * described a function called
-     * pango_font_description_set_absolute_size(), which is
-     * _exactly_ what I want here. Unfortunately, none of
-     * my local Pango installations have it (presumably
-     * they're too old), so I'm going to have to hack round
-     * it by figuring out the point size myself. This
-     * limits me to X and probably also breaks in later
-     * Pango installations, so ideally I should add another
-     * CHECK_VERSION type ifdef and use set_absolute_size
-     * where available. All very annoying.
-     */
-#ifdef HAVE_SENSIBLE_ABSOLUTE_SIZE_FUNCTION
-    pango_font_description_set_absolute_size(fd, PANGO_SCALE*fontsize);
-#else
-    {
-        Display *d = GDK_DISPLAY();
-        int s = DefaultScreen(d);
-        double resolution =
-            (PANGO_SCALE * 72.27 / 25.4) *
-            ((double) DisplayWidthMM(d, s) / DisplayWidth (d, s));
-        pango_font_description_set_size(fd, resolution * fontsize);
-    }
-#endif
-    fe->fonts[index].desc = fd;
-}
-
-static void align_and_draw_text(frontend *fe,
-                                int index, int align, int x, int y,
-                                const char *text)
-{
-    PangoLayout *layout;
-    PangoRectangle rect;
-
-    layout = make_pango_layout(fe);
-
-    /*
-     * Create a layout.
-     */
-    pango_layout_set_font_description(layout, fe->fonts[index].desc);
-    pango_layout_set_text(layout, text, strlen(text));
-    pango_layout_get_pixel_extents(layout, NULL, &rect);
-
-    if (align & ALIGN_VCENTRE)
-        rect.y -= rect.height / 2;
-    else
-        rect.y -= rect.height;
-
-    if (align & ALIGN_HCENTRE)
-        rect.x -= rect.width / 2;
-    else if (align & ALIGN_HRIGHT)
-        rect.x -= rect.width;
-
-    draw_pango_layout(fe, layout, rect.x + x, rect.y + y);
-
-    g_object_unref(layout);
-}
-
-#endif
-
-/* ----------------------------------------------------------------------
- * Old-fashioned font functions.
- */
-
-#ifndef USE_PANGO
-
-static void add_font(int index, int fonttype, int fontsize)
-{
-    /*
-     * In GTK 1.2, I don't know of any plausible way to
-     * pick a suitable font, so I'm just going to be
-     * tedious.
-     */
-    fe->fonts[i].font = gdk_font_load(fonttype == FONT_FIXED ?
-                                      "fixed" : "variable");
-}
-
-static void align_and_draw_text(int index, int align, int x, int y,
-                                const char *text)
-{
-    int lb, rb, wid, asc, desc;
-
-    /*
-     * Measure vertical string extents with respect to the same
-     * string always...
-     */
-    gdk_string_extents(fe->fonts[i].font,
-                       "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                       &lb, &rb, &wid, &asc, &desc);
-    if (align & ALIGN_VCENTRE)
-        y += asc - (asc+desc)/2;
-    else
-        y += asc;
-
-    /*
-     * ... but horizontal extents with respect to the provided
-     * string. This means that multiple pieces of text centred
-     * on the same y-coordinate don't have different baselines.
-     */
-    gdk_string_extents(fe->fonts[i].font, text,
-                       &lb, &rb, &wid, &asc, &desc);
-
-    if (align & ALIGN_HCENTRE)
-        x -= wid / 2;
-    else if (align & ALIGN_HRIGHT)
-        x -= wid;
-
-    /*
-     * Actually draw the text.
-     */
-    gdk_draw_string(fe->pixmap, fe->fonts[i].font, fe->gc, x, y, text);
-}
-
-#endif
-
-/* ----------------------------------------------------------------------
- * The exported drawing functions.
- */
-
-void gtk_start_draw(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    fe->bbox_l = fe->w;
-    fe->bbox_r = 0;
-    fe->bbox_u = fe->h;
-    fe->bbox_d = 0;
-    setup_drawing(fe);
-}
-
-void gtk_clip(void *handle, int x, int y, int w, int h)
-{
-    frontend *fe = (frontend *)handle;
-    do_clip(fe, x, y, w, h);
-}
-
-void gtk_unclip(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    do_unclip(fe);
-}
-
-void gtk_draw_text(void *handle, int x, int y, int fonttype, int fontsize,
-                   int align, int colour, const char *text)
-{
-    frontend *fe = (frontend *)handle;
-    int i;
-
-    /*
-     * Find or create the font.
-     */
-    for (i = 0; i < fe->nfonts; i++)
-        if (fe->fonts[i].type == fonttype && fe->fonts[i].size == fontsize)
-            break;
-
-    if (i == fe->nfonts) {
-        if (fe->fontsize <= fe->nfonts) {
-            fe->fontsize = fe->nfonts + 10;
-            fe->fonts = sresize(fe->fonts, fe->fontsize, struct font);
-        }
-
-        fe->nfonts++;
-
-        fe->fonts[i].type = fonttype;
-        fe->fonts[i].size = fontsize;
-        add_font(fe, i, fonttype, fontsize);
-    }
-
-    /*
-     * Do the job.
-     */
-    fe->dr_api->set_colour(fe, colour);
-    align_and_draw_text(fe, i, align, x, y, text);
-}
-
-void gtk_draw_rect(void *handle, int x, int y, int w, int h, int colour)
-{
-    frontend *fe = (frontend *)handle;
-    fe->dr_api->set_colour(fe, colour);
-    do_draw_rect(fe, x, y, w, h);
-}
-
-void gtk_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour)
-{
-    frontend *fe = (frontend *)handle;
-    fe->dr_api->set_colour(fe, colour);
-    do_draw_line(fe, x1, y1, x2, y2);
-}
-
-void gtk_draw_thick_line(void *handle, float thickness,
-                         float x1, float y1, float x2, float y2, int colour)
-{
-    frontend *fe = (frontend *)handle;
-    fe->dr_api->set_colour(fe, colour);
-    do_draw_thick_line(fe, thickness, x1, y1, x2, y2);
-}
-
-void gtk_draw_poly(void *handle, int *coords, int npoints,
-                   int fillcolour, int outlinecolour)
-{
-    frontend *fe = (frontend *)handle;
-    do_draw_poly(fe, coords, npoints, fillcolour, outlinecolour);
-}
-
-void gtk_draw_circle(void *handle, int cx, int cy, int radius,
-                     int fillcolour, int outlinecolour)
-{
-    frontend *fe = (frontend *)handle;
-    do_draw_circle(fe, cx, cy, radius, fillcolour, outlinecolour);
-}
-
-blitter *gtk_blitter_new(void *handle, int w, int h)
-{
-    blitter *bl = snew(blitter);
-    setup_blitter(bl, w, h);
-    bl->w = w;
-    bl->h = h;
-    return bl;
-}
-
-void gtk_blitter_free(void *handle, blitter *bl)
-{
-    teardown_blitter(bl);
-    sfree(bl);
-}
-
-void gtk_blitter_save(void *handle, blitter *bl, int x, int y)
-{
-    frontend *fe = (frontend *)handle;
-    do_blitter_save(fe, bl, x, y);
-    bl->x = x;
-    bl->y = y;
-}
-
-void gtk_blitter_load(void *handle, blitter *bl, int x, int y)
-{
-    frontend *fe = (frontend *)handle;
-    if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
-        x = bl->x;
-        y = bl->y;
-    }
-    do_blitter_load(fe, bl, x, y);
-}
-
-void gtk_draw_update(void *handle, int x, int y, int w, int h)
-{
-    frontend *fe = (frontend *)handle;
-    if (fe->bbox_l > x  ) fe->bbox_l = x  ;
-    if (fe->bbox_r < x+w) fe->bbox_r = x+w;
-    if (fe->bbox_u > y  ) fe->bbox_u = y  ;
-    if (fe->bbox_d < y+h) fe->bbox_d = y+h;
-}
-
-void gtk_end_draw(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-
-    teardown_drawing(fe);
-
-    if (fe->bbox_l < fe->bbox_r && fe->bbox_u < fe->bbox_d && !fe->headless) {
-#ifdef USE_CAIRO_WITHOUT_PIXMAP
-        gtk_widget_queue_draw_area(fe->area,
-                                   fe->bbox_l - 1 + fe->ox,
-                                   fe->bbox_u - 1 + fe->oy,
-                                   fe->bbox_r - fe->bbox_l + 2,
-                                   fe->bbox_d - fe->bbox_u + 2);
-#else
-        repaint_rectangle(fe, fe->area,
-                          fe->bbox_l - 1 + fe->ox,
-                          fe->bbox_u - 1 + fe->oy,
-                          fe->bbox_r - fe->bbox_l + 2,
-                          fe->bbox_d - fe->bbox_u + 2);
-#endif
-    }
-}
-
-#ifdef USE_PANGO
-char *gtk_text_fallback(void *handle, const char *const *strings, int nstrings)
-{
-    /*
-     * We assume Pango can cope with any UTF-8 likely to be emitted
-     * by a puzzle.
-     */
-    return dupstr(strings[0]);
-}
-#endif
-
-#ifdef USE_PRINTING
-void gtk_begin_doc(void *handle, int pages)
-{
-    frontend *fe = (frontend *)handle;
-    gtk_print_operation_set_n_pages(fe->printop, pages);
-}
-
-void gtk_begin_page(void *handle, int number)
-{
-}
-
-void gtk_begin_puzzle(void *handle, float xm, float xc,
-                      float ym, float yc, int pw, int ph, float wmm)
-{
-    frontend *fe = (frontend *)handle;
-    double ppw, pph, pox, poy, dpmmx, dpmmy;
-    double scale;
-
-    ppw = gtk_print_context_get_width(fe->printcontext);
-    pph = gtk_print_context_get_height(fe->printcontext);
-    dpmmx = gtk_print_context_get_dpi_x(fe->printcontext) / 25.4;
-    dpmmy = gtk_print_context_get_dpi_y(fe->printcontext) / 25.4;
-
-    /*
-     * Compute the puzzle's position in pixels on the logical page.
-     */
-    pox = xm * ppw + xc * dpmmx;
-    poy = ym * pph + yc * dpmmy;
-
-    /*
-     * And determine the scale.
-     *
-     * I need a scale such that the maximum puzzle-coordinate
-     * extent of the rectangle (pw * scale) is equal to the pixel
-     * equivalent of the puzzle's millimetre width (wmm * dpmmx).
-     */
-    scale = wmm * dpmmx / pw;
-
-    /*
-     * Now instruct Cairo to transform points based on our calculated
-     * values (order here *is* important).
-     */
-    cairo_save(fe->cr);
-    cairo_translate(fe->cr, pox, poy);
-    cairo_scale(fe->cr, scale, scale);
-
-    fe->hatchthick = 0.2 * pw / wmm;
-    fe->hatchspace = 1.0 * pw / wmm;
-}
-
-void gtk_end_puzzle(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    cairo_restore(fe->cr);
-}
-
-void gtk_end_page(void *handle, int number)
-{
-}
-
-void gtk_end_doc(void *handle)
-{
-}
-
-void gtk_line_width(void *handle, float width)
-{
-    frontend *fe = (frontend *)handle;
-    cairo_set_line_width(fe->cr, width);
-}
-
-void gtk_line_dotted(void *handle, bool dotted)
-{
-    frontend *fe = (frontend *)handle;
-
-    if (dotted) {
-        const double dash = 35.0;
-        cairo_set_dash(fe->cr, &dash, 1, 0);
-    } else {
-        cairo_set_dash(fe->cr, NULL, 0, 0);
-    }
-}
-#endif /* USE_PRINTING */
-
-const struct internal_drawing_api internal_drawing = {
-    draw_set_colour,
-#ifdef USE_CAIRO
-    do_draw_fill,
-    do_draw_fill_preserve,
-#endif
-};
-
-#ifdef USE_CAIRO
-const struct internal_drawing_api internal_printing = {
-    print_set_colour,
-    do_print_fill,
-    do_print_fill_preserve,
-};
-#endif
-
-const struct drawing_api gtk_drawing = {
-    gtk_draw_text,
-    gtk_draw_rect,
-    gtk_draw_line,
-    gtk_draw_poly,
-    gtk_draw_circle,
-    gtk_draw_update,
-    gtk_clip,
-    gtk_unclip,
-    gtk_start_draw,
-    gtk_end_draw,
-    gtk_status_bar,
-    gtk_blitter_new,
-    gtk_blitter_free,
-    gtk_blitter_save,
-    gtk_blitter_load,
-#ifdef USE_PRINTING
-    gtk_begin_doc,
-    gtk_begin_page,
-    gtk_begin_puzzle,
-    gtk_end_puzzle,
-    gtk_end_page,
-    gtk_end_doc,
-    gtk_line_width,
-    gtk_line_dotted,
-#else
-    NULL, NULL, NULL, NULL, NULL, NULL, /* {begin,end}_{doc,page,puzzle} */
-    NULL, NULL,                        /* line_width, line_dotted */
-#endif
-#ifdef USE_PANGO
-    gtk_text_fallback,
-#else
-    NULL,
-#endif
-#ifdef NO_THICK_LINE
-    NULL,
-#else
-    gtk_draw_thick_line,
-#endif
-};
-
-static void destroy(GtkWidget *widget, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    deactivate_timer(fe);
-    midend_free(fe->me);
-    gtk_main_quit();
-}
-
-static gint key_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    int keyval;
-    int shift = (event->state & GDK_SHIFT_MASK) ? MOD_SHFT : 0;
-    int ctrl = (event->state & GDK_CONTROL_MASK) ? MOD_CTRL : 0;
-
-    if (!backing_store_ok(fe))
-        return true;
-
-    /* Handle mnemonics. */
-    if (gtk_window_activate_key(GTK_WINDOW(fe->window), event))
-        return true;
-
-    if (event->keyval == GDK_KEY_Up)
-        keyval = shift | ctrl | CURSOR_UP;
-    else if (event->keyval == GDK_KEY_KP_Up ||
-             event->keyval == GDK_KEY_KP_8)
-        keyval = MOD_NUM_KEYPAD | '8';
-    else if (event->keyval == GDK_KEY_Down)
-        keyval = shift | ctrl | CURSOR_DOWN;
-    else if (event->keyval == GDK_KEY_KP_Down ||
-             event->keyval == GDK_KEY_KP_2)
-        keyval = MOD_NUM_KEYPAD | '2';
-    else if (event->keyval == GDK_KEY_Left)
-        keyval = shift | ctrl | CURSOR_LEFT;
-    else if (event->keyval == GDK_KEY_KP_Left ||
-             event->keyval == GDK_KEY_KP_4)
-        keyval = MOD_NUM_KEYPAD | '4';
-    else if (event->keyval == GDK_KEY_Right)
-        keyval = shift | ctrl | CURSOR_RIGHT;
-    else if (event->keyval == GDK_KEY_KP_Right ||
-             event->keyval == GDK_KEY_KP_6)
-        keyval = MOD_NUM_KEYPAD | '6';
-    else if (event->keyval == GDK_KEY_KP_Home ||
-             event->keyval == GDK_KEY_KP_7)
-        keyval = MOD_NUM_KEYPAD | '7';
-    else if (event->keyval == GDK_KEY_KP_End ||
-             event->keyval == GDK_KEY_KP_1)
-        keyval = MOD_NUM_KEYPAD | '1';
-    else if (event->keyval == GDK_KEY_KP_Page_Up ||
-             event->keyval == GDK_KEY_KP_9)
-        keyval = MOD_NUM_KEYPAD | '9';
-    else if (event->keyval == GDK_KEY_KP_Page_Down ||
-             event->keyval == GDK_KEY_KP_3)
-        keyval = MOD_NUM_KEYPAD | '3';
-    else if (event->keyval == GDK_KEY_KP_Insert ||
-             event->keyval == GDK_KEY_KP_0)
-        keyval = MOD_NUM_KEYPAD | '0';
-    else if (event->keyval == GDK_KEY_KP_Begin ||
-             event->keyval == GDK_KEY_KP_5)
-        keyval = MOD_NUM_KEYPAD | '5';
-    else if (event->keyval == GDK_KEY_BackSpace ||
-             event->keyval == GDK_KEY_Delete ||
-             event->keyval == GDK_KEY_KP_Delete)
-        keyval = '\177';
-    else if ((event->keyval == 'z' || event->keyval == 'Z') && shift && ctrl)
-        keyval = UI_REDO;
-    else if (event->string[0] && !event->string[1])
-        keyval = (unsigned char)event->string[0];
-    else
-        keyval = -1;
-
-    if (keyval >= 0 &&
-        !midend_process_key(fe->me, 0, 0, keyval))
-        gtk_widget_destroy(fe->window);
-
-    return true;
-}
-
-static gint button_event(GtkWidget *widget, GdkEventButton *event,
-                         gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    int button;
-
-    if (!backing_store_ok(fe))
-        return true;
-
-    if (event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE)
-        return true;
-
-    if (event->button == 2 || (event->state & GDK_SHIFT_MASK))
-        button = MIDDLE_BUTTON;
-    else if (event->button == 3 || (event->state & GDK_MOD1_MASK))
-        button = RIGHT_BUTTON;
-    else if (event->button == 1)
-        button = LEFT_BUTTON;
-    else if (event->button == 8 && event->type == GDK_BUTTON_PRESS)
-        button = 'u';
-    else if (event->button == 9 && event->type == GDK_BUTTON_PRESS)
-        button = 'r';
-    else
-        return false;                  /* don't even know what button! */
-
-    if (event->type == GDK_BUTTON_RELEASE && button >= LEFT_BUTTON)
-        button += LEFT_RELEASE - LEFT_BUTTON;
-
-    if (!midend_process_key(fe->me, event->x - fe->ox,
-                            event->y - fe->oy, button))
-        gtk_widget_destroy(fe->window);
-
-    return true;
-}
-
-static gint motion_event(GtkWidget *widget, GdkEventMotion *event,
-                         gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    int button;
-
-    if (!backing_store_ok(fe))
-        return true;
-
-    if (event->state & (GDK_BUTTON2_MASK | GDK_SHIFT_MASK))
-        button = MIDDLE_DRAG;
-    else if (event->state & GDK_BUTTON1_MASK)
-        button = LEFT_DRAG;
-    else if (event->state & GDK_BUTTON3_MASK)
-        button = RIGHT_DRAG;
-    else
-        return false;                  /* don't even know what button! */
-
-    if (!midend_process_key(fe->me, event->x - fe->ox,
-                            event->y - fe->oy, button))
-        gtk_widget_destroy(fe->window);
-#if GTK_CHECK_VERSION(2,12,0)
-    gdk_event_request_motions(event);
-#else
-    gdk_window_get_pointer(gtk_widget_get_window(widget), NULL, NULL, NULL);
-#endif
-
-    return true;
-}
-
-#if GTK_CHECK_VERSION(3,0,0)
-static gint draw_area(GtkWidget *widget, cairo_t *cr, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    GdkRectangle dirtyrect;
-
-    cairo_surface_t *target_surface = cairo_get_target(cr);
-    cairo_matrix_t m;
-    cairo_get_matrix(cr, &m);
-    double orig_sx, orig_sy;
-    cairo_surface_get_device_scale(target_surface, &orig_sx, &orig_sy);
-    cairo_surface_set_device_scale(target_surface, 1.0, 1.0);
-    cairo_translate(cr, m.x0 * (orig_sx - 1.0), m.y0 * (orig_sy - 1.0));
-
-    gdk_cairo_get_clip_rectangle(cr, &dirtyrect);
-    cairo_set_source_surface(cr, fe->image, fe->ox, fe->oy);
-    cairo_rectangle(cr, dirtyrect.x, dirtyrect.y,
-                    dirtyrect.width, dirtyrect.height);
-    cairo_fill(cr);
-
-    cairo_surface_set_device_scale(target_surface, orig_sx, orig_sy);
-
-    return true;
-}
-#else
-static gint expose_area(GtkWidget *widget, GdkEventExpose *event,
-                        gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    if (backing_store_ok(fe)) {
-#ifdef USE_CAIRO_WITHOUT_PIXMAP
-        cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
-        cairo_set_source_surface(cr, fe->image, fe->ox, fe->oy);
-        cairo_rectangle(cr, event->area.x, event->area.y,
-                        event->area.width, event->area.height);
-        cairo_fill(cr);
-        cairo_destroy(cr);
-#else
-        repaint_rectangle(fe, widget,
-                          event->area.x, event->area.y,
-                          event->area.width, event->area.height);
-#endif
-    }
-    return true;
-}
-#endif
-
-static gint map_window(GtkWidget *widget, GdkEvent *event,
-                       gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    /*
-     * Apparently we need to do this because otherwise the status
-     * bar will fail to update immediately. Annoying, but there we
-     * go.
-     */
-    gtk_widget_queue_draw(fe->window);
-
-    return true;
-}
-
-static void resize_puzzle_to_area(frontend *fe, int x, int y)
-{
-    int oldw = fe->w, oldpw = fe->pw, oldh = fe->h, oldph = fe->ph;
-    int oldps = fe->ps;
-
-    fe->w = x;
-    fe->h = y;
-    midend_size(fe->me, &x, &y, true);
-    fe->pw = x;
-    fe->ph = y;
-#if GTK_CHECK_VERSION(3,10,0)
-    fe->ps = gtk_widget_get_scale_factor(fe->area);
-#else
-    fe->ps = 1;
-#endif
-    fe->ox = (fe->w - fe->pw) / 2;
-    fe->oy = (fe->h - fe->ph) / 2;
-
-    if (oldw != fe->w || oldpw != fe->pw || oldps != fe->ps ||
-        oldh != fe->h || oldph != fe->ph || !backing_store_ok(fe)) {
-        if (backing_store_ok(fe))
-            teardown_backing_store(fe);
-        setup_backing_store(fe);
-    }
-
-    midend_force_redraw(fe->me);
-}
-
-static gint configure_area(GtkWidget *widget,
-                           GdkEventConfigure *event, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    resize_puzzle_to_area(fe, event->width, event->height);
-#if GTK_CHECK_VERSION(3,0,0)
-    fe->awaiting_resize_ack = false;
-#endif
-    return true;
-}
-
-#if GTK_CHECK_VERSION(3,0,0)
-static void window_size_alloc(GtkWidget *widget, GtkAllocation *allocation,
-                              gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    if (fe->awaiting_resize_ack) {
-        GtkAllocation a;
-        gtk_widget_get_allocation(fe->area, &a);
-        resize_puzzle_to_area(fe, a.width, a.height);
-        fe->awaiting_resize_ack = false;
-    }
-}
-#endif
-
-static gint timer_func(gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    if (fe->timer_active) {
-        struct timeval now;
-        float elapsed;
-        gettimeofday(&now, NULL);
-        elapsed = ((now.tv_usec - fe->last_time.tv_usec) * 0.000001F +
-                   (now.tv_sec - fe->last_time.tv_sec));
-        midend_timer(fe->me, elapsed);  /* may clear timer_active */
-        fe->last_time = now;
-    }
-
-    return fe->timer_active;
-}
-
-void deactivate_timer(frontend *fe)
-{
-    if (!fe)
-        return;                        /* can happen due to --generate */
-    if (fe->timer_active)
-        g_source_remove(fe->timer_id);
-    fe->timer_active = false;
-}
-
-void activate_timer(frontend *fe)
-{
-    if (!fe)
-        return;                        /* can happen due to --generate */
-    if (!fe->timer_active) {
-        fe->timer_id = g_timeout_add(20, timer_func, fe);
-        gettimeofday(&fe->last_time, NULL);
-    }
-    fe->timer_active = true;
-}
-
-static void window_destroy(GtkWidget *widget, gpointer data)
-{
-    gtk_main_quit();
-}
-
-static gint win_key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-    GObject *cancelbutton = G_OBJECT(data);
-
-    /*
-     * `Escape' effectively clicks the cancel button
-     */
-    if (event->keyval == GDK_KEY_Escape) {
-        g_signal_emit_by_name(cancelbutton, "clicked");
-        return true;
-    }
-
-    return false;
-}
-
-enum { MB_OK, MB_YESNO };
-
-static void align_label(GtkLabel *label, double x, double y)
-{
-#if GTK_CHECK_VERSION(3,16,0)
-    gtk_label_set_xalign(label, x);
-    gtk_label_set_yalign(label, y);
-#elif GTK_CHECK_VERSION(3,14,0)
-    gtk_widget_set_halign(GTK_WIDGET(label),
-                          x == 0 ? GTK_ALIGN_START :
-                          x == 1 ? GTK_ALIGN_END : GTK_ALIGN_CENTER);
-    gtk_widget_set_valign(GTK_WIDGET(label),
-                          y == 0 ? GTK_ALIGN_START :
-                          y == 1 ? GTK_ALIGN_END : GTK_ALIGN_CENTER);
-#else
-    gtk_misc_set_alignment(GTK_MISC(label), x, y);
-#endif
-}
-
-#if GTK_CHECK_VERSION(3,0,0)
-bool message_box(GtkWidget *parent, const char *title, const char *msg,
-                 bool centre, int type)
-{
-    GtkWidget *window;
-    gint ret;
-
-    window = gtk_message_dialog_new
-        (GTK_WINDOW(parent),
-         (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
-         (type == MB_OK ? GTK_MESSAGE_INFO : GTK_MESSAGE_QUESTION),
-         (type == MB_OK ? GTK_BUTTONS_OK   : GTK_BUTTONS_YES_NO),
-         "%s", msg);
-    gtk_window_set_title(GTK_WINDOW(window), title);
-    ret = gtk_dialog_run(GTK_DIALOG(window));
-    gtk_widget_destroy(window);
-    return (type == MB_OK ? true : (ret == GTK_RESPONSE_YES));
-}
-#else /* GTK_CHECK_VERSION(3,0,0) */
-static void msgbox_button_clicked(GtkButton *button, gpointer data)
-{
-    GtkWidget *window = GTK_WIDGET(data);
-    int v, *ip;
-
-    ip = (int *)g_object_get_data(G_OBJECT(window), "user-data");
-    v = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "user-data"));
-    *ip = v;
-
-    gtk_widget_destroy(GTK_WIDGET(data));
-}
-
-bool message_box(GtkWidget *parent, const char *title, const char *msg,
-                 bool centre, int type)
-{
-    GtkWidget *window, *hbox, *text, *button;
-    char *titles;
-    int i, def, cancel;
-
-    window = gtk_dialog_new();
-    text = gtk_label_new(msg);
-    align_label(GTK_LABEL(text), 0.0, 0.0);
-    hbox = gtk_hbox_new(false, 0);
-    gtk_box_pack_start(GTK_BOX(hbox), text, false, false, 20);
-    gtk_box_pack_start
-        (GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(window))),
-         hbox, false, false, 20);
-    gtk_widget_show(text);
-    gtk_widget_show(hbox);
-    gtk_window_set_title(GTK_WINDOW(window), title);
-    gtk_label_set_line_wrap(GTK_LABEL(text), true);
-
-    if (type == MB_OK) {
-        titles = LABEL_OK "\0";
-        def = cancel = 0;
-    } else {
-        assert(type == MB_YESNO);
-        titles = LABEL_NO "\0" LABEL_YES "\0";
-        def = 1;
-        cancel = 0;
-    }
-    i = 0;
-    
-    while (*titles) {
-        button = gtk_button_new_with_our_label(titles);
-        gtk_box_pack_end
-            (GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(window))),
-             button, false, false, 0);
-        gtk_widget_show(button);
-        if (i == def) {
-            gtk_widget_set_can_default(button, true);
-            gtk_window_set_default(GTK_WINDOW(window), button);
-        }
-        if (i == cancel) {
-            g_signal_connect(G_OBJECT(window), "key_press_event",
-                             G_CALLBACK(win_key_press), button);
-        }
-        g_signal_connect(G_OBJECT(button), "clicked",
-                         G_CALLBACK(msgbox_button_clicked), window);
-        g_object_set_data(G_OBJECT(button), "user-data",
-                          GINT_TO_POINTER(i));
-        titles += strlen(titles)+1;
-        i++;
-    }
-    g_object_set_data(G_OBJECT(window), "user-data", &i);
-    g_signal_connect(G_OBJECT(window), "destroy",
-                     G_CALLBACK(window_destroy), NULL);
-    gtk_window_set_modal(GTK_WINDOW(window), true);
-    gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(parent));
-    /* set_transient_window_pos(parent, window); */
-    gtk_widget_show(window);
-    i = -1;
-    gtk_main();
-    return (type == MB_YESNO ? i == 1 : true);
-}
-#endif /* GTK_CHECK_VERSION(3,0,0) */
-
-void error_box(GtkWidget *parent, const char *msg)
-{
-    message_box(parent, "Error", msg, false, MB_OK);
-}
-
-static void config_ok_button_clicked(GtkButton *button, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    const char *err;
-
-    err = midend_set_config(fe->me, fe->cfg_which, fe->cfg);
-
-    if (err)
-        error_box(fe->cfgbox, err);
-    else {
-        fe->cfgret = true;
-        gtk_widget_destroy(fe->cfgbox);
-        changed_preset(fe);
-    }
-}
-
-static void config_cancel_button_clicked(GtkButton *button, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    gtk_widget_destroy(fe->cfgbox);
-}
-
-static gint editbox_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
-{
-    /*
-     * GtkEntry has a nasty habit of eating the Return key, which
-     * is unhelpful since it doesn't actually _do_ anything with it
-     * (it calls gtk_widget_activate, but our edit boxes never need
-     * activating). So I catch Return before GtkEntry sees it, and
-     * pass it straight on to the parent widget. Effect: hitting
-     * Return in an edit box will now activate the default button
-     * in the dialog just like it will everywhere else.
-     */
-    if (event->keyval == GDK_KEY_Return &&
-        gtk_widget_get_parent(widget) != NULL) {
-        gint return_val;
-        g_signal_stop_emission_by_name(G_OBJECT(widget), "key_press_event");
-        g_signal_emit_by_name(G_OBJECT(gtk_widget_get_parent(widget)),
-                              "key_press_event", event, &return_val);
-        return return_val;
-    }
-    return false;
-}
-
-static void editbox_changed(GtkEditable *ed, gpointer data)
-{
-    config_item *i = (config_item *)data;
-
-    assert(i->type == C_STRING);
-    sfree(i->u.string.sval);
-    i->u.string.sval = dupstr(gtk_entry_get_text(GTK_ENTRY(ed)));
-}
-
-static void button_toggled(GtkToggleButton *tb, gpointer data)
-{
-    config_item *i = (config_item *)data;
-
-    assert(i->type == C_BOOLEAN);
-    i->u.boolean.bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(tb));
-}
-
-static void droplist_sel(GtkComboBox *combo, gpointer data)
-{
-    config_item *i = (config_item *)data;
-
-    assert(i->type == C_CHOICES);
-    i->u.choices.selected = gtk_combo_box_get_active(combo);
-}
-
-static bool get_config(frontend *fe, int which)
-{
-    GtkWidget *w, *table, *cancel;
-    GtkBox *content_box, *button_box;
-    char *title;
-    config_item *i;
-    int y;
-
-    fe->cfg = midend_get_config(fe->me, which, &title);
-    fe->cfg_which = which;
-    fe->cfgret = false;
-
-#if GTK_CHECK_VERSION(3,0,0)
-    /* GtkDialog isn't quite flexible enough */
-    fe->cfgbox = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    content_box = GTK_BOX(gtk_vbox_new(false, 8));
-    g_object_set(G_OBJECT(content_box), "margin", 8, (const char *)NULL);
-    gtk_widget_show(GTK_WIDGET(content_box));
-    gtk_container_add(GTK_CONTAINER(fe->cfgbox), GTK_WIDGET(content_box));
-    button_box = GTK_BOX(gtk_hbox_new(false, 8));
-    gtk_widget_show(GTK_WIDGET(button_box));
-    gtk_box_pack_end(content_box, GTK_WIDGET(button_box), false, false, 0);
-    {
-        GtkWidget *sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
-        gtk_widget_show(sep);
-        gtk_box_pack_end(content_box, sep, false, false, 0);
-    }
-#else
-    fe->cfgbox = gtk_dialog_new();
-    content_box = GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(fe->cfgbox)));
-    button_box = GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(fe->cfgbox)));
-#endif
-    gtk_window_set_title(GTK_WINDOW(fe->cfgbox), title);
-    sfree(title);
-
-    w = gtk_button_new_with_our_label(LABEL_CANCEL);
-    gtk_box_pack_end(button_box, w, false, false, 0);
-    gtk_widget_show(w);
-    g_signal_connect(G_OBJECT(w), "clicked",
-                     G_CALLBACK(config_cancel_button_clicked), fe);
-    cancel = w;
-
-    w = gtk_button_new_with_our_label(LABEL_OK);
-    gtk_box_pack_end(button_box, w, false, false, 0);
-    gtk_widget_show(w);
-    gtk_widget_set_can_default(w, true);
-    gtk_window_set_default(GTK_WINDOW(fe->cfgbox), w);
-    g_signal_connect(G_OBJECT(w), "clicked",
-                     G_CALLBACK(config_ok_button_clicked), fe);
-
-#if GTK_CHECK_VERSION(3,0,0)
-    table = gtk_grid_new();
-#else
-    table = gtk_table_new(1, 2, false);
-#endif
-    y = 0;
-    gtk_box_pack_start(content_box, table, false, false, 0);
-    gtk_widget_show(table);
-
-    for (i = fe->cfg; i->type != C_END; i++) {
-#if !GTK_CHECK_VERSION(3,0,0)
-        gtk_table_resize(GTK_TABLE(table), y+1, 2);
-#endif
-
-        switch (i->type) {
-          case C_STRING:
-            /*
-             * Edit box with a label beside it.
-             */
-
-            w = gtk_label_new(i->name);
-            align_label(GTK_LABEL(w), 0.0, 0.5);
-#if GTK_CHECK_VERSION(3,0,0)
-            gtk_grid_attach(GTK_GRID(table), w, 0, y, 1, 1);
-#else
-            gtk_table_attach(GTK_TABLE(table), w, 0, 1, y, y+1,
-                             GTK_SHRINK | GTK_FILL,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             3, 3);
-#endif
-            gtk_widget_show(w);
-
-            w = gtk_entry_new();
-#if GTK_CHECK_VERSION(3,0,0)
-            gtk_grid_attach(GTK_GRID(table), w, 1, y, 1, 1);
-            g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
-#else
-            gtk_table_attach(GTK_TABLE(table), w, 1, 2, y, y+1,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             3, 3);
-#endif
-            gtk_entry_set_text(GTK_ENTRY(w), i->u.string.sval);
-            g_signal_connect(G_OBJECT(w), "changed",
-                             G_CALLBACK(editbox_changed), i);
-            g_signal_connect(G_OBJECT(w), "key_press_event",
-                             G_CALLBACK(editbox_key), NULL);
-            gtk_widget_show(w);
-
-            break;
-
-          case C_BOOLEAN:
-            /*
-             * Simple checkbox.
-             */
-            w = gtk_check_button_new_with_label(i->name);
-            g_signal_connect(G_OBJECT(w), "toggled",
-                             G_CALLBACK(button_toggled), i);
-#if GTK_CHECK_VERSION(3,0,0)
-            gtk_grid_attach(GTK_GRID(table), w, 0, y, 2, 1);
-            g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
-#else
-            gtk_table_attach(GTK_TABLE(table), w, 0, 2, y, y+1,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             3, 3);
-#endif
-            gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-                                         i->u.boolean.bval);
-            gtk_widget_show(w);
-            break;
-
-          case C_CHOICES:
-            /*
-             * Drop-down list (GtkComboBox).
-             */
-
-            w = gtk_label_new(i->name);
-            align_label(GTK_LABEL(w), 0.0, 0.5);
-#if GTK_CHECK_VERSION(3,0,0)
-            gtk_grid_attach(GTK_GRID(table), w, 0, y, 1, 1);
-#else
-            gtk_table_attach(GTK_TABLE(table), w, 0, 1, y, y+1,
-                             GTK_SHRINK | GTK_FILL,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL ,
-                             3, 3);
-#endif
-            gtk_widget_show(w);
-
-            {
-                int c;
-                const char *p, *q;
-                char *name;
-                GtkListStore *model;
-                GtkCellRenderer *cr;
-                GtkTreeIter iter;
-
-                model = gtk_list_store_new(1, G_TYPE_STRING);
-
-                c = *i->u.choices.choicenames;
-                p = i->u.choices.choicenames+1;
-
-                while (*p) {
-                    q = p;
-                    while (*q && *q != c)
-                        q++;
-
-                    name = snewn(q-p+1, char);
-                    strncpy(name, p, q-p);
-                    name[q-p] = '\0';
-
-                    if (*q) q++;       /* eat delimiter */
-
-                    gtk_list_store_append(model, &iter);
-                    gtk_list_store_set(model, &iter, 0, name, -1);
-
-                    p = q;
-                }
-
-                w = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model));
-
-                gtk_combo_box_set_active(GTK_COMBO_BOX(w),
-                                         i->u.choices.selected);
-
-                cr = gtk_cell_renderer_text_new();
-                gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(w), cr, true);
-                gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(w), cr,
-                                               "text", 0, NULL);
-
-                g_signal_connect(G_OBJECT(w), "changed",
-                                 G_CALLBACK(droplist_sel), i);
-            }
-
-#if GTK_CHECK_VERSION(3,0,0)
-            gtk_grid_attach(GTK_GRID(table), w, 1, y, 1, 1);
-            g_object_set(G_OBJECT(w), "hexpand", true, (const char *)NULL);
-#else
-            gtk_table_attach(GTK_TABLE(table), w, 1, 2, y, y+1,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             GTK_EXPAND | GTK_SHRINK | GTK_FILL,
-                             3, 3);
-#endif
-            gtk_widget_show(w);
-            break;
-        }
-
-        y++;
-    }
-
-    g_signal_connect(G_OBJECT(fe->cfgbox), "destroy",
-                     G_CALLBACK(window_destroy), NULL);
-    g_signal_connect(G_OBJECT(fe->cfgbox), "key_press_event",
-                     G_CALLBACK(win_key_press), cancel);
-    gtk_window_set_modal(GTK_WINDOW(fe->cfgbox), true);
-    gtk_window_set_transient_for(GTK_WINDOW(fe->cfgbox),
-                                 GTK_WINDOW(fe->window));
-    /* set_transient_window_pos(fe->window, fe->cfgbox); */
-    gtk_widget_show(fe->cfgbox);
-    gtk_main();
-
-    free_cfg(fe->cfg);
-
-    return fe->cfgret;
-}
-
-static void menu_key_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    int key = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),
-                                                "user-data"));
-    if (!midend_process_key(fe->me, 0, 0, key))
-        gtk_widget_destroy(fe->window);
-}
-
-static void get_size(frontend *fe, int *px, int *py)
-{
-    int x, y;
-
-    /*
-     * Currently I don't want to make the GTK port scale large
-     * puzzles to fit on the screen. This is because X does permit
-     * extremely large windows and many window managers provide a
-     * means of navigating round them, and the users I consulted
-     * before deciding said that they'd rather have enormous puzzle
-     * windows spanning multiple screen pages than have them
-     * shrunk. I could change my mind later or introduce
-     * configurability; this would be the place to do so, by
-     * replacing the initial values of x and y with the screen
-     * dimensions.
-     */
-    x = INT_MAX;
-    y = INT_MAX;
-    midend_size(fe->me, &x, &y, false);
-    *px = x;
-    *py = y;
-}
-
-#if !GTK_CHECK_VERSION(2,0,0)
-#define gtk_window_resize(win, x, y) \
-        gdk_window_resize(GTK_WIDGET(win)->window, x, y)
-#endif
-
-/*
- * Called when any other code in this file has changed the
- * selected game parameters.
- */
-static void changed_preset(frontend *fe)
-{
-    int n = midend_which_preset(fe->me);
-
-    fe->preset_threaded = true;
-    if (n < 0 && fe->preset_custom) {
-        gtk_check_menu_item_set_active(
-            GTK_CHECK_MENU_ITEM(fe->preset_custom),
-            true);
-    } else {
-        GSList *gs = fe->preset_radio;
-        GSList *found = NULL;
-
-        for (gs = fe->preset_radio; gs; gs = gs->next) {
-            struct preset_menu_entry *entry =
-                (struct preset_menu_entry *)g_object_get_data(
-                    G_OBJECT(gs->data), "user-data");
-            if (!entry || entry->id != n)
-                gtk_check_menu_item_set_active(
-                    GTK_CHECK_MENU_ITEM(gs->data), false);
-            else
-                found = gs;
-        }
-        if (found)
-            gtk_check_menu_item_set_active(
-                GTK_CHECK_MENU_ITEM(found->data), true);
-    }
-    fe->preset_threaded = false;
-
-    /*
-     * Update the greying on the Copy menu option.
-     */
-    if (fe->copy_menu_item) {
-        bool enabled = midend_can_format_as_text_now(fe->me);
-        gtk_widget_set_sensitive(fe->copy_menu_item, enabled);
-    }
-}
-
-#if !GTK_CHECK_VERSION(3,0,0)
-static bool not_size_allocated_yet(GtkWidget *w)
-{
-    /*
-     * This function tests whether a widget has not yet taken up space
-     * on the screen which it will occupy in future. (Therefore, it
-     * returns true only if the widget does exist but does not have a
-     * size allocation. A null widget is already taking up all the
-     * space it ever will.)
-     */
-    if (!w)
-        return false;        /* nonexistent widgets aren't a problem */
-
-#if GTK_CHECK_VERSION(2,18,0)  /* skip if no gtk_widget_get_allocation */
-    {
-        GtkAllocation a;
-        gtk_widget_get_allocation(w, &a);
-        if (a.height == 0 || a.width == 0)
-            return true;       /* widget exists but has no size yet */
-    }
-#endif
-
-    return false;
-}
-
-static void try_shrink_drawing_area(frontend *fe)
-{
-    if (fe->drawing_area_shrink_pending &&
-        (!fe->menubar_is_local || !not_size_allocated_yet(fe->menubar)) &&
-        !not_size_allocated_yet(fe->statusbar)) {
-        /*
-         * In order to permit the user to resize the window smaller as
-         * well as bigger, we call this function after the window size
-         * has ended up where we want it. This shouldn't shrink the
-         * window immediately; it just arranges that the next time the
-         * user tries to shrink it, they can.
-         *
-         * However, at puzzle creation time, we defer the first of
-         * these operations until after the menu bar and status bar
-         * are actually visible. On Ubuntu 12.04 I've found that these
-         * can take a while to be displayed, and that it's a mistake
-         * to reduce the drawing area's size allocation before they've
-         * turned up or else the drawing area makes room for them by
-         * shrinking to less than the size we intended.
-         */
-        gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), 1, 1);
-        fe->drawing_area_shrink_pending = false;
-    }
-}
-#endif /* !GTK_CHECK_VERSION(3,0,0) */
-
-static gint configure_window(GtkWidget *widget,
-                             GdkEventConfigure *event, gpointer data)
-{
-#if !GTK_CHECK_VERSION(3,0,0)
-    /*
-     * When the main puzzle window changes size, it might be because
-     * the menu bar or status bar has turned up after starting off
-     * absent, in which case we should have another go at enacting a
-     * pending shrink of the drawing area.
-     */
-    frontend *fe = (frontend *)data;
-    try_shrink_drawing_area(fe);
-#endif
-    return false;
-}
-
-#if GTK_CHECK_VERSION(3,0,0)
-static int window_extra_height(frontend *fe)
-{
-    int ret = 0;
-    if (fe->menubar) {
-        GtkRequisition req;
-        gtk_widget_get_preferred_size(fe->menubar, &req, NULL);
-        ret += req.height;
-    }
-    if (fe->statusbar) {
-        GtkRequisition req;
-        gtk_widget_get_preferred_size(fe->statusbar, &req, NULL);
-        ret += req.height;
-    }
-    return ret;
-}
-#endif
-
-static void resize_fe(frontend *fe)
-{
-    int x, y;
-
-    get_size(fe, &x, &y);
-
-#if GTK_CHECK_VERSION(3,0,0)
-    gtk_window_resize(GTK_WINDOW(fe->window), x, y + window_extra_height(fe));
-    fe->awaiting_resize_ack = true;
-#else
-    fe->drawing_area_shrink_pending = false;
-    gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
-    {
-        GtkRequisition req;
-        gtk_widget_size_request(GTK_WIDGET(fe->window), &req);
-        gtk_window_resize(GTK_WINDOW(fe->window), req.width, req.height);
-    }
-    fe->drawing_area_shrink_pending = true;
-    try_shrink_drawing_area(fe);
-#endif
-}
-
-static void menu_preset_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    struct preset_menu_entry *entry =
-        (struct preset_menu_entry *)g_object_get_data(
-            G_OBJECT(menuitem), "user-data");
-
-    if (fe->preset_threaded ||
-        (GTK_IS_CHECK_MENU_ITEM(menuitem) &&
-         !gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))))
-        return;
-    midend_set_params(fe->me, entry->params);
-    midend_new_game(fe->me);
-    changed_preset(fe);
-    resize_fe(fe);
-    midend_redraw(fe->me);
-}
-
-GdkAtom compound_text_atom, utf8_string_atom;
-bool paste_initialised = false;
-
-static void set_selection(frontend *fe, GdkAtom selection)
-{
-    if (!paste_initialised) {
-        compound_text_atom = gdk_atom_intern("COMPOUND_TEXT", false);
-        utf8_string_atom = gdk_atom_intern("UTF8_STRING", false);
-        paste_initialised = true;
-    }
-
-    /*
-     * For this simple application we can safely assume that the
-     * data passed to this function is pure ASCII, which means we
-     * can return precisely the same stuff for types STRING,
-     * COMPOUND_TEXT or UTF8_STRING.
-     */
-
-    if (gtk_selection_owner_set(fe->area, selection, CurrentTime)) {
-        gtk_selection_clear_targets(fe->area, selection);
-        gtk_selection_add_target(fe->area, selection,
-                                 GDK_SELECTION_TYPE_STRING, 1);
-        gtk_selection_add_target(fe->area, selection, compound_text_atom, 1);
-        gtk_selection_add_target(fe->area, selection, utf8_string_atom, 1);
-    }
-}
-
-void write_clip(frontend *fe, char *data)
-{
-    if (fe->paste_data)
-        sfree(fe->paste_data);
-
-    fe->paste_data = data;
-    fe->paste_data_len = strlen(data);
-
-    set_selection(fe, GDK_SELECTION_PRIMARY);
-    set_selection(fe, GDK_SELECTION_CLIPBOARD);
-}
-
-void selection_get(GtkWidget *widget, GtkSelectionData *seldata,
-                   guint info, guint time_stamp, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    gtk_selection_data_set(seldata, gtk_selection_data_get_target(seldata), 8,
-                           fe->paste_data, fe->paste_data_len);
-}
-
-gint selection_clear(GtkWidget *widget, GdkEventSelection *seldata,
-                     gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    if (fe->paste_data)
-        sfree(fe->paste_data);
-    fe->paste_data = NULL;
-    fe->paste_data_len = 0;
-    return true;
-}
-
-static void menu_copy_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    char *text;
-
-    text = midend_text_format(fe->me);
-
-    if (text) {
-        write_clip(fe, text);
-    } else {
-        gdk_display_beep(gdk_display_get_default());
-    }
-}
-
-#ifdef OLD_FILESEL
-
-static void filesel_ok(GtkButton *button, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    gpointer filesel = g_object_get_data(G_OBJECT(button), "user-data");
-
-    const char *name =
-        gtk_file_selection_get_filename(GTK_FILE_SELECTION(filesel));
-
-    fe->filesel_name = dupstr(name);
-}
-
-static char *file_selector(frontend *fe, const char *title, int save)
-{
-    GtkWidget *filesel =
-        gtk_file_selection_new(title);
-
-    fe->filesel_name = NULL;
-
-    gtk_window_set_modal(GTK_WINDOW(filesel), true);
-    g_object_set_data
-        (G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "user-data",
-         (gpointer)filesel);
-    g_signal_connect
-        (G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
-         G_CALLBACK(filesel_ok), fe);
-    g_signal_connect_swapped
-        (G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button), "clicked",
-         G_CALLBACK(gtk_widget_destroy), (gpointer)filesel);
-    g_signal_connect_object
-        (G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button), "clicked",
-         G_CALLBACK(gtk_widget_destroy), (gpointer)filesel);
-    g_signal_connect(G_OBJECT(filesel), "destroy",
-                     G_CALLBACK(window_destroy), NULL);
-    gtk_widget_show(filesel);
-    gtk_window_set_transient_for(GTK_WINDOW(filesel), GTK_WINDOW(fe->window));
-    gtk_main();
-
-    return fe->filesel_name;
-}
-
-#else
-
-static char *file_selector(frontend *fe, const char *title, bool save)
-{
-    char *filesel_name = NULL;
-
-    GtkWidget *filesel =
-        gtk_file_chooser_dialog_new(title,
-                                    GTK_WINDOW(fe->window),
-                                    save ? GTK_FILE_CHOOSER_ACTION_SAVE :
-                                    GTK_FILE_CHOOSER_ACTION_OPEN,
-                                    LABEL_CANCEL, GTK_RESPONSE_CANCEL,
-                                    save ? LABEL_SAVE : LABEL_OPEN,
-                                    GTK_RESPONSE_ACCEPT,
-                                    NULL);
-
-    if (gtk_dialog_run(GTK_DIALOG(filesel)) == GTK_RESPONSE_ACCEPT) {
-        char *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filesel));
-        filesel_name = dupstr(name);
-        g_free(name);
-    }
-
-    gtk_widget_destroy(filesel);
-
-    return filesel_name;
-}
-
-#endif
-
-#ifdef USE_PRINTING
-GObject *create_print_widget(GtkPrintOperation *print, gpointer data)
-{
-    GtkLabel *count_label, *width_label, *height_label,
-        *scale_llabel, *scale_rlabel;
-    GtkBox *scale_hbox;
-    GtkWidget *grid;
-    frontend *fe = (frontend *)data;
-
-    fe->printcount_spin_button =
-        GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(1, 999, 1));
-    gtk_spin_button_set_numeric(fe->printcount_spin_button, true);
-    gtk_spin_button_set_snap_to_ticks(fe->printcount_spin_button, true);
-    fe->printw_spin_button =
-        GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(1, 99, 1));
-    gtk_spin_button_set_numeric(fe->printw_spin_button, true);
-    gtk_spin_button_set_snap_to_ticks(fe->printw_spin_button, true);
-    fe->printh_spin_button =
-        GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(1, 99, 1));
-    gtk_spin_button_set_numeric(fe->printh_spin_button, true);
-    gtk_spin_button_set_snap_to_ticks(fe->printh_spin_button, true);
-    fe->printscale_spin_button =
-        GTK_SPIN_BUTTON(gtk_spin_button_new_with_range(1, 1000, 1));
-    gtk_spin_button_set_digits(fe->printscale_spin_button, 1);
-    gtk_spin_button_set_numeric(fe->printscale_spin_button, true);
-    if (thegame.can_solve) {
-        fe->soln_check_button =
-            GTK_CHECK_BUTTON(
-                gtk_check_button_new_with_label("Print solutions"));
-    }
-    if (thegame.can_print_in_colour) {
-        fe->colour_check_button =
-            GTK_CHECK_BUTTON(
-                gtk_check_button_new_with_label("Print in color"));
-    }
-
-    /* Set defaults to what was selected last time. */
-    gtk_spin_button_set_value(fe->printcount_spin_button,
-                              (gdouble)fe->printcount);
-    gtk_spin_button_set_value(fe->printw_spin_button,
-                              (gdouble)fe->printw);
-    gtk_spin_button_set_value(fe->printh_spin_button,
-                              (gdouble)fe->printh);
-    gtk_spin_button_set_value(fe->printscale_spin_button,
-                              (gdouble)fe->printscale);
-    if (thegame.can_solve) {
-        gtk_toggle_button_set_active(
-            GTK_TOGGLE_BUTTON(fe->soln_check_button), fe->printsolns);
-    }
-    if (thegame.can_print_in_colour) {
-        gtk_toggle_button_set_active(
-            GTK_TOGGLE_BUTTON(fe->colour_check_button), fe->printcolour);
-    }
-
-    count_label = GTK_LABEL(gtk_label_new("Puzzles to print:"));
-    width_label = GTK_LABEL(gtk_label_new("Puzzles across:"));
-    height_label = GTK_LABEL(gtk_label_new("Puzzles down:"));
-    scale_llabel = GTK_LABEL(gtk_label_new("Puzzle scale:"));
-    scale_rlabel = GTK_LABEL(gtk_label_new("%"));
-#if GTK_CHECK_VERSION(3,0,0)
-    gtk_widget_set_halign(GTK_WIDGET(count_label), GTK_ALIGN_START);
-    gtk_widget_set_halign(GTK_WIDGET(width_label), GTK_ALIGN_START);
-    gtk_widget_set_halign(GTK_WIDGET(height_label), GTK_ALIGN_START);
-    gtk_widget_set_halign(GTK_WIDGET(scale_llabel), GTK_ALIGN_START);
-#else
-    gtk_misc_set_alignment(GTK_MISC(count_label), 0, 0);
-    gtk_misc_set_alignment(GTK_MISC(width_label), 0, 0);
-    gtk_misc_set_alignment(GTK_MISC(height_label), 0, 0);
-    gtk_misc_set_alignment(GTK_MISC(scale_llabel), 0, 0);
-#endif
-
-    scale_hbox = GTK_BOX(gtk_hbox_new(false, 6));
-    gtk_box_pack_start(scale_hbox, GTK_WIDGET(fe->printscale_spin_button),
-                       false, false, 0);
-    gtk_box_pack_start(scale_hbox, GTK_WIDGET(scale_rlabel),
-                       false, false, 0);
-
-#if GTK_CHECK_VERSION(3,0,0)
-    grid = gtk_grid_new();
-    gtk_grid_set_column_spacing(GTK_GRID(grid), 18);
-    gtk_grid_set_row_spacing(GTK_GRID(grid), 18);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(count_label), 0, 0, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(width_label), 0, 1, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(height_label), 0, 2, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(scale_llabel), 0, 3, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(fe->printcount_spin_button),
-                    1, 0, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(fe->printw_spin_button),
-                    1, 1, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(fe->printh_spin_button),
-                    1, 2, 1, 1);
-    gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(scale_hbox), 1, 3, 1, 1);
-    if (thegame.can_solve) {
-        gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(fe->soln_check_button),
-                        0, 4, 1, 1);
-    }
-    if (thegame.can_print_in_colour) {
-        gtk_grid_attach(GTK_GRID(grid), GTK_WIDGET(fe->colour_check_button),
-                        thegame.can_solve, 4, 1, 1);
-    }
-#else
-    grid = gtk_table_new((thegame.can_solve || thegame.can_print_in_colour) ?
-                         5 : 4, 2, false);
-    gtk_table_set_col_spacings(GTK_TABLE(grid), 18);
-    gtk_table_set_row_spacings(GTK_TABLE(grid), 18);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(count_label), 0, 1, 0, 1,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(width_label), 0, 1, 1, 2,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(height_label), 0, 1, 2, 3,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(scale_llabel), 0, 1, 3, 4,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(fe->printcount_spin_button),
-                     1, 2, 0, 1,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(fe->printw_spin_button),
-                     1, 2, 1, 2,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(fe->printh_spin_button),
-                     1, 2, 2, 3,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(scale_hbox), 1, 2, 3, 4,
-                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    if (thegame.can_solve) {
-        gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(fe->soln_check_button),
-                         0, 1, 4, 5,
-                         GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    }
-    if (thegame.can_print_in_colour) {
-        gtk_table_attach(GTK_TABLE(grid), GTK_WIDGET(fe->colour_check_button),
-                         thegame.can_solve, thegame.can_solve + 1, 4, 5,
-                         GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-    }
-#endif
-    gtk_container_set_border_width(GTK_CONTAINER(grid), 12);
-
-    gtk_widget_show_all(grid);
-
-    return G_OBJECT(grid);
-}
-
-void apply_print_widget(GtkPrintOperation *print,
-                        GtkWidget *widget, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    /* We ignore `widget' because it is easier and faster to store the
-       widgets we need in `fe' then to get the children of `widget'. */
-    fe->printcount =
-        gtk_spin_button_get_value_as_int(fe->printcount_spin_button);
-    fe->printw = gtk_spin_button_get_value_as_int(fe->printw_spin_button);
-    fe->printh = gtk_spin_button_get_value_as_int(fe->printh_spin_button);
-    fe->printscale = gtk_spin_button_get_value(fe->printscale_spin_button);
-    if (thegame.can_solve) {
-        fe->printsolns =
-            gtk_toggle_button_get_active(
-                GTK_TOGGLE_BUTTON(fe->soln_check_button));
-    }
-    if (thegame.can_print_in_colour) {
-        fe->printcolour =
-            gtk_toggle_button_get_active(
-                GTK_TOGGLE_BUTTON(fe->colour_check_button));
-    }
-}
-
-void print_begin(GtkPrintOperation *printop,
-                 GtkPrintContext *context, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    midend *nme = NULL;  /* non-interactive midend for bulk puzzle generation */
-    int i;
-
-    fe->printcontext = context;
-    fe->cr = gtk_print_context_get_cairo_context(context);
-
-    /*
-     * Create our document structure and fill it up with puzzles.
-     */
-    fe->doc = document_new(fe->printw, fe->printh, fe->printscale / 100.0F);
-
-    for (i = 0; i < fe->printcount; i++) {
-        const char *err;
-
-        if (i == 0) {
-            err = midend_print_puzzle(fe->me, fe->doc, fe->printsolns);
-        } else {
-            if (!nme) {
-                game_params *params;
-
-                nme = midend_new(NULL, &thegame, NULL, NULL);
-
-                /*
-                 * Set the non-interactive mid-end to have the same
-                 * parameters as the standard one.
-                 */
-                params = midend_get_params(fe->me);
-                midend_set_params(nme, params);
-                thegame.free_params(params);
-            }
-
-            midend_new_game(nme);
-            err = midend_print_puzzle(nme, fe->doc, fe->printsolns);
-        }
-
-        if (err) {
-            error_box(fe->window, err);
-            return;
-        }
-    }
-
-    if (nme)
-        midend_free(nme);
-
-    /* Begin the document. */
-    document_begin(fe->doc, fe->print_dr);
-}
-
-void draw_page(GtkPrintOperation *printop,
-               GtkPrintContext *context,
-               gint page_nr, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    document_print_page(fe->doc, fe->print_dr, page_nr);
-}
-
-void print_end(GtkPrintOperation *printop,
-               GtkPrintContext *context, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    /* End and free the document. */
-    document_end(fe->doc, fe->print_dr);
-    document_free(fe->doc);
-    fe->doc = NULL;
-}
-
-static void print_dialog(frontend *fe)
-{
-    GError *error;
-    static GtkPrintSettings *settings = NULL;
-    static GtkPageSetup *page_setup = NULL;
-#ifndef USE_EMBED_PAGE_SETUP
-    GtkPageSetup *new_page_setup;
-#endif
-
-    fe->printop = gtk_print_operation_new();
-    gtk_print_operation_set_use_full_page(fe->printop, true);
-    gtk_print_operation_set_custom_tab_label(fe->printop, "Puzzle Settings");
-    g_signal_connect(fe->printop, "create-custom-widget",
-                     G_CALLBACK(create_print_widget), fe);
-    g_signal_connect(fe->printop, "custom-widget-apply",
-                     G_CALLBACK(apply_print_widget), fe);
-    g_signal_connect(fe->printop, "begin-print", G_CALLBACK(print_begin), fe);
-    g_signal_connect(fe->printop, "draw-page", G_CALLBACK(draw_page), fe);
-    g_signal_connect(fe->printop, "end-print", G_CALLBACK(print_end), fe);
-#ifdef USE_EMBED_PAGE_SETUP
-    gtk_print_operation_set_embed_page_setup(fe->printop, true);
-#else
-    if (page_setup == NULL) {
-        page_setup =
-            g_object_ref(
-                gtk_print_operation_get_default_page_setup(fe->printop));
-    }
-    if (settings == NULL) {
-        settings =
-            g_object_ref(gtk_print_operation_get_print_settings(fe->printop));
-    }
-    new_page_setup = gtk_print_run_page_setup_dialog(GTK_WINDOW(fe->window),
-                                                     page_setup, settings);
-    g_object_unref(page_setup);
-    page_setup = new_page_setup;
-    gtk_print_operation_set_default_page_setup(fe->printop, page_setup);
-#endif
-
-    if (settings != NULL)
-        gtk_print_operation_set_print_settings(fe->printop, settings);
-    if (page_setup != NULL)
-        gtk_print_operation_set_default_page_setup(fe->printop, page_setup);
-
-    switch (gtk_print_operation_run(fe->printop,
-                                    GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
-                                    GTK_WINDOW(fe->window), &error)) {
-    case GTK_PRINT_OPERATION_RESULT_ERROR:
-        error_box(fe->window, error->message);
-        g_error_free(error);
-        break;
-    case GTK_PRINT_OPERATION_RESULT_APPLY:
-        if (settings != NULL)
-            g_object_unref(settings);
-        settings =
-            g_object_ref(gtk_print_operation_get_print_settings(fe->printop));
-#ifdef USE_EMBED_PAGE_SETUP
-        if (page_setup != NULL)
-            g_object_unref(page_setup);
-        page_setup =
-            g_object_ref(
-                gtk_print_operation_get_default_page_setup(fe->printop));
-#endif
-        break;
-    default:
-        /* Don't error out on -Werror=switch. */
-        break;
-    }
-
-    g_object_unref(fe->printop);
-    fe->printop = NULL;
-    fe->printcontext = NULL;
-}
-#endif /* USE_PRINTING */
-
-struct savefile_write_ctx {
-    FILE *fp;
-    int error;
-};
-
-static void savefile_write(void *wctx, const void *buf, int len)
-{
-    struct savefile_write_ctx *ctx = (struct savefile_write_ctx *)wctx;
-    if (fwrite(buf, 1, len, ctx->fp) < len)
-        ctx->error = errno;
-}
-
-static bool savefile_read(void *wctx, void *buf, int len)
-{
-    FILE *fp = (FILE *)wctx;
-    int ret;
-
-    ret = fread(buf, 1, len, fp);
-    return (ret == len);
-}
-
-static void menu_save_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    char *name;
-
-    name = file_selector(fe, "Enter name of game file to save", true);
-
-    if (name) {
-        FILE *fp;
-
-        if ((fp = fopen(name, "r")) != NULL) {
-            char buf[256 + FILENAME_MAX];
-            fclose(fp);
-            /* file exists */
-
-            sprintf(buf, "Are you sure you want to overwrite the"
-                    " file \"%.*s\"?",
-                    FILENAME_MAX, name);
-            if (!message_box(fe->window, "Question", buf, true, MB_YESNO))
-                goto free_and_return;
-        }
-
-        fp = fopen(name, "w");
-
-        if (!fp) {
-            error_box(fe->window, "Unable to open save file");
-            goto free_and_return;
-        }
-
-        {
-            struct savefile_write_ctx ctx;
-            ctx.fp = fp;
-            ctx.error = 0;
-            midend_serialise(fe->me, savefile_write, &ctx);
-            fclose(fp);
-            if (ctx.error) {
-                char boxmsg[512];
-                sprintf(boxmsg, "Error writing save file: %.400s",
-                        strerror(ctx.error));
-                error_box(fe->window, boxmsg);
-                goto free_and_return;
-            }
-        }
-    free_and_return:
-        sfree(name);
-    }
-}
-
-static void menu_load_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    char *name;
-    const char *err;
-
-    name = file_selector(fe, "Enter name of saved game file to load", false);
-
-    if (name) {
-        FILE *fp = fopen(name, "r");
-        sfree(name);
-
-        if (!fp) {
-            error_box(fe->window, "Unable to open saved game file");
-            return;
-        }
-
-        err = midend_deserialise(fe->me, savefile_read, fp);
-
-        fclose(fp);
-
-        if (err) {
-            error_box(fe->window, err);
-            return;
-        }
-
-        changed_preset(fe);
-        resize_fe(fe);
-        midend_redraw(fe->me);
-    }
-}
-
-#ifdef USE_PRINTING
-static void menu_print_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    print_dialog(fe);
-}
-#endif
-
-static void menu_solve_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    const char *msg;
-
-    msg = midend_solve(fe->me);
-
-    if (msg)
-        error_box(fe->window, msg);
-}
-
-static void menu_restart_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-    midend_restart_game(fe->me);
-}
-
-static void menu_config_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-    int which = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),
-                                                  "user-data"));
-
-    if (fe->preset_threaded ||
-        (GTK_IS_CHECK_MENU_ITEM(menuitem) &&
-         !gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menuitem))))
-        return;
-    changed_preset(fe);                 /* Put the old preset back! */
-    if (!get_config(fe, which))
-        return;
-
-    midend_new_game(fe->me);
-    resize_fe(fe);
-    midend_redraw(fe->me);
-}
-
-static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
-{
-    frontend *fe = (frontend *)data;
-
-#if GTK_CHECK_VERSION(3,0,0)
-# define ABOUT_PARAMS                                               \
-    "program-name", thegame.name,                                   \
-    "version", ver,                                                 \
-    "comments", "Part of Simon Tatham's Portable Puzzle Collection"
-
-    extern char *const *const xpm_icons[];
-    extern const int n_xpm_icons;
-
-    if (n_xpm_icons) {
-        GdkPixbuf *icon = gdk_pixbuf_new_from_xpm_data
-            ((const gchar **)xpm_icons[n_xpm_icons-1]);
-
-        gtk_show_about_dialog
-            (GTK_WINDOW(fe->window),
-             ABOUT_PARAMS,
-             "logo", icon,
-             (const gchar *)NULL);
-        g_object_unref(G_OBJECT(icon));
-    }
-    else {
-        gtk_show_about_dialog
-            (GTK_WINDOW(fe->window),
-             ABOUT_PARAMS,
-             (const gchar *)NULL);
-    }
-#else
-    char titlebuf[256];
-    char textbuf[1024];
-
-    sprintf(titlebuf, "About %.200s", thegame.name);
-    sprintf(textbuf,
-            "%.200s\n\n"
-            "from Simon Tatham's Portable Puzzle Collection\n\n"
-            "%.500s", thegame.name, ver);
-
-    message_box(fe->window, titlebuf, textbuf, true, MB_OK);
-#endif
-}
-
-static GtkWidget *add_menu_ui_item(
-    frontend *fe, GtkContainer *cont, const char *text, int action,
-    int accel_key, int accel_keyqual)
-{
-    GtkWidget *menuitem = gtk_menu_item_new_with_label(text);
-    gtk_container_add(cont, menuitem);
-    g_object_set_data(G_OBJECT(menuitem), "user-data",
-                      GINT_TO_POINTER(action));
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_key_event), fe);
-
-    if (accel_key) {
-        /*
-         * Display a keyboard accelerator alongside this menu item.
-         * Actually this won't be processed via the usual GTK
-         * accelerator system, because we add it to a dummy
-         * accelerator group which is never actually activated on the
-         * main window; this permits back ends to override special
-         * keys like 'n' and 'r' and 'u' in some UI states. So
-         * whatever keystroke we display here will still go to
-         * key_event and be handled in the normal way.
-         */
-        gtk_widget_add_accelerator(menuitem,
-                                   "activate", fe->dummy_accelgroup,
-                                   accel_key, accel_keyqual,
-                                   GTK_ACCEL_VISIBLE | GTK_ACCEL_LOCKED);
-    }
-
-    gtk_widget_show(menuitem);
-    return menuitem;
-}
-
-static void add_menu_separator(GtkContainer *cont)
-{
-    GtkWidget *menuitem = gtk_menu_item_new();
-    gtk_container_add(cont, menuitem);
-    gtk_widget_show(menuitem);
-}
-
-static void populate_gtk_preset_menu(frontend *fe, struct preset_menu *menu,
-                                     GtkWidget *gtkmenu)
-{
-    int i;
-
-    for (i = 0; i < menu->n_entries; i++) {
-        struct preset_menu_entry *entry = &menu->entries[i];
-        GtkWidget *menuitem;
-
-        if (entry->params) {
-            menuitem = gtk_radio_menu_item_new_with_label(
-                fe->preset_radio, entry->title);
-            fe->preset_radio = gtk_radio_menu_item_get_group(
-                GTK_RADIO_MENU_ITEM(menuitem));
-            g_object_set_data(G_OBJECT(menuitem), "user-data", entry);
-            g_signal_connect(G_OBJECT(menuitem), "activate",
-                             G_CALLBACK(menu_preset_event), fe);
-        } else {
-            GtkWidget *submenu;
-            menuitem = gtk_menu_item_new_with_label(entry->title);
-            submenu = gtk_menu_new();
-            gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
-            populate_gtk_preset_menu(fe, entry->submenu, submenu);
-        }
-
-        gtk_container_add(GTK_CONTAINER(gtkmenu), menuitem);
-        gtk_widget_show(menuitem);
-    }
-}
-
-enum { ARG_EITHER, ARG_SAVE, ARG_ID }; /* for argtype */
-
-static frontend *new_window(
-    char *arg, int argtype, char **error, bool headless)
-{
-    frontend *fe;
-#ifdef USE_PRINTING
-    frontend *print_fe = NULL;
-#endif
-    GtkBox *vbox, *hbox;
-    GtkWidget *menu, *menuitem;
-    GList *iconlist;
-    int x, y, n;
-    char errbuf[1024];
-    extern char *const *const xpm_icons[];
-    extern const int n_xpm_icons;
-    struct preset_menu *preset_menu;
-
-    fe = snew(frontend);
-    memset(fe, 0, sizeof(frontend));
-
-#ifndef USE_CAIRO
-    if (headless) {
-        fprintf(stderr, "headless mode not supported for non-Cairo drawing\n");
-        exit(1);
-    }
-#else
-    fe->headless = headless;
-    fe->ps = 1; /* in headless mode, configure_area won't have set this */
-#endif
-
-    fe->timer_active = false;
-    fe->timer_id = -1;
-
-    fe->me = midend_new(fe, &thegame, &gtk_drawing, fe);
-
-    fe->dr_api = &internal_drawing;
-
-#ifdef USE_PRINTING
-    if (thegame.can_print) {
-        print_fe = snew(frontend);
-        memset(print_fe, 0, sizeof(frontend));
-
-        /* Defaults */
-        print_fe->printcount = print_fe->printw = print_fe->printh = 1;
-        print_fe->printscale = 100;
-        print_fe->printsolns = false;
-        print_fe->printcolour = thegame.can_print_in_colour;
-
-        /*
-         * We need to use the same midend as the main frontend because
-         * we need midend_print_puzzle() to be able to print the
-         * current puzzle.
-         */
-        print_fe->me = fe->me;
-
-        print_fe->print_dr = drawing_new(&gtk_drawing, print_fe->me, print_fe);
-
-        print_fe->dr_api = &internal_printing;
-    }
-#endif
-
-    if (arg) {
-        const char *err;
-        FILE *fp;
-
-        errbuf[0] = '\0';
-
-        switch (argtype) {
-          case ARG_ID:
-            err = midend_game_id(fe->me, arg);
-            if (!err)
-                midend_new_game(fe->me);
-            else
-                sprintf(errbuf, "Invalid game ID: %.800s", err);
-            break;
-          case ARG_SAVE:
-            fp = fopen(arg, "r");
-            if (!fp) {
-                sprintf(errbuf, "Error opening file: %.800s", strerror(errno));
-            } else {
-                err = midend_deserialise(fe->me, savefile_read, fp);
-                if (err)
-                    sprintf(errbuf, "Invalid save file: %.800s", err);
-                fclose(fp);
-            }
-            break;
-          default /*case ARG_EITHER*/:
-            /*
-             * First try treating the argument as a game ID.
-             */
-            err = midend_game_id(fe->me, arg);
-            if (!err) {
-                /*
-                 * It's a valid game ID.
-                 */
-                midend_new_game(fe->me);
-            } else {
-                FILE *fp = fopen(arg, "r");
-                if (!fp) {
-                    sprintf(errbuf, "Supplied argument is neither a game ID (%.400s)"
-                            " nor a save file (%.400s)", err, strerror(errno));
-                } else {
-                    err = midend_deserialise(fe->me, savefile_read, fp);
-                    if (err)
-                        sprintf(errbuf, "%.800s", err);
-                    fclose(fp);
-                }
-            }
-            break;
-        }
-        if (*errbuf) {
-            *error = dupstr(errbuf);
-            midend_free(fe->me);
-            sfree(fe);
-#ifdef USE_PRINTING
-            if (thegame.can_print) {
-                drawing_free(print_fe->print_dr);
-                sfree(print_fe);
-            }
-#endif
-            return NULL;
-        }
-
-    } else {
-        midend_new_game(fe->me);
-    }
-
-    if (headless) {
-        snaffle_colours(fe);
-        get_size(fe, &fe->pw, &fe->ph);
-        setup_backing_store(fe);
-        return fe;
-    }
-
-#if !GTK_CHECK_VERSION(3,0,0)
-    {
-        /*
-         * try_shrink_drawing_area() will do some fiddling with the
-         * window size request (see comment in that function) after
-         * all the bits and pieces such as the menu bar and status bar
-         * have appeared in the puzzle window.
-         *
-         * However, on Unity systems, the menu bar _doesn't_ appear in
-         * the puzzle window, because the Unity shell hijacks it into
-         * the menu bar at the very top of the screen. We therefore
-         * try to detect that situation here, so that we don't sit
-         * here forever waiting for a menu bar.
-         */
-        const char prop[] = "gtk-shell-shows-menubar";
-        GtkSettings *settings = gtk_settings_get_default();
-        if (!g_object_class_find_property(G_OBJECT_GET_CLASS(settings),
-                                          prop)) {
-            fe->menubar_is_local = true;
-        } else {
-            int unity_mode;
-            g_object_get(gtk_settings_get_default(),
-                         prop, &unity_mode,
-                         (const gchar *)NULL);
-            fe->menubar_is_local = !unity_mode;
-        }
-    }
-#endif
-
-#if GTK_CHECK_VERSION(3,0,0)
-    fe->awaiting_resize_ack = false;
-#endif
-
-    fe->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_title(GTK_WINDOW(fe->window), thegame.name);
-
-    vbox = GTK_BOX(gtk_vbox_new(false, 0));
-    gtk_container_add(GTK_CONTAINER(fe->window), GTK_WIDGET(vbox));
-    gtk_widget_show(GTK_WIDGET(vbox));
-
-    fe->dummy_accelgroup = gtk_accel_group_new();
-    /*
-     * Intentionally _not_ added to the window via
-     * gtk_window_add_accel_group; see menu_key_event
-     */
-
-    hbox = GTK_BOX(gtk_hbox_new(false, 0));
-    gtk_box_pack_start(vbox, GTK_WIDGET(hbox), false, false, 0);
-    gtk_widget_show(GTK_WIDGET(hbox));
-
-    fe->menubar = gtk_menu_bar_new();
-    gtk_box_pack_start(hbox, fe->menubar, true, true, 0);
-    gtk_widget_show(fe->menubar);
-
-    menuitem = gtk_menu_item_new_with_mnemonic("_Game");
-    gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
-    gtk_widget_show(menuitem);
-
-    menu = gtk_menu_new();
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-
-    add_menu_ui_item(fe, GTK_CONTAINER(menu), "New", UI_NEWGAME, 'n', 0);
-
-    menuitem = gtk_menu_item_new_with_label("Restart");
-    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_restart_event), fe);
-    gtk_widget_show(menuitem);
-
-    menuitem = gtk_menu_item_new_with_label("Specific...");
-    g_object_set_data(G_OBJECT(menuitem), "user-data",
-                      GINT_TO_POINTER(CFG_DESC));
-    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_config_event), fe);
-    gtk_widget_show(menuitem);
-
-    menuitem = gtk_menu_item_new_with_label("Random Seed...");
-    g_object_set_data(G_OBJECT(menuitem), "user-data",
-                      GINT_TO_POINTER(CFG_SEED));
-    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_config_event), fe);
-    gtk_widget_show(menuitem);
-
-    fe->preset_radio = NULL;
-    fe->preset_custom = NULL;
-    fe->preset_threaded = false;
-
-    preset_menu = midend_get_presets(fe->me, NULL);
-    if (preset_menu->n_entries > 0 || thegame.can_configure) {
-        GtkWidget *submenu;
-
-        menuitem = gtk_menu_item_new_with_mnemonic("_Type");
-        gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
-        gtk_widget_show(menuitem);
-
-        submenu = gtk_menu_new();
-        gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
-
-        populate_gtk_preset_menu(fe, preset_menu, submenu);
-
-        if (thegame.can_configure) {
-            menuitem = fe->preset_custom =
-                gtk_radio_menu_item_new_with_label(fe->preset_radio,
-                                                   "Custom...");
-            fe->preset_radio =
-                gtk_radio_menu_item_get_group(GTK_RADIO_MENU_ITEM(menuitem));
-            gtk_container_add(GTK_CONTAINER(submenu), menuitem);
-            g_object_set_data(G_OBJECT(menuitem), "user-data",
-                              GINT_TO_POINTER(CFG_SETTINGS));
-            g_signal_connect(G_OBJECT(menuitem), "activate",
-                             G_CALLBACK(menu_config_event), fe);
-            gtk_widget_show(menuitem);
-        }
-
-    }
-
-    add_menu_separator(GTK_CONTAINER(menu));
-    menuitem = gtk_menu_item_new_with_label("Load...");
-    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_load_event), fe);
-    gtk_widget_show(menuitem);
-    menuitem = gtk_menu_item_new_with_label("Save...");
-    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_save_event), fe);
-    gtk_widget_show(menuitem);
-#ifdef USE_PRINTING
-    if (thegame.can_print) {
-        add_menu_separator(GTK_CONTAINER(menu));
-        menuitem = gtk_menu_item_new_with_label("Print...");
-        gtk_container_add(GTK_CONTAINER(menu), menuitem);
-        g_signal_connect(G_OBJECT(menuitem), "activate",
-                         G_CALLBACK(menu_print_event), print_fe);
-        gtk_widget_show(menuitem);
-    }
-#endif
-#ifndef STYLUS_BASED
-    add_menu_separator(GTK_CONTAINER(menu));
-    add_menu_ui_item(fe, GTK_CONTAINER(menu), "Undo", UI_UNDO, 'u', 0);
-    add_menu_ui_item(fe, GTK_CONTAINER(menu), "Redo", UI_REDO, 'r', 0);
-#endif
-    if (thegame.can_format_as_text_ever) {
-        add_menu_separator(GTK_CONTAINER(menu));
-        menuitem = gtk_menu_item_new_with_label("Copy");
-        gtk_container_add(GTK_CONTAINER(menu), menuitem);
-        g_signal_connect(G_OBJECT(menuitem), "activate",
-                         G_CALLBACK(menu_copy_event), fe);
-        gtk_widget_show(menuitem);
-        fe->copy_menu_item = menuitem;
-    } else {
-        fe->copy_menu_item = NULL;
-    }
-    if (thegame.can_solve) {
-        add_menu_separator(GTK_CONTAINER(menu));
-        menuitem = gtk_menu_item_new_with_label("Solve");
-        gtk_container_add(GTK_CONTAINER(menu), menuitem);
-        g_signal_connect(G_OBJECT(menuitem), "activate",
-                         G_CALLBACK(menu_solve_event), fe);
-        gtk_widget_show(menuitem);
-    }
-    add_menu_separator(GTK_CONTAINER(menu));
-    add_menu_ui_item(fe, GTK_CONTAINER(menu), "Exit", UI_QUIT, 'q', 0);
-
-    menuitem = gtk_menu_item_new_with_mnemonic("_Help");
-    gtk_container_add(GTK_CONTAINER(fe->menubar), menuitem);
-    gtk_widget_show(menuitem);
-
-    menu = gtk_menu_new();
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-
-    menuitem = gtk_menu_item_new_with_label("About");
-    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-    g_signal_connect(G_OBJECT(menuitem), "activate",
-                     G_CALLBACK(menu_about_event), fe);
-    gtk_widget_show(menuitem);
-
-#ifdef STYLUS_BASED
-    menuitem=gtk_button_new_with_mnemonic("_Redo");
-    g_object_set_data(G_OBJECT(menuitem), "user-data",
-                      GINT_TO_POINTER(UI_REDO));
-    g_signal_connect(G_OBJECT(menuitem), "clicked",
-                     G_CALLBACK(menu_key_event), fe);
-    gtk_box_pack_end(hbox, menuitem, false, false, 0);
-    gtk_widget_show(menuitem);
-
-    menuitem=gtk_button_new_with_mnemonic("_Undo");
-    g_object_set_data(G_OBJECT(menuitem), "user-data",
-                      GINT_TO_POINTER(UI_UNDO));
-    g_signal_connect(G_OBJECT(menuitem), "clicked",
-                     G_CALLBACK(menu_key_event), fe);
-    gtk_box_pack_end(hbox, menuitem, false, false, 0);
-    gtk_widget_show(menuitem);
-
-    if (thegame.flags & REQUIRE_NUMPAD) {
-        hbox = GTK_BOX(gtk_hbox_new(false, 0));
-        gtk_box_pack_start(vbox, GTK_WIDGET(hbox), false, false, 0);
-        gtk_widget_show(GTK_WIDGET(hbox));
-
-        *((int*)errbuf)=0;
-        errbuf[1]='\0';
-        for(errbuf[0]='0';errbuf[0]<='9';errbuf[0]++) {
-            menuitem=gtk_button_new_with_label(errbuf);
-            g_object_set_data(G_OBJECT(menuitem), "user-data",
-                              GINT_TO_POINTER((int)(errbuf[0])));
-            g_signal_connect(G_OBJECT(menuitem), "clicked",
-                             G_CALLBACK(menu_key_event), fe);
-            gtk_box_pack_start(hbox, menuitem, true, true, 0);
-            gtk_widget_show(menuitem);
-        }
-    }
-#endif /* STYLUS_BASED */
-
-    changed_preset(fe);
-
-    snaffle_colours(fe);
-
-    if (midend_wants_statusbar(fe->me)) {
-        GtkWidget *viewport;
-        GtkRequisition req;
-
-        viewport = gtk_viewport_new(NULL, NULL);
-        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
-        fe->statusbar = gtk_statusbar_new();
-        gtk_container_add(GTK_CONTAINER(viewport), fe->statusbar);
-        gtk_widget_show(viewport);
-        gtk_box_pack_end(vbox, viewport, false, false, 0);
-        gtk_widget_show(fe->statusbar);
-        fe->statusctx = gtk_statusbar_get_context_id
-            (GTK_STATUSBAR(fe->statusbar), "game");
-        gtk_statusbar_push(GTK_STATUSBAR(fe->statusbar), fe->statusctx,
-                           DEFAULT_STATUSBAR_TEXT);
-#if GTK_CHECK_VERSION(3,0,0)
-        gtk_widget_get_preferred_size(fe->statusbar, &req, NULL);
-#else
-        gtk_widget_size_request(fe->statusbar, &req);
-#endif
-        gtk_widget_set_size_request(viewport, -1, req.height);
-    } else
-        fe->statusbar = NULL;
-
-    fe->area = gtk_drawing_area_new();
-#if GTK_CHECK_VERSION(2,0,0) && !GTK_CHECK_VERSION(3,0,0)
-    gtk_widget_set_double_buffered(fe->area, false);
-#endif
-    {
-        GdkGeometry geom;
-        geom.base_width = 0;
-#if GTK_CHECK_VERSION(3,0,0)
-        geom.base_height = window_extra_height(fe);
-        gtk_window_set_geometry_hints(GTK_WINDOW(fe->window), NULL,
-                                      &geom, GDK_HINT_BASE_SIZE);
-#else
-        geom.base_height = 0;
-        gtk_window_set_geometry_hints(GTK_WINDOW(fe->window), fe->area,
-                                      &geom, GDK_HINT_BASE_SIZE);
-#endif
-    }
-    fe->w = -1;
-    fe->h = -1;
-    get_size(fe, &x, &y);
-#if GTK_CHECK_VERSION(3,0,0)
-    gtk_window_set_default_size(GTK_WINDOW(fe->window),
-                                x, y + window_extra_height(fe));
-#else
-    fe->drawing_area_shrink_pending = false;
-    gtk_drawing_area_size(GTK_DRAWING_AREA(fe->area), x, y);
-#endif
-
-    gtk_box_pack_end(vbox, fe->area, true, true, 0);
-
-    clear_backing_store(fe);
-    fe->fonts = NULL;
-    fe->nfonts = fe->fontsize = 0;
-
-    fe->paste_data = NULL;
-    fe->paste_data_len = 0;
-
-    g_signal_connect(G_OBJECT(fe->window), "destroy",
-                     G_CALLBACK(destroy), fe);
-    g_signal_connect(G_OBJECT(fe->window), "key_press_event",
-                     G_CALLBACK(key_event), fe);
-    g_signal_connect(G_OBJECT(fe->area), "button_press_event",
-                     G_CALLBACK(button_event), fe);
-    g_signal_connect(G_OBJECT(fe->area), "button_release_event",
-                     G_CALLBACK(button_event), fe);
-    g_signal_connect(G_OBJECT(fe->area), "motion_notify_event",
-                     G_CALLBACK(motion_event), fe);
-    g_signal_connect(G_OBJECT(fe->area), "selection_get",
-                     G_CALLBACK(selection_get), fe);
-    g_signal_connect(G_OBJECT(fe->area), "selection_clear_event",
-                     G_CALLBACK(selection_clear), fe);
-#if GTK_CHECK_VERSION(3,0,0)
-    g_signal_connect(G_OBJECT(fe->area), "draw",
-                     G_CALLBACK(draw_area), fe);
-#else
-    g_signal_connect(G_OBJECT(fe->area), "expose_event",
-                     G_CALLBACK(expose_area), fe);
-#endif
-    g_signal_connect(G_OBJECT(fe->window), "map_event",
-                     G_CALLBACK(map_window), fe);
-    g_signal_connect(G_OBJECT(fe->area), "configure_event",
-                     G_CALLBACK(configure_area), fe);
-    g_signal_connect(G_OBJECT(fe->window), "configure_event",
-                     G_CALLBACK(configure_window), fe);
-#if GTK_CHECK_VERSION(3,0,0)
-    g_signal_connect(G_OBJECT(fe->window), "size_allocate",
-                     G_CALLBACK(window_size_alloc), fe);
-#endif
-
-    gtk_widget_add_events(GTK_WIDGET(fe->area),
-                          GDK_BUTTON_PRESS_MASK |
-                          GDK_BUTTON_RELEASE_MASK |
-                          GDK_BUTTON_MOTION_MASK |
-                          GDK_POINTER_MOTION_HINT_MASK);
-
-    if (n_xpm_icons) {
-        gtk_window_set_icon(GTK_WINDOW(fe->window),
-                            gdk_pixbuf_new_from_xpm_data
-                            ((const gchar **)xpm_icons[0]));
-
-        iconlist = NULL;
-        for (n = 0; n < n_xpm_icons; n++) {
-            iconlist =
-                g_list_append(iconlist,
-                              gdk_pixbuf_new_from_xpm_data((const gchar **)
-                                                           xpm_icons[n]));
-        }
-        gtk_window_set_icon_list(GTK_WINDOW(fe->window), iconlist);
-    }
-
-    gtk_widget_show(fe->area);
-    gtk_widget_show(fe->window);
-
-#if !GTK_CHECK_VERSION(3,0,0)
-    fe->drawing_area_shrink_pending = true;
-    try_shrink_drawing_area(fe);
-#endif
-
-    set_window_background(fe, 0);
-
-    return fe;
-}
-
-static void list_presets_from_menu(struct preset_menu *menu)
-{
-    int i;
-
-    for (i = 0; i < menu->n_entries; i++) {
-        if (menu->entries[i].params) {
-            char *paramstr = thegame.encode_params(
-                menu->entries[i].params, true);
-            printf("%s %s\n", paramstr, menu->entries[i].title);
-            sfree(paramstr);
-        } else {
-            list_presets_from_menu(menu->entries[i].submenu);
-        }
-    }
-}
-
-int main(int argc, char **argv)
-{
-    char *pname = argv[0];
-    char *error;
-    int ngenerate = 0, px = 1, py = 1;
-    bool print = false;
-    bool time_generation = false, test_solve = false, list_presets = false;
-    bool soln = false, colour = false;
-    float scale = 1.0F;
-    float redo_proportion = 0.0F;
-    const char *savefile = NULL, *savesuffix = NULL;
-    char *arg = NULL;
-    int argtype = ARG_EITHER;
-    char *screenshot_file = NULL;
-    bool doing_opts = true;
-    int ac = argc;
-    char **av = argv;
-    char errbuf[500];
-
-    /*
-     * Command line parsing in this function is rather fiddly,
-     * because GTK wants to have a go at argc/argv _first_ - and
-     * yet we can't let it, because gtk_init() will bomb out if it
-     * can't open an X display, whereas in fact we want to permit
-     * our --generate and --print modes to run without an X
-     * display.
-     * 
-     * So what we do is:
-     *  - we parse the command line ourselves, without modifying
-     *    argc/argv
-     *  - if we encounter an error which might plausibly be the
-     *    result of a GTK command line (i.e. not detailed errors in
-     *    particular options of ours) we store the error message
-     *    and terminate parsing.
-     *  - if we got enough out of the command line to know it
-     *    specifies a non-X mode of operation, we either display
-     *    the stored error and return failure, or if there is no
-     *    stored error we do the non-X operation and return
-     *    success.
-     *  - otherwise, we go straight to gtk_init().
-     */
-
-    errbuf[0] = '\0';
-    while (--ac > 0) {
-        char *p = *++av;
-        if (doing_opts && !strcmp(p, "--version")) {
-            printf("%s, from Simon Tatham's Portable Puzzle Collection\n%s\n",
-                   thegame.name, ver);
-            return 0;
-        } else if (doing_opts && !strcmp(p, "--generate")) {
-            if (--ac > 0) {
-                ngenerate = atoi(*++av);
-                if (!ngenerate) {
-                    fprintf(stderr, "%s: '--generate' expected a number\n",
-                            pname);
-                    return 1;
-                }
-            } else
-                ngenerate = 1;
-        } else if (doing_opts && !strcmp(p, "--time-generation")) {
-            time_generation = true;
-        } else if (doing_opts && !strcmp(p, "--test-solve")) {
-            test_solve = true;
-        } else if (doing_opts && !strcmp(p, "--list-presets")) {
-            list_presets = true;
-        } else if (doing_opts && !strcmp(p, "--save")) {
-            if (--ac > 0) {
-                savefile = *++av;
-            } else {
-                fprintf(stderr, "%s: '--save' expected a filename\n",
-                        pname);
-                return 1;
-            }
-        } else if (doing_opts && (!strcmp(p, "--save-suffix") ||
-                                  !strcmp(p, "--savesuffix"))) {
-            if (--ac > 0) {
-                savesuffix = *++av;
-            } else {
-                fprintf(stderr, "%s: '--save-suffix' expected a filename\n",
-                        pname);
-                return 1;
-            }
-        } else if (doing_opts && !strcmp(p, "--print")) {
-            if (!thegame.can_print) {
-                fprintf(stderr, "%s: this game does not support printing\n",
-                        pname);
-                return 1;
-            }
-            print = true;
-            if (--ac > 0) {
-                char *dim = *++av;
-                if (sscanf(dim, "%dx%d", &px, &py) != 2) {
-                    fprintf(stderr, "%s: unable to parse argument '%s' to "
-                            "'--print'\n", pname, dim);
-                    return 1;
-                }
-            } else {
-                px = py = 1;
-            }
-        } else if (doing_opts && !strcmp(p, "--scale")) {
-            if (--ac > 0) {
-                scale = atof(*++av);
-            } else {
-                fprintf(stderr, "%s: no argument supplied to '--scale'\n",
-                        pname);
-                return 1;
-            }
-        } else if (doing_opts && !strcmp(p, "--redo")) {
-            /*
-             * This is an internal option which I don't expect
-             * users to have any particular use for. The effect of
-             * --redo is that once the game has been loaded and
-             * initialised, the next move in the redo chain is
-             * replayed, and the game screen is redrawn part way
-             * through the making of the move. This is only
-             * meaningful if there _is_ a next move in the redo
-             * chain, which means in turn that this option is only
-             * useful if you're also passing a save file on the
-             * command line.
-             *
-             * This option is used by the script which generates
-             * the puzzle icons and website screenshots, and I
-             * don't imagine it's useful for anything else.
-             * (Unless, I suppose, users don't like my screenshots
-             * and want to generate their own in the same way for
-             * some repackaged version of the puzzles.)
-             */
-            if (--ac > 0) {
-                redo_proportion = atof(*++av);
-            } else {
-                fprintf(stderr, "%s: no argument supplied to '--redo'\n",
-                        pname);
-                return 1;
-            }
-        } else if (doing_opts && !strcmp(p, "--screenshot")) {
-            /*
-             * Another internal option for the icon building
-             * script. This causes a screenshot of the central
-             * drawing area (i.e. not including the menu bar or
-             * status bar) to be saved to a PNG file once the
-             * window has been drawn, and then the application
-             * quits immediately.
-             */
-            if (--ac > 0) {
-                screenshot_file = *++av;
-            } else {
-                fprintf(stderr, "%s: no argument supplied to '--screenshot'\n",
-                        pname);
-                return 1;
-            }
-        } else if (doing_opts && (!strcmp(p, "--with-solutions") ||
-                                  !strcmp(p, "--with-solution") ||
-                                  !strcmp(p, "--with-solns") ||
-                                  !strcmp(p, "--with-soln") ||
-                                  !strcmp(p, "--solutions") ||
-                                  !strcmp(p, "--solution") ||
-                                  !strcmp(p, "--solns") ||
-                                  !strcmp(p, "--soln"))) {
-            soln = true;
-        } else if (doing_opts && !strcmp(p, "--colour")) {
-            if (!thegame.can_print_in_colour) {
-                fprintf(stderr, "%s: this game does not support colour"
-                        " printing\n", pname);
-                return 1;
-            }
-            colour = true;
-        } else if (doing_opts && !strcmp(p, "--load")) {
-            argtype = ARG_SAVE;
-        } else if (doing_opts && !strcmp(p, "--game")) {
-            argtype = ARG_ID;
-        } else if (doing_opts && !strcmp(p, "--")) {
-            doing_opts = false;
-        } else if (!doing_opts || p[0] != '-') {
-            if (arg) {
-                fprintf(stderr, "%s: more than one argument supplied\n",
-                        pname);
-                return 1;
-            }
-            arg = p;
-        } else {
-            sprintf(errbuf, "%.100s: unrecognised option '%.100s'\n",
-                    pname, p);
-            break;
-        }
-    }
-
-    /*
-     * Special standalone mode for generating puzzle IDs on the
-     * command line. Useful for generating puzzles to be printed
-     * out and solved offline (for puzzles where that even makes
-     * sense - Solo, for example, is a lot more pencil-and-paper
-     * friendly than Twiddle!)
-     * 
-     * Usage:
-     * 
-     *   <puzzle-name> --generate [<n> [<params>]]
-     * 
-     * <n>, if present, is the number of puzzle IDs to generate.
-     * <params>, if present, is the same type of parameter string
-     * you would pass to the puzzle when running it in GUI mode,
-     * including optional extras such as the expansion factor in
-     * Rectangles and the difficulty level in Solo.
-     * 
-     * If you specify <params>, you must also specify <n> (although
-     * you may specify it to be 1). Sorry; that was the
-     * simplest-to-parse command-line syntax I came up with.
-     */
-    if (ngenerate > 0 || print || savefile || savesuffix) {
-        int i, n = 1;
-        midend *me;
-        char *id;
-        document *doc = NULL;
-
-        /*
-         * If we're in this branch, we should display any pending
-         * error message from the command line, since GTK isn't going
-         * to take another crack at making sense of it.
-         */
-        if (*errbuf) {
-            fputs(errbuf, stderr);
-            return 1;
-        }
-
-        n = ngenerate;
-
-        me = midend_new(NULL, &thegame, NULL, NULL);
-        i = 0;
-
-        if (savefile && !savesuffix)
-            savesuffix = "";
-        if (!savefile && savesuffix)
-            savefile = "";
-
-        if (print)
-            doc = document_new(px, py, scale);
-
-        /*
-         * In this loop, we either generate a game ID or read one
-         * from stdin depending on whether we're in generate mode;
-         * then we either write it to stdout or print it, depending
-         * on whether we're in print mode. Thus, this loop handles
-         * generate-to-stdout, print-from-stdin and generate-and-
-         * immediately-print modes.
-         * 
-         * (It could also handle a copy-stdin-to-stdout mode,
-         * although there's currently no combination of options
-         * which will cause this loop to be activated in that mode.
-         * It wouldn't be _entirely_ pointless, though, because
-         * stdin could contain bare params strings or random-seed
-         * IDs, and stdout would contain nothing but fully
-         * generated descriptive game IDs.)
-         */
-        while (ngenerate == 0 || i < n) {
-            char *pstr, *seed;
-            const char *err;
-            struct rusage before, after;
-
-            if (ngenerate == 0) {
-                pstr = fgetline(stdin);
-                if (!pstr)
-                    break;
-                pstr[strcspn(pstr, "\r\n")] = '\0';
-            } else {
-                if (arg) {
-                    pstr = snewn(strlen(arg) + 40, char);
-
-                    strcpy(pstr, arg);
-                    if (i > 0 && strchr(arg, '#'))
-                        sprintf(pstr + strlen(pstr), "-%d", i);
-                } else
-                    pstr = NULL;
-            }
-
-            if (pstr) {
-                err = midend_game_id(me, pstr);
-                if (err) {
-                    fprintf(stderr, "%s: error parsing '%s': %s\n",
-                            pname, pstr, err);
-                    return 1;
-                }
-            }
-
-            if (time_generation)
-                getrusage(RUSAGE_SELF, &before);
-
-            midend_new_game(me);
-
-            seed = midend_get_random_seed(me);
-
-            if (time_generation) {
-                double elapsed;
-
-                getrusage(RUSAGE_SELF, &after);
-
-                elapsed = (after.ru_utime.tv_sec -
-                           before.ru_utime.tv_sec);
-                elapsed += (after.ru_utime.tv_usec -
-                            before.ru_utime.tv_usec) / 1000000.0;
-
-                printf("%s %s: %.6f\n", thegame.name, seed, elapsed);
-            }
-
-            if (test_solve && thegame.can_solve) {
-                /*
-                 * Now destroy the aux_info in the midend, by means of
-                 * re-entering the same game id, and then try to solve
-                 * it.
-                 */
-                char *game_id;
-
-                game_id = midend_get_game_id(me);
-                err = midend_game_id(me, game_id);
-                if (err) {
-                    fprintf(stderr, "%s %s: game id re-entry error: %s\n",
-                            thegame.name, seed, err);
-                    return 1;
-                }
-                midend_new_game(me);
-                sfree(game_id);
-
-                err = midend_solve(me);
-                /*
-                 * If the solve operation returned the error "Solution
-                 * not known for this puzzle", that's OK, because that
-                 * just means it's a puzzle for which we don't have an
-                 * algorithmic solver and hence can't solve it without
-                 * the aux_info, e.g. Netslide. Any other error is a
-                 * problem, though.
-                 */
-                if (err && strcmp(err, "Solution not known for this puzzle")) {
-                    fprintf(stderr, "%s %s: solve error: %s\n",
-                            thegame.name, seed, err);
-                    return 1;
-                }
-            }
-
-            sfree(pstr);
-            sfree(seed);
-
-            if (doc) {
-                err = midend_print_puzzle(me, doc, soln);
-                if (err) {
-                    fprintf(stderr, "%s: error in printing: %s\n", pname, err);
-                    return 1;
-                }
-            }
-            if (savefile) {
-                struct savefile_write_ctx ctx;
-                char *realname = snewn(40 + strlen(savefile) +
-                                       strlen(savesuffix), char);
-                sprintf(realname, "%s%d%s", savefile, i, savesuffix);
-
-                if (soln) {
-                    const char *err = midend_solve(me);
-                    if (err) {
-                        fprintf(stderr, "%s: unable to show solution: %s\n",
-                                realname, err);
-                        return 1;
-                    }
-                }
-
-                ctx.fp = fopen(realname, "w");
-                if (!ctx.fp) {
-                    fprintf(stderr, "%s: open: %s\n", realname,
-                            strerror(errno));
-                    return 1;
-                }
-                ctx.error = 0;
-                midend_serialise(me, savefile_write, &ctx);
-                if (ctx.error) {
-                    fprintf(stderr, "%s: write: %s\n", realname,
-                            strerror(ctx.error));
-                    return 1;
-                }
-                if (fclose(ctx.fp)) {
-                    fprintf(stderr, "%s: close: %s\n", realname,
-                            strerror(errno));
-                    return 1;
-                }
-                sfree(realname);
-            }
-            if (!doc && !savefile && !time_generation) {
-                id = midend_get_game_id(me);
-                puts(id);
-                sfree(id);
-            }
-
-            i++;
-        }
-
-        if (doc) {
-            psdata *ps = ps_init(stdout, colour);
-            document_print(doc, ps_drawing_api(ps));
-            document_free(doc);
-            ps_free(ps);
-        }
-
-        midend_free(me);
-
-        return 0;
-    } else if (list_presets) {
-        /*
-         * Another specialist mode which causes the puzzle to list the
-         * game_params strings for all its preset configurations.
-         */
-        midend *me;
-        struct preset_menu *menu;
-
-        me = midend_new(NULL, &thegame, NULL, NULL);
-        menu = midend_get_presets(me, NULL);
-        list_presets_from_menu(menu);
-        midend_free(me);
-        return 0;
-    } else {
-        frontend *fe;
-        bool headless = screenshot_file != NULL;
-
-        if (!headless)
-            gtk_init(&argc, &argv);
-
-        fe = new_window(arg, argtype, &error, headless);
-
-        if (!fe) {
-            fprintf(stderr, "%s: %s\n", pname, error);
-            return 1;
-        }
-
-        if (screenshot_file) {
-            /*
-             * Some puzzles will not redraw their entire area if
-             * given a partially completed animation, which means
-             * we must redraw now and _then_ redraw again after
-             * freezing the move timer.
-             */
-            midend_force_redraw(fe->me);
-        }
-
-        if (redo_proportion) {
-            /* Start a redo. */
-            midend_process_key(fe->me, 0, 0, 'r');
-            /* And freeze the timer at the specified position. */
-            midend_freeze_timer(fe->me, redo_proportion);
-        }
-
-        if (screenshot_file) {
-            save_screenshot_png(fe, screenshot_file);
-            exit(0);
-        }
-
-        gtk_main();
-    }
-
-    return 0;
-}
diff --git a/apps/plugins/puzzles/src/gtk.h b/apps/plugins/puzzles/src/gtk.h
new file mode 100644
index 0000000000..a039f0dc36
--- /dev/null
+++ b/apps/plugins/puzzles/src/gtk.h
@@ -0,0 +1,7 @@
+#ifndef PUZZLES_GTK_H
+#define PUZZLES_GTK_H
+
+extern const char *const *const xpm_icons[];
+extern const int n_xpm_icons;
+
+#endif /* PUZZLES_GTK_H */
diff --git a/apps/plugins/puzzles/src/guess.R b/apps/plugins/puzzles/src/guess.R
deleted file mode 100644
index 0e1a00c073..0000000000
--- a/apps/plugins/puzzles/src/guess.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-guess    : [X] GTK COMMON guess guess-icon|no-icon
-
-guess    : [G] WINDOWS COMMON guess guess.res|noicon.res
-
-ALL += guess[COMBINED]
-
-!begin am gtk
-GAMES += guess
-!end
-
-!begin >list.c
-    A(guess) \
-!end
-
-!begin >gamedesc.txt
-guess:guess.exe:Guess:Combination-guessing puzzle:Guess the hidden combination of colours.
-!end
diff --git a/apps/plugins/puzzles/src/guess.c b/apps/plugins/puzzles/src/guess.c
index a501579442..5c5f941230 100644
--- a/apps/plugins/puzzles/src/guess.c
+++ b/apps/plugins/puzzles/src/guess.c
@@ -7,7 +7,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -35,6 +39,11 @@ typedef struct pegrow {
     int *pegs;          /* 0 is 'empty' */
     int *feedback;      /* may well be unused */
 } *pegrow;
+/* Pegs can have these flags OR'ed into them. */
+#define PEG_CURSOR   0x1000
+#define PEG_HOLD     0x2000
+#define PEG_LABELLED 0x4000
+#define PEG_FLAGS    (PEG_CURSOR | PEG_HOLD | PEG_LABELLED)
 
 struct game_state {
     game_params params;
@@ -88,13 +97,7 @@ static bool game_fetch_preset(int i, char **name, game_params **params)
         return false;
 
     *name = dupstr(guess_presets[i].name);
-    /*
-     * get round annoying const issues
-     */
-    {
-        game_params tmp = guess_presets[i].params;
-        *params = dup_params(&tmp);
-    }
+    *params = dup_params(&guess_presets[i].params);
 
     return true;
 }
@@ -365,16 +368,6 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     return dupstr("S");
 }
 
-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 bool is_markable(const game_params *params, pegrow pegs)
 {
     int i, nset = 0, nrequired;
@@ -386,6 +379,7 @@ static bool is_markable(const game_params *params, pegrow pegs)
     for (i = 0; i < params->npegs; i++) {
         int c = pegs->pegs[i];
         if (c > 0) {
+            assert(c <= params->ncolours);
             colcount->pegs[c-1]++;
             nset++;
         }
@@ -414,7 +408,7 @@ struct game_ui {
     int drag_col, drag_x, drag_y; /* x and y are *center* of peg! */
     int drag_opeg; /* peg index, if dragged from a peg (from current guess), otherwise -1 */
 
-    bool show_labels;                   /* label the colours with letters */
+    bool show_labels;                   /* label the colours with numbers */
     pegrow hint;
 };
 
@@ -422,19 +416,45 @@ static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     memset(ui, 0, sizeof(game_ui));
-    ui->params = state->params;        /* structure copy */
-    ui->curr_pegs = new_pegrow(state->params.npegs);
-    ui->holds = snewn(state->params.npegs, bool);
-    memset(ui->holds, 0, sizeof(bool)*state->params.npegs);
+    if (state != NULL) {
+        ui->params = state->params;        /* structure copy */
+        ui->curr_pegs = new_pegrow(state->params.npegs);
+        ui->holds = snewn(state->params.npegs, bool);
+        memset(ui->holds, 0, sizeof(bool)*state->params.npegs);
+    }
+    ui->display_cur = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->drag_opeg = -1;
     return ui;
 }
 
+static config_item *get_prefs(game_ui *ui)
+{
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Label colours with numbers";
+    ret[0].kw = "show-labels";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->show_labels;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
+}
+
+static void set_prefs(game_ui *ui, const config_item *cfg)
+{
+    ui->show_labels = cfg[0].u.boolean.bval;
+}
+
 static void free_ui(game_ui *ui)
 {
     if (ui->hint)
         free_pegrow(ui->hint);
-    free_pegrow(ui->curr_pegs);
+    if (ui->curr_pegs)
+        free_pegrow(ui->curr_pegs);
     sfree(ui->holds);
     sfree(ui);
 }
@@ -462,12 +482,16 @@ static char *encode_ui(const game_ui *ui)
     return sresize(ret, p - ret, char);
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void decode_ui(game_ui *ui, const char *encoding,
+                      const game_state *state)
 {
     int i;
     const char *p = encoding;
     for (i = 0; i < ui->curr_pegs->npegs; i++) {
         ui->curr_pegs->pegs[i] = atoi(p);
+        if (ui->curr_pegs->pegs[i] < 0 ||
+            ui->curr_pegs->pegs[i] > ui->params.ncolours)
+            ui->curr_pegs->pegs[i] = 0; /* Remove invalid pegs. */
         while (*p && isdigit((unsigned char)*p)) p++;
         if (*p == '_') {
             /* NB: old versions didn't store holds */
@@ -507,7 +531,20 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     ui->markable = is_markable(&newstate->params, ui->curr_pegs);
     /* Clean up cursor position */
     if (!ui->markable && ui->peg_cur == newstate->solution->npegs)
-        ui->peg_cur--;
+        ui->peg_cur = 0;
+}
+
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (state->solved) return "";
+    if (button == CURSOR_SELECT) {
+        if (ui->peg_cur == state->params.npegs) return "Submit";
+        return "Place";
+    }
+    if (button == CURSOR_SELECT2 && ui->peg_cur != state->params.npegs)
+        return "Hold";
+    return "";
 }
 
 #define PEGSZ   (ds->pegsz)
@@ -700,7 +737,11 @@ static void compute_hint(const game_state *state, game_ui *ui)
         for (j = 0; j < state->params.npegs; ++j)
             if (state->guesses[i]->pegs[j] > maxcolour)
                 maxcolour = state->guesses[i]->pegs[j];
-    maxcolour = min(maxcolour + 1, state->params.ncolours);
+    if (state->params.allow_multiple)
+        maxcolour = min(maxcolour + 1, state->params.ncolours);
+    else
+        maxcolour = min(maxcolour + state->params.npegs,
+                        state->params.ncolours);
 
 increase_mincolour:
     for (i = 0; i < state->next_go; ++i) {
@@ -722,6 +763,7 @@ increase_mincolour:
     }
 
     while (ui->hint->pegs[0] <= state->params.ncolours) {
+        if (!is_markable(&state->params, ui->hint)) goto increment_pegrow;
         for (i = 0; i < state->next_go; ++i) {
             mark_pegs(ui->hint, state->guesses[i], maxcolour);
             for (j = 0; j < state->params.npegs; ++j)
@@ -777,7 +819,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
      */
     if (button == 'l' || button == 'L') {
         ui->show_labels = !ui->show_labels;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (from->solved) return NULL;
@@ -834,13 +876,13 @@ static char *interpret_move(const game_state *from, game_ui *ui,
             ui->drag_y = y;
             debug(("Start dragging, col = %d, (%d,%d)",
                    ui->drag_col, ui->drag_x, ui->drag_y));
-            ret = UI_UPDATE;
+            ret = MOVE_UI_UPDATE;
         }
     } else if (button == LEFT_DRAG && ui->drag_col) {
         ui->drag_x = x;
         ui->drag_y = y;
         debug(("Keep dragging, (%d,%d)", ui->drag_x, ui->drag_y));
-        ret = UI_UPDATE;
+        ret = MOVE_UI_UPDATE;
     } else if (button == LEFT_RELEASE && ui->drag_col) {
         if (over_guess > -1) {
             debug(("Dropping colour %d onto guess peg %d",
@@ -857,13 +899,13 @@ static char *interpret_move(const game_state *from, game_ui *ui,
         ui->drag_opeg = -1;
         ui->display_cur = false;
         debug(("Stop dragging."));
-        ret = UI_UPDATE;
+        ret = MOVE_UI_UPDATE;
     } else if (button == RIGHT_BUTTON) {
         if (over_guess > -1) {
             /* we use ths feedback in the game_ui to signify
              * 'carry this peg to the next guess as well'. */
             ui->holds[over_guess] ^= 1;
-            ret = UI_UPDATE;
+            ret = MOVE_UI_UPDATE;
         }
     } else if (button == LEFT_RELEASE && over_hint && ui->markable) {
         /* NB this won't trigger if on the end of a drag; that's on
@@ -872,44 +914,47 @@ static char *interpret_move(const game_state *from, game_ui *ui,
     }
 
     /* keyboard input */
-    if (button == CURSOR_UP || button == CURSOR_DOWN) {
-        ui->display_cur = true;
-        if (button == CURSOR_DOWN && (ui->colour_cur+1) < from->params.ncolours)
-            ui->colour_cur++;
-        if (button == CURSOR_UP && ui->colour_cur > 0)
-            ui->colour_cur--;
-        ret = UI_UPDATE;
-    } else if (button == 'h' || button == 'H' || button == '?') {
-        compute_hint(from, ui);
-        ret = UI_UPDATE;
-    } else if (button == CURSOR_LEFT || button == CURSOR_RIGHT) {
+    if (IS_CURSOR_MOVE(button)) {
         int maxcur = from->params.npegs;
         if (ui->markable) maxcur++;
 
-        ui->display_cur = true;
-        if (button == CURSOR_RIGHT && (ui->peg_cur+1) < maxcur)
-            ui->peg_cur++;
-        if (button == CURSOR_LEFT && ui->peg_cur > 0)
-            ui->peg_cur--;
-        ret = UI_UPDATE;
-    } else if (IS_CURSOR_SELECT(button)) {
+        ret = move_cursor(button, &ui->peg_cur, &ui->colour_cur,
+                          maxcur, from->params.ncolours,
+                          false, &ui->display_cur);
+    } else if (button == 'h' || button == 'H' || button == '?') {
+        compute_hint(from, ui);
+        ret = MOVE_UI_UPDATE;
+    } else if (button == CURSOR_SELECT) {
         ui->display_cur = true;
         if (ui->peg_cur == from->params.npegs) {
             ret = encode_move(from, ui);
         } else {
             set_peg(&from->params, ui, ui->peg_cur, ui->colour_cur+1);
-            ret = UI_UPDATE;
+            ret = MOVE_UI_UPDATE;
         }
-    } else if (button == 'D' || button == 'd' || button == '\b') {
+    } else if (((button >= '1' && button <= '0' + from->params.ncolours) ||
+                (button == '0' && from->params.ncolours == 10)) &&
+               ui->peg_cur < from->params.npegs) {
         ui->display_cur = true;
-        set_peg(&from->params, ui, ui->peg_cur, 0);
-        ret = UI_UPDATE;
+        /* Number keys insert a peg and advance the cursor. */
+        set_peg(&from->params, ui, ui->peg_cur,
+                button == '0' ? 10 : button - '0');
+        if (ui->peg_cur + 1 < from->params.npegs + ui->markable)
+            ui->peg_cur++;
+        ret = MOVE_UI_UPDATE;
+    } else if (button == 'D' || button == 'd' || button == '\b') {
+        if (!ui->display_cur || ui->curr_pegs->pegs[ui->peg_cur] != 0) {
+            ui->display_cur = true;
+            set_peg(&from->params, ui, ui->peg_cur, 0);
+            ret = MOVE_UI_UPDATE;
+        } else
+            ret = MOVE_NO_EFFECT;
     } else if (button == CURSOR_SELECT2) {
         if (ui->peg_cur == from->params.npegs)
             return NULL;
         ui->display_cur = true;
         ui->holds[ui->peg_cur] ^= 1;
-        ret = UI_UPDATE;
+        ret = MOVE_UI_UPDATE;
     }
     return ret;
 }
@@ -925,6 +970,8 @@ static game_state *execute_move(const game_state *from, const char *move)
         ret->solved = -1;
         return ret;
     } else if (move[0] == 'G') {
+        /* No guesses are allowed once the game is solved. */
+        if (from->solved) return NULL;
         p = move+1;
 
         ret = dup_game(from);
@@ -975,7 +1022,7 @@ static game_state *execute_move(const game_state *from, const char *move)
 #define BORDER    0.5
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     double hmul, vmul_c, vmul_g, vmul;
     int hintw = (params->npegs+1)/2;
@@ -1019,7 +1066,8 @@ static void game_set_size(drawing *dr, game_drawstate *ds,
     guessh = ((ds->pegsz + ds->gapsz) * params->nguesses);      /* guesses */
     guessh += ds->gapsz + ds->pegsz;                            /* solution */
 
-    game_compute_size(params, tilesize, &ds->w, &ds->h);
+    /* We know we don't need anything from the game_ui we haven't got */
+    game_compute_size(params, tilesize, NULL, &ds->w, &ds->h);
     ds->colx = ds->border;
     ds->coly = (ds->h - colh) / 2;
 
@@ -1196,7 +1244,7 @@ static void draw_peg(drawing *dr, game_drawstate *ds, int cx, int cy,
 
     if (labelled && col) {
         char buf[2];
-        buf[0] = 'a'-1 + col;
+        buf[0] = '0' + (col % 10);
         buf[1] = '\0';
         draw_text(dr, cx+PEGRAD, cy+PEGRAD, FONT_VARIABLE, PEGRAD,
                   ALIGN_HCENTRE|ALIGN_VCENTRE, COL_FRAME, buf);
@@ -1233,23 +1281,25 @@ static void guess_redraw(drawing *dr, game_drawstate *ds, int guess,
     for (i = 0; i < dest->npegs; i++) {
         scol = src ? src->pegs[i] : 0;
         if (i == cur_col)
-            scol |= 0x1000;
+            scol |= PEG_CURSOR;
         if (holds && holds[i])
-            scol |= 0x2000;
+            scol |= PEG_HOLD;
         if (labelled)
-            scol |= 0x4000;
+            scol |= PEG_LABELLED;
         if ((dest->pegs[i] != scol) || force) {
             draw_peg(dr, ds, rowx + PEGOFF * i, rowy, false, labelled,
-                     scol &~ 0x7000);
+                     scol &~ PEG_FLAGS);
+            if (scol & PEG_CURSOR)
+                draw_cursor(dr, ds, rowx + PEGOFF * i, rowy);
             /*
              * Hold marker.
              */
-            draw_rect(dr, rowx + PEGOFF * i, rowy + PEGSZ + ds->gapsz/2,
-                      PEGSZ, 2, (scol & 0x2000 ? COL_HOLD : COL_BACKGROUND));
-            draw_update(dr, rowx + PEGOFF * i, rowy + PEGSZ + ds->gapsz/2,
-                        PEGSZ, 2);
-            if (scol & 0x1000)
-                draw_cursor(dr, ds, rowx + PEGOFF * i, rowy);
+            if (scol & PEG_HOLD) {
+                draw_rect(dr, rowx + PEGOFF * i,
+                          rowy + PEGSZ + ds->gapsz/2 - 2, PEGSZ, 2, COL_HOLD);
+            }
+            draw_update(dr, rowx + PEGOFF * i,
+                        rowy + PEGSZ + ds->gapsz/2 - 2, PEGSZ, 2);
         }
         dest->pegs[i] = scol;
     }
@@ -1276,9 +1326,9 @@ static void hint_redraw(drawing *dr, game_drawstate *ds, int guess,
     for (i = 0; i < dest->npegs; i++) {
         scol = src ? src->feedback[i] : 0;
         if (i == 0 && cursor)
-            scol |= 0x1000;
+            scol |= PEG_CURSOR;
         if (i == 0 && markable)
-            scol |= 0x2000;
+            scol |= PEG_HOLD;
         if ((scol != dest->feedback[i]) || force) {
             need_redraw = true;
         }
@@ -1349,7 +1399,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     new_move = (state->next_go != ds->next_go) || !ds->started;
 
     if (!ds->started) {
-      draw_rect(dr, 0, 0, ds->w, ds->h, COL_BACKGROUND);
       draw_rect(dr, SOLN_OX, SOLN_OY - ds->gapsz - 1, SOLN_W, 2, COL_FRAME);
       draw_update(dr, 0, 0, ds->w, ds->h);
     }
@@ -1364,19 +1413,18 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     for (i = 0; i < state->params.ncolours; i++) {
         int val = i+1;
         if (ui->display_cur && ui->colour_cur == i)
-            val |= 0x1000;
+            val |= PEG_CURSOR;
         if (ui->show_labels)
-            val |= 0x2000;
+            val |= PEG_HOLD;
         if (ds->colours->pegs[i] != val) {
             draw_peg(dr, ds, COL_X(i), COL_Y(i), false, ui->show_labels, i+1);
-            if (val & 0x1000)
+            if (val & PEG_CURSOR)
                 draw_cursor(dr, ds, COL_X(i), COL_Y(i));
             ds->colours->pegs[i] = val;
         }
     }
 
-    /* draw the guesses (so far) and the hints
-     * (in reverse order to avoid trampling holds, and postponing the
+    /* draw the guesses (so far) and the hints (postponing the
      * next_go'th to not overrender the top of the circular cursor) */
     for (i = state->params.nguesses - 1; i >= 0; i--) {
         if (i < state->next_go || state->solved) {
@@ -1473,19 +1521,6 @@ static int game_status(const game_state *state)
     return state->solved;
 }
 
-static bool game_timing_state(const game_state *state, game_ui *ui)
-{
-    return true;
-}
-
-static void game_print_size(const game_params *params, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame guess
 #endif
@@ -1506,13 +1541,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
     encode_ui,
     decode_ui,
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PEG_PREFER_SZ, game_compute_size, game_set_size,
@@ -1524,9 +1561,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/hat-internal.h b/apps/plugins/puzzles/src/hat-internal.h
new file mode 100644
index 0000000000..2be96327a8
--- /dev/null
+++ b/apps/plugins/puzzles/src/hat-internal.h
@@ -0,0 +1,271 @@
+/*
+ * Internal definitions for the hat.c tiling generator, shared between
+ * hat.c itself and hat-test.c.
+ */
+
+#include "puzzles.h"
+
+/*
+ * Coordinate system:
+ *
+ * The output of this code lives on the tiling known to grid.c as
+ * 'Kites', which can be viewed as a tiling of hexagons each of which
+ * is subdivided into six kites sharing their pointy vertex, or
+ * (equivalently) a tiling of equilateral triangles each subdivided
+ * into three kits sharing their blunt vertex.
+ *
+ * We express coordinates in this system relative to the basis (1, r)
+ * where r = (1 + sqrt(3)i) / 2 is a primitive 6th root of unity. This
+ * gives us a system in which two integer coordinates can address any
+ * grid point, provided we scale up so that the side length of the
+ * equilateral triangles in the tiling is 6.
+ */
+
+typedef struct Point {
+    int x, y;                          /* represents x + yr */
+} Point;
+
+static inline Point pointscale(int scale, Point a)
+{
+    Point r = { scale * a.x, scale * a.y };
+    return r;
+}
+
+static inline Point pointadd(Point a, Point b)
+{
+    Point r = { a.x + b.x, a.y + b.y };
+    return r;
+}
+
+/*
+ * We identify a single kite by the coordinates of its four vertices.
+ * This allows us to construct the coordinates of an adjacent kite by
+ * taking affine transformations of the original kite's vertices.
+ *
+ * This is a useful way to do it because it means that if you reflect
+ * the kite (by swapping its left and right vertices) then these
+ * transformations also perform in a reflected way. This will be
+ * useful in the code below that outputs the coordinates of each hat,
+ * because this way it can work by walking around its 8 kites using a
+ * fixed set of steps, and if the hat is reflected, then we just
+ * reflect the starting kite before doing that, and everything still
+ * works.
+ */
+
+typedef struct Kite {
+    Point centre, left, right, outer;
+} Kite;
+
+static inline Kite kite_left(Kite k)
+{
+    Kite r;
+    r.centre = k.centre;
+    r.right = k.left;
+    r.outer = pointadd(pointscale(2, k.left), pointscale(-1, k.outer));
+    r.left = pointadd(pointadd(k.centre, k.left), pointscale(-1, k.right));
+    return r;
+}
+
+static inline Kite kite_right(Kite k)
+{
+    Kite r;
+    r.centre = k.centre;
+    r.left = k.right;
+    r.outer = pointadd(pointscale(2, k.right), pointscale(-1, k.outer));
+    r.right = pointadd(pointadd(k.centre, k.right), pointscale(-1, k.left));
+    return r;
+}
+
+static inline Kite kite_forward_left(Kite k)
+{
+    Kite r;
+    r.outer = k.outer;
+    r.right = k.left;
+    r.centre = pointadd(pointscale(2, k.left), pointscale(-1, k.centre));
+    r.left = pointadd(pointadd(k.right, k.left), pointscale(-1, k.centre));
+    return r;
+}
+
+static inline Kite kite_forward_right(Kite k)
+{
+    Kite r;
+    r.outer = k.outer;
+    r.left = k.right;
+    r.centre = pointadd(pointscale(2, k.right), pointscale(-1, k.centre));
+    r.right = pointadd(pointadd(k.left, k.right), pointscale(-1, k.centre));
+    return r;
+}
+
+typedef enum KiteStep { KS_LEFT, KS_RIGHT, KS_F_LEFT, KS_F_RIGHT } KiteStep;
+
+static inline Kite kite_step(Kite k, KiteStep step)
+{
+    switch (step) {
+      case KS_LEFT: return kite_left(k);
+      case KS_RIGHT: return kite_right(k);
+      case KS_F_LEFT: return kite_forward_left(k);
+      default /* case KS_F_RIGHT */: return kite_forward_right(k);
+    }
+}
+
+/*
+ * Functiond to enumerate the kites in a rectangular region, in a
+ * serpentine-raster fashion so that every kite delivered shares an
+ * edge with a recent previous one.
+ */
+#define KE_NKEEP 3
+typedef struct KiteEnum {
+    /* Fields private to the enumerator */
+    int state;
+    int x, y, w, h;
+    unsigned curr_index;
+
+    /* Fields the client can legitimately read out */
+    Kite *curr;
+    Kite recent[KE_NKEEP];
+    unsigned last_index;
+    KiteStep last_step; /* step that got curr from recent[last_index] */
+} KiteEnum;
+void hat_kiteenum_first(KiteEnum *s, int w, int h);
+bool hat_kiteenum_next(KiteEnum *s);
+
+/*
+ * Assorted useful definitions.
+ */
+typedef enum TileType { TT_H, TT_T, TT_P, TT_F, TT_KITE, TT_HAT } TileType;
+static const char tilechars[] = "HTPF";
+
+#define HAT_KITES 8     /* number of kites in a hat */
+#define MT_MAXEXPAND 13 /* largest number of metatiles in any expansion */
+
+/*
+ * Definitions for the autogenerated hat-tables.h header file that
+ * defines all the lookup tables.
+ */
+typedef struct KitemapEntry {
+    int kite, hat, meta;               /* all -1 if impossible */
+} KitemapEntry;
+
+typedef struct MetamapEntry {
+    int meta, meta2;
+} MetamapEntry;
+
+static inline size_t kitemap_index(KiteStep step, unsigned kite,
+                                   unsigned hat, unsigned meta)
+{
+    return step + 4 * (kite + 8 * (hat + 4 * meta));
+}
+
+static inline size_t metamap_index(unsigned meta, unsigned meta2)
+{
+    return meta2 * MT_MAXEXPAND + meta;
+}
+
+/*
+ * Coordinate system for tracking kites within a randomly selected
+ * part of the recursively expanded hat tiling.
+ *
+ * HatCoords will store an array of HatCoord, in little-endian
+ * arrangement. So hc->c[0] will always have type TT_KITE and index a
+ * single kite within a hat; hc->c[1] will have type TT_HAT and index
+ * a hat within a first-order metatile; hc->c[2] will be the smallest
+ * metatile containing this hat, and hc->c[3, 4, 5, ...] will be
+ * higher-order metatiles as needed.
+ *
+ * The last coordinate stored, hc->c[hc->nc-1], will have a tile type
+ * but no index (represented by index==-1). This means "we haven't
+ * decided yet what this level of metatile needs to be". If we need to
+ * refer to this level during the hatctx_step algorithm, we make it up
+ * at random, based on a table of what metatiles each type can
+ * possibly be part of, at what index.
+ */
+typedef struct HatCoord {
+    int index; /* index within that tile, or -1 if not yet known */
+    TileType type;  /* type of this tile */
+} HatCoord;
+
+typedef struct HatCoords {
+    HatCoord *c;
+    size_t nc, csize;
+} HatCoords;
+
+HatCoords *hat_coords_new(void);
+void hat_coords_free(HatCoords *hc);
+void hat_coords_make_space(HatCoords *hc, size_t size);
+HatCoords *hat_coords_copy(HatCoords *hc_in);
+
+#ifdef HAT_COORDS_DEBUG
+static inline void hat_coords_debug(const char *prefix, HatCoords *hc,
+                                    const char *suffix)
+{
+    const char *sep = "";
+    static const char *const types[] = {"H","T","P","F","kite","hat"};
+
+    fputs(prefix, stderr);
+    for (size_t i = 0; i < hc->nc; i++) {
+        fprintf(stderr, "%s %s ", sep, types[hc->c[i].type]);
+        sep = " .";
+        if (hc->c[i].index == -1)
+            fputs("?", stderr);
+        else
+            fprintf(stderr, "%d", hc->c[i].index);
+    }
+    fputs(suffix, stderr);
+}
+#else
+#define hat_coords_debug(p,c,s) ((void)0)
+#endif
+
+/*
+ * HatContext is the shared context of a whole run of the algorithm.
+ * Its 'prototype' HatCoords object represents the coordinates of the
+ * starting kite, and is extended as necessary; any other HatCoord
+ * that needs extending will copy the higher-order values from
+ * ctx->prototype as needed, so that once each choice has been made,
+ * it remains consistent.
+ *
+ * When we're inventing a random piece of tiling in the first place,
+ * we append to ctx->prototype by choosing a random (but legal)
+ * higher-level metatile for the current topmost one to turn out to be
+ * part of. When we're replaying a generation whose parameters are
+ * already stored, we don't have a random_state, and we make fixed
+ * decisions if not enough coordinates were provided.
+ *
+ * (Of course another approach would be to reject grid descriptions
+ * that didn't define enough coordinates! But that would involve a
+ * whole extra iteration over the whole grid region just for
+ * validation, and that seems like more timewasting than really
+ * needed. So we tolerate short descriptions, and do something
+ * deterministic with them.)
+ */
+
+typedef struct HatContext {
+    random_state *rs;
+    HatCoords *prototype;
+} HatContext;
+
+void hatctx_init_random(HatContext *ctx, random_state *rs);
+void hatctx_cleanup(HatContext *ctx);
+HatCoords *hatctx_initial_coords(HatContext *ctx);
+void hatctx_extend_coords(HatContext *ctx, HatCoords *hc, size_t n);
+HatCoords *hatctx_step(HatContext *ctx, HatCoords *hc_in, KiteStep step);
+
+/*
+ * Subroutine of hat_tiling_generate, called for each kite in the grid
+ * as we iterate over it, to decide whether to generate an output hat
+ * and pass it to the client. Exposed in this header file so that
+ * hat-test can reuse it.
+ *
+ * We do this by starting from kite #0 of each hat, and tracing round
+ * the boundary. If the whole boundary is within the caller's bounding
+ * region, we return it; if it goes off the edge, we don't.
+ *
+ * (Of course, every hat we _do_ want to return will have all its
+ * kites inside the rectangle, so its kite #0 will certainly be caught
+ * by this iteration.)
+ */
+
+typedef void (*internal_hat_callback_fn)(void *ctx, Kite kite0, HatCoords *hc,
+                                         int *coords);
+void maybe_report_hat(int w, int h, Kite kite, HatCoords *hc,
+                      internal_hat_callback_fn cb, void *cbctx);
diff --git a/apps/plugins/puzzles/src/hat-tables.h b/apps/plugins/puzzles/src/hat-tables.h
new file mode 100644
index 0000000000..b55fbb405b
--- /dev/null
+++ b/apps/plugins/puzzles/src/hat-tables.h
@@ -0,0 +1,2120 @@
+/*
+ * Header file autogenerated by auxiliary/hatgen.c
+ *
+ * To regenerate, run 'hatgen --tables > hat-tables.h'
+ */
+
+static const unsigned hats_in_metatile[] = { 4, 1, 2, 2, };
+
+static const TileType children_H[] = {
+    TT_H, TT_H, TT_H, TT_T, TT_P, TT_P, TT_P, TT_F, TT_F, TT_F, TT_F, TT_F, TT_F,
+};
+static const TileType children_T[] = {
+    TT_H, TT_P, TT_P, TT_P, TT_F, TT_F, TT_F,
+};
+static const TileType children_P[] = {
+    TT_H, TT_H, TT_P, TT_P, TT_P, TT_F, TT_F, TT_F, TT_F, TT_F, TT_F,
+};
+static const TileType children_F[] = {
+    TT_H, TT_H, TT_P, TT_P, TT_F, TT_F, TT_F, TT_F, TT_F, TT_F, TT_F,
+};
+static const TileType *const children[] = {
+    children_H,
+    children_T,
+    children_P,
+    children_F,
+};
+static const size_t nchildren[] = {
+    13,
+    7,
+    11,
+    11,
+};
+
+static const KitemapEntry kitemap_H[] = {
+    /* hat #0 in metatile #0 (type H) */
+    {1,0,0}, {7,3,0}, {3,0,4}, {4,0,4},
+    {4,3,0}, {0,0,0}, {5,0,0}, {2,0,0},
+    {3,0,4}, {3,0,0}, {1,0,0}, {5,0,0},
+    {2,0,0}, {1,2,1}, {4,0,0}, {6,2,1},
+    {3,0,3}, {5,0,0}, {6,2,1}, {3,0,0},
+    {4,0,0}, {6,0,0}, {2,0,0}, {1,0,0},
+    {5,0,0}, {7,0,0}, {4,3,0}, {3,3,0},
+    {6,0,0}, {2,0,3}, {7,1,0}, {0,0,3},
+    /* hat #1 in metatile #0 (type H) */
+    {1,1,0}, {2,0,5}, {7,1,8}, {0,0,5},
+    {3,0,2}, {0,1,0}, {5,1,0}, {2,1,0},
+    {7,1,8}, {3,1,0}, {1,1,0}, {5,1,0},
+    {2,1,0}, {4,1,8}, {4,1,0}, {0,3,0},
+    {2,3,0}, {5,1,0}, {0,3,0}, {3,1,0},
+    {4,1,0}, {6,1,0}, {2,1,0}, {1,1,0},
+    {5,1,0}, {7,1,0}, {3,0,2}, {4,0,2},
+    {6,1,0}, {3,3,0}, {0,0,3}, {7,0,0},
+    /* hat #2 in metatile #0 (type H) */
+    {1,2,0}, {1,0,7}, {7,1,4}, {6,0,7},
+    {3,0,8}, {0,2,0}, {5,2,0}, {2,2,0},
+    {7,1,4}, {3,2,0}, {1,2,0}, {5,2,0},
+    {2,2,0}, {4,1,4}, {4,2,0}, {6,3,0},
+    {1,3,0}, {5,2,0}, {6,3,0}, {3,2,0},
+    {4,2,0}, {6,2,0}, {2,2,0}, {1,2,0},
+    {5,2,0}, {7,2,0}, {3,0,8}, {4,0,8},
+    {6,2,0}, {0,3,0}, {3,1,8}, {4,1,8},
+    /* hat #3 in metatile #0 (type H) */
+    {7,2,0}, {1,3,0}, {3,1,0}, {4,1,0},
+    {0,3,0}, {4,2,0}, {2,3,0}, {5,3,0},
+    {3,3,0}, {4,1,0}, {5,3,0}, {1,3,0},
+    {7,1,0}, {2,3,0}, {6,0,0}, {4,3,0},
+    {5,3,0}, {1,0,0}, {3,3,0}, {6,0,0},
+    {6,3,0}, {4,3,0}, {1,3,0}, {2,3,0},
+    {7,3,0}, {5,3,0}, {3,2,0}, {4,2,0},
+    {0,0,0}, {6,3,0}, {3,1,4}, {4,1,4},
+    /* hat #0 in metatile #1 (type H) */
+    {1,0,1}, {7,3,1}, {3,0,9}, {4,0,9},
+    {4,3,1}, {0,0,1}, {5,0,1}, {2,0,1},
+    {3,0,9}, {3,0,1}, {1,0,1}, {5,0,1},
+    {2,0,1}, {1,0,10}, {4,0,1}, {6,0,10},
+    {0,0,6}, {5,0,1}, {6,0,10}, {3,0,1},
+    {4,0,1}, {6,0,1}, {2,0,1}, {1,0,1},
+    {5,0,1}, {7,0,1}, {4,3,1}, {3,3,1},
+    {6,0,1}, {1,0,6}, {7,1,1}, {6,0,6},
+    /* hat #1 in metatile #1 (type H) */
+    {1,1,1}, {1,1,2}, {7,0,3}, {6,1,2},
+    {0,1,6}, {0,1,1}, {5,1,1}, {2,1,1},
+    {7,0,3}, {3,1,1}, {1,1,1}, {5,1,1},
+    {2,1,1}, {4,0,3}, {4,1,1}, {0,3,1},
+    {2,3,1}, {5,1,1}, {0,3,1}, {3,1,1},
+    {4,1,1}, {6,1,1}, {2,1,1}, {1,1,1},
+    {5,1,1}, {7,1,1}, {0,1,6}, {7,0,6},
+    {6,1,1}, {3,3,1}, {6,0,6}, {7,0,1},
+    /* hat #2 in metatile #1 (type H) */
+    {1,2,1}, {2,0,4}, {7,1,9}, {0,0,4},
+    {3,0,0}, {0,2,1}, {5,2,1}, {2,2,1},
+    {7,1,9}, {3,2,1}, {1,2,1}, {5,2,1},
+    {2,2,1}, {4,1,9}, {4,2,1}, {6,3,1},
+    {1,3,1}, {5,2,1}, {6,3,1}, {3,2,1},
+    {4,2,1}, {6,2,1}, {2,2,1}, {1,2,1},
+    {5,2,1}, {7,2,1}, {3,0,0}, {4,0,0},
+    {6,2,1}, {0,3,1}, {3,0,3}, {4,0,3},
+    /* hat #3 in metatile #1 (type H) */
+    {7,2,1}, {1,3,1}, {3,1,1}, {4,1,1},
+    {0,3,1}, {4,2,1}, {2,3,1}, {5,3,1},
+    {3,3,1}, {4,1,1}, {5,3,1}, {1,3,1},
+    {7,1,1}, {2,3,1}, {6,0,1}, {4,3,1},
+    {5,3,1}, {1,0,1}, {3,3,1}, {6,0,1},
+    {6,3,1}, {4,3,1}, {1,3,1}, {2,3,1},
+    {7,3,1}, {5,3,1}, {3,2,1}, {4,2,1},
+    {0,0,1}, {6,3,1}, {3,1,9}, {4,1,9},
+    /* hat #0 in metatile #2 (type H) */
+    {1,0,2}, {7,3,2}, {3,0,5}, {4,0,5},
+    {4,3,2}, {0,0,2}, {5,0,2}, {2,0,2},
+    {3,0,5}, {3,0,2}, {1,0,2}, {5,0,2},
+    {2,0,2}, {1,1,0}, {4,0,2}, {6,1,0},
+    {0,0,3}, {5,0,2}, {6,1,0}, {3,0,2},
+    {4,0,2}, {6,0,2}, {2,0,2}, {1,0,2},
+    {5,0,2}, {7,0,2}, {4,3,2}, {3,3,2},
+    {6,0,2}, {1,0,3}, {7,1,2}, {6,0,3},
+    /* hat #1 in metatile #2 (type H) */
+    {1,1,2}, {1,1,6}, {7,1,12}, {6,1,6},
+    {0,1,1}, {0,1,2}, {5,1,2}, {2,1,2},
+    {7,1,12}, {3,1,2}, {1,1,2}, {5,1,2},
+    {2,1,2}, {4,1,12}, {4,1,2}, {0,3,2},
+    {2,3,2}, {5,1,2}, {0,3,2}, {3,1,2},
+    {4,1,2}, {6,1,2}, {2,1,2}, {1,1,2},
+    {5,1,2}, {7,1,2}, {0,1,1}, {7,0,3},
+    {6,1,2}, {3,3,2}, {6,0,3}, {7,0,2},
+    /* hat #2 in metatile #2 (type H) */
+    {1,2,2}, {1,0,11}, {7,1,5}, {6,0,11},
+    {3,0,12}, {0,2,2}, {5,2,2}, {2,2,2},
+    {7,1,5}, {3,2,2}, {1,2,2}, {5,2,2},
+    {2,2,2}, {4,1,5}, {4,2,2}, {6,3,2},
+    {1,3,2}, {5,2,2}, {6,3,2}, {3,2,2},
+    {4,2,2}, {6,2,2}, {2,2,2}, {1,2,2},
+    {5,2,2}, {7,2,2}, {3,0,12}, {4,0,12},
+    {6,2,2}, {0,3,2}, {3,1,12}, {4,1,12},
+    /* hat #3 in metatile #2 (type H) */
+    {7,2,2}, {1,3,2}, {3,1,2}, {4,1,2},
+    {0,3,2}, {4,2,2}, {2,3,2}, {5,3,2},
+    {3,3,2}, {4,1,2}, {5,3,2}, {1,3,2},
+    {7,1,2}, {2,3,2}, {6,0,2}, {4,3,2},
+    {5,3,2}, {1,0,2}, {3,3,2}, {6,0,2},
+    {6,3,2}, {4,3,2}, {1,3,2}, {2,3,2},
+    {7,3,2}, {5,3,2}, {3,2,2}, {4,2,2},
+    {0,0,2}, {6,3,2}, {3,1,5}, {4,1,5},
+    /* hat #0 in metatile #3 (type T) */
+    {1,0,3}, {4,0,2}, {7,0,0}, {7,1,0},
+    {7,0,2}, {0,0,3}, {5,0,3}, {2,0,3},
+    {7,0,0}, {3,0,3}, {1,0,3}, {5,0,3},
+    {2,0,3}, {4,0,0}, {4,0,3}, {7,2,1},
+    {3,1,1}, {5,0,3}, {7,2,1}, {3,0,3},
+    {4,0,3}, {6,0,3}, {2,0,3}, {1,0,3},
+    {5,0,3}, {7,0,3}, {7,0,2}, {7,1,2},
+    {6,0,3}, {2,1,1}, {6,1,2}, {0,1,1},
+    /* hat #1 in metatile #3 (type T) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #2 in metatile #3 (type T) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #3 (type T) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #4 (type P) */
+    {1,0,4}, {-1,-1,-1}, {0,2,1}, {7,1,9},
+    {-1,-1,-1}, {0,0,4}, {5,0,4}, {2,0,4},
+    {0,2,1}, {3,0,4}, {1,0,4}, {5,0,4},
+    {2,0,4}, {2,0,0}, {4,0,4}, {0,0,0},
+    {3,1,4}, {5,0,4}, {0,0,0}, {3,0,4},
+    {4,0,4}, {6,0,4}, {2,0,4}, {1,0,4},
+    {5,0,4}, {7,0,4}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,4}, {2,1,4}, {-1,-1,-1}, {0,1,4},
+    /* hat #1 in metatile #4 (type P) */
+    {1,1,4}, {-1,-1,-1}, {7,0,4}, {-1,-1,-1},
+    {0,1,7}, {0,1,4}, {5,1,4}, {2,1,4},
+    {7,0,4}, {3,1,4}, {1,1,4}, {5,1,4},
+    {2,1,4}, {4,0,4}, {4,1,4}, {7,3,0},
+    {3,2,0}, {5,1,4}, {7,3,0}, {3,1,4},
+    {4,1,4}, {6,1,4}, {2,1,4}, {1,1,4},
+    {5,1,4}, {7,1,4}, {0,1,7}, {7,0,7},
+    {6,1,4}, {2,2,0}, {6,0,7}, {0,2,0},
+    /* hat #2 in metatile #4 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #4 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #5 (type P) */
+    {1,0,5}, {-1,-1,-1}, {0,1,0}, {7,1,8},
+    {-1,-1,-1}, {0,0,5}, {5,0,5}, {2,0,5},
+    {0,1,0}, {3,0,5}, {1,0,5}, {5,0,5},
+    {2,0,5}, {2,0,2}, {4,0,5}, {0,0,2},
+    {3,1,5}, {5,0,5}, {0,0,2}, {3,0,5},
+    {4,0,5}, {6,0,5}, {2,0,5}, {1,0,5},
+    {5,0,5}, {7,0,5}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,5}, {2,1,5}, {-1,-1,-1}, {0,1,5},
+    /* hat #1 in metatile #5 (type P) */
+    {1,1,5}, {-1,-1,-1}, {7,0,5}, {-1,-1,-1},
+    {0,1,11}, {0,1,5}, {5,1,5}, {2,1,5},
+    {7,0,5}, {3,1,5}, {1,1,5}, {5,1,5},
+    {2,1,5}, {4,0,5}, {4,1,5}, {7,3,2},
+    {3,2,2}, {5,1,5}, {7,3,2}, {3,1,5},
+    {4,1,5}, {6,1,5}, {2,1,5}, {1,1,5},
+    {5,1,5}, {7,1,5}, {0,1,11}, {7,0,11},
+    {6,1,5}, {2,2,2}, {6,0,11}, {0,2,2},
+    /* hat #2 in metatile #5 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #5 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #6 (type P) */
+    {1,0,6}, {4,0,1}, {0,1,10}, {7,0,10},
+    {7,0,1}, {0,0,6}, {5,0,6}, {2,0,6},
+    {0,1,10}, {3,0,6}, {1,0,6}, {5,0,6},
+    {2,0,6}, {-1,-1,-1}, {4,0,6}, {-1,-1,-1},
+    {3,1,6}, {5,0,6}, {-1,-1,-1}, {3,0,6},
+    {4,0,6}, {6,0,6}, {2,0,6}, {1,0,6},
+    {5,0,6}, {7,0,6}, {7,0,1}, {7,1,1},
+    {6,0,6}, {2,1,6}, {6,1,1}, {0,1,6},
+    /* hat #1 in metatile #6 (type P) */
+    {1,1,6}, {1,1,1}, {7,0,6}, {6,1,1},
+    {0,1,2}, {0,1,6}, {5,1,6}, {2,1,6},
+    {7,0,6}, {3,1,6}, {1,1,6}, {5,1,6},
+    {2,1,6}, {4,0,6}, {4,1,6}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,6}, {-1,-1,-1}, {3,1,6},
+    {4,1,6}, {6,1,6}, {2,1,6}, {1,1,6},
+    {5,1,6}, {7,1,6}, {0,1,2}, {7,1,12},
+    {6,1,6}, {-1,-1,-1}, {6,1,12}, {-1,-1,-1},
+    /* hat #2 in metatile #6 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #6 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #7 (type F) */
+    {1,0,7}, {2,0,8}, {-1,-1,-1}, {0,0,8},
+    {0,2,0}, {0,0,7}, {5,0,7}, {2,0,7},
+    {-1,-1,-1}, {3,0,7}, {1,0,7}, {5,0,7},
+    {2,0,7}, {-1,-1,-1}, {4,0,7}, {-1,-1,-1},
+    {3,1,7}, {5,0,7}, {-1,-1,-1}, {3,0,7},
+    {4,0,7}, {6,0,7}, {2,0,7}, {1,0,7},
+    {5,0,7}, {7,0,7}, {0,2,0}, {7,1,4},
+    {6,0,7}, {2,1,7}, {6,1,4}, {0,1,7},
+    /* hat #1 in metatile #7 (type F) */
+    {1,1,7}, {1,1,4}, {7,0,7}, {6,1,4},
+    {-1,-1,-1}, {0,1,7}, {5,1,7}, {2,1,7},
+    {7,0,7}, {3,1,7}, {1,1,7}, {5,1,7},
+    {2,1,7}, {4,0,7}, {4,1,7}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,7}, {-1,-1,-1}, {3,1,7},
+    {4,1,7}, {6,1,7}, {2,1,7}, {1,1,7},
+    {5,1,7}, {7,1,7}, {-1,-1,-1}, {-1,-1,-1},
+    {6,1,7}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #2 in metatile #7 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #7 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #8 (type F) */
+    {1,0,8}, {-1,-1,-1}, {0,0,7}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,8}, {5,0,8}, {2,0,8},
+    {0,0,7}, {3,0,8}, {1,0,8}, {5,0,8},
+    {2,0,8}, {1,2,0}, {4,0,8}, {6,2,0},
+    {3,1,8}, {5,0,8}, {6,2,0}, {3,0,8},
+    {4,0,8}, {6,0,8}, {2,0,8}, {1,0,8},
+    {5,0,8}, {7,0,8}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,8}, {2,1,8}, {-1,-1,-1}, {0,1,8},
+    /* hat #1 in metatile #8 (type F) */
+    {1,1,8}, {-1,-1,-1}, {7,0,8}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,8}, {5,1,8}, {2,1,8},
+    {7,0,8}, {3,1,8}, {1,1,8}, {5,1,8},
+    {2,1,8}, {4,0,8}, {4,1,8}, {7,2,0},
+    {3,1,0}, {5,1,8}, {7,2,0}, {3,1,8},
+    {4,1,8}, {6,1,8}, {2,1,8}, {1,1,8},
+    {5,1,8}, {7,1,8}, {-1,-1,-1}, {-1,-1,-1},
+    {6,1,8}, {2,1,0}, {0,0,5}, {0,1,0},
+    /* hat #2 in metatile #8 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #8 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #9 (type F) */
+    {1,0,9}, {-1,-1,-1}, {0,0,10}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,9}, {5,0,9}, {2,0,9},
+    {0,0,10}, {3,0,9}, {1,0,9}, {5,0,9},
+    {2,0,9}, {2,0,1}, {4,0,9}, {0,0,1},
+    {3,1,9}, {5,0,9}, {0,0,1}, {3,0,9},
+    {4,0,9}, {6,0,9}, {2,0,9}, {1,0,9},
+    {5,0,9}, {7,0,9}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,9}, {2,1,9}, {-1,-1,-1}, {0,1,9},
+    /* hat #1 in metatile #9 (type F) */
+    {1,1,9}, {-1,-1,-1}, {7,0,9}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,9}, {5,1,9}, {2,1,9},
+    {7,0,9}, {3,1,9}, {1,1,9}, {5,1,9},
+    {2,1,9}, {4,0,9}, {4,1,9}, {7,3,1},
+    {3,2,1}, {5,1,9}, {7,3,1}, {3,1,9},
+    {4,1,9}, {6,1,9}, {2,1,9}, {1,1,9},
+    {5,1,9}, {7,1,9}, {-1,-1,-1}, {-1,-1,-1},
+    {6,1,9}, {2,2,1}, {0,0,4}, {0,2,1},
+    /* hat #2 in metatile #9 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #9 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #10 (type F) */
+    {1,0,10}, {2,0,9}, {-1,-1,-1}, {0,0,9},
+    {3,0,1}, {0,0,10}, {5,0,10}, {2,0,10},
+    {-1,-1,-1}, {3,0,10}, {1,0,10}, {5,0,10},
+    {2,0,10}, {-1,-1,-1}, {4,0,10}, {-1,-1,-1},
+    {3,1,10}, {5,0,10}, {-1,-1,-1}, {3,0,10},
+    {4,0,10}, {6,0,10}, {2,0,10}, {1,0,10},
+    {5,0,10}, {7,0,10}, {3,0,1}, {4,0,1},
+    {6,0,10}, {2,1,10}, {0,0,6}, {0,1,10},
+    /* hat #1 in metatile #10 (type F) */
+    {1,1,10}, {2,0,6}, {7,0,10}, {0,0,6},
+    {-1,-1,-1}, {0,1,10}, {5,1,10}, {2,1,10},
+    {7,0,10}, {3,1,10}, {1,1,10}, {5,1,10},
+    {2,1,10}, {4,0,10}, {4,1,10}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,10}, {-1,-1,-1}, {3,1,10},
+    {4,1,10}, {6,1,10}, {2,1,10}, {1,1,10},
+    {5,1,10}, {7,1,10}, {-1,-1,-1}, {-1,-1,-1},
+    {6,1,10}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #2 in metatile #10 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #10 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #11 (type F) */
+    {1,0,11}, {2,0,12}, {-1,-1,-1}, {0,0,12},
+    {0,2,2}, {0,0,11}, {5,0,11}, {2,0,11},
+    {-1,-1,-1}, {3,0,11}, {1,0,11}, {5,0,11},
+    {2,0,11}, {-1,-1,-1}, {4,0,11}, {-1,-1,-1},
+    {3,1,11}, {5,0,11}, {-1,-1,-1}, {3,0,11},
+    {4,0,11}, {6,0,11}, {2,0,11}, {1,0,11},
+    {5,0,11}, {7,0,11}, {0,2,2}, {7,1,5},
+    {6,0,11}, {2,1,11}, {6,1,5}, {0,1,11},
+    /* hat #1 in metatile #11 (type F) */
+    {1,1,11}, {1,1,5}, {7,0,11}, {6,1,5},
+    {-1,-1,-1}, {0,1,11}, {5,1,11}, {2,1,11},
+    {7,0,11}, {3,1,11}, {1,1,11}, {5,1,11},
+    {2,1,11}, {4,0,11}, {4,1,11}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,11}, {-1,-1,-1}, {3,1,11},
+    {4,1,11}, {6,1,11}, {2,1,11}, {1,1,11},
+    {5,1,11}, {7,1,11}, {-1,-1,-1}, {-1,-1,-1},
+    {6,1,11}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #2 in metatile #11 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #11 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #12 (type F) */
+    {1,0,12}, {-1,-1,-1}, {0,0,11}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,12}, {5,0,12}, {2,0,12},
+    {0,0,11}, {3,0,12}, {1,0,12}, {5,0,12},
+    {2,0,12}, {1,2,2}, {4,0,12}, {6,2,2},
+    {3,1,12}, {5,0,12}, {6,2,2}, {3,0,12},
+    {4,0,12}, {6,0,12}, {2,0,12}, {1,0,12},
+    {5,0,12}, {7,0,12}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,12}, {2,1,12}, {-1,-1,-1}, {0,1,12},
+    /* hat #1 in metatile #12 (type F) */
+    {1,1,12}, {-1,-1,-1}, {7,0,12}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,12}, {5,1,12}, {2,1,12},
+    {7,0,12}, {3,1,12}, {1,1,12}, {5,1,12},
+    {2,1,12}, {4,0,12}, {4,1,12}, {7,2,2},
+    {3,1,2}, {5,1,12}, {7,2,2}, {3,1,12},
+    {4,1,12}, {6,1,12}, {2,1,12}, {1,1,12},
+    {5,1,12}, {7,1,12}, {-1,-1,-1}, {7,1,6},
+    {6,1,12}, {2,1,2}, {6,1,6}, {0,1,2},
+    /* hat #2 in metatile #12 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #12 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+};
+static const KitemapEntry kitemap_T[] = {
+    /* hat #0 in metatile #0 (type H) */
+    {1,0,0}, {7,3,0}, {3,0,3}, {4,0,3},
+    {4,3,0}, {0,0,0}, {5,0,0}, {2,0,0},
+    {3,0,3}, {3,0,0}, {1,0,0}, {5,0,0},
+    {2,0,0}, {1,1,6}, {4,0,0}, {6,1,6},
+    {0,0,2}, {5,0,0}, {6,1,6}, {3,0,0},
+    {4,0,0}, {6,0,0}, {2,0,0}, {1,0,0},
+    {5,0,0}, {7,0,0}, {4,3,0}, {3,3,0},
+    {6,0,0}, {1,0,2}, {7,1,0}, {6,0,2},
+    /* hat #1 in metatile #0 (type H) */
+    {1,1,0}, {1,1,4}, {7,1,1}, {6,1,4},
+    {0,1,2}, {0,1,0}, {5,1,0}, {2,1,0},
+    {7,1,1}, {3,1,0}, {1,1,0}, {5,1,0},
+    {2,1,0}, {4,1,1}, {4,1,0}, {0,3,0},
+    {2,3,0}, {5,1,0}, {0,3,0}, {3,1,0},
+    {4,1,0}, {6,1,0}, {2,1,0}, {1,1,0},
+    {5,1,0}, {7,1,0}, {0,1,2}, {7,0,2},
+    {6,1,0}, {3,3,0}, {6,0,2}, {7,0,0},
+    /* hat #2 in metatile #0 (type H) */
+    {1,2,0}, {1,1,5}, {7,1,3}, {6,1,5},
+    {3,0,1}, {0,2,0}, {5,2,0}, {2,2,0},
+    {7,1,3}, {3,2,0}, {1,2,0}, {5,2,0},
+    {2,2,0}, {4,1,3}, {4,2,0}, {6,3,0},
+    {1,3,0}, {5,2,0}, {6,3,0}, {3,2,0},
+    {4,2,0}, {6,2,0}, {2,2,0}, {1,2,0},
+    {5,2,0}, {7,2,0}, {3,0,1}, {4,0,1},
+    {6,2,0}, {0,3,0}, {3,1,1}, {4,1,1},
+    /* hat #3 in metatile #0 (type H) */
+    {7,2,0}, {1,3,0}, {3,1,0}, {4,1,0},
+    {0,3,0}, {4,2,0}, {2,3,0}, {5,3,0},
+    {3,3,0}, {4,1,0}, {5,3,0}, {1,3,0},
+    {7,1,0}, {2,3,0}, {6,0,0}, {4,3,0},
+    {5,3,0}, {1,0,0}, {3,3,0}, {6,0,0},
+    {6,3,0}, {4,3,0}, {1,3,0}, {2,3,0},
+    {7,3,0}, {5,3,0}, {3,2,0}, {4,2,0},
+    {0,0,0}, {6,3,0}, {3,1,3}, {4,1,3},
+    /* hat #0 in metatile #1 (type P) */
+    {1,0,1}, {-1,-1,-1}, {0,1,5}, {7,0,5},
+    {-1,-1,-1}, {0,0,1}, {5,0,1}, {2,0,1},
+    {0,1,5}, {3,0,1}, {1,0,1}, {5,0,1},
+    {2,0,1}, {1,2,0}, {4,0,1}, {6,2,0},
+    {3,1,1}, {5,0,1}, {6,2,0}, {3,0,1},
+    {4,0,1}, {6,0,1}, {2,0,1}, {1,0,1},
+    {5,0,1}, {7,0,1}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,1}, {2,1,1}, {-1,-1,-1}, {0,1,1},
+    /* hat #1 in metatile #1 (type P) */
+    {1,1,1}, {-1,-1,-1}, {7,0,1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,1}, {5,1,1}, {2,1,1},
+    {7,0,1}, {3,1,1}, {1,1,1}, {5,1,1},
+    {2,1,1}, {4,0,1}, {4,1,1}, {7,2,0},
+    {3,1,0}, {5,1,1}, {7,2,0}, {3,1,1},
+    {4,1,1}, {6,1,1}, {2,1,1}, {1,1,1},
+    {5,1,1}, {7,1,1}, {-1,-1,-1}, {7,1,4},
+    {6,1,1}, {2,1,0}, {6,1,4}, {0,1,0},
+    /* hat #2 in metatile #1 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #1 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #2 (type P) */
+    {1,0,2}, {4,0,0}, {-1,-1,-1}, {7,1,6},
+    {7,0,0}, {0,0,2}, {5,0,2}, {2,0,2},
+    {-1,-1,-1}, {3,0,2}, {1,0,2}, {5,0,2},
+    {2,0,2}, {-1,-1,-1}, {4,0,2}, {-1,-1,-1},
+    {3,1,2}, {5,0,2}, {-1,-1,-1}, {3,0,2},
+    {4,0,2}, {6,0,2}, {2,0,2}, {1,0,2},
+    {5,0,2}, {7,0,2}, {7,0,0}, {7,1,0},
+    {6,0,2}, {2,1,2}, {6,1,0}, {0,1,2},
+    /* hat #1 in metatile #2 (type P) */
+    {1,1,2}, {1,1,0}, {7,0,2}, {6,1,0},
+    {0,1,4}, {0,1,2}, {5,1,2}, {2,1,2},
+    {7,0,2}, {3,1,2}, {1,1,2}, {5,1,2},
+    {2,1,2}, {4,0,2}, {4,1,2}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,2}, {-1,-1,-1}, {3,1,2},
+    {4,1,2}, {6,1,2}, {2,1,2}, {1,1,2},
+    {5,1,2}, {7,1,2}, {0,1,4}, {7,0,4},
+    {6,1,2}, {-1,-1,-1}, {6,0,4}, {-1,-1,-1},
+    /* hat #2 in metatile #2 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #2 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #3 (type P) */
+    {1,0,3}, {-1,-1,-1}, {0,1,6}, {7,0,6},
+    {-1,-1,-1}, {0,0,3}, {5,0,3}, {2,0,3},
+    {0,1,6}, {3,0,3}, {1,0,3}, {5,0,3},
+    {2,0,3}, {2,0,0}, {4,0,3}, {0,0,0},
+    {3,1,3}, {5,0,3}, {0,0,0}, {3,0,3},
+    {4,0,3}, {6,0,3}, {2,0,3}, {1,0,3},
+    {5,0,3}, {7,0,3}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,3}, {2,1,3}, {-1,-1,-1}, {0,1,3},
+    /* hat #1 in metatile #3 (type P) */
+    {1,1,3}, {-1,-1,-1}, {7,0,3}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,3}, {5,1,3}, {2,1,3},
+    {7,0,3}, {3,1,3}, {1,1,3}, {5,1,3},
+    {2,1,3}, {4,0,3}, {4,1,3}, {7,3,0},
+    {3,2,0}, {5,1,3}, {7,3,0}, {3,1,3},
+    {4,1,3}, {6,1,3}, {2,1,3}, {1,1,3},
+    {5,1,3}, {7,1,3}, {-1,-1,-1}, {7,1,5},
+    {6,1,3}, {2,2,0}, {6,1,5}, {0,2,0},
+    /* hat #2 in metatile #3 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #3 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #4 (type F) */
+    {1,0,4}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,4}, {5,0,4}, {2,0,4},
+    {-1,-1,-1}, {3,0,4}, {1,0,4}, {5,0,4},
+    {2,0,4}, {-1,-1,-1}, {4,0,4}, {-1,-1,-1},
+    {3,1,4}, {5,0,4}, {-1,-1,-1}, {3,0,4},
+    {4,0,4}, {6,0,4}, {2,0,4}, {1,0,4},
+    {5,0,4}, {7,0,4}, {-1,-1,-1}, {7,1,2},
+    {6,0,4}, {2,1,4}, {6,1,2}, {0,1,4},
+    /* hat #1 in metatile #4 (type F) */
+    {1,1,4}, {1,1,2}, {7,0,4}, {6,1,2},
+    {0,1,0}, {0,1,4}, {5,1,4}, {2,1,4},
+    {7,0,4}, {3,1,4}, {1,1,4}, {5,1,4},
+    {2,1,4}, {4,0,4}, {4,1,4}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,4}, {-1,-1,-1}, {3,1,4},
+    {4,1,4}, {6,1,4}, {2,1,4}, {1,1,4},
+    {5,1,4}, {7,1,4}, {0,1,0}, {7,1,1},
+    {6,1,4}, {-1,-1,-1}, {6,1,1}, {-1,-1,-1},
+    /* hat #2 in metatile #4 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #4 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #5 (type F) */
+    {1,0,5}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,5}, {5,0,5}, {2,0,5},
+    {-1,-1,-1}, {3,0,5}, {1,0,5}, {5,0,5},
+    {2,0,5}, {-1,-1,-1}, {4,0,5}, {-1,-1,-1},
+    {3,1,5}, {5,0,5}, {-1,-1,-1}, {3,0,5},
+    {4,0,5}, {6,0,5}, {2,0,5}, {1,0,5},
+    {5,0,5}, {7,0,5}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,5}, {2,1,5}, {0,0,1}, {0,1,5},
+    /* hat #1 in metatile #5 (type F) */
+    {1,1,5}, {2,0,1}, {7,0,5}, {0,0,1},
+    {0,2,0}, {0,1,5}, {5,1,5}, {2,1,5},
+    {7,0,5}, {3,1,5}, {1,1,5}, {5,1,5},
+    {2,1,5}, {4,0,5}, {4,1,5}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,5}, {-1,-1,-1}, {3,1,5},
+    {4,1,5}, {6,1,5}, {2,1,5}, {1,1,5},
+    {5,1,5}, {7,1,5}, {0,2,0}, {7,1,3},
+    {6,1,5}, {-1,-1,-1}, {6,1,3}, {-1,-1,-1},
+    /* hat #2 in metatile #5 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #5 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #6 (type F) */
+    {1,0,6}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,6}, {5,0,6}, {2,0,6},
+    {-1,-1,-1}, {3,0,6}, {1,0,6}, {5,0,6},
+    {2,0,6}, {-1,-1,-1}, {4,0,6}, {-1,-1,-1},
+    {3,1,6}, {5,0,6}, {-1,-1,-1}, {3,0,6},
+    {4,0,6}, {6,0,6}, {2,0,6}, {1,0,6},
+    {5,0,6}, {7,0,6}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,6}, {2,1,6}, {0,0,3}, {0,1,6},
+    /* hat #1 in metatile #6 (type F) */
+    {1,1,6}, {2,0,3}, {7,0,6}, {0,0,3},
+    {3,0,0}, {0,1,6}, {5,1,6}, {2,1,6},
+    {7,0,6}, {3,1,6}, {1,1,6}, {5,1,6},
+    {2,1,6}, {4,0,6}, {4,1,6}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,6}, {-1,-1,-1}, {3,1,6},
+    {4,1,6}, {6,1,6}, {2,1,6}, {1,1,6},
+    {5,1,6}, {7,1,6}, {3,0,0}, {4,0,0},
+    {6,1,6}, {-1,-1,-1}, {0,0,2}, {-1,-1,-1},
+    /* hat #2 in metatile #6 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #6 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+};
+static const KitemapEntry kitemap_P[] = {
+    /* hat #0 in metatile #0 (type H) */
+    {1,0,0}, {7,3,0}, {3,0,4}, {4,0,4},
+    {4,3,0}, {0,0,0}, {5,0,0}, {2,0,0},
+    {3,0,4}, {3,0,0}, {1,0,0}, {5,0,0},
+    {2,0,0}, {1,1,9}, {4,0,0}, {6,1,9},
+    {0,0,3}, {5,0,0}, {6,1,9}, {3,0,0},
+    {4,0,0}, {6,0,0}, {2,0,0}, {1,0,0},
+    {5,0,0}, {7,0,0}, {4,3,0}, {3,3,0},
+    {6,0,0}, {1,0,3}, {7,1,0}, {6,0,3},
+    /* hat #1 in metatile #0 (type H) */
+    {1,1,0}, {1,1,8}, {7,1,5}, {6,1,8},
+    {0,1,3}, {0,1,0}, {5,1,0}, {2,1,0},
+    {7,1,5}, {3,1,0}, {1,1,0}, {5,1,0},
+    {2,1,0}, {4,1,5}, {4,1,0}, {0,3,0},
+    {2,3,0}, {5,1,0}, {0,3,0}, {3,1,0},
+    {4,1,0}, {6,1,0}, {2,1,0}, {1,1,0},
+    {5,1,0}, {7,1,0}, {0,1,3}, {7,0,3},
+    {6,1,0}, {3,3,0}, {6,0,3}, {7,0,0},
+    /* hat #2 in metatile #0 (type H) */
+    {1,2,0}, {1,0,6}, {7,1,4}, {6,0,6},
+    {3,0,5}, {0,2,0}, {5,2,0}, {2,2,0},
+    {7,1,4}, {3,2,0}, {1,2,0}, {5,2,0},
+    {2,2,0}, {4,1,4}, {4,2,0}, {6,3,0},
+    {1,3,0}, {5,2,0}, {6,3,0}, {3,2,0},
+    {4,2,0}, {6,2,0}, {2,2,0}, {1,2,0},
+    {5,2,0}, {7,2,0}, {3,0,5}, {4,0,5},
+    {6,2,0}, {0,3,0}, {3,1,5}, {4,1,5},
+    /* hat #3 in metatile #0 (type H) */
+    {7,2,0}, {1,3,0}, {3,1,0}, {4,1,0},
+    {0,3,0}, {4,2,0}, {2,3,0}, {5,3,0},
+    {3,3,0}, {4,1,0}, {5,3,0}, {1,3,0},
+    {7,1,0}, {2,3,0}, {6,0,0}, {4,3,0},
+    {5,3,0}, {1,0,0}, {3,3,0}, {6,0,0},
+    {6,3,0}, {4,3,0}, {1,3,0}, {2,3,0},
+    {7,3,0}, {5,3,0}, {3,2,0}, {4,2,0},
+    {0,0,0}, {6,3,0}, {3,1,4}, {4,1,4},
+    /* hat #0 in metatile #1 (type H) */
+    {1,0,1}, {7,3,1}, {3,0,10}, {4,0,10},
+    {4,3,1}, {0,0,1}, {5,0,1}, {2,0,1},
+    {3,0,10}, {3,0,1}, {1,0,1}, {5,0,1},
+    {2,0,1}, {1,0,9}, {4,0,1}, {6,0,9},
+    {0,0,4}, {5,0,1}, {6,0,9}, {3,0,1},
+    {4,0,1}, {6,0,1}, {2,0,1}, {1,0,1},
+    {5,0,1}, {7,0,1}, {4,3,1}, {3,3,1},
+    {6,0,1}, {1,0,4}, {7,1,1}, {6,0,4},
+    /* hat #1 in metatile #1 (type H) */
+    {1,1,1}, {1,1,6}, {7,1,2}, {6,1,6},
+    {0,1,4}, {0,1,1}, {5,1,1}, {2,1,1},
+    {7,1,2}, {3,1,1}, {1,1,1}, {5,1,1},
+    {2,1,1}, {4,1,2}, {4,1,1}, {0,3,1},
+    {2,3,1}, {5,1,1}, {0,3,1}, {3,1,1},
+    {4,1,1}, {6,1,1}, {2,1,1}, {1,1,1},
+    {5,1,1}, {7,1,1}, {0,1,4}, {7,0,4},
+    {6,1,1}, {3,3,1}, {6,0,4}, {7,0,1},
+    /* hat #2 in metatile #1 (type H) */
+    {1,2,1}, {1,1,7}, {7,1,10}, {6,1,7},
+    {3,0,2}, {0,2,1}, {5,2,1}, {2,2,1},
+    {7,1,10}, {3,2,1}, {1,2,1}, {5,2,1},
+    {2,2,1}, {4,1,10}, {4,2,1}, {6,3,1},
+    {1,3,1}, {5,2,1}, {6,3,1}, {3,2,1},
+    {4,2,1}, {6,2,1}, {2,2,1}, {1,2,1},
+    {5,2,1}, {7,2,1}, {3,0,2}, {4,0,2},
+    {6,2,1}, {0,3,1}, {3,1,2}, {4,1,2},
+    /* hat #3 in metatile #1 (type H) */
+    {7,2,1}, {1,3,1}, {3,1,1}, {4,1,1},
+    {0,3,1}, {4,2,1}, {2,3,1}, {5,3,1},
+    {3,3,1}, {4,1,1}, {5,3,1}, {1,3,1},
+    {7,1,1}, {2,3,1}, {6,0,1}, {4,3,1},
+    {5,3,1}, {1,0,1}, {3,3,1}, {6,0,1},
+    {6,3,1}, {4,3,1}, {1,3,1}, {2,3,1},
+    {7,3,1}, {5,3,1}, {3,2,1}, {4,2,1},
+    {0,0,1}, {6,3,1}, {3,1,10}, {4,1,10},
+    /* hat #0 in metatile #2 (type P) */
+    {1,0,2}, {-1,-1,-1}, {0,1,7}, {7,0,7},
+    {-1,-1,-1}, {0,0,2}, {5,0,2}, {2,0,2},
+    {0,1,7}, {3,0,2}, {1,0,2}, {5,0,2},
+    {2,0,2}, {1,2,1}, {4,0,2}, {6,2,1},
+    {3,1,2}, {5,0,2}, {6,2,1}, {3,0,2},
+    {4,0,2}, {6,0,2}, {2,0,2}, {1,0,2},
+    {5,0,2}, {7,0,2}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,2}, {2,1,2}, {-1,-1,-1}, {0,1,2},
+    /* hat #1 in metatile #2 (type P) */
+    {1,1,2}, {-1,-1,-1}, {7,0,2}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,2}, {5,1,2}, {2,1,2},
+    {7,0,2}, {3,1,2}, {1,1,2}, {5,1,2},
+    {2,1,2}, {4,0,2}, {4,1,2}, {7,2,1},
+    {3,1,1}, {5,1,2}, {7,2,1}, {3,1,2},
+    {4,1,2}, {6,1,2}, {2,1,2}, {1,1,2},
+    {5,1,2}, {7,1,2}, {-1,-1,-1}, {7,1,6},
+    {6,1,2}, {2,1,1}, {6,1,6}, {0,1,1},
+    /* hat #2 in metatile #2 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #2 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #3 (type P) */
+    {1,0,3}, {4,0,0}, {-1,-1,-1}, {7,1,9},
+    {7,0,0}, {0,0,3}, {5,0,3}, {2,0,3},
+    {-1,-1,-1}, {3,0,3}, {1,0,3}, {5,0,3},
+    {2,0,3}, {-1,-1,-1}, {4,0,3}, {-1,-1,-1},
+    {3,1,3}, {5,0,3}, {-1,-1,-1}, {3,0,3},
+    {4,0,3}, {6,0,3}, {2,0,3}, {1,0,3},
+    {5,0,3}, {7,0,3}, {7,0,0}, {7,1,0},
+    {6,0,3}, {2,1,3}, {6,1,0}, {0,1,3},
+    /* hat #1 in metatile #3 (type P) */
+    {1,1,3}, {1,1,0}, {7,0,3}, {6,1,0},
+    {0,1,8}, {0,1,3}, {5,1,3}, {2,1,3},
+    {7,0,3}, {3,1,3}, {1,1,3}, {5,1,3},
+    {2,1,3}, {4,0,3}, {4,1,3}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,3}, {-1,-1,-1}, {3,1,3},
+    {4,1,3}, {6,1,3}, {2,1,3}, {1,1,3},
+    {5,1,3}, {7,1,3}, {0,1,8}, {7,0,8},
+    {6,1,3}, {-1,-1,-1}, {6,0,8}, {-1,-1,-1},
+    /* hat #2 in metatile #3 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #3 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #4 (type P) */
+    {1,0,4}, {4,0,1}, {0,1,9}, {7,0,9},
+    {7,0,1}, {0,0,4}, {5,0,4}, {2,0,4},
+    {0,1,9}, {3,0,4}, {1,0,4}, {5,0,4},
+    {2,0,4}, {2,0,0}, {4,0,4}, {0,0,0},
+    {3,1,4}, {5,0,4}, {0,0,0}, {3,0,4},
+    {4,0,4}, {6,0,4}, {2,0,4}, {1,0,4},
+    {5,0,4}, {7,0,4}, {7,0,1}, {7,1,1},
+    {6,0,4}, {2,1,4}, {6,1,1}, {0,1,4},
+    /* hat #1 in metatile #4 (type P) */
+    {1,1,4}, {1,1,1}, {7,0,4}, {6,1,1},
+    {0,1,6}, {0,1,4}, {5,1,4}, {2,1,4},
+    {7,0,4}, {3,1,4}, {1,1,4}, {5,1,4},
+    {2,1,4}, {4,0,4}, {4,1,4}, {7,3,0},
+    {3,2,0}, {5,1,4}, {7,3,0}, {3,1,4},
+    {4,1,4}, {6,1,4}, {2,1,4}, {1,1,4},
+    {5,1,4}, {7,1,4}, {0,1,6}, {7,0,6},
+    {6,1,4}, {2,2,0}, {6,0,6}, {0,2,0},
+    /* hat #2 in metatile #4 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #4 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #5 (type F) */
+    {1,0,5}, {-1,-1,-1}, {0,0,6}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,5}, {5,0,5}, {2,0,5},
+    {0,0,6}, {3,0,5}, {1,0,5}, {5,0,5},
+    {2,0,5}, {1,2,0}, {4,0,5}, {6,2,0},
+    {3,1,5}, {5,0,5}, {6,2,0}, {3,0,5},
+    {4,0,5}, {6,0,5}, {2,0,5}, {1,0,5},
+    {5,0,5}, {7,0,5}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,5}, {2,1,5}, {-1,-1,-1}, {0,1,5},
+    /* hat #1 in metatile #5 (type F) */
+    {1,1,5}, {-1,-1,-1}, {7,0,5}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,5}, {5,1,5}, {2,1,5},
+    {7,0,5}, {3,1,5}, {1,1,5}, {5,1,5},
+    {2,1,5}, {4,0,5}, {4,1,5}, {7,2,0},
+    {3,1,0}, {5,1,5}, {7,2,0}, {3,1,5},
+    {4,1,5}, {6,1,5}, {2,1,5}, {1,1,5},
+    {5,1,5}, {7,1,5}, {-1,-1,-1}, {7,1,8},
+    {6,1,5}, {2,1,0}, {6,1,8}, {0,1,0},
+    /* hat #2 in metatile #5 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #5 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #6 (type F) */
+    {1,0,6}, {2,0,5}, {-1,-1,-1}, {0,0,5},
+    {0,2,0}, {0,0,6}, {5,0,6}, {2,0,6},
+    {-1,-1,-1}, {3,0,6}, {1,0,6}, {5,0,6},
+    {2,0,6}, {-1,-1,-1}, {4,0,6}, {-1,-1,-1},
+    {3,1,6}, {5,0,6}, {-1,-1,-1}, {3,0,6},
+    {4,0,6}, {6,0,6}, {2,0,6}, {1,0,6},
+    {5,0,6}, {7,0,6}, {0,2,0}, {7,1,4},
+    {6,0,6}, {2,1,6}, {6,1,4}, {0,1,6},
+    /* hat #1 in metatile #6 (type F) */
+    {1,1,6}, {1,1,4}, {7,0,6}, {6,1,4},
+    {0,1,1}, {0,1,6}, {5,1,6}, {2,1,6},
+    {7,0,6}, {3,1,6}, {1,1,6}, {5,1,6},
+    {2,1,6}, {4,0,6}, {4,1,6}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,6}, {-1,-1,-1}, {3,1,6},
+    {4,1,6}, {6,1,6}, {2,1,6}, {1,1,6},
+    {5,1,6}, {7,1,6}, {0,1,1}, {7,1,2},
+    {6,1,6}, {-1,-1,-1}, {6,1,2}, {-1,-1,-1},
+    /* hat #2 in metatile #6 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #6 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #7 (type F) */
+    {1,0,7}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,7}, {5,0,7}, {2,0,7},
+    {-1,-1,-1}, {3,0,7}, {1,0,7}, {5,0,7},
+    {2,0,7}, {-1,-1,-1}, {4,0,7}, {-1,-1,-1},
+    {3,1,7}, {5,0,7}, {-1,-1,-1}, {3,0,7},
+    {4,0,7}, {6,0,7}, {2,0,7}, {1,0,7},
+    {5,0,7}, {7,0,7}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,7}, {2,1,7}, {0,0,2}, {0,1,7},
+    /* hat #1 in metatile #7 (type F) */
+    {1,1,7}, {2,0,2}, {7,0,7}, {0,0,2},
+    {0,2,1}, {0,1,7}, {5,1,7}, {2,1,7},
+    {7,0,7}, {3,1,7}, {1,1,7}, {5,1,7},
+    {2,1,7}, {4,0,7}, {4,1,7}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,7}, {-1,-1,-1}, {3,1,7},
+    {4,1,7}, {6,1,7}, {2,1,7}, {1,1,7},
+    {5,1,7}, {7,1,7}, {0,2,1}, {7,1,10},
+    {6,1,7}, {-1,-1,-1}, {6,1,10}, {-1,-1,-1},
+    /* hat #2 in metatile #7 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #7 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #8 (type F) */
+    {1,0,8}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,8}, {5,0,8}, {2,0,8},
+    {-1,-1,-1}, {3,0,8}, {1,0,8}, {5,0,8},
+    {2,0,8}, {-1,-1,-1}, {4,0,8}, {-1,-1,-1},
+    {3,1,8}, {5,0,8}, {-1,-1,-1}, {3,0,8},
+    {4,0,8}, {6,0,8}, {2,0,8}, {1,0,8},
+    {5,0,8}, {7,0,8}, {-1,-1,-1}, {7,1,3},
+    {6,0,8}, {2,1,8}, {6,1,3}, {0,1,8},
+    /* hat #1 in metatile #8 (type F) */
+    {1,1,8}, {1,1,3}, {7,0,8}, {6,1,3},
+    {0,1,0}, {0,1,8}, {5,1,8}, {2,1,8},
+    {7,0,8}, {3,1,8}, {1,1,8}, {5,1,8},
+    {2,1,8}, {4,0,8}, {4,1,8}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,8}, {-1,-1,-1}, {3,1,8},
+    {4,1,8}, {6,1,8}, {2,1,8}, {1,1,8},
+    {5,1,8}, {7,1,8}, {0,1,0}, {7,1,5},
+    {6,1,8}, {-1,-1,-1}, {6,1,5}, {-1,-1,-1},
+    /* hat #2 in metatile #8 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #8 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #9 (type F) */
+    {1,0,9}, {2,0,10}, {-1,-1,-1}, {0,0,10},
+    {3,0,1}, {0,0,9}, {5,0,9}, {2,0,9},
+    {-1,-1,-1}, {3,0,9}, {1,0,9}, {5,0,9},
+    {2,0,9}, {-1,-1,-1}, {4,0,9}, {-1,-1,-1},
+    {3,1,9}, {5,0,9}, {-1,-1,-1}, {3,0,9},
+    {4,0,9}, {6,0,9}, {2,0,9}, {1,0,9},
+    {5,0,9}, {7,0,9}, {3,0,1}, {4,0,1},
+    {6,0,9}, {2,1,9}, {0,0,4}, {0,1,9},
+    /* hat #1 in metatile #9 (type F) */
+    {1,1,9}, {2,0,4}, {7,0,9}, {0,0,4},
+    {3,0,0}, {0,1,9}, {5,1,9}, {2,1,9},
+    {7,0,9}, {3,1,9}, {1,1,9}, {5,1,9},
+    {2,1,9}, {4,0,9}, {4,1,9}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,9}, {-1,-1,-1}, {3,1,9},
+    {4,1,9}, {6,1,9}, {2,1,9}, {1,1,9},
+    {5,1,9}, {7,1,9}, {3,0,0}, {4,0,0},
+    {6,1,9}, {-1,-1,-1}, {0,0,3}, {-1,-1,-1},
+    /* hat #2 in metatile #9 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #9 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #10 (type F) */
+    {1,0,10}, {-1,-1,-1}, {0,0,9}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,10}, {5,0,10}, {2,0,10},
+    {0,0,9}, {3,0,10}, {1,0,10}, {5,0,10},
+    {2,0,10}, {2,0,1}, {4,0,10}, {0,0,1},
+    {3,1,10}, {5,0,10}, {0,0,1}, {3,0,10},
+    {4,0,10}, {6,0,10}, {2,0,10}, {1,0,10},
+    {5,0,10}, {7,0,10}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,10}, {2,1,10}, {-1,-1,-1}, {0,1,10},
+    /* hat #1 in metatile #10 (type F) */
+    {1,1,10}, {-1,-1,-1}, {7,0,10}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,10}, {5,1,10}, {2,1,10},
+    {7,0,10}, {3,1,10}, {1,1,10}, {5,1,10},
+    {2,1,10}, {4,0,10}, {4,1,10}, {7,3,1},
+    {3,2,1}, {5,1,10}, {7,3,1}, {3,1,10},
+    {4,1,10}, {6,1,10}, {2,1,10}, {1,1,10},
+    {5,1,10}, {7,1,10}, {-1,-1,-1}, {7,1,7},
+    {6,1,10}, {2,2,1}, {6,1,7}, {0,2,1},
+    /* hat #2 in metatile #10 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #10 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+};
+static const KitemapEntry kitemap_F[] = {
+    /* hat #0 in metatile #0 (type H) */
+    {1,0,0}, {7,3,0}, {3,0,3}, {4,0,3},
+    {4,3,0}, {0,0,0}, {5,0,0}, {2,0,0},
+    {3,0,3}, {3,0,0}, {1,0,0}, {5,0,0},
+    {2,0,0}, {1,1,9}, {4,0,0}, {6,1,9},
+    {0,0,2}, {5,0,0}, {6,1,9}, {3,0,0},
+    {4,0,0}, {6,0,0}, {2,0,0}, {1,0,0},
+    {5,0,0}, {7,0,0}, {4,3,0}, {3,3,0},
+    {6,0,0}, {1,0,2}, {7,1,0}, {6,0,2},
+    /* hat #1 in metatile #0 (type H) */
+    {1,1,0}, {1,1,8}, {7,1,4}, {6,1,8},
+    {0,1,2}, {0,1,0}, {5,1,0}, {2,1,0},
+    {7,1,4}, {3,1,0}, {1,1,0}, {5,1,0},
+    {2,1,0}, {4,1,4}, {4,1,0}, {0,3,0},
+    {2,3,0}, {5,1,0}, {0,3,0}, {3,1,0},
+    {4,1,0}, {6,1,0}, {2,1,0}, {1,1,0},
+    {5,1,0}, {7,1,0}, {0,1,2}, {7,0,2},
+    {6,1,0}, {3,3,0}, {6,0,2}, {7,0,0},
+    /* hat #2 in metatile #0 (type H) */
+    {1,2,0}, {1,0,5}, {7,1,3}, {6,0,5},
+    {3,0,4}, {0,2,0}, {5,2,0}, {2,2,0},
+    {7,1,3}, {3,2,0}, {1,2,0}, {5,2,0},
+    {2,2,0}, {4,1,3}, {4,2,0}, {6,3,0},
+    {1,3,0}, {5,2,0}, {6,3,0}, {3,2,0},
+    {4,2,0}, {6,2,0}, {2,2,0}, {1,2,0},
+    {5,2,0}, {7,2,0}, {3,0,4}, {4,0,4},
+    {6,2,0}, {0,3,0}, {3,1,4}, {4,1,4},
+    /* hat #3 in metatile #0 (type H) */
+    {7,2,0}, {1,3,0}, {3,1,0}, {4,1,0},
+    {0,3,0}, {4,2,0}, {2,3,0}, {5,3,0},
+    {3,3,0}, {4,1,0}, {5,3,0}, {1,3,0},
+    {7,1,0}, {2,3,0}, {6,0,0}, {4,3,0},
+    {5,3,0}, {1,0,0}, {3,3,0}, {6,0,0},
+    {6,3,0}, {4,3,0}, {1,3,0}, {2,3,0},
+    {7,3,0}, {5,3,0}, {3,2,0}, {4,2,0},
+    {0,0,0}, {6,3,0}, {3,1,3}, {4,1,3},
+    /* hat #0 in metatile #1 (type H) */
+    {1,0,1}, {7,3,1}, {3,0,10}, {4,0,10},
+    {4,3,1}, {0,0,1}, {5,0,1}, {2,0,1},
+    {3,0,10}, {3,0,1}, {1,0,1}, {5,0,1},
+    {2,0,1}, {1,0,9}, {4,0,1}, {6,0,9},
+    {0,0,3}, {5,0,1}, {6,0,9}, {3,0,1},
+    {4,0,1}, {6,0,1}, {2,0,1}, {1,0,1},
+    {5,0,1}, {7,0,1}, {4,3,1}, {3,3,1},
+    {6,0,1}, {1,0,3}, {7,1,1}, {6,0,3},
+    /* hat #1 in metatile #1 (type H) */
+    {1,1,1}, {1,1,5}, {7,1,6}, {6,1,5},
+    {0,1,3}, {0,1,1}, {5,1,1}, {2,1,1},
+    {7,1,6}, {3,1,1}, {1,1,1}, {5,1,1},
+    {2,1,1}, {4,1,6}, {4,1,1}, {0,3,1},
+    {2,3,1}, {5,1,1}, {0,3,1}, {3,1,1},
+    {4,1,1}, {6,1,1}, {2,1,1}, {1,1,1},
+    {5,1,1}, {7,1,1}, {0,1,3}, {7,0,3},
+    {6,1,1}, {3,3,1}, {6,0,3}, {7,0,1},
+    /* hat #2 in metatile #1 (type H) */
+    {1,2,1}, {1,0,7}, {7,1,10}, {6,0,7},
+    {3,0,6}, {0,2,1}, {5,2,1}, {2,2,1},
+    {7,1,10}, {3,2,1}, {1,2,1}, {5,2,1},
+    {2,2,1}, {4,1,10}, {4,2,1}, {6,3,1},
+    {1,3,1}, {5,2,1}, {6,3,1}, {3,2,1},
+    {4,2,1}, {6,2,1}, {2,2,1}, {1,2,1},
+    {5,2,1}, {7,2,1}, {3,0,6}, {4,0,6},
+    {6,2,1}, {0,3,1}, {3,1,6}, {4,1,6},
+    /* hat #3 in metatile #1 (type H) */
+    {7,2,1}, {1,3,1}, {3,1,1}, {4,1,1},
+    {0,3,1}, {4,2,1}, {2,3,1}, {5,3,1},
+    {3,3,1}, {4,1,1}, {5,3,1}, {1,3,1},
+    {7,1,1}, {2,3,1}, {6,0,1}, {4,3,1},
+    {5,3,1}, {1,0,1}, {3,3,1}, {6,0,1},
+    {6,3,1}, {4,3,1}, {1,3,1}, {2,3,1},
+    {7,3,1}, {5,3,1}, {3,2,1}, {4,2,1},
+    {0,0,1}, {6,3,1}, {3,1,10}, {4,1,10},
+    /* hat #0 in metatile #2 (type P) */
+    {1,0,2}, {4,0,0}, {-1,-1,-1}, {7,1,9},
+    {7,0,0}, {0,0,2}, {5,0,2}, {2,0,2},
+    {-1,-1,-1}, {3,0,2}, {1,0,2}, {5,0,2},
+    {2,0,2}, {-1,-1,-1}, {4,0,2}, {-1,-1,-1},
+    {3,1,2}, {5,0,2}, {-1,-1,-1}, {3,0,2},
+    {4,0,2}, {6,0,2}, {2,0,2}, {1,0,2},
+    {5,0,2}, {7,0,2}, {7,0,0}, {7,1,0},
+    {6,0,2}, {2,1,2}, {6,1,0}, {0,1,2},
+    /* hat #1 in metatile #2 (type P) */
+    {1,1,2}, {1,1,0}, {7,0,2}, {6,1,0},
+    {0,1,8}, {0,1,2}, {5,1,2}, {2,1,2},
+    {7,0,2}, {3,1,2}, {1,1,2}, {5,1,2},
+    {2,1,2}, {4,0,2}, {4,1,2}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,2}, {-1,-1,-1}, {3,1,2},
+    {4,1,2}, {6,1,2}, {2,1,2}, {1,1,2},
+    {5,1,2}, {7,1,2}, {0,1,8}, {7,0,8},
+    {6,1,2}, {-1,-1,-1}, {6,0,8}, {-1,-1,-1},
+    /* hat #2 in metatile #2 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #2 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #3 (type P) */
+    {1,0,3}, {4,0,1}, {0,1,9}, {7,0,9},
+    {7,0,1}, {0,0,3}, {5,0,3}, {2,0,3},
+    {0,1,9}, {3,0,3}, {1,0,3}, {5,0,3},
+    {2,0,3}, {2,0,0}, {4,0,3}, {0,0,0},
+    {3,1,3}, {5,0,3}, {0,0,0}, {3,0,3},
+    {4,0,3}, {6,0,3}, {2,0,3}, {1,0,3},
+    {5,0,3}, {7,0,3}, {7,0,1}, {7,1,1},
+    {6,0,3}, {2,1,3}, {6,1,1}, {0,1,3},
+    /* hat #1 in metatile #3 (type P) */
+    {1,1,3}, {1,1,1}, {7,0,3}, {6,1,1},
+    {0,1,5}, {0,1,3}, {5,1,3}, {2,1,3},
+    {7,0,3}, {3,1,3}, {1,1,3}, {5,1,3},
+    {2,1,3}, {4,0,3}, {4,1,3}, {7,3,0},
+    {3,2,0}, {5,1,3}, {7,3,0}, {3,1,3},
+    {4,1,3}, {6,1,3}, {2,1,3}, {1,1,3},
+    {5,1,3}, {7,1,3}, {0,1,5}, {7,0,5},
+    {6,1,3}, {2,2,0}, {6,0,5}, {0,2,0},
+    /* hat #2 in metatile #3 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #3 (type P) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #4 (type F) */
+    {1,0,4}, {-1,-1,-1}, {0,0,5}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,4}, {5,0,4}, {2,0,4},
+    {0,0,5}, {3,0,4}, {1,0,4}, {5,0,4},
+    {2,0,4}, {1,2,0}, {4,0,4}, {6,2,0},
+    {3,1,4}, {5,0,4}, {6,2,0}, {3,0,4},
+    {4,0,4}, {6,0,4}, {2,0,4}, {1,0,4},
+    {5,0,4}, {7,0,4}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,4}, {2,1,4}, {-1,-1,-1}, {0,1,4},
+    /* hat #1 in metatile #4 (type F) */
+    {1,1,4}, {-1,-1,-1}, {7,0,4}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,4}, {5,1,4}, {2,1,4},
+    {7,0,4}, {3,1,4}, {1,1,4}, {5,1,4},
+    {2,1,4}, {4,0,4}, {4,1,4}, {7,2,0},
+    {3,1,0}, {5,1,4}, {7,2,0}, {3,1,4},
+    {4,1,4}, {6,1,4}, {2,1,4}, {1,1,4},
+    {5,1,4}, {7,1,4}, {-1,-1,-1}, {7,1,8},
+    {6,1,4}, {2,1,0}, {6,1,8}, {0,1,0},
+    /* hat #2 in metatile #4 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #4 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #5 (type F) */
+    {1,0,5}, {2,0,4}, {-1,-1,-1}, {0,0,4},
+    {0,2,0}, {0,0,5}, {5,0,5}, {2,0,5},
+    {-1,-1,-1}, {3,0,5}, {1,0,5}, {5,0,5},
+    {2,0,5}, {-1,-1,-1}, {4,0,5}, {-1,-1,-1},
+    {3,1,5}, {5,0,5}, {-1,-1,-1}, {3,0,5},
+    {4,0,5}, {6,0,5}, {2,0,5}, {1,0,5},
+    {5,0,5}, {7,0,5}, {0,2,0}, {7,1,3},
+    {6,0,5}, {2,1,5}, {6,1,3}, {0,1,5},
+    /* hat #1 in metatile #5 (type F) */
+    {1,1,5}, {1,1,3}, {7,0,5}, {6,1,3},
+    {0,1,1}, {0,1,5}, {5,1,5}, {2,1,5},
+    {7,0,5}, {3,1,5}, {1,1,5}, {5,1,5},
+    {2,1,5}, {4,0,5}, {4,1,5}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,5}, {-1,-1,-1}, {3,1,5},
+    {4,1,5}, {6,1,5}, {2,1,5}, {1,1,5},
+    {5,1,5}, {7,1,5}, {0,1,1}, {7,1,6},
+    {6,1,5}, {-1,-1,-1}, {6,1,6}, {-1,-1,-1},
+    /* hat #2 in metatile #5 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #5 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #6 (type F) */
+    {1,0,6}, {-1,-1,-1}, {0,0,7}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,6}, {5,0,6}, {2,0,6},
+    {0,0,7}, {3,0,6}, {1,0,6}, {5,0,6},
+    {2,0,6}, {1,2,1}, {4,0,6}, {6,2,1},
+    {3,1,6}, {5,0,6}, {6,2,1}, {3,0,6},
+    {4,0,6}, {6,0,6}, {2,0,6}, {1,0,6},
+    {5,0,6}, {7,0,6}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,6}, {2,1,6}, {-1,-1,-1}, {0,1,6},
+    /* hat #1 in metatile #6 (type F) */
+    {1,1,6}, {-1,-1,-1}, {7,0,6}, {-1,-1,-1},
+    {-1,-1,-1}, {0,1,6}, {5,1,6}, {2,1,6},
+    {7,0,6}, {3,1,6}, {1,1,6}, {5,1,6},
+    {2,1,6}, {4,0,6}, {4,1,6}, {7,2,1},
+    {3,1,1}, {5,1,6}, {7,2,1}, {3,1,6},
+    {4,1,6}, {6,1,6}, {2,1,6}, {1,1,6},
+    {5,1,6}, {7,1,6}, {-1,-1,-1}, {7,1,5},
+    {6,1,6}, {2,1,1}, {6,1,5}, {0,1,1},
+    /* hat #2 in metatile #6 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #6 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #7 (type F) */
+    {1,0,7}, {2,0,6}, {-1,-1,-1}, {0,0,6},
+    {0,2,1}, {0,0,7}, {5,0,7}, {2,0,7},
+    {-1,-1,-1}, {3,0,7}, {1,0,7}, {5,0,7},
+    {2,0,7}, {-1,-1,-1}, {4,0,7}, {-1,-1,-1},
+    {3,1,7}, {5,0,7}, {-1,-1,-1}, {3,0,7},
+    {4,0,7}, {6,0,7}, {2,0,7}, {1,0,7},
+    {5,0,7}, {7,0,7}, {0,2,1}, {7,1,10},
+    {6,0,7}, {2,1,7}, {6,1,10}, {0,1,7},
+    /* hat #1 in metatile #7 (type F) */
+    {1,1,7}, {1,1,10}, {7,0,7}, {6,1,10},
+    {-1,-1,-1}, {0,1,7}, {5,1,7}, {2,1,7},
+    {7,0,7}, {3,1,7}, {1,1,7}, {5,1,7},
+    {2,1,7}, {4,0,7}, {4,1,7}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,7}, {-1,-1,-1}, {3,1,7},
+    {4,1,7}, {6,1,7}, {2,1,7}, {1,1,7},
+    {5,1,7}, {7,1,7}, {-1,-1,-1}, {-1,-1,-1},
+    {6,1,7}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #2 in metatile #7 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #7 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #8 (type F) */
+    {1,0,8}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,8}, {5,0,8}, {2,0,8},
+    {-1,-1,-1}, {3,0,8}, {1,0,8}, {5,0,8},
+    {2,0,8}, {-1,-1,-1}, {4,0,8}, {-1,-1,-1},
+    {3,1,8}, {5,0,8}, {-1,-1,-1}, {3,0,8},
+    {4,0,8}, {6,0,8}, {2,0,8}, {1,0,8},
+    {5,0,8}, {7,0,8}, {-1,-1,-1}, {7,1,2},
+    {6,0,8}, {2,1,8}, {6,1,2}, {0,1,8},
+    /* hat #1 in metatile #8 (type F) */
+    {1,1,8}, {1,1,2}, {7,0,8}, {6,1,2},
+    {0,1,0}, {0,1,8}, {5,1,8}, {2,1,8},
+    {7,0,8}, {3,1,8}, {1,1,8}, {5,1,8},
+    {2,1,8}, {4,0,8}, {4,1,8}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,8}, {-1,-1,-1}, {3,1,8},
+    {4,1,8}, {6,1,8}, {2,1,8}, {1,1,8},
+    {5,1,8}, {7,1,8}, {0,1,0}, {7,1,4},
+    {6,1,8}, {-1,-1,-1}, {6,1,4}, {-1,-1,-1},
+    /* hat #2 in metatile #8 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #8 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #9 (type F) */
+    {1,0,9}, {2,0,10}, {-1,-1,-1}, {0,0,10},
+    {3,0,1}, {0,0,9}, {5,0,9}, {2,0,9},
+    {-1,-1,-1}, {3,0,9}, {1,0,9}, {5,0,9},
+    {2,0,9}, {-1,-1,-1}, {4,0,9}, {-1,-1,-1},
+    {3,1,9}, {5,0,9}, {-1,-1,-1}, {3,0,9},
+    {4,0,9}, {6,0,9}, {2,0,9}, {1,0,9},
+    {5,0,9}, {7,0,9}, {3,0,1}, {4,0,1},
+    {6,0,9}, {2,1,9}, {0,0,3}, {0,1,9},
+    /* hat #1 in metatile #9 (type F) */
+    {1,1,9}, {2,0,3}, {7,0,9}, {0,0,3},
+    {3,0,0}, {0,1,9}, {5,1,9}, {2,1,9},
+    {7,0,9}, {3,1,9}, {1,1,9}, {5,1,9},
+    {2,1,9}, {4,0,9}, {4,1,9}, {-1,-1,-1},
+    {-1,-1,-1}, {5,1,9}, {-1,-1,-1}, {3,1,9},
+    {4,1,9}, {6,1,9}, {2,1,9}, {1,1,9},
+    {5,1,9}, {7,1,9}, {3,0,0}, {4,0,0},
+    {6,1,9}, {-1,-1,-1}, {0,0,2}, {-1,-1,-1},
+    /* hat #2 in metatile #9 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #9 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #0 in metatile #10 (type F) */
+    {1,0,10}, {-1,-1,-1}, {0,0,9}, {-1,-1,-1},
+    {-1,-1,-1}, {0,0,10}, {5,0,10}, {2,0,10},
+    {0,0,9}, {3,0,10}, {1,0,10}, {5,0,10},
+    {2,0,10}, {2,0,1}, {4,0,10}, {0,0,1},
+    {3,1,10}, {5,0,10}, {0,0,1}, {3,0,10},
+    {4,0,10}, {6,0,10}, {2,0,10}, {1,0,10},
+    {5,0,10}, {7,0,10}, {-1,-1,-1}, {-1,-1,-1},
+    {6,0,10}, {2,1,10}, {-1,-1,-1}, {0,1,10},
+    /* hat #1 in metatile #10 (type F) */
+    {1,1,10}, {-1,-1,-1}, {7,0,10}, {-1,-1,-1},
+    {0,1,7}, {0,1,10}, {5,1,10}, {2,1,10},
+    {7,0,10}, {3,1,10}, {1,1,10}, {5,1,10},
+    {2,1,10}, {4,0,10}, {4,1,10}, {7,3,1},
+    {3,2,1}, {5,1,10}, {7,3,1}, {3,1,10},
+    {4,1,10}, {6,1,10}, {2,1,10}, {1,1,10},
+    {5,1,10}, {7,1,10}, {0,1,7}, {7,0,7},
+    {6,1,10}, {2,2,1}, {6,0,7}, {0,2,1},
+    /* hat #2 in metatile #10 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    /* hat #3 in metatile #10 (type F) does not exist */
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+    {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1}, {-1,-1,-1},
+};
+static const KitemapEntry *const kitemap[] = {
+    kitemap_H,
+    kitemap_T,
+    kitemap_P,
+    kitemap_F,
+};
+
+static const MetamapEntry metamap_H[] = {
+    /* 0, 0 -> */ {0, 0}, /* no alternatives */
+    /* 1, 0 -> */ {1, 0}, /* no alternatives */
+    /* 2, 0 -> */ {2, 0}, /* no alternatives */
+    /* 3, 0 -> */ {3, 0}, /* no alternatives */
+    /* 4, 0 -> */ {3, 4},
+    /* 5, 0 -> */ {2, 8},
+    /* 6, 0 -> */ {3, 3},
+    /* 7, 0 -> */ {8, 4},
+    /* 8, 0 -> */ {9, 8},
+    /* 9, 0 -> */ {9, 4},
+    /* 10, 0 -> */ {8, 1},
+    /* 11, 0 -> */ {10, 5},
+    /* 12, 0 -> */ {5, 3},
+    /* 0, 1 -> */ {0, 1}, /* no alternatives */
+    /* 1, 1 -> */ {1, 1}, /* no alternatives */
+    /* 2, 1 -> */ {2, 1}, /* no alternatives */
+    /* 3, 1 -> */ {3, 1}, /* no alternatives */
+    /* 4, 1 -> */ {2, 9},
+    /* 5, 1 -> */ {2, 3},
+    /* 6, 1 -> */ {2, 6},
+    /* 7, 1 -> */ {10, 4},
+    /* 8, 1 -> */ {6, 3},
+    /* 9, 1 -> */ {9, 9},
+    /* 10, 1 -> */ {6, 10},
+    /* 11, 1 -> */ {4, 3},
+    /* 12, 1 -> */ {6, 6},
+    /* 0, 2 -> */ {0, 2}, /* no alternatives */
+    /* 1, 2 -> */ {1, 2}, /* no alternatives */
+    /* 2, 2 -> */ {2, 2}, /* no alternatives */
+    /* 3, 2 -> */ {3, 2}, /* no alternatives */
+    /* 4, 2 -> */ {3, 5},
+    /* 5, 2 -> */ {2, 12},
+    /* 6, 2 -> */ {1, 3},
+    /* 7, 2 -> */ {8, 5},
+    /* 8, 2 -> */ {9, 12},
+    /* 9, 2 -> */ {9, 5},
+    /* 10, 2 -> */ {12, 0},
+    /* 11, 2 -> */ {5, 6},
+    /* 12, 2 -> */ {11, 1},
+    /* 0, 3 -> */ {0, 3}, /* no alternatives */
+    /* 1, 3 -> */ {6, 2},
+    /* 2, 3 -> */ {5, 1},
+    /* 3, 3 -> */ {6, 0},
+    /* 4, 3 -> */ {12, 2},
+    /* 5, 3 -> */ {10, 2},
+    /* 6, 3 -> */ {10, 0},
+    /* 7, 3 -> */ {-1,-1}, /* does not exist */
+    /* 8, 3 -> */ {-1,-1}, /* does not exist */
+    /* 9, 3 -> */ {-1,-1}, /* does not exist */
+    /* 10, 3 -> */ {-1,-1}, /* does not exist */
+    /* 11, 3 -> */ {-1,-1}, /* does not exist */
+    /* 12, 3 -> */ {-1,-1}, /* does not exist */
+    /* 0, 4 -> */ {0, 4}, /* no alternatives */
+    /* 1, 4 -> */ {1, 4}, /* no alternatives */
+    /* 2, 4 -> */ {2, 4}, /* no alternatives */
+    /* 3, 4 -> */ {4, 0},
+    /* 4, 4 -> */ {4, 4}, /* no alternatives */
+    /* 5, 4 -> */ {5, 7},
+    /* 6, 4 -> */ {6, 4}, /* no alternatives */
+    /* 7, 4 -> */ {4, 9},
+    /* 8, 4 -> */ {6, 7},
+    /* 9, 4 -> */ {9, 0},
+    /* 10, 4 -> */ {8, 9},
+    /* 11, 4 -> */ {-1,-1}, /* does not exist */
+    /* 12, 4 -> */ {-1,-1}, /* does not exist */
+    /* 0, 5 -> */ {0, 5}, /* no alternatives */
+    /* 1, 5 -> */ {1, 5}, /* no alternatives */
+    /* 2, 5 -> */ {2, 5}, /* no alternatives */
+    /* 3, 5 -> */ {4, 2},
+    /* 4, 5 -> */ {4, 5}, /* no alternatives */
+    /* 5, 5 -> */ {5, 11},
+    /* 6, 5 -> */ {6, 5}, /* no alternatives */
+    /* 7, 5 -> */ {4, 8},
+    /* 8, 5 -> */ {6, 11},
+    /* 9, 5 -> */ {9, 2},
+    /* 10, 5 -> */ {8, 8},
+    /* 11, 5 -> */ {-1,-1}, /* does not exist */
+    /* 12, 5 -> */ {-1,-1}, /* does not exist */
+    /* 0, 6 -> */ {0, 6}, /* no alternatives */
+    /* 1, 6 -> */ {1, 6}, /* no alternatives */
+    /* 2, 6 -> */ {6, 1},
+    /* 3, 6 -> */ {3, 6}, /* no alternatives */
+    /* 4, 6 -> */ {4, 6}, /* no alternatives */
+    /* 5, 6 -> */ {8, 12},
+    /* 6, 6 -> */ {12, 1},
+    /* 7, 6 -> */ {10, 1},
+    /* 8, 6 -> */ {4, 12},
+    /* 9, 6 -> */ {9, 6}, /* no alternatives */
+    /* 10, 6 -> */ {5, 10},
+    /* 11, 6 -> */ {-1,-1}, /* does not exist */
+    /* 12, 6 -> */ {-1,-1}, /* does not exist */
+    /* 0, 7 -> */ {0, 7}, /* no alternatives */
+    /* 1, 7 -> */ {1, 7}, /* no alternatives */
+    /* 2, 7 -> */ {2, 7}, /* no alternatives */
+    /* 3, 7 -> */ {3, 7}, /* no alternatives */
+    /* 4, 7 -> */ {4, 7}, /* no alternatives */
+    /* 5, 7 -> */ {5, 4},
+    /* 6, 7 -> */ {7, 0},
+    /* 7, 7 -> */ {10, 8},
+    /* 8, 7 -> */ {8, 7}, /* no alternatives */
+    /* 9, 7 -> */ {9, 7}, /* no alternatives */
+    /* 10, 7 -> */ {10, 7}, /* no alternatives */
+    /* 11, 7 -> */ {-1,-1}, /* does not exist */
+    /* 12, 7 -> */ {-1,-1}, /* does not exist */
+    /* 0, 8 -> */ {0, 8}, /* no alternatives */
+    /* 1, 8 -> */ {1, 8}, /* no alternatives */
+    /* 2, 8 -> */ {5, 0},
+    /* 3, 8 -> */ {3, 8}, /* no alternatives */
+    /* 4, 8 -> */ {7, 5},
+    /* 5, 8 -> */ {5, 8}, /* no alternatives */
+    /* 6, 8 -> */ {6, 8}, /* no alternatives */
+    /* 7, 8 -> */ {7, 8}, /* no alternatives */
+    /* 8, 8 -> */ {11, 0},
+    /* 9, 8 -> */ {8, 0},
+    /* 10, 8 -> */ {7, 7},
+    /* 11, 8 -> */ {-1,-1}, /* does not exist */
+    /* 12, 8 -> */ {-1,-1}, /* does not exist */
+    /* 0, 9 -> */ {0, 9}, /* no alternatives */
+    /* 1, 9 -> */ {1, 9}, /* no alternatives */
+    /* 2, 9 -> */ {4, 1},
+    /* 3, 9 -> */ {3, 9}, /* no alternatives */
+    /* 4, 9 -> */ {7, 4},
+    /* 5, 9 -> */ {5, 9}, /* no alternatives */
+    /* 6, 9 -> */ {6, 9}, /* no alternatives */
+    /* 7, 9 -> */ {7, 9}, /* no alternatives */
+    /* 8, 9 -> */ {7, 1},
+    /* 9, 9 -> */ {9, 1},
+    /* 10, 9 -> */ {7, 10},
+    /* 11, 9 -> */ {-1,-1}, /* does not exist */
+    /* 12, 9 -> */ {-1,-1}, /* does not exist */
+    /* 0, 10 -> */ {0, 10}, /* no alternatives */
+    /* 1, 10 -> */ {1, 10}, /* no alternatives */
+    /* 2, 10 -> */ {2, 10}, /* no alternatives */
+    /* 3, 10 -> */ {3, 10}, /* no alternatives */
+    /* 4, 10 -> */ {4, 10}, /* no alternatives */
+    /* 5, 10 -> */ {10, 6},
+    /* 6, 10 -> */ {7, 6},
+    /* 7, 10 -> */ {10, 9},
+    /* 8, 10 -> */ {8, 10}, /* no alternatives */
+    /* 9, 10 -> */ {9, 10}, /* no alternatives */
+    /* 10, 10 -> */ {10, 10}, /* no alternatives */
+    /* 11, 10 -> */ {-1,-1}, /* does not exist */
+    /* 12, 10 -> */ {-1,-1}, /* does not exist */
+    /* 0, 11 -> */ {0, 11}, /* no alternatives */
+    /* 1, 11 -> */ {1, 11}, /* no alternatives */
+    /* 2, 11 -> */ {2, 11}, /* no alternatives */
+    /* 3, 11 -> */ {3, 11}, /* no alternatives */
+    /* 4, 11 -> */ {4, 11}, /* no alternatives */
+    /* 5, 11 -> */ {5, 5},
+    /* 6, 11 -> */ {7, 2},
+    /* 7, 11 -> */ {10, 12},
+    /* 8, 11 -> */ {8, 11}, /* no alternatives */
+    /* 9, 11 -> */ {9, 11}, /* no alternatives */
+    /* 10, 11 -> */ {10, 11}, /* no alternatives */
+    /* 11, 11 -> */ {-1,-1}, /* does not exist */
+    /* 12, 11 -> */ {-1,-1}, /* does not exist */
+    /* 0, 12 -> */ {0, 12}, /* no alternatives */
+    /* 1, 12 -> */ {1, 12}, /* no alternatives */
+    /* 2, 12 -> */ {5, 2},
+    /* 3, 12 -> */ {3, 12}, /* no alternatives */
+    /* 4, 12 -> */ {8, 6},
+    /* 5, 12 -> */ {5, 12}, /* no alternatives */
+    /* 6, 12 -> */ {6, 12}, /* no alternatives */
+    /* 7, 12 -> */ {7, 12}, /* no alternatives */
+    /* 8, 12 -> */ {11, 2},
+    /* 9, 12 -> */ {8, 2},
+    /* 10, 12 -> */ {7, 11},
+    /* 11, 12 -> */ {-1,-1}, /* does not exist */
+    /* 12, 12 -> */ {-1,-1}, /* does not exist */
+};
+static const MetamapEntry metamap_T[] = {
+    /* 0, 0 -> */ {0, 0}, /* no alternatives */
+    /* 1, 0 -> */ {1, 0}, /* no alternatives */
+    /* 2, 0 -> */ {2, 0}, /* no alternatives */
+    /* 3, 0 -> */ {3, 0}, /* no alternatives */
+    /* 4, 0 -> */ {3, 3},
+    /* 5, 0 -> */ {3, 1},
+    /* 6, 0 -> */ {2, 2},
+    /* 7, 0 -> */ {8, 3},
+    /* 8, 0 -> */ {9, 1},
+    /* 9, 0 -> */ {9, 3},
+    /* 10, 0 -> */ {4, 6},
+    /* 11, 0 -> */ {4, 4},
+    /* 12, 0 -> */ {6, 2},
+    /* 0, 1 -> */ {0, 1}, /* no alternatives */
+    /* 1, 1 -> */ {1, 1}, /* no alternatives */
+    /* 2, 1 -> */ {2, 1}, /* no alternatives */
+    /* 3, 1 -> */ {5, 0},
+    /* 4, 1 -> */ {4, 1}, /* no alternatives */
+    /* 5, 1 -> */ {8, 4},
+    /* 6, 1 -> */ {6, 1}, /* no alternatives */
+    /* 7, 1 -> */ {6, 5},
+    /* 8, 1 -> */ {11, 0},
+    /* 9, 1 -> */ {8, 0},
+    /* 10, 1 -> */ {5, 5},
+    /* 11, 1 -> */ {-1,-1}, /* does not exist */
+    /* 12, 1 -> */ {-1,-1}, /* does not exist */
+    /* 0, 2 -> */ {0, 2}, /* no alternatives */
+    /* 1, 2 -> */ {1, 2}, /* no alternatives */
+    /* 2, 2 -> */ {6, 0},
+    /* 3, 2 -> */ {3, 2}, /* no alternatives */
+    /* 4, 2 -> */ {4, 2}, /* no alternatives */
+    /* 5, 2 -> */ {5, 4},
+    /* 6, 2 -> */ {12, 0},
+    /* 7, 2 -> */ {10, 0},
+    /* 8, 2 -> */ {6, 4},
+    /* 9, 2 -> */ {9, 2}, /* no alternatives */
+    /* 10, 2 -> */ {8, 6},
+    /* 11, 2 -> */ {-1,-1}, /* does not exist */
+    /* 12, 2 -> */ {-1,-1}, /* does not exist */
+    /* 0, 3 -> */ {0, 3}, /* no alternatives */
+    /* 1, 3 -> */ {1, 3}, /* no alternatives */
+    /* 2, 3 -> */ {2, 3}, /* no alternatives */
+    /* 3, 3 -> */ {4, 0},
+    /* 4, 3 -> */ {4, 3}, /* no alternatives */
+    /* 5, 3 -> */ {8, 5},
+    /* 6, 3 -> */ {6, 3}, /* no alternatives */
+    /* 7, 3 -> */ {6, 6},
+    /* 8, 3 -> */ {4, 5},
+    /* 9, 3 -> */ {9, 0},
+    /* 10, 3 -> */ {5, 6},
+    /* 11, 3 -> */ {-1,-1}, /* does not exist */
+    /* 12, 3 -> */ {-1,-1}, /* does not exist */
+    /* 0, 4 -> */ {0, 4}, /* no alternatives */
+    /* 1, 4 -> */ {1, 4}, /* no alternatives */
+    /* 2, 4 -> */ {2, 4}, /* no alternatives */
+    /* 3, 4 -> */ {3, 4}, /* no alternatives */
+    /* 4, 4 -> */ {8, 1},
+    /* 5, 4 -> */ {5, 2},
+    /* 6, 4 -> */ {8, 2},
+    /* 7, 4 -> */ {7, 4}, /* no alternatives */
+    /* 8, 4 -> */ {5, 1},
+    /* 9, 4 -> */ {9, 4}, /* no alternatives */
+    /* 10, 4 -> */ {10, 4}, /* no alternatives */
+    /* 11, 4 -> */ {-1,-1}, /* does not exist */
+    /* 12, 4 -> */ {-1,-1}, /* does not exist */
+    /* 0, 5 -> */ {0, 5}, /* no alternatives */
+    /* 1, 5 -> */ {1, 5}, /* no alternatives */
+    /* 2, 5 -> */ {2, 5}, /* no alternatives */
+    /* 3, 5 -> */ {3, 5}, /* no alternatives */
+    /* 4, 5 -> */ {7, 0},
+    /* 5, 5 -> */ {10, 1},
+    /* 6, 5 -> */ {7, 1},
+    /* 7, 5 -> */ {7, 5}, /* no alternatives */
+    /* 8, 5 -> */ {5, 3},
+    /* 9, 5 -> */ {9, 5}, /* no alternatives */
+    /* 10, 5 -> */ {10, 5}, /* no alternatives */
+    /* 11, 5 -> */ {-1,-1}, /* does not exist */
+    /* 12, 5 -> */ {-1,-1}, /* does not exist */
+    /* 0, 6 -> */ {0, 6}, /* no alternatives */
+    /* 1, 6 -> */ {1, 6}, /* no alternatives */
+    /* 2, 6 -> */ {2, 6}, /* no alternatives */
+    /* 3, 6 -> */ {3, 6}, /* no alternatives */
+    /* 4, 6 -> */ {7, 2},
+    /* 5, 6 -> */ {10, 3},
+    /* 6, 6 -> */ {7, 3},
+    /* 7, 6 -> */ {7, 6}, /* no alternatives */
+    /* 8, 6 -> */ {10, 2},
+    /* 9, 6 -> */ {9, 6}, /* no alternatives */
+    /* 10, 6 -> */ {10, 6}, /* no alternatives */
+    /* 11, 6 -> */ {-1,-1}, /* does not exist */
+    /* 12, 6 -> */ {-1,-1}, /* does not exist */
+};
+static const MetamapEntry metamap_P[] = {
+    /* 0, 0 -> */ {0, 0}, /* no alternatives */
+    /* 1, 0 -> */ {1, 0}, /* no alternatives */
+    /* 2, 0 -> */ {2, 0}, /* no alternatives */
+    /* 3, 0 -> */ {3, 0}, /* no alternatives */
+    /* 4, 0 -> */ {3, 4},
+    /* 5, 0 -> */ {2, 5},
+    /* 6, 0 -> */ {2, 3},
+    /* 7, 0 -> */ {8, 4},
+    /* 8, 0 -> */ {9, 5},
+    /* 9, 0 -> */ {9, 4},
+    /* 10, 0 -> */ {4, 9},
+    /* 11, 0 -> */ {4, 8},
+    /* 12, 0 -> */ {6, 3},
+    /* 0, 1 -> */ {0, 1}, /* no alternatives */
+    /* 1, 1 -> */ {1, 1}, /* no alternatives */
+    /* 2, 1 -> */ {2, 1}, /* no alternatives */
+    /* 3, 1 -> */ {3, 1}, /* no alternatives */
+    /* 4, 1 -> */ {2, 10},
+    /* 5, 1 -> */ {3, 2},
+    /* 6, 1 -> */ {2, 4},
+    /* 7, 1 -> */ {8, 10},
+    /* 8, 1 -> */ {9, 2},
+    /* 9, 1 -> */ {9, 10},
+    /* 10, 1 -> */ {7, 4},
+    /* 11, 1 -> */ {8, 2},
+    /* 12, 1 -> */ {6, 4},
+    /* 0, 2 -> */ {0, 2}, /* no alternatives */
+    /* 1, 2 -> */ {1, 2}, /* no alternatives */
+    /* 2, 2 -> */ {2, 2}, /* no alternatives */
+    /* 3, 2 -> */ {5, 1},
+    /* 4, 2 -> */ {4, 2}, /* no alternatives */
+    /* 5, 2 -> */ {8, 6},
+    /* 6, 2 -> */ {6, 2}, /* no alternatives */
+    /* 7, 2 -> */ {6, 7},
+    /* 8, 2 -> */ {4, 6},
+    /* 9, 2 -> */ {8, 1},
+    /* 10, 2 -> */ {5, 7},
+    /* 11, 2 -> */ {-1,-1}, /* does not exist */
+    /* 12, 2 -> */ {-1,-1}, /* does not exist */
+    /* 0, 3 -> */ {0, 3}, /* no alternatives */
+    /* 1, 3 -> */ {1, 3}, /* no alternatives */
+    /* 2, 3 -> */ {6, 0},
+    /* 3, 3 -> */ {3, 3}, /* no alternatives */
+    /* 4, 3 -> */ {4, 3}, /* no alternatives */
+    /* 5, 3 -> */ {5, 8},
+    /* 6, 3 -> */ {12, 0},
+    /* 7, 3 -> */ {10, 0},
+    /* 8, 3 -> */ {6, 8},
+    /* 9, 3 -> */ {9, 3}, /* no alternatives */
+    /* 10, 3 -> */ {8, 9},
+    /* 11, 3 -> */ {-1,-1}, /* does not exist */
+    /* 12, 3 -> */ {-1,-1}, /* does not exist */
+    /* 0, 4 -> */ {0, 4}, /* no alternatives */
+    /* 1, 4 -> */ {1, 4}, /* no alternatives */
+    /* 2, 4 -> */ {6, 1},
+    /* 3, 4 -> */ {4, 0},
+    /* 4, 4 -> */ {4, 4}, /* no alternatives */
+    /* 5, 4 -> */ {5, 6},
+    /* 6, 4 -> */ {12, 1},
+    /* 7, 4 -> */ {6, 9},
+    /* 8, 4 -> */ {6, 6},
+    /* 9, 4 -> */ {9, 0},
+    /* 10, 4 -> */ {5, 9},
+    /* 11, 4 -> */ {-1,-1}, /* does not exist */
+    /* 12, 4 -> */ {-1,-1}, /* does not exist */
+    /* 0, 5 -> */ {0, 5}, /* no alternatives */
+    /* 1, 5 -> */ {1, 5}, /* no alternatives */
+    /* 2, 5 -> */ {5, 0},
+    /* 3, 5 -> */ {3, 5}, /* no alternatives */
+    /* 4, 5 -> */ {8, 8},
+    /* 5, 5 -> */ {5, 5}, /* no alternatives */
+    /* 6, 5 -> */ {6, 5}, /* no alternatives */
+    /* 7, 5 -> */ {7, 5}, /* no alternatives */
+    /* 8, 5 -> */ {11, 0},
+    /* 9, 5 -> */ {8, 0},
+    /* 10, 5 -> */ {7, 6},
+    /* 11, 5 -> */ {-1,-1}, /* does not exist */
+    /* 12, 5 -> */ {-1,-1}, /* does not exist */
+    /* 0, 6 -> */ {0, 6}, /* no alternatives */
+    /* 1, 6 -> */ {1, 6}, /* no alternatives */
+    /* 2, 6 -> */ {2, 6}, /* no alternatives */
+    /* 3, 6 -> */ {3, 6}, /* no alternatives */
+    /* 4, 6 -> */ {11, 1},
+    /* 5, 6 -> */ {5, 4},
+    /* 6, 6 -> */ {7, 0},
+    /* 7, 6 -> */ {10, 5},
+    /* 8, 6 -> */ {5, 2},
+    /* 9, 6 -> */ {9, 6}, /* no alternatives */
+    /* 10, 6 -> */ {10, 6}, /* no alternatives */
+    /* 11, 6 -> */ {-1,-1}, /* does not exist */
+    /* 12, 6 -> */ {-1,-1}, /* does not exist */
+    /* 0, 7 -> */ {0, 7}, /* no alternatives */
+    /* 1, 7 -> */ {1, 7}, /* no alternatives */
+    /* 2, 7 -> */ {2, 7}, /* no alternatives */
+    /* 3, 7 -> */ {3, 7}, /* no alternatives */
+    /* 4, 7 -> */ {7, 1},
+    /* 5, 7 -> */ {10, 2},
+    /* 6, 7 -> */ {7, 2},
+    /* 7, 7 -> */ {7, 7}, /* no alternatives */
+    /* 8, 7 -> */ {4, 10},
+    /* 9, 7 -> */ {9, 7}, /* no alternatives */
+    /* 10, 7 -> */ {10, 7}, /* no alternatives */
+    /* 11, 7 -> */ {-1,-1}, /* does not exist */
+    /* 12, 7 -> */ {-1,-1}, /* does not exist */
+    /* 0, 8 -> */ {0, 8}, /* no alternatives */
+    /* 1, 8 -> */ {1, 8}, /* no alternatives */
+    /* 2, 8 -> */ {2, 8}, /* no alternatives */
+    /* 3, 8 -> */ {3, 8}, /* no alternatives */
+    /* 4, 8 -> */ {8, 5},
+    /* 5, 8 -> */ {5, 3},
+    /* 6, 8 -> */ {8, 3},
+    /* 7, 8 -> */ {7, 8}, /* no alternatives */
+    /* 8, 8 -> */ {4, 5},
+    /* 9, 8 -> */ {9, 8}, /* no alternatives */
+    /* 10, 8 -> */ {10, 8}, /* no alternatives */
+    /* 11, 8 -> */ {-1,-1}, /* does not exist */
+    /* 12, 8 -> */ {-1,-1}, /* does not exist */
+    /* 0, 9 -> */ {0, 9}, /* no alternatives */
+    /* 1, 9 -> */ {1, 9}, /* no alternatives */
+    /* 2, 9 -> */ {2, 9}, /* no alternatives */
+    /* 3, 9 -> */ {3, 9}, /* no alternatives */
+    /* 4, 9 -> */ {7, 3},
+    /* 5, 9 -> */ {10, 4},
+    /* 6, 9 -> */ {10, 1},
+    /* 7, 9 -> */ {10, 10},
+    /* 8, 9 -> */ {10, 3},
+    /* 9, 9 -> */ {9, 9}, /* no alternatives */
+    /* 10, 9 -> */ {10, 9}, /* no alternatives */
+    /* 11, 9 -> */ {-1,-1}, /* does not exist */
+    /* 12, 9 -> */ {-1,-1}, /* does not exist */
+    /* 0, 10 -> */ {0, 10}, /* no alternatives */
+    /* 1, 10 -> */ {1, 10}, /* no alternatives */
+    /* 2, 10 -> */ {4, 1},
+    /* 3, 10 -> */ {3, 10}, /* no alternatives */
+    /* 4, 10 -> */ {8, 7},
+    /* 5, 10 -> */ {5, 10}, /* no alternatives */
+    /* 6, 10 -> */ {6, 10}, /* no alternatives */
+    /* 7, 10 -> */ {7, 10}, /* no alternatives */
+    /* 8, 10 -> */ {4, 7},
+    /* 9, 10 -> */ {9, 1},
+    /* 10, 10 -> */ {7, 9},
+    /* 11, 10 -> */ {-1,-1}, /* does not exist */
+    /* 12, 10 -> */ {-1,-1}, /* does not exist */
+};
+static const MetamapEntry metamap_F[] = {
+    /* 0, 0 -> */ {0, 0}, /* no alternatives */
+    /* 1, 0 -> */ {1, 0}, /* no alternatives */
+    /* 2, 0 -> */ {2, 0}, /* no alternatives */
+    /* 3, 0 -> */ {3, 0}, /* no alternatives */
+    /* 4, 0 -> */ {3, 3},
+    /* 5, 0 -> */ {2, 4},
+    /* 6, 0 -> */ {2, 2},
+    /* 7, 0 -> */ {8, 3},
+    /* 8, 0 -> */ {9, 4},
+    /* 9, 0 -> */ {9, 3},
+    /* 10, 0 -> */ {4, 9},
+    /* 11, 0 -> */ {4, 8},
+    /* 12, 0 -> */ {6, 2},
+    /* 0, 1 -> */ {0, 1}, /* no alternatives */
+    /* 1, 1 -> */ {1, 1}, /* no alternatives */
+    /* 2, 1 -> */ {2, 1}, /* no alternatives */
+    /* 3, 1 -> */ {3, 1}, /* no alternatives */
+    /* 4, 1 -> */ {2, 10},
+    /* 5, 1 -> */ {2, 6},
+    /* 6, 1 -> */ {2, 3},
+    /* 7, 1 -> */ {8, 10},
+    /* 8, 1 -> */ {9, 6},
+    /* 9, 1 -> */ {9, 10},
+    /* 10, 1 -> */ {7, 3},
+    /* 11, 1 -> */ {8, 6},
+    /* 12, 1 -> */ {6, 3},
+    /* 0, 2 -> */ {0, 2}, /* no alternatives */
+    /* 1, 2 -> */ {1, 2}, /* no alternatives */
+    /* 2, 2 -> */ {6, 0},
+    /* 3, 2 -> */ {3, 2}, /* no alternatives */
+    /* 4, 2 -> */ {4, 2}, /* no alternatives */
+    /* 5, 2 -> */ {5, 8},
+    /* 6, 2 -> */ {12, 0},
+    /* 7, 2 -> */ {10, 0},
+    /* 8, 2 -> */ {6, 8},
+    /* 9, 2 -> */ {9, 2}, /* no alternatives */
+    /* 10, 2 -> */ {8, 9},
+    /* 11, 2 -> */ {-1,-1}, /* does not exist */
+    /* 12, 2 -> */ {-1,-1}, /* does not exist */
+    /* 0, 3 -> */ {0, 3}, /* no alternatives */
+    /* 1, 3 -> */ {1, 3}, /* no alternatives */
+    /* 2, 3 -> */ {6, 1},
+    /* 3, 3 -> */ {4, 0},
+    /* 4, 3 -> */ {4, 3}, /* no alternatives */
+    /* 5, 3 -> */ {5, 5},
+    /* 6, 3 -> */ {12, 1},
+    /* 7, 3 -> */ {6, 9},
+    /* 8, 3 -> */ {6, 5},
+    /* 9, 3 -> */ {9, 0},
+    /* 10, 3 -> */ {5, 9},
+    /* 11, 3 -> */ {-1,-1}, /* does not exist */
+    /* 12, 3 -> */ {-1,-1}, /* does not exist */
+    /* 0, 4 -> */ {0, 4}, /* no alternatives */
+    /* 1, 4 -> */ {1, 4}, /* no alternatives */
+    /* 2, 4 -> */ {5, 0},
+    /* 3, 4 -> */ {3, 4}, /* no alternatives */
+    /* 4, 4 -> */ {8, 8},
+    /* 5, 4 -> */ {5, 4}, /* no alternatives */
+    /* 6, 4 -> */ {6, 4}, /* no alternatives */
+    /* 7, 4 -> */ {7, 4}, /* no alternatives */
+    /* 8, 4 -> */ {11, 0},
+    /* 9, 4 -> */ {8, 0},
+    /* 10, 4 -> */ {7, 5},
+    /* 11, 4 -> */ {-1,-1}, /* does not exist */
+    /* 12, 4 -> */ {-1,-1}, /* does not exist */
+    /* 0, 5 -> */ {0, 5}, /* no alternatives */
+    /* 1, 5 -> */ {1, 5}, /* no alternatives */
+    /* 2, 5 -> */ {2, 5}, /* no alternatives */
+    /* 3, 5 -> */ {3, 5}, /* no alternatives */
+    /* 4, 5 -> */ {11, 1},
+    /* 5, 5 -> */ {5, 3},
+    /* 6, 5 -> */ {7, 0},
+    /* 7, 5 -> */ {10, 4},
+    /* 8, 5 -> */ {4, 6},
+    /* 9, 5 -> */ {9, 5}, /* no alternatives */
+    /* 10, 5 -> */ {10, 5}, /* no alternatives */
+    /* 11, 5 -> */ {-1,-1}, /* does not exist */
+    /* 12, 5 -> */ {-1,-1}, /* does not exist */
+    /* 0, 6 -> */ {0, 6}, /* no alternatives */
+    /* 1, 6 -> */ {1, 6}, /* no alternatives */
+    /* 2, 6 -> */ {5, 1},
+    /* 3, 6 -> */ {3, 6}, /* no alternatives */
+    /* 4, 6 -> */ {8, 5},
+    /* 5, 6 -> */ {5, 6}, /* no alternatives */
+    /* 6, 6 -> */ {6, 6}, /* no alternatives */
+    /* 7, 6 -> */ {7, 6}, /* no alternatives */
+    /* 8, 6 -> */ {4, 5},
+    /* 9, 6 -> */ {8, 1},
+    /* 10, 6 -> */ {7, 7},
+    /* 11, 6 -> */ {-1,-1}, /* does not exist */
+    /* 12, 6 -> */ {-1,-1}, /* does not exist */
+    /* 0, 7 -> */ {0, 7}, /* no alternatives */
+    /* 1, 7 -> */ {1, 7}, /* no alternatives */
+    /* 2, 7 -> */ {2, 7}, /* no alternatives */
+    /* 3, 7 -> */ {3, 7}, /* no alternatives */
+    /* 4, 7 -> */ {4, 7}, /* no alternatives */
+    /* 5, 7 -> */ {4, 10},
+    /* 6, 7 -> */ {7, 1},
+    /* 7, 7 -> */ {10, 6},
+    /* 8, 7 -> */ {8, 7}, /* no alternatives */
+    /* 9, 7 -> */ {9, 7}, /* no alternatives */
+    /* 10, 7 -> */ {10, 7}, /* no alternatives */
+    /* 11, 7 -> */ {-1,-1}, /* does not exist */
+    /* 12, 7 -> */ {-1,-1}, /* does not exist */
+    /* 0, 8 -> */ {0, 8}, /* no alternatives */
+    /* 1, 8 -> */ {1, 8}, /* no alternatives */
+    /* 2, 8 -> */ {2, 8}, /* no alternatives */
+    /* 3, 8 -> */ {3, 8}, /* no alternatives */
+    /* 4, 8 -> */ {8, 4},
+    /* 5, 8 -> */ {5, 2},
+    /* 6, 8 -> */ {8, 2},
+    /* 7, 8 -> */ {7, 8}, /* no alternatives */
+    /* 8, 8 -> */ {4, 4},
+    /* 9, 8 -> */ {9, 8}, /* no alternatives */
+    /* 10, 8 -> */ {10, 8}, /* no alternatives */
+    /* 11, 8 -> */ {-1,-1}, /* does not exist */
+    /* 12, 8 -> */ {-1,-1}, /* does not exist */
+    /* 0, 9 -> */ {0, 9}, /* no alternatives */
+    /* 1, 9 -> */ {1, 9}, /* no alternatives */
+    /* 2, 9 -> */ {2, 9}, /* no alternatives */
+    /* 3, 9 -> */ {3, 9}, /* no alternatives */
+    /* 4, 9 -> */ {7, 2},
+    /* 5, 9 -> */ {10, 3},
+    /* 6, 9 -> */ {10, 1},
+    /* 7, 9 -> */ {10, 10},
+    /* 8, 9 -> */ {10, 2},
+    /* 9, 9 -> */ {9, 9}, /* no alternatives */
+    /* 10, 9 -> */ {10, 9}, /* no alternatives */
+    /* 11, 9 -> */ {-1,-1}, /* does not exist */
+    /* 12, 9 -> */ {-1,-1}, /* does not exist */
+    /* 0, 10 -> */ {0, 10}, /* no alternatives */
+    /* 1, 10 -> */ {1, 10}, /* no alternatives */
+    /* 2, 10 -> */ {4, 1},
+    /* 3, 10 -> */ {3, 10}, /* no alternatives */
+    /* 4, 10 -> */ {5, 7},
+    /* 5, 10 -> */ {5, 10}, /* no alternatives */
+    /* 6, 10 -> */ {6, 10}, /* no alternatives */
+    /* 7, 10 -> */ {7, 10}, /* no alternatives */
+    /* 8, 10 -> */ {6, 7},
+    /* 9, 10 -> */ {9, 1},
+    /* 10, 10 -> */ {7, 9},
+    /* 11, 10 -> */ {-1,-1}, /* does not exist */
+    /* 12, 10 -> */ {-1,-1}, /* does not exist */
+};
+static const MetamapEntry *const metamap[] = {
+    metamap_H,
+    metamap_T,
+    metamap_P,
+    metamap_F,
+};
diff --git a/apps/plugins/puzzles/src/hat.c b/apps/plugins/puzzles/src/hat.c
new file mode 100644
index 0000000000..176d1f049e
--- /dev/null
+++ b/apps/plugins/puzzles/src/hat.c
@@ -0,0 +1,891 @@
+/*
+ * Code to generate patches of the aperiodic 'hat' tiling discovered
+ * in 2023.
+ *
+ * This uses the 'combinatorial coordinates' system documented in my
+ * public article
+ * https://www.chiark.greenend.org.uk/~sgtatham/quasiblog/aperiodic-tilings/
+ *
+ * The internal document auxiliary/doc/hats.html also contains an
+ * explanation of the basic ideas of this algorithm (less polished but
+ * containing more detail).
+ *
+ * Neither of those documents can really be put in a source file,
+ * because they just have too many complicated diagrams. So read at
+ * least one of those first; the comments in here will refer to it.
+ *
+ * Discoverers' website: https://cs.uwaterloo.ca/~csk/hat/
+ * Preprint of paper:    https://arxiv.org/abs/2303.10798
+ */
+
+#include <assert.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "puzzles.h"
+#include "hat.h"
+#include "hat-internal.h"
+
+void hat_kiteenum_first(KiteEnum *s, int w, int h)
+{
+    Kite start = { {0,0}, {0, 3}, {3, 0}, {2, 2} };
+    size_t i;
+
+    for (i = 0; i < KE_NKEEP; i++)
+        s->recent[i] = start;          /* initialise to *something* */
+    s->curr_index = 0;
+    s->curr = &s->recent[s->curr_index];
+    s->state = 1;
+    s->w = w;
+    s->h = h;
+    s->x = 0;
+    s->y = 0;
+}
+
+bool hat_kiteenum_next(KiteEnum *s)
+{
+    unsigned lastbut1 = s->last_index;
+    s->last_index = s->curr_index;
+    s->curr_index = (s->curr_index + 1) % KE_NKEEP;
+    s->curr = &s->recent[s->curr_index];
+
+    switch (s->state) {
+        /* States 1,2,3 walk rightwards along the upper side of a
+         * horizontal grid line with a pointy kite end at the start
+         * point */
+      case 1:
+        s->last_step = KS_F_RIGHT;
+        s->state = 2;
+        break;
+
+      case 2:
+        if (s->x+1 >= s->w) {
+            s->last_step = KS_F_RIGHT;
+            s->state = 4;
+            break;
+        }
+        s->last_step = KS_RIGHT;
+        s->state = 3;
+        s->x++;
+        break;
+
+      case 3:
+        s->last_step = KS_RIGHT;
+        s->state = 1;
+        break;
+
+        /* State 4 is special: we've just moved up into a row below a
+         * grid line, but we can't produce the rightmost tile of that
+         * row because it's not adjacent any tile so far emitted. So
+         * instead, emit the second-rightmost tile, and next time,
+         * we'll emit the rightmost. */
+      case 4:
+        s->last_step = KS_LEFT;
+        s->state = 5;
+        break;
+
+        /* And now we have to emit the third-rightmost tile relative
+         * to the last but one tile we emitted (the one from state 2,
+         * not state 4). */
+      case 5:
+        s->last_step = KS_RIGHT;
+        s->last_index = lastbut1;
+        s->state = 6;
+        break;
+
+        /* Now states 6-8 handle the general case of walking leftwards
+         * along the lower side of a line, starting from a
+         * right-angled kite end. */
+      case 6:
+        if (s->x <= 0) {
+            if (s->y+1 >= s->h) {
+                s->state = 0;
+                return false;
+            }
+            s->last_step = KS_RIGHT;
+            s->state = 9;
+            s->y++;
+            break;
+        }
+        s->last_step = KS_F_RIGHT;
+        s->state = 7;
+        s->x--;
+        break;
+
+      case 7:
+        s->last_step = KS_RIGHT;
+        s->state = 8;
+        break;
+
+      case 8:
+        s->last_step = KS_RIGHT;
+        s->state = 6;
+        break;
+
+        /* States 9,10,11 walk rightwards along the upper side of a
+         * horizontal grid line with a right-angled kite end at the
+         * start point. This time there's no awkward transition from
+         * the previous row. */
+      case 9:
+        s->last_step = KS_RIGHT;
+        s->state = 10;
+        break;
+
+      case 10:
+        s->last_step = KS_RIGHT;
+        s->state = 11;
+        break;
+
+      case 11:
+        if (s->x+1 >= s->w) {
+            /* Another awkward transition to the next row, where we
+             * have to generate it based on the previous state-9 tile.
+             * But this time at least we generate the rightmost tile
+             * of the new row, so the next states will be simple. */
+            s->last_step = KS_F_RIGHT;
+            s->last_index = lastbut1;
+            s->state = 12;
+            break;
+        }
+        s->last_step = KS_F_RIGHT;
+        s->state = 9;
+        s->x++;
+        break;
+
+        /* States 12,13,14 walk leftwards along the upper edge of a
+         * horizontal grid line with a pointy kite end at the start
+         * point */
+      case 12:
+        s->last_step = KS_F_RIGHT;
+        s->state = 13;
+        break;
+
+      case 13:
+        if (s->x <= 0) {
+            if (s->y+1 >= s->h) {
+                s->state = 0;
+                return false;
+            }
+            s->last_step = KS_LEFT;
+            s->state = 1;
+            s->y++;
+            break;
+        }
+        s->last_step = KS_RIGHT;
+        s->state = 14;
+        s->x--;
+        break;
+
+      case 14:
+        s->last_step = KS_RIGHT;
+        s->state = 12;
+        break;
+
+      default:
+        return false;
+    }
+
+    *s->curr = kite_step(s->recent[s->last_index], s->last_step);
+    return true;
+}
+
+/*
+ * The actual tables.
+ */
+#include "hat-tables.h"
+
+/*
+ * One set of tables that we write by hand: the permitted ways to
+ * extend the coordinate system outwards from a given metatile.
+ *
+ * One obvious approach would be to make a table of all the places
+ * each metatile can appear in the expansion of another (e.g. H can be
+ * subtile 0, 1 or 2 of another H, subtile 0 of a T, or 0 or 1 of a P
+ * or an F), and when we need to decide what our current topmost tile
+ * turns out to be a subtile of, choose equiprobably at random from
+ * those options.
+ *
+ * That's what I did originally, but a better approach is to skew the
+ * probabilities. We'd like to generate our patch of actual tiling
+ * uniformly at random, in the sense that if you selected uniformly
+ * from a very large region of the plane, the distribution of possible
+ * finite patches of tiling would converge to some limit as that
+ * region tended to infinity, and we'd be picking from that limiting
+ * distribution on finite patches.
+ *
+ * For this we have to refer back to the original paper, which
+ * indicates the subset of each metatile's expansion that can be
+ * considered to 'belong' to that metatile, such that every subtile
+ * belongs to exactly one parent metatile, and the overlaps are
+ * eliminated. Reading out the diagrams from their Figure 2.8:
+ *
+ * - H: we discard three of the outer F subtiles, in the symmetric
+ *    positions index by our coordinates as 7, 10, 11. So we keep the
+ *    remaining subtiles {0,1,2,3,4,5,6,8,9,12}, which consist of
+ *    three H, one T, three P and three F.
+ *
+ * - T: only the central H expanded from a T is considered to belong
+ *   to it, so we just keep {0}, a single H.
+ *
+ * - P: we discard everything intersected by a long edge of the
+ *   parallelogram, leaving the central three tiles and the endmost
+ *   pair of F. That is, we keep {0,1,4,5,10}, consisting of two H,
+ *   one P and two F.
+ *
+ * - F: looks like P at one end, and we retain the corresponding set
+ *   of tiles there, but at the other end we keep the two F on either
+ *   side of the endmost one. So we keep {0,1,3,6,8,10}, consisting of
+ *   two H, one P and _three_ F.
+ *
+ * Adding up the tile numbers gives us this matrix system:
+ *
+ * (H_1)   (3 1 2 2)(H_0)
+ * (T_1) = (1 0 0 0)(T_0)
+ * (P_1)   (3 0 1 1)(P_0)
+ * (F_1)   (3 0 2 3)(F_0)
+ *
+ * which says that if you have a patch of metatiling consisting of H_0
+ * H tiles, T_0 T tiles etc, then this matrix shows the number H_1 of
+ * smaller H tiles, etc, expanded from it.
+ *
+ * If you expand _many_ times, that's equivalent to raising the matrix
+ * to a power:
+ *
+ *                  n
+ * (H_n)   (3 1 2 2) (H_0)
+ * (T_n) = (1 0 0 0) (T_0)
+ * (P_n)   (3 0 1 1) (P_0)
+ * (F_n)   (3 0 2 3) (F_0)
+ *
+ * The limiting distribution of metatiles is obtained by looking at
+ * the four-way ratio between H_n, T_n, P_n and F_n as n tends to
+ * infinity. To calculate this, we find the eigenvalues and
+ * eigenvectors of the matrix, and extract the eigenvector
+ * corresponding to the eigenvalue of largest magnitude. (Things get
+ * more complicated in cases where there isn't a _unique_ eigenvalue
+ * of largest magnitude, but here, there is.)
+ *
+ * That eigenvector is
+ *
+ *   [          1          ]      [ 1                      ]
+ *   [ (7 - 3 sqrt(5)) / 2 ]  ~=  [ 0.14589803375031545538 ]
+ *   [    3 sqrt(5) - 6    ]      [ 0.70820393249936908922 ]
+ *   [ (9 - 3 sqrt(5)) / 2 ]      [ 1.14589803375031545538 ]
+ *
+ * So those are the limiting relative proportions of metatiles.
+ *
+ * So if we have a particular metatile, how likely is it for its
+ * parent to be one of those? We have to adjust by the number of
+ * metatiles of each type that each tile has as its children. For
+ * example, the P and F tiles have one P child each, but the H has
+ * three P children. So if we have a P, the proportion of H in its
+ * potential ancestry is three times what's shown here. (And T can't
+ * occur at all as a parent.)
+ *
+ * In other words, we should choose _each coordinate_ with probability
+ * corresponding to one of those numbers (scaled down so they all sum
+ * to 1). Continuing to use P as an example, it will be:
+ *
+ *  - child 4 of H with relative probability 1
+ *  - child 5 of H with relative probability 1
+ *  - child 6 of H with relative probability 1
+ *  - child 4 of P with relative probability 0.70820393249936908922
+ *  - child 3 of F with relative probability 1.14589803375031545538
+ *
+ * and then we obtain the true probabilities by scaling those values
+ * down so that they sum to 1.
+ *
+ * The tables below give a reasonable approximation in 32-bit
+ * integers to these proportions.
+ */
+
+typedef struct MetatilePossibleParent {
+    TileType type;
+    unsigned index;
+    unsigned long probability;
+} MetatilePossibleParent;
+
+/* The above probabilities scaled up by 10000000 */
+#define PROB_H 10000000
+#define PROB_T  1458980
+#define PROB_P  7082039
+#define PROB_F 11458980
+
+static const MetatilePossibleParent parents_H[] = {
+    { TT_H,  0, PROB_H },
+    { TT_H,  1, PROB_H },
+    { TT_H,  2, PROB_H },
+    { TT_T,  0, PROB_T },
+    { TT_P,  0, PROB_P },
+    { TT_P,  1, PROB_P },
+    { TT_F,  0, PROB_F },
+    { TT_F,  1, PROB_F },
+};
+static const MetatilePossibleParent parents_T[] = {
+    { TT_H,  3, PROB_H },
+};
+static const MetatilePossibleParent parents_P[] = {
+    { TT_H,  4, PROB_H },
+    { TT_H,  5, PROB_H },
+    { TT_H,  6, PROB_H },
+    { TT_P,  4, PROB_P },
+    { TT_F,  3, PROB_F },
+};
+static const MetatilePossibleParent parents_F[] = {
+    { TT_H,  8, PROB_H },
+    { TT_H,  9, PROB_H },
+    { TT_H, 12, PROB_H },
+    { TT_P,  5, PROB_P },
+    { TT_P, 10, PROB_P },
+    { TT_F,  6, PROB_F },
+    { TT_F,  8, PROB_F },
+    { TT_F, 10, PROB_F },
+};
+
+static const MetatilePossibleParent *const possible_parents[] = {
+    parents_H, parents_T, parents_P, parents_F,
+};
+static const size_t n_possible_parents[] = {
+    lenof(parents_H), lenof(parents_T), lenof(parents_P), lenof(parents_F),
+};
+
+/*
+ * Similarly, we also want to choose our absolute starting hat with
+ * close to uniform probability, which again we do by looking at the
+ * limiting ratio of the metatile types, and this time, scaling by the
+ * number of hats in each metatile.
+ *
+ * We cheatingly use the same MetatilePossibleParent struct, because
+ * it's got all the right fields, even if it has an inappropriate
+ * name.
+ */
+static const MetatilePossibleParent starting_hats[] = {
+    { TT_H,  0, PROB_H },
+    { TT_H,  1, PROB_H },
+    { TT_H,  2, PROB_H },
+    { TT_H,  3, PROB_H },
+    { TT_T,  0, PROB_P },
+    { TT_P,  0, PROB_P },
+    { TT_P,  1, PROB_P },
+    { TT_F,  0, PROB_F },
+    { TT_F,  1, PROB_F },
+};
+
+#undef PROB_H
+#undef PROB_T
+#undef PROB_P
+#undef PROB_F
+
+HatCoords *hat_coords_new(void)
+{
+    HatCoords *hc = snew(HatCoords);
+    hc->nc = hc->csize = 0;
+    hc->c = NULL;
+    return hc;
+}
+
+void hat_coords_free(HatCoords *hc)
+{
+    if (hc) {
+        sfree(hc->c);
+        sfree(hc);
+    }
+}
+
+void hat_coords_make_space(HatCoords *hc, size_t size)
+{
+    if (hc->csize < size) {
+        hc->csize = hc->csize * 5 / 4 + 16;
+        if (hc->csize < size)
+            hc->csize = size;
+        hc->c = sresize(hc->c, hc->csize, HatCoord);
+    }
+}
+
+HatCoords *hat_coords_copy(HatCoords *hc_in)
+{
+    HatCoords *hc_out = hat_coords_new();
+    hat_coords_make_space(hc_out, hc_in->nc);
+    memcpy(hc_out->c, hc_in->c, hc_in->nc * sizeof(*hc_out->c));
+    hc_out->nc = hc_in->nc;
+    return hc_out;
+}
+
+static const MetatilePossibleParent *choose_mpp(
+    random_state *rs, const MetatilePossibleParent *parents, size_t nparents)
+{
+    /*
+     * If we needed to do this _efficiently_, we'd rewrite all those
+     * tables above as cumulative frequency tables and use binary
+     * search. But this happens about log n times in a grid of area n,
+     * so it hardly matters, and it's easier to keep the tables
+     * legible.
+     */
+    unsigned long limit = 0, value;
+    size_t i;
+
+    for (i = 0; i < nparents; i++)
+        limit += parents[i].probability;
+
+    value = random_upto(rs, limit);
+
+    for (i = 0; i+1 < nparents; i++) {
+        if (value < parents[i].probability)
+            return &parents[i];
+        value -= parents[i].probability;
+    }
+
+    assert(i == nparents - 1);
+    assert(value < parents[i].probability);
+    return &parents[i];
+}
+void hatctx_init_random(HatContext *ctx, random_state *rs)
+{
+    const MetatilePossibleParent *starting_hat = choose_mpp(
+        rs, starting_hats, lenof(starting_hats));
+
+    ctx->rs = rs;
+    ctx->prototype = hat_coords_new();
+    hat_coords_make_space(ctx->prototype, 3);
+    ctx->prototype->c[2].type = starting_hat->type;
+    ctx->prototype->c[2].index = -1;
+    ctx->prototype->c[1].type = TT_HAT;
+    ctx->prototype->c[1].index = starting_hat->index;
+    ctx->prototype->c[0].type = TT_KITE;
+    ctx->prototype->c[0].index = random_upto(rs, HAT_KITES);
+    ctx->prototype->nc = 3;
+}
+
+static inline int metatile_char_to_enum(char metatile)
+{
+    return (metatile == 'H' ? TT_H :
+            metatile == 'T' ? TT_T :
+            metatile == 'P' ? TT_P :
+            metatile == 'F' ? TT_F : -1);
+}
+
+static void init_coords_params(HatContext *ctx,
+                               const struct HatPatchParams *hp)
+{
+    size_t i;
+
+    ctx->rs = NULL;
+    ctx->prototype = hat_coords_new();
+
+    assert(hp->ncoords >= 3);
+
+    hat_coords_make_space(ctx->prototype, hp->ncoords + 1);
+    ctx->prototype->nc = hp->ncoords + 1;
+
+    for (i = 0; i < hp->ncoords; i++)
+        ctx->prototype->c[i].index = hp->coords[i];
+
+    ctx->prototype->c[hp->ncoords].type =
+        metatile_char_to_enum(hp->final_metatile);
+    ctx->prototype->c[hp->ncoords].index = -1;
+
+    ctx->prototype->c[0].type = TT_KITE;
+    ctx->prototype->c[1].type = TT_HAT;
+
+    for (i = hp->ncoords - 1; i > 1; i--) {
+        TileType metatile = ctx->prototype->c[i+1].type;
+        assert(hp->coords[i] < nchildren[metatile]);
+        ctx->prototype->c[i].type = children[metatile][hp->coords[i]];
+    }
+
+    assert(hp->coords[0] < 8);
+}
+
+HatCoords *hatctx_initial_coords(HatContext *ctx)
+{
+    return hat_coords_copy(ctx->prototype);
+}
+
+/*
+ * Extend hc until it has at least n coordinates in, by copying from
+ * ctx->prototype if needed, and extending ctx->prototype if needed in
+ * order to do that.
+ */
+void hatctx_extend_coords(HatContext *ctx, HatCoords *hc, size_t n)
+{
+    if (ctx->prototype->nc < n) {
+        hat_coords_make_space(ctx->prototype, n);
+        while (ctx->prototype->nc < n) {
+            TileType type = ctx->prototype->c[ctx->prototype->nc - 1].type;
+            assert(ctx->prototype->c[ctx->prototype->nc - 1].index == -1);
+            const MetatilePossibleParent *parent;
+
+            if (ctx->rs)
+                parent = choose_mpp(ctx->rs, possible_parents[type],
+                                    n_possible_parents[type]);
+            else
+                parent = possible_parents[type];
+
+            ctx->prototype->c[ctx->prototype->nc - 1].index = parent->index;
+            ctx->prototype->c[ctx->prototype->nc].index = -1;
+            ctx->prototype->c[ctx->prototype->nc].type = parent->type;
+            ctx->prototype->nc++;
+        }
+    }
+
+    hat_coords_make_space(hc, n);
+    while (hc->nc < n) {
+        assert(hc->c[hc->nc - 1].index == -1);
+        assert(hc->c[hc->nc - 1].type == ctx->prototype->c[hc->nc - 1].type);
+        hc->c[hc->nc - 1].index = ctx->prototype->c[hc->nc - 1].index;
+        hc->c[hc->nc].index = -1;
+        hc->c[hc->nc].type = ctx->prototype->c[hc->nc].type;
+        hc->nc++;
+    }
+}
+
+void hatctx_cleanup(HatContext *ctx)
+{
+    hat_coords_free(ctx->prototype);
+}
+
+/*
+ * The actual system for finding the coordinates of an adjacent kite.
+ */
+
+/*
+ * Kitemap step: ensure we have enough coordinates to know two levels
+ * of meta-tiling, and use the kite map for the outer layer to move
+ * around the individual kites. If this fails, return NULL.
+ */
+static HatCoords *try_step_coords_kitemap(
+    HatContext *ctx, HatCoords *hc_in, KiteStep step)
+{
+    hatctx_extend_coords(ctx, hc_in, 4);
+    hat_coords_debug("  try kitemap  ", hc_in, "\n");
+    unsigned kite = hc_in->c[0].index;
+    unsigned hat = hc_in->c[1].index;
+    unsigned meta = hc_in->c[2].index;
+    TileType meta2type = hc_in->c[3].type;
+    const KitemapEntry *ke = &kitemap[meta2type][
+        kitemap_index(step, kite, hat, meta)];
+    if (ke->kite >= 0) {
+        /*
+         * Success! We've got coordinates for the next kite in this
+         * direction.
+         */
+        HatCoords *hc_out = hat_coords_copy(hc_in);
+
+        hc_out->c[2].index = ke->meta;
+        hc_out->c[2].type = children[meta2type][ke->meta];
+        hc_out->c[1].index = ke->hat;
+        hc_out->c[1].type = TT_HAT;
+        hc_out->c[0].index = ke->kite;
+        hc_out->c[0].type = TT_KITE;
+
+        hat_coords_debug("  success!     ", hc_out, "\n");
+        return hc_out;
+    }
+
+    return NULL;
+}
+
+/*
+ * Recursive metamap step. Try using the metamap to rewrite the
+ * coordinates at hc->c[depth] and hc->c[depth+1] (using the metamap
+ * for the tile type described in hc->c[depth+2]). If successful,
+ * recurse back down to see if this led to a successful step via the
+ * kitemap. If even that fails (so that we need to try a higher-order
+ * metamap rewrite), return NULL.
+ */
+static HatCoords *try_step_coords_metamap(
+    HatContext *ctx, HatCoords *hc_in, KiteStep step, size_t depth)
+{
+    HatCoords *hc_tmp = NULL, *hc_out;
+
+    hatctx_extend_coords(ctx, hc_in, depth+3);
+#ifdef HAT_COORDS_DEBUG
+    fprintf(stderr, "  try meta %-4d", (int)depth);
+    hat_coords_debug("", hc_in, "\n");
+#endif
+    unsigned meta_orig = hc_in->c[depth].index;
+    unsigned meta2_orig = hc_in->c[depth+1].index;
+    TileType meta3type = hc_in->c[depth+2].type;
+
+    unsigned meta = meta_orig, meta2 = meta2_orig;
+
+    while (true) {
+        const MetamapEntry *me;
+        HatCoords *hc_curr = hc_tmp ? hc_tmp : hc_in;
+
+        if (depth > 2)
+            hc_out = try_step_coords_metamap(ctx, hc_curr, step, depth - 1);
+        else
+            hc_out = try_step_coords_kitemap(ctx, hc_curr, step);
+        if (hc_out) {
+            hat_coords_free(hc_tmp);
+            return hc_out;
+        }
+
+        me = &metamap[meta3type][metamap_index(meta, meta2)];
+        assert(me->meta != -1);
+        if (me->meta == meta_orig && me->meta2 == meta2_orig) {
+            hat_coords_free(hc_tmp);
+            return NULL;
+        }
+
+        meta = me->meta;
+        meta2 = me->meta2;
+
+        /*
+         * We must do the rewrite in a copy of hc_in. It's not
+         * _necessarily_ obvious that that's the case (any successful
+         * rewrite leaves the coordinates still valid and still
+         * referring to the same kite, right?). But the problem is
+         * that we might do a rewrite at this level more than once,
+         * and in between, a metamap rewrite at the next level down
+         * might have modified _one_ of the two coordinates we're
+         * messing about with. So it's easiest to let the recursion
+         * just use a separate copy.
+         */
+        if (!hc_tmp)
+            hc_tmp = hat_coords_copy(hc_in);
+
+        hc_tmp->c[depth+1].index = meta2;
+        hc_tmp->c[depth+1].type = children[meta3type][meta2];
+        hc_tmp->c[depth].index = meta;
+        hc_tmp->c[depth].type = children[hc_tmp->c[depth+1].type][meta];
+
+        hat_coords_debug("  rewritten -> ", hc_tmp, "\n");
+    }
+}
+
+/*
+ * The top-level algorithm for finding the next tile.
+ */
+HatCoords *hatctx_step(HatContext *ctx, HatCoords *hc_in, KiteStep step)
+{
+    HatCoords *hc_out;
+    size_t depth;
+
+#ifdef HAT_COORDS_DEBUG
+    static const char *const directions[] = {
+        " left\n", " right\n", " forward left\n", " forward right\n" };
+    hat_coords_debug("step start     ", hc_in, directions[step]);
+#endif
+
+    /*
+     * First, just try a kitemap step immediately. If that succeeds,
+     * we're done.
+     */
+    if ((hc_out = try_step_coords_kitemap(ctx, hc_in, step)) != NULL)
+        return hc_out;
+
+    /*
+     * Otherwise, try metamap rewrites at successively higher layers
+     * until one works. Each one will recurse back down to the
+     * kitemap, as described above.
+     */
+    for (depth = 2;; depth++) {
+        if ((hc_out = try_step_coords_metamap(
+                 ctx, hc_in, step, depth)) != NULL)
+            return hc_out;
+    }
+}
+
+/*
+ * Generate a random set of parameters for a tiling of a given size.
+ * To do this, we iterate over the whole tiling via hat_kiteenum_first
+ * and hat_kiteenum_next, and for each kite, calculate its
+ * coordinates. But then we throw the coordinates away and don't do
+ * anything with them!
+ *
+ * But the side effect of _calculating_ all those coordinates is that
+ * we found out how far ctx->prototype needed to be extended, and did
+ * so, pulling random choices out of our random_state. So after this
+ * iteration, ctx->prototype contains everything we need to replicate
+ * the same piece of tiling next time.
+ */
+void hat_tiling_randomise(struct HatPatchParams *hp, int w, int h,
+                          random_state *rs)
+{
+    HatContext ctx[1];
+    HatCoords *coords[KE_NKEEP];
+    KiteEnum s[1];
+    size_t i;
+
+    hatctx_init_random(ctx, rs);
+    for (i = 0; i < lenof(coords); i++)
+        coords[i] = NULL;
+
+    hat_kiteenum_first(s, w, h);
+    coords[s->curr_index] = hatctx_initial_coords(ctx);
+
+    while (hat_kiteenum_next(s)) {
+        hat_coords_free(coords[s->curr_index]);
+        coords[s->curr_index] = hatctx_step(
+            ctx, coords[s->last_index], s->last_step);
+    }
+
+    hp->ncoords = ctx->prototype->nc - 1;
+    hp->coords = snewn(hp->ncoords, unsigned char);
+    for (i = 0; i < hp->ncoords; i++)
+        hp->coords[i] = ctx->prototype->c[i].index;
+    hp->final_metatile = tilechars[ctx->prototype->c[hp->ncoords].type];
+
+    hatctx_cleanup(ctx);
+    for (i = 0; i < lenof(coords); i++)
+        hat_coords_free(coords[i]);
+}
+
+const char *hat_tiling_params_invalid(const struct HatPatchParams *hp)
+{
+    TileType metatile;
+    size_t i;
+
+    if (hp->ncoords < 3)
+        return "Grid parameters require at least three coordinates";
+    if (metatile_char_to_enum(hp->final_metatile) < 0)
+        return "Grid parameters contain an invalid final metatile";
+    if (hp->coords[0] >= 8)
+        return "Grid parameters contain an invalid kite index";
+
+    metatile = metatile_char_to_enum(hp->final_metatile);
+    for (i = hp->ncoords - 1; i > 1; i--) {
+        if (hp->coords[i] >= nchildren[metatile])
+            return "Grid parameters contain an invalid metatile index";
+        metatile = children[metatile][hp->coords[i]];
+    }
+
+    if (hp->coords[1] >= hats_in_metatile[metatile])
+        return "Grid parameters contain an invalid hat index";
+
+    return NULL;
+}
+
+void maybe_report_hat(int w, int h, Kite kite, HatCoords *hc,
+                      internal_hat_callback_fn cb, void *cbctx)
+{
+    Kite kite0;
+    Point vertices[14];
+    size_t i, j;
+    bool reversed = false;
+    int coords[28];
+
+    /* Only iterate from kite #0 of a hat */
+    if (hc->c[0].index != 0)
+        return;
+    kite0 = kite;
+
+    /*
+     * Identify reflected hats: they are always hat #3 of an H
+     * metatile. If we find one, reflect the starting kite so that the
+     * kite_step operations below will go in the other direction.
+     */
+    if (hc->c[2].type == TT_H && hc->c[1].index == 3) {
+        reversed = true;
+        Point tmp = kite.left;
+        kite.left = kite.right;
+        kite.right = tmp;
+    }
+
+    vertices[0] = kite.centre;
+    vertices[1] = kite.right;
+    vertices[2] = kite.outer;
+    vertices[3] = kite.left;
+    kite = kite_left(kite);            /* now on kite #1 */
+    kite = kite_forward_right(kite);   /* now on kite #2 */
+    vertices[4] = kite.centre;
+    kite = kite_right(kite);           /* now on kite #3 */
+    vertices[5] = kite.right;
+    vertices[6] = kite.outer;
+    kite = kite_forward_left(kite);    /* now on kite #4 */
+    vertices[7] = kite.left;
+    vertices[8] = kite.centre;
+    kite = kite_right(kite);           /* now on kite #5 */
+    kite = kite_right(kite);           /* now on kite #6 */
+    kite = kite_right(kite);           /* now on kite #7 */
+    vertices[9] = kite.right;
+    vertices[10] = kite.outer;
+    vertices[11] = kite.left;
+    kite = kite_left(kite);            /* now on kite #6 again */
+    vertices[12] = kite.outer;
+    vertices[13] = kite.left;
+
+    if (reversed) {
+        /* For a reversed kite, also reverse the vertex order, so that
+         * we report every polygon in a consistent orientation */
+        for (i = 0, j = 13; i < j; i++, j--) {
+            Point tmp = vertices[i];
+            vertices[i] = vertices[j];
+            vertices[j] = tmp;
+        }
+    }
+
+    /*
+     * Convert from our internal coordinate system into the orthogonal
+     * one used in this module's external API. In the same loop, we
+     * might as well do the bounds check.
+     */
+    for (i = 0; i < 14; i++) {
+        Point v = vertices[i];
+        int x = (v.x * 2 + v.y) / 3, y = v.y;
+
+        if (x < 0 || x > 4*w || y < 0 || y > 6*h)
+            return;       /* a vertex of this kite is out of bounds */
+
+        coords[2*i] = x;
+        coords[2*i+1] = y;
+    }
+
+    cb(cbctx, kite0, hc, coords);
+}
+
+struct internal_ctx {
+    hat_tile_callback_fn external_cb;
+    void *external_cbctx;
+};
+static void report_hat(void *vctx, Kite kite0, HatCoords *hc, int *coords)
+{
+    struct internal_ctx *ctx = (struct internal_ctx *)vctx;
+    ctx->external_cb(ctx->external_cbctx, 14, coords);
+}
+
+/*
+ * Generate a hat tiling from a previously generated set of parameters.
+ */
+void hat_tiling_generate(const struct HatPatchParams *hp, int w, int h,
+                         hat_tile_callback_fn cb, void *cbctx)
+{
+    HatContext ctx[1];
+    HatCoords *coords[KE_NKEEP];
+    KiteEnum s[1];
+    size_t i;
+    struct internal_ctx report_hat_ctx[1];
+
+    report_hat_ctx->external_cb = cb;
+    report_hat_ctx->external_cbctx = cbctx;
+
+    init_coords_params(ctx, hp);
+    for (i = 0; i < lenof(coords); i++)
+        coords[i] = NULL;
+
+    hat_kiteenum_first(s, w, h);
+    coords[s->curr_index] = hatctx_initial_coords(ctx);
+    maybe_report_hat(w, h, *s->curr, coords[s->curr_index],
+                     report_hat, report_hat_ctx);
+
+    while (hat_kiteenum_next(s)) {
+        hat_coords_free(coords[s->curr_index]);
+        coords[s->curr_index] = hatctx_step(
+            ctx, coords[s->last_index], s->last_step);
+        maybe_report_hat(w, h, *s->curr, coords[s->curr_index],
+                         report_hat, report_hat_ctx);
+    }
+
+    hatctx_cleanup(ctx);
+    for (i = 0; i < lenof(coords); i++)
+        hat_coords_free(coords[i]);
+}
diff --git a/apps/plugins/puzzles/src/hat.h b/apps/plugins/puzzles/src/hat.h
new file mode 100644
index 0000000000..39e2d31a66
--- /dev/null
+++ b/apps/plugins/puzzles/src/hat.h
@@ -0,0 +1,67 @@
+#ifndef PUZZLES_HAT_H
+#define PUZZLES_HAT_H
+
+struct HatPatchParams {
+    /*
+     * A patch of hat tiling is identified by giving the coordinates
+     * of the kite in one corner, using a multi-level coordinate
+     * system based on metatile expansions. Coordinates are a sequence
+     * of small non-negative integers. The valid range for each
+     * coordinate depends on the next coordinate, or on final_metatile
+     * if it's the last one in the list. The largest valid range is
+     * {0,...,12}.
+     *
+     * 'final_metatile' is one of the characters 'H', 'T', 'P' or 'F'.
+     */
+    size_t ncoords;
+    unsigned char *coords;
+    char final_metatile;
+};
+
+/*
+ * Fill in HatPatchParams with a randomly selected set of coordinates,
+ * in enough detail to generate a patch of tiling covering an area of
+ * w x h 'squares' of a kite tiling.
+ *
+ * The kites grid is considered to be oriented so that it includes
+ * horizontal lines and not vertical ones. So each of the smallest
+ * equilateral triangles in the grid has a bounding rectangle whose
+ * height is sqrt(3)/2 times its width, and either the top or the
+ * bottom of that bounding rectangle is the horizontal edge of the
+ * triangle. A 'square' of a kite tiling (for convenience of choosing
+ * grid dimensions) counts as one of those bounding rectangles.
+ *
+ * The 'coords' field of the structure will be filled in with a new
+ * dynamically allocated array. Any previous pointer in that field
+ * will be overwritten.
+ */
+void hat_tiling_randomise(struct HatPatchParams *params, int w, int h,
+                          random_state *rs);
+
+/*
+ * Validate a HatPatchParams to ensure it contains no illegal
+ * coordinates. Returns NULL if it's acceptable, or an error string if
+ * not.
+ */
+const char *hat_tiling_params_invalid(const struct HatPatchParams *params);
+
+/*
+ * Generate the actual set of hat tiles from a HatPatchParams, passing
+ * each one to a callback. The callback receives the vertices of each
+ * point, as a sequence of 2*nvertices integers, with x,y coordinates
+ * interleaved.
+ *
+ * The x coordinates are measured in units of 1/4 of the side length
+ * of the smallest equilateral triangle, or equivalently, 1/2 the
+ * length of one of the long edges of a single kite. The y coordinates
+ * are measured in units of 1/6 the height of the triangle, which is
+ * also 1/2 the length of the short edge of a kite. Therefore, you can
+ * expect x to go up to 4*w and y up to 6*h.
+ */
+typedef void (*hat_tile_callback_fn)(void *ctx, size_t nvertices,
+                                     int *coords);
+
+void hat_tiling_generate(const struct HatPatchParams *params, int w, int h,
+                         hat_tile_callback_fn cb, void *cbctx);
+
+#endif
diff --git a/apps/plugins/puzzles/src/inertia.R b/apps/plugins/puzzles/src/inertia.R
deleted file mode 100644
index e6e86beaec..0000000000
--- a/apps/plugins/puzzles/src/inertia.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-inertia  : [X] GTK COMMON inertia inertia-icon|no-icon
-
-inertia  : [G] WINDOWS COMMON inertia inertia.res|noicon.res
-
-ALL += inertia[COMBINED]
-
-!begin am gtk
-GAMES += inertia
-!end
-
-!begin >list.c
-    A(inertia) \
-!end
-
-!begin >gamedesc.txt
-inertia:inertia.exe:Inertia:Gem-collecting puzzle:Collect all the gems without running into any of the mines.
-!end
diff --git a/apps/plugins/puzzles/src/inertia.c b/apps/plugins/puzzles/src/inertia.c
index 726c89c7dd..fe174f3b56 100644
--- a/apps/plugins/puzzles/src/inertia.c
+++ b/apps/plugins/puzzles/src/inertia.c
@@ -11,7 +11,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -202,6 +207,8 @@ static const char *validate_params(const game_params *params, bool full)
      */
     if (params->w < 2 || params->h < 2)
         return "Width and height must both be at least two";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
 
     /*
      * The grid construction algorithm creates 1/5 as many gems as
@@ -715,18 +722,6 @@ static int move_goes_to(int w, int h, char *grid, int x, int y, int d)
     return (y*w+x)*DP1+dr;
 }
 
-static int compare_integers(const void *av, const void *bv)
-{
-    const int *a = (const int *)av;
-    const int *b = (const int *)bv;
-    if (*a < *b)
-        return -1;
-    else if (*a > *b)
-        return +1;
-    else
-        return 0;
-}
-
 static char *solve_game(const game_state *state, const game_state *currstate,
                         const char *aux, const char **error)
 {
@@ -1520,7 +1515,8 @@ static char *encode_ui(const game_ui *ui)
     return dupstr(buf);
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void decode_ui(game_ui *ui, const char *encoding,
+                      const game_state *state)
 {
     int p = 0;
     sscanf(encoding, "D%d%n", &ui->deaths, &p);
@@ -1545,6 +1541,15 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     ui->just_made_move = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) &&
+        state->soln && state->solnpos < state->soln->len)
+        return "Advance";
+    return "";
+}
+
 struct game_drawstate {
     game_params p;
     int tilesize;
@@ -1593,7 +1598,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
              * end up the right way round. */
             angle = atan2(dx, -dy);
 
-            angle = (angle + (PI/8)) / (PI/4);
+            angle = (angle + (float)(PI/8)) / (float)(PI/4);
             assert(angle > -16.0F);
             dir = (int)(angle + 16.0F) & 7;
         }
@@ -1618,20 +1623,20 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         dir = state->soln->list[state->solnpos];
 
     if (dir < 0)
-        return NULL;
+        return MOVE_UNUSED;
 
     /*
      * Reject the move if we can't make it at all due to a wall
      * being in the way.
      */
     if (AT(w, h, state->grid, state->px+DX(dir), state->py+DY(dir)) == WALL)
-        return NULL;
+        return MOVE_NO_EFFECT;
 
     /*
      * Reject the move if we're dead!
      */
     if (state->dead)
-        return NULL;
+        return MOVE_NO_EFFECT;
 
     /*
      * Otherwise, we can make the move. All we need to specify is
@@ -1685,6 +1690,7 @@ static game_state *execute_move(const game_state *state, const char *move)
          * This is a solve move, so we don't actually _change_ the
          * grid but merely set up a stored solution path.
          */
+        if (move[1] == '\0') return NULL; /* Solution must be non-empty. */
         ret = dup_game(state);
         install_new_solution(ret, move);
         return ret;
@@ -1729,11 +1735,10 @@ static game_state *execute_move(const game_state *state, const char *move)
     if (ret->soln) {
         if (ret->dead || ret->gems == 0)
             discard_solution(ret);
-        else if (ret->soln->list[ret->solnpos] == dir) {
+        else if (ret->soln->list[ret->solnpos] == dir &&
+            ret->solnpos+1 < ret->soln->len)
             ++ret->solnpos;
-            assert(ret->solnpos < ret->soln->len); /* or gems == 0 */
-            assert(!ret->dead); /* or not a solution */
-        } else {
+        else {
             const char *error = NULL;
             char *soln = solve_game(NULL, ret, NULL, &error);
             if (!error) {
@@ -1751,7 +1756,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1869,11 +1874,6 @@ static void draw_player(drawing *dr, game_drawstate *ds, int x, int y,
             coords[d*4+2] = x + TILESIZE/2 + (int)((TILESIZE*3/7) * x2);
             coords[d*4+3] = y + TILESIZE/2 + (int)((TILESIZE*3/7) * y2);
         }
-        /* rockbox hack */
-        int tmp[2] = { coords[0], coords[1] };
-        memmove(coords, coords + 2, sizeof(int) * DIRECTIONS * 4 - 2);
-        memcpy(coords + DIRECTIONS * 4 - 2, tmp, 2 * sizeof(int));
-        
         draw_polygon(dr, coords, DIRECTIONS*2, COL_DEAD_PLAYER, COL_OUTLINE);
     } else {
         draw_circle(dr, x + TILESIZE/2, y + TILESIZE/2,
@@ -1889,6 +1889,8 @@ static void draw_player(drawing *dr, game_drawstate *ds, int x, int y,
         int coords[14], *c;
 
         c = coords;
+        *c++ = ox + px/9;
+        *c++ = oy + py/9;
         *c++ = ox + px/9 + ax*2/3;
         *c++ = oy + py/9 + ay*2/3;
         *c++ = ox + px/3 + ax*2/3;
@@ -1901,8 +1903,6 @@ static void draw_player(drawing *dr, game_drawstate *ds, int x, int y,
         *c++ = oy - py/9 + ay*2/3;
         *c++ = ox - px/9;
         *c++ = oy - py/9;
-        *c++ = ox + px/9;
-        *c++ = oy + py/9;
         draw_polygon(dr, coords, 7, COL_HINT, COL_OUTLINE);
     }
 
@@ -2013,15 +2013,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
      * Initialise a fresh drawstate.
      */
     if (!ds->started) {
-        int wid, ht;
-
-        /*
-         * Blank out the window initially.
-         */
-        game_compute_size(&ds->p, TILESIZE, &wid, &ht);
-        draw_rect(dr, 0, 0, wid, ht, COL_BACKGROUND);
-        draw_update(dr, 0, 0, wid, ht);
-
         /*
          * Draw the grid lines.
          */
@@ -2207,19 +2198,6 @@ static int game_status(const game_state *state)
     return state->gems == 0 ? +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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame inertia
 #endif
@@ -2241,12 +2219,14 @@ const struct game thegame = {
     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,
     encode_ui,
     decode_ui,
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILESIZE, game_compute_size, game_set_size,
@@ -2258,8 +2238,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
diff --git a/apps/plugins/puzzles/src/keen.R b/apps/plugins/puzzles/src/keen.R
deleted file mode 100644
index 46bd09a33d..0000000000
--- a/apps/plugins/puzzles/src/keen.R
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- makefile -*-
-
-KEEN_EXTRA        = dsf LATIN
-KEEN_EXTRA_SOLVER = dsf LATIN_SOLVER
-
-keen    : [X] GTK COMMON keen KEEN_EXTRA keen-icon|no-icon
-
-keen    : [G] WINDOWS COMMON keen KEEN_EXTRA keen.res|noicon.res
-
-keensolver : [U] keen[STANDALONE_SOLVER] KEEN_EXTRA_SOLVER STANDALONE
-keensolver : [C] keen[STANDALONE_SOLVER] KEEN_EXTRA_SOLVER STANDALONE
-
-ALL += keen[COMBINED] KEEN_EXTRA
-
-!begin am gtk
-GAMES += keen
-!end
-
-!begin >list.c
-    A(keen) \
-!end
-
-!begin >gamedesc.txt
-keen:keen.exe:Keen:Arithmetic Latin square puzzle:Complete the latin square in accordance with the arithmetic clues.
-!end
diff --git a/apps/plugins/puzzles/src/keen.c b/apps/plugins/puzzles/src/keen.c
index 6b9610dbcd..7e2f71c8f9 100644
--- a/apps/plugins/puzzles/src/keen.c
+++ b/apps/plugins/puzzles/src/keen.c
@@ -8,7 +8,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "latin.h"
@@ -69,7 +73,7 @@ struct game_params {
 struct clues {
     int refcount;
     int w;
-    int *dsf;
+    DSF *dsf;
     long *clues;
 };
 
@@ -677,7 +681,7 @@ static bool keen_valid(struct latin_solver *solver, void *vctx)
     return true;
 }
 
-static int solver(int w, int *dsf, long *clues, digit *soln, int maxdiff)
+static int solver(int w, DSF *dsf, long *clues, digit *soln, int maxdiff)
 {
     int a = w*w;
     struct solver_ctx ctx;
@@ -704,11 +708,11 @@ static int solver(int w, int *dsf, long *clues, digit *soln, int maxdiff)
     ctx.clues = snewn(ctx.nboxes, long);
     ctx.whichbox = snewn(a, int);
     for (n = m = i = 0; i < a; i++)
-        if (dsf_canonify(dsf, i) == i) {
+        if (dsf_minimal(dsf, i) == i) {
             ctx.clues[n] = clues[i];
             ctx.boxes[n] = m;
             for (j = 0; j < a; j++)
-                if (dsf_canonify(dsf, j) == i) {
+                if (dsf_minimal(dsf, j) == i) {
                     ctx.boxlist[m++] = (j % w) * w + (j / w);   /* transpose */
                     ctx.whichbox[ctx.boxlist[m-1]] = n;
                 }
@@ -740,7 +744,7 @@ static int solver(int w, int *dsf, long *clues, digit *soln, int maxdiff)
  * Grid generation.
  */
 
-static char *encode_block_structure(char *p, int w, int *dsf)
+static char *encode_block_structure(char *p, int w, DSF *dsf)
 {
     int i, currrun = 0;
     char *orig, *q, *r, c;
@@ -777,7 +781,7 @@ static char *encode_block_structure(char *p, int w, int *dsf)
                 p0 = y*w+x;
                 p1 = (y+1)*w+x;
             }
-            edge = (dsf_canonify(dsf, p0) != dsf_canonify(dsf, p1));
+            edge = !dsf_equivalent(dsf, p0, p1);
         }
 
         if (edge) {
@@ -815,13 +819,12 @@ static char *encode_block_structure(char *p, int w, int *dsf)
     return q;
 }
 
-static const char *parse_block_structure(const char **p, int w, int *dsf)
+static const char *parse_block_structure(const char **p, int w, DSF *dsf)
 {
-    int a = w*w;
     int pos = 0;
     int repc = 0, repn = 0;
 
-    dsf_init(dsf, a);
+    dsf_reinit(dsf);
 
     while (**p && (repn > 0 || **p != ',')) {
         int c;
@@ -890,7 +893,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
 {
     int w = params->w, a = w*w;
     digit *grid, *soln;
-    int *order, *revorder, *singletons, *dsf;
+    int *order, *revorder, *singletons;
+    DSF *dsf;
     long *clues, *cluevals;
     int i, j, k, n, x, y, ret;
     int diff = params->diff;
@@ -927,7 +931,7 @@ done
     order = snewn(a, int);
     revorder = snewn(a, int);
     singletons = snewn(a, int);
-    dsf = snew_dsf(a);
+    dsf = dsf_new_min(a);
     clues = snewn(a, long);
     cluevals = snewn(a, long);
     soln = snewn(a, digit);
@@ -955,7 +959,7 @@ done
         for (i = 0; i < a; i++)
             singletons[i] = true;
 
-        dsf_init(dsf, a);
+        dsf_reinit(dsf);
 
         /* Place dominoes. */
         for (i = 0; i < a; i++) {
@@ -1037,11 +1041,10 @@ done
          * integer quotient, of course), but we rule out (or try to
          * avoid) some clues because they're of low quality.
          *
-         * Hence, we iterate once over the grid, stopping at the
-         * canonical element of every >2 block and the _non_-
-         * canonical element of every 2-block; the latter means that
-         * we can make our decision about a 2-block in the knowledge
-         * of both numbers in it.
+         * Hence, we iterate once over the grid, stopping at the first
+         * element in every >2 block and the _last_ element of every
+         * 2-block; the latter means that we can make our decision
+         * about a 2-block in the knowledge of both numbers in it.
          *
          * We reuse the 'singletons' array (finished with in the
          * above loop) to hold information about which blocks are
@@ -1055,7 +1058,7 @@ done
 
         for (i = 0; i < a; i++) {
             singletons[i] = 0;
-            j = dsf_canonify(dsf, i);
+            j = dsf_minimal(dsf, i);
             k = dsf_size(dsf, j);
             if (params->multiplication_only)
                 singletons[j] = F_MUL;
@@ -1178,7 +1181,7 @@ done
          * Having chosen the clue types, calculate the clue values.
          */
         for (i = 0; i < a; i++) {
-            j = dsf_canonify(dsf, i);
+            j = dsf_minimal(dsf, i);
             if (j == i) {
                 cluevals[j] = grid[i];
             } else {
@@ -1206,7 +1209,7 @@ done
         }
 
         for (i = 0; i < a; i++) {
-            j = dsf_canonify(dsf, i);
+            j = dsf_minimal(dsf, i);
             if (j == i) {
                 clues[j] |= cluevals[j];
             }
@@ -1252,7 +1255,7 @@ done
     p = encode_block_structure(p, w, dsf);
     *p++ = ',';
     for (i = 0; i < a; i++) {
-        j = dsf_canonify(dsf, i);
+        j = dsf_minimal(dsf, i);
         if (j == i) {
             switch (clues[j] & CMASK) {
               case C_ADD: *p++ = 'a'; break;
@@ -1280,7 +1283,7 @@ done
     sfree(order);
     sfree(revorder);
     sfree(singletons);
-    sfree(dsf);
+    dsf_free(dsf);
     sfree(clues);
     sfree(cluevals);
     sfree(soln);
@@ -1295,7 +1298,7 @@ done
 static const char *validate_desc(const game_params *params, const char *desc)
 {
     int w = params->w, a = w*w;
-    int *dsf;
+    DSF *dsf;
     const char *ret;
     const char *p = desc;
     int i;
@@ -1303,15 +1306,17 @@ static const char *validate_desc(const game_params *params, const char *desc)
     /*
      * Verify that the block structure makes sense.
      */
-    dsf = snew_dsf(a);
+    dsf = dsf_new_min(a);
     ret = parse_block_structure(&p, w, dsf);
     if (ret) {
-        sfree(dsf);
+        dsf_free(dsf);
         return ret;
     }
 
-    if (*p != ',')
+    if (*p != ',') {
+        dsf_free(dsf);
         return "Expected ',' after block structure description";
+    }
     p++;
 
     /*
@@ -1319,21 +1324,26 @@ static const char *validate_desc(const game_params *params, const char *desc)
      * and DIV clues don't apply to blocks of the wrong size.
      */
     for (i = 0; i < a; i++) {
-        if (dsf_canonify(dsf, i) == i) {
+        if (dsf_minimal(dsf, i) == i) {
             if (*p == 'a' || *p == 'm') {
                 /* these clues need no validation */
             } else if (*p == 'd' || *p == 's') {
-                if (dsf_size(dsf, i) != 2)
+                if (dsf_size(dsf, i) != 2) {
+                    dsf_free(dsf);
                     return "Subtraction and division blocks must have area 2";
+                }
             } else if (!*p) {
+                dsf_free(dsf);
                 return "Too few clues for block structure";
             } else {
+                dsf_free(dsf);
                 return "Unrecognised clue type";
             }
             p++;
             while (*p && isdigit((unsigned char)*p)) p++;
         }
     }
+    dsf_free(dsf);
     if (*p)
         return "Too many clues for block structure";
 
@@ -1373,7 +1383,7 @@ static game_state *new_game(midend *me, const game_params *params,
     state->clues = snew(struct clues);
     state->clues->refcount = 1;
     state->clues->w = w;
-    state->clues->dsf = snew_dsf(a);
+    state->clues->dsf = dsf_new_min(a);
     parse_block_structure(&p, w, state->clues->dsf);
 
     assert(*p == ',');
@@ -1381,7 +1391,7 @@ static game_state *new_game(midend *me, const game_params *params,
 
     state->clues->clues = snewn(a, long);
     for (i = 0; i < a; i++) {
-        if (dsf_canonify(state->clues->dsf, i) == i) {
+        if (dsf_minimal(state->clues->dsf, i) == i) {
             long clue = 0;
             switch (*p) {
               case 'a':
@@ -1448,7 +1458,7 @@ static void free_game(game_state *state)
     sfree(state->grid);
     sfree(state->pencil);
     if (--state->clues->refcount <= 0) {
-        sfree(state->clues->dsf);
+        dsf_free(state->clues->dsf);
         sfree(state->clues->clues);
         sfree(state->clues);
     }
@@ -1490,16 +1500,6 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     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)
-{
-    return NULL;
-}
-
 struct game_ui {
     /*
      * These are the coordinates of the currently highlighted
@@ -1525,6 +1525,17 @@ struct game_ui {
      * allowed on immutable squares.
      */
     bool hcursor;
+
+    /*
+     * User preference option: if the user right-clicks in a square
+     * and presses a number 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)
@@ -1533,8 +1544,9 @@ static game_ui *new_ui(const game_state *state)
 
     ui->hx = ui->hy = 0;
     ui->hpencil = false;
-    ui->hshow = false;
-    ui->hcursor = false;
+    ui->hshow = ui->hcursor = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+
+    ui->pencil_keep_highlight = false;
 
     return ui;
 }
@@ -1544,13 +1556,26 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    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 decode_ui(game_ui *ui, const char *encoding)
+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,
@@ -1569,6 +1594,14 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     }
 }
 
+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";
+    return "";
+}
+
 #define PREFERRED_TILESIZE 48
 #define TILESIZE (ds->tilesize)
 #define BORDER (TILESIZE / 2)
@@ -1613,7 +1646,7 @@ static bool check_errors(const game_state *state, long *errors)
     for (i = 0; i < a; i++) {
         long clue;
 
-        j = dsf_canonify(state->clues->dsf, i);
+        j = dsf_minimal(state->clues->dsf, i);
         if (j == i) {
             cluevals[i] = state->grid[i];
         } else {
@@ -1647,7 +1680,7 @@ static bool check_errors(const game_state *state, long *errors)
     }
 
     for (i = 0; i < a; i++) {
-        j = dsf_canonify(state->clues->dsf, i);
+        j = dsf_minimal(state->clues->dsf, i);
         if (j == i) {
             if ((state->clues->clues[j] & ~CMASK) != cluevals[i]) {
                 errs = true;
@@ -1709,7 +1742,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int tx, ty;
     char buf[80];
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     tx = FROMCOORD(x);
     ty = FROMCOORD(y);
@@ -1726,7 +1759,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hpencil = false;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (button == RIGHT_BUTTON) {
             /*
@@ -1746,20 +1779,18 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hshow = false;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     }
     if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->hx, &ui->hy, w, w, false);
-        ui->hshow = true;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return move_cursor(button, &ui->hx, &ui->hy, w, w, false, &ui->hshow);
     }
     if (ui->hshow &&
         (button == CURSOR_SELECT)) {
         ui->hpencil ^= 1;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (ui->hshow &&
@@ -1776,10 +1807,31 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (ui->hpencil && state->grid[ui->hy*w+ui->hx])
             return NULL;
 
+        /*
+         * If you ask to fill a square with what it already contains,
+         * or blank it when it's already empty, that has no effect...
+         */
+        if ((!ui->hpencil || n == 0) && state->grid[ui->hy*w+ui->hx] == n &&
+            state->pencil[ui->hy*w+ui->hx] == 0) {
+            /* ... expect to remove the cursor in mouse mode. */
+            if (!ui->hcursor) {
+                ui->hshow = false;
+                return MOVE_UI_UPDATE;
+            }
+            return NULL;
+        }
+
         sprintf(buf, "%c%d,%d,%d",
                 (char)(ui->hpencil && n > 0 ? 'P' : 'R'), ui->hx, ui->hy, n);
 
-        if (!ui->hcursor) ui->hshow = false;
+        /*
+         * 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 dupstr(buf);
     }
@@ -1854,7 +1906,7 @@ static game_state *execute_move(const game_state *from, const char *move)
 #define SIZE(w) ((w) * TILESIZE + 2*BORDER)
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1939,6 +1991,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
     int tx, ty, tw, th;
     int cx, cy, cw, ch;
     char str[64];
+    bool draw_clue = dsf_minimal(clues->dsf, y*w+x) == y*w+x;
 
     tx = BORDER + x * TILESIZE + 1 + GRIDEXTRA;
     ty = BORDER + y * TILESIZE + 1 + GRIDEXTRA;
@@ -1948,13 +2001,13 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
     cw = tw = TILESIZE-1-2*GRIDEXTRA;
     ch = th = TILESIZE-1-2*GRIDEXTRA;
 
-    if (x > 0 && dsf_canonify(clues->dsf, y*w+x) == dsf_canonify(clues->dsf, y*w+x-1))
+    if (x > 0 && dsf_equivalent(clues->dsf, y*w+x, y*w+x-1))
         cx -= GRIDEXTRA, cw += GRIDEXTRA;
-    if (x+1 < w && dsf_canonify(clues->dsf, y*w+x) == dsf_canonify(clues->dsf, y*w+x+1))
+    if (x+1 < w && dsf_equivalent(clues->dsf, y*w+x, y*w+x+1))
         cw += GRIDEXTRA;
-    if (y > 0 && dsf_canonify(clues->dsf, y*w+x) == dsf_canonify(clues->dsf, (y-1)*w+x))
+    if (y > 0 && dsf_equivalent(clues->dsf, y*w+x, (y-1)*w+x))
         cy -= GRIDEXTRA, ch += GRIDEXTRA;
-    if (y+1 < w && dsf_canonify(clues->dsf, y*w+x) == dsf_canonify(clues->dsf, (y+1)*w+x))
+    if (y+1 < w && dsf_equivalent(clues->dsf, y*w+x, (y+1)*w+x))
         ch += GRIDEXTRA;
 
     clip(dr, cx, cy, cw, ch);
@@ -1979,17 +2032,21 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
      * Draw the corners of thick lines in corner-adjacent squares,
      * which jut into this square by one pixel.
      */
-    if (x > 0 && y > 0 && dsf_canonify(clues->dsf, y*w+x) != dsf_canonify(clues->dsf, (y-1)*w+x-1))
-        draw_rect(dr, tx-GRIDEXTRA, ty-GRIDEXTRA, GRIDEXTRA, GRIDEXTRA, COL_GRID);
-    if (x+1 < w && y > 0 && dsf_canonify(clues->dsf, y*w+x) != dsf_canonify(clues->dsf, (y-1)*w+x+1))
-        draw_rect(dr, tx+TILESIZE-1-2*GRIDEXTRA, ty-GRIDEXTRA, GRIDEXTRA, GRIDEXTRA, COL_GRID);
-    if (x > 0 && y+1 < w && dsf_canonify(clues->dsf, y*w+x) != dsf_canonify(clues->dsf, (y+1)*w+x-1))
-        draw_rect(dr, tx-GRIDEXTRA, ty+TILESIZE-1-2*GRIDEXTRA, GRIDEXTRA, GRIDEXTRA, COL_GRID);
-    if (x+1 < w && y+1 < w && dsf_canonify(clues->dsf, y*w+x) != dsf_canonify(clues->dsf, (y+1)*w+x+1))
-        draw_rect(dr, tx+TILESIZE-1-2*GRIDEXTRA, ty+TILESIZE-1-2*GRIDEXTRA, GRIDEXTRA, GRIDEXTRA, COL_GRID);
+    if (x > 0 && y > 0 && !dsf_equivalent(clues->dsf, y*w+x, (y-1)*w+x-1))
+        draw_rect(dr, tx-GRIDEXTRA, ty-GRIDEXTRA,
+                  GRIDEXTRA, GRIDEXTRA, COL_GRID);
+    if (x+1 < w && y > 0 && !dsf_equivalent(clues->dsf, y*w+x, (y-1)*w+x+1))
+        draw_rect(dr, tx+TILESIZE-1-2*GRIDEXTRA, ty-GRIDEXTRA,
+                  GRIDEXTRA, GRIDEXTRA, COL_GRID);
+    if (x > 0 && y+1 < w && !dsf_equivalent(clues->dsf, y*w+x, (y+1)*w+x-1))
+        draw_rect(dr, tx-GRIDEXTRA, ty+TILESIZE-1-2*GRIDEXTRA,
+                  GRIDEXTRA, GRIDEXTRA, COL_GRID);
+    if (x+1 < w && y+1 < w && !dsf_equivalent(clues->dsf, y*w+x, (y+1)*w+x+1))
+        draw_rect(dr, tx+TILESIZE-1-2*GRIDEXTRA, ty+TILESIZE-1-2*GRIDEXTRA,
+                  GRIDEXTRA, GRIDEXTRA, COL_GRID);
 
     /* Draw the box clue. */
-    if (dsf_canonify(clues->dsf, y*w+x) == y*w+x) {
+    if (draw_clue) {
         long clue = clues->clues[y*w+x];
         long cluetype = clue & CMASK, clueval = clue & ~CMASK;
         int size = dsf_size(clues->dsf, y*w+x);
@@ -2043,7 +2100,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
             pr = pl + TILESIZE - GRIDEXTRA;
             pt = ty + GRIDEXTRA;
             pb = pt + TILESIZE - GRIDEXTRA;
-            if (dsf_canonify(clues->dsf, y*w+x) == y*w+x) {
+            if (draw_clue) {
                 /*
                  * Make space for the clue text.
                  */
@@ -2097,7 +2154,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
              * And move it down a bit if it's collided with some
              * clue text.
              */
-            if (dsf_canonify(clues->dsf, y*w+x) == y*w+x) {
+            if (draw_clue) {
                 pt = max(pt, ty + GRIDEXTRA * 3 + TILESIZE/4);
             }
 
@@ -2134,14 +2191,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     if (!ds->started) {
         /*
-         * The initial contents of the window are not guaranteed and
-         * can vary with front ends. To be on the safe side, all
-         * games should start by drawing a big background-colour
-         * rectangle covering the whole window.
-         */
-        draw_rect(dr, 0, 0, SIZE(w), SIZE(w), COL_BACKGROUND);
-
-        /*
          * Big containing rectangle.
          */
         draw_rect(dr, COORD(0) - GRIDEXTRA, COORD(0) - GRIDEXTRA,
@@ -2217,21 +2266,15 @@ 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, float *x, float *y)
+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, &pw, &ph);
+    game_compute_size(params, 900, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
@@ -2245,7 +2288,7 @@ static void game_print_size(const game_params *params, float *x, float *y)
  * single polygon.
  */
 static void outline_block_structure(drawing *dr, game_drawstate *ds,
-                                    int w, int *dsf, int ink)
+                                    int w, DSF *dsf, int ink)
 {
     int a = w*w;
     int *coords;
@@ -2258,7 +2301,7 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds,
      * Iterate over all the blocks.
      */
     for (i = 0; i < a; i++) {
-        if (dsf_canonify(dsf, i) != i)
+        if (dsf_minimal(dsf, i) != i)
             continue;
 
         /*
@@ -2297,11 +2340,11 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds,
             tx = x - dy + dx;
             ty = y + dx + dy;
             nin += (tx >= 0 && tx < w && ty >= 0 && ty < w &&
-                    dsf_canonify(dsf, ty*w+tx) == i);
+                    dsf_minimal(dsf, ty*w+tx) == i);
             tx = x - dy;
             ty = y + dx;
             nin += (tx >= 0 && tx < w && ty >= 0 && ty < w &&
-                    dsf_canonify(dsf, ty*w+tx) == i);
+                    dsf_minimal(dsf, ty*w+tx) == i);
             if (nin == 0) {
                 /*
                  * Turn right.
@@ -2338,9 +2381,9 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds,
              * somewhere sensible.
              */
             assert(x >= 0 && x < w && y >= 0 && y < w &&
-                   dsf_canonify(dsf, y*w+x) == i);
+                   dsf_minimal(dsf, y*w+x) == i);
             assert(x+dx < 0 || x+dx >= w || y+dy < 0 || y+dy >= w ||
-                   dsf_canonify(dsf, (y+dy)*w+(x+dx)) != i);
+                   dsf_minimal(dsf, (y+dy)*w+(x+dx)) != i);
 
             /*
              * Record the point we just went past at one end of the
@@ -2367,7 +2410,8 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds,
     sfree(coords);
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+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);
@@ -2413,7 +2457,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
      */
     for (y = 0; y < w; y++)
         for (x = 0; x < w; x++)
-            if (dsf_canonify(state->clues->dsf, y*w+x) == y*w+x) {
+            if (dsf_minimal(state->clues->dsf, y*w+x) == y*w+x) {
                 long clue = state->clues->clues[y*w+x];
                 long cluetype = clue & CMASK, clueval = clue & ~CMASK;
                 int size = dsf_size(state->clues->dsf, y*w+x);
@@ -2478,13 +2522,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     game_request_keys,
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILESIZE, game_compute_size, game_set_size,
@@ -2498,7 +2544,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON | REQUIRE_NUMPAD,  /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/latin.c b/apps/plugins/puzzles/src/latin.c
index 39930166e7..a2d5713b30 100644
--- a/apps/plugins/puzzles/src/latin.c
+++ b/apps/plugins/puzzles/src/latin.c
@@ -563,7 +563,7 @@ void latin_solver_free_scratch(struct latin_solver_scratch *scratch)
     sfree(scratch);
 }
 
-void latin_solver_alloc(struct latin_solver *solver, digit *grid, int o)
+bool latin_solver_alloc(struct latin_solver *solver, digit *grid, int o)
 {
     int x, y;
 
@@ -577,14 +577,23 @@ void latin_solver_alloc(struct latin_solver *solver, digit *grid, int o)
     memset(solver->row, 0, o*o);
     memset(solver->col, 0, o*o);
 
-    for (x = 0; x < o; x++)
-        for (y = 0; y < o; y++)
-            if (grid[y*o+x])
-                latin_solver_place(solver, x, y, grid[y*o+x]);
-
 #ifdef STANDALONE_SOLVER
     solver->names = NULL;
 #endif
+
+    for (x = 0; x < o; x++) {
+        for (y = 0; y < o; y++) {
+            int n = grid[y*o+x];
+            if (n) {
+                if (cube(x, y, n))
+                    latin_solver_place(solver, x, y, n);
+                else
+                    return false;      /* puzzle is already inconsistent */
+            }
+        }
+    }
+
+    return true;
 }
 
 void latin_solver_free(struct latin_solver *solver)
@@ -810,15 +819,17 @@ static int latin_solver_recurse
             } else {
                 newctx = ctx;
             }
-            latin_solver_alloc(&subsolver, outgrid, o);
 #ifdef STANDALONE_SOLVER
             subsolver.names = solver->names;
 #endif
-            ret = latin_solver_top(&subsolver, diff_recursive,
-                                   diff_simple, diff_set_0, diff_set_1,
-                                   diff_forcing, diff_recursive,
-                                   usersolvers, valid, newctx,
-                                   ctxnew, ctxfree);
+            if (latin_solver_alloc(&subsolver, outgrid, o))
+                ret = latin_solver_top(&subsolver, diff_recursive,
+                                       diff_simple, diff_set_0, diff_set_1,
+                                       diff_forcing, diff_recursive,
+                                       usersolvers, valid, newctx,
+                                       ctxnew, ctxfree);
+            else
+                ret = diff_impossible;
             latin_solver_free(&subsolver);
             if (ctxnew)
                 ctxfree(newctx);
@@ -1059,11 +1070,13 @@ int latin_solver(digit *grid, int o, int maxdiff,
     struct latin_solver solver;
     int diff;
 
-    latin_solver_alloc(&solver, grid, o);
-    diff = latin_solver_main(&solver, maxdiff,
-                             diff_simple, diff_set_0, diff_set_1,
-                             diff_forcing, diff_recursive,
-                             usersolvers, valid, ctx, ctxnew, ctxfree);
+    if (latin_solver_alloc(&solver, grid, o))
+        diff = latin_solver_main(&solver, maxdiff,
+                                 diff_simple, diff_set_0, diff_set_1,
+                                 diff_forcing, diff_recursive,
+                                 usersolvers, valid, ctx, ctxnew, ctxfree);
+    else
+        diff = diff_impossible;
     latin_solver_free(&solver);
     return diff;
 }
@@ -1298,121 +1311,4 @@ bool latin_check(digit *sq, int order)
     return ret;
 }
 
-
-/* --------------------------------------------------------
- * Testing (and printing).
- */
-
-#ifdef STANDALONE_LATIN_TEST
-
-#include <stdio.h>
-#include <time.h>
-
-const char *quis;
-
-static void latin_print(digit *sq, int order)
-{
-    int x, y;
-
-    for (y = 0; y < order; y++) {
-        for (x = 0; x < order; x++) {
-            printf("%2u ", ELT(sq, x, y));
-        }
-        printf("\n");
-    }
-    printf("\n");
-}
-
-static void gen(int order, random_state *rs, int debug)
-{
-    digit *sq;
-
-    solver_show_working = debug;
-
-    sq = latin_generate(order, rs);
-    latin_print(sq, order);
-    if (latin_check(sq, order)) {
-        fprintf(stderr, "Square is not a latin square!");
-        exit(1);
-    }
-
-    sfree(sq);
-}
-
-void test_soak(int order, random_state *rs)
-{
-    digit *sq;
-    int n = 0;
-    time_t tt_start, tt_now, tt_last;
-
-    solver_show_working = 0;
-    tt_now = tt_start = time(NULL);
-
-    while(1) {
-        sq = latin_generate(order, rs);
-        sfree(sq);
-        n++;
-
-        tt_last = time(NULL);
-        if (tt_last > tt_now) {
-            tt_now = tt_last;
-            printf("%d total, %3.1f/s\n", n,
-                   (double)n / (double)(tt_now - tt_start));
-        }
-    }
-}
-
-void usage_exit(const char *msg)
-{
-    if (msg)
-        fprintf(stderr, "%s: %s\n", quis, msg);
-    fprintf(stderr, "Usage: %s [--seed SEED] --soak <params> | [game_id [game_id ...]]\n", quis);
-    exit(1);
-}
-
-int main(int argc, char *argv[])
-{
-    int i, soak = 0;
-    random_state *rs;
-    time_t seed = time(NULL);
-
-    quis = argv[0];
-    while (--argc > 0) {
-        const char *p = *++argv;
-        if (!strcmp(p, "--soak"))
-            soak = 1;
-        else if (!strcmp(p, "--seed")) {
-            if (argc == 0)
-                usage_exit("--seed needs an argument");
-            seed = (time_t)atoi(*++argv);
-            argc--;
-        } else if (*p == '-')
-                usage_exit("unrecognised option");
-        else
-            break; /* finished options */
-    }
-
-    rs = random_new((void*)&seed, sizeof(time_t));
-
-    if (soak == 1) {
-        if (argc != 1) usage_exit("only one argument for --soak");
-        test_soak(atoi(*argv), rs);
-    } else {
-        if (argc > 0) {
-            for (i = 0; i < argc; i++) {
-                gen(atoi(*argv++), rs, 1);
-            }
-        } else {
-            while (1) {
-                i = random_upto(rs, 20) + 1;
-                gen(i, rs, 0);
-            }
-        }
-    }
-    random_free(rs);
-    return 0;
-}
-
-#endif
-
 /* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/puzzles/src/latin.h b/apps/plugins/puzzles/src/latin.h
index bb172ec3c7..96a0480491 100644
--- a/apps/plugins/puzzles/src/latin.h
+++ b/apps/plugins/puzzles/src/latin.h
@@ -61,10 +61,13 @@ int latin_solver_forcing(struct latin_solver *solver,
 /* --- Solver allocation --- */
 
 /* Fills in (and allocates members for) a latin_solver struct.
- * Will allocate members of snew, but not snew itself
+ * Will allocate members of solver, but not solver itself
  * (allowing 'struct latin_solver' to be the first element in a larger
- * struct, for example). */
-void latin_solver_alloc(struct latin_solver *solver, digit *grid, int o);
+ * struct, for example).
+ *
+ * latin_solver_alloc returns false if the digits already in the grid
+ * could not be legally placed. */
+bool latin_solver_alloc(struct latin_solver *solver, digit *grid, int o);
 void latin_solver_free(struct latin_solver *solver);
 
 /* Allocates scratch space (for _set and _forcing) */
diff --git a/apps/plugins/puzzles/src/lightup.R b/apps/plugins/puzzles/src/lightup.R
deleted file mode 100644
index a474de815d..0000000000
--- a/apps/plugins/puzzles/src/lightup.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-LIGHTUP_EXTRA = combi
-
-lightup  : [X] GTK COMMON lightup LIGHTUP_EXTRA lightup-icon|no-icon
-
-lightup  : [G] WINDOWS COMMON lightup LIGHTUP_EXTRA lightup.res|noicon.res
-
-lightupsolver : [U] lightup[STANDALONE_SOLVER] LIGHTUP_EXTRA STANDALONE
-lightupsolver : [C] lightup[STANDALONE_SOLVER] LIGHTUP_EXTRA STANDALONE
-
-ALL += lightup[COMBINED] LIGHTUP_EXTRA
-
-!begin am gtk
-GAMES += lightup
-!end
-
-!begin >list.c
-    A(lightup) \
-!end
-
-!begin >gamedesc.txt
-lightup:lightup.exe:Light Up:Light-bulb placing puzzle:Place bulbs to light up all the squares.
-!end
diff --git a/apps/plugins/puzzles/src/lightup.c b/apps/plugins/puzzles/src/lightup.c
index ab4be9ec87..e779663e01 100644
--- a/apps/plugins/puzzles/src/lightup.c
+++ b/apps/plugins/puzzles/src/lightup.c
@@ -47,7 +47,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -58,7 +63,7 @@
  */
 #if defined STANDALONE_SOLVER
 #define SOLVER_DIAGNOSTICS
-int verbose = 0;
+static int verbose = 0;
 #undef debug
 #define debug(x) printf x
 #elif defined SOLVER_DIAGNOSTICS
@@ -346,6 +351,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 2 || params->h < 2)
         return "Width and height must be at least 2";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (full) {
         if (params->blackpc < 5 || params->blackpc > 100)
             return "Percentage of black squares must be between 5% and 100%";
@@ -353,6 +360,8 @@ static const char *validate_params(const game_params *params, bool full)
             if (params->symm == SYMM_ROT4)
                 return "4-fold symmetry is only available with square grids";
         }
+        if ((params->symm == SYMM_ROT4 || params->symm == SYMM_REF4) && params->w < 3 && params->h < 3)
+            return "Width or height must be at least 3 for 4-way symmetry";
         if (params->symm < 0 || params->symm >= SYMM_MAX)
             return "Unknown symmetry type";
         if (params->difficulty < 0 || params->difficulty > DIFFCOUNT)
@@ -411,6 +420,8 @@ static void debug_state(game_state *state)
     int x, y;
     char c = '?';
 
+    (void)c; /* placate -Wunused-but-set-variable if debug() does nothing */
+
     for (y = 0; y < state->h; y++) {
         for (x = 0; x < state->w; x++) {
             c = '.';
@@ -1822,30 +1833,65 @@ static char *game_text_format(const game_state *state)
 struct game_ui {
     int cur_x, cur_y;
     bool cur_visible;
+
+    /*
+     * User preference: when a square contains both a black blob for
+     * 'user is convinced this isn't a light' and a yellow highlight
+     * for 'this square is lit by a light', both of which rule out it
+     * being a light, should we still bother to show the blob?
+     */
+    bool draw_blobs_when_lit;
 };
 
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int draw_blobs_when_lit = -1;
+
+    if (!initialised) {
+        initialised = true;
+        draw_blobs_when_lit = getenv_bool("LIGHTUP_LIT_BLOBS", -1);
+    }
+
+    if (draw_blobs_when_lit != -1)
+        ui_out->draw_blobs_when_lit = draw_blobs_when_lit;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+    ui->draw_blobs_when_lit = true;
+    legacy_prefs_override(ui);
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Draw non-light marks even when lit";
+    ret[0].kw = "show-lit-blobs";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->draw_blobs_when_lit;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    /* nothing to encode. */
-    return NULL;
+    ui->draw_blobs_when_lit = cfg[0].u.boolean.bval;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
-    /* nothing to decode. */
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1855,6 +1901,26 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
         ui->cur_visible = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    int cx = ui->cur_x, cy = ui->cur_y;
+    unsigned int flags = GRID(state, flags, cx, cy);
+
+    if (!ui->cur_visible) return "";
+    if (button == CURSOR_SELECT) {
+        if (flags & (F_BLACK | F_IMPOSSIBLE)) return "";
+        if (flags & F_LIGHT) return "Clear";
+        return "Light";
+    }
+    if (button == CURSOR_SELECT2) {
+        if (flags & (F_BLACK | F_LIGHT)) return "";
+        if (flags & F_IMPOSSIBLE) return "Clear";
+        return "Mark";
+    }
+    return "";
+}
+
 #define DF_BLACK        1       /* black square */
 #define DF_NUMBERED     2       /* black square with number */
 #define DF_LIT          4       /* display (white) square lit up */
@@ -1888,7 +1954,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     enum { NONE, FLIP_LIGHT, FLIP_IMPOSSIBLE } action = NONE;
     int cx = -1, cy = -1;
     unsigned int flags;
-    char buf[80], *nullret = UI_UPDATE, *empty = UI_UPDATE, c;
+    char buf[80], *nullret = MOVE_NO_EFFECT, *empty = MOVE_UI_UPDATE, c;
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
         if (ui->cur_visible)
@@ -1898,8 +1964,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         cy = FROMCOORD(y);
         action = (button == LEFT_BUTTON) ? FLIP_LIGHT : FLIP_IMPOSSIBLE;
     } else if (IS_CURSOR_SELECT(button) ||
-               button == 'i' || button == 'I' ||
-               button == ' ' || button == '\r' || button == '\n') {
+               button == 'i' || button == 'I') {
         if (ui->cur_visible) {
             /* Only allow cursor-effect operations if the cursor is visible
              * (otherwise you have no idea which square it might be affecting) */
@@ -1910,11 +1975,10 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
         ui->cur_visible = true;
     } else if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cur_x, &ui->cur_y, state->w, state->h, false);
-        ui->cur_visible = true;
-        nullret = empty;
+        nullret = move_cursor(button, &ui->cur_x, &ui->cur_y,
+                              state->w, state->h, false, &ui->cur_visible);
     } else
-        return NULL;
+        return MOVE_UNUSED;
 
     switch (action) {
     case FLIP_LIGHT:
@@ -2002,7 +2066,7 @@ badmove:
 
 /* XXX entirely cloned from fifteen.c; separate out? */
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2111,7 +2175,7 @@ static unsigned int tile_flags(game_drawstate *ds, const game_state *state,
     return ret;
 }
 
-static void tile_redraw(drawing *dr, game_drawstate *ds,
+static void tile_redraw(drawing *dr, game_drawstate *ds, const game_ui *ui,
                         const game_state *state, int x, int y)
 {
     unsigned int ds_flags = GRID(ds, flags, x, y);
@@ -2141,13 +2205,7 @@ static void tile_redraw(drawing *dr, game_drawstate *ds,
             draw_circle(dr, dx + TILE_SIZE/2, dy + TILE_SIZE/2, TILE_RADIUS,
                         lcol, COL_BLACK);
         } else if ((ds_flags & DF_IMPOSSIBLE)) {
-            static int draw_blobs_when_lit = -1;
-            if (draw_blobs_when_lit < 0) {
-                char *env = getenv("LIGHTUP_LIT_BLOBS");
-                draw_blobs_when_lit = (!env || (env[0] == 'y' ||
-                                                env[0] == 'Y'));
-            }
-            if (!(ds_flags & DF_LIT) || draw_blobs_when_lit) {
+            if (!(ds_flags & DF_LIT) || ui->draw_blobs_when_lit) {
                 int rlen = TILE_SIZE / 4;
                 draw_rect(dr, dx + TILE_SIZE/2 - rlen/2,
                           dy + TILE_SIZE/2 - rlen/2,
@@ -2176,10 +2234,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (flashtime) flashing = (int)(flashtime * 3 / FLASH_TIME) != 1;
 
     if (!ds->started) {
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * ds->w + 2 * BORDER,
-                  TILE_SIZE * ds->h + 2 * BORDER, COL_BACKGROUND);
-
         draw_rect_outline(dr, COORD(0)-1, COORD(0)-1,
                           TILE_SIZE * ds->w + 2,
                           TILE_SIZE * ds->h + 2,
@@ -2196,7 +2250,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
             unsigned int ds_flags = tile_flags(ds, state, ui, x, y, flashing);
             if (ds_flags != GRID(ds, flags, x, y)) {
                 GRID(ds, flags, x, y) = ds_flags;
-                tile_redraw(dr, ds, state, x, y);
+                tile_redraw(dr, ds, ui, state, x, y);
             }
         }
     }
@@ -2235,24 +2289,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->w, h = state->h;
     int ink = print_mono_colour(dr, 0);
@@ -2323,12 +2374,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2342,7 +2395,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/loopgen.c b/apps/plugins/puzzles/src/loopgen.c
index e738d4a26d..05097fe304 100644
--- a/apps/plugins/puzzles/src/loopgen.c
+++ b/apps/plugins/puzzles/src/loopgen.c
@@ -8,7 +8,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -79,7 +83,7 @@ static bool can_colour_face(grid *g, char* board, int face_index,
                             enum face_colour colour)
 {
     int i, j;
-    grid_face *test_face = g->faces + face_index;
+    grid_face *test_face = g->faces[face_index];
     grid_face *starting_face, *current_face;
     grid_dot *starting_dot;
     int transitions;
@@ -344,7 +348,7 @@ void generate_loop(grid *g, char *board, random_state *rs,
      * to check every face of the board (the grid structure does not keep a
      * list of the infinite face's neighbours). */
     for (i = 0; i < num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         struct face_score *fs = face_scores + i;
         if (board[i] != FACE_GREY) continue;
         /* We need the full colourability check here, it's not enough simply
@@ -426,7 +430,7 @@ void generate_loop(grid *g, char *board, random_state *rs,
         del234(darkable_faces_sorted, fs);
 
         /* Remember which face we've just coloured */
-        cur_face = g->faces + i;
+        cur_face = g->faces[i];
 
         /* The face we've just coloured potentially affects the colourability
          * and the scores of any neighbouring faces (touching at a corner or
@@ -452,7 +456,7 @@ void generate_loop(grid *g, char *board, random_state *rs,
                 if (FACE_COLOUR(f) != FACE_GREY) continue; 
 
                 /* Find the face index and face_score* corresponding to f */
-                fi = f - g->faces;                
+                fi = f->index;
                 fs = face_scores + fi;
 
                 /* Remove from lightable list if it's in there.  We do this,
@@ -513,7 +517,7 @@ void generate_loop(grid *g, char *board, random_state *rs,
             enum face_colour opp =
                 (board[j] == FACE_WHITE) ? FACE_BLACK : FACE_WHITE;
             if (can_colour_face(g, board, j, opp)) {
-                grid_face *face = g->faces +j;
+                grid_face *face = g->faces[j];
                 if (do_random_pass) {
                     /* final random pass */
                     if (!random_upto(rs, 10))
diff --git a/apps/plugins/puzzles/src/loopgen.h b/apps/plugins/puzzles/src/loopgen.h
index 079c87c576..bab95814d2 100644
--- a/apps/plugins/puzzles/src/loopgen.h
+++ b/apps/plugins/puzzles/src/loopgen.h
@@ -2,8 +2,8 @@
  * loopgen.h: interface file for loop generation functions for grid.[ch].
  */
 
-#ifndef _LOOPGEN_H
-#define _LOOPGEN_H
+#ifndef PUZZLES_LOOPGEN_H
+#define PUZZLES_LOOPGEN_H
 
 #include "puzzles.h"
 #include "grid.h"
@@ -13,7 +13,7 @@ enum face_colour { FACE_WHITE, FACE_GREY, FACE_BLACK };
 /* face should be of type grid_face* here. */
 #define FACE_COLOUR(face) \
     ( (face) == NULL ? FACE_BLACK : \
-          board[(face) - g->faces] )
+          board[(face)->index] )
 
 typedef int (*loopgen_bias_fn_t)(void *ctx, char *board, int face);
 
diff --git a/apps/plugins/puzzles/src/loopy.R b/apps/plugins/puzzles/src/loopy.R
deleted file mode 100644
index f44560095d..0000000000
--- a/apps/plugins/puzzles/src/loopy.R
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- makefile -*-
-
-LOOPY_EXTRA = tree234 dsf grid penrose loopgen
-
-loopy     : [X] GTK COMMON loopy LOOPY_EXTRA loopy-icon|no-icon
-
-loopy     : [G] WINDOWS COMMON loopy LOOPY_EXTRA loopy.res|noicon.res
-
-loopysolver :   [U] loopy[STANDALONE_SOLVER] LOOPY_EXTRA STANDALONE m.lib
-loopysolver :   [C] loopy[STANDALONE_SOLVER] LOOPY_EXTRA STANDALONE
-
-#penrose :    [U] penrose[TEST_PENROSE] STANDALONE m.lib
-#penrose :    [C] penrose[TEST_PENROSE] STANDALONE
-
-#test-basis : [U] penrose[TEST_VECTORS] tree234 STANDALONE m.lib
-#test-basis : [C] penrose[TEST_VECTORS] tree234 STANDALONE
-
-
-ALL += loopy[COMBINED] LOOPY_EXTRA
-
-!begin am gtk
-GAMES += loopy
-!end
-
-!begin >list.c
-    A(loopy) \
-!end
-
-!begin >gamedesc.txt
-loopy:loopy.exe:Loopy:Loop-drawing puzzle:Draw a single closed loop, given clues about number of adjacent edges.
-!end
diff --git a/apps/plugins/puzzles/src/loopy.c b/apps/plugins/puzzles/src/loopy.c
index 176b56285c..b30dd68f4d 100644
--- a/apps/plugins/puzzles/src/loopy.c
+++ b/apps/plugins/puzzles/src/loopy.c
@@ -25,28 +25,28 @@
  *    outside respectively. So if you can track this for all
  *    faces, you figure out the state of the line between a pair
  *    once their relative insideness is known.
- *     + The way I envisage this working is simply to keep an edsf
+ *     + The way I envisage this working is simply to keep a flip dsf
  *       of all _faces_, which indicates whether they're on
  *       opposite sides of the loop from one another. We also
- *       include a special entry in the edsf for the infinite
+ *       include a special entry in the dsf for the infinite
  *       exterior "face".
  *     + So, the simple way to do this is to just go through the
  *       edges: every time we see an edge in a state other than
  *       LINE_UNKNOWN which separates two faces that aren't in the
- *       same edsf class, we can rectify that by merging the
+ *       same dsf class, we can rectify that by merging the
  *       classes. Then, conversely, an edge in LINE_UNKNOWN state
- *       which separates two faces that _are_ in the same edsf
+ *       which separates two faces that _are_ in the same dsf
  *       class can immediately have its state determined.
  *     + But you can go one better, if you're prepared to loop
  *       over all _pairs_ of edges. Suppose we have edges A and B,
  *       which respectively separate faces A1,A2 and B1,B2.
- *       Suppose that A,B are in the same edge-edsf class and that
- *       A1,B1 (wlog) are in the same face-edsf class; then we can
- *       immediately place A2,B2 into the same face-edsf class (as
+ *       Suppose that A,B are in the same edge-dsf class and that
+ *       A1,B1 (wlog) are in the same face-dsf class; then we can
+ *       immediately place A2,B2 into the same face-dsf class (as
  *       each other, not as A1 and A2) one way round or the other.
- *       And conversely again, if A1,B1 are in the same face-edsf
+ *       And conversely again, if A1,B1 are in the same face-dsf
  *       class and so are A2,B2, then we can put A,B into the same
- *       face-edsf class.
+ *       face-dsf class.
  *        * Of course, this deduction requires a quadratic-time
  *          loop over all pairs of edges in the grid, so it should
  *          be reserved until there's nothing easier left to be
@@ -77,7 +77,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -153,7 +157,7 @@ typedef struct solver_state {
     char *face_yes_count;
     char *face_no_count;
     bool *dot_solved, *face_solved;
-    int *dotdsf;
+    DSF *dotdsf;
 
     /* Information for Normal level deductions:
      * For each dline, store a bitmask for whether we know:
@@ -162,7 +166,7 @@ typedef struct solver_state {
     char *dlines;
 
     /* Hard level information */
-    int *linedsf;
+    DSF *linedsf;
 } solver_state;
 
 /*
@@ -279,6 +283,9 @@ static void check_caches(const solver_state* sstate);
     A("Penrose (rhombs)",PENROSE_P3,3,3)                        \
     A("Great-Great-Dodecagonal",GREATGREATDODECAGONAL,2,2)      \
     A("Kagome",KAGOME,3,3)                                      \
+    A("Compass-Dodecagonal",COMPASSDODECAGONAL,2,2)             \
+    A("Hats",HATS,6,6)                                          \
+    A("Spectres",SPECTRES,6,6)                                  \
     /* end of list */
 
 #define GRID_NAME(title,type,amin,omin) title,
@@ -380,7 +387,7 @@ static solver_state *new_solver_state(const game_state *state, int diff) {
     ret->solver_status = SOLVER_INCOMPLETE;
     ret->diff = diff;
 
-    ret->dotdsf = snew_dsf(num_dots);
+    ret->dotdsf = dsf_new(num_dots);
     ret->looplen = snewn(num_dots, int);
 
     for (i = 0; i < num_dots; i++) {
@@ -411,7 +418,7 @@ static solver_state *new_solver_state(const game_state *state, int diff) {
     if (diff < DIFF_HARD) {
         ret->linedsf = NULL;
     } else {
-        ret->linedsf = snew_dsf(state->game_grid->num_edges);
+        ret->linedsf = dsf_new_flip(state->game_grid->num_edges);
     }
 
     return ret;
@@ -420,7 +427,7 @@ static solver_state *new_solver_state(const game_state *state, int diff) {
 static void free_solver_state(solver_state *sstate) {
     if (sstate) {
         free_game(sstate->state);
-        sfree(sstate->dotdsf);
+        dsf_free(sstate->dotdsf);
         sfree(sstate->looplen);
         sfree(sstate->dot_solved);
         sfree(sstate->face_solved);
@@ -431,7 +438,7 @@ static void free_solver_state(solver_state *sstate) {
 
         /* OK, because sfree(NULL) is a no-op */
         sfree(sstate->dlines);
-        sfree(sstate->linedsf);
+        dsf_free(sstate->linedsf);
 
         sfree(sstate);
     }
@@ -449,10 +456,9 @@ static solver_state *dup_solver_state(const solver_state *sstate) {
     ret->solver_status = sstate->solver_status;
     ret->diff = sstate->diff;
 
-    ret->dotdsf = snewn(num_dots, int);
+    ret->dotdsf = dsf_new(num_dots);
     ret->looplen = snewn(num_dots, int);
-    memcpy(ret->dotdsf, sstate->dotdsf,
-           num_dots * sizeof(int));
+    dsf_copy(ret->dotdsf, sstate->dotdsf);
     memcpy(ret->looplen, sstate->looplen,
            num_dots * sizeof(int));
 
@@ -480,9 +486,8 @@ static solver_state *dup_solver_state(const solver_state *sstate) {
     }
 
     if (sstate->linedsf) {
-        ret->linedsf = snewn(num_edges, int);
-        memcpy(ret->linedsf, sstate->linedsf,
-               num_edges * sizeof(int));
+        ret->linedsf = dsf_new_flip(num_edges);
+        dsf_copy(ret->linedsf, sstate->linedsf);
     } else {
         ret->linedsf = NULL;
     }
@@ -552,6 +557,9 @@ static const game_params loopy_presets_more[] = {
     {  3,  3, DIFF_HARD,   LOOPY_GRID_DODECAGONAL },
     {  3,  3, DIFF_HARD,   LOOPY_GRID_GREATDODECAGONAL },
     {  3,  2, DIFF_HARD,   LOOPY_GRID_GREATGREATDODECAGONAL },
+    {  3,  3, DIFF_HARD,   LOOPY_GRID_COMPASSDODECAGONAL },
+    {  6,  6, DIFF_HARD,   LOOPY_GRID_HATS },
+    {  6,  6, DIFF_HARD,   LOOPY_GRID_SPECTRES },
 #else
     { 10, 10, DIFF_HARD,   LOOPY_GRID_HONEYCOMB },
     {  5,  4, DIFF_HARD,   LOOPY_GRID_GREATHEXAGONAL },
@@ -561,6 +569,9 @@ static const game_params loopy_presets_more[] = {
     {  5,  4, DIFF_HARD,   LOOPY_GRID_DODECAGONAL },
     {  5,  4, DIFF_HARD,   LOOPY_GRID_GREATDODECAGONAL },
     {  5,  3, DIFF_HARD,   LOOPY_GRID_GREATGREATDODECAGONAL },
+    {  5,  4, DIFF_HARD,   LOOPY_GRID_COMPASSDODECAGONAL },
+    { 10, 10, DIFF_HARD,   LOOPY_GRID_HATS },
+    { 10, 10, DIFF_HARD,   LOOPY_GRID_SPECTRES },
 #endif
 };
 
@@ -681,6 +692,7 @@ static game_params *custom_params(const config_item *cfg)
 
 static const char *validate_params(const game_params *params, bool full)
 {
+    const char *err;
     if (params->type < 0 || params->type >= NUM_GRID_TYPES)
         return "Illegal grid type";
     if (params->w < grid_size_limits[params->type].amin ||
@@ -689,6 +701,8 @@ static const char *validate_params(const game_params *params, bool full)
     if (params->w < grid_size_limits[params->type].omin &&
         params->h < grid_size_limits[params->type].omin)
         return grid_size_limits[params->type].oerr;
+    err = grid_validate_params(grid_types[params->type], params->w, params->h);
+    if (err != NULL) return err;
 
     /*
      * This shouldn't be able to happen at all, since decode_params
@@ -771,10 +785,13 @@ static const char *validate_desc(const game_params *params, const char *desc)
      * know is the precise number of faces. */
     grid_desc = extract_grid_desc(&desc);
     ret = grid_validate_desc(grid_types[params->type], params->w, params->h, grid_desc);
-    if (ret) return ret;
+    if (ret) {
+        sfree(grid_desc);
+        return ret;
+    }
 
     g = loopy_generate_grid(params, grid_desc);
-    if (grid_desc) sfree(grid_desc);
+    sfree(grid_desc);
 
     for (; *desc; ++desc) {
         if ((*desc >= '0' && *desc <= '9') || (*desc >= 'A' && *desc <= 'Z')) {
@@ -785,13 +802,18 @@ static const char *validate_desc(const game_params *params, const char *desc)
             count += *desc - 'a' + 1;
             continue;
         }
+        grid_free(g);
         return "Unknown character in description";
     }
 
-    if (count < g->num_faces)
+    if (count < g->num_faces) {
+        grid_free(g);
         return "Description too short for board size";
-    if (count > g->num_faces)
+    }
+    if (count > g->num_faces) {
+        grid_free(g);
         return "Description too long for board size";
+    }
 
     grid_free(g);
 
@@ -850,22 +872,98 @@ static char *encode_solve_move(const game_state *state)
     return ret;
 }
 
+struct game_ui {
+    /*
+     * User preference: should grid lines in LINE_NO state be drawn
+     * very faintly so users can still see where they are, or should
+     * they be completely invisible?
+     */
+    bool draw_faint_lines;
+
+    /*
+     * User preference: when clicking an edge that has only one
+     * possible edge connecting to one (or both) of its ends, should
+     * that edge also change to the same state as the edge we just
+     * clicked?
+     */
+    enum {
+        AF_OFF,     /* no, all grid edges are independent in the UI */
+        AF_FIXED,   /* yes, but only based on the grid itself */
+        AF_ADAPTIVE /* yes, and consider edges user has already set to NO */
+    } autofollow;
+};
+
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int draw_faint_lines = -1;
+    static int autofollow = -1;
+
+    if (!initialised) {
+        char *env;
+
+        initialised = true;
+        draw_faint_lines = getenv_bool("LOOPY_FAINT_LINES", -1);
+
+        if ((env = getenv("LOOPY_AUTOFOLLOW")) != NULL) {
+            if (!strcmp(env, "off"))
+                autofollow = AF_OFF;
+            else if (!strcmp(env, "fixed"))
+                autofollow = AF_FIXED;
+            else if (!strcmp(env, "adaptive"))
+                autofollow = AF_ADAPTIVE;
+        }
+    }
+
+    if (draw_faint_lines != -1)
+        ui_out->draw_faint_lines = draw_faint_lines;
+    if (autofollow != -1)
+        ui_out->autofollow = autofollow;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
-    return NULL;
+    game_ui *ui = snew(game_ui);
+    ui->draw_faint_lines = true;
+    ui->autofollow = AF_OFF;
+    legacy_prefs_override(ui);
+    return ui;
 }
 
 static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    config_item *ret;
+
+    ret = snewn(3, config_item);
+
+    ret[0].name = "Draw excluded grid lines faintly";
+    ret[0].kw = "draw-faint-lines";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->draw_faint_lines;
+
+    ret[1].name = "Auto-follow unique paths of edges";
+    ret[1].kw = "auto-follow";
+    ret[1].type = C_CHOICES;
+    ret[1].u.choices.choicenames =
+        ":No:Based on grid only:Based on grid and game state";
+    ret[1].u.choices.choicekws = ":off:fixed:adaptive";
+    ret[1].u.choices.selected = ui->autofollow;
+
+    ret[2].name = NULL;
+    ret[2].type = C_END;
+
+    return ret;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
+    ui->draw_faint_lines = cfg[0].u.boolean.bval;
+    ui->autofollow = cfg[1].u.choices.selected;
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -874,7 +972,7 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 }
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     int grid_width, grid_height, rendered_width, rendered_height;
     int g_tilesize;
@@ -974,11 +1072,6 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
     sfree(ds);
 }
 
-static bool game_timing_state(const game_state *state, game_ui *ui)
-{
-    return true;
-}
-
 static float game_anim_length(const game_state *oldstate,
                               const game_state *newstate, int dir, game_ui *ui)
 {
@@ -1004,7 +1097,7 @@ static char *game_text_format(const game_state *state)
     assert(state->grid_type == 0);
 
     /* Work out the basic size unit */
-    f = g->faces; /* first face */
+    f = g->faces[0]; /* first face */
     assert(f->order == 4);
     /* The dots are ordered clockwise, so the two opposite
      * corners are guaranteed to span the square */
@@ -1027,7 +1120,7 @@ static char *game_text_format(const game_state *state)
 
     /* Fill in edge info */
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         /* Cell coordinates, from (0,0) to (w-1,h-1) */
         int x1 = (e->dot1->x - g->lowest_x) / cell_size;
         int x2 = (e->dot2->x - g->lowest_x) / cell_size;
@@ -1055,7 +1148,7 @@ static char *game_text_format(const game_state *state)
     for (i = 0; i < g->num_faces; i++) {
         int x1, x2, y1, y2;
 
-        f = g->faces + i;
+        f = g->faces[i];
         assert(f->order == 4);
         /* Cell coordinates, from (0,0) to (w-1,h-1) */
         x1 = (f->dots[0]->x - g->lowest_x) / cell_size;
@@ -1135,26 +1228,26 @@ static bool solver_set_line(solver_state *sstate, int i,
 #endif
 
     g = state->game_grid;
-    e = g->edges + i;
+    e = g->edges[i];
 
     /* Update the cache for both dots and both faces affected by this. */
     if (line_new == LINE_YES) {
-        sstate->dot_yes_count[e->dot1 - g->dots]++;
-        sstate->dot_yes_count[e->dot2 - g->dots]++;
+        sstate->dot_yes_count[e->dot1->index]++;
+        sstate->dot_yes_count[e->dot2->index]++;
         if (e->face1) {
-            sstate->face_yes_count[e->face1 - g->faces]++;
+            sstate->face_yes_count[e->face1->index]++;
         }
         if (e->face2) {
-            sstate->face_yes_count[e->face2 - g->faces]++;
+            sstate->face_yes_count[e->face2->index]++;
         }
     } else {
-        sstate->dot_no_count[e->dot1 - g->dots]++;
-        sstate->dot_no_count[e->dot2 - g->dots]++;
+        sstate->dot_no_count[e->dot1->index]++;
+        sstate->dot_no_count[e->dot2->index]++;
         if (e->face1) {
-            sstate->face_no_count[e->face1 - g->faces]++;
+            sstate->face_no_count[e->face1->index]++;
         }
         if (e->face2) {
-            sstate->face_no_count[e->face2 - g->faces]++;
+            sstate->face_no_count[e->face2->index]++;
         }
     }
 
@@ -1178,10 +1271,10 @@ static bool merge_dots(solver_state *sstate, int edge_index)
 {
     int i, j, len;
     grid *g = sstate->state->game_grid;
-    grid_edge *e = g->edges + edge_index;
+    grid_edge *e = g->edges[edge_index];
 
-    i = e->dot1 - g->dots;
-    j = e->dot2 - g->dots;
+    i = e->dot1->index;
+    j = e->dot2->index;
 
     i = dsf_canonify(sstate->dotdsf, i);
     j = dsf_canonify(sstate->dotdsf, j);
@@ -1211,12 +1304,12 @@ static bool merge_lines(solver_state *sstate, int i, int j, bool inverse
     assert(i < sstate->state->game_grid->num_edges);
     assert(j < sstate->state->game_grid->num_edges);
 
-    i = edsf_canonify(sstate->linedsf, i, &inv_tmp);
+    i = dsf_canonify_flip(sstate->linedsf, i, &inv_tmp);
     inverse ^= inv_tmp;
-    j = edsf_canonify(sstate->linedsf, j, &inv_tmp);
+    j = dsf_canonify_flip(sstate->linedsf, j, &inv_tmp);
     inverse ^= inv_tmp;
 
-    edsf_merge(sstate->linedsf, i, j, inverse);
+    dsf_merge_flip(sstate->linedsf, i, j, inverse);
 
 #ifdef SHOW_WORKING
     if (i != j) {
@@ -1239,12 +1332,12 @@ static int dot_order(const game_state* state, int dot, char line_type)
 {
     int n = 0;
     grid *g = state->game_grid;
-    grid_dot *d = g->dots + dot;
+    grid_dot *d = g->dots[dot];
     int i;
 
     for (i = 0; i < d->order; i++) {
         grid_edge *e = d->edges[i];
-        if (state->lines[e - g->edges] == line_type)
+        if (state->lines[e->index] == line_type)
             ++n;
     }
     return n;
@@ -1256,12 +1349,12 @@ static int face_order(const game_state* state, int face, char line_type)
 {
     int n = 0;
     grid *g = state->game_grid;
-    grid_face *f = g->faces + face;
+    grid_face *f = g->faces[face];
     int i;
 
     for (i = 0; i < f->order; i++) {
         grid_edge *e = f->edges[i];
-        if (state->lines[e - g->edges] == line_type)
+        if (state->lines[e->index] == line_type)
             ++n;
     }
     return n;
@@ -1282,10 +1375,10 @@ static bool dot_setall(solver_state *sstate, int dot,
         return false;
 
     g = state->game_grid;
-    d = g->dots + dot;
+    d = g->dots[dot];
 
     for (i = 0; i < d->order; i++) {
-        int line_index = d->edges[i] - g->edges;
+        int line_index = d->edges[i]->index;
         if (state->lines[line_index] == old_type) {
             r = solver_set_line(sstate, line_index, new_type);
             assert(r);
@@ -1309,10 +1402,10 @@ static bool face_setall(solver_state *sstate, int face,
         return false;
 
     g = state->game_grid;
-    f = g->faces + face;
+    f = g->faces[face];
 
     for (i = 0; i < f->order; i++) {
-        int line_index = f->edges[i] - g->edges;
+        int line_index = f->edges[i]->index;
         if (state->lines[line_index] == old_type) {
             r = solver_set_line(sstate, line_index, new_type);
             assert(r);
@@ -1341,7 +1434,7 @@ static void add_full_clues(game_state *state, random_state *rs)
      * algorithm does work, and there aren't any GREY faces still there. */
     memset(clues, 0, g->num_faces);
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         grid_face *f1 = e->face1;
         grid_face *f2 = e->face2;
         enum face_colour c1 = FACE_COLOUR(f1);
@@ -1349,8 +1442,8 @@ static void add_full_clues(game_state *state, random_state *rs)
         assert(c1 != FACE_GREY);
         assert(c2 != FACE_GREY);
         if (c1 != c2) {
-            if (f1) clues[f1 - g->faces]++;
-            if (f2) clues[f2 - g->faces]++;
+            if (f1) clues[f1->index]++;
+            if (f2) clues[f2->index]++;
         }
     }
     sfree(board);
@@ -1361,7 +1454,7 @@ static bool game_has_unique_soln(const game_state *state, int diff)
 {
     bool ret;
     solver_state *sstate_new;
-    solver_state *sstate = new_solver_state((game_state *)state, diff);
+    solver_state *sstate = new_solver_state(state, diff);
 
     sstate_new = solve_game_rec(sstate);
 
@@ -1541,7 +1634,8 @@ static bool check_completion(game_state *state)
     grid *g = state->game_grid;
     int i;
     bool ret;
-    int *dsf, *component_state;
+    DSF *dsf;
+    int *component_state;
     int nsilly, nloop, npath, largest_comp, largest_size, total_pathsize;
     enum { COMP_NONE, COMP_LOOP, COMP_PATH, COMP_SILLY, COMP_EMPTY };
 
@@ -1626,13 +1720,13 @@ static bool check_completion(game_state *state)
      *    leave that one unhighlighted, and light the rest up in red.
      */
 
-    dsf = snew_dsf(g->num_dots);
+    dsf = dsf_new(g->num_dots);
 
     /* Build the dsf. */
     for (i = 0; i < g->num_edges; i++) {
         if (state->lines[i] == LINE_YES) {
-            grid_edge *e = g->edges + i;
-            int d1 = e->dot1 - g->dots, d2 = e->dot2 - g->dots;
+            grid_edge *e = g->edges[i];
+            int d1 = e->dot1->index, d2 = e->dot2->index;
             dsf_merge(dsf, d1, d2);
         }
     }
@@ -1657,10 +1751,10 @@ static bool check_completion(game_state *state)
         int unknown = dot_order(state, i, LINE_UNKNOWN);
         if ((yes == 1 && unknown == 0) || (yes >= 3)) {
             /* violation, so mark all YES edges as errors */
-            grid_dot *d = g->dots + i;
+            grid_dot *d = g->dots[i];
             int j;
             for (j = 0; j < d->order; j++) {
-                int e = d->edges[j] - g->edges;
+                int e = d->edges[j]->index;
                 if (state->lines[e] == LINE_YES)
                     state->line_errors[e] = true;
             }
@@ -1723,8 +1817,8 @@ static bool check_completion(game_state *state)
          */
         for (i = 0; i < g->num_edges; i++) {
             if (state->lines[i] == LINE_YES) {
-                grid_edge *e = g->edges + i;
-                int d1 = e->dot1 - g->dots; /* either endpoint is good enough */
+                grid_edge *e = g->edges[i];
+                int d1 = e->dot1->index; /* either endpoint is good enough */
                 int comp = dsf_canonify(dsf, d1);
                 if ((component_state[comp] == COMP_PATH &&
                      -1 != largest_comp) ||
@@ -1763,7 +1857,7 @@ static bool check_completion(game_state *state)
     }
 
     sfree(component_state);
-    sfree(dsf);
+    dsf_free(dsf);
 
     return ret;
 }
@@ -1782,7 +1876,7 @@ static bool check_completion(game_state *state)
  *   know both or neither is on that's already stored more directly.)
  *
  *   Advanced Mode
- *   Use edsf data structure to make equivalence classes of lines that are
+ *   Use flip dsf data structure to make equivalence classes of lines that are
  *   known identical to or opposite to one another.
  */
 
@@ -1822,11 +1916,10 @@ static int dline_index_from_dot(grid *g, grid_dot *d, int i)
     if (i2 == d->order) i2 = 0;
     e2 = d->edges[i2];
 #endif
-    ret = 2 * (e - g->edges) + ((e->dot1 == d) ? 1 : 0);
+    ret = 2 * (e->index) + ((e->dot1 == d) ? 1 : 0);
 #ifdef DEBUG_DLINES
     printf("dline_index_from_dot: d=%d,i=%d, edges [%d,%d] - %d\n",
-           (int)(d - g->dots), i, (int)(e - g->edges),
-           (int)(e2 - g->edges), ret);
+           (int)(d->index), i, (int)(e->index), (int)(e2 ->index), ret);
 #endif
     return ret;
 }
@@ -1845,11 +1938,10 @@ static int dline_index_from_face(grid *g, grid_face *f, int i)
     if (i2 < 0) i2 += f->order;
     e2 = f->edges[i2];
 #endif
-    ret = 2 * (e - g->edges) + ((e->dot1 == d) ? 1 : 0);
+    ret = 2 * (e->index) + ((e->dot1 == d) ? 1 : 0);
 #ifdef DEBUG_DLINES
     printf("dline_index_from_face: f=%d,i=%d, edges [%d,%d] - %d\n",
-           (int)(f - g->faces), i, (int)(e - g->edges),
-           (int)(e2 - g->edges), ret);
+           (int)(f->index), i, (int)(e->index), (int)(e2->index), ret);
 #endif
     return ret;
 }
@@ -1907,9 +1999,9 @@ static bool dline_set_opp_atleastone(solver_state *sstate,
         opp2 = opp + 1;
         if (opp2 == N) opp2 = 0;
         /* Check if opp, opp2 point to LINE_UNKNOWNs */
-        if (state->lines[d->edges[opp] - g->edges] != LINE_UNKNOWN)
+        if (state->lines[d->edges[opp]->index] != LINE_UNKNOWN)
             continue;
-        if (state->lines[d->edges[opp2] - g->edges] != LINE_UNKNOWN)
+        if (state->lines[d->edges[opp2]->index] != LINE_UNKNOWN)
             continue;
         /* Found opposite UNKNOWNS and they're next to each other */
         opp_dline_index = dline_index_from_dot(g, d, opp);
@@ -1931,24 +2023,24 @@ static bool face_setall_identical(solver_state *sstate, int face_index,
     bool retval = false;
     game_state *state = sstate->state;
     grid *g = state->game_grid;
-    grid_face *f = g->faces + face_index;
+    grid_face *f = g->faces[face_index];
     int N = f->order;
     int i, j;
     int can1, can2;
     bool inv1, inv2;
 
     for (i = 0; i < N; i++) {
-        int line1_index = f->edges[i] - g->edges;
+        int line1_index = f->edges[i]->index;
         if (state->lines[line1_index] != LINE_UNKNOWN)
             continue;
         for (j = i + 1; j < N; j++) {
-            int line2_index = f->edges[j] - g->edges;
+            int line2_index = f->edges[j]->index;
             if (state->lines[line2_index] != LINE_UNKNOWN)
                 continue;
 
             /* Found two UNKNOWNS */
-            can1 = edsf_canonify(sstate->linedsf, line1_index, &inv1);
-            can2 = edsf_canonify(sstate->linedsf, line2_index, &inv2);
+            can1 = dsf_canonify_flip(sstate->linedsf, line1_index, &inv1);
+            can2 = dsf_canonify_flip(sstate->linedsf, line2_index, &inv2);
             if (can1 == can2 && inv1 == inv2) {
                 solver_set_line(sstate, line1_index, line_new);
                 solver_set_line(sstate, line2_index, line_new);
@@ -1966,9 +2058,8 @@ static void find_unknowns(game_state *state,
     int *e /* Returned edge indices */)
 {
     int c = 0;
-    grid *g = state->game_grid;
     while (c < expected_count) {
-        int line_index = *edge_list - g->edges;
+        int line_index = (*edge_list)->index;
         if (state->lines[line_index] == LINE_UNKNOWN) {
             e[c] = line_index;
             c++;
@@ -1989,7 +2080,7 @@ static int parity_deductions(solver_state *sstate,
 {
     game_state *state = sstate->state;
     int diff = DIFF_MAX;
-    int *linedsf = sstate->linedsf;
+    DSF *linedsf = sstate->linedsf;
 
     if (unknown_count == 2) {
         /* Lines are known alike/opposite, depending on inv. */
@@ -2002,9 +2093,9 @@ static int parity_deductions(solver_state *sstate,
         int can[3]; /* canonical edges */
         bool inv[3]; /* whether can[x] is inverse to e[x] */
         find_unknowns(state, edge_list, 3, e);
-        can[0] = edsf_canonify(linedsf, e[0], inv);
-        can[1] = edsf_canonify(linedsf, e[1], inv+1);
-        can[2] = edsf_canonify(linedsf, e[2], inv+2);
+        can[0] = dsf_canonify_flip(linedsf, e[0], inv);
+        can[1] = dsf_canonify_flip(linedsf, e[1], inv+1);
+        can[2] = dsf_canonify_flip(linedsf, e[2], inv+2);
         if (can[0] == can[1]) {
             if (solver_set_line(sstate, e[2], (total_parity^inv[0]^inv[1]) ?
                                 LINE_YES : LINE_NO))
@@ -2025,10 +2116,10 @@ static int parity_deductions(solver_state *sstate,
         int can[4]; /* canonical edges */
         bool inv[4]; /* whether can[x] is inverse to e[x] */
         find_unknowns(state, edge_list, 4, e);
-        can[0] = edsf_canonify(linedsf, e[0], inv);
-        can[1] = edsf_canonify(linedsf, e[1], inv+1);
-        can[2] = edsf_canonify(linedsf, e[2], inv+2);
-        can[3] = edsf_canonify(linedsf, e[3], inv+3);
+        can[0] = dsf_canonify_flip(linedsf, e[0], inv);
+        can[1] = dsf_canonify_flip(linedsf, e[1], inv+1);
+        can[2] = dsf_canonify_flip(linedsf, e[2], inv+2);
+        can[3] = dsf_canonify_flip(linedsf, e[3], inv+3);
         if (can[0] == can[1]) {
             if (merge_lines(sstate, e[2], e[3], total_parity^inv[0]^inv[1]))
                 diff = min(diff, DIFF_HARD);
@@ -2097,7 +2188,7 @@ static int trivial_deductions(solver_state *sstate)
 
     /* Per-face deductions */
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
 
         if (sstate->face_solved[i])
             continue;
@@ -2155,22 +2246,22 @@ static int trivial_deductions(solver_state *sstate)
             int j, k, e1, e2, e, d;
 
             for (j = 0; j < f->order; j++) {
-                e1 = f->edges[j] - g->edges;
-                e2 = f->edges[j+1 < f->order ? j+1 : 0] - g->edges;
+                e1 = f->edges[j]->index;
+                e2 = f->edges[j+1 < f->order ? j+1 : 0]->index;
 
-                if (g->edges[e1].dot1 == g->edges[e2].dot1 ||
-                    g->edges[e1].dot1 == g->edges[e2].dot2) {
-                    d = g->edges[e1].dot1 - g->dots;
+                if (g->edges[e1]->dot1 == g->edges[e2]->dot1 ||
+                    g->edges[e1]->dot1 == g->edges[e2]->dot2) {
+                    d = g->edges[e1]->dot1->index;
                 } else {
-                    assert(g->edges[e1].dot2 == g->edges[e2].dot1 ||
-                           g->edges[e1].dot2 == g->edges[e2].dot2);
-                    d = g->edges[e1].dot2 - g->dots;
+                    assert(g->edges[e1]->dot2 == g->edges[e2]->dot1 ||
+                           g->edges[e1]->dot2 == g->edges[e2]->dot2);
+                    d = g->edges[e1]->dot2->index;
                 }
 
                 if (state->lines[e1] == LINE_UNKNOWN &&
                     state->lines[e2] == LINE_UNKNOWN) {
-                    for (k = 0; k < g->dots[d].order; k++) {
-                        int e = g->dots[d].edges[k] - g->edges;
+                    for (k = 0; k < g->dots[d]->order; k++) {
+                        int e = g->dots[d]->edges[k]->index;
                         if (state->lines[e] == LINE_YES)
                             goto found;    /* multi-level break */
                     }
@@ -2184,7 +2275,7 @@ static int trivial_deductions(solver_state *sstate)
              * they're e1 and e2.
              */
             for (j = 0; j < f->order; j++) {
-                e = f->edges[j] - g->edges;
+                e = f->edges[j]->index;
                 if (state->lines[e] == LINE_UNKNOWN && e != e1 && e != e2) {
                     bool r = solver_set_line(sstate, e, LINE_YES);
                     assert(r);
@@ -2198,7 +2289,7 @@ static int trivial_deductions(solver_state *sstate)
 
     /* Per-dot deductions */
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         int yes, no, unknown;
 
         if (sstate->dot_solved[i])
@@ -2290,12 +2381,12 @@ static int dline_deductions(solver_state *sstate)
      * on that.  We check this with an assertion, in case someone decides to
      * make a grid which has larger faces than this.  Note, this algorithm
      * could get quite expensive if there are many large faces. */
-#define MAX_FACE_SIZE 12
+#define MAX_FACE_SIZE 14
 
     for (i = 0; i < g->num_faces; i++) {
         int maxs[MAX_FACE_SIZE][MAX_FACE_SIZE];
         int mins[MAX_FACE_SIZE][MAX_FACE_SIZE];
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int N = f->order;
         int j,m;
         int clue = state->clues[i];
@@ -2306,7 +2397,7 @@ static int dline_deductions(solver_state *sstate)
 
         /* Calculate the (j,j+1) entries */
         for (j = 0; j < N; j++) {
-            int edge_index = f->edges[j] - g->edges;
+            int edge_index = f->edges[j]->index;
             int dline_index;
             enum line_state line1 = state->lines[edge_index];
             enum line_state line2;
@@ -2317,7 +2408,7 @@ static int dline_deductions(solver_state *sstate)
             mins[j][k] = (line1 == LINE_YES) ? 1 : 0;
             /* Calculate the (j,j+2) entries */
             dline_index = dline_index_from_face(g, f, k);
-            edge_index = f->edges[k] - g->edges;
+            edge_index = f->edges[k]->index;
             line2 = state->lines[edge_index];
             k++;
             if (k >= N) k = 0;
@@ -2362,7 +2453,7 @@ static int dline_deductions(solver_state *sstate)
         for (j = 0; j < N; j++) {
             int k;
             grid_edge *e = f->edges[j];
-            int line_index = e - g->edges;
+            int line_index = e->index;
             int dline_index;
 
             if (state->lines[line_index] != LINE_UNKNOWN)
@@ -2397,7 +2488,7 @@ static int dline_deductions(solver_state *sstate)
             if (sstate->diff >= DIFF_TRICKY) {
                 /* Now see if we can make dline deduction for edges{j,j+1} */
                 e = f->edges[k];
-                if (state->lines[e - g->edges] != LINE_UNKNOWN)
+                if (state->lines[e->index] != LINE_UNKNOWN)
                     /* Only worth doing this for an UNKNOWN,UNKNOWN pair.
                      * Dlines where one of the edges is known, are handled in the
                      * dot-deductions */
@@ -2429,7 +2520,7 @@ static int dline_deductions(solver_state *sstate)
     /* ------ Dot deductions ------ */
 
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         int N = d->order;
         int yes, no, unknown;
         int j;
@@ -2447,8 +2538,8 @@ static int dline_deductions(solver_state *sstate)
             k = j + 1;
             if (k >= N) k = 0;
             dline_index = dline_index_from_dot(g, d, j);
-            line1_index = d->edges[j] - g->edges;
-            line2_index = d->edges[k] - g->edges;
+            line1_index = d->edges[j]->index;
+            line2_index = d->edges[k] ->index;
             line1 = state->lines[line1_index];
             line2 = state->lines[line2_index];
 
@@ -2545,7 +2636,7 @@ static int dline_deductions(solver_state *sstate)
                                 int opp_index;
                                 if (opp == j || opp == k)
                                     continue;
-                                opp_index = d->edges[opp] - g->edges;
+                                opp_index = d->edges[opp]->index;
                                 if (state->lines[opp_index] == LINE_UNKNOWN) {
                                     solver_set_line(sstate, opp_index,
                                                     LINE_YES);
@@ -2596,7 +2687,7 @@ static int linedsf_deductions(solver_state *sstate)
         if (clue < 0)
             continue;
 
-        N = g->faces[i].order;
+        N = g->faces[i]->order;
         yes = sstate->face_yes_count[i];
         if (yes + 1 == clue) {
             if (face_setall_identical(sstate, i, LINE_NO))
@@ -2614,14 +2705,14 @@ static int linedsf_deductions(solver_state *sstate)
 
         /* Deductions with small number of LINE_UNKNOWNs, based on overall
          * parity of lines. */
-        diff_tmp = parity_deductions(sstate, g->faces[i].edges,
+        diff_tmp = parity_deductions(sstate, g->faces[i]->edges,
                                      (clue - yes) % 2, unknown);
         diff = min(diff, diff_tmp);
     }
 
     /* ------ Dot deductions ------ */
     for (i = 0; i < g->num_dots; i++) {
-        grid_dot *d = g->dots + i;
+        grid_dot *d = g->dots[i];
         int N = d->order;
         int j;
         int yes, no, unknown;
@@ -2634,17 +2725,17 @@ static int linedsf_deductions(solver_state *sstate)
             int can1, can2;
             bool inv1, inv2;
             int j2;
-            line1_index = d->edges[j] - g->edges;
+            line1_index = d->edges[j]->index;
             if (state->lines[line1_index] != LINE_UNKNOWN)
                 continue;
             j2 = j + 1;
             if (j2 == N) j2 = 0;
-            line2_index = d->edges[j2] - g->edges;
+            line2_index = d->edges[j2]->index;
             if (state->lines[line2_index] != LINE_UNKNOWN)
                 continue;
             /* Infer dline flags from linedsf */
-            can1 = edsf_canonify(sstate->linedsf, line1_index, &inv1);
-            can2 = edsf_canonify(sstate->linedsf, line2_index, &inv2);
+            can1 = dsf_canonify_flip(sstate->linedsf, line1_index, &inv1);
+            can2 = dsf_canonify_flip(sstate->linedsf, line2_index, &inv2);
             if (can1 == can2 && inv1 != inv2) {
                 /* These are opposites, so set dline atmostone/atleastone */
                 if (set_atmostone(dlines, dline_index))
@@ -2679,7 +2770,7 @@ static int linedsf_deductions(solver_state *sstate)
         int can;
         bool inv;
         enum line_state s;
-        can = edsf_canonify(sstate->linedsf, i, &inv);
+        can = dsf_canonify_flip(sstate->linedsf, i, &inv);
         if (can == i)
             continue;
         s = sstate->state->lines[can];
@@ -2704,7 +2795,6 @@ static int loop_deductions(solver_state *sstate)
     game_state *state = sstate->state;
     grid *g = state->game_grid;
     int shortest_chainlen = g->num_dots;
-    bool loop_found = false;
     int dots_connected;
     bool progress = false;
     int i;
@@ -2717,7 +2807,7 @@ static int loop_deductions(solver_state *sstate)
      */
     for (i = 0; i < g->num_edges; i++) {
         if (state->lines[i] == LINE_YES) {
-            loop_found |= merge_dots(sstate, i);
+            merge_dots(sstate, i);
             edgecount++;
         }
     }
@@ -2762,9 +2852,9 @@ static int loop_deductions(solver_state *sstate)
      * loop it would create is a solution.
      */
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
-        int d1 = e->dot1 - g->dots;
-        int d2 = e->dot2 - g->dots;
+        grid_edge *e = g->edges[i];
+        int d1 = e->dot1->index;
+        int d2 = e->dot2->index;
         int eqclass, val;
         if (state->lines[i] != LINE_UNKNOWN)
             continue;
@@ -2801,13 +2891,13 @@ static int loop_deductions(solver_state *sstate)
              */
             sm1_nearby = 0;
             if (e->face1) {
-                int f = e->face1 - g->faces;
+                int f = e->face1->index;
                 int c = state->clues[f];
                 if (c >= 0 && sstate->face_yes_count[f] == c - 1)
                     sm1_nearby++;
             }
             if (e->face2) {
-                int f = e->face2 - g->faces;
+                int f = e->face2->index;
                 int c = state->clues[f];
                 if (c >= 0 && sstate->face_yes_count[f] == c - 1)
                     sm1_nearby++;
@@ -2958,7 +3048,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char button_char = ' ';
     enum line_state old_state;
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     /* Convert mouse-click (x,y) to grid coordinates */
     x -= BORDER(ds->tilesize);
@@ -2972,7 +3062,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     if (e == NULL)
         return NULL;
 
-    i = e - g->edges;
+    i = e->index;
 
     /* I think it's only possible to play this game with mouse clicks, sorry */
     /* Maybe will add mouse drag support some time */
@@ -3020,73 +3110,58 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     movesize = 80;
     movebuf = snewn(movesize, char);
     movelen = sprintf(movebuf, "%d%c", i, (int)button_char);
-    {
-        static enum { OFF, FIXED, ADAPTIVE, DUNNO } autofollow = DUNNO;
-        if (autofollow == DUNNO) {
-            const char *env = getenv("LOOPY_AUTOFOLLOW");
-            if (env && !strcmp(env, "off"))
-                autofollow = OFF;
-            else if (env && !strcmp(env, "fixed"))
-                autofollow = FIXED;
-            else if (env && !strcmp(env, "adaptive"))
-                autofollow = ADAPTIVE;
-            else
-                autofollow = OFF;
-        }
 
-        if (autofollow != OFF) {
-            int dotid;
-            for (dotid = 0; dotid < 2; dotid++) {
-                grid_dot *dot = (dotid == 0 ? e->dot1 : e->dot2);
-                grid_edge *e_this = e;
-
-                while (1) {
-                    int j, n_found;
-                    grid_edge *e_next = NULL;
-
-                    for (j = n_found = 0; j < dot->order; j++) {
-                        grid_edge *e_candidate = dot->edges[j];
-                        int i_candidate = e_candidate - g->edges;
-                        if (e_candidate != e_this &&
-                            (autofollow == FIXED ||
-                             state->lines[i] == LINE_NO ||
-                             state->lines[i_candidate] != LINE_NO)) {
-                            e_next = e_candidate;
-                            n_found++;
-                        }
+    if (ui->autofollow != AF_OFF) {
+        int dotid;
+        for (dotid = 0; dotid < 2; dotid++) {
+            grid_dot *dot = (dotid == 0 ? e->dot1 : e->dot2);
+            grid_edge *e_this = e;
+
+            while (1) {
+                int j, n_found;
+                grid_edge *e_next = NULL;
+
+                for (j = n_found = 0; j < dot->order; j++) {
+                    grid_edge *e_candidate = dot->edges[j];
+                    int i_candidate = e_candidate->index;
+                    if (e_candidate != e_this &&
+                        (ui->autofollow == AF_FIXED ||
+                         state->lines[i] == LINE_NO ||
+                         state->lines[i_candidate] != LINE_NO)) {
+                        e_next = e_candidate;
+                        n_found++;
                     }
+                }
 
-                    if (n_found != 1 ||
-                        state->lines[e_next - g->edges] != state->lines[i])
-                        break;
-
-                    if (e_next == e) {
-                        /*
-                         * Special case: we might have come all the
-                         * way round a loop and found our way back to
-                         * the same edge we started from. In that
-                         * situation, we must terminate not only this
-                         * while loop, but the 'for' outside it that
-                         * was tracing in both directions from the
-                         * starting edge, because if we let it trace
-                         * in the second direction then we'll only
-                         * find ourself traversing the same loop in
-                         * the other order and generate an encoded
-                         * move string that mentions the same set of
-                         * edges twice.
-                         */
-                        goto autofollow_done;
-                    }
+                if (n_found != 1 ||
+                    state->lines[e_next->index] != state->lines[i])
+                    break;
+
+                if (e_next == e) {
+                    /*
+                     * Special case: we might have come all the way
+                     * round a loop and found our way back to the same
+                     * edge we started from. In that situation, we
+                     * must terminate not only this while loop, but
+                     * the 'for' outside it that was tracing in both
+                     * directions from the starting edge, because if
+                     * we let it trace in the second direction then
+                     * we'll only find ourself traversing the same
+                     * loop in the other order and generate an encoded
+                     * move string that mentions the same set of edges
+                     * twice.
+                     */
+                    goto autofollow_done;
+                }
 
-                    dot = (e_next->dot1 != dot ? e_next->dot1 : e_next->dot2);
-                    if (movelen > movesize - 40) {
-                        movesize = movesize * 5 / 4 + 128;
-                        movebuf = sresize(movebuf, movesize, char);
-                    }
-                    e_this = e_next;
-                    movelen += sprintf(movebuf+movelen, "%d%c",
-                                       (int)(e_this - g->edges), button_char);
+                dot = (e_next->dot1 != dot ? e_next->dot1 : e_next->dot2);
+                if (movelen > movesize - 40) {
+                    movesize = movesize * 5 / 4 + 128;
+                    movebuf = sresize(movebuf, movesize, char);
                 }
+                e_this = e_next;
+                movelen += sprintf(movebuf+movelen, "%d%c",
+                                   (int)(e_this->index), button_char);
             }
           autofollow_done:;
         }
@@ -3159,7 +3234,7 @@ static void grid_to_screen(const game_drawstate *ds, const grid *g,
 static void face_text_pos(const game_drawstate *ds, const grid *g,
                           grid_face *f, int *xret, int *yret)
 {
-    int faceindex = f - g->faces;
+    int faceindex = f->index;
 
     /*
      * Return the cached position for this face, if we've already
@@ -3192,9 +3267,9 @@ static void face_text_bbox(game_drawstate *ds, grid *g, grid_face *f,
     /* There seems to be a certain amount of trial-and-error involved
      * in working out the correct bounding-box for the text. */
 
-    *x = xx - ds->tilesize/4 - 1;
+    *x = xx - ds->tilesize * 5 / 4 - 1;
     *y = yy - ds->tilesize/4 - 3;
-    *w = ds->tilesize/2 + 2;
+    *w = ds->tilesize * 5 / 2 + 2;
     *h = ds->tilesize/2 + 5;
 }
 
@@ -3202,7 +3277,7 @@ static void game_redraw_clue(drawing *dr, game_drawstate *ds,
                              const game_state *state, int i)
 {
     grid *g = state->game_grid;
-    grid_face *f = g->faces + i;
+    grid_face *f = g->faces[i];
     int x, y;
     char c[20];
 
@@ -3228,10 +3303,10 @@ static void edge_bbox(game_drawstate *ds, grid *g, grid_edge *e,
     grid_to_screen(ds, g, x1, y1, &x1, &y1);
     grid_to_screen(ds, g, x2, y2, &x2, &y2);
     /* Allow extra margin for dots, and thickness of lines */
-    xmin = min(x1, x2) - 2;
-    xmax = max(x1, x2) + 2;
-    ymin = min(y1, y2) - 2;
-    ymax = max(y1, y2) + 2;
+    xmin = min(x1, x2) - (ds->tilesize + 15) / 16;
+    xmax = max(x1, x2) + (ds->tilesize + 15) / 16;
+    ymin = min(y1, y2) - (ds->tilesize + 15) / 16;
+    ymax = max(y1, y2) + (ds->tilesize + 15) / 16;
 
     *x = xmin;
     *y = ymin;
@@ -3243,13 +3318,19 @@ static void dot_bbox(game_drawstate *ds, grid *g, grid_dot *d,
                      int *x, int *y, int *w, int *h)
 {
     int x1, y1;
+    int xmin, xmax, ymin, ymax;
 
     grid_to_screen(ds, g, d->x, d->y, &x1, &y1);
 
-    *x = x1 - 2;
-    *y = y1 - 2;
-    *w = 5;
-    *h = 5;
+    xmin = x1 - (ds->tilesize * 5 + 63) / 64;
+    xmax = x1 + (ds->tilesize * 5 + 63) / 64;
+    ymin = y1 - (ds->tilesize * 5 + 63) / 64;
+    ymax = y1 + (ds->tilesize * 5 + 63) / 64;
+
+    *x = xmin;
+    *y = ymin;
+    *w = xmax - xmin + 1;
+    *h = ymax - ymin + 1;
 }
 
 static const int loopy_line_redraw_phases[] = {
@@ -3257,11 +3338,11 @@ static const int loopy_line_redraw_phases[] = {
 };
 #define NPHASES lenof(loopy_line_redraw_phases)
 
-static void game_redraw_line(drawing *dr, game_drawstate *ds,
+static void game_redraw_line(drawing *dr, game_drawstate *ds,const game_ui *ui,
                              const game_state *state, int i, int phase)
 {
     grid *g = state->game_grid;
-    grid_edge *e = g->edges + i;
+    grid_edge *e = g->edges[i];
     int x1, x2, y1, y2;
     int line_colour;
 
@@ -3283,16 +3364,13 @@ static void game_redraw_line(drawing *dr, game_drawstate *ds,
     grid_to_screen(ds, g, e->dot2->x, e->dot2->y, &x2, &y2);
 
     if (line_colour == COL_FAINT) {
-        static int draw_faint_lines = -1;
-        if (draw_faint_lines < 0) {
-            char *env = getenv("LOOPY_FAINT_LINES");
-            draw_faint_lines = (!env || (env[0] == 'y' ||
-                                         env[0] == 'Y'));
-        }
-        if (draw_faint_lines)
-            draw_line(dr, x1, y1, x2, y2, line_colour);
+        if (ui->draw_faint_lines)
+            draw_thick_line(dr, ds->tilesize/24.0,
+                            x1 + 0.5, y1 + 0.5,
+                            x2 + 0.5, y2 + 0.5,
+                            line_colour);
     } else {
-        draw_thick_line(dr, 3.0,
+        draw_thick_line(dr, ds->tilesize*3/32.0,
                         x1 + 0.5, y1 + 0.5,
                         x2 + 0.5, y2 + 0.5,
                         line_colour);
@@ -3303,11 +3381,11 @@ static void game_redraw_dot(drawing *dr, game_drawstate *ds,
                             const game_state *state, int i)
 {
     grid *g = state->game_grid;
-    grid_dot *d = g->dots + i;
+    grid_dot *d = g->dots[i];
     int x, y;
 
     grid_to_screen(ds, g, d->x, d->y, &x, &y);
-    draw_circle(dr, x, y, 2, COL_FOREGROUND, COL_FOREGROUND);
+    draw_circle(dr, x, y, ds->tilesize*2.5/32.0, COL_FOREGROUND, COL_FOREGROUND);
 }
 
 static bool boxes_intersect(int x0, int y0, int w0, int h0,
@@ -3322,7 +3400,7 @@ static bool boxes_intersect(int x0, int y0, int w0, int h0,
 }
 
 static void game_redraw_in_rect(drawing *dr, game_drawstate *ds,
-                                const game_state *state,
+                                const game_ui *ui, const game_state *state,
                                 int x, int y, int w, int h)
 {
     grid *g = state->game_grid;
@@ -3334,20 +3412,20 @@ static void game_redraw_in_rect(drawing *dr, game_drawstate *ds,
 
     for (i = 0; i < g->num_faces; i++) {
         if (state->clues[i] >= 0) {
-            face_text_bbox(ds, g, &g->faces[i], &bx, &by, &bw, &bh);
+            face_text_bbox(ds, g, g->faces[i], &bx, &by, &bw, &bh);
             if (boxes_intersect(x, y, w, h, bx, by, bw, bh))
                 game_redraw_clue(dr, ds, state, i);
         }
     }
     for (phase = 0; phase < NPHASES; phase++) {
         for (i = 0; i < g->num_edges; i++) {
-            edge_bbox(ds, g, &g->edges[i], &bx, &by, &bw, &bh);
+            edge_bbox(ds, g, g->edges[i], &bx, &by, &bw, &bh);
             if (boxes_intersect(x, y, w, h, bx, by, bw, bh))
-                game_redraw_line(dr, ds, state, i, phase);
+                game_redraw_line(dr, ds, ui, state, i, phase);
         }
     }
     for (i = 0; i < g->num_dots; i++) {
-        dot_bbox(ds, g, &g->dots[i], &bx, &by, &bw, &bh);
+        dot_bbox(ds, g, g->dots[i], &bx, &by, &bw, &bh);
         if (boxes_intersect(x, y, w, h, bx, by, bw, bh))
             game_redraw_dot(dr, ds, state, i);
     }
@@ -3407,7 +3485,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     /* First, trundle through the faces. */
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int sides = f->order;
         int yes_order, no_order;
         bool clue_mistake;
@@ -3500,26 +3578,26 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         int w = grid_width * ds->tilesize / g->tilesize;
         int h = grid_height * ds->tilesize / g->tilesize;
 
-        game_redraw_in_rect(dr, ds, state,
+        game_redraw_in_rect(dr, ds, ui, state,
                             0, 0, w + 2*border + 1, h + 2*border + 1);
     } else {
 
         /* Right.  Now we roll up our sleeves. */
 
         for (i = 0; i < nfaces; i++) {
-            grid_face *f = g->faces + faces[i];
+            grid_face *f = g->faces[faces[i]];
             int x, y, w, h;
 
             face_text_bbox(ds, g, f, &x, &y, &w, &h);
-            game_redraw_in_rect(dr, ds, state, x, y, w, h);
+            game_redraw_in_rect(dr, ds, ui, state, x, y, w, h);
         }
 
         for (i = 0; i < nedges; i++) {
-            grid_edge *e = g->edges + edges[i];
+            grid_edge *e = g->edges[edges[i]];
             int x, y, w, h;
 
             edge_bbox(ds, g, e, &x, &y, &w, &h);
-            game_redraw_in_rect(dr, ds, state, x, y, w, h);
+            game_redraw_in_rect(dr, ds, ui, state, x, y, w, h);
         }
     }
 
@@ -3550,19 +3628,21 @@ static int game_status(const game_state *state)
     return state->solved ? +1 : 0;
 }
 
-static void game_print_size(const game_params *params, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 7mm "squares" by default.
      */
-    game_compute_size(params, 700, &pw, &ph);
+    game_compute_size(params, 700, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int ink = print_mono_colour(dr, 0);
     int i;
@@ -3577,7 +3657,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 
     for (i = 0; i < g->num_dots; i++) {
         int x, y;
-        grid_to_screen(ds, g, g->dots[i].x, g->dots[i].y, &x, &y);
+        grid_to_screen(ds, g, g->dots[i]->x, g->dots[i]->y, &x, &y);
         draw_circle(dr, x, y, ds->tilesize / 15, ink, ink);
     }
 
@@ -3585,7 +3665,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
      * Clues.
      */
     for (i = 0; i < g->num_faces; i++) {
-        grid_face *f = g->faces + i;
+        grid_face *f = g->faces[i];
         int clue = state->clues[i];
         if (clue >= 0) {
             char c[20];
@@ -3603,7 +3683,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
      */
     for (i = 0; i < g->num_edges; i++) {
         int thickness = (state->lines[i] == LINE_YES) ? 30 : 150;
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         int x1, y1, x2, y2;
         grid_to_screen(ds, g, e->dot1->x, e->dot1->y, &x1, &y1);
         grid_to_screen(ds, g, e->dot2->x, e->dot2->y, &x2, &y2);
@@ -3666,14 +3746,16 @@ const struct game thegame = {
     new_game,
     dup_game,
     free_game,
-    1, solve_game,
+    true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    NULL, /* current_key_label */
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -3687,7 +3769,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false /* wants_statusbar */,
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                       /* mouse_priorities */
 };
 
diff --git a/apps/plugins/puzzles/src/magnets.R b/apps/plugins/puzzles/src/magnets.R
deleted file mode 100644
index e55e4746ee..0000000000
--- a/apps/plugins/puzzles/src/magnets.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-MAGNETS_EXTRA = laydomino
-
-magnets      : [X] GTK COMMON magnets MAGNETS_EXTRA magnets-icon|no-icon
-
-magnets      : [G] WINDOWS COMMON magnets MAGNETS_EXTRA magnets.res|noicon.res
-
-magnetssolver :     [U] magnets[STANDALONE_SOLVER] MAGNETS_EXTRA STANDALONE m.lib
-magnetssolver :     [C] magnets[STANDALONE_SOLVER] MAGNETS_EXTRA STANDALONE
-
-ALL += magnets[COMBINED] MAGNETS_EXTRA
-
-!begin am gtk
-GAMES += magnets
-!end
-
-!begin >list.c
-    A(magnets) \
-!end
-
-!begin >gamedesc.txt
-magnets:magnets.exe:Magnets:Magnet-placing puzzle:Place magnets to satisfy the clues and avoid like poles touching.
-!end
diff --git a/apps/plugins/puzzles/src/magnets.c b/apps/plugins/puzzles/src/magnets.c
index edbb8490ad..7cb5fbc919 100644
--- a/apps/plugins/puzzles/src/magnets.c
+++ b/apps/plugins/puzzles/src/magnets.c
@@ -36,12 +36,17 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
 #ifdef STANDALONE_SOLVER
-bool verbose = 0;
+static bool verbose = false;
 #endif
 
 enum {
@@ -230,8 +235,17 @@ static game_params *custom_params(const config_item *cfg)
 
 static const char *validate_params(const game_params *params, bool full)
 {
-    if (params->w < 2) return "Width must be at least one";
-    if (params->h < 2) return "Height must be at least one";
+    if (params->w < 2) return "Width must be at least two";
+    if (params->h < 2) return "Height must be at least two";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
+    if (params->diff >= DIFF_TRICKY) {
+        if (params->w < 5 && params->h < 5)
+            return "Either width or height must be at least five for Tricky";
+    } else {
+        if (params->w < 3 && params->h < 3)
+            return "Either width or height must be at least three";
+    }
     if (params->diff < 0 || params->diff >= DIFFCOUNT)
         return "Unknown difficulty level";
 
@@ -510,7 +524,9 @@ nextchar:
      * (i.e. each end points to the other) */
     for (idx = 0; idx < state->wh; idx++) {
         if (state->common->dominoes[idx] < 0 ||
-            state->common->dominoes[idx] > state->wh ||
+            state->common->dominoes[idx] >= state->wh ||
+            (state->common->dominoes[idx] % state->w != idx % state->w &&
+             state->common->dominoes[idx] / state->w != idx / state->w) ||
             state->common->dominoes[state->common->dominoes[idx]] != idx) {
             *prob = "Domino descriptions inconsistent";
             goto done;
@@ -541,7 +557,7 @@ static const char *validate_desc(const game_params *params, const char *desc)
 {
     const char *prob;
     game_state *st = new_game_int(params, desc, &prob);
-    if (!st) return (char*)prob;
+    if (!st) return prob;
     free_game(st);
     return NULL;
 }
@@ -1574,6 +1590,7 @@ static int lay_dominoes(game_state *state, random_state *rs, int *scratch)
     }
 
     debug(("Laid %d dominoes, total %d dominoes.\n", nlaid, state->wh/2));
+    (void)nlaid;
     game_debug(state, "Final layout");
     return ret;
 }
@@ -1720,7 +1737,7 @@ static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     return ui;
 }
 
@@ -1729,15 +1746,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
@@ -1745,6 +1753,36 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
         ui->cur_visible = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    int idx;
+
+    if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible) return "";
+        idx = ui->cur_y * state->w + ui->cur_x;
+        if (button == CURSOR_SELECT) {
+            if (state->grid[idx] == NEUTRAL && state->flags[idx] & GS_SET)
+                return "";
+            switch (state->grid[idx]) {
+              case EMPTY: return "+";
+              case POSITIVE: return "-";
+              case NEGATIVE: return "Clear";
+            }
+        }
+        if (button == CURSOR_SELECT2) {
+            if (state->grid[idx] != NEUTRAL) return "";
+            if (state->flags[idx] & GS_SET) /* neutral */
+                return "?";
+            if (state->flags[idx] & GS_NOTNEUTRAL) /* !neutral */
+                return "Clear";
+            else
+                return "X";
+        }
+    }
+    return "";
+}
+    
 struct game_drawstate {
     int tilesize;
     bool started, solved;
@@ -1805,14 +1843,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char *nullret = NULL, buf[80], movech;
     enum { CYCLE_MAGNET, CYCLE_NEUTRAL } action;
 
-    if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cur_x, &ui->cur_y, state->w, state->h, false);
-        ui->cur_visible = true;
-        return UI_UPDATE;
-    } else if (IS_CURSOR_SELECT(button)) {
+    if (IS_CURSOR_MOVE(button))
+        return move_cursor(button, &ui->cur_x, &ui->cur_y, state->w, state->h,
+                           false, &ui->cur_visible);
+    else if (IS_CURSOR_SELECT(button)) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         action = (button == CURSOR_SELECT) ? CYCLE_MAGNET : CYCLE_NEUTRAL;
         gx = ui->cur_x;
@@ -1821,7 +1858,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                (button == LEFT_BUTTON || button == RIGHT_BUTTON)) {
         if (ui->cur_visible) {
             ui->cur_visible = false;
-            nullret = UI_UPDATE;
+            nullret = MOVE_UI_UPDATE;
         }
         action = (button == LEFT_BUTTON) ? CYCLE_MAGNET : CYCLE_NEUTRAL;
     } else if (button == LEFT_BUTTON && is_clue(state, gx, gy)) {
@@ -1928,7 +1965,7 @@ badmove:
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2205,12 +2242,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     flash = (int)(flashtime * 5 / FLASH_TIME) % 2;
 
     if (!ds->started) {
-        /* draw background, corner +-. */
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * (w+2) + 2 * BORDER,
-                  TILE_SIZE * (h+2) + 2 * BORDER,
-                  COL_BACKGROUND);
-
+        /* draw corner +-. */
         draw_sym(dr, ds, -1, -1, POSITIVE, COL_TEXT);
         draw_sym(dr, ds, state->w, state->h, NEGATIVE, COL_TEXT);
 
@@ -2309,24 +2341,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->w, h = state->h;
     int ink = print_mono_colour(dr, 0);
@@ -2430,12 +2459,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2449,7 +2480,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
@@ -2458,14 +2489,14 @@ const struct game thegame = {
 #include <time.h>
 #include <stdarg.h>
 
-const char *quis = NULL;
-bool csv = false;
+static const char *quis = NULL;
+static bool csv = false;
 
-void usage(FILE *out) {
+static void usage(FILE *out) {
     fprintf(out, "usage: %s [-v] [--print] <params>|<game id>\n", quis);
 }
 
-void doprint(game_state *state)
+static void doprint(game_state *state)
 {
     char *fmt = game_text_format(state);
     printf("%s", fmt);
@@ -2559,7 +2590,7 @@ static void start_soak(game_params *p, random_state *rs)
     sfree(aux);
 }
 
-int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
     bool print = false, soak = false, solved = false;
     int ret;
@@ -2608,7 +2639,7 @@ int main(int argc, const char *argv[])
     decode_params(p, id);
     err = validate_params(p, true);
     if (err) {
-        fprintf(stderr, "%s: %s", argv[0], err);
+        fprintf(stderr, "%s: %s\n", argv[0], err);
         goto done;
     }
 
diff --git a/apps/plugins/puzzles/src/malloc.c b/apps/plugins/puzzles/src/malloc.c
deleted file mode 100644
index a7fa7c5adc..0000000000
--- a/apps/plugins/puzzles/src/malloc.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * malloc.c: safe wrappers around malloc, realloc, free, strdup
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "puzzles.h"
-
-/*
- * smalloc should guarantee to return a useful pointer - Halibut
- * can do nothing except die when it's out of memory anyway.
- */
-void *smalloc(size_t size) {
-    void *p;
-    p = malloc(size);
-    if (!p)
-        fatal("out of memory");
-    return p;
-}
-
-/*
- * sfree should guaranteeably deal gracefully with freeing NULL
- */
-void sfree(void *p) {
-    if (p) {
-        free(p);
-    }
-}
-
-/*
- * srealloc should guaranteeably be able to realloc NULL
- */
-void *srealloc(void *p, size_t size) {
-    void *q;
-    if (p) {
-        q = realloc(p, size);
-    } else {
-        q = malloc(size);
-    }
-    if (!q)
-        fatal("out of memory");
-    return q;
-}
-
-/*
- * dupstr is like strdup, but with the never-return-NULL property
- * of smalloc (and also reliably defined in all environments :-)
- */
-char *dupstr(const char *s) {
-    char *r = smalloc(1+strlen(s));
-    strcpy(r,s);
-    return r;
-}
diff --git a/apps/plugins/puzzles/src/map.R b/apps/plugins/puzzles/src/map.R
deleted file mode 100644
index 1e702aa19d..0000000000
--- a/apps/plugins/puzzles/src/map.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-MAP_EXTRA = dsf
-
-map      : [X] GTK COMMON map MAP_EXTRA map-icon|no-icon
-
-map      : [G] WINDOWS COMMON map MAP_EXTRA map.res|noicon.res
-
-mapsolver :     [U] map[STANDALONE_SOLVER] MAP_EXTRA STANDALONE m.lib
-mapsolver :     [C] map[STANDALONE_SOLVER] MAP_EXTRA STANDALONE
-
-ALL += map[COMBINED] MAP_EXTRA
-
-!begin am gtk
-GAMES += map
-!end
-
-!begin >list.c
-    A(map) \
-!end
-
-!begin >gamedesc.txt
-map:map.exe:Map:Map-colouring puzzle:Colour the map so that adjacent regions are never the same colour.
-!end
diff --git a/apps/plugins/puzzles/src/map.c b/apps/plugins/puzzles/src/map.c
index 9df2d22b52..2ef156e72a 100644
--- a/apps/plugins/puzzles/src/map.c
+++ b/apps/plugins/puzzles/src/map.c
@@ -14,7 +14,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -25,7 +30,7 @@
  */
 #if defined STANDALONE_SOLVER
 #define SOLVER_DIAGNOSTICS
-bool verbose = false;
+static bool verbose = false;
 #elif defined SOLVER_DIAGNOSTICS
 #define verbose true
 #endif
@@ -41,12 +46,6 @@ bool verbose = false;
 #define SIX (FOUR+2)
 
 /*
- * Ghastly run-time configuration option, just for Gareth (again).
- */
-static int flash_type = -1;
-static float flash_length;
-
-/*
  * Difficulty levels. I do some macro ickery here to ensure that my
  * enum and the various forms of my name list always match up.
  */
@@ -180,7 +179,9 @@ static void decode_params(game_params *params, char const *string)
         params->n = atoi(p);
         while (*p && (*p == '.' || isdigit((unsigned char)*p))) p++;
     } else {
-        params->n = params->w * params->h / 8;
+        if (params->h > 0 && params->w > 0 &&
+            params->w <= INT_MAX / params->h)
+            params->n = params->w * params->h / 8;
     }
     if (*p == 'd') {
         int i;
@@ -252,6 +253,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 2 || params->h < 2)
         return "Width and height must be at least two";
+    if (params->w > INT_MAX / 2 / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->n < 5)
         return "Must have at least five regions";
     if (params->n > params->w * params->h)
@@ -1659,6 +1662,10 @@ static char *new_game_desc(const game_params *params, random_state *rs,
             }
         }
 
+        if (retlen + 10 >= retsize) {
+            retsize = retlen + 256;
+            ret = sresize(ret, retsize, char);
+        }
         ret[retlen++] = 'a'-1 + run;
         ret[retlen++] = ',';
 
@@ -1711,8 +1718,8 @@ static const char *parse_edge_list(const game_params *params,
     int i, k, pos;
     bool state;
     const char *p = *desc;
-
-    dsf_init(map+wh, wh);
+    const char *err = NULL;
+    DSF *dsf = dsf_new(wh);
 
     pos = -1;
     state = false;
@@ -1723,8 +1730,10 @@ static const char *parse_edge_list(const game_params *params,
      * pairs of squares whenever the edge list shows a non-edge).
      */
     while (*p && *p != ',') {
-        if (*p < 'a' || *p > 'z')
-            return "Unexpected character in edge list";
+        if (*p < 'a' || *p > 'z') {
+            err = "Unexpected character in edge list";
+            goto out;
+        }
         if (*p == 'z')
             k = 25;
         else
@@ -1747,10 +1756,12 @@ static const char *parse_edge_list(const game_params *params,
                 y = (pos - w*(h-1)) % h;
                 dx = 1;
                 dy = 0;
-            } else
-                return "Too much data in edge list";
+            } else {
+                err = "Too much data in edge list";
+                goto out;
+            }
             if (!state)
-                dsf_merge(map+wh, y*w+x, (y+dy)*w+(x+dx));
+                dsf_merge(dsf, y*w+x, (y+dy)*w+(x+dx));
 
             pos++;
         }
@@ -1759,8 +1770,10 @@ static const char *parse_edge_list(const game_params *params,
         p++;
     }
     assert(pos <= 2*wh-w-h);
-    if (pos < 2*wh-w-h)
-        return "Too little data in edge list";
+    if (pos < 2*wh-w-h) {
+        err = "Too little data in edge list";
+        goto out;
+    }
 
     /*
      * Now go through again and allocate region numbers.
@@ -1769,17 +1782,22 @@ static const char *parse_edge_list(const game_params *params,
     for (i = 0; i < wh; i++)
         map[i] = -1;
     for (i = 0; i < wh; i++) {
-        k = dsf_canonify(map+wh, i);
+        k = dsf_canonify(dsf, i);
         if (map[k] < 0)
             map[k] = pos++;
         map[i] = map[k];
     }
-    if (pos != n)
-        return "Edge list defines the wrong number of regions";
+    if (pos != n) {
+        err = "Edge list defines the wrong number of regions";
+        goto out;
+    }
 
     *desc = p;
+    err = NULL; /* no error */
 
-    return NULL;
+  out:
+    dsf_free(dsf);
+    return err;
 }
 
 static const char *validate_desc(const game_params *params, const char *desc)
@@ -1789,7 +1807,7 @@ static const char *validate_desc(const game_params *params, const char *desc)
     int *map;
     const char *ret;
 
-    map = snewn(2*wh, int);
+    map = snewn(wh, int);
     ret = parse_edge_list(params, &desc, map);
     sfree(map);
     if (ret)
@@ -2252,16 +2270,6 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     return dupstr(aux);
 }
 
-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;
-}
-
 struct game_ui {
     /*
      * drag_colour:
@@ -2275,11 +2283,41 @@ struct game_ui {
     int drag_pencil;
     int dragx, dragy;
     bool show_numbers;
+    bool large_stipples;
 
     int cur_x, cur_y, cur_lastmove;
     bool cur_visible, cur_moved;
+
+    /*
+     * User preference to enable alternative versions of the
+     * completion flash. Some users have found the colour-cycling
+     * default version to be a bit eye-twisting.
+     */
+    enum {
+        FLASH_CYCLIC,          /* cycle the four colours of the map */
+        FLASH_EACH_TO_WHITE,   /* turn each colour white in turn */
+        FLASH_ALL_TO_WHITE     /* flash the whole map to white in one go */
+    } flash_type;
 };
 
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int flash_type = -1;
+
+    if (!initialised) {
+        char *env;
+
+        initialised = true;
+
+        if ((env = getenv("MAP_ALTERNATIVE_FLASH")) != NULL)
+            flash_type = FLASH_EACH_TO_WHITE;
+    }
+
+    if (flash_type != -1)
+        ui_out->flash_type = flash_type;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
@@ -2288,24 +2326,56 @@ static game_ui *new_ui(const game_state *state)
     ui->drag_pencil = 0;
     ui->show_numbers = false;
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->cur_moved = false;
     ui->cur_lastmove = 0;
+    ui->flash_type = FLASH_CYCLIC;
+    ui->large_stipples = false;
+    legacy_prefs_override(ui);
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *ret;
+
+    ret = snewn(4, config_item);
+
+    ret[0].name = "Victory flash effect";
+    ret[0].kw = "flash-type";
+    ret[0].type = C_CHOICES;
+    ret[0].u.choices.choicenames = ":Cyclic:Each to white:All to white";
+    ret[0].u.choices.choicekws = ":cyclic:each-white:all-white";
+    ret[0].u.choices.selected = ui->flash_type;
+
+    ret[1].name = "Number regions";
+    ret[1].kw = "show-numbers";
+    ret[1].type = C_BOOLEAN;
+    ret[1].u.boolean.bval = ui->show_numbers;
+
+    ret[2].name = "Display style for stipple marks";
+    ret[2].kw = "stipple-style";
+    ret[2].type = C_CHOICES;
+    ret[2].u.choices.choicenames = ":Small:Large";
+    ret[2].u.choices.choicekws = ":small:large";
+    ret[2].u.choices.selected = ui->large_stipples;
+
+    ret[3].name = NULL;
+    ret[3].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->flash_type = cfg[0].u.choices.selected;
+    ui->show_numbers = cfg[1].u.boolean.bval;
+    ui->large_stipples = cfg[2].u.choices.selected;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -2388,6 +2458,26 @@ static int region_from_ui_cursor(const game_state *state, const game_ui *ui)
                                       EPSILON_Y(ui->cur_lastmove));
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    int r;
+
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible) {
+        if (ui->drag_colour == -2) return "Pick";
+        r = region_from_ui_cursor(state, ui);
+        if (state->map->immutable[r]) return "Cancel";
+        if (!ui->cur_moved) return ui->drag_pencil ? "Cancel" : "Clear";
+        if (button == CURSOR_SELECT2) {
+            if (state->colouring[r] >= 0) return "Cancel";
+            if (ui->drag_colour >= 0) return "Stipple";
+        }
+        if (ui->drag_pencil) return "Stipple";
+        return ui->drag_colour >= 0 ? "Fill" : "Clear";
+    }
+    return "";
+}
+
 static char *interpret_move(const game_state *state, game_ui *ui,
                             const game_drawstate *ds,
                             int x, int y, int button)
@@ -2401,21 +2491,21 @@ static char *interpret_move(const game_state *state, game_ui *ui,
      */
     if (button == 'l' || button == 'L') {
         ui->show_numbers = !ui->show_numbers;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_CURSOR_MOVE(button)) {
         move_cursor(button, &ui->cur_x, &ui->cur_y, state->p.w, state->p.h,
-                    false);
+                    false, NULL);
         ui->cur_visible = true;
         ui->cur_moved = true;
         ui->cur_lastmove = button;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
     if (IS_CURSOR_SELECT(button)) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (ui->drag_colour == -2) { /* not currently cursor-dragging, start. */
             int r = region_from_ui_cursor(state, ui);
@@ -2427,7 +2517,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->drag_pencil = 0;
             }
             ui->cur_moved = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         } else { /* currently cursor-dragging; drop the colour in the new region. */
             alt_button = (button == CURSOR_SELECT2);
             /* Double-select removes current colour. */
@@ -2452,14 +2542,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->dragx = x;
         ui->dragy = y;
         ui->cur_visible = false;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if ((button == LEFT_DRAG || button == RIGHT_DRAG) &&
         ui->drag_colour > -2) {
         ui->dragx = x;
         ui->dragy = y;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if ((button == LEFT_RELEASE || button == RIGHT_RELEASE) &&
@@ -2484,18 +2574,18 @@ drag_dropped:
         ui->drag_colour = -2;
 
         if (r < 0)
-            return UI_UPDATE;          /* drag into border; do nothing else */
+            return MOVE_UI_UPDATE;          /* drag into border; do nothing else */
 
         if (state->map->immutable[r])
-            return UI_UPDATE;          /* can't change this region */
+            return MOVE_UI_UPDATE;          /* can't change this region */
 
         if (state->colouring[r] == c && state->pencil[r] == p)
-            return UI_UPDATE;          /* don't _need_ to change this region */
+            return MOVE_UI_UPDATE;          /* don't _need_ to change this region */
 
         if (alt_button) {
             if (state->colouring[r] >= 0) {
                 /* Can't pencil on a coloured region */
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             } else if (c >= 0) {
                 /* Right-dragging from colour to blank toggles one pencil */
                 p = state->pencil[r] ^ (1 << c);
@@ -2605,7 +2695,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2729,7 +2819,7 @@ static void draw_error(drawing *dr, game_drawstate *ds, int x, int y)
 
 static void draw_square(drawing *dr, game_drawstate *ds,
                         const game_params *params, struct map *map,
-                        int x, int y, unsigned long v)
+                        int x, int y, unsigned long v, bool large_stipples)
 {
     int w = params->w, h = params->h, wh = w*h;
     int tv, bv, xo, yo, i, j, oldj;
@@ -2802,7 +2892,8 @@ static void draw_square(drawing *dr, game_drawstate *ds,
 
             draw_circle(dr, COORD(x) + (xo+1)*TILESIZE/5,
                         COORD(y) + (yo+1)*TILESIZE/5,
-                        TILESIZE/4, COL_0 + c, COL_0 + c);
+                        large_stipples ? TILESIZE/4 : TILESIZE/7,
+                        COL_0 + c, COL_0 + c);
         }
 
     /*
@@ -2857,6 +2948,11 @@ static void draw_square(drawing *dr, game_drawstate *ds,
     draw_update(dr, COORD(x), COORD(y), TILESIZE, TILESIZE);
 }
 
+static float flash_length(const game_ui *ui)
+{
+    return (ui->flash_type == FLASH_EACH_TO_WHITE ? 0.50F : 0.30F);
+}
+
 static void game_redraw(drawing *dr, game_drawstate *ds,
                         const game_state *oldstate, const game_state *state,
                         int dir, const game_ui *ui,
@@ -2872,29 +2968,18 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         ds->drag_visible = false;
     }
 
-    /*
-     * The initial contents of the window are not guaranteed and
-     * can vary with front ends. To be on the safe side, all games
-     * should start by drawing a big background-colour rectangle
-     * covering the whole window.
-     */
     if (!ds->started) {
-        int ww, wh;
-
-        game_compute_size(&state->p, TILESIZE, &ww, &wh);
-        draw_rect(dr, 0, 0, ww, wh, COL_BACKGROUND);
         draw_rect(dr, COORD(0), COORD(0), w*TILESIZE+1, h*TILESIZE+1,
                   COL_GRID);
-
-        draw_update(dr, 0, 0, ww, wh);
+        draw_update(dr, COORD(0), COORD(0), w*TILESIZE+1, h*TILESIZE+1);
         ds->started = true;
     }
 
     if (flashtime) {
-        if (flash_type == 1)
-            flash = (int)(flashtime * FOUR / flash_length);
+        if (ui->flash_type == FLASH_EACH_TO_WHITE)
+            flash = (int)(flashtime * FOUR / flash_length(ui));
         else
-            flash = 1 + (int)(flashtime * THREE / flash_length);
+            flash = 1 + (int)(flashtime * THREE / flash_length(ui));
     } else
         flash = -1;
 
@@ -2913,12 +2998,12 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
                 bv = FOUR;
 
             if (flash >= 0) {
-                if (flash_type == 1) {
+                if (ui->flash_type == FLASH_EACH_TO_WHITE) {
                     if (tv == flash)
                         tv = FOUR;
                     if (bv == flash)
                         bv = FOUR;
-                } else if (flash_type == 2) {
+                } else if (ui->flash_type == FLASH_ALL_TO_WHITE) {
                     if (flash % 2)
                         tv = bv = FOUR;
                 } else {
@@ -2990,7 +3075,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         for (x = 0; x < w; x++) {
             unsigned long v = ds->todraw[y*w+x];
             if (ds->drawn[y*w+x] != v) {
-                draw_square(dr, ds, &state->p, state->map, x, y, v);
+                draw_square(dr, ds, &state->p, state->map, x, y, v, ui->large_stipples);
                 ds->drawn[y*w+x] = v;
             }
         }
@@ -3048,15 +3133,7 @@ static float game_flash_length(const game_state *oldstate,
 {
     if (!oldstate->completed && newstate->completed &&
         !oldstate->cheated && !newstate->cheated) {
-        if (flash_type < 0) {
-            char *env = getenv("MAP_ALTERNATIVE_FLASH");
-            if (env)
-                flash_type = atoi(env);
-            else
-                flash_type = 0;
-            flash_length = (flash_type == 1 ? 0.50F : 0.30F);
-        }
-        return flash_length;
+        return flash_length(ui);
     } else
         return 0.0F;
 }
@@ -3079,12 +3156,8 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
@@ -3093,12 +3166,13 @@ static void game_print_size(const game_params *params, float *x, float *y)
      * compute this size is to compute the pixel puzzle size at a
      * given tile size and then scale.
      */
-    game_compute_size(params, 400, &pw, &ph);
+    game_compute_size(params, 400, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->p.w, h = state->p.h, wh = w*h, n = state->p.n;
     int ink, c[FOUR], i;
@@ -3257,13 +3331,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     20, game_compute_size, game_set_size,
@@ -3277,7 +3353,7 @@ const struct game thegame = {
     game_status,
     true, true, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/matching.c b/apps/plugins/puzzles/src/matching.c
index 9078f6c36a..aabdae0846 100644
--- a/apps/plugins/puzzles/src/matching.c
+++ b/apps/plugins/puzzles/src/matching.c
@@ -319,35 +319,7 @@ int matching(int nl, int nr, int **adjlists, int *adjsizes,
     return ret;
 }
 
-#ifdef STANDALONE_MATCHING_TEST
-
-/*
- * Diagnostic routine used in testing this algorithm. It is passed a
- * pointer to a piece of scratch space that's just been used by
- * matching_with_scratch, and extracts from it a labelling of the
- * input graph that acts as a 'witness' to the maximality of the
- * returned matching.
- *
- * The output parameter 'witness' should be an array of (nl+nr)
- * integers, indexed such that witness[L] corresponds to an L-vertex (for
- * L=0,1,...,nl-1) and witness[nl+R] corresponds to an R-vertex (for
- * R=0,1,...,nr-1). On return, this array will assign each vertex a
- * label which is either 0 or 1, and the following properties will
- * hold:
- *
- *  + all vertices not paired up by the matching are type L0 or R1
- *  + every L0->R1 edge is used by the matching
- *  + no L1->R0 edge is used by the matching.
- *
- * The mere existence of such a labelling is enough to prove the
- * maximality of the matching, because if there is any larger matching
- * then its symmetric difference with this one must include at least
- * one 'augmenting path', which starts at a free L-vertex and ends at
- * a free R-vertex, traversing only unused L->R edges and only used
- * R->L edges. But that would mean it starts at an L0, ends at an R1,
- * and never follows an edge that can get from an 0 to a 1.
- */
-static void matching_witness(void *scratchv, int nl, int nr, int *witness)
+void matching_witness(void *scratchv, int nl, int nr, int *witness)
 {
     struct scratch *s = (struct scratch *)scratchv;
     int i, j;
@@ -357,397 +329,3 @@ static void matching_witness(void *scratchv, int nl, int nr, int *witness)
     for (j = 0; j < nr; j++)
         witness[nl + j] = s->Rlayer[j] == -1;
 }
-
-/*
- * Standalone tool to run the matching algorithm.
- */
-
-#include <string.h>
-#include <ctype.h>
-#include <time.h>
-
-#include "tree234.h"
-
-int nl, nr, count;
-int **adjlists, *adjsizes;
-int *adjdata, *outl, *outr, *witness;
-void *scratch;
-random_state *rs;
-
-void allocate(int nl_, int nr_, int maxedges)
-{
-    nl = nl_;
-    nr = nr_;
-    adjdata = snewn(maxedges, int);
-    adjlists = snewn(nl, int *);
-    adjsizes = snewn(nl, int);
-    outl = snewn(nl, int);
-    outr = snewn(nr, int);
-    witness = snewn(nl+nr, int);
-    scratch = smalloc(matching_scratch_size(nl, nr));
-}
-
-void deallocate(void)
-{
-    sfree(adjlists);
-    sfree(adjsizes);
-    sfree(adjdata);
-    sfree(outl);
-    sfree(outr);
-    sfree(witness);
-    sfree(scratch);
-}
-
-void find_and_check_matching(void)
-{
-    int i, j, k;
-
-    count = matching_with_scratch(scratch, nl, nr, adjlists, adjsizes,
-                                  rs, outl, outr);
-    matching_witness(scratch, nl, nr, witness);
-
-    for (i = j = 0; i < nl; i++) {
-        if (outl[i] != -1) {
-            assert(0 <= outl[i] && outl[i] < nr);
-            assert(outr[outl[i]] == i);
-            j++;
-
-            for (k = 0; k < adjsizes[i]; k++)
-                if (adjlists[i][k] == outl[i])
-                    break;
-            assert(k < adjsizes[i]);
-        }
-    }
-    assert(j == count);
-
-    for (i = j = 0; i < nr; i++) {
-        if (outr[i] != -1) {
-            assert(0 <= outr[i] && outr[i] < nl);
-            assert(outl[outr[i]] == i);
-            j++;
-        }
-    }
-    assert(j == count);
-
-    for (i = 0; i < nl; i++) {
-        if (outl[i] == -1)
-            assert(witness[i] == 0);
-    }
-    for (i = 0; i < nr; i++) {
-        if (outr[i] == -1)
-            assert(witness[nl+i] == 1);
-    }
-    for (i = 0; i < nl; i++) {
-        for (j = 0; j < adjsizes[i]; j++) {
-            k = adjlists[i][j];
-
-            if (outl[i] == k)
-                assert(!(witness[i] == 1 && witness[nl+k] == 0));
-            else
-                assert(!(witness[i] == 0 && witness[nl+k] == 1));
-        }
-    }
-}
-
-struct nodename {
-    const char *name;
-    int index;
-};
-
-int compare_nodes(void *av, void *bv)
-{
-    const struct nodename *a = (const struct nodename *)av;
-    const struct nodename *b = (const struct nodename *)bv;
-    return strcmp(a->name, b->name);
-}
-
-int node_index(tree234 *n2i, tree234 *i2n, const char *name)
-{
-    struct nodename *nn, *nn_prev;
-    char *namedup = dupstr(name);
-
-    nn = snew(struct nodename);
-    nn->name = namedup;
-    nn->index = count234(n2i);
-
-    nn_prev = add234(n2i, nn);
-    if (nn_prev != nn) {
-        sfree(nn);
-        sfree(namedup);
-    } else {
-        addpos234(i2n, nn, nn->index);
-    }
-
-    return nn_prev->index;
-}
-
-struct edge {
-    int L, R;
-};
-
-int compare_edges(void *av, void *bv)
-{
-    const struct edge *a = (const struct edge *)av;
-    const struct edge *b = (const struct edge *)bv;
-    if (a->L < b->L) return -1;
-    if (a->L > b->L) return +1;
-    if (a->R < b->R) return -1;
-    if (a->R > b->R) return +1;
-    return 0;
-}
-
-void matching_from_user_input(FILE *fp, const char *filename)
-{
-    tree234 *Ln2i, *Li2n, *Rn2i, *Ri2n, *edges;
-    char *line = NULL;
-    struct edge *e;
-    int i, lineno = 0;
-    int *adjptr;
-
-    Ln2i = newtree234(compare_nodes);
-    Rn2i = newtree234(compare_nodes);
-    Li2n = newtree234(NULL);
-    Ri2n = newtree234(NULL);
-    edges = newtree234(compare_edges);
-
-    while (sfree(line), lineno++, (line = fgetline(fp)) != NULL) {
-        char *p, *Lname, *Rname;
-
-        p = line;
-        while (*p && isspace((unsigned char)*p)) p++;
-        if (!*p)
-            continue;
-
-        Lname = p;
-        while (*p && !isspace((unsigned char)*p)) p++;
-        if (*p)
-            *p++ = '\0';
-        while (*p && isspace((unsigned char)*p)) p++;
-
-        if (!*p) {
-            fprintf(stderr, "%s:%d: expected 2 words, found 1\n",
-                    filename, lineno);
-            exit(1);
-        }
-
-        Rname = p;
-        while (*p && !isspace((unsigned char)*p)) p++;
-        if (*p)
-            *p++ = '\0';
-        while (*p && isspace((unsigned char)*p)) p++;
-
-        if (*p) {
-            fprintf(stderr, "%s:%d: expected 2 words, found more\n",
-                    filename, lineno);
-            exit(1);
-        }
-
-        e = snew(struct edge);
-        e->L = node_index(Ln2i, Li2n, Lname);
-        e->R = node_index(Rn2i, Ri2n, Rname);
-        if (add234(edges, e) != e) {
-            fprintf(stderr, "%s:%d: duplicate edge\n",
-                    filename, lineno);
-            exit(1);
-        }
-    }
-
-    allocate(count234(Ln2i), count234(Rn2i), count234(edges));
-
-    adjptr = adjdata;
-    for (i = 0; i < nl; i++)
-        adjlists[i] = NULL;
-    for (i = 0; (e = index234(edges, i)) != NULL; i++) {
-        if (!adjlists[e->L])
-            adjlists[e->L] = adjptr;
-        *adjptr++ = e->R;
-        adjsizes[e->L] = adjptr - adjlists[e->L];
-    }
-
-    find_and_check_matching();
-
-    for (i = 0; i < nl; i++) {
-        if (outl[i] != -1) {
-            struct nodename *Lnn = index234(Li2n, i);
-            struct nodename *Rnn = index234(Ri2n, outl[i]);
-            printf("%s %s\n", Lnn->name, Rnn->name);
-        }
-    }
-}
-
-void test_subsets(void)
-{
-    int b = 8;
-    int n = 1 << b;
-    int i, j, nruns, expected_size;
-    int *adjptr;
-    int *edgecounts;
-    struct stats {
-        int min, max;
-        double n, sx, sxx;
-    } *stats;
-    static const char seed[] = "fixed random seed for repeatability";
-
-    /*
-     * Generate a graph in which every subset of [b] = {1,...,b}
-     * (represented as a b-bit integer 0 <= i < n) has an edge going
-     * to every subset obtained by removing exactly one element.
-     *
-     * This graph is the disjoint union of the corresponding graph for
-     * each layer (collection of same-sized subset) of the power set
-     * of [b]. Each of those graphs has a matching of size equal to
-     * the smaller of its vertex sets. So we expect the overall size
-     * of the output matching to be less than n by the size of the
-     * largest layer, that is, to be n - binomial(n, floor(n/2)).
-     *
-     * We run the generation repeatedly, randomising it every time,
-     * and we expect to see every possible edge appear sooner or
-     * later.
-     */
-
-    rs = random_new(seed, strlen(seed));
-
-    allocate(n, n, n*b);
-    adjptr = adjdata;
-    expected_size = 0;
-    for (i = 0; i < n; i++) {
-        adjlists[i] = adjptr;
-        for (j = 0; j < b; j++) {
-            if (i & (1 << j))
-                *adjptr++ = i & ~(1 << j);
-        }
-        adjsizes[i] = adjptr - adjlists[i];
-        if (adjsizes[i] != b/2)
-            expected_size++;
-    }
-
-    edgecounts = snewn(n*b, int);
-    for (i = 0; i < n*b; i++)
-        edgecounts[i] = 0;
-
-    stats = snewn(b, struct stats);
-
-    nruns = 0;
-    while (nruns < 10000) {
-        nruns++;
-        find_and_check_matching();
-        assert(count == expected_size);
-
-        for (i = 0; i < n; i++)
-            for (j = 0; j < b; j++)
-                if ((i ^ outl[i]) == (1 << j))
-                    edgecounts[b*i+j]++;
-
-        if (nruns % 1000 == 0) {
-            for (i = 0; i < b; i++) {
-                struct stats *st = &stats[i];
-                st->min = st->max = -1;
-                st->n = st->sx = st->sxx = 0;
-            }
-
-            for (i = 0; i < n; i++) {
-                int pop = 0;
-                for (j = 0; j < b; j++)
-                    if (i & (1 << j))
-                        pop++;
-                pop--;
-
-                for (j = 0; j < b; j++) {
-                    if (i & (1 << j)) {
-                        struct stats *st = &stats[pop];
-                        int x = edgecounts[b*i+j];
-                        if (st->max == -1 || st->max < x)
-                            st->max = x;
-                        if (st->min == -1 || st->min > x)
-                            st->min = x;
-                        st->n++;
-                        st->sx += x;
-                        st->sxx += (double)x*x;
-                    } else {
-                        assert(edgecounts[b*i+j] == 0);
-                    }
-                }
-            }
-        }
-    }
-
-    printf("after %d runs:\n", nruns);
-    for (j = 0; j < b; j++) {
-        struct stats *st = &stats[j];
-        printf("edges between layers %d,%d:"
-               " min=%d max=%d mean=%f variance=%f\n",
-               j, j+1, st->min, st->max, st->sx/st->n,
-               (st->sxx - st->sx*st->sx/st->n) / st->n);
-    }
-}
-
-int main(int argc, char **argv)
-{
-    static const char stdin_identifier[] = "<standard input>";
-    const char *infile = NULL;
-    bool doing_opts = true;
-    enum { USER_INPUT, AUTOTEST } mode = USER_INPUT;
-
-    while (--argc > 0) {
-        const char *arg = *++argv;
-
-        if (doing_opts && arg[0] == '-' && arg[1]) {
-            if (!strcmp(arg, "--")) {
-                doing_opts = false;
-            } else if (!strcmp(arg, "--random")) {
-                char buf[64];
-                int len = sprintf(buf, "%lu", (unsigned long)time(NULL));
-                rs = random_new(buf, len);
-            } else if (!strcmp(arg, "--autotest")) {
-                mode = AUTOTEST;
-            } else {
-                fprintf(stderr, "matching: unrecognised option '%s'\n", arg);
-                return 1;
-            }
-        } else {
-            if (!infile) {
-                infile = (!strcmp(arg, "-") ? stdin_identifier : arg);
-            } else {
-                fprintf(stderr, "matching: too many arguments\n");
-                return 1;
-            }
-        }
-    }
-
-    if (mode == USER_INPUT) {
-        FILE *fp;
-
-        if (!infile)
-            infile = stdin_identifier;
-
-        if (infile != stdin_identifier) {
-            fp = fopen(infile, "r");
-            if (!fp) {
-                fprintf(stderr, "matching: could not open input file '%s'\n",
-                        infile);
-                return 1;
-            }
-        } else {
-            fp = stdin;
-        }
-
-        matching_from_user_input(fp, infile);
-
-        if (infile != stdin_identifier)
-            fclose(fp);
-    }
-
-    if (mode == AUTOTEST) {
-        if (infile) {
-            fprintf(stderr, "matching: expected no filename argument "
-                    "with --autotest\n");
-            return 1;
-        }
-
-        test_subsets();
-    }
-
-    return 0;
-}
-
-#endif /* STANDALONE_MATCHING_TEST */
diff --git a/apps/plugins/puzzles/src/matching.h b/apps/plugins/puzzles/src/matching.h
index a4d3098efa..dbf424d044 100644
--- a/apps/plugins/puzzles/src/matching.h
+++ b/apps/plugins/puzzles/src/matching.h
@@ -77,4 +77,32 @@ size_t matching_scratch_size(int nl, int nr);
 int matching(int nl, int nr, int **adjlists, int *adjsizes,
              random_state *rs, int *outl, int *outr);
 
+/*
+ * Diagnostic routine used in testing this algorithm. It is passed a
+ * pointer to a piece of scratch space that's just been used by
+ * matching_with_scratch, and extracts from it a labelling of the
+ * input graph that acts as a 'witness' to the maximality of the
+ * returned matching.
+ *
+ * The output parameter 'witness' should be an array of (nl+nr)
+ * integers, indexed such that witness[L] corresponds to an L-vertex (for
+ * L=0,1,...,nl-1) and witness[nl+R] corresponds to an R-vertex (for
+ * R=0,1,...,nr-1). On return, this array will assign each vertex a
+ * label which is either 0 or 1, and the following properties will
+ * hold:
+ *
+ *  + all vertices not paired up by the matching are type L0 or R1
+ *  + every L0->R1 edge is used by the matching
+ *  + no L1->R0 edge is used by the matching.
+ *
+ * The mere existence of such a labelling is enough to prove the
+ * maximality of the matching, because if there is any larger matching
+ * then its symmetric difference with this one must include at least
+ * one 'augmenting path', which starts at a free L-vertex and ends at
+ * a free R-vertex, traversing only unused L->R edges and only used
+ * R->L edges. But that would mean it starts at an L0, ends at an R1,
+ * and never follows an edge that can get from an 0 to a 1.
+ */
+void matching_witness(void *scratch, int nl, int nr, int *witness);
+
 #endif /* MATCHING_MATCHING_H */
diff --git a/apps/plugins/puzzles/src/midend.c b/apps/plugins/puzzles/src/midend.c
index f2d27d3e31..30fdf1b830 100644
--- a/apps/plugins/puzzles/src/midend.c
+++ b/apps/plugins/puzzles/src/midend.c
@@ -30,6 +30,11 @@ struct midend_serialise_buf {
     int len, size;
 };
 
+struct midend_serialise_buf_read_ctx {
+    struct midend_serialise_buf *ser;
+    int len, pos;
+};
+
 struct midend {
     frontend *frontend;
     random_state *random;
@@ -73,6 +78,7 @@ struct midend {
 
     game_params *params, *curparams;
     game_drawstate *drawstate;
+    bool first_draw;
     game_ui *ui;
 
     game_state *oldstate;
@@ -88,10 +94,15 @@ struct midend {
 
     int pressed_mouse_button;
 
-    int preferred_tilesize, tilesize, winwidth, winheight;
+    struct midend_serialise_buf be_prefs;
+
+    int preferred_tilesize, preferred_tilesize_dpr, tilesize;
+    int winwidth, winheight;
 
     void (*game_id_change_notify_function)(void *);
     void *game_id_change_notify_ctx;
+
+    bool one_key_shortcuts;
 };
 
 #define ensure(me) do { \
@@ -119,21 +130,33 @@ struct deserialise_data {
 };
 
 /*
- * Forward reference.
+ * Forward references.
  */
 static const char *midend_deserialise_internal(
     midend *me, bool (*read)(void *ctx, void *buf, int len), void *rctx,
     const char *(*check)(void *ctx, midend *, const struct deserialise_data *),
     void *cctx);
+static void midend_serialise_prefs(
+    midend *me, game_ui *ui,
+    void (*write)(void *ctx, const void *buf, int len), void *wctx);
+static const char *midend_deserialise_prefs(
+    midend *me, game_ui *ui,
+    bool (*read)(void *ctx, void *buf, int len), void *rctx);
+static config_item *midend_get_prefs(midend *me, game_ui *ui);
+static void midend_set_prefs(midend *me, game_ui *ui, config_item *all_prefs);
+static void midend_apply_prefs(midend *me, game_ui *ui);
 
 void midend_reset_tilesize(midend *me)
 {
     me->preferred_tilesize = me->ourgame->preferred_tilesize;
+    me->preferred_tilesize_dpr = 1.0;
     {
         /*
          * Allow an environment-based override for the default tile
          * size by defining a variable along the lines of
          * `NET_TILESIZE=15'.
+         *
+         * XXX How should this interact with DPR?
          */
 
         char buf[80], *e;
@@ -196,6 +219,7 @@ midend *midend_new(frontend *fe, const game *ourgame,
     me->aux_info = NULL;
     me->genmode = GOT_NOTHING;
     me->drawstate = NULL;
+    me->first_draw = true;
     me->oldstate = NULL;
     me->preset_menu = NULL;
     me->anim_time = me->anim_pos = 0.0F;
@@ -212,6 +236,11 @@ midend *midend_new(frontend *fe, const game *ourgame,
     else
         me->drawing = NULL;
 
+    me->be_prefs.buf = NULL;
+    me->be_prefs.size = me->be_prefs.len = 0;
+
+    me->one_key_shortcuts = true;
+
     midend_reset_tilesize(me);
 
     sfree(randseed);
@@ -280,6 +309,7 @@ void midend_free(midend *me)
     sfree(me->privdesc);
     sfree(me->seedstr);
     sfree(me->aux_info);
+    sfree(me->be_prefs.buf);
     me->ourgame->free_params(me->params);
     midend_free_preset_menu(me, me->preset_menu);
     if (me->ui)
@@ -297,14 +327,56 @@ static void midend_size_new_drawstate(midend *me)
      * anyway yet.
      */
     if (me->tilesize > 0) {
-        me->ourgame->compute_size(me->params, me->tilesize,
+        me->ourgame->compute_size(me->params, me->tilesize, me->ui,
                                   &me->winwidth, &me->winheight);
         me->ourgame->set_size(me->drawing, me->drawstate,
                               me->params, me->tilesize);
     }
 }
 
-void midend_size(midend *me, int *x, int *y, bool user_size)
+/*
+ * There is no one correct way to convert tilesizes between device
+ * pixel ratios, because there's only a loosely-defined relationship
+ * between tilesize and the actual size of a puzzle.  We define this
+ * function as the canonical conversion function so everything in the
+ * midend will be consistent.
+ */
+static int convert_tilesize(midend *me, int old_tilesize,
+                            double old_dpr, double new_dpr)
+{
+    int x, y, rx, ry, min, max;
+    game_params *defaults;
+
+    if (new_dpr == old_dpr)
+        return old_tilesize;
+
+    defaults = me->ourgame->default_params();
+
+    me->ourgame->compute_size(defaults, old_tilesize, me->ui, &x, &y);
+    x *= new_dpr / old_dpr;
+    y *= new_dpr / old_dpr;
+
+    min = max = 1;
+    do {
+        max *= 2;
+        me->ourgame->compute_size(defaults, max, me->ui, &rx, &ry);
+    } while (rx <= x && ry <= y);
+
+    while (max - min > 1) {
+        int mid = (max + min) / 2;
+        me->ourgame->compute_size(defaults, mid, me->ui, &rx, &ry);
+        if (rx <= x && ry <= y)
+            min = mid;
+        else
+            max = mid;
+    }
+
+    me->ourgame->free_params(defaults);
+    return min;
+}
+
+void midend_size(midend *me, int *x, int *y, bool user_size,
+                 double device_pixel_ratio)
 {
     int min, max;
     int rx, ry;
@@ -318,6 +390,7 @@ void midend_size(midend *me, int *x, int *y, bool user_size)
         me->ourgame->free_drawstate(me->drawing, me->drawstate);
         me->drawstate = me->ourgame->new_drawstate(me->drawing,
                                                    me->states[0].state);
+        me->first_draw = true;
     }
 
     /*
@@ -333,10 +406,12 @@ void midend_size(midend *me, int *x, int *y, bool user_size)
         max = 1;
         do {
             max *= 2;
-            me->ourgame->compute_size(me->params, max, &rx, &ry);
+            me->ourgame->compute_size(me->params, max, me->ui, &rx, &ry);
         } while (rx <= *x && ry <= *y);
     } else
-        max = me->preferred_tilesize + 1;
+        max = convert_tilesize(me, me->preferred_tilesize,
+                               me->preferred_tilesize_dpr,
+                               device_pixel_ratio) + 1;
     min = 1;
 
     /*
@@ -347,7 +422,7 @@ void midend_size(midend *me, int *x, int *y, bool user_size)
      */
     while (max - min > 1) {
         int mid = (max + min) / 2;
-        me->ourgame->compute_size(me->params, mid, &rx, &ry);
+        me->ourgame->compute_size(me->params, mid, me->ui, &rx, &ry);
         if (rx <= *x && ry <= *y)
             min = mid;
         else
@@ -359,9 +434,11 @@ void midend_size(midend *me, int *x, int *y, bool user_size)
      */
 
     me->tilesize = min;
-    if (user_size)
+    if (user_size) {
         /* If the user requested a change in size, make it permanent. */
         me->preferred_tilesize = me->tilesize;
+        me->preferred_tilesize_dpr = device_pixel_ratio;
+    }
     midend_size_new_drawstate(me);
     *x = me->winwidth;
     *y = me->winheight;
@@ -380,6 +457,28 @@ game_params *midend_get_params(midend *me)
     return me->ourgame->dup_params(me->params);
 }
 
+static char *encode_params(midend *me, const game_params *params, bool full)
+{
+    char *encoded = me->ourgame->encode_params(params, full);
+    int i;
+
+    /* Assert that the params consist of printable ASCII containing
+     * neither '#' nor ':'. */
+    for (i = 0; encoded[i]; i++)
+        assert(encoded[i] >= 32 && encoded[i] < 127 &&
+               encoded[i] != '#' && encoded[i] != ':');
+    return encoded;
+}
+
+static void assert_printable_ascii(char const *s)
+{
+    /* Assert that s is entirely printable ASCII, and hence safe for
+     * writing in a save file. */
+    int i;
+    for (i = 0; s[i]; i++)
+        assert(s[i] >= 32 && s[i] < 127);
+}
+
 static void midend_set_timer(midend *me)
 {
     me->timing = (me->ourgame->is_timed &&
@@ -397,11 +496,12 @@ void midend_force_redraw(midend *me)
         me->ourgame->free_drawstate(me->drawing, me->drawstate);
     me->drawstate = me->ourgame->new_drawstate(me->drawing,
                                                me->states[0].state);
+    me->first_draw = true;
     midend_size_new_drawstate(me);
     midend_redraw(me);
 }
 
-static void newgame_serialise_write(void *ctx, const void *buf, int len)
+static void midend_serialise_buf_write(void *ctx, const void *buf, int len)
 {
     struct midend_serialise_buf *ser = (struct midend_serialise_buf *)ctx;
     int new_len;
@@ -416,6 +516,18 @@ static void newgame_serialise_write(void *ctx, const void *buf, int len)
     ser->len = new_len;
 }
 
+static bool midend_serialise_buf_read(void *ctx, void *buf, int len)
+{
+    struct midend_serialise_buf_read_ctx *const rctx = ctx;
+
+    if (len > rctx->len - rctx->pos)
+        return false;
+
+    memcpy(buf, rctx->ser->buf + rctx->pos, len);
+    rctx->pos += len;
+    return true;
+}
+
 void midend_new_game(midend *me)
 {
     me->newgame_undo.len = 0;
@@ -435,7 +547,7 @@ void midend_new_game(midend *me)
          * worse, valid but wrong.
          */
         midend_purge_states(me);
-        midend_serialise(me, newgame_serialise_write, &me->newgame_undo);
+        midend_serialise(me, midend_serialise_buf_write, &me->newgame_undo);
     }
 
     midend_stop_anim(me);
@@ -487,6 +599,7 @@ void midend_new_game(midend *me)
          */
         me->desc = me->ourgame->new_desc(me->curparams, rs,
                                          &me->aux_info, (me->drawing != NULL));
+        assert_printable_ascii(me->desc);
         me->privdesc = NULL;
         random_free(rs);
     }
@@ -536,6 +649,7 @@ void midend_new_game(midend *me)
     me->statepos = 1;
     me->drawstate = me->ourgame->new_drawstate(me->drawing,
                                                me->states[0].state);
+    me->first_draw = true;
     midend_size_new_drawstate(me);
     me->elapsed = 0.0F;
     me->flash_pos = me->flash_time = 0.0F;
@@ -543,6 +657,7 @@ void midend_new_game(midend *me)
     if (me->ui)
         me->ourgame->free_ui(me->ui);
     me->ui = me->ourgame->new_ui(me->states[0].state);
+    midend_apply_prefs(me, me->ui);
     midend_set_timer(me);
     me->pressed_mouse_button = 0;
 
@@ -552,31 +667,28 @@ void midend_new_game(midend *me)
     me->newgame_can_store_undo = true;
 }
 
-bool midend_can_undo(midend *me)
+const char *midend_load_prefs(
+    midend *me, bool (*read)(void *ctx, void *buf, int len), void *rctx)
 {
-    return (me->statepos > 1 || me->newgame_undo.len);
+    const char *err = midend_deserialise_prefs(me, NULL, read, rctx);
+    return err;
 }
 
-bool midend_can_redo(midend *me)
+void midend_save_prefs(midend *me,
+                       void (*write)(void *ctx, const void *buf, int len),
+                       void *wctx)
 {
-    return (me->statepos < me->nstates || me->newgame_redo.len);
+    midend_serialise_prefs(me, NULL, write, wctx);
 }
 
-struct newgame_undo_deserialise_read_ctx {
-    struct midend_serialise_buf *ser;
-    int len, pos;
-};
-
-static bool newgame_undo_deserialise_read(void *ctx, void *buf, int len)
+bool midend_can_undo(midend *me)
 {
-    struct newgame_undo_deserialise_read_ctx *const rctx = ctx;
-
-    if (len > rctx->len - rctx->pos)
-        return false;
+    return (me->statepos > 1 || me->newgame_undo.len);
+}
 
-    memcpy(buf, rctx->ser->buf + rctx->pos, len);
-    rctx->pos += len;
-    return true;
+bool midend_can_redo(midend *me)
+{
+    return (me->statepos < me->nstates || me->newgame_redo.len);
 }
 
 struct newgame_undo_deserialise_check_ctx {
@@ -613,8 +725,8 @@ static const char *newgame_undo_deserialise_check(
      * We check both params and cparams, to be as safe as possible.
      */
 
-    old = me->ourgame->encode_params(me->params, true);
-    new = me->ourgame->encode_params(data->params, true);
+    old = encode_params(me, me->params, true);
+    new = encode_params(me, data->params, true);
     if (strcmp(old, new)) {
         /* Set a flag to distinguish this deserialise failure
          * from one due to faulty decoding */
@@ -622,8 +734,8 @@ static const char *newgame_undo_deserialise_check(
         return "Undoing this new-game operation would change params";
     }
 
-    old = me->ourgame->encode_params(me->curparams, true);
-    new = me->ourgame->encode_params(data->cparams, true);
+    old = encode_params(me, me->curparams, true);
+    new = encode_params(me, data->cparams, true);
     if (strcmp(old, new)) {
         ctx->refused = true;
         return "Undoing this new-game operation would change params";
@@ -648,7 +760,7 @@ static bool midend_undo(midend *me)
         me->dir = -1;
         return true;
     } else if (me->newgame_undo.len) {
-        struct newgame_undo_deserialise_read_ctx rctx;
+        struct midend_serialise_buf_read_ctx rctx;
         struct newgame_undo_deserialise_check_ctx cctx;
         struct midend_serialise_buf serbuf;
 
@@ -659,14 +771,14 @@ static bool midend_undo(midend *me)
          */
         serbuf.buf = NULL;
         serbuf.len = serbuf.size = 0;
-        midend_serialise(me, newgame_serialise_write, &serbuf);
+        midend_serialise(me, midend_serialise_buf_write, &serbuf);
 
         rctx.ser = &me->newgame_undo;
         rctx.len = me->newgame_undo.len; /* copy for reentrancy safety */
         rctx.pos = 0;
         cctx.refused = false;
         deserialise_error = midend_deserialise_internal(
-            me, newgame_undo_deserialise_read, &rctx,
+            me, midend_serialise_buf_read, &rctx,
             newgame_undo_deserialise_check, &cctx);
         if (cctx.refused) {
             /*
@@ -699,7 +811,8 @@ static bool midend_undo(midend *me)
              * the midend so that we can redo back into it later.
              */
             me->newgame_redo.len = 0;
-            newgame_serialise_write(&me->newgame_redo, serbuf.buf, serbuf.len);
+            midend_serialise_buf_write(&me->newgame_redo,
+                                       serbuf.buf, serbuf.len);
 
             sfree(serbuf.buf);
             return true;
@@ -721,7 +834,7 @@ static bool midend_redo(midend *me)
         me->dir = +1;
         return true;
     } else if (me->newgame_redo.len) {
-        struct newgame_undo_deserialise_read_ctx rctx;
+        struct midend_serialise_buf_read_ctx rctx;
         struct newgame_undo_deserialise_check_ctx cctx;
         struct midend_serialise_buf serbuf;
 
@@ -732,14 +845,14 @@ static bool midend_redo(midend *me)
          */
         serbuf.buf = NULL;
         serbuf.len = serbuf.size = 0;
-        midend_serialise(me, newgame_serialise_write, &serbuf);
+        midend_serialise(me, midend_serialise_buf_write, &serbuf);
 
         rctx.ser = &me->newgame_redo;
         rctx.len = me->newgame_redo.len; /* copy for reentrancy safety */
         rctx.pos = 0;
         cctx.refused = false;
         deserialise_error = midend_deserialise_internal(
-            me, newgame_undo_deserialise_read, &rctx,
+            me, midend_serialise_buf_read, &rctx,
             newgame_undo_deserialise_check, &cctx);
         if (cctx.refused) {
             /*
@@ -772,7 +885,8 @@ static bool midend_redo(midend *me)
              * the midend so that we can undo back into it later.
              */
             me->newgame_undo.len = 0;
-            newgame_serialise_write(&me->newgame_undo, serbuf.buf, serbuf.len);
+            midend_serialise_buf_write(&me->newgame_undo,
+                                       serbuf.buf, serbuf.len);
 
             sfree(serbuf.buf);
             return true;
@@ -859,12 +973,13 @@ void midend_restart_game(midend *me)
     midend_set_timer(me);
 }
 
-static bool midend_really_process_key(midend *me, int x, int y, int button)
+static int midend_really_process_key(midend *me, int x, int y, int button)
 {
     game_state *oldstate =
         me->ourgame->dup_game(me->states[me->statepos - 1].state);
     int type = MOVE;
-    bool gottype = false, ret = true;
+    bool gottype = false;
+    int ret = PKR_NO_EFFECT;
     float anim_time;
     game_state *s;
     char *movestr = NULL;
@@ -875,40 +990,51 @@ static bool midend_really_process_key(midend *me, int x, int y, int button)
             me->ui, me->drawstate, x, y, button);
     }
 
-    if (!movestr) {
-        if (button == 'n' || button == 'N' || button == '\x0E' ||
-            button == UI_NEWGAME) {
+    if (movestr == NULL || movestr == MOVE_UNUSED) {
+        if ((me->one_key_shortcuts && (button == 'n' || button == 'N')) ||
+             button == '\x0E' || button == UI_NEWGAME) {
             midend_new_game(me);
             midend_redraw(me);
+            ret = PKR_SOME_EFFECT;
             goto done;                 /* never animate */
-        } else if (button == 'u' || button == 'U' ||
-                   button == '\x1A' || button == '\x1F' ||
+        } else if ((me->one_key_shortcuts && (button=='u' || button=='U')) ||
+                   button == '*' || button == '\x1A' || button == '\x1F' ||
                    button == UI_UNDO) {
             midend_stop_anim(me);
             type = me->states[me->statepos-1].movetype;
             gottype = true;
             if (!midend_undo(me))
                 goto done;
-        } else if (button == 'r' || button == 'R' ||
-                   button == '\x12' || button == '\x19' ||
+            ret = PKR_SOME_EFFECT;
+        } else if ((me->one_key_shortcuts && (button=='r' || button=='R')) ||
+                   button == '#' || button == '\x12' || button == '\x19' ||
                    button == UI_REDO) {
             midend_stop_anim(me);
             if (!midend_redo(me))
                 goto done;
+            ret = PKR_SOME_EFFECT;
         } else if ((button == '\x13' || button == UI_SOLVE) &&
                    me->ourgame->can_solve) {
+            ret = PKR_SOME_EFFECT;
             if (midend_solve(me))
                 goto done;
-        } else if (button == 'q' || button == 'Q' || button == '\x11' ||
-                   button == UI_QUIT) {
-            ret = false;
+        } else if ((me->one_key_shortcuts && (button=='q' || button=='Q')) ||
+                   button == '\x11' || button == UI_QUIT) {
+            ret = PKR_QUIT;
             goto done;
-        } else
+        } else {
+            ret = PKR_UNUSED;
             goto done;
+        }
+    } else if (movestr == MOVE_NO_EFFECT) {
+        ret = PKR_NO_EFFECT;
+        goto done;
     } else {
-        if (movestr == UI_UPDATE)
+        ret = PKR_SOME_EFFECT;
+        if (movestr == MOVE_UI_UPDATE)
             s = me->states[me->statepos-1].state;
         else {
+            assert_printable_ascii(movestr);
             s = me->ourgame->execute_move(me->states[me->statepos-1].state,
                                           movestr);
             assert(s != NULL);
@@ -975,9 +1101,9 @@ static bool midend_really_process_key(midend *me, int x, int y, int button)
     return ret;
 }
 
-bool midend_process_key(midend *me, int x, int y, int button)
+int midend_process_key(midend *me, int x, int y, int button)
 {
-    bool ret = true;
+    int ret = PKR_UNUSED, ret2;
 
     /*
      * Harmonise mouse drag and release messages.
@@ -1052,6 +1178,10 @@ bool midend_process_key(midend *me, int x, int y, int button)
      * of '\n' etc for keyboard-based cursors. The choice of buttons
      * here could eventually be controlled by a runtime configuration
      * option.
+     *
+     * We also handle converting MOD_CTRL|'a' etc into '\x01' etc,
+     * specially recognising Ctrl+Shift+Z, and stripping modifier
+     * flags off keys that aren't meant to have them.
      */
     if (IS_MOUSE_DRAG(button) || IS_MOUSE_RELEASE(button)) {
         if (me->pressed_mouse_button) {
@@ -1076,11 +1206,34 @@ bool midend_process_key(midend *me, int x, int y, int button)
         /*
          * Fabricate a button-up for the previously pressed button.
          */
-        ret = ret && midend_really_process_key
+        ret2 = midend_really_process_key
             (me, x, y, (me->pressed_mouse_button +
                         (LEFT_RELEASE - LEFT_BUTTON)));
-    }
-
+        ret = min(ret, ret2);
+    }
+
+    /* Canonicalise CTRL+ASCII. */
+    if ((button & MOD_CTRL) &&
+        STRIP_BUTTON_MODIFIERS(button) >= 0x40 &&
+        STRIP_BUTTON_MODIFIERS(button) < 0x80)
+        button = button & (0x1f | (MOD_MASK & ~MOD_CTRL));
+    /* Special handling to make CTRL+SHFT+Z into REDO. */
+    if ((button & (~MOD_MASK | MOD_SHFT)) == (MOD_SHFT | '\x1A'))
+        button = UI_REDO;
+    /* interpret_move() expects CTRL and SHFT only on cursor keys, and
+     * TAB (added as of 7/2024 to support Untangle). */
+    if (!IS_CURSOR_MOVE(STRIP_BUTTON_MODIFIERS(button))) {
+        /* reject CTRL+anything odd */
+        if ((button & MOD_CTRL) && STRIP_BUTTON_MODIFIERS(button) >= 0x20)
+            return PKR_UNUSED;
+        /* otherwise strip them, except for tab */
+        if (STRIP_BUTTON_MODIFIERS(button) != '\t')
+            button &= ~(MOD_CTRL | MOD_SHFT);
+    }
+    /* interpret_move() expects NUM_KEYPAD only on numbers. */
+    if (STRIP_BUTTON_MODIFIERS(button) < '0' ||
+        STRIP_BUTTON_MODIFIERS(button) > '9')
+        button &= ~MOD_NUM_KEYPAD;
     /*
      * Translate keyboard presses to cursor selection.
      */
@@ -1101,7 +1254,8 @@ bool midend_process_key(midend *me, int x, int y, int button)
     /*
      * Now send on the event we originally received.
      */
-    ret = ret && midend_really_process_key(me, x, y, button);
+    ret2 = midend_really_process_key(me, x, y, button);
+    ret = min(ret, ret2);
 
     /*
      * And update the currently pressed button.
@@ -1121,7 +1275,7 @@ key_label *midend_request_keys(midend *me, int *n)
 
     if(me->ourgame->request_keys)
     {
-        keys = me->ourgame->request_keys(midend_get_params(me), &nkeys);
+        keys = me->ourgame->request_keys(me->params, &nkeys);
         for(i = 0; i < nkeys; ++i)
         {
             if(!keys[i].label)
@@ -1135,12 +1289,38 @@ key_label *midend_request_keys(midend *me, int *n)
     return keys;
 }
 
+/* Return a good label to show next to a key right now. */
+const char *midend_current_key_label(midend *me, int button)
+{
+    assert(IS_CURSOR_SELECT(button));
+    if (!me->ourgame->current_key_label) return "";
+    return me->ourgame->current_key_label(
+        me->ui, me->states[me->statepos-1].state, button);
+}
+
 void midend_redraw(midend *me)
 {
     assert(me->drawing);
 
     if (me->statepos > 0 && me->drawstate) {
+        bool first_draw = me->first_draw;
+        me->first_draw = false;
+
         start_draw(me->drawing);
+
+        if (first_draw) {
+            /*
+             * The initial contents of the window are not guaranteed
+             * by the front end. But we also don't want to require
+             * every single game to go to the effort of clearing the
+             * window on setup. So we centralise here the operation of
+             * covering the whole window with colour 0 (assumed to be
+             * the puzzle's background colour) the first time we do a
+             * redraw operation with a new drawstate.
+             */
+            draw_rect(me->drawing, 0, 0, me->winwidth, me->winheight, 0);
+        }
+
         if (me->oldstate && me->anim_time > 0 &&
             me->anim_pos < me->anim_time) {
             assert(me->dir != 0);
@@ -1152,6 +1332,15 @@ void midend_redraw(midend *me)
                                 me->states[me->statepos-1].state, +1 /*shrug*/,
                                 me->ui, 0.0, me->flash_pos);
         }
+
+        if (first_draw) {
+            /*
+             * Call a big draw_update on the whole window, in case the
+             * game backend didn't.
+             */
+            draw_update(me->drawing, 0, 0, me->winwidth, me->winheight);
+        }
+
         end_draw(me->drawing);
     }
 }
@@ -1201,6 +1390,7 @@ float *midend_colours(midend *me, int *ncolours)
     float *ret;
 
     ret = me->ourgame->colours(me->frontend, ncolours);
+    assert(*ncolours >= 1);
 
     {
         int i;
@@ -1227,6 +1417,9 @@ float *midend_colours(midend *me, int *ncolours)
                 ret[i*3 + 1] = g / 255.0F;
                 ret[i*3 + 2] = b / 255.0F;
             }
+            assert(0.0F <= ret[i*3 + 0] && ret[i*3 + 0] <= 1.0F);
+            assert(0.0F <= ret[i*3 + 1] && ret[i*3 + 1] <= 1.0F);
+            assert(0.0F <= ret[i*3 + 2] && ret[i*3 + 2] <= 1.0F);
         }
     }
 
@@ -1359,7 +1552,7 @@ static void preset_menu_encode_params(midend *me, struct preset_menu *menu)
     for (i = 0; i < menu->n_entries; i++) {
         if (menu->entries[i].params) {
             me->encoded_presets[menu->entries[i].id] =
-                me->ourgame->encode_params(menu->entries[i].params, true);
+                encode_params(me, menu->entries[i].params, true);
         } else {
             preset_menu_encode_params(me, menu->entries[i].submenu);
         }
@@ -1438,7 +1631,7 @@ struct preset_menu *midend_get_presets(midend *me, int *id_limit)
 
 int midend_which_preset(midend *me)
 {
-    char *encoding = me->ourgame->encode_params(me->params, true);
+    char *encoding = encode_params(me, me->params, true);
     int i, ret;
 
     ret = -1;
@@ -1496,6 +1689,10 @@ bool midend_get_cursor_location(midend *me,
 void midend_supersede_game_desc(midend *me, const char *desc,
                                 const char *privdesc)
 {
+    /* Assert that the descriptions consists only of printable ASCII. */
+    assert_printable_ascii(desc);
+    if (privdesc)
+        assert_printable_ascii(privdesc);
     sfree(me->desc);
     sfree(me->privdesc);
     me->desc = dupstr(desc);
@@ -1545,7 +1742,7 @@ config_item *midend_get_config(midend *me, int which, char **wintitle)
          * the former is likely to persist across many code
          * changes).
          */
-        parstr = me->ourgame->encode_params(me->curparams, which == CFG_SEED);
+        parstr = encode_params(me, me->curparams, which == CFG_SEED);
         assert(parstr);
         if (which == CFG_DESC) {
             rest = me->desc ? me->desc : "";
@@ -1562,6 +1759,10 @@ config_item *midend_get_config(midend *me, int which, char **wintitle)
         ret[1].name = NULL;
 
         return ret;
+      case CFG_PREFS:
+        sprintf(titlebuf, "%s preferences", me->ourgame->name);
+        *wintitle = titlebuf;
+        return midend_get_prefs(me, NULL);
     }
 
     assert(!"We shouldn't be here");
@@ -1670,6 +1871,7 @@ static const char *midend_game_id_int(midend *me, const char *id, int defmode)
             newcurparams = me->ourgame->default_params();
         }
         me->ourgame->decode_params(newcurparams, par);
+        sfree(par);
         error = me->ourgame->validate_params(newcurparams, desc == NULL);
         if (error) {
             me->ourgame->free_params(newcurparams);
@@ -1689,7 +1891,7 @@ static const char *midend_game_id_int(midend *me, const char *id, int defmode)
 
             newparams = me->ourgame->dup_params(me->params);
 
-            tmpstr = me->ourgame->encode_params(newcurparams, false);
+            tmpstr = encode_params(me, newcurparams, false);
             me->ourgame->decode_params(newparams, tmpstr);
 
             sfree(tmpstr);
@@ -1745,8 +1947,6 @@ static const char *midend_game_id_int(midend *me, const char *id, int defmode)
         me->genmode = GOT_SEED;
     }
 
-    sfree(par);
-
     me->newgame_can_store_undo = false;
 
     return NULL;
@@ -1761,7 +1961,7 @@ char *midend_get_game_id(midend *me)
 {
     char *parstr, *ret;
 
-    parstr = me->ourgame->encode_params(me->curparams, false);
+    parstr = encode_params(me, me->curparams, false);
     assert(parstr);
     assert(me->desc);
     ret = snewn(strlen(parstr) + strlen(me->desc) + 2, char);
@@ -1777,7 +1977,7 @@ char *midend_get_random_seed(midend *me)
     if (!me->seedstr)
         return NULL;
 
-    parstr = me->ourgame->encode_params(me->curparams, true);
+    parstr = encode_params(me, me->curparams, true);
     assert(parstr);
     ret = snewn(strlen(parstr) + strlen(me->seedstr) + 2, char);
     sprintf(ret, "%s#%s", parstr, me->seedstr);
@@ -1811,6 +2011,10 @@ const char *midend_set_config(midend *me, int which, config_item *cfg)
         if (error)
             return error;
         break;
+
+      case CFG_PREFS:
+        midend_set_prefs(me, me->ui, cfg);
+        break;
     }
 
     return NULL;
@@ -1849,12 +2053,13 @@ const char *midend_solve(midend *me)
     movestr = me->ourgame->solve(me->states[0].state,
                                  me->states[me->statepos-1].state,
                                  me->aux_info, &msg);
-    assert(movestr != UI_UPDATE);
+    assert(movestr != MOVE_UI_UPDATE);
     if (!movestr) {
         if (!msg)
             msg = "Solve operation failed";   /* _shouldn't_ happen, but can */
         return msg;
     }
+    assert_printable_ascii(movestr);
     s = me->ourgame->execute_move(me->states[me->statepos-1].state, movestr);
     assert(s);
 
@@ -1961,7 +2166,9 @@ void midend_serialise(midend *me,
     char lbuf[9];                               \
     copy_left_justified(lbuf, sizeof(lbuf), h); \
     sprintf(hbuf, "%s:%d:", lbuf, (int)strlen(str)); \
+    assert_printable_ascii(hbuf); \
     write(wctx, hbuf, strlen(hbuf)); \
+    assert_printable_ascii(str); \
     write(wctx, str, strlen(str)); \
     write(wctx, "\n", 1); \
 } while (0)
@@ -1986,7 +2193,7 @@ void midend_serialise(midend *me,
      * The current long-term parameters structure, in full.
      */
     if (me->params) {
-        char *s = me->ourgame->encode_params(me->params, true);
+        char *s = encode_params(me, me->params, true);
         wr("PARAMS", s);
         sfree(s);
     }
@@ -1995,7 +2202,7 @@ void midend_serialise(midend *me,
      * The current short-term parameters structure, in full.
      */
     if (me->curparams) {
-        char *s = me->ourgame->encode_params(me->curparams, true);
+        char *s = encode_params(me, me->curparams, true);
         wr("CPARAMS", s);
         sfree(s);
     }
@@ -2003,8 +2210,27 @@ void midend_serialise(midend *me,
     /*
      * The current game description, the privdesc, and the random seed.
      */
-    if (me->seedstr)
-        wr("SEED", me->seedstr);
+    if (me->seedstr) {
+        /*
+         * Random seeds are not necessarily printable ASCII.
+         * Hex-encode the seed if necessary.  Printable ASCII seeds
+         * are emitted unencoded for compatibility with older
+         * versions.
+         */
+        int i;
+
+        for (i = 0; me->seedstr[i]; i++)
+            if (me->seedstr[i] < 32 || me->seedstr[i] >= 127)
+                break;
+        if (me->seedstr[i]) {
+            char *hexseed = bin2hex((unsigned char *)me->seedstr,
+                                    strlen(me->seedstr));
+
+            wr("HEXSEED", hexseed);
+            sfree(hexseed);
+        } else
+            wr("SEED", me->seedstr);
+    }
     if (me->desc)
         wr("DESC", me->desc);
     if (me->privdesc)
@@ -2036,7 +2262,7 @@ void midend_serialise(midend *me,
     /*
      * Any required serialisation of the game_ui.
      */
-    if (me->ui) {
+    if (me->ui && me->ourgame->encode_ui) {
         char *s = me->ourgame->encode_ui(me->ui);
         if (s) {
             wr("UI", s);
@@ -2049,7 +2275,7 @@ void midend_serialise(midend *me,
      */
     if (me->ourgame->is_timed) {
         char buf[80];
-        ftoa(buf, me->elapsed);
+        sprintf(buf, "%g", me->elapsed);
         wr("TIME", buf);
     }
 
@@ -2060,6 +2286,7 @@ void midend_serialise(midend *me,
         char buf[80];
         sprintf(buf, "%d", me->nstates);
         wr("NSTATES", buf);
+        assert(me->statepos >= 1 && me->statepos <= me->nstates);
         sprintf(buf, "%d", me->statepos);
         wr("STATEPOS", buf);
     }
@@ -2159,7 +2386,7 @@ static const char *midend_deserialise_internal(
 
             if (c == ':') {
                 break;
-            } else if (c >= '0' && c <= '9') {
+            } else if (c >= '0' && c <= '9' && len < (INT_MAX - 10) / 10) {
                 len = (len * 10) + (c - '0');
             } else {
                 if (started)
@@ -2171,10 +2398,17 @@ static const char *midend_deserialise_internal(
 
         val = snewn(len+1, char);
         if (!read(rctx, val, len)) {
-            if (started)
+            /* unexpected EOF */
             goto cleanup;
         }
         val[len] = '\0';
+        /* Validate that all values (apart from SEED) are printable ASCII. */
+        if (strcmp(key, "SEED"))
+            for (i = 0; val[i]; i++)
+                if (val[i] < 32 || val[i] >= 127) {
+                    ret = "Forbidden characters in saved game file";
+                    goto cleanup;
+                }
 
         if (!started) {
             if (strcmp(key, "SAVEFILE") || strcmp(val, SERIALISE_MAGIC)) {
@@ -2204,6 +2438,15 @@ static const char *midend_deserialise_internal(
                 sfree(data.cparstr);
                 data.cparstr = val;
                 val = NULL;
+            } else if (!strcmp(key, "HEXSEED")) {
+                unsigned char *tmp;
+                int len = strlen(val) / 2;   /* length in bytes */
+                tmp = hex2bin(val, len);
+                sfree(data.seed);
+                data.seed = snewn(len + 1, char);
+                memcpy(data.seed, tmp, len);
+                data.seed[len] = '\0';
+                sfree(tmp);
             } else if (!strcmp(key, "SEED")) {
                 sfree(data.seed);
                 data.seed = val;
@@ -2234,15 +2477,15 @@ static const char *midend_deserialise_internal(
             } else if (!strcmp(key, "TIME")) {
                 data.elapsed = (float)atof(val);
             } else if (!strcmp(key, "NSTATES")) {
+                if (data.states) {
+                    ret = "Two state counts provided in save file";
+                    goto cleanup;
+                }
                 data.nstates = atoi(val);
                 if (data.nstates <= 0) {
                     ret = "Number of states in save file was negative";
                     goto cleanup;
                 }
-                if (data.states) {
-                    ret = "Two state counts provided in save file";
-                    goto cleanup;
-                }
                 data.states = snewn(data.nstates, struct midend_state_entry);
                 for (i = 0; i < data.nstates; i++) {
                     data.states[i].state = NULL;
@@ -2251,19 +2494,25 @@ static const char *midend_deserialise_internal(
                 }
             } else if (!strcmp(key, "STATEPOS")) {
                 data.statepos = atoi(val);
-            } else if (!strcmp(key, "MOVE")) {
-                gotstates++;
-                data.states[gotstates].movetype = MOVE;
-                data.states[gotstates].movestr = val;
-                val = NULL;
-            } else if (!strcmp(key, "SOLVE")) {
-                gotstates++;
-                data.states[gotstates].movetype = SOLVE;
-                data.states[gotstates].movestr = val;
-                val = NULL;
-            } else if (!strcmp(key, "RESTART")) {
+            } else if (!strcmp(key, "MOVE") ||
+                       !strcmp(key, "SOLVE") ||
+                       !strcmp(key, "RESTART")) {
+                if (!data.states) {
+                    ret = "No state count provided in save file";
+                    goto cleanup;
+                }
+                if (data.statepos < 0) {
+                    ret = "No game position provided in save file";
+                    goto cleanup;
+                }
                 gotstates++;
-                data.states[gotstates].movetype = RESTART;
+                assert(gotstates < data.nstates);
+                if (!strcmp(key, "MOVE"))
+                    data.states[gotstates].movetype = MOVE;
+                else if (!strcmp(key, "SOLVE"))
+                    data.states[gotstates].movetype = SOLVE;
+                else
+                    data.states[gotstates].movetype = RESTART;
                 data.states[gotstates].movestr = val;
                 val = NULL;
             }
@@ -2274,12 +2523,20 @@ static const char *midend_deserialise_internal(
     }
 
     data.params = me->ourgame->default_params();
+    if (!data.parstr) {
+        ret = "Long-term parameters in save file are missing";
+        goto cleanup;
+    }
     me->ourgame->decode_params(data.params, data.parstr);
     if (me->ourgame->validate_params(data.params, true)) {
         ret = "Long-term parameters in save file are invalid";
         goto cleanup;
     }
     data.cparams = me->ourgame->default_params();
+    if (!data.cparstr) {
+        ret = "Short-term parameters in save file are missing";
+        goto cleanup;
+    }
     me->ourgame->decode_params(data.cparams, data.cparstr);
     if (me->ourgame->validate_params(data.cparams, false)) {
         ret = "Short-term parameters in save file are invalid";
@@ -2305,12 +2562,18 @@ static const char *midend_deserialise_internal(
         ret = "Game private description in save file is invalid";
         goto cleanup;
     }
-    if (data.statepos < 0 || data.statepos >= data.nstates) {
+    if (data.statepos < 1 || data.statepos > data.nstates) {
         ret = "Game position in save file is out of range";
+        goto cleanup;
     }
 
+    if (!data.states) {
+        ret = "No state count provided in save file";
+        goto cleanup;
+    }
     data.states[0].state = me->ourgame->new_game(
         me, data.cparams, data.privdesc ? data.privdesc : data.desc);
+
     for (i = 1; i < data.nstates; i++) {
         assert(data.states[i].movetype != NEWGAME);
         switch (data.states[i].movetype) {
@@ -2336,7 +2599,10 @@ static const char *midend_deserialise_internal(
     }
 
     data.ui = me->ourgame->new_ui(data.states[0].state);
-    me->ourgame->decode_ui(data.ui, data.uistr);
+    midend_apply_prefs(me, data.ui);
+    if (data.uistr && me->ourgame->decode_ui)
+        me->ourgame->decode_ui(data.ui, data.uistr,
+                               data.states[data.statepos-1].state);
 
     /*
      * Run the externally provided check function, and abort if it
@@ -2429,6 +2695,7 @@ static const char *midend_deserialise_internal(
     me->drawstate =
         me->ourgame->new_drawstate(me->drawing,
                                    me->states[me->statepos-1].state);
+    me->first_draw = true;
     midend_size_new_drawstate(me);
     if (me->game_id_change_notify_function)
         me->game_id_change_notify_function(me->game_id_change_notify_ctx);
@@ -2528,7 +2795,7 @@ const char *identify_game(char **name,
 
             if (c == ':') {
                 break;
-            } else if (c >= '0' && c <= '9') {
+            } else if (c >= '0' && c <= '9' && len < (INT_MAX - 10) / 10) {
                 len = (len * 10) + (c - '0');
             } else {
                 if (started)
@@ -2540,7 +2807,7 @@ const char *identify_game(char **name,
 
         val = snewn(len+1, char);
         if (!read(rctx, val, len)) {
-            if (started)
+            /* unexpected EOF */
             goto cleanup;
         }
         val[len] = '\0';
@@ -2605,14 +2872,340 @@ const char *midend_print_puzzle(midend *me, document *doc, bool with_soln)
         soln = NULL;
 
     /*
-     * This call passes over ownership of the two game_states and
-     * the game_params. Hence we duplicate the ones we want to
-     * keep, and we don't have to bother freeing soln if it was
-     * non-NULL.
+     * This call passes over ownership of the two game_states, the
+     * game_params and the game_ui. Hence we duplicate the ones we
+     * want to keep, and we don't have to bother freeing soln if it
+     * was non-NULL.
      */
+    game_ui *ui = me->ourgame->new_ui(me->states[0].state);
+    midend_apply_prefs(me, ui);
     document_add_puzzle(doc, me->ourgame,
-                        me->ourgame->dup_params(me->curparams),
+                        me->ourgame->dup_params(me->curparams), ui,
                         me->ourgame->dup_game(me->states[0].state), soln);
 
     return NULL;
 }
+
+static void midend_apply_prefs(midend *me, game_ui *ui)
+{
+    struct midend_serialise_buf_read_ctx rctx[1];
+    rctx->ser = &me->be_prefs;
+    rctx->len = me->be_prefs.len;
+    rctx->pos = 0;
+    const char *err = midend_deserialise_prefs(
+        me, ui, midend_serialise_buf_read, rctx);
+    /* This should have come from our own serialise function, so
+     * it should never be invalid. */
+    assert(!err && "Bad internal serialisation of preferences");
+}
+
+static config_item *midend_get_prefs(midend *me, game_ui *ui)
+{
+    int n_be_prefs, n_me_prefs, pos, i;
+    config_item *all_prefs, *be_prefs;
+
+    be_prefs = NULL;
+    n_be_prefs = 0;
+    if (me->ourgame->get_prefs) {
+        if (ui) {
+            be_prefs = me->ourgame->get_prefs(ui);
+        } else if (me->ui) {
+            be_prefs = me->ourgame->get_prefs(me->ui);
+        } else {
+            game_ui *tmp_ui = me->ourgame->new_ui(NULL);
+            be_prefs = me->ourgame->get_prefs(tmp_ui);
+            me->ourgame->free_ui(tmp_ui);
+        }
+        while (be_prefs[n_be_prefs].type != C_END)
+            n_be_prefs++;
+    }
+
+    n_me_prefs = 1;
+    all_prefs = snewn(n_me_prefs + n_be_prefs + 1, config_item);
+
+    pos = 0;
+
+    assert(pos < n_me_prefs);
+    all_prefs[pos].name = "Keyboard shortcuts without Ctrl";
+    all_prefs[pos].kw = "one-key-shortcuts";
+    all_prefs[pos].type = C_BOOLEAN;
+    all_prefs[pos].u.boolean.bval = me->one_key_shortcuts;
+    pos++;
+
+    for (i = 0; i < n_be_prefs; i++) {
+        all_prefs[pos] = be_prefs[i];  /* structure copy */
+        pos++;
+    }
+
+    all_prefs[pos].name = NULL;
+    all_prefs[pos].type = C_END;
+
+    if (be_prefs)
+        /* We already copied each element, so don't free those with
+           free_cfg(). */
+        sfree(be_prefs);
+
+    return all_prefs;
+}
+
+static void midend_set_prefs(midend *me, game_ui *ui, config_item *all_prefs)
+{
+    int pos = 0;
+    game_ui *tmpui = NULL;
+
+    me->one_key_shortcuts = all_prefs[pos].u.boolean.bval;
+    pos++;
+
+    if (me->ourgame->get_prefs) {
+        if (!ui)
+            ui = tmpui = me->ourgame->new_ui(NULL);
+        me->ourgame->set_prefs(ui, all_prefs + pos);
+    }
+
+    me->be_prefs.len = 0;
+    midend_serialise_prefs(me, ui, midend_serialise_buf_write, &me->be_prefs);
+
+    if (tmpui)
+        me->ourgame->free_ui(tmpui);
+}
+
+static void midend_serialise_prefs(
+    midend *me, game_ui *ui,
+    void (*write)(void *ctx, const void *buf, int len), void *wctx)
+{
+    config_item *cfg;
+    int i;
+
+    cfg = midend_get_prefs(me, ui);
+
+    assert(cfg);
+
+    for (i = 0; cfg[i].type != C_END; i++) {
+        config_item *it = &cfg[i];
+
+        /* Expect keywords to be made up only of simple characters */
+        assert(it->kw[strspn(it->kw, "abcdefghijklmnopqrstuvwxyz-")] == '\0');
+
+        write(wctx, it->kw, strlen(it->kw));
+        write(wctx, "=", 1);
+
+        switch (it->type) {
+          case C_BOOLEAN:
+            if (it->u.boolean.bval)
+                write(wctx, "true", 4);
+            else
+                write(wctx, "false", 5);
+            break;
+          case C_STRING: {
+            const char *p = it->u.string.sval;
+            while (*p) {
+                char c = *p++;
+                write(wctx, &c, 1);
+                if (c == '\n')
+                write(wctx, " ", 1);
+            }
+            break;
+          }
+          case C_CHOICES: {
+            int n = it->u.choices.selected;
+            const char *p = it->u.choices.choicekws;
+            char sepstr[2];
+
+            sepstr[0] = *p++;
+            sepstr[1] = '\0';
+
+            while (n > 0) {
+                const char *q = strchr(p, sepstr[0]);
+                assert(q != NULL && "Value out of range in C_CHOICES");
+                p = q+1;
+                n--;
+            }
+
+            write(wctx, p, strcspn(p, sepstr));
+            break;
+          }
+        }
+
+        write(wctx, "\n", 1);
+    }
+
+    free_cfg(cfg);
+}
+
+struct buffer {
+    char *data;
+    size_t len, size;
+};
+
+static void buffer_append(struct buffer *buf, char c)
+{
+    if (buf->len + 2 > buf->size) {
+        size_t new_size = buf->size + buf->size / 4 + 128;
+        assert(new_size > buf->size);
+        buf->data = sresize(buf->data, new_size, char);
+        buf->size = new_size;
+        assert(buf->len < buf->size);
+    }
+    buf->data[buf->len++] = c;
+    assert(buf->len < buf->size);
+    buf->data[buf->len] = '\0';
+}
+
+static const char *midend_deserialise_prefs(
+    midend *me, game_ui *ui,
+    bool (*read)(void *ctx, void *buf, int len), void *rctx)
+{
+    config_item *cfg, *it;
+    int i;
+    struct buffer buf[1] = {{ NULL, 0, 0 }};
+    const char *errmsg = NULL;
+    char read_char;
+    char ungot_char = '\0';
+    bool have_ungot_a_char = false, eof = false;
+
+    cfg = midend_get_prefs(me, ui);
+
+    while (!eof) {
+        if (have_ungot_a_char) {
+            read_char = ungot_char;
+            have_ungot_a_char = false;
+        } else {
+            if (!read(rctx, &read_char, 1))
+                goto out;           /* EOF at line start == success */
+        }
+
+        if (read_char == '#' || read_char == '\n') {
+            /* Skip comment or blank line */
+            while (read_char != '\n') {
+                if (!read(rctx, &read_char, 1))
+                    goto out;  /* EOF during boring line == success */
+            }
+            continue;
+        }
+
+        buf->len = 0;
+        while (true) {
+            buffer_append(buf, read_char);
+            if (!read(rctx, &read_char, 1)) {
+                errmsg = "Partial line at end of preferences file";
+                goto out;
+            }
+            if (read_char == '\n') {
+                errmsg = "Expected '=' after keyword";
+                goto out;
+            }
+            if (read_char == '=')
+                break;
+        }
+
+        it = NULL;
+        for (i = 0; cfg[i].type != C_END; i++)
+            if (!strcmp(buf->data, cfg[i].kw))
+                it = &cfg[i];
+
+        buf->len = 0;
+        while (true) {
+            if (!read(rctx, &read_char, 1)) {
+                /* We tolerate missing \n at the end of the file, so
+                 * this is taken to mean we've got a complete config
+                 * directive. But set the eof flag so that we stop
+                 * after processing it. */
+                eof = true;
+                break;
+            } else if (read_char == '\n') {
+                /* Newline _might_ be the end of this config
+                 * directive, unless it's followed by a space, in
+                 * which case it's a space-stuffed line
+                 * continuation. */
+                if (read(rctx, &read_char, 1)) {
+                    if (read_char == ' ') {
+                        buffer_append(buf, '\n');
+                        continue;
+                    } else {
+                        /* But if the next character wasn't a space,
+                         * then we must unget it so that it'll be
+                         * available to the next iteration of our
+                         * outer loop as the first character of the
+                         * next keyword. */
+                        ungot_char = read_char;
+                        have_ungot_a_char = true;
+                        break;
+                    }
+                } else {
+                    /* And if the newline was followed by EOF, then we
+                     * should finish this iteration of the outer
+                     * loop normally, and then not go round again. */
+                    eof = true;
+                    break;
+                }
+            } else {
+                /* Any other character is just added to the buffer. */
+                buffer_append(buf, read_char);
+            }
+        }
+
+        if (!it) {
+            /*
+             * Tolerate unknown keywords in a preferences file, on the
+             * assumption that they're from a different (probably
+             * later) version of the game.
+             */
+            continue;
+        }
+
+        switch (it->type) {
+          case C_BOOLEAN:
+            if (!strcmp(buf->data, "true"))
+                it->u.boolean.bval = true;
+            else if (!strcmp(buf->data, "false"))
+                it->u.boolean.bval = false;
+            else {
+                errmsg = "Value for boolean was not 'true' or 'false'";
+                goto out;
+            }
+            break;
+          case C_STRING:
+            sfree(it->u.string.sval);
+            it->u.string.sval = buf->data;
+            buf->data = NULL;
+            buf->len = buf->size = 0;
+            break;
+          case C_CHOICES: {
+            int n = 0;
+            bool found = false;
+            const char *p = it->u.choices.choicekws;
+            char sepstr[2];
+
+            sepstr[0] = *p;
+            sepstr[1] = '\0';
+
+            while (*p++) {
+                int len = strcspn(p, sepstr);
+                if (buf->len == len && !memcmp(p, buf->data, len)) {
+                    it->u.choices.selected = n;
+                    found = true;
+                    break;
+                }
+                p += len;
+                n++;
+            }
+
+            if (!found) {
+                errmsg = "Invalid value for enumeration";
+                goto out;
+            }
+
+            break;
+          }
+        }
+    }
+
+  out:
+
+    if (!errmsg)
+        midend_set_prefs(me, ui, cfg);
+
+    free_cfg(cfg);
+    sfree(buf->data);
+    return errmsg;
+}
diff --git a/apps/plugins/puzzles/src/mines.R b/apps/plugins/puzzles/src/mines.R
deleted file mode 100644
index 275c76c7ad..0000000000
--- a/apps/plugins/puzzles/src/mines.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-MINES_EXTRA = tree234
-
-mines    : [X] GTK COMMON mines MINES_EXTRA mines-icon|no-icon
-
-mines    : [G] WINDOWS COMMON mines MINES_EXTRA mines.res|noicon.res
-
-mineobfusc :    [U] mines[STANDALONE_OBFUSCATOR] MINES_EXTRA STANDALONE
-mineobfusc :    [C] mines[STANDALONE_OBFUSCATOR] MINES_EXTRA STANDALONE
-
-ALL += mines[COMBINED] MINES_EXTRA
-
-!begin am gtk
-GAMES += mines
-!end
-
-!begin >list.c
-    A(mines) \
-!end
-
-!begin >gamedesc.txt
-mines:mines.exe:Mines:Mine-finding puzzle:Find all the mines without treading on any of them.
-!end
diff --git a/apps/plugins/puzzles/src/mines.c b/apps/plugins/puzzles/src/mines.c
index 706777c4f1..e1441fae13 100644
--- a/apps/plugins/puzzles/src/mines.c
+++ b/apps/plugins/puzzles/src/mines.c
@@ -3,8 +3,7 @@
  * 
  * Still TODO:
  *
- *  - think about configurably supporting question marks. Once,
- *    that is, we've thought about configurability in general!
+ *  - think about configurably supporting question marks.
  */
 
 #include <stdio.h>
@@ -12,7 +11,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "tree234.h"
 #include "puzzles.h"
@@ -34,8 +38,8 @@ enum {
 #else
 #define BORDER (TILE_SIZE * 3 / 2)
 #endif
-#define HIGHLIGHT_WIDTH (TILE_SIZE / 10)
-#define OUTER_HIGHLIGHT_WIDTH (BORDER / 10)
+#define HIGHLIGHT_WIDTH (TILE_SIZE / 10 ? TILE_SIZE / 10 : 1)
+#define OUTER_HIGHLIGHT_WIDTH (BORDER / 10 ? BORDER / 10 : 1)
 #define COORD(x)  ( (x) * TILE_SIZE + BORDER )
 #define FROMCOORD(x)  ( ((x) - BORDER + TILE_SIZE) / TILE_SIZE - 1 )
 
@@ -162,7 +166,9 @@ static void decode_params(game_params *params, char const *string)
         params->n = atoi(p);
         while (*p && (*p == '.' || isdigit((unsigned char)*p))) p++;
     } else {
-        params->n = params->w * params->h / 10;
+        if (params->h > 0 && params->w > 0 &&
+            params->w <= INT_MAX / params->h)
+            params->n = params->w * params->h / 10;
     }
 
     while (*p) {
@@ -250,7 +256,7 @@ static const char *validate_params(const game_params *params, bool full)
      * blocking the way and no idea what's behind them, or one mine
      * and no way to know which of the two rows it's in. If the
      * mine count is even you can create a soluble grid by packing
-     * all the mines at one end (so what when you hit a two-mine
+     * all the mines at one end (so that when you hit a two-mine
      * wall there are only as many covered squares left as there
      * are mines); but if it's odd, you are doomed, because you
      * _have_ to have a gap somewhere which you can't determine the
@@ -258,12 +264,25 @@ static const char *validate_params(const game_params *params, bool full)
      */
     if (full && params->unique && (params->w <= 2 || params->h <= 2))
         return "Width and height must both be greater than two";
+    if (params->w < 1 || params->h < 1)
+        return "Width and height must both be at least one";
+    if (params->w > SHRT_MAX || params->h > SHRT_MAX)
+        return "Neither width nor height may be unreasonably large";
+    /*
+     * We use random_upto() to place mines, and its maximum limit is 2^28-1.
+     */
+#if (1<<28)-1 < INT_MAX
+    if (params->w > ((1<<28)-1) / params->h)
+#else
+    if (params->w > INT_MAX / params->h)
+#endif
+        return "Width times height must not be unreasonably large";
     if (params->n < 0)
         return "Mine count may not be negative";
-    if (params->n > params->w * params->h - 9)
-        return "Too many mines for grid size";
     if (params->n < 1)
         return "Number of mines must be greater than zero";
+    if (params->n > params->w * params->h - 9)
+        return "Too many mines for grid size";
 
     /*
      * FIXME: Need more constraints here. Not sure what the
@@ -428,7 +447,9 @@ static void ss_add(struct setstore *ss, int x, int y, int mask, int mines)
      * Create a set structure and add it to the tree.
      */
     s = snew(struct set);
+    assert(SHRT_MIN <= x && x <= SHRT_MAX);
     s->x = x;
+    assert(SHRT_MIN <= y && y <= SHRT_MAX);
     s->y = y;
     s->mask = mask;
     s->mines = mines;
@@ -499,7 +520,9 @@ static struct set **ss_overlap(struct setstore *ss, int x, int y, int mask)
             /*
              * Find the first set with these top left coordinates.
              */
+            assert(SHRT_MIN <= xx && xx <= SHRT_MAX);
             stmp.x = xx;
+            assert(SHRT_MIN <= yy && yy <= SHRT_MAX);
             stmp.y = yy;
             stmp.mask = 0;
 
@@ -1880,72 +1903,7 @@ static char *describe_layout(bool *grid, int area, int x, int y,
 static bool *new_mine_layout(int w, int h, int n, int x, int y, bool unique,
                              random_state *rs, char **game_desc)
 {
-    bool *grid;
-
-#ifdef TEST_OBFUSCATION
-    static int tested_obfuscation = false;
-    if (!tested_obfuscation) {
-        /*
-         * A few simple test vectors for the obfuscator.
-         * 
-         * First test: the 28-bit stream 1234567. This divides up
-         * into 1234 and 567[0]. The SHA of 56 70 30 (appending
-         * "0") is 15ce8ab946640340bbb99f3f48fd2c45d1a31d30. Thus,
-         * we XOR the 16-bit string 15CE into the input 1234 to get
-         * 07FA. Next, we SHA that with "0": the SHA of 07 FA 30 is
-         * 3370135c5e3da4fed937adc004a79533962b6391. So we XOR the
-         * 12-bit string 337 into the input 567 to get 650. Thus
-         * our output is 07FA650.
-         */
-        {
-            unsigned char bmp1[] = "\x12\x34\x56\x70";
-            obfuscate_bitmap(bmp1, 28, false);
-            printf("test 1 encode: %s\n",
-                   memcmp(bmp1, "\x07\xfa\x65\x00", 4) ? "failed" : "passed");
-            obfuscate_bitmap(bmp1, 28, true);
-            printf("test 1 decode: %s\n",
-                   memcmp(bmp1, "\x12\x34\x56\x70", 4) ? "failed" : "passed");
-        }
-        /*
-         * Second test: a long string to make sure we switch from
-         * one SHA to the next correctly. My input string this time
-         * is simply fifty bytes of zeroes.
-         */
-        {
-            unsigned char bmp2[50];
-            unsigned char bmp2a[50];
-            memset(bmp2, 0, 50);
-            memset(bmp2a, 0, 50);
-            obfuscate_bitmap(bmp2, 50 * 8, false);
-            /*
-             * SHA of twenty-five zero bytes plus "0" is
-             * b202c07b990c01f6ff2d544707f60e506019b671. SHA of
-             * twenty-five zero bytes plus "1" is
-             * fcb1d8b5a2f6b592fe6780b36aa9d65dd7aa6db9. Thus our
-             * first half becomes
-             * b202c07b990c01f6ff2d544707f60e506019b671fcb1d8b5a2.
-             * 
-             * SHA of that lot plus "0" is
-             * 10b0af913db85d37ca27f52a9f78bba3a80030db. SHA of the
-             * same string plus "1" is
-             * 3d01d8df78e76d382b8106f480135a1bc751d725. So the
-             * second half becomes
-             * 10b0af913db85d37ca27f52a9f78bba3a80030db3d01d8df78.
-             */
-            printf("test 2 encode: %s\n",
-                   memcmp(bmp2, "\xb2\x02\xc0\x7b\x99\x0c\x01\xf6\xff\x2d\x54"
-                          "\x47\x07\xf6\x0e\x50\x60\x19\xb6\x71\xfc\xb1\xd8"
-                          "\xb5\xa2\x10\xb0\xaf\x91\x3d\xb8\x5d\x37\xca\x27"
-                          "\xf5\x2a\x9f\x78\xbb\xa3\xa8\x00\x30\xdb\x3d\x01"
-                          "\xd8\xdf\x78", 50) ? "failed" : "passed");
-            obfuscate_bitmap(bmp2, 50 * 8, true);
-            printf("test 2 decode: %s\n",
-                   memcmp(bmp2, bmp2a, 50) ? "failed" : "passed");
-        }
-    }
-#endif
-
-    grid = minegen(w, h, n, x, y, unique, rs);
+    bool *grid = minegen(w, h, n, x, y, unique, rs);
 
     if (game_desc)
         *game_desc = describe_layout(grid, w * h, x, y, true);
@@ -2001,6 +1959,8 @@ static const char *validate_desc(const game_params *params, const char *desc)
         desc++;
         if (!*desc || !isdigit((unsigned char)*desc))
             return "No initial mine count in game description";
+        if (atoi(desc) > wh - 9)
+            return "Too many mines for grid size";
         while (*desc && isdigit((unsigned char)*desc))
             desc++;                    /* skip over mine count */
         if (*desc != ',')
@@ -2139,6 +2099,8 @@ static int open_square(game_state *state, int x, int y)
             break;
     }
 
+    /* If the player has already lost, don't let them win as well. */
+    if (state->dead) return 0;
     /*
      * Finally, scan the grid and see if exactly as many squares
      * are still covered as there are mines. If so, set the `won'
@@ -2365,7 +2327,7 @@ static game_ui *new_ui(const game_state *state)
     ui->completed = false;
     ui->flash_is_death = false;        /* *shrug* */
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     return ui;
 }
 
@@ -2387,7 +2349,8 @@ static char *encode_ui(const game_ui *ui)
     return dupstr(buf);
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void decode_ui(game_ui *ui, const char *encoding,
+                      const game_state *state)
 {
     int p= 0;
     sscanf(encoding, "D%d%n", &ui->deaths, &p);
@@ -2402,6 +2365,35 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
         ui->completed = true;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    int cx = ui->cur_x, cy = ui->cur_y;
+    int v = state->grid[cy * state->w + cx];
+
+    if (state->dead || state->won || !ui->cur_visible) return "";
+    if (button == CURSOR_SELECT2) {
+        if (v == -2) return "Mark";
+        if (v == -1) return "Unmark";
+        return "";
+    }
+    if (button == CURSOR_SELECT) {
+        int dy, dx, n = 0;
+        if (v == -2 || v == -3) return "Uncover";
+        if (v == 0) return "";
+        /* Count mine markers. */
+        for (dy = -1; dy <= +1; dy++)
+            for (dx = -1; dx <= +1; dx++)
+                if (cx+dx >= 0 && cx+dx < state->w &&
+                        cy+dy >= 0 && cy+dy < state->h) {
+                        if (state->grid[(cy+dy)*state->w+(cx+dx)] == -1)
+                            n++;
+                    }
+        if (n == v) return "Clear";
+    }
+    return "";
+}
+
 struct game_drawstate {
     int w, h, tilesize, bg;
     bool started;
@@ -2432,22 +2424,20 @@ static char *interpret_move(const game_state *from, game_ui *ui,
     cx = FROMCOORD(x);
     cy = FROMCOORD(y);
 
-    if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h, false);
-        ui->cur_visible = true;
-        return UI_UPDATE;
-    }
+    if (IS_CURSOR_MOVE(button))
+        return move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h,
+                           false, &ui->cur_visible);
     if (IS_CURSOR_SELECT(button)) {
         int v = from->grid[ui->cur_y * from->w + ui->cur_x];
 
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (button == CURSOR_SELECT2) {
             /* As for RIGHT_BUTTON; only works on covered square. */
             if (v != -2 && v != -1)
-                return NULL;
+                return MOVE_NO_EFFECT;
             sprintf(buf, "F%d,%d", ui->cur_x, ui->cur_y);
             return dupstr(buf);
         }
@@ -2468,7 +2458,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
     if (button == LEFT_BUTTON || button == LEFT_DRAG ||
         button == MIDDLE_BUTTON || button == MIDDLE_DRAG) {
         if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
-            return NULL;
+            return MOVE_UNUSED;
 
         /*
          * Mouse-downs and mouse-drags just cause highlighting
@@ -2482,12 +2472,12 @@ static char *interpret_move(const game_state *from, game_ui *ui,
         else if (button == MIDDLE_BUTTON)
             ui->validradius = 1;
         ui->cur_visible = false;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (button == RIGHT_BUTTON) {
         if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
-            return NULL;
+            return MOVE_UNUSED;
 
         /*
          * Right-clicking only works on a covered square, and it
@@ -2498,7 +2488,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
          */
         if (from->grid[cy * from->w + cx] != -2 &&
             from->grid[cy * from->w + cx] != -1)
-            return NULL;
+            return MOVE_NO_EFFECT;
 
         sprintf(buf, "F%d,%d", cx, cy);
         return dupstr(buf);
@@ -2509,11 +2499,12 @@ static char *interpret_move(const game_state *from, game_ui *ui,
         ui->hradius = 0;
 
         /*
-         * At this stage we must never return NULL: we have adjusted
-         * the ui, so at worst we return UI_UPDATE.
+         * At this stage we must never return MOVE_UNUSED or
+         * MOVE_NO_EFFECT: we have adjusted the ui, so at worst we
+         * return MOVE_UI_UPDATE.
          */
         if (cx < 0 || cx >= from->w || cy < 0 || cy >= from->h)
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
 
         /*
          * Left-clicking on a covered square opens a tile. Not
@@ -2533,7 +2524,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
         }
         goto uncover;
     }
-    return NULL;
+    return MOVE_UNUSED;
 
 uncover:
     {
@@ -2591,7 +2582,7 @@ uncover:
             }
         }
 
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 }
 
@@ -2603,6 +2594,7 @@ static game_state *execute_move(const game_state *from, const char *move)
     if (!strcmp(move, "S")) {
         int yy, xx;
 
+        if (!from->layout->mines) return NULL; /* Game not started. */
         ret = dup_game(from);
         if (!ret->dead) {
             /*
@@ -2656,12 +2648,17 @@ static game_state *execute_move(const game_state *from, const char *move)
 
         return ret;
     } else {
+        /* Dead players should stop trying to move. */
+        if (from->dead)
+            return NULL;
         ret = dup_game(from);
 
         while (*move) {
             if (move[0] == 'F' &&
                 sscanf(move+1, "%d,%d", &cx, &cy) == 2 &&
-                cx >= 0 && cx < from->w && cy >= 0 && cy < from->h) {
+                cx >= 0 && cx < from->w && cy >= 0 && cy < from->h &&
+                (ret->grid[cy * from->w + cx] == -1 ||
+                 ret->grid[cy * from->w + cx] == -2)) {
                 ret->grid[cy * from->w + cx] ^= (-2 ^ -1);
             } else if (move[0] == 'O' &&
                        sscanf(move+1, "%d,%d", &cx, &cy) == 2 &&
@@ -2697,7 +2694,7 @@ static game_state *execute_move(const game_state *from, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2870,12 +2867,12 @@ static void draw_tile(drawing *dr, game_drawstate *ds,
     coords[(n)*2+0] = x + (int)(TILE_SIZE * (dx)); \
     coords[(n)*2+1] = y + (int)(TILE_SIZE * (dy)); \
 } while (0)
-            SETCOORD(0, 0.6F,  0.7F);
-            SETCOORD(1, 0.8F,  0.8F);
-            SETCOORD(2, 0.25F, 0.8F);
-            SETCOORD(3, 0.55F, 0.7F);
-            SETCOORD(4, 0.55F, 0.35F);
-            SETCOORD(5, 0.6F,  0.35F);
+            SETCOORD(0, 0.6F,  0.35F);
+            SETCOORD(1, 0.6F,  0.7F);
+            SETCOORD(2, 0.8F,  0.8F);
+            SETCOORD(3, 0.25F, 0.8F);
+            SETCOORD(4, 0.55F, 0.7F);
+            SETCOORD(5, 0.55F, 0.35F);
             draw_polygon(dr, coords, 6, COL_FLAGBASE, COL_FLAGBASE);
 
             SETCOORD(0, 0.6F, 0.2F);
@@ -2980,13 +2977,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int coords[10];
 
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * state->w + 2 * BORDER,
-                  TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND);
-        draw_update(dr, 0, 0,
-                    TILE_SIZE * state->w + 2 * BORDER,
-                    TILE_SIZE * state->h + 2 * BORDER);
-
         /*
          * Recessed area containing the whole puzzle.
          */
@@ -3182,14 +3172,6 @@ static bool game_timing_state(const game_state *state, game_ui *ui)
     return true;
 }
 
-static void game_print_size(const game_params *params, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame mines
 #endif
@@ -3211,12 +3193,14 @@ const struct game thegame = {
     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,
     encode_ui,
     decode_ui,
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -3228,7 +3212,7 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
     true, game_timing_state,
     BUTTON_BEATS(LEFT_BUTTON, RIGHT_BUTTON) | REQUIRE_RBUTTON,
diff --git a/apps/plugins/puzzles/src/misc.c b/apps/plugins/puzzles/src/misc.c
index ed31acbbe4..8e96d67039 100644
--- a/apps/plugins/puzzles/src/misc.c
+++ b/apps/plugins/puzzles/src/misc.c
@@ -3,13 +3,21 @@
  */
 
 #include <assert.h>
+#include <ctype.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "puzzles.h"
 
-char UI_UPDATE[] = "";
+char MOVE_UI_UPDATE[] = "";
+char MOVE_NO_EFFECT[] = "";
+char MOVE_UNUSED[] = "";
 
 void free_cfg(config_item *cfg)
 {
@@ -197,30 +205,85 @@ char *fgetline(FILE *fp)
     return ret;
 }
 
+int getenv_bool(const char *name, int dflt)
+{
+    char *env = getenv(name);
+    if (env == NULL) return dflt;
+    if (strchr("yYtT", env[0])) return true;
+    return false;
+}
+
+/* Utility functions for colour manipulation. */
+
+static float colour_distance(const float a[3], const float b[3])
+{
+    return (float)sqrt((a[0]-b[0]) * (a[0]-b[0]) +
+                       (a[1]-b[1]) * (a[1]-b[1]) +
+                       (a[2]-b[2]) * (a[2]-b[2]));
+}
+
+void colour_mix(const float src1[3], const float src2[3], float p, float dst[3])
+{
+    int i;
+    for (i = 0; i < 3; i++)
+        dst[i] = src1[i] * (1.0F - p) + src2[i] * p;
+}
+
 void game_mkhighlight_specific(frontend *fe, float *ret,
                                int background, int highlight, int lowlight)
 {
-    float max;
+    static const float black[3] = { 0.0F, 0.0F, 0.0F };
+    static const float white[3] = { 1.0F, 1.0F, 1.0F };
+    float db, dw;
     int i;
-
     /*
-     * Drop the background colour so that the highlight is
-     * noticeably brighter than it while still being under 1.
+     * New geometric highlight-generation algorithm: Draw a line from
+     * the base colour to white.  The point K distance along this line
+     * from the base colour is the highlight colour.  Similarly, draw
+     * a line from the base colour to black.  The point on this line
+     * at a distance K from the base colour is the shadow.  If either
+     * of these colours is imaginary (for reasonable K at most one
+     * will be), _extrapolate_ the base colour along the same line
+     * until it's a distance K from white (or black) and start again
+     * with that as the base colour.
+     *
+     * This preserves the hue of the base colour, ensures that of the
+     * three the base colour is the most saturated, and only ever
+     * flattens the highlight and shadow to pure white or pure black.
+     *
+     * K must be at most sqrt(3)/2, or mid grey would be too close to
+     * both white and black.  Here K is set to sqrt(3)/6 so that this
+     * code produces the same results as the former code in the common
+     * case where the background is grey and the highlight saturates
+     * to white.
      */
-    max = ret[background*3];
-    for (i = 1; i < 3; i++)
-        if (ret[background*3+i] > max)
-            max = ret[background*3+i];
-    if (max * 1.2F > 1.0F) {
-        for (i = 0; i < 3; i++)
-            ret[background*3+i] /= (max * 1.2F);
+    const float k = sqrt(3)/6.0F;
+    if (lowlight >= 0) {
+        db = colour_distance(&ret[background*3], black);
+        if (db < k) {
+            for (i = 0; i < 3; i++) ret[lowlight*3+i] = black[i];
+            if (db == 0.0F)
+                colour_mix(black, white, k/sqrt(3), &ret[background*3]);
+            else
+                colour_mix(black, &ret[background*3], k/db, &ret[background*3]);
+        } else {
+            colour_mix(&ret[background*3], black, k/db, &ret[lowlight*3]);
+        }
     }
-
-    for (i = 0; i < 3; i++) {
-        if (highlight >= 0)
-            ret[highlight * 3 + i] = ret[background * 3 + i] * 1.2F;
-        if (lowlight >= 0)
-            ret[lowlight * 3 + i] = ret[background * 3 + i] * 0.8F;
+    if (highlight >= 0) {
+        dw = colour_distance(&ret[background*3], white);
+        if (dw < k) {
+            for (i = 0; i < 3; i++) ret[highlight*3+i] = white[i];
+            if (dw == 0.0F)
+                colour_mix(white, black, k/sqrt(3), &ret[background*3]);
+            else
+                colour_mix(white, &ret[background*3], k/dw, &ret[background*3]);
+            /* Background has changed; recalculate lowlight. */
+            if (lowlight >= 0)
+                colour_mix(&ret[background*3], black, k/db, &ret[lowlight*3]);
+        } else {
+            colour_mix(&ret[background*3], white, k/dw, &ret[highlight*3]);
+        }
     }
 }
 
@@ -231,7 +294,7 @@ void game_mkhighlight(frontend *fe, float *ret,
     game_mkhighlight_specific(fe, ret, background, highlight, lowlight);
 }
 
-static void swap_regions(void *av, void *bv, int size)
+void swap_regions(void *av, void *bv, size_t size)
 {
     char tmpbuf[512];
     char *a = av, *b = bv;
@@ -288,15 +351,27 @@ void draw_rect_corners(drawing *dr, int cx, int cy, int r, int col)
     draw_line(dr, cx + r, cy + r, cx + r/2, cy + r, col);
 }
 
-void move_cursor(int button, int *x, int *y, int maxw, int maxh, bool wrap)
+int compare_integers(const void *av, const void *bv) {
+    const int *a = (const int *)av;
+    const int *b = (const int *)bv;
+    if (*a < *b)
+        return -1;
+    else if (*a > *b)
+        return +1;
+    else
+        return 0;
+}
+
+char *move_cursor(int button, int *x, int *y, int maxw, int maxh, bool wrap,
+    bool *visible)
 {
-    int dx = 0, dy = 0;
+    int dx = 0, dy = 0, ox = *x, oy = *y;
     switch (button) {
     case CURSOR_UP:         dy = -1; break;
     case CURSOR_DOWN:       dy = 1; break;
     case CURSOR_RIGHT:      dx = 1; break;
     case CURSOR_LEFT:       dx = -1; break;
-    default: return;
+    default: return MOVE_UNUSED;
     }
     if (wrap) {
         *x = (*x + dx + maxw) % maxw;
@@ -305,6 +380,13 @@ void move_cursor(int button, int *x, int *y, int maxw, int maxh, bool wrap)
         *x = min(max(*x+dx, 0), maxw - 1);
         *y = min(max(*y+dy, 0), maxh - 1);
     }
+    if (visible != NULL && !*visible) {
+        *visible = true;
+        return MOVE_UI_UPDATE;
+    }
+    if (*x != ox || *y != oy)
+        return MOVE_UI_UPDATE;
+    return MOVE_NO_EFFECT;
 }
 
 /* Used in netslide.c and sixteen.c for cursor movement around edge. */
@@ -402,12 +484,6 @@ void copy_left_justified(char *buf, size_t sz, const char *str)
     buf[sz - 1] = 0;
 }
 
-/* another kludge for platforms without %g support in *printf() */
-int ftoa(char *buf, float f)
-{
-    return sprintf(buf, "%d.%06d", (int)f, abs((int)((f - (int)f)*1e6)));
-}
-
 /* Returns a dynamically allocated label for a generic button.
  * Game-specific buttons should go into the `label' field of key_label
  * instead. */
@@ -446,4 +522,161 @@ char *button2label(int button)
     return NULL;
 }
 
+char *make_prefs_path(const char *dir, const char *sep,
+                      const game *game, const char *suffix)
+{
+    size_t dirlen = strlen(dir);
+    size_t seplen = strlen(sep);
+    size_t gamelen = strlen(game->name);
+    size_t suffixlen = strlen(suffix);
+    char *path, *p;
+    const char *q;
+
+    if (!dir || !sep || !game || !suffix)
+        return NULL;
+
+    path = snewn(dirlen + seplen + gamelen + suffixlen + 1, char);
+    p = path;
+
+    memcpy(p, dir, dirlen);
+    p += dirlen;
+
+    memcpy(p, sep, seplen);
+    p += seplen;
+
+    for (q = game->name; *q; q++)
+        if (*q != ' ')
+            *p++ = tolower((unsigned char)*q);
+
+    memcpy(p, suffix, suffixlen);
+    p += suffixlen;
+
+    *p = '\0';
+    return path;
+}
+
+/*
+ * Calculate the nearest integer to n*sqrt(k), via a bitwise algorithm
+ * that avoids floating point.
+ *
+ * (It would probably be OK in practice to use floating point, but I
+ * felt like overengineering it for fun. With FP, there's at least a
+ * theoretical risk of rounding the wrong way, due to the three
+ * successive roundings involved - rounding sqrt(k), rounding its
+ * product with n, and then rounding to the nearest integer. This
+ * approach avoids that: it's exact.)
+ */
+int n_times_root_k(int n_signed, int k)
+{
+    unsigned x, r, m;
+    int sign = n_signed < 0 ? -1 : +1;
+    unsigned n = n_signed * sign;
+    unsigned bitpos;
+
+    /*
+     * Method:
+     *
+     * We transform m gradually from zero into n, by multiplying it by
+     * 2 in each step and optionally adding 1, so that it's always
+     * floor(n/2^something).
+     *
+     * At the start of each step, x is the largest integer less than
+     * or equal to m*sqrt(k). We transform m to 2m+bit, and therefore
+     * we must transform x to 2x+something to match. The 'something'
+     * we add to 2x is at most floor(sqrt(k))+2. (Worst case is if m
+     * sqrt(k) was equal to x + 1-eps for some tiny eps, and then the
+     * incoming bit of m is 1, so that (2m+1)sqrt(k) =
+     * 2x+2+sqrt(k)-2eps.)
+     *
+     * To compute this, we also track the residual value r such that
+     * x^2+r = km^2.
+     *
+     * The algorithm below is very similar to the usual approach for
+     * taking the square root of an integer in binary. The wrinkle is
+     * that we have an integer multiplier, i.e. we're computing
+     * n*sqrt(k) rather than just sqrt(k). Of course in principle we
+     * could just take sqrt(n^2k), but we'd need an integer twice the
+     * width to hold n^2. Pulling out n and treating it specially
+     * makes overflow less likely.
+     */
+
+    x = r = m = 0;
+
+    for (bitpos = UINT_MAX & ~(UINT_MAX >> 1); bitpos; bitpos >>= 1) {
+        unsigned a, b = (n & bitpos) ? 1 : 0;
+
+        /*
+         * Check invariants. We expect that x^2 + r = km^2 (i.e. our
+         * residual term is correct), and also that r < 2x+1 (because
+         * if not, then we could replace x with x+1 and still get a
+         * value that made r non-negative, i.e. x would not be the
+         * _largest_ integer less than m sqrt(k)).
+         */
+        assert(x*x + r == k*m*m);
+        assert(r < 2*x+1);
+
+        /*
+         * We're going to replace m with 2m+b, and x with 2x+a for
+         * some a we haven't decided on yet.
+         *
+         * The new value of the residual will therefore be
+         *
+         *   k (2m+b)^2 - (2x+a)^2
+         * = (4km^2 + 4kmb + kb^2) - (4x^2 + 4xa + a^2)
+         * = 4 (km^2 - x^2) + 4kmb + kb^2 - 4xa - a^2
+         * = 4r + 4kmb + kb^2 - 4xa - a^2          (because r = km^2 - x^2)
+         * = 4r + (4m + 1)kb - 4xa - a^2           (b is 0 or 1, so b = b^2)
+         */
+        for (a = 0;; a++) {
+            /* If we made this routine handle square roots of numbers
+             * significantly bigger than 3 or 5 then it would be
+             * sensible to make this a binary search. Here, it hardly
+             * seems important. */
+            unsigned pos = 4*r + k*b*(4*m + 1);
+            unsigned neg = 4*a*x + a*a;
+            if (pos < neg)
+                break;                 /* this value of a is too big */
+        }
+
+        /* The above loop will have terminated with a one too big. So
+         * now decrementing a will give us the right value to add. */
+        a--;
+
+        r = 4*r + b*k*(4*m + 1) - (4*a*x + a*a);
+        m = 2*m+b;
+        x = 2*x+a;
+    }
+
+    /*
+     * Finally, round to the nearest integer. At present, x is the
+     * largest integer that is _at most_ m sqrt(k). But we want the
+     * _nearest_ integer, whether that's rounded up or down. So check
+     * whether (x + 1/2) is still less than m sqrt(k), i.e. whether
+     * (x + 1/2)^2 < km^2; if it is, then we increment x.
+     *
+     * We have km^2 - (x + 1/2)^2 = km^2 - x^2 - x - 1/4
+     *                            = r - x - 1/4
+     *
+     * and since r and x are integers, this is greater than 0 if and
+     * only if r > x.
+     *
+     * (There's no need to worry about tie-breaking exact halfway
+     * rounding cases. sqrt(k) is irrational, so none such exist.)
+     */
+    if (r > x)
+        x++;
+
+    /*
+     * Put the sign back on, and convert back from unsigned to int.
+     */
+    if (sign == +1) {
+        return x;
+    } else {
+        /* Be a little careful to avoid compilers deciding I've just
+         * perpetrated signed-integer overflow. This should optimise
+         * down to no actual code. */
+        return INT_MIN + (int)(-x - (unsigned)INT_MIN);
+    }
+}
+
 /* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/puzzles/src/mosaic.c b/apps/plugins/puzzles/src/mosaic.c
new file mode 100644
index 0000000000..05a339ded5
--- /dev/null
+++ b/apps/plugins/puzzles/src/mosaic.c
@@ -0,0 +1,1626 @@
+/*
+ * mosaic.c: A puzzle based on a square grid, with some of the tiles
+ * having clues as to how many black squares are around them.
+ * the purpose of the game is to find what should be on all tiles (black or
+ * unmarked)
+ *
+ * The game is also known as: ArtMosaico, Count and Darken, Cuenta Y Sombrea,
+ * Fill-a-Pix, Fill-In, Komsu Karala, Magipic, Majipiku, Mosaico, Mosaik,
+ * Mozaiek, Nampre Puzzle, Nurie-Puzzle, Oekaki-Pix, Voisimage.
+ *
+ * Implementation is loosely based on https://github.com/mordechaim/Mosaic, UI
+ * interaction is based on the range puzzle in the collection.
+ */
+
+#include <assert.h>
+#include <ctype.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "puzzles.h"
+
+#define DEFAULT_SIZE 10
+#define DEFAULT_AGGRESSIVENESS true
+#define MAX_TILES 10000
+#define MAX_TILES_ERROR "Maximum size is 10000 tiles"
+#define DEFAULT_TILE_SIZE 32
+#define DEBUG_IMAGE 1
+#undef DEBUG_IMAGE
+#define FLASH_TIME 0.5F
+/* To enable debug prints define DEBUG_PRINTS */
+
+/* Getting the coordinates and returning NULL when out of scope
+ * The parentheses are needed to avoid order of operations issues
+ */
+#define get_coords(params, array, x, y)                                      \
+  (((x) >= 0 && (y) >= 0) && ((x) < params->width && (y) < params->height))  \
+      ? array + ((y)*params->width) + x                                      \
+      : NULL
+
+#define COORD_FROM_CELL(d) ((d * ds->tilesize) + ds->tilesize / 2) - 1
+
+enum {
+    COL_BACKGROUND = 0,
+    COL_UNMARKED,
+    COL_GRID,
+    COL_MARKED,
+    COL_BLANK,
+    COL_TEXT_SOLVED,
+    COL_ERROR,
+    COL_CURSOR,
+    NCOLOURS,
+    COL_TEXT_DARK = COL_MARKED,
+    COL_TEXT_LIGHT = COL_BLANK
+};
+
+enum cell_state {
+    STATE_UNMARKED = 0,
+    STATE_MARKED = 1,
+    STATE_BLANK = 2,
+    STATE_SOLVED = 4,
+    STATE_ERROR = 8,
+    STATE_UNMARKED_ERROR = STATE_ERROR | STATE_UNMARKED,
+    STATE_MARKED_ERROR = STATE_ERROR | STATE_MARKED,
+    STATE_BLANK_ERROR = STATE_ERROR | STATE_BLANK,
+    STATE_BLANK_SOLVED = STATE_SOLVED | STATE_BLANK,
+    STATE_MARKED_SOLVED = STATE_MARKED | STATE_SOLVED,
+    STATE_OK_NUM = STATE_BLANK | STATE_MARKED
+};
+
+struct game_params {
+    int width;
+    int height;
+    bool aggressive;
+};
+
+typedef struct board_state board_state;
+
+typedef struct needed_list_item needed_list_item;
+
+struct needed_list_item {
+    int x, y;
+    needed_list_item *next;
+};
+
+struct game_state {
+    bool cheating;
+    int not_completed_clues;
+    int width;
+    int height;
+    char *cells_contents;
+    board_state *board;
+};
+
+struct board_state {
+    unsigned int references;
+    struct board_cell *actual_board;
+};
+
+struct board_cell {
+    signed char clue;
+    bool shown;
+};
+
+struct solution_cell {
+    signed char cell;
+    bool solved;
+    bool needed;
+};
+
+struct desc_cell {
+    char clue;
+    bool shown;
+    bool value;
+    bool full;
+    bool empty;
+};
+
+struct game_ui {
+    bool solved;
+    bool in_progress;
+    int last_x, last_y, last_state;
+    int cur_x, cur_y;
+    bool cur_visible;
+};
+
+struct game_drawstate {
+    int tilesize;
+    int *state;
+};
+
+static game_params *default_params(void)
+{
+    game_params *ret = snew(game_params);
+
+    ret->width = DEFAULT_SIZE;
+    ret->height = DEFAULT_SIZE;
+    ret->aggressive = DEFAULT_AGGRESSIVENESS;
+
+    return ret;
+}
+
+static bool game_fetch_preset(int i, char **name, game_params **params)
+{
+    const int sizes[6] = { 3, 5, 10, 15, 25, 50 };
+    const bool aggressiveness[6] = { true, true, true, true, true, false };
+    if (i < 0 || i > 5) {
+        return false;
+    }
+    game_params *res = snew(game_params);
+    res->height = sizes[i];
+    res->width = sizes[i];
+    res->aggressive = aggressiveness[i];
+    *params = res;
+
+    char value[80];
+    sprintf(value, "Size: %dx%d", sizes[i], sizes[i]);
+    *name = dupstr(value);
+    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->width = params->height = atoi(string);
+    while (*string && isdigit((unsigned char)*string)) string++;
+    if (*string == 'x') {
+        string++;
+        params->height = atoi(string);
+        while (*string && isdigit((unsigned char)*string)) string++;
+    }
+    if (*string == 'h') {
+        string++;
+        params->aggressive = atoi(string);
+        while (*string && isdigit((unsigned char)*string)) string++;
+    }
+}
+
+static char *encode_params(const game_params *params, bool full)
+{
+    char encoded[128];
+    int pos = 0;
+    pos += sprintf(encoded + pos, "%dx%d", params->width, params->height);
+    if (full) {
+        if (params->aggressive != DEFAULT_AGGRESSIVENESS)
+            pos += sprintf(encoded + pos, "h%d", params->aggressive);
+    }
+    return dupstr(encoded);
+}
+
+static config_item *game_configure(const game_params *params)
+{
+    config_item *config = snewn(4, config_item);
+    char value[80];
+
+    config[0].type = C_STRING;
+    config[0].name = "Height";
+    sprintf(value, "%d", params->height);
+    config[0].u.string.sval = dupstr(value);
+
+    config[1].type = C_STRING;
+    config[1].name = "Width";
+    sprintf(value, "%d", params->width);
+    config[1].u.string.sval = dupstr(value);
+
+    config[2].name = "Aggressive generation (longer)";
+    config[2].type = C_BOOLEAN;
+    config[2].u.boolean.bval = params->aggressive;
+
+    config[3].type = C_END;
+
+    return config;
+}
+
+static game_params *custom_params(const config_item *cfg)
+{
+    game_params *res = snew(game_params);
+    res->height = atol(cfg[0].u.string.sval);
+    res->width = atol(cfg[1].u.string.sval);
+    res->aggressive = cfg[2].u.boolean.bval;
+    return res;
+}
+
+static const char *validate_params(const game_params *params, bool full)
+{
+    if (params->height < 3 || params->width < 3) {
+        return "Minimal size is 3x3";
+    }
+    if (params->height > MAX_TILES / params->width) {
+        return MAX_TILES_ERROR;
+    }
+    return NULL;
+}
+
+static bool get_pixel(const game_params *params, const bool *image,
+                      const int x, const int y)
+{
+    const bool *pixel;
+    pixel = get_coords(params, image, x, y);
+    if (pixel) {
+        return *pixel;
+    }
+    return 0;
+}
+
+static void populate_cell(const game_params *params, const bool *image,
+                          const int x, const int y, bool edge,
+                          struct desc_cell *desc)
+{
+    int clue = 0;
+    bool xEdge = false;
+    bool yEdge = false;
+    if (edge) {
+        if (x > 0) {
+            clue += get_pixel(params, image, x - 1, y);
+            if (y > 0) {
+                clue += get_pixel(params, image, x - 1, y - 1);
+            }
+            if (y < params->height - 1) {
+                clue += get_pixel(params, image, x - 1, y + 1);
+            }
+        } else {
+            xEdge = true;
+        }
+
+        if (y > 0) {
+            clue += get_pixel(params, image, x, y - 1);
+        } else {
+            yEdge = true;
+        }
+        if (x < params->width - 1) {
+            clue += get_pixel(params, image, x + 1, y);
+            if (y > 0) {
+                clue += get_pixel(params, image, x + 1, y - 1);
+            }
+            if (y < params->height - 1) {
+                clue += get_pixel(params, image, x + 1, y + 1);
+            }
+        } else {
+            xEdge = true;
+        }
+        if (y < params->height - 1) {
+            clue += get_pixel(params, image, x, y + 1);
+        } else {
+            yEdge = true;
+        }
+    } else {
+        clue += get_pixel(params, image, x - 1, y - 1);
+        clue += get_pixel(params, image, x - 1, y);
+        clue += get_pixel(params, image, x - 1, y + 1);
+        clue += get_pixel(params, image, x, y - 1);
+        clue += get_pixel(params, image, x, y + 1);
+        clue += get_pixel(params, image, x + 1, y - 1);
+        clue += get_pixel(params, image, x + 1, y);
+        clue += get_pixel(params, image, x + 1, y + 1);
+    }
+
+    desc->value = get_pixel(params, image, x, y);
+    clue += desc->value;
+    if (clue == 0) {
+        desc->empty = true;
+        desc->full = false;
+    } else {
+        desc->empty = false;
+        /* setting the default */
+        desc->full = false;
+        if (clue == 9) {
+            desc->full = true;
+        } else if (edge && ((xEdge && yEdge && clue == 4) ||
+                            ((xEdge || yEdge) && clue == 6))) {
+
+            desc->full = true;
+        }
+    }
+    desc->shown = true;
+    desc->clue = clue;
+}
+
+static void count_around(const game_params *params,
+                         struct solution_cell *sol, int x, int y,
+                         int *marked, int *blank, int *total)
+{
+    int i, j;
+    struct solution_cell *curr = NULL;
+    (*total) = 0;
+    (*blank) = 0;
+    (*marked) = 0;
+
+    for (i = -1; i < 2; i++) {
+        for (j = -1; j < 2; j++) {
+            curr = get_coords(params, sol, x + i, y + j);
+            if (curr) {
+                (*total)++;
+                if ((curr->cell & STATE_BLANK) != 0) {
+                    (*blank)++;
+                } else if ((curr->cell & STATE_MARKED) != 0) {
+                    (*marked)++;
+                }
+            }
+        }
+    }
+}
+
+static void count_around_state(const game_state *state, int x, int y,
+                               int *marked, int *blank, int *total)
+{
+    int i, j;
+    char *curr = NULL;
+    (*total) = 0;
+    (*blank) = 0;
+    (*marked) = 0;
+
+    for (i = -1; i < 2; i++) {
+        for (j = -1; j < 2; j++) {
+            curr = get_coords(state, state->cells_contents, x + i, y + j);
+            if (curr) {
+                (*total)++;
+                if ((*curr & STATE_BLANK) != 0) {
+                    (*blank)++;
+                } else if ((*curr & STATE_MARKED) != 0) {
+                    (*marked)++;
+                }
+            }
+        }
+    }
+}
+
+static void count_clues_around(const game_params *params,
+                               struct desc_cell *desc, int x, int y,
+                               int *clues, int *total)
+{
+    int i, j;
+    struct desc_cell *curr = NULL;
+    (*total) = 0;
+    (*clues) = 0;
+
+    for (i = -1; i < 2; i++) {
+        for (j = -1; j < 2; j++) {
+            curr = get_coords(params, desc, x + i, y + j);
+            if (curr) {
+                (*total)++;
+                if (curr->shown) {
+                    (*clues)++;
+                }
+            }
+        }
+    }
+}
+
+static void mark_around(const game_params *params,
+                        struct solution_cell *sol, int x, int y, int mark)
+{
+    int i, j;
+    struct solution_cell *curr;
+
+    for (i = -1; i < 2; i++) {
+        for (j = -1; j < 2; j++) {
+            curr = get_coords(params, sol, x + i, y + j);
+            if (curr) {
+                if (curr->cell == STATE_UNMARKED) {
+                    curr->cell = mark;
+                }
+            }
+        }
+    }
+}
+
+static char solve_cell(const game_params *params, struct desc_cell *desc,
+                       struct board_cell *board, struct solution_cell *sol,
+                       int x, int y)
+{
+    struct desc_cell curr;
+
+    if (desc) {
+        curr.shown = desc[(y * params->width) + x].shown;
+        curr.clue = desc[(y * params->width) + x].clue;
+        curr.full = desc[(y * params->width) + x].full;
+        curr.empty = desc[(y * params->width) + x].empty;
+    } else {
+        curr.shown = board[(y * params->width) + x].shown;
+        curr.clue = board[(y * params->width) + x].clue;
+        curr.full = false;
+        curr.empty = false;
+    }
+    int marked = 0, total = 0, blank = 0;
+
+    if (sol[(y * params->width) + x].solved) {
+        return 0;
+    }
+    count_around(params, sol, x, y, &marked, &blank, &total);
+    if (curr.full && curr.shown) {
+        sol[(y * params->width) + x].solved = true;
+        if (marked + blank < total) {
+            sol[(y * params->width) + x].needed = true;
+        }
+        mark_around(params, sol, x, y, STATE_MARKED);
+        return 1;
+    }
+    if (curr.empty && curr.shown) {
+        sol[(y * params->width) + x].solved = true;
+        if (marked + blank < total) {
+            sol[(y * params->width) + x].needed = true;
+        }
+        mark_around(params, sol, x, y, STATE_BLANK);
+        return 1;
+    }
+    if (curr.shown) {
+        if (!sol[(y * params->width) + x].solved) {
+            if (marked == curr.clue) {
+                sol[(y * params->width) + x].solved = true;
+                if (total != marked + blank) {
+                    sol[(y * params->width) + x].needed = true;
+                }
+                mark_around(params, sol, x, y, STATE_BLANK);
+            } else if (curr.clue == (total - blank)) {
+                sol[(y * params->width) + x].solved = true;
+                if (total != marked + blank) {
+                    sol[(y * params->width) + x].needed = true;
+                }
+                mark_around(params, sol, x, y, STATE_MARKED);
+            } else if (total == marked + blank) {
+                return -1;
+            } else {
+                return 0;
+            }
+            return 1;
+        }
+        return 0;
+    } else if (total == marked + blank) {
+        sol[(y * params->width) + x].solved = true;
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+static bool solve_check(const game_params *params, struct desc_cell *desc,
+                        random_state *rs, struct solution_cell **sol_return)
+{
+    int x, y, i;
+    int board_size = params->height * params->width;
+    struct solution_cell *sol = snewn(board_size, struct solution_cell),
+        *curr_sol;
+    bool made_progress = true, error = false;
+    int solved = 0, curr = 0, shown = 0;
+    needed_list_item *head = NULL, *curr_needed, **needed_array;
+    struct desc_cell *curr_desc;
+
+    memset(sol, 0, board_size * sizeof(*sol));
+    for (y = 0; y < params->height; y++) {
+        for (x = 0; x < params->width; x++) {
+            curr_desc = get_coords(params, desc, x, y);
+            if (curr_desc->shown) {
+                curr_needed = snew(needed_list_item);
+                curr_needed->next = head;
+                head = curr_needed;
+                curr_needed->x = x;
+                curr_needed->y = y;
+                shown++;
+            }
+        }
+    }
+    needed_array = snewn(shown, needed_list_item *);
+    curr_needed = head;
+    i = 0;
+    while (curr_needed) {
+        needed_array[i] = curr_needed;
+        curr_needed = curr_needed->next;
+        i++;
+    }
+    if (rs) {
+        shuffle(needed_array, shown, sizeof(*needed_array), rs);
+    }
+    solved = 0;
+    while (solved < shown && made_progress && !error) {
+        made_progress = false;
+        for (i = 0; i < shown; i++) {
+            curr = solve_cell(params, desc, NULL, sol, needed_array[i]->x,
+                              needed_array[i]->y);
+            if (curr < 0) {
+                error = true;
+#ifdef DEBUG_PRINTS
+                printf("error in cell x=%d, y=%d\n", needed_array[i]->x,
+                       needed_array[i]->y);
+#endif
+                break;
+            }
+            if (curr > 0) {
+                solved++;
+                made_progress = true;
+            }
+        }
+    }
+    while (head) {
+        curr_needed = head;
+        head = curr_needed->next;
+        sfree(curr_needed);
+    }
+    sfree(needed_array);
+    solved = 0;
+    /* verifying all the board is solved */
+    if (made_progress) {
+        for (y = 0; y < params->height; y++) {
+            for (x = 0; x < params->width; x++) {
+                curr_sol = get_coords(params, sol, x, y);
+                if ((curr_sol->cell & (STATE_MARKED | STATE_BLANK)) > 0) {
+                    solved++;
+                }
+            }
+        }
+    }
+    if (sol_return) {
+        *sol_return = sol;
+    } else {
+        sfree(sol);
+    }
+    return solved == board_size;
+}
+
+static bool solve_game_actual(const game_params *params,
+                              struct board_cell *desc,
+                              struct solution_cell **sol_return)
+{
+    int x, y;
+    int board_size = params->height * params->width;
+    struct solution_cell *sol = snewn(board_size, struct solution_cell);
+    bool made_progress = true, error = false;
+    int solved = 0, curr = 0;
+
+    memset(sol, 0, params->height * params->width * sizeof(*sol));
+    solved = 0;
+    while (solved < params->height * params->width && made_progress
+           && !error) {
+        for (y = 0; y < params->height; y++) {
+            for (x = 0; x < params->width; x++) {
+                curr = solve_cell(params, NULL, desc, sol, x, y);
+                if (curr < 0) {
+                    error = true;
+#ifdef DEBUG_PRINTS
+                    printf("error in cell x=%d, y=%d\n", x, y);
+#endif
+                    break;
+                }
+                if (curr > 0) {
+                    made_progress = true;
+                }
+                solved += curr;
+            }
+        }
+    }
+    if (sol_return) {
+        *sol_return = sol;
+    } else {
+        sfree(sol);
+    }
+    return solved == params->height * params->width;
+}
+
+static void hide_clues(const game_params *params, struct desc_cell *desc,
+                       random_state *rs)
+{
+    int shown, total, x, y, i;
+    int needed = 0;
+    struct desc_cell *curr;
+    struct solution_cell *sol = NULL, *curr_sol = NULL;
+    needed_list_item *head = NULL, *curr_needed, **needed_array;
+
+#ifdef DEBUG_PRINTS
+    printf("Hiding clues\n");
+#endif
+    solve_check(params, desc, rs, &sol);
+    for (y = 0; y < params->height; y++) {
+        for (x = 0; x < params->width; x++) {
+            count_clues_around(params, desc, x, y, &shown, &total);
+            curr = get_coords(params, desc, x, y);
+            curr_sol = get_coords(params, sol, x, y);
+            if (curr_sol->needed && params->aggressive) {
+                curr_needed = snew(needed_list_item);
+                curr_needed->x = x;
+                curr_needed->y = y;
+                curr_needed->next = head;
+                head = curr_needed;
+                needed++;
+            } else if (!curr_sol->needed) {
+                curr->shown = false;
+            }
+        }
+    }
+    if (params->aggressive) {
+        curr_needed = head;
+        needed_array = snewn(needed, needed_list_item *);
+        memset(needed_array, 0, needed * sizeof(*needed_array));
+        i = 0;
+        while (curr_needed) {
+            needed_array[i] = curr_needed;
+            curr_needed = curr_needed->next;
+            i++;
+        }
+        shuffle(needed_array, needed, sizeof(*needed_array), rs);
+        for (i = 0; i < needed; i++) {
+            curr_needed = needed_array[i];
+            curr =
+                get_coords(params, desc, curr_needed->x, curr_needed->y);
+            if (curr) {
+                curr->shown = false;
+                if (!solve_check(params, desc, NULL, NULL)) {
+#ifdef DEBUG_PRINTS
+                    printf("Hiding cell %d, %d not possible.\n",
+                           curr_needed->x, curr_needed->y);
+#endif
+                    curr->shown = true;
+                }
+                sfree(curr_needed);
+                needed_array[i] = NULL;
+            }
+            curr_needed = NULL;
+        }
+        sfree(needed_array);
+    }
+#ifdef DEBUG_PRINTS
+    printf("needed %d\n", needed);
+#endif
+    sfree(sol);
+}
+
+static bool start_point_check(size_t size, struct desc_cell *desc)
+{
+    int i;
+    for (i = 0; i < size; i++) {
+        if (desc[i].empty || desc[i].full) {
+            return true;
+        }
+    }
+    return false;
+}
+
+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)
+{
+    if (ui->cur_visible) {
+        *x = COORD_FROM_CELL(ui->cur_x);
+        *y = COORD_FROM_CELL(ui->cur_y);
+        *w = *h = ds->tilesize;
+    }
+}
+
+static void generate_image(const game_params *params, random_state *rs,
+                           bool *image)
+{
+    int x, y;
+    for (y = 0; y < params->height; y++) {
+        for (x = 0; x < params->width; x++) {
+            image[(y * params->width) + x] = random_bits(rs, 1);
+        }
+    }
+}
+
+static char *new_game_desc(const game_params *params, random_state *rs,
+                           char **aux, bool interactive)
+{
+    bool *image = snewn(params->height * params->width, bool);
+    bool valid = false;
+    char *desc_string = snewn((params->height * params->width) + 1, char);
+    char *compressed_desc =
+        snewn((params->height * params->width) + 1, char);
+    char space_count;
+
+    struct desc_cell *desc =
+        snewn(params->height * params->width, struct desc_cell);
+    int x, y, location_in_str;
+
+    while (!valid) {
+        generate_image(params, rs, image);
+#ifdef DEBUG_IMAGE
+        image[0] = 1;
+        image[1] = 1;
+        image[2] = 0;
+        image[3] = 1;
+        image[4] = 1;
+        image[5] = 0;
+        image[6] = 0;
+        image[7] = 0;
+        image[8] = 0;
+#endif
+
+        for (y = 0; y < params->height; y++) {
+            for (x = 0; x < params->width; x++) {
+                populate_cell(params, image, x, y,
+                              x * y == 0 || y == params->height - 1 ||
+                              x == params->width - 1,
+                              &desc[(y * params->width) + x]);
+            }
+        }
+        valid =
+            start_point_check((params->height - 1) * (params->width - 1),
+                              desc);
+        if (!valid) {
+#ifdef DEBUG_PRINTS
+            printf("Not valid, regenerating.\n");
+#endif
+        } else {
+            valid = solve_check(params, desc, rs, NULL);
+            if (!valid) {
+#ifdef DEBUG_PRINTS
+                printf("Couldn't solve, regenerating.");
+#endif
+            } else {
+                hide_clues(params, desc, rs);
+            }
+        }
+    }
+    location_in_str = 0;
+    for (y = 0; y < params->height; y++) {
+        for (x = 0; x < params->width; x++) {
+            if (desc[(y * params->width) + x].shown) {
+#ifdef DEBUG_PRINTS
+                printf("%d(%d)", desc[(y * params->width) + x].value,
+                       desc[(y * params->width) + x].clue);
+#endif
+                sprintf(desc_string + location_in_str, "%d",
+                        desc[(y * params->width) + x].clue);
+            } else {
+#ifdef DEBUG_PRINTS
+                printf("%d( )", desc[(y * params->width) + x].value);
+#endif
+                sprintf(desc_string + location_in_str, " ");
+            }
+            location_in_str += 1;
+        }
+#ifdef DEBUG_PRINTS
+        printf("\n");
+#endif
+    }
+    location_in_str = 0;
+    space_count = 'a' - 1;
+    for (y = 0; y < params->height; y++) {
+        for (x = 0; x < params->width; x++) {
+            if (desc[(y * params->width) + x].shown) {
+                if (space_count >= 'a') {
+                    sprintf(compressed_desc + location_in_str, "%c",
+                            space_count);
+                    location_in_str++;
+                    space_count = 'a' - 1;
+                }
+                sprintf(compressed_desc + location_in_str, "%d",
+                        desc[(y * params->width) + x].clue);
+                location_in_str++;
+            } else {
+                if (space_count <= 'z') {
+                    space_count++;
+                } else {
+                    sprintf(compressed_desc + location_in_str, "%c",
+                            space_count);
+                    location_in_str++;
+                    space_count = 'a' - 1;
+                }
+            }
+        }
+    }
+    if (space_count >= 'a') {
+        sprintf(compressed_desc + location_in_str, "%c", space_count);
+        location_in_str++;
+    }
+    compressed_desc[location_in_str] = '\0';
+#ifdef DEBUG_PRINTS
+    printf("compressed_desc: %s\n", compressed_desc);
+#endif
+    return compressed_desc;
+}
+
+static const char *validate_desc(const game_params *params,
+                                 const char *desc)
+{
+    int size_dest = params->height * params->width;
+    int length;
+    length = 0;
+
+    while (*desc != '\0') {
+        if (*desc >= 'a' && *desc <= 'z') {
+            length += *desc - 'a';
+        } else if (*desc < '0' || *desc > '9')
+            return "Invalid character in game description";
+        length++;
+        desc++;
+    }
+
+    if (length != size_dest) {
+        return "Desc size mismatch";
+    }
+    return NULL;
+}
+
+static game_state *new_game(midend *me, const game_params *params,
+                            const char *desc)
+{
+    game_state *state = snew(game_state);
+    char *curr_desc = dupstr(desc);
+    char *desc_base = curr_desc;
+    int dest_loc;
+    int spaces, total_spaces;
+
+    state->cheating = false;
+    state->not_completed_clues = 0;
+    dest_loc = 0;
+    state->height = params->height;
+    state->width = params->width;
+    state->cells_contents = snewn(params->height * params->width, char);
+    memset(state->cells_contents, 0, params->height * params->width);
+    state->board = snew(board_state);
+    state->board->references = 1;
+    state->board->actual_board =
+        snewn(params->height * params->width, struct board_cell);
+
+    while (*curr_desc != '\0') {
+        if (*curr_desc >= '0' && *curr_desc <= '9') {
+            state->board->actual_board[dest_loc].shown = true;
+            state->not_completed_clues++;
+            state->board->actual_board[dest_loc].clue = *curr_desc - '0';
+        } else {
+            if (*curr_desc != ' ') {
+                total_spaces = *curr_desc - 'a' + 1;
+            } else {
+                total_spaces = 1;
+            }
+            spaces = 0;
+            while (spaces < total_spaces) {
+                state->board->actual_board[dest_loc].shown = false;
+                state->board->actual_board[dest_loc].clue = -1;
+                spaces++;
+                if (spaces < total_spaces) {
+                    dest_loc++;
+                }
+            }
+        }
+        curr_desc++;
+        dest_loc++;
+    }
+
+    sfree(desc_base);
+    return state;
+}
+
+static game_state *dup_game(const game_state *state)
+{
+    game_state *ret = snew(game_state);
+
+    ret->cheating = state->cheating;
+    ret->not_completed_clues = state->not_completed_clues;
+    ret->width = state->width;
+    ret->height = state->height;
+    ret->cells_contents = snewn(state->height * state->width, char);
+    memcpy(ret->cells_contents, state->cells_contents,
+           state->height * state->width);
+    ret->board = state->board;
+    ret->board->references++;
+
+    return ret;
+}
+
+static void free_game(game_state *state)
+{
+    sfree(state->cells_contents);
+    state->cells_contents = NULL;
+    if (state->board->references <= 1) {
+        sfree(state->board->actual_board);
+        sfree(state->board);
+        state->board = NULL;
+    } else {
+        state->board->references--;
+    }
+    sfree(state);
+}
+
+static char *solve_game(const game_state *state,
+                        const game_state *currstate, const char *aux,
+                        const char **error)
+{
+    struct solution_cell *sol = NULL;
+    game_params param;
+    bool solved;
+    char *ret = NULL;
+    unsigned int curr_ret;
+    int i, bits, ret_loc = 1;
+    int size = state->width * state->height;
+
+    param.width = state->width;
+    param.height = state->height;
+    solved = solve_game_actual(&param, state->board->actual_board, &sol);
+    if (!solved) {
+        *error = dupstr("Could not solve this board");
+        sfree(sol);
+        return NULL;
+    }
+
+    ret = snewn((size / 4) + 3, char);
+
+    ret[0] = 's';
+    i = 0;
+    while (i < size) {
+        curr_ret = 0;
+        bits = 0;
+        while (bits < 8 && i < size) {
+            curr_ret <<= 1;
+            curr_ret |= sol[i].cell == STATE_MARKED;
+            i++;
+            bits++;
+        }
+        curr_ret <<= 8 - bits;
+        sprintf(ret + ret_loc, "%02x", curr_ret);
+        ret_loc += 2;
+    }
+
+    sfree(sol);
+    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)
+{
+    char *desc_string =
+        snewn((state->height * state->width) * 3 + 1, char);
+    int location_in_str = 0, x, y;
+    for (y = 0; y < state->height; y++) {
+        for (x = 0; x < state->width; x++) {
+            if (state->board->actual_board[(y * state->width) + x].shown) {
+                sprintf(desc_string + location_in_str, "|%d|",
+                        state->board->actual_board[(y * state->width) +
+                                                   x].clue);
+            } else {
+                sprintf(desc_string + location_in_str, "| |");
+            }
+            location_in_str += 3;
+        }
+        sprintf(desc_string + location_in_str, "\n");
+        location_in_str += 1;
+    }
+    return desc_string;
+}
+
+static game_ui *new_ui(const game_state *state)
+{
+    game_ui *ui = snew(game_ui);
+    ui->last_x = -1;
+    ui->last_y = -1;
+    ui->last_state = 0;
+    ui->solved = false;
+    ui->cur_x = ui->cur_y = 0;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+    return ui;
+}
+
+static void free_ui(game_ui *ui)
+{
+    sfree(ui);
+}
+
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
+{
+}
+
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    char *cell;
+
+    if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible || state->not_completed_clues == 0) return "";
+        cell = get_coords(state, state->cells_contents, ui->cur_x, ui->cur_y);
+        switch (*cell & STATE_OK_NUM) {
+          case STATE_UNMARKED:
+            return button == CURSOR_SELECT ? "Black" : "White";
+          case STATE_MARKED:
+            return button == CURSOR_SELECT ? "White" : "Empty";
+          case STATE_BLANK:
+            return button == CURSOR_SELECT ? "Empty" : "Black";
+        }
+    }
+    return "";
+}
+
+static char *interpret_move(const game_state *state, game_ui *ui,
+                            const game_drawstate *ds, int x, int y,
+                            int button)
+{
+    int srcX = ui->last_x, srcY = ui->last_y;
+    int offsetX, offsetY, gameX, gameY, i;
+    int dirX, dirY, diff;
+    char move_type;
+    char move_desc[80];
+    char *ret = NULL;
+    const char *cell_state;
+    bool changed = false;
+    if (state->not_completed_clues == 0 && !IS_CURSOR_MOVE(button)) {
+        return NULL;
+    }
+    offsetX = x - (ds->tilesize / 2);
+    offsetY = y - (ds->tilesize / 2);
+    gameX = offsetX / ds->tilesize;
+    gameY = offsetY / ds->tilesize;
+    if ((IS_MOUSE_DOWN(button) || IS_MOUSE_DRAG(button) || IS_MOUSE_RELEASE(button))
+        && ((offsetX < 0) || (offsetY < 0)))
+        return NULL;
+    if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
+        cell_state =
+            get_coords(state, state->cells_contents, gameX, gameY);
+        if (cell_state) {
+            ui->last_state = *cell_state & (STATE_BLANK | STATE_MARKED);
+            ui->last_state =
+                (ui->last_state +
+                 ((button ==
+                   RIGHT_BUTTON) ? 2 : 1)) % (STATE_BLANK | STATE_MARKED);
+        }
+        if (button == RIGHT_BUTTON) {
+            /* Right button toggles twice */
+            move_type = 'T';
+        } else {
+            move_type = 't';
+        }
+        if (gameX >= 0 && gameY >= 0 && gameX < state->width &&
+            gameY < state->height) {
+            sprintf(move_desc, "%c%d,%d", move_type, gameX, gameY);
+            ui->last_x = gameX;
+            ui->last_y = gameY;
+            ret = dupstr(move_desc);
+        } else {
+            ui->last_x = -1;
+            ui->last_y = -1;
+        }
+        changed = true;
+        ui->cur_visible = false;
+    } else if (button == LEFT_DRAG || button == RIGHT_DRAG) {
+        move_type = 'd';
+        /* allowing only drags in straight lines */
+        if (gameX >= 0 && gameY >= 0 && gameX < state->width &&
+            gameY < state->height && ui->last_x >= 0 && ui->last_y >= 0 &&
+            (gameY == ui->last_y || gameX == ui->last_x)) {
+            sprintf(move_desc, "%c%d,%d,%d,%d,%d", move_type, gameX, gameY,
+                    ui->last_x, ui->last_y, ui->last_state);
+            if (srcX == gameX && srcY != gameY) {
+                dirX = 0;
+                diff = srcY - gameY;
+                if (diff < 0) {
+                    dirY = -1;
+                    diff *= -1;
+                } else {
+                    dirY = 1;
+                }
+            } else {
+                diff = srcX - gameX;
+                dirY = 0;
+                if (diff < 0) {
+                    dirX = -1;
+                    diff *= -1;
+                } else {
+                    dirX = 1;
+                }
+            }
+            for (i = 0; i < diff; i++) {
+                cell_state = get_coords(state, state->cells_contents,
+                                        gameX + (dirX * i),
+                                        gameY + (dirY * i));
+                if (cell_state && (*cell_state & STATE_OK_NUM) == 0
+                    && ui->last_state > 0) {
+                    changed = true;
+                    break;
+                }
+            }
+            ui->last_x = gameX;
+            ui->last_y = gameY;
+            if (changed) {
+                ret = dupstr(move_desc);
+            }
+        } else {
+            ui->last_x = -1;
+            ui->last_y = -1;
+        }
+        ui->cur_visible = false;
+    } else if (button == LEFT_RELEASE || button == RIGHT_RELEASE) {
+        move_type = 'e';
+        if (gameX >= 0 && gameY >= 0 && gameX < state->width &&
+            gameY < state->height && ui->last_x >= 0 && ui->last_y >= 0 &&
+            (gameY == ui->last_y || gameX == ui->last_x)) {
+            sprintf(move_desc, "%c%d,%d,%d,%d,%d", move_type, gameX, gameY,
+                    ui->last_x, ui->last_y, ui->last_state);
+            if (srcX == gameX && srcY != gameY) {
+                dirX = 0;
+                diff = srcY - gameY;
+                if (diff < 0) {
+                    dirY = -1;
+                    diff *= -1;
+                } else {
+                    dirY = 1;
+                }
+            } else {
+                diff = srcX - gameX;
+                dirY = 0;
+                if (diff < 0) {
+                    dirX = -1;
+                    diff *= -1;
+                } else {
+                    dirX = 1;
+                }
+            }
+            for (i = 0; i < diff; i++) {
+                cell_state = get_coords(state, state->cells_contents,
+                                        gameX + (dirX * i),
+                                        gameY + (dirY * i));
+                if (cell_state && (*cell_state & STATE_OK_NUM) == 0
+                    && ui->last_state > 0) {
+                    changed = true;
+                    break;
+                }
+            }
+            if (changed) {
+                ret = dupstr(move_desc);
+            }
+        } else {
+            ui->last_x = -1;
+            ui->last_y = -1;
+        }
+        ui->cur_visible = false;
+    } else if (IS_CURSOR_MOVE(button)) {
+        return move_cursor(button, &ui->cur_x, &ui->cur_y, state->width,
+                    state->height, false, &ui->cur_visible);
+    } else if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible) {
+            ui->cur_x = 0;
+            ui->cur_y = 0;
+            ui->cur_visible = true;
+            return MOVE_UI_UPDATE;
+        }
+
+        if (button == CURSOR_SELECT2) {
+            sprintf(move_desc, "T%d,%d", ui->cur_x, ui->cur_y);
+            ret = dupstr(move_desc);
+        } else {
+            /* Otherwise, treat as LEFT_BUTTON, for a single square. */
+            sprintf(move_desc, "t%d,%d", ui->cur_x, ui->cur_y);
+            ret = dupstr(move_desc);
+        }
+    }
+    return ret;
+}
+
+static void update_board_state_around(game_state *state, int x, int y)
+{
+    int i, j;
+    struct board_cell *curr;
+    char *curr_state;
+    int total;
+    int blank;
+    int marked;
+
+    for (i = -1; i < 2; i++) {
+        for (j = -1; j < 2; j++) {
+            curr =
+                get_coords(state, state->board->actual_board, x + i,
+                           y + j);
+            if (curr && curr->shown) {
+                curr_state =
+                    get_coords(state, state->cells_contents, x + i, y + j);
+                count_around_state(state, x + i, y + j, &marked, &blank,
+                                   &total);
+                if (curr->clue == marked && (total - marked - blank) == 0) {
+                    *curr_state &= STATE_MARKED | STATE_BLANK;
+                    *curr_state |= STATE_SOLVED;
+                } else if (curr->clue < marked
+                           || curr->clue > (total - blank)) {
+                    *curr_state &= STATE_MARKED | STATE_BLANK;
+                    *curr_state |= STATE_ERROR;
+                } else {
+                    *curr_state &= STATE_MARKED | STATE_BLANK;
+                }
+            }
+        }
+    }
+}
+
+static game_state *execute_move(const game_state *state, const char *move)
+{
+    game_state *new_state = dup_game(state);
+    int i = 0, x = -1, y = -1, clues_left = 0;
+    int srcX = -1, srcY = -1, size = state->height * state->width;
+    const char *p;
+    char *cell, sol_char;
+    int steps = 1, bits, sol_location, dirX, dirY, diff,
+        last_state = STATE_UNMARKED;
+    unsigned int sol_value;
+    struct board_cell *curr_cell;
+    char move_type;
+    int nparams = 0, move_params[5];
+
+    p = move;
+    move_type = *p++;
+    switch (move_type) {
+      case 't':
+      case 'T':
+        nparams = 2;
+        break;
+      case 'd':
+      case 'e':
+        nparams = 5;
+        break;
+    }
+
+    for (i = 0; i < nparams; i++) {
+        move_params[i] = atoi(p);
+        while (*p && isdigit((unsigned char)*p)) p++;
+        if (i+1 < nparams) {
+            if (*p != ',') {
+                free_game(new_state);
+                return NULL;
+            }
+            p++;
+        }
+    }
+
+    if (move_type == 't' || move_type == 'T') {
+        if (move_type == 'T') {
+            steps++;
+        }
+        x = move_params[0];
+        y = move_params[1];
+        if (x == -1 || y == -1) {
+            return new_state;
+        }
+        cell = get_coords(new_state, new_state->cells_contents, x, y);
+        if (cell == NULL) {
+            free_game(new_state);
+            return NULL;
+        }
+        if (*cell >= STATE_OK_NUM) {
+            *cell &= STATE_OK_NUM;
+        }
+        *cell = (*cell + steps) % STATE_OK_NUM;
+        update_board_state_around(new_state, x, y);
+    } else if (move_type == 's') {
+        new_state->not_completed_clues = 0;
+        new_state->cheating = true;
+        sol_location = 0;
+        bits = 0;
+        i = 1;
+        while (i < strlen(move)) {
+            sol_value = 0;
+            while (bits < 8) {
+                sol_value <<= 4;
+                sol_char = move[i];
+                if (sol_char >= '0' && sol_char <= '9') {
+                    sol_value |= sol_char - '0';
+                } else {
+                    sol_value |= (sol_char - 'a') + 10;
+                }
+                bits += 4;
+                i++;
+            }
+            while (bits > 0 && sol_location < size) {
+                if (sol_value & 0x80) {
+                    new_state->cells_contents[sol_location] =
+                        STATE_MARKED_SOLVED;
+                } else {
+                    new_state->cells_contents[sol_location] =
+                        STATE_BLANK_SOLVED;
+                }
+                sol_value <<= 1;
+                bits--;
+                sol_location++;
+            }
+        }
+        return new_state;
+    } else if (move_type == 'd' || move_type == 'e') {
+        x = move_params[0];
+        y = move_params[1];
+        srcX = move_params[2];
+        srcY = move_params[3];
+        last_state = move_params[4];
+        if (srcX == x && srcY != y) {
+            dirX = 0;
+            diff = srcY - y;
+            if (diff < 0) {
+                dirY = -1;
+                diff *= -1;
+            } else {
+                dirY = 1;
+            }
+        } else {
+            diff = srcX - x;
+            dirY = 0;
+            if (diff < 0) {
+                dirX = -1;
+                diff *= -1;
+            } else {
+                dirX = 1;
+            }
+        }
+        for (i = 0; i < diff; i++) {
+            cell = get_coords(new_state, new_state->cells_contents,
+                              x + (dirX * i), y + (dirY * i));
+            if (cell == NULL) {
+                free_game(new_state);
+                return NULL;
+            }
+            if ((*cell & STATE_OK_NUM) == 0) {
+                *cell = last_state;
+                update_board_state_around(new_state, x + (dirX * i),
+                                          y + (dirY * i));
+            }
+        }
+    }
+    for (y = 0; y < state->height; y++) {
+        for (x = 0; x < state->width; x++) {
+            cell = get_coords(new_state, new_state->cells_contents, x, y);
+            curr_cell = get_coords(new_state, new_state->board->actual_board,
+                                   x, y);
+            if (curr_cell->shown && ((*cell & STATE_SOLVED) == 0)) {
+                clues_left++;
+            }
+        }
+    }
+    new_state->not_completed_clues = clues_left;
+    return new_state;
+}
+
+/* ----------------------------------------------------------------------
+ * Drawing routines.
+ */
+
+static void game_compute_size(const game_params *params, int tilesize,
+                              const game_ui *ui, int *x, int *y)
+{
+    *x = (params->width + 1) * tilesize;
+    *y = (params->height + 1) * tilesize;
+}
+
+static void game_set_size(drawing *dr, game_drawstate *ds,
+                          const game_params *params, int tilesize)
+{
+    ds->tilesize = tilesize;
+}
+
+#define COLOUR(ret, i, r, g, b)                                                \
+  ((ret[3 * (i) + 0] = (r)), (ret[3 * (i) + 1] = (g)), (ret[3 * (i) + 2] = (b)))
+
+static float *game_colours(frontend *fe, int *ncolours)
+{
+    float *ret = snewn(3 * NCOLOURS, float);
+
+    frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]);
+    COLOUR(ret, COL_GRID, 0.0F, 102 / 255.0F, 99 / 255.0F);
+    COLOUR(ret, COL_ERROR, 1.0F, 0.0F, 0.0F);
+    COLOUR(ret, COL_BLANK, 236 / 255.0F, 236 / 255.0F, 236 / 255.0F);
+    COLOUR(ret, COL_MARKED, 20 / 255.0F, 20 / 255.0F, 20 / 255.0F);
+    COLOUR(ret, COL_UNMARKED, 148 / 255.0F, 196 / 255.0F, 190 / 255.0F);
+    COLOUR(ret, COL_TEXT_SOLVED, 100 / 255.0F, 100 / 255.0F, 100 / 255.0F);
+    COLOUR(ret, COL_CURSOR, 255 / 255.0F, 200 / 255.0F, 200 / 255.0F);
+
+    *ncolours = NCOLOURS;
+    return ret;
+}
+
+/* Extra flags in game_drawstate entries, not in main game state */
+#define DRAWFLAG_CURSOR    0x100
+#define DRAWFLAG_CURSOR_U  0x200
+#define DRAWFLAG_CURSOR_L  0x400
+#define DRAWFLAG_CURSOR_UL 0x800
+#define DRAWFLAG_MARGIN_R  0x1000
+#define DRAWFLAG_MARGIN_D  0x2000
+
+static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
+{
+    struct game_drawstate *ds = snew(game_drawstate);
+    int i;
+
+    ds->tilesize = 0;
+    ds->state = NULL;
+    ds->state = snewn((state->width + 1) * (state->height + 1), int);
+    for (i = 0; i < (state->width + 1) * (state->height + 1); i++)
+        ds->state[i] = -1;
+
+    return ds;
+}
+
+static void game_free_drawstate(drawing *dr, game_drawstate *ds)
+{
+    sfree(ds->state);
+    sfree(ds);
+}
+
+static void draw_cell(drawing *dr, int cell, int ts, signed char clue_val,
+                      int x, int y)
+{
+    int startX = ((x * ts) + ts / 2) - 1, startY = ((y * ts) + ts / 2) - 1;
+    int color, text_color = COL_TEXT_DARK;
+
+    clip(dr, startX - 1, startY - 1, ts, ts);
+    if (!(cell & DRAWFLAG_MARGIN_R))
+        draw_rect(dr, startX - 1, startY - 1, ts, 1,
+                  (cell & (DRAWFLAG_CURSOR | DRAWFLAG_CURSOR_U) ?
+                   COL_CURSOR : COL_GRID));
+    if (!(cell & DRAWFLAG_MARGIN_D))
+        draw_rect(dr, startX - 1, startY - 1, 1, ts,
+                  (cell & (DRAWFLAG_CURSOR | DRAWFLAG_CURSOR_L) ?
+                   COL_CURSOR : COL_GRID));
+    if (cell & DRAWFLAG_CURSOR_UL)
+        draw_rect(dr, startX - 1, startY - 1, 1, 1, COL_CURSOR);
+
+    if (!(cell & (DRAWFLAG_MARGIN_R | DRAWFLAG_MARGIN_D))) {
+        if (cell & STATE_MARKED) {
+            color = COL_MARKED;
+            text_color = COL_TEXT_LIGHT;
+        } else if (cell & STATE_BLANK) {
+            text_color = COL_TEXT_DARK;
+            color = COL_BLANK;
+        } else {
+            text_color = COL_TEXT_DARK;
+            color = COL_UNMARKED;
+        }
+        if (cell & STATE_ERROR) {
+            text_color = COL_ERROR;
+        } else if (cell & STATE_SOLVED) {
+            text_color = COL_TEXT_SOLVED;
+        }
+
+        draw_rect(dr, startX, startY, ts - 1, ts - 1, color);
+        if (clue_val >= 0) {
+            char clue[80];
+            sprintf(clue, "%d", clue_val);
+            draw_text(dr, startX + ts / 2, startY + ts / 2, 1, ts * 3 / 5,
+                      ALIGN_VCENTRE | ALIGN_HCENTRE, text_color, clue);
+        }
+    }
+
+    unclip(dr);
+    draw_update(dr, startX - 1, startY - 1, ts, ts);
+}
+
+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 x, y;
+    char status[80];
+    signed char clue_val;
+    bool flashing = (flashtime > 0 && (flashtime <= FLASH_TIME / 3 ||
+                                       flashtime > 2*FLASH_TIME / 3));
+
+    for (y = 0; y <= state->height; y++) {
+        for (x = 0; x <= state->width; x++) {
+            bool inbounds = x < state->width && y < state->height;
+            int cell = (inbounds ?
+                        state->cells_contents[(y * state->width) + x] : 0);
+            if (x == state->width)
+                cell |= DRAWFLAG_MARGIN_R;
+            if (y == state->height)
+                cell |= DRAWFLAG_MARGIN_D;
+            if (flashing)
+                cell ^= (STATE_BLANK | STATE_MARKED);
+            if (ui->cur_visible) {
+                if (ui->cur_x == x && ui->cur_y == y)
+                    cell |= DRAWFLAG_CURSOR;
+                if (ui->cur_x == x-1 && ui->cur_y == y)
+                    cell |= DRAWFLAG_CURSOR_L;
+                if (ui->cur_x == x && ui->cur_y == y-1)
+                    cell |= DRAWFLAG_CURSOR_U;
+                if (ui->cur_x == x-1 && ui->cur_y == y-1)
+                    cell |= DRAWFLAG_CURSOR_UL;
+            }
+
+            if (inbounds &&
+                state->board->actual_board[(y * state->width) + x].shown) {
+                clue_val = state->board->actual_board[
+                    (y * state->width) + x].clue;
+            } else {
+                clue_val = -1;
+            }
+
+            if (ds->state[(y * (state->width+1)) + x] != cell) {
+                draw_cell(dr, cell, ds->tilesize, clue_val, x, y);
+                ds->state[(y * (state->width+1)) + x] = cell;
+            }
+        }
+    }
+    sprintf(status, "Clues left: %d", state->not_completed_clues);
+    if (state->not_completed_clues == 0 && !state->cheating) {
+        sprintf(status, "COMPLETED!");
+    } else if (state->not_completed_clues == 0 && state->cheating) {
+        sprintf(status, "Auto solved");
+    }
+    status_bar(dr, status);
+}
+
+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->cheating && oldstate->not_completed_clues > 0 &&
+        newstate->not_completed_clues == 0) {
+        return FLASH_TIME;
+    }
+    return 0.0F;
+}
+
+static int game_status(const game_state *state)
+{
+    if (state->not_completed_clues == 0)
+        return +1;
+    return 0;
+}
+
+#ifdef COMBINED
+#define thegame mosaic
+#endif
+
+const struct game thegame = {
+    "Mosaic", "games.mosaic", "mosaic",
+    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,
+    current_key_label,
+    interpret_move,
+    execute_move,
+    DEFAULT_TILE_SIZE, 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, NULL, NULL,          /* print_size, print */
+    true,                              /* wants_statusbar */
+    false, NULL,                       /* timing_state */
+    0,                                 /* flags */
+};
diff --git a/apps/plugins/puzzles/src/nestedvm.c b/apps/plugins/puzzles/src/nestedvm.c
deleted file mode 100644
index 947abe0fae..0000000000
--- a/apps/plugins/puzzles/src/nestedvm.c
+++ /dev/null
@@ -1,486 +0,0 @@
-/*
- * nestedvm.c: NestedVM front end for my puzzle collection.
- */
-
-#include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-
-#include <sys/time.h>
-
-#include "puzzles.h"
-
-extern void _pause();
-extern int _call_java(int cmd, int arg1, int arg2, int arg3);
-
-void fatal(const char *fmt, ...)
-{
-    va_list ap;
-    fprintf(stderr, "fatal error: ");
-    va_start(ap, fmt);
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-    fprintf(stderr, "\n");
-    exit(1);
-}
-
-struct frontend {
-    // TODO kill unneeded members!
-    midend *me;
-    bool timer_active;
-    struct timeval last_time;
-    config_item *cfg;
-    int cfg_which;
-    bool cfgret;
-    int ox, oy, w, h;
-};
-
-static frontend *_fe;
-
-void get_random_seed(void **randseed, int *randseedsize)
-{
-    struct timeval *tvp = snew(struct timeval);
-    gettimeofday(tvp, NULL);
-    *randseed = (void *)tvp;
-    *randseedsize = sizeof(struct timeval);
-}
-
-void frontend_default_colour(frontend *fe, float *output)
-{
-    output[0] = output[1]= output[2] = 0.8f;
-}
-
-void nestedvm_status_bar(void *handle, const char *text)
-{
-    _call_java(4,0,(int)text,0);
-}
-
-void nestedvm_start_draw(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(5, 0, fe->w, fe->h);
-    _call_java(4, 1, fe->ox, fe->oy);
-}
-
-void nestedvm_clip(void *handle, int x, int y, int w, int h)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(5, w, h, 0);
-    _call_java(4, 3, x + fe->ox, y + fe->oy);
-}
-
-void nestedvm_unclip(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(4, 4, fe->ox, fe->oy);
-}
-
-void nestedvm_draw_text(void *handle, int x, int y, int fonttype, int fontsize,
-                        int align, int colour, const char *text)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(5, x + fe->ox, y + fe->oy, 
-               (fonttype == FONT_FIXED ? 0x10 : 0x0) | align);
-    _call_java(7, fontsize, colour, (int)text);
-}
-
-void nestedvm_draw_rect(void *handle, int x, int y, int w, int h, int colour)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(5, w, h, colour);
-    _call_java(4, 5, x + fe->ox, y + fe->oy);
-}
-
-void nestedvm_draw_line(void *handle, int x1, int y1, int x2, int y2, 
-                        int colour)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(5, x2 + fe->ox, y2 + fe->oy, colour);
-    _call_java(4, 6, x1 + fe->ox, y1 + fe->oy);
-}
-
-void nestedvm_draw_poly(void *handle, int *coords, int npoints,
-                        int fillcolour, int outlinecolour)
-{
-    frontend *fe = (frontend *)handle;
-    int i;
-    _call_java(4, 7, npoints, 0);
-    for (i = 0; i < npoints; i++) {
-        _call_java(6, i, coords[i*2] + fe->ox, coords[i*2+1] + fe->oy);
-    }
-    _call_java(4, 8, outlinecolour, fillcolour);
-}
-
-void nestedvm_draw_circle(void *handle, int cx, int cy, int radius,
-                     int fillcolour, int outlinecolour)
-{
-    frontend *fe = (frontend *)handle;
-    _call_java(5, cx+fe->ox, cy+fe->oy, radius);
-    _call_java(4, 9, outlinecolour, fillcolour);
-}
-
-struct blitter {
-    int handle, w, h, x, y;
-};
-
-blitter *nestedvm_blitter_new(void *handle, int w, int h)
-{
-    blitter *bl = snew(blitter);
-    bl->handle = -1;
-    bl->w = w;
-    bl->h = h;
-    return bl;
-}
-
-void nestedvm_blitter_free(void *handle, blitter *bl)
-{
-    if (bl->handle != -1)
-        _call_java(4, 11, bl->handle, 0);
-    sfree(bl);
-}
-
-void nestedvm_blitter_save(void *handle, blitter *bl, int x, int y)
-{
-    frontend *fe = (frontend *)handle;    
-    if (bl->handle == -1)
-        bl->handle = _call_java(4,10,bl->w, bl->h);
-    bl->x = x;
-    bl->y = y;
-    _call_java(8, bl->handle, x + fe->ox, y + fe->oy);
-}
-
-void nestedvm_blitter_load(void *handle, blitter *bl, int x, int y)
-{
-    frontend *fe = (frontend *)handle;
-    assert(bl->handle != -1);
-    if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
-        x = bl->x;
-        y = bl->y;
-    }
-    _call_java(9, bl->handle, x + fe->ox, y + fe->oy);
-}
-
-void nestedvm_end_draw(void *handle)
-{
-    _call_java(4,2,0,0);
-}
-
-char *nestedvm_text_fallback(void *handle, const char *const *strings,
-                             int nstrings)
-{
-    /*
-     * We assume Java can cope with any UTF-8 likely to be emitted
-     * by a puzzle.
-     */
-    return dupstr(strings[0]);
-}
-
-const struct drawing_api nestedvm_drawing = {
-    nestedvm_draw_text,
-    nestedvm_draw_rect,
-    nestedvm_draw_line,
-    nestedvm_draw_poly,
-    nestedvm_draw_circle,
-    NULL, // draw_update,
-    nestedvm_clip,
-    nestedvm_unclip,
-    nestedvm_start_draw,
-    nestedvm_end_draw,
-    nestedvm_status_bar,
-    nestedvm_blitter_new,
-    nestedvm_blitter_free,
-    nestedvm_blitter_save,
-    nestedvm_blitter_load,
-    NULL, NULL, NULL, NULL, NULL, NULL, /* {begin,end}_{doc,page,puzzle} */
-    NULL, NULL,                        /* line_width, line_dotted */
-    nestedvm_text_fallback,
-};
-
-int jcallback_key_event(int x, int y, int keyval)
-{
-    frontend *fe = (frontend *)_fe;
-    if (fe->ox == -1)
-        return 1;
-    if (keyval >= 0 &&
-        !midend_process_key(fe->me, x - fe->ox, y - fe->oy, keyval))
-        return 42;
-    return 1;
-}
-
-int jcallback_resize(int width, int height)
-{
-    frontend *fe = (frontend *)_fe;
-    int x, y;
-    x = width;
-    y = height;
-    midend_size(fe->me, &x, &y, true);
-    fe->ox = (width - x) / 2;
-    fe->oy = (height - y) / 2;
-    fe->w = x;
-    fe->h = y;
-    midend_force_redraw(fe->me);
-    return 0;
-}
-
-int jcallback_timer_func()
-{
-    frontend *fe = (frontend *)_fe;
-    if (fe->timer_active) {
-        struct timeval now;
-        float elapsed;
-        gettimeofday(&now, NULL);
-        elapsed = ((now.tv_usec - fe->last_time.tv_usec) * 0.000001F +
-                   (now.tv_sec - fe->last_time.tv_sec));
-        midend_timer(fe->me, elapsed);  /* may clear timer_active */
-        fe->last_time = now;
-    }
-    return fe->timer_active;
-}
-
-void deactivate_timer(frontend *fe)
-{
-    if (fe->timer_active)
-        _call_java(4, 13, 0, 0);
-    fe->timer_active = false;
-}
-
-void activate_timer(frontend *fe)
-{
-    if (!fe->timer_active) {
-        _call_java(4, 12, 0, 0);
-        gettimeofday(&fe->last_time, NULL);
-    }
-    fe->timer_active = true;
-}
-
-void jcallback_config_ok()
-{
-    frontend *fe = (frontend *)_fe;
-    const char *err;
-
-    err = midend_set_config(fe->me, fe->cfg_which, fe->cfg);
-
-    if (err)
-        _call_java(2, (int) "Error", (int)err, 1);
-    else {
-        fe->cfgret = true;
-    }
-}
-
-void jcallback_config_set_string(int item_ptr, int char_ptr) {
-    config_item *i = (config_item *)item_ptr;
-    char* newval = (char*) char_ptr;
-    assert(i->type == C_STRING);
-    sfree(i->u.string.sval);
-    i->u.string.sval = dupstr(newval);
-    free(newval);
-}
-
-void jcallback_config_set_boolean(int item_ptr, int selected) {
-    config_item *i = (config_item *)item_ptr;
-    assert(i->type == C_BOOLEAN);
-    i->u.boolean.bval = selected != 0 ? true : false;
-}
-
-void jcallback_config_set_choice(int item_ptr, int selected) {
-    config_item *i = (config_item *)item_ptr;
-    assert(i->type == C_CHOICES);
-    i->u.choices.selected = selected;
-}
-
-static bool get_config(frontend *fe, int which)
-{
-    char *title;
-    config_item *i;
-    fe->cfg = midend_get_config(fe->me, which, &title);
-    fe->cfg_which = which;
-    fe->cfgret = false;
-    _call_java(10, (int)title, 0, 0);
-    for (i = fe->cfg; i->type != C_END; i++) {
-        _call_java(5, (int)i, i->type, (int)i->name);
-        switch (i->type) {
-          case C_STRING:
-            _call_java(11, (int)i->u.string.sval, 0, 0);
-            break;
-          case C_BOOLEAN:
-            _call_java(11, 0, i->u.boolean.bval, 0);
-            break;
-          case C_CHOICES:
-            _call_java(11, (int)i->u.choices.choicenames,
-                       i->u.choices.selected, 0);
-            break;
-        }
-    }
-    _call_java(12,0,0,0);
-    free_cfg(fe->cfg);
-    return fe->cfgret;
-}
-
-int jcallback_newgame_event(void)
-{
-    frontend *fe = (frontend *)_fe;
-    if (!midend_process_key(fe->me, 0, 0, UI_NEWGAME))
-        return 42;
-    return 0;
-}
-
-int jcallback_undo_event(void)
-{
-    frontend *fe = (frontend *)_fe;
-    if (!midend_process_key(fe->me, 0, 0, UI_UNDO))
-        return 42;
-    return 0;
-}
-
-int jcallback_redo_event(void)
-{
-    frontend *fe = (frontend *)_fe;
-    if (!midend_process_key(fe->me, 0, 0, UI_REDO))
-        return 42;
-    return 0;
-}
-
-int jcallback_quit_event(void)
-{
-    frontend *fe = (frontend *)_fe;
-    if (!midend_process_key(fe->me, 0, 0, UI_QUIT))
-        return 42;
-    return 0;
-}
-
-static void resize_fe(frontend *fe)
-{
-    int x, y;
-
-    x = INT_MAX;
-    y = INT_MAX;
-    midend_size(fe->me, &x, &y, false);
-    _call_java(3, x, y, 0);
-}
-
-int jcallback_preset_event(int ptr_game_params)
-{
-    frontend *fe = (frontend *)_fe;
-    game_params *params =
-        (game_params *)ptr_game_params;
-
-    midend_set_params(fe->me, params);
-    midend_new_game(fe->me);
-    resize_fe(fe);
-    _call_java(13, midend_which_preset(fe->me), 0, 0);
-    return 0;
-}
-
-int jcallback_solve_event()
-{
-    frontend *fe = (frontend *)_fe;
-    const char *msg;
-
-    msg = midend_solve(fe->me);
-
-    if (msg)
-        _call_java(2, (int) "Error", (int)msg, 1);
-    return 0;
-}
-
-int jcallback_restart_event()
-{
-    frontend *fe = (frontend *)_fe;
-
-    midend_restart_game(fe->me);
-    return 0;
-}
-
-int jcallback_config_event(int which)
-{
-    frontend *fe = (frontend *)_fe;
-    _call_java(13, midend_which_preset(fe->me), 0, 0);
-    if (!get_config(fe, which))
-        return 0;
-    midend_new_game(fe->me);
-    resize_fe(fe);
-    _call_java(13, midend_which_preset(fe->me), 0, 0);
-    return 0;
-}
-
-int jcallback_about_event()
-{
-    char titlebuf[256];
-    char textbuf[1024];
-
-    sprintf(titlebuf, "About %.200s", thegame.name);
-    sprintf(textbuf,
-            "%.200s\n\n"
-            "from Simon Tatham's Portable Puzzle Collection\n\n"
-            "%.500s", thegame.name, ver);
-    _call_java(2, (int)&titlebuf, (int)&textbuf, 0);
-    return 0;
-}
-
-void preset_menu_populate(struct preset_menu *menu, int menuid)
-{
-    int i;
-
-    for (i = 0; i < menu->n_entries; i++) {
-        struct preset_menu_entry *entry = &menu->entries[i];
-        if (entry->params) {
-            _call_java(5, (int)entry->params, 0, 0);
-            _call_java(1, (int)entry->title, menuid, entry->id);
-        } else {
-            _call_java(5, 0, 0, 0);
-            _call_java(1, (int)entry->title, menuid, entry->id);
-            preset_menu_populate(entry->submenu, entry->id);
-        }
-    }
-}
-
-int main(int argc, char **argv)
-{
-    int i, n;
-    float* colours;
-
-    _fe = snew(frontend);
-    _fe->timer_active = false;
-    _fe->me = midend_new(_fe, &thegame, &nestedvm_drawing, _fe);
-    if (argc > 1)
-        midend_game_id(_fe->me, argv[1]);   /* ignore failure */
-    midend_new_game(_fe->me);
-
-    {
-        struct preset_menu *menu;
-        int nids, topmenu;
-        menu = midend_get_presets(_fe->me, &nids);
-        topmenu = _call_java(1, 0, nids, 0);
-        preset_menu_populate(menu, topmenu);
-    }
-
-    colours = midend_colours(_fe->me, &n);
-    _fe->ox = -1;
-
-    _call_java(0, (int)thegame.name,
-               (thegame.can_configure ? 1 : 0) |
-               (midend_wants_statusbar(_fe->me) ? 2 : 0) |
-               (thegame.can_solve ? 4 : 0), n);    
-    for (i = 0; i < n; i++) {
-        _call_java(1024+ i,
-                   (int)(colours[i*3] * 0xFF),
-                   (int)(colours[i*3+1] * 0xFF),
-                   (int)(colours[i*3+2] * 0xFF));
-    }
-    resize_fe(_fe);
-
-    _call_java(13, midend_which_preset(_fe->me), 0, 0);
-
-    // Now pause the vm. The VM will be call()ed when
-    // an input event occurs.
-    _pause();
-
-    // shut down when the VM is resumed.
-    deactivate_timer(_fe);
-    midend_free(_fe->me);
-    return 0;
-}
diff --git a/apps/plugins/puzzles/src/net.R b/apps/plugins/puzzles/src/net.R
deleted file mode 100644
index 8e98216e03..0000000000
--- a/apps/plugins/puzzles/src/net.R
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- makefile -*-
-
-NET_EXTRA = tree234 dsf findloop
-
-net      : [X] GTK COMMON net NET_EXTRA net-icon|no-icon
-
-# The Windows Net shouldn't be called `net.exe' since Windows
-# already has a reasonably important utility program by that name!
-netgame  : [G] WINDOWS COMMON net NET_EXTRA net.res|noicon.res
-
-ALL += net[COMBINED] NET_EXTRA
-
-!begin am gtk
-GAMES += net
-!end
-
-!begin >list.c
-    A(net) \
-!end
-
-!begin >gamedesc.txt
-net:netgame.exe:Net:Network jigsaw puzzle:Rotate each tile to reassemble the network.
-!end
diff --git a/apps/plugins/puzzles/src/net.c b/apps/plugins/puzzles/src/net.c
index d3032b6fe2..3200253ef9 100644
--- a/apps/plugins/puzzles/src/net.c
+++ b/apps/plugins/puzzles/src/net.c
@@ -7,7 +7,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -249,10 +254,7 @@ static char *encode_params(const game_params *params, bool full)
     if (params->wrapping)
         ret[len++] = 'w';
     if (full && params->barrier_probability)
-    {
-        len += sprintf(ret+len, "b");
-        len += ftoa(ret + len, params->barrier_probability);
-    }
+        len += sprintf(ret+len, "b%g", params->barrier_probability);
     if (full && !params->unique)
         ret[len++] = 'a';
     assert(len < lenof(ret));
@@ -284,7 +286,7 @@ static config_item *game_configure(const game_params *params)
 
     ret[3].name = "Barrier probability";
     ret[3].type = C_STRING;
-    ftoa(buf, params->barrier_probability);
+    sprintf(buf, "%g", params->barrier_probability);
     ret[3].u.string.sval = dupstr(buf);
 
     ret[4].name = "Ensure unique solution";
@@ -316,6 +318,8 @@ static const char *validate_params(const game_params *params, bool full)
         return "Width and height must both be greater than zero";
     if (params->width <= 1 && params->height <= 1)
         return "At least one of width and height must be greater than one";
+    if (params->width > INT_MAX / params->height)
+        return "Width times height must not be unreasonably large";
     if (params->barrier_probability < 0)
         return "Barrier probability may not be negative";
     if (params->barrier_probability > 1)
@@ -458,7 +462,7 @@ static int net_solver(int w, int h, unsigned char *tiles,
     unsigned char *tilestate;
     unsigned char *edgestate;
     int *deadends;
-    int *equivalence;
+    DSF *equivalence;
     struct todo *todo;
     int i, j, x, y;
     int area;
@@ -543,7 +547,7 @@ static int net_solver(int w, int h, unsigned char *tiles,
      * classes) by finding the representative of each tile and
      * setting equivalence[one]=the_other.
      */
-    equivalence = snew_dsf(w * h);
+    equivalence = dsf_new(w * h);
 
     /*
      * On a non-wrapping grid, we instantly know that all the edges
@@ -828,7 +832,7 @@ static int net_solver(int w, int h, unsigned char *tiles,
     sfree(tilestate);
     sfree(edgestate);
     sfree(deadends);
-    sfree(equivalence);
+    dsf_free(equivalence);
 
     return j;
 }
@@ -1131,7 +1135,8 @@ static void perturb(int w, int h, unsigned char *tiles, bool wrapping,
 
 static int *compute_loops_inner(int w, int h, bool wrapping,
                                 const unsigned char *tiles,
-                                const unsigned char *barriers);
+                                const unsigned char *barriers,
+                                bool include_unlocked_squares);
 
 static char *new_game_desc(const game_params *params, random_state *rs,
                            char **aux, bool interactive)
@@ -1460,7 +1465,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
          */
         prev_loopsquares = w*h+1;
         while (1) {
-            loops = compute_loops_inner(w, h, params->wrapping, tiles, NULL);
+            loops = compute_loops_inner(w, h, params->wrapping, tiles, NULL,
+                                        true);
             this_loopsquares = 0;
             for (i = 0; i < w*h; i++) {
                 if (loops[i]) {
@@ -1848,16 +1854,6 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     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 NULL;
-}
-
 /* ----------------------------------------------------------------------
  * Utility routine.
  */
@@ -1878,6 +1874,8 @@ static unsigned char *compute_active(const game_state *state, int cx, int cy)
     active = snewn(state->width * state->height, unsigned char);
     memset(active, 0, state->width * state->height);
 
+    assert(0 <= cx && cx < state->width);
+    assert(0 <= cy && cy < state->height);
     /*
      * We only store (x,y) pairs in todo, but it's easier to reuse
      * xyd_cmp and just store direction 0 every time.
@@ -1923,6 +1921,7 @@ struct net_neighbour_ctx {
     int w, h;
     const unsigned char *tiles, *barriers;
     int i, n, neighbours[4];
+    bool include_unlocked_squares;
 };
 static int net_neighbour(int vertex, void *vctx)
 {
@@ -1943,6 +1942,9 @@ static int net_neighbour(int vertex, void *vctx)
                 continue;
             OFFSETWH(x1, y1, x, y, dir, ctx->w, ctx->h);
             v1 = y1 * ctx->w + x1;
+            if (!ctx->include_unlocked_squares &&
+                !(tile & ctx->tiles[v1] & LOCKED))
+                continue;
             if (ctx->tiles[v1] & F(dir))
                 ctx->neighbours[ctx->n++] = v1;
         }
@@ -1956,32 +1958,39 @@ static int net_neighbour(int vertex, void *vctx)
 
 static int *compute_loops_inner(int w, int h, bool wrapping,
                                 const unsigned char *tiles,
-                                const unsigned char *barriers)
+                                const unsigned char *barriers,
+                                bool include_unlocked_squares)
 {
     struct net_neighbour_ctx ctx;
     struct findloopstate *fls;
     int *loops;
-    int x, y;
+    int x, y, v;
 
     fls = findloop_new_state(w*h);
     ctx.w = w;
     ctx.h = h;
     ctx.tiles = tiles;
     ctx.barriers = barriers;
+    ctx.include_unlocked_squares = include_unlocked_squares;
     findloop_run(fls, w*h, net_neighbour, &ctx);
 
     loops = snewn(w*h, int);
 
     for (y = 0; y < h; y++) {
         for (x = 0; x < w; x++) {
-            int x1, y1, dir;
+            int x1, y1, v1, dir;
             int flags = 0;
 
+            v = y * w + x;
             for (dir = 1; dir < 0x10; dir <<= 1) {
-                if ((tiles[y*w+x] & dir) &&
+                if ((tiles[v] & dir) &&
                     !(barriers && (barriers[y*w+x] & dir))) {
                     OFFSETWH(x1, y1, x, y, dir, w, h);
-                    if ((tiles[y1*w+x1] & F(dir)) &&
+                    v1 = y1 * w + x1;
+                    if (!include_unlocked_squares &&
+                        !(tiles[v] & tiles[v1] & LOCKED))
+                        continue;
+                    if ((tiles[v1] & F(dir)) &&
                         findloop_is_loop_edge(fls, y*w+x, y1*w+x1))
                         flags |= ERR(dir);
                 }
@@ -1994,10 +2003,12 @@ static int *compute_loops_inner(int w, int h, bool wrapping,
     return loops;
 }
 
-static int *compute_loops(const game_state *state)
+static int *compute_loops(const game_state *state,
+                          bool include_unlocked_squares)
 {
     return compute_loops_inner(state->width, state->height, state->wrapping,
-                               state->tiles, state->imm->barriers);
+                               state->tiles, state->imm->barriers,
+                               include_unlocked_squares);
 }
 
 struct game_ui {
@@ -2010,6 +2021,8 @@ struct game_ui {
     int dragtilex, dragtiley, dragstartx, dragstarty;
     bool dragged;
 #endif
+
+    bool unlocked_loops;
 };
 
 static game_ui *new_ui(const game_state *state)
@@ -2017,20 +2030,31 @@ static game_ui *new_ui(const game_state *state)
     void *seed;
     int seedsize;
     game_ui *ui = snew(game_ui);
-    ui->org_x = ui->org_y = 0;
-    ui->cur_x = ui->cx = state->width / 2;
-    ui->cur_y = ui->cy = state->height / 2;
-    ui->cur_visible = false;
-    get_random_seed(&seed, &seedsize);
-    ui->rs = random_new(seed, seedsize);
-    sfree(seed);
+
+    ui->unlocked_loops = true;
+
+    if (state) {
+        ui->org_x = ui->org_y = 0;
+        ui->cur_x = ui->cx = state->width / 2;
+        ui->cur_y = ui->cy = state->height / 2;
+        ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+        get_random_seed(&seed, &seedsize);
+        ui->rs = random_new(seed, seedsize);
+        sfree(seed);
+#ifdef USE_DRAGGING
+        ui->dragstartx = ui->dragstarty = ui->dragtilex = ui->dragtiley = -1;
+#endif
+    } else {
+        ui->rs = NULL;
+    }
 
     return ui;
 }
 
 static void free_ui(game_ui *ui)
 {
-    random_free(ui->rs);
+    if (ui->rs)
+        random_free(ui->rs);
     sfree(ui);
 }
 
@@ -2045,10 +2069,45 @@ static char *encode_ui(const game_ui *ui)
     return dupstr(buf);
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void decode_ui(game_ui *ui, const char *encoding,
+                      const game_state *state)
 {
-    sscanf(encoding, "O%d,%d;C%d,%d",
-           &ui->org_x, &ui->org_y, &ui->cx, &ui->cy);
+    int org_x, org_y, cx, cy;
+
+    if (sscanf(encoding, "O%d,%d;C%d,%d", &org_x, &org_y, &cx, &cy) == 4) {
+        if (0 <= org_x && org_x < state->width &&
+            0 <= org_y && org_y < state->height) {
+            ui->org_x = org_x;
+            ui->org_y = org_y;
+        }
+        if (0 <= cx && cx < state->width &&
+            0 <= cy && cy < state->height) {
+            ui->cx = cx;
+            ui->cy = cy;
+        }
+    }
+}
+
+static config_item *get_prefs(game_ui *ui)
+{
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Highlight loops involving unlocked squares";
+    ret[0].kw = "unlocked-loops";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->unlocked_loops;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
+}
+
+static void set_prefs(game_ui *ui, const config_item *cfg)
+{
+    ui->unlocked_loops = cfg[0].u.boolean.bval;
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -2056,8 +2115,19 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 {
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (tile(state, ui->cur_x, ui->cur_y) & LOCKED) {
+        if (button == CURSOR_SELECT2) return "Unlock";
+    } else {
+        if (button == CURSOR_SELECT) return "Rotate";
+        if (button == CURSOR_SELECT2) return "Lock";
+    }
+    return "";
+}
+
 struct game_drawstate {
-    bool started;
     int width, height;
     int tilesize;
     unsigned long *visible, *to_draw;
@@ -2078,7 +2148,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         MOVE_ORIGIN, MOVE_SOURCE, MOVE_ORIGIN_AND_SOURCE, MOVE_CURSOR
     } action;
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
     nullret = NULL;
     action = NONE;
 
@@ -2094,7 +2164,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (ui->cur_visible) {
             ui->cur_visible = false;
-            nullret = UI_UPDATE;
+            nullret = MOVE_UI_UPDATE;
         }
 
         /*
@@ -2102,12 +2172,22 @@ static char *interpret_move(const game_state *state, game_ui *ui,
          */
         x -= WINDOW_OFFSET + LINE_THICK;
         y -= WINDOW_OFFSET + LINE_THICK;
-        if (x < 0 || y < 0)
-            return nullret;
         tx = x / TILE_SIZE;
         ty = y / TILE_SIZE;
-        if (tx >= state->width || ty >= state->height)
+        if (x < 0 || y < 0 || tx >= state->width || ty >= state->height) {
+#ifdef USE_DRAGGING
+            if (IS_MOUSE_DOWN(button)) {
+                ui->dragstartx = ui->dragstarty = ui->dragtilex = ui->dragtiley = -1;
+                return nullret;
+            }
+            /*
+             * else: Despite the mouse moving off the grid, let drags and releases
+             * continue to manipulate the tile they started from.
+             */
+#else
             return nullret;
+#endif
+        }
         /* Transform from physical to game coords */
         tx = (tx + ui->org_x) % state->width;
         ty = (ty + ui->org_y) % state->height;
@@ -2145,6 +2225,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                    || button == RIGHT_DRAG
 #endif
                   ) {
+            if (ui->dragtilex < 0)
+                return nullret;
+
             /*
              * Find the new drag point and see if it necessitates a
              * rotation.
@@ -2198,7 +2281,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                    || button == RIGHT_RELEASE
 #endif
                   ) {
-            if (!ui->dragged) {
+            if (!ui->dragged && ui->dragtilex >= 0) {
                 /*
                  * There was a click but no perceptible drag:
                  * revert to single-click behaviour.
@@ -2334,7 +2417,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             OFFSET(ui->cur_x, ui->cur_y, ui->cur_x, ui->cur_y, dir, state);
             ui->cur_visible = true;
         }
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else {
         return NULL;
     }
@@ -2444,7 +2527,6 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     game_drawstate *ds = snew(game_drawstate);
     int i, ncells;
 
-    ds->started = false;
     ds->width = state->width;
     ds->height = state->height;
     ncells = (state->width+2) * (state->height+2);
@@ -2464,11 +2546,12 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
 static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 {
     sfree(ds->visible);
+    sfree(ds->to_draw);
     sfree(ds);
 }
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2605,8 +2688,8 @@ static void draw_wires(drawing *dr, int cx, int cy, int radius,
 
     for (i = 0; i < npoints; i++) {
         rotated_coords(&xf, &yf, matrix, cx, cy, fpoints[2*i], fpoints[2*i+1]);
-        points[2*i] = 0.5 + xf;
-        points[2*i+1] = 0.5 + yf;
+        points[2*i] = 0.5F + xf;
+        points[2*i+1] = 0.5F + yf;
     }
 
     draw_polygon(dr, points, npoints, colour, colour);
@@ -2746,8 +2829,8 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y,
      * rotated by an arbitrary angle about that centre point.
      */
     if (tile & TILE_ROTATING) {
-        matrix[0] = (float)cos(angle * PI / 180.0);
-        matrix[2] = (float)sin(angle * PI / 180.0);
+        matrix[0] = (float)cos(angle * (float)PI / 180.0F);
+        matrix[2] = (float)sin(angle * (float)PI / 180.0F);
     } else {
         matrix[0] = 1.0F;
         matrix[2] = 0.0F;
@@ -2786,8 +2869,8 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int x, int y,
                 float x, y;
                 rotated_coords(&x, &y, matrix, cx, cy,
                                boxr * points[i], boxr * points[i+1]);
-                points[i] = x + 0.5;
-                points[i+1] = y + 0.5;
+                points[i] = x + 0.5F;
+                points[i+1] = y + 0.5F;
             }
 
             draw_polygon(dr, points, 4, col, COL_WIRE);
@@ -2841,23 +2924,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int *loops;
     float angle = 0.0;
 
-    /*
-     * Clear the screen on our first call.
-     */
-    if (!ds->started) {
-        int w, h;
-        game_params params;
-
-        ds->started = true;
-
-        params.width = ds->width;
-        params.height = ds->height;
-        game_compute_size(&params, TILE_SIZE, &w, &h);
-
-        draw_rect(dr, 0, 0, w, h, COL_BACKGROUND);
-        draw_update(dr, 0, 0, w, h);
-    }
-
     tx = ty = -1;
     last_rotate_dir = dir==-1 ? oldstate->last_rotate_dir :
                                 state->last_rotate_dir;
@@ -2888,7 +2954,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
      * of barriers.
      */
     active = compute_active(state, ui->cx, ui->cy);
-    loops = compute_loops(state);
+    loops = compute_loops(state, ui->unlocked_loops);
 
     for (dy = -1; dy < ds->height+1; dy++) {
         for (dx = -1; dx < ds->width+1; dx++) {
@@ -3109,19 +3175,15 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 8mm squares by default.
      */
-    game_compute_size(params, 800, &pw, &ph);
+    game_compute_size(params, 800, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
@@ -3172,7 +3234,8 @@ static void draw_diagram(drawing *dr, game_drawstate *ds, int x, int y,
     }
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->width, h = state->height;
     int ink = print_mono_colour(dr, 0);
@@ -3269,13 +3332,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
     encode_ui,
     decode_ui,
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -3289,6 +3354,6 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
diff --git a/apps/plugins/puzzles/src/netslide.R b/apps/plugins/puzzles/src/netslide.R
deleted file mode 100644
index ecfe7c3df8..0000000000
--- a/apps/plugins/puzzles/src/netslide.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-NETSLIDE_EXTRA = tree234
-
-netslide : [X] GTK COMMON netslide NETSLIDE_EXTRA netslide-icon|no-icon
-
-netslide : [G] WINDOWS COMMON netslide NETSLIDE_EXTRA netslide.res|noicon.res
-
-ALL += netslide[COMBINED] NETSLIDE_EXTRA
-
-!begin am gtk
-GAMES += netslide
-!end
-
-!begin >list.c
-    A(netslide) \
-!end
-
-!begin >gamedesc.txt
-netslide:netslide.exe:Netslide:Toroidal sliding network puzzle:Slide a row at a time to reassemble the network.
-!end
diff --git a/apps/plugins/puzzles/src/netslide.c b/apps/plugins/puzzles/src/netslide.c
index 14af2a689d..4e6e82b39f 100644
--- a/apps/plugins/puzzles/src/netslide.c
+++ b/apps/plugins/puzzles/src/netslide.c
@@ -8,7 +8,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -242,10 +247,7 @@ static char *encode_params(const game_params *params, bool full)
     if (params->wrapping)
         ret[len++] = 'w';
     if (full && params->barrier_probability)
-    {
-        len += sprintf(ret+len, "b");
-        len += ftoa(ret + len, params->barrier_probability);
-    }
+        len += sprintf(ret+len, "b%g", params->barrier_probability);
     /* Shuffle limit is part of the limited parameters, because we have to
      * provide the target move count. */
     if (params->movetarget)
@@ -279,7 +281,7 @@ static config_item *game_configure(const game_params *params)
 
     ret[3].name = "Barrier probability";
     ret[3].type = C_STRING;
-    ftoa(buf, params->barrier_probability);
+    sprintf(buf, "%g", params->barrier_probability);
     ret[3].u.string.sval = dupstr(buf);
 
     ret[4].name = "Number of shuffling moves";
@@ -310,6 +312,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->width <= 1 || params->height <= 1)
         return "Width and height must both be greater than one";
+    if (params->width > INT_MAX / params->height)
+        return "Width times height must not be unreasonably large";
     if (params->barrier_probability < 0)
         return "Barrier probability may not be negative";
     if (params->barrier_probability > 1)
@@ -895,16 +899,6 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     return dupstr(aux);
 }
 
-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;
-}
-
 /* ----------------------------------------------------------------------
  * Utility routine.
  */
@@ -981,7 +975,7 @@ static game_ui *new_ui(const game_state *state)
     game_ui *ui = snew(game_ui);
     ui->cur_x = 0;
     ui->cur_y = -1;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     return ui;
 }
@@ -991,15 +985,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 /* ----------------------------------------------------------------------
  * Process a move.
  */
@@ -1009,7 +994,9 @@ static void slide_row_int(int w, int h, unsigned char *tiles, int dir, int row)
     int x = dir > 0 ? -1 : w;
     int tx = x + dir;
     int n = w - 1;
-    unsigned char endtile = tiles[row * w + tx];
+    unsigned char endtile;
+    assert(0 <= tx && tx < w);
+    endtile = tiles[row * w + tx];
     do {
         x = tx;
         tx = (x + dir + w) % w;
@@ -1023,7 +1010,9 @@ static void slide_col_int(int w, int h, unsigned char *tiles, int dir, int col)
     int y = dir > 0 ? -1 : h;
     int ty = y + dir;
     int n = h - 1;
-    unsigned char endtile = tiles[ty * w + col];
+    unsigned char endtile;
+    assert(0 <= ty && ty < h);
+    endtile = tiles[ty * w + col];
     do {
         y = ty;
         ty = (y + dir + h) % h;
@@ -1055,6 +1044,14 @@ struct game_drawstate {
     int cur_x, cur_y;
 };
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible)
+        return "Slide";
+    return "";
+}
+
 static char *interpret_move(const game_state *state, game_ui *ui,
                             const game_drawstate *ds,
                             int x, int y, int button)
@@ -1063,7 +1060,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int dx, dy;
     char buf[80];
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (IS_CURSOR_MOVE(button)) {
         int cpos, diff = 0;
@@ -1078,7 +1075,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
 
         ui->cur_visible = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
@@ -1092,7 +1089,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         } else {
             /* 'click' when cursor is invisible just makes cursor visible. */
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else
         return NULL;
@@ -1136,7 +1133,9 @@ static game_state *execute_move(const game_state *from, const char *move)
 
     if ((move[0] == 'C' || move[0] == 'R') &&
         sscanf(move+1, "%d,%d", &c, &d) == 2 &&
-        c >= 0 && c < (move[0] == 'C' ? from->width : from->height)) {
+        c >= 0 && c < (move[0] == 'C' ? from->width : from->height) &&
+        d <= (move[0] == 'C' ? from->height : from->width) &&
+        d >= -(move[0] == 'C' ? from->height : from->width) && d != 0) {
         col = (move[0] == 'C');
     } else if (move[0] == 'S' &&
                strlen(move) == from->width * from->height + 1) {
@@ -1226,7 +1225,7 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 }
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1490,7 +1489,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, const game_state *state,
         vx = (dy ? 1 : 0);
         vy = (dx ? 1 : 0);
 
-        if (xshift == 0.0 && yshift == 0.0 && (tile & dir)) {
+        if (xshift == 0.0F && yshift == 0.0F && (tile & dir)) {
             /*
              * If we are fully connected to the other tile, we must
              * draw right across the tile border. (We can use our
@@ -1594,22 +1593,13 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int cur_x = -1, cur_y = -1;
 
     /*
-     * Clear the screen and draw the exterior barrier lines if this
-     * is our first call.
+     * Draw the exterior barrier lines if this is our first call.
      */
     if (!ds->started) {
         int phase;
 
         ds->started = true;
 
-        draw_rect(dr, 0, 0, 
-                  BORDER * 2 + WINDOW_OFFSET * 2 + TILE_SIZE * state->width + TILE_BORDER,
-                  BORDER * 2 + WINDOW_OFFSET * 2 + TILE_SIZE * state->height + TILE_BORDER,
-                  COL_BACKGROUND);
-        draw_update(dr, 0, 0, 
-                    BORDER * 2 + WINDOW_OFFSET*2 + TILE_SIZE*state->width + TILE_BORDER,
-                    BORDER * 2 + WINDOW_OFFSET*2 + TILE_SIZE*state->height + TILE_BORDER);
-
         for (phase = 0; phase < 2; phase++) {
 
             for (x = 0; x < ds->width; x++) {
@@ -1703,7 +1693,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     /*
      * Draw any tile which differs from the way it was last drawn.
      */
-    if (xshift != 0.0 || yshift != 0.0) {
+    if (xshift != 0.0F || yshift != 0.0F) {
         active = compute_active(state,
                                 state->last_move_row, state->last_move_col);
     } else {
@@ -1849,19 +1839,6 @@ 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 false;
-}
-
-static void game_print_size(const game_params *params, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame netslide
 #endif
@@ -1882,13 +1859,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    NULL, NULL, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1900,9 +1879,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/no-icon.c b/apps/plugins/puzzles/src/no-icon.c
deleted file mode 100644
index 114b2c57c7..0000000000
--- a/apps/plugins/puzzles/src/no-icon.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-/*
- * Dummy source file which replaces the files generated in the
- * `icons' subdirectory, when they're absent.
- */
-
-const char *const *const xpm_icons[] = { 0 };
-const int n_xpm_icons = 0;
diff --git a/apps/plugins/puzzles/src/nullfe.c b/apps/plugins/puzzles/src/nullfe.c
deleted file mode 100644
index 7cba4e0c23..0000000000
--- a/apps/plugins/puzzles/src/nullfe.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * nullfe.c: Null front-end code containing a bunch of boring stub
- * functions. Used to ensure successful linking when building the
- * various stand-alone solver binaries.
- */
-
-#include <stdarg.h>
-
-#include "puzzles.h"
-
-void frontend_default_colour(frontend *fe, float *output) {}
-void draw_text(drawing *dr, int x, int y, int fonttype, int fontsize,
-               int align, int colour, const char *text) {}
-void draw_rect(drawing *dr, int x, int y, int w, int h, int colour) {}
-void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour) {}
-void draw_thick_line(drawing *dr, float thickness,
-                     float x1, float y1, float x2, float y2, int colour) {}
-void draw_polygon(drawing *dr, int *coords, int npoints,
-                  int fillcolour, int outlinecolour) {}
-void draw_circle(drawing *dr, int cx, int cy, int radius,
-                 int fillcolour, int outlinecolour) {}
-char *text_fallback(drawing *dr, const char *const *strings, int nstrings)
-{ return dupstr(strings[0]); }
-void clip(drawing *dr, int x, int y, int w, int h) {}
-void unclip(drawing *dr) {}
-void start_draw(drawing *dr) {}
-void draw_update(drawing *dr, int x, int y, int w, int h) {}
-void end_draw(drawing *dr) {}
-blitter *blitter_new(drawing *dr, int w, int h) {return NULL;}
-void blitter_free(drawing *dr, blitter *bl) {}
-void blitter_save(drawing *dr, blitter *bl, int x, int y) {}
-void blitter_load(drawing *dr, blitter *bl, int x, int y) {}
-int print_mono_colour(drawing *dr, int grey) { return 0; }
-int print_grey_colour(drawing *dr, float grey) { return 0; }
-int print_hatched_colour(drawing *dr, int hatch) { return 0; }
-int print_rgb_mono_colour(drawing *dr, float r, float g, float b, int grey)
-{ return 0; }
-int print_rgb_grey_colour(drawing *dr, float r, float g, float b, float grey)
-{ return 0; }
-int print_rgb_hatched_colour(drawing *dr, float r, float g, float b, int hatch)
-{ return 0; }
-void print_line_width(drawing *dr, int width) {}
-void print_line_dotted(drawing *dr, bool dotted) {}
-void midend_supersede_game_desc(midend *me, const char *desc,
-                                const char *privdesc) {}
-void status_bar(drawing *dr, const char *text) {}
-struct preset_menu *preset_menu_new(void) {return NULL;}
-struct preset_menu *preset_menu_add_submenu(struct preset_menu *parent,
-                                            char *title) {return NULL;}
-void preset_menu_add_preset(struct preset_menu *parent,
-                            char *title, game_params *params) {}
-
-void fatal(const char *fmt, ...)
-{
-    va_list ap;
-
-    fprintf(stderr, "fatal error: ");
-
-    va_start(ap, fmt);
-    vfprintf(stderr, fmt, ap);
-    va_end(ap);
-
-    fprintf(stderr, "\n");
-    exit(1);
-}
-
-#ifdef DEBUGGING
-void debug_printf(const char *fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-    vfprintf(stdout, fmt, ap);
-    va_end(ap);
-}
-#endif
diff --git a/apps/plugins/puzzles/src/nullgame.R b/apps/plugins/puzzles/src/nullgame.R
deleted file mode 100644
index 41bdb85d57..0000000000
--- a/apps/plugins/puzzles/src/nullgame.R
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- makefile -*-
-
-# The `nullgame' source file is a largely blank one, which contains
-# all the correct function definitions to compile and link, but
-# which defines the null game in which nothing is ever drawn and
-# there are no valid moves. Its main purpose is to act as a
-# template for writing new game definition source files. I include
-# it in the Makefile because it will be worse than useless if it
-# ever fails to compile, so it's important that it should actually
-# be built on a regular basis.
-nullgame : [X] GTK COMMON nullgame nullgame-icon|no-icon
-nullgame : [G] WINDOWS COMMON nullgame nullgame.res|noicon.res
diff --git a/apps/plugins/puzzles/src/nullgame.c b/apps/plugins/puzzles/src/nullgame.c
deleted file mode 100644
index d923bc8710..0000000000
--- a/apps/plugins/puzzles/src/nullgame.c
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * nullgame.c [FIXME]: Template defining the null game (in which no
- * moves are permitted and nothing is ever drawn). This file exists
- * solely as a basis for constructing new game definitions - it
- * helps to have something which will compile from the word go and
- * merely doesn't _do_ very much yet.
- * 
- * Parts labelled FIXME actually want _removing_ (e.g. the dummy
- * field in each of the required data structures, and this entire
- * comment itself) when converting this source file into one
- * describing a real game.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-#include <math.h>
-
-#include "puzzles.h"
-
-enum {
-    COL_BACKGROUND,
-    NCOLOURS
-};
-
-struct game_params {
-    int FIXME;
-};
-
-struct game_state {
-    int FIXME;
-};
-
-static game_params *default_params(void)
-{
-    game_params *ret = snew(game_params);
-
-    ret->FIXME = 0;
-
-    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)
-{
-}
-
-static char *encode_params(const game_params *params, bool full)
-{
-    return dupstr("FIXME");
-}
-
-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;
-}
-
-static char *new_game_desc(const game_params *params, random_state *rs,
-                           char **aux, bool interactive)
-{
-    return dupstr("FIXME");
-}
-
-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 char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
-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,
-                              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)
-{
-    /*
-     * The initial contents of the window are not guaranteed and
-     * can vary with front ends. To be on the safe side, all games
-     * should start by drawing a big background-colour rectangle
-     * covering the whole window.
-     */
-    draw_rect(dr, 0, 0, 10*ds->tilesize, 10*ds->tilesize, COL_BACKGROUND);
-    draw_update(dr, 0, 0, 10*ds->tilesize, 10*ds->tilesize);
-}
-
-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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
-#ifdef COMBINED
-#define thegame nullgame
-#endif
-
-const struct game thegame = {
-    "Null Game", 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,
-    new_ui,
-    free_ui,
-    encode_ui,
-    decode_ui,
-    NULL, /* game_request_keys */
-    game_changed_state,
-    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/obfusc.c b/apps/plugins/puzzles/src/obfusc.c
deleted file mode 100644
index c62189c3ad..0000000000
--- a/apps/plugins/puzzles/src/obfusc.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Stand-alone tool to access the Puzzles obfuscation algorithm.
- * 
- * To deobfuscate, use "obfusc -d":
- * 
- *   obfusc -d                 reads binary data from stdin, writes to stdout
- *   obfusc -d <hex string>    works on the given hex string instead of stdin
- *   obfusc -d -h              writes a hex string instead of binary to stdout
- *
- * To obfuscate, "obfusc -e":
- * 
- *   obfusc -e                 reads binary from stdin, writes hex to stdout
- *   obfusc -e <hex string>    works on the given hex string instead of stdin
- *   obfusc -e -b              writes binary instead of text to stdout
- *
- * The default output format is hex for -e and binary for -d
- * because that's the way obfuscation is generally used in
- * Puzzles. Either of -b and -h can always be specified to set it
- * explicitly.
- *
- * Data read from standard input is assumed always to be binary;
- * data provided on the command line is taken to be hex.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <errno.h>
-
-#include "puzzles.h"
-
-int main(int argc, char **argv)
-{
-    enum { BINARY, DEFAULT, HEX } outputmode = DEFAULT;
-    char *inhex = NULL;
-    unsigned char *data;
-    int datalen;
-    enum { UNKNOWN, DECODE, ENCODE } mode = UNKNOWN;
-    bool doing_opts = true;
-
-    while (--argc > 0) {
-        char *p = *++argv;
-
-        if (doing_opts && *p == '-') {
-            if (!strcmp(p, "--")) {
-                doing_opts = 0;
-                continue;
-            }
-            p++;
-            while (*p) {
-                switch (*p) {
-                  case 'e':
-                    mode = ENCODE;
-                    break;
-                  case 'd':
-                    mode = DECODE;
-                    break;
-                  case 'b':
-                    outputmode = BINARY;
-                    break;
-                  case 'h':
-                    outputmode = HEX;
-                    break;
-                  default:
-                    fprintf(stderr, "obfusc: unrecognised option '-%c'\n",
-                            *p);
-                    return 1;
-                }
-                p++;
-            }
-        } else {
-            if (!inhex) {
-                inhex = p;
-            } else {
-                fprintf(stderr, "obfusc: expected at most one argument\n");
-                return 1;
-            }
-        }
-    }
-
-    if (mode == UNKNOWN) {
-        fprintf(stderr, "usage: obfusc < -e | -d > [ -b | -h ] [hex data]\n");
-        return 0;
-    }
-
-    if (outputmode == DEFAULT)
-        outputmode = (mode == DECODE ? BINARY : HEX);
-
-    if (inhex) {
-        datalen = strlen(inhex) / 2;
-        data = hex2bin(inhex, datalen);
-    } else {
-        int datasize = 4096;
-        datalen = 0;
-        data = snewn(datasize, unsigned char);
-        while (1) {
-            int ret = fread(data + datalen, 1, datasize - datalen, stdin);
-            if (ret < 0) {
-                fprintf(stderr, "obfusc: read: %s\n", strerror(errno));
-                return 1;
-            } else if (ret == 0) {
-                break;
-            } else {
-                datalen += ret;
-                if (datasize - datalen < 4096) {
-                    datasize = datalen * 5 / 4 + 4096;
-                    data = sresize(data, datasize, unsigned char);
-                }
-            }
-        }
-    }
-
-    obfuscate_bitmap(data, datalen * 8, mode == DECODE);
-
-    if (outputmode == BINARY) {
-        int ret = fwrite(data, 1, datalen, stdout);
-        if (ret < 0) {
-            fprintf(stderr, "obfusc: write: %s\n", strerror(errno));
-            return 1;
-        }
-    } else {
-        int i;
-        for (i = 0; i < datalen; i++)
-            printf("%02x", data[i]);
-        printf("\n");
-    }
-
-    return 0;
-}
diff --git a/apps/plugins/puzzles/src/osx-help.but b/apps/plugins/puzzles/src/osx-help.but
deleted file mode 100644
index fa45996aee..0000000000
--- a/apps/plugins/puzzles/src/osx-help.but
+++ /dev/null
@@ -1,14 +0,0 @@
-\# Additional Halibut fragment to set up the HTML output
-\# appropriately for MacOS online help.
-
-\cfg{html-head-end}{
-<style type="text/css">
-body \{ font-family: "Lucida Grande", Helvetica, Arial; font-size: 9pt \}
-h1 \{ font-size: 12pt \}
-h2 \{ font-size: 10pt \}
-h3 \{ font-size: 9pt \}
-h4 \{ font-size: 9pt \}
-h5 \{ font-size: 9pt \}
-h6 \{ font-size: 9pt \}
-</style>
-}
diff --git a/apps/plugins/puzzles/src/palisade.R b/apps/plugins/puzzles/src/palisade.R
deleted file mode 100644
index de4bd83126..0000000000
--- a/apps/plugins/puzzles/src/palisade.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-PALISADE_EXTRA = divvy dsf
-
-palisade    : [X] GTK COMMON palisade PALISADE_EXTRA palisade-icon|no-icon
-
-palisade    : [G] WINDOWS COMMON palisade PALISADE_EXTRA palisade.res|noicon.res
-
-ALL += palisade[COMBINED] PALISADE_EXTRA
-
-!begin am gtk
-GAMES += palisade
-!end
-
-!begin >list.c
-    A(palisade) \
-!end
-
-!begin >gamedesc.txt
-palisade:palisade.exe:Palisade:Grid-division puzzle:Divide the grid into equal-sized areas in accordance with the clues.
-!end
diff --git a/apps/plugins/puzzles/src/palisade.c b/apps/plugins/puzzles/src/palisade.c
index e941661a0e..ecbbbb4d6f 100644
--- a/apps/plugins/puzzles/src/palisade.c
+++ b/apps/plugins/puzzles/src/palisade.c
@@ -17,6 +17,7 @@
 
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,7 +47,7 @@ struct game_params {
     int w, h, k;
 };
 
-typedef char clue;
+typedef signed char clue;
 typedef unsigned char borderflag;
 
 typedef struct shared_state {
@@ -156,13 +157,15 @@ static game_params *custom_params(const config_item *cfg)
 
 static const char *validate_params(const game_params *params, bool full)
 {
-    int w = params->w, h = params->h, k = params->k, wh = w * h;
+    int w = params->w, h = params->h, k = params->k, wh;
 
     if (k < 1) return "Region size must be at least one";
     if (w < 1) return "Width must be at least one";
     if (h < 1) return "Height must be at least one";
+    if (w > INT_MAX / h)
+        return "Width times height must not be unreasonably large";
+    wh = w * h;
     if (wh % k) return "Region size must divide grid area";
-
     if (!full) return NULL; /* succeed partial validation */
 
     /* MAYBE FIXME: we (just?) don't have the UI for winning these. */
@@ -183,7 +186,7 @@ typedef struct solver_ctx {
     const game_params *params;  /* also in shared_state */
     clue *clues;                /* also in shared_state */
     borderflag *borders;        /* also in game_state */
-    int *dsf;                   /* particular to the solver */
+    DSF *dsf;                   /* particular to the solver */
 } solver_ctx;
 
 /* Deductions:
@@ -270,7 +273,7 @@ static void connect(solver_ctx *ctx, int i, int j)
 static bool connected(solver_ctx *ctx, int i, int j, int dir)
 {
     if (j == COMPUTE_J) j = i + dx[dir] + ctx->params->w*dy[dir];
-    return dsf_canonify(ctx->dsf, i) == dsf_canonify(ctx->dsf, j);
+    return dsf_equivalent(ctx->dsf, i, j);
 }
 
 static void disconnect(solver_ctx *ctx, int i, int j, int dir)
@@ -502,19 +505,20 @@ static bool solver_equivalent_edges(solver_ctx *ctx)
     return changed;
 }
 
-#define UNVISITED 6
-
 /* build connected components in `dsf', along the lines of `borders'. */
-static void dfs_dsf(int i, int w, borderflag *border, int *dsf, bool black)
+static void build_dsf(int w, int h, borderflag *border, DSF *dsf, bool black)
 {
-    int dir;
-    for (dir = 0; dir < 4; ++dir) {
-        int ii = i + dx[dir] + w*dy[dir], bdir = BORDER(dir);
-        if (black ? (border[i] & bdir) : !(border[i] & DISABLED(bdir)))
-            continue;
-        if (dsf[ii] != UNVISITED) continue;
-        dsf_merge(dsf, i, ii);
-        dfs_dsf(ii, w, border, dsf, black);
+    int x, y;
+
+    for (y = 0; y < h; y++) {
+        for (x = 0; x < w; x++) {
+            if (x+1 < w && (black ? !(border[y*w+x] & BORDER_R) :
+                            (border[y*w+x] & DISABLED(BORDER_R))))
+                dsf_merge(dsf, y*w+x, y*w+(x+1));
+            if (y+1 < h && (black ? !(border[y*w+x] & BORDER_D) :
+                            (border[y*w+x] & DISABLED(BORDER_D))))
+                dsf_merge(dsf, y*w+x, (y+1)*w+x);
+        }
     }
 }
 
@@ -523,9 +527,9 @@ static bool is_solved(const game_params *params, clue *clues,
 {
     int w = params->w, h = params->h, wh = w*h, k = params->k;
     int i, x, y;
-    int *dsf = snew_dsf(wh);
+    DSF *dsf = dsf_new(wh);
 
-    assert (dsf[0] == UNVISITED); /* check: UNVISITED and dsf.c match up */
+    build_dsf(w, h, border, dsf, true);
 
     /*
      * A game is solved if:
@@ -536,7 +540,6 @@ static bool is_solved(const game_params *params, clue *clues,
      *  - the borders also satisfy the clue set
      */
     for (i = 0; i < wh; ++i) {
-        if (dsf[i] == UNVISITED) dfs_dsf(i, params->w, border, dsf, true);
         if (dsf_size(dsf, i) != k) goto error;
         if (clues[i] == EMPTY) continue;
         if (clues[i] != bitcount[border[i] & BORDER_MASK]) goto error;
@@ -554,19 +557,19 @@ static bool is_solved(const game_params *params, clue *clues,
     for (y = 0; y < h; y++) {
         for (x = 0; x < w; x++) {
             if (x+1 < w && (border[y*w+x] & BORDER_R) &&
-                dsf_canonify(dsf, y*w+x) == dsf_canonify(dsf, y*w+(x+1)))
+                dsf_equivalent(dsf, y*w+x, y*w+(x+1)))
                 goto error;
             if (y+1 < h && (border[y*w+x] & BORDER_D) &&
-                dsf_canonify(dsf, y*w+x) == dsf_canonify(dsf, (y+1)*w+x))
+                dsf_equivalent(dsf, y*w+x, (y+1)*w+x))
                 goto error;
         }
     }
 
-    sfree(dsf);
+    dsf_free(dsf);
     return true;
 
 error:
-    sfree(dsf);
+    dsf_free(dsf);
     return false;
 }
 
@@ -579,7 +582,7 @@ static bool solver(const game_params *params, clue *clues, borderflag *borders)
     ctx.params = params;
     ctx.clues = clues;
     ctx.borders = borders;
-    ctx.dsf = snew_dsf(wh);
+    ctx.dsf = dsf_new(wh);
 
     solver_connected_clues_versus_region_size(&ctx); /* idempotent */
     do {
@@ -591,7 +594,7 @@ static bool solver(const game_params *params, clue *clues, borderflag *borders)
         changed |= solver_equivalent_edges(&ctx);
     } while (changed);
 
-    sfree(ctx.dsf);
+    dsf_free(ctx.dsf);
 
     return is_solved(params, clues, borders);
 }
@@ -622,15 +625,14 @@ static char *new_game_desc(const game_params *params, random_state *rs,
 {
     int w = params->w, h = params->h, wh = w*h, k = params->k;
 
-    clue *numbers = snewn(wh + 1, clue), *p;
+    clue *numbers = snewn(wh + 1, clue);
     borderflag *rim = snewn(wh, borderflag);
     borderflag *scratch_borders = snewn(wh, borderflag);
 
     char *soln = snewa(*aux, wh + 2);
     int *shuf = snewn(wh, int);
-    int *dsf = NULL, i, r, c;
-
-    int attempts = 0;
+    DSF *dsf = NULL;
+    int i, r, c;
 
     for (i = 0; i < wh; ++i) shuf[i] = i;
     xshuffle(shuf, wh, rs);
@@ -642,10 +644,9 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     soln[wh] = '\0';
 
     do {
-        ++attempts;
         setmem(soln, '@', wh);
 
-        sfree(dsf);
+        dsf_free(dsf);
         dsf = divvy_rectangle(w, h, k, rs);
 
         for (r = 0; r < h; ++r)
@@ -655,7 +656,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
                 for (dir = 0; dir < 4; ++dir) {
                     int rr = r + dy[dir], cc = c + dx[dir], ii = rr * w + cc;
                     if (OUT_OF_BOUNDS(cc, rr, w, h) ||
-                        dsf_canonify(dsf, i) != dsf_canonify(dsf, ii)) {
+                        !dsf_equivalent(dsf, i, ii)) {
                         ++numbers[i];
                         soln[i] |= BORDER(dir);
                     }
@@ -680,9 +681,10 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     sfree(scratch_borders);
     sfree(rim);
     sfree(shuf);
-    sfree(dsf);
+    dsf_free(dsf);
+
+    char *output = snewn(wh + 1, char), *p = output;
 
-    p = numbers;
     r = 0;
     for (i = 0; i < wh; ++i) {
         if (numbers[i] != EMPTY) {
@@ -699,7 +701,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     }
     *p++ = '\0';
 
-    return sresize(numbers, p - numbers, clue);
+    sfree(numbers);
+    return sresize(output, p - output, char);
 }
 
 static const char *validate_desc(const game_params *params, const char *desc)
@@ -865,32 +868,51 @@ static char *game_text_format(const game_state *state)
 }
 
 struct game_ui {
+    /* These are half-grid coordinates - (0,0) is the top left corner
+     * of the top left square; (1,1) is the center of the top left
+     * grid square. */
     int x, y;
     bool show;
-    bool fake_ctrl, fake_shift;
+
+    bool legacy_cursor;
 };
 
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
-    ui->x = ui->y = 0;
-    ui->show = ui->fake_ctrl = ui->fake_shift = false;
+    ui->x = ui->y = 1;
+    ui->show = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+    ui->legacy_cursor = false;
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *cfg;
+
+    cfg = snewn(2, config_item);
+
+    cfg[0].name = "Cursor mode";
+    cfg[0].kw = "cursor-mode";
+    cfg[0].type = C_CHOICES;
+    cfg[0].u.choices.choicenames = ":Half-grid:Full-grid";
+    cfg[0].u.choices.choicekws = ":half:full";
+    cfg[0].u.choices.selected = ui->legacy_cursor;
+
+    cfg[1].name = NULL;
+    cfg[1].type = C_END;
+
+    return cfg;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->legacy_cursor = cfg[0].u.choices.selected;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
-    assert (encoding == NULL);
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -898,7 +920,7 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 {
 }
 
-typedef unsigned short dsflags;
+typedef int dsflags;
 
 struct game_drawstate {
     int tilesize;
@@ -907,7 +929,7 @@ struct game_drawstate {
 
 #define TILESIZE (ds->tilesize)
 #define MARGIN (ds->tilesize / 2)
-#define WIDTH (1 + (TILESIZE >= 16) + (TILESIZE >= 32) + (TILESIZE >= 64))
+#define WIDTH (3*TILESIZE/32 > 1 ? 3*TILESIZE/32 : 1)
 #define CENTER ((ds->tilesize / 2) + WIDTH/2)
 
 #define FROMCOORD(x) (((x) - MARGIN) / TILESIZE)
@@ -918,12 +940,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                             const game_drawstate *ds, int x, int y, int button)
 {
     int w = state->shared->params.w, h = state->shared->params.h;
-    bool control = (button & MOD_CTRL) | ui->fake_ctrl, shift = (button & MOD_SHFT) | ui->fake_shift;
-
-    /* reset */
-    ui->fake_ctrl = ui->fake_shift = false;
+    bool control = button & MOD_CTRL, shift = button & MOD_SHFT;
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
         int gx = FROMCOORD(x), gy = FROMCOORD(y), possible = BORDER_MASK;
@@ -932,9 +951,6 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (OUT_OF_BOUNDS(gx, gy, w, h)) return NULL;
 
-        ui->x = gx;
-        ui->y = gy;
-
         /* find edge closest to click point */
         possible &=~ (2*px < TILESIZE ? BORDER_R : BORDER_L);
         possible &=~ (2*py < TILESIZE ? BORDER_D : BORDER_U);
@@ -945,6 +961,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         for (dir = 0; dir < 4 && BORDER(dir) != possible; ++dir);
         if (dir == 4) return NULL; /* there's not exactly one such edge */
 
+        ui->x = min(max(2*gx + 1 + dx[dir], 1), 2*w-1);
+        ui->y = min(max(2*gy + 1 + dy[dir], 1), 2*h-1);
+
         hx = gx + dx[dir];
         hy = gy + dy[dir];
 
@@ -974,17 +993,17 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     }
 
     if (IS_CURSOR_MOVE(button)) {
-        ui->show = true;
-        if (control || shift) {
+        if(ui->legacy_cursor && (control || shift)) {
             borderflag flag = 0, newflag;
-            int dir, i =  ui->y * w + ui->x;
-            x = ui->x;
-            y = ui->y;
-            move_cursor(button, &x, &y, w, h, false);
+            int dir, i = (ui->y/2) * w + (ui->x/2);
+            ui->show = true;
+            x = ui->x/2;
+            y = ui->y/2;
+            move_cursor(button, &x, &y, w, h, false, NULL);
             if (OUT_OF_BOUNDS(x, y, w, h)) return NULL;
 
             for (dir = 0; dir < 4; ++dir)
-                if (dx[dir] == x - ui->x && dy[dir] == y - ui->y) break;
+                if (dx[dir] == x - ui->x/2 && dy[dir] == y - ui->y/2) break;
             if (dir == 4) return NULL; /* how the ... ?! */
 
             if (control) flag |= BORDER(dir);
@@ -998,21 +1017,67 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             if (control) newflag |= BORDER(FLIP(dir));
             if (shift) newflag |= DISABLED(BORDER(FLIP(dir)));
             return string(80, "F%d,%d,%dF%d,%d,%d",
-                          ui->x, ui->y, flag, x, y, newflag);
+                          ui->x/2, ui->y/2, flag, x, y, newflag);
         } else {
-            move_cursor(button, &ui->x, &ui->y, w, h, false);
-            return UI_UPDATE;
+            /* TODO: Refactor this and other half-grid cursor games
+             * (Tracks, etc.) */
+            int dx = (button == CURSOR_LEFT) ? -1 : ((button == CURSOR_RIGHT) ? +1 : 0);
+            int dy = (button == CURSOR_DOWN) ? +1 : ((button == CURSOR_UP)    ? -1 : 0);
+
+            if(ui->legacy_cursor) {
+                dx *= 2; dy *= 2;
+
+                ui->x |= 1;
+                ui->y |= 1;
+            }
+
+            if (!ui->show) {
+                ui->show = true;
+            }
+
+            ui->x = min(max(ui->x + dx, 1), 2*w-1);
+            ui->y = min(max(ui->y + dy, 1), 2*h-1);
+
+            return MOVE_UI_UPDATE;
+        }
+    } else if (IS_CURSOR_SELECT(button)) {
+        int px = ui->x % 2, py = ui->y % 2;
+        int gx = ui->x / 2, gy = ui->y / 2;
+        int dir = (px == 0) ? 3 : 0; /* left = 3; up = 0 */
+        int hx = gx + dx[dir];
+        int hy = gy + dy[dir];
+
+        int i = gy * w + gx;
+
+        if(!ui->show) {
+            ui->show = true;
+            return MOVE_UI_UPDATE;
+        }
+
+        /* clicks on square corners and centers do nothing */
+        if (px == py)
+            return MOVE_NO_EFFECT;
+
+        /* TODO: Refactor this and the mouse click handling code
+         * above. */
+        switch ((button == CURSOR_SELECT2) |
+                ((state->borders[i] & BORDER(dir)) >> dir << 1) |
+                ((state->borders[i] & DISABLED(BORDER(dir))) >> dir >> 2)) {
+
+        case MAYBE_LEFT:
+        case ON_LEFT:
+        case ON_RIGHT:
+            return string(80, "F%d,%d,%dF%d,%d,%d",
+                          gx, gy, BORDER(dir),
+                          hx, hy, BORDER(FLIP(dir)));
+
+        case MAYBE_RIGHT:
+        case OFF_LEFT:
+        case OFF_RIGHT:
+            return string(80, "F%d,%d,%dF%d,%d,%d",
+                          gx, gy, DISABLED(BORDER(dir)),
+                          hx, hy, DISABLED(BORDER(FLIP(dir))));
         }
-    }
-    else if(IS_CURSOR_SELECT(button)) {
-        /* CURSOR_SELECT or CURSOR_SELECT2 tells us to toggle whether
-         * the button press should be interpreted as having CTRL or
-         * shift pressed along with it, respectively. */
-        ui->show = true;
-        if(button == CURSOR_SELECT2)
-            ui->fake_shift = !ui->fake_shift;
-        else
-            ui->fake_ctrl = !ui->fake_ctrl;
     }
 
     return NULL;
@@ -1022,15 +1087,14 @@ static game_state *execute_move(const game_state *state, const char *move)
 {
     int w = state->shared->params.w, h = state->shared->params.h, wh = w * h;
     game_state *ret = dup_game(state);
-    int nchars, x, y, flag;
+    int nchars, x, y, flag, i;
 
     if (*move == 'S') {
-        int i;
         ++move;
         for (i = 0; i < wh && move[i]; ++i)
             ret->borders[i] =
                 (move[i] & BORDER_MASK) | DISABLED(~move[i] & BORDER_MASK);
-        if (i < wh || move[i]) return NULL; /* leaks `ret', then we die */
+        if (i < wh || move[i]) goto badmove;
         ret->cheated = ret->completed = true;
         return ret;
     }
@@ -1038,22 +1102,31 @@ static game_state *execute_move(const game_state *state, const char *move)
     while (sscanf(move, "F%d,%d,%d%n", &x, &y, &flag, &nchars) == 3 &&
            !OUT_OF_BOUNDS(x, y, w, h)) {
         move += nchars;
+        for (i = 0; i < 4; i++)
+            if ((flag & BORDER(i)) &&
+                OUT_OF_BOUNDS(x+dx[i], y+dy[i], w, h))
+                /* No toggling the borders of the grid! */
+                goto badmove;
         ret->borders[y*w + x] ^= flag;
     }
 
-    if (*move) return NULL; /* leaks `ret', then we die */
+    if (*move) goto badmove;
 
     if (!ret->completed)
         ret->completed = is_solved(&ret->shared->params, ret->shared->clues,
                                    ret->borders);
 
     return ret;
+
+  badmove:
+    free_game(ret);
+    return NULL;
 }
 
 /* --- Drawing routines --------------------------------------------- */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     *x = (params->w + 1) * tilesize;
     *y = (params->h + 1) * tilesize;
@@ -1113,7 +1186,7 @@ static float *game_colours(frontend *fe, int *ncolours)
 #define F_ERROR_L BORDER_ERROR(BORDER_L) /* BIT(11) */
 #define F_ERROR_CLUE BIT(12)
 #define F_FLASH BIT(13)
-#define F_CURSOR BIT(14)
+#define CONTAINS_CURSOR(x) ((x) << 14)
 
 static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
 {
@@ -1147,9 +1220,6 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int r, int c,
     draw_rect(dr, x + WIDTH, y + WIDTH, TILESIZE - WIDTH, TILESIZE - WIDTH,
               (flags & F_FLASH ? COL_FLASH : COL_BACKGROUND));
 
-    if (flags & F_CURSOR)
-        draw_rect_corners(dr, x + CENTER, y + CENTER, TILESIZE / 3, COL_GRID);
-
     if (clue != EMPTY) {
         char buf[2];
         buf[0] = '0' + clue;
@@ -1173,6 +1243,47 @@ static void draw_tile(drawing *dr, game_drawstate *ds, int r, int c,
     draw_update(dr, x, y, TILESIZE + WIDTH, TILESIZE + WIDTH);
 }
 
+static void draw_cursor(drawing *dr, game_drawstate *ds,
+                        int cur_x, int cur_y, bool legacy_cursor)
+{
+    int off_x = cur_x % 2, off_y = cur_y % 2;
+
+    /* Figure out the tile coordinates corresponding to these cursor
+     * coordinates. */
+    int x = MARGIN + TILESIZE * (cur_x / 2), y = MARGIN + TILESIZE * (cur_y / 2);
+
+    /* off_x and off_y are either 0 or 1. The possible cases are
+     * therefore:
+     *
+     * (0, 0): the cursor is in the top left corner of the tile.
+     * (0, 1): the cursor is on the left border of the tile.
+     * (1, 0): the cursor is on the top border of the tile.
+     * (1, 1): the cursor is in the center of the tile.
+     */
+    enum { TOP_LEFT_CORNER, LEFT_BORDER, TOP_BORDER, TILE_CENTER } cur_type = (off_x << 1) + off_y;
+
+    int center_x = x + ((off_x == 0) ? WIDTH/2 : CENTER),
+        center_y = y + ((off_y == 0) ? WIDTH/2 : CENTER);
+
+    struct { int w, h; } cursor_dimensions[] = {
+        { TILESIZE / 3, TILESIZE / 3 },         /* top left corner */
+        { TILESIZE / 3, 2 * TILESIZE / 3},      /* left border */
+        { 2 * TILESIZE / 3, TILESIZE / 3},      /* top border */
+        { 2 * TILESIZE / 3, 2 * TILESIZE / 3 }  /* center */
+    }, *dims = cursor_dimensions + cur_type;
+
+    if(legacy_cursor && cur_type == TILE_CENTER)
+        draw_rect_corners(dr, center_x, center_y, TILESIZE / 3, COL_GRID);
+    else
+        draw_rect_outline(dr,
+                          center_x - dims->w / 2, center_y - dims->h / 2,
+                          dims->w, dims->h, COL_GRID);
+
+    draw_update(dr,
+                center_x - dims->w / 2, center_y - dims->h / 2,
+                dims->w, dims->h);
+}
+
 #define FLASH_TIME 0.7F
 
 static void game_redraw(drawing *dr, game_drawstate *ds,
@@ -1181,14 +1292,13 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
                         float animtime, float flashtime)
 {
     int w = state->shared->params.w, h = state->shared->params.h, wh = w*h;
-    int r, c, i, flash = ((int) (flashtime * 5 / FLASH_TIME)) % 2;
-    int *black_border_dsf = snew_dsf(wh), *yellow_border_dsf = snew_dsf(wh);
+    int r, c, flash = ((int) (flashtime * 5 / FLASH_TIME)) % 2;
+    DSF *black_border_dsf = dsf_new(wh), *yellow_border_dsf = dsf_new(wh);
     int k = state->shared->params.k;
 
     if (!ds->grid) {
         char buf[40];
         int bgw = (w+1) * ds->tilesize, bgh = (h+1) * ds->tilesize;
-        draw_rect(dr, 0, 0, bgw, bgh, COL_BACKGROUND);
 
         for (r = 0; r <= h; ++r)
             for (c = 0; c <= w; ++c)
@@ -1203,12 +1313,8 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         status_bar(dr, buf);
     }
 
-    for (i = 0; i < wh; ++i) {
-        if (black_border_dsf[i] == UNVISITED)
-            dfs_dsf(i, w, state->borders, black_border_dsf, true);
-        if (yellow_border_dsf[i] == UNVISITED)
-            dfs_dsf(i, w, state->borders, yellow_border_dsf, false);
-    }
+    build_dsf(w, h, state->borders, black_border_dsf, true);
+    build_dsf(w, h, state->borders, yellow_border_dsf, false);
 
     for (r = 0; r < h; ++r)
         for (c = 0; c < w; ++c) {
@@ -1223,8 +1329,13 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
             if (clue != EMPTY && (on > clue || clue > 4 - off))
                 flags |= F_ERROR_CLUE;
 
-            if (ui->show && ui->x == c && ui->y == r)
-                flags |= F_CURSOR;
+            if (ui->show) {
+                int u, v;
+                for(u = 0; u < 3; u++)
+                    for(v = 0; v < 3; v++)
+                        if(ui->x == 2*c+u && ui->y == 2*r+v)
+                            flags |= CONTAINS_CURSOR(BIT(3*u+v));
+            }
 
             /* border errors */
             for (dir = 0; dir < 4; ++dir) {
@@ -1268,8 +1379,11 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
             draw_tile(dr, ds, r, c, ds->grid[i], clue);
         }
 
-    sfree(black_border_dsf);
-    sfree(yellow_border_dsf);
+    if (ui->show)
+        draw_cursor(dr, ds, ui->x, ui->y, ui->legacy_cursor);
+
+    dsf_free(black_border_dsf);
+    dsf_free(yellow_border_dsf);
 }
 
 static float game_anim_length(const game_state *oldstate,
@@ -1306,17 +1420,12 @@ 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)
-{
-    assert (!"this shouldn't get called");
-    return false;                      /* placate optimiser */
-}
-
-static void game_print_size(const game_params *params, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
-    game_compute_size(params, 700, &pw, &ph); /* 7mm, like loopy */
+    game_compute_size(params, 700, ui, &pw, &ph); /* 7mm, like loopy */
 
     *x = pw / 100.0F;
     *y = ph / 100.0F;
@@ -1335,7 +1444,8 @@ static void print_line(drawing *dr, int x1, int y1, int x2, int y2,
     } else draw_line(dr, x1, y1, x2, y2, colour);
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->shared->params.w, h = state->shared->params.h;
     int ink = print_mono_colour(dr, 0);
@@ -1399,12 +1509,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    NULL, /* current_key_label */
     interpret_move,
     execute_move,
     48, game_compute_size, game_set_size,
@@ -1418,6 +1530,6 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     true,                                     /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                         /* flags */
 };
diff --git a/apps/plugins/puzzles/src/pattern.R b/apps/plugins/puzzles/src/pattern.R
deleted file mode 100644
index d6695715f9..0000000000
--- a/apps/plugins/puzzles/src/pattern.R
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- makefile -*-
-
-pattern  : [X] GTK COMMON pattern pattern-icon|no-icon
-
-pattern  : [G] WINDOWS COMMON pattern pattern.res|noicon.res
-
-patternsolver : [U] pattern[STANDALONE_SOLVER] STANDALONE
-patternsolver : [C] pattern[STANDALONE_SOLVER] STANDALONE
-
-patternpicture : [U] pattern[STANDALONE_PICTURE_GENERATOR] STANDALONE
-patternpicture : [C] pattern[STANDALONE_PICTURE_GENERATOR] STANDALONE
-
-ALL += pattern[COMBINED]
-
-!begin am gtk
-GAMES += pattern
-!end
-
-!begin >list.c
-    A(pattern) \
-!end
-
-!begin >gamedesc.txt
-pattern:pattern.exe:Pattern:Pattern puzzle:Fill in the pattern in the grid, given only the lengths of runs of black squares.
-!end
diff --git a/apps/plugins/puzzles/src/pattern.c b/apps/plugins/puzzles/src/pattern.c
index df720b7d82..b370a3dc2f 100644
--- a/apps/plugins/puzzles/src/pattern.c
+++ b/apps/plugins/puzzles/src/pattern.c
@@ -7,7 +7,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -53,6 +58,7 @@ typedef struct game_state_common {
     int *rowdata, *rowlen;
     bool *immutable;
     int refcount;
+    enum { FS_SMALL, FS_LARGE } fontsize;
 } game_state_common;
 
 struct game_state {
@@ -176,7 +182,10 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w <= 0 || params->h <= 0)
         return "Width and height must both be greater than zero";
-    if (params->w * params->w < 2)
+    if (params->w > INT_MAX - 1 || params->h > INT_MAX - 1 ||
+        params->w > INT_MAX / params->h)
+        return "Puzzle must not be unreasonably large";
+    if (params->w * params->h < 2)
         return "Grid must contain at least two squares";
     return NULL;
 }
@@ -360,7 +369,7 @@ static int compute_rowdata(int *ret, unsigned char *start, int len, int step)
 #define STILL_UNKNOWN 3
 
 #ifdef STANDALONE_SOLVER
-bool verbose = false;
+static bool verbose = false;
 #endif
 
 static bool do_recurse(unsigned char *known, unsigned char *deduced,
@@ -441,6 +450,8 @@ static bool do_row(unsigned char *known, unsigned char *deduced,
     int rowlen, i, freespace;
     bool done_any;
 
+    assert(len >= 0);   /* avoid compile warnings about the memsets below */
+
     freespace = len+1;
     for (rowlen = 0; data[rowlen]; rowlen++) {
         minpos_done[rowlen] = minpos_ok[rowlen] = len - 1;
@@ -654,7 +665,7 @@ static bool solve_puzzle(const game_state *state, unsigned char *grid,
 #ifndef STANDALONE_PICTURE_GENERATOR
 static unsigned char *generate_soluble(random_state *rs, int w, int h)
 {
-    int i, j, ntries, max;
+    int i, j, max;
     bool ok;
     unsigned char *grid, *matrix, *workspace;
     unsigned int *changed_h, *changed_w;
@@ -670,11 +681,7 @@ static unsigned char *generate_soluble(random_state *rs, int w, int h)
     changed_w = snewn(max+1, unsigned int);
     rowdata = snewn(max+1, int);
 
-    ntries = 0;
-
     do {
-        ntries++;
-
         generate(rs, w, h, grid);
 
         /*
@@ -719,7 +726,7 @@ static unsigned char *generate_soluble(random_state *rs, int w, int h)
 #endif
 
 #ifdef STANDALONE_PICTURE_GENERATOR
-unsigned char *picture;
+static unsigned char *picture;
 #endif
 
 static char *new_game_desc(const game_params *params, random_state *rs,
@@ -908,6 +915,10 @@ static const char *validate_desc(const game_params *params, const char *desc)
                 p = desc;
                 while (*desc && isdigit((unsigned char)*desc)) desc++;
                 n = atoi(p);
+                if (n <= 0)
+                    return "all clues must be positive";
+                if (n > INT_MAX - 1)
+                    return "at least one clue is grossly excessive";
                 rowspace -= n+1;
 
                 if (rowspace < 0) {
@@ -965,7 +976,7 @@ static const char *validate_desc(const game_params *params, const char *desc)
 static game_state *new_game(midend *me, const game_params *params,
                             const char *desc)
 {
-    int i;
+    int i, j;
     const char *p;
     game_state *state = snew(game_state);
 
@@ -1003,6 +1014,26 @@ static game_state *new_game(midend *me, const game_params *params,
         }
     }
 
+    /*
+     * Choose a font size based on the clues.  If any column clue is
+     * more than one digit, switch to the smaller size.
+     */
+    state->common->fontsize = FS_LARGE;
+    for (i = 0; i < params->w; i++)
+        for (j = 0; j < state->common->rowlen[i]; j++)
+            if (state->common->rowdata[state->common->rowsize * i + j] >= 10)
+                state->common->fontsize = FS_SMALL;
+    /*
+     * We might also need to use the small font if there are lots of
+     * row clues.  We assume that all clues are one digit and that a
+     * single-digit clue takes up 1.5 tiles, of which the clue is 0.5
+     * tiles and the space is 1.0 tiles.
+     */
+    for (i = params->w; i < params->w + params->h; i++)
+        if ((state->common->rowlen[i] * 3 - 2) >
+            TLBORDER(state->common->w) * 2)
+            state->common->fontsize = FS_SMALL;
+
     if (desc[-1] == ',') {
         /*
          * Optional extra piece of game description which fills in
@@ -1217,7 +1248,7 @@ static game_ui *new_ui(const game_state *state)
     ret = snew(game_ui);
     ret->dragging = false;
     ret->cur_x = ret->cur_y = 0;
-    ret->cur_visible = false;
+    ret->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     return ret;
 }
@@ -1227,18 +1258,26 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible) return "";
+        switch (state->grid[ui->cur_y * state->common->w + ui->cur_x]) {
+          case GRID_UNKNOWN:
+            return button == CURSOR_SELECT ? "Black" : "White";
+          case GRID_FULL:
+            return button == CURSOR_SELECT ? "White" : "Grey";
+          case GRID_EMPTY:
+            return button == CURSOR_SELECT ? "Grey" : "Black";
+        }
+    }
+    return "";
 }
 
 struct game_drawstate {
@@ -1247,6 +1286,7 @@ struct game_drawstate {
     int tilesize;
     unsigned char *visible, *numcolours;
     int cur_x, cur_y;
+    char *strbuf; /* Used for formatting clues. */
 };
 
 static char *interpret_move(const game_state *state, game_ui *ui,
@@ -1254,7 +1294,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                             int x, int y, int button)
 {
     bool control = button & MOD_CTRL, shift = button & MOD_SHFT;
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     x = FROMCOORD(state->common->w, x);
     y = FROMCOORD(state->common->h, y);
@@ -1294,7 +1334,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->drag_start_y = ui->drag_end_y = y;
         ui->cur_visible = false;
 
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (ui->dragging && button == ui->drag) {
@@ -1323,7 +1363,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->drag_end_x = x;
         ui->drag_end_y = y;
 
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (ui->dragging && button == ui->release) {
@@ -1351,20 +1391,21 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                     x1, y1, x2-x1+1, y2-y1+1);
             return dupstr(buf);
         } else
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
     }
 
     if (IS_CURSOR_MOVE(button)) {
         int x = ui->cur_x, y = ui->cur_y, newstate;
-        char buf[80];
-        move_cursor(button, &ui->cur_x, &ui->cur_y, state->common->w, state->common->h, false);
-        ui->cur_visible = true;
-        if (!control && !shift) return UI_UPDATE;
+        char buf[80], *ret;
+        ret = move_cursor(button, &ui->cur_x, &ui->cur_y,
+                          state->common->w, state->common->h, false,
+                          &ui->cur_visible);
+        if (!control && !shift) return ret;
 
         newstate = control ? shift ? GRID_UNKNOWN : GRID_FULL : GRID_EMPTY;
         if (state->grid[y * state->common->w + x] == newstate &&
             state->grid[ui->cur_y * state->common->w + ui->cur_x] == newstate)
-            return UI_UPDATE;
+            return ret;
 
         sprintf(buf, "%c%d,%d,%d,%d", control ? shift ? 'U' : 'F' : 'E',
                 min(x, ui->cur_x), min(y, ui->cur_y),
@@ -1379,7 +1420,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
 
         if (button == CURSOR_SELECT2)
@@ -1637,7 +1678,7 @@ static bool check_errors(const game_state *state, int i)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1692,6 +1733,8 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     ds->numcolours = snewn(ds->w + ds->h, unsigned char);
     memset(ds->numcolours, 255, ds->w + ds->h);
     ds->cur_x = ds->cur_y = 0;
+    ds->strbuf = snewn(state->common->rowsize *
+                       MAX_DIGITS(*state->common->rowdata) + 1, char);
 
     return ds;
 }
@@ -1699,6 +1742,8 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
 static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 {
     sfree(ds->visible);
+    sfree(ds->numcolours);
+    sfree(ds->strbuf);
     sfree(ds);
 }
 
@@ -1743,19 +1788,43 @@ static void draw_numbers(
     int *rowdata = state->common->rowdata + state->common->rowsize * i;
     int nfit;
     int j;
+    int rx, ry, rw, rh;
+    int fontsize;
 
-    if (erase) {
-        if (i < state->common->w) {
-            draw_rect(dr, TOCOORD(state->common->w, i), 0,
-                      TILE_SIZE, BORDER + TLBORDER(state->common->h) * TILE_SIZE,
-                      COL_BACKGROUND);
-        } else {
-            draw_rect(dr, 0, TOCOORD(state->common->h, i - state->common->w),
-                      BORDER + TLBORDER(state->common->w) * TILE_SIZE, TILE_SIZE,
-                      COL_BACKGROUND);
-        }
+    if (i < state->common->w) {
+        rx = TOCOORD(state->common->w, i);
+        ry = 0;
+        rw = TILE_SIZE;
+        rh = BORDER + TLBORDER(state->common->h) * TILE_SIZE;
+    } else {
+        rx = 0;
+        ry = TOCOORD(state->common->h, i - state->common->w);
+        rw = BORDER + TLBORDER(state->common->w) * TILE_SIZE;
+        rh = TILE_SIZE;
     }
 
+    clip(dr, rx, ry, rw, rh);
+    if (erase)
+        draw_rect(dr, rx, ry, rw, rh, COL_BACKGROUND);
+
+    /*
+     * Choose a font size that's suitable for the lengths of clue.
+     * Only column clues are interesting because row clues can be
+     * spaced out independent of the tile size.  For column clues, we
+     * want to go as large as practical while leaving decent space
+     * between horizintally adjacent clues.  We currently distinguish
+     * two cases: FS_LARGE is when all column clues are single digits,
+     * and FS_SMALL in all other cases.
+     *
+     * If we assume that a digit is about 0.6em wide, and we want
+     * about that space between clues, then FS_LARGE should be
+     * TILESIZE/1.2.  If we also assume that clues are at most two
+     * digits long then the case where adjacent clues are two digits
+     * long requries FS_SMALL to be TILESIZE/1.8.
+     */
+    fontsize = (TILE_SIZE + 0.5F) /
+        (state->common->fontsize == FS_LARGE ? 1.2F : 1.8F);
+
     /*
      * Normally I space the numbers out by the same distance as the
      * tile size. However, if there are more numbers than available
@@ -1768,32 +1837,38 @@ static void draw_numbers(
     nfit = max(rowlen, nfit) - 1;
     assert(nfit > 0);
 
-    for (j = 0; j < rowlen; j++) {
-        int x, y;
-        char str[80];
+    if (i < state->common->w) {
+        for (j = 0; j < rowlen; j++) {
+            int x, y;
+            char str[MAX_DIGITS(*rowdata) + 1];
 
-        if (i < state->common->w) {
-            x = TOCOORD(state->common->w, i);
+            x = rx;
             y = BORDER + TILE_SIZE * (TLBORDER(state->common->h)-1);
             y -= ((rowlen-j-1)*TILE_SIZE) * (TLBORDER(state->common->h)-1) / nfit;
-        } else {
-            y = TOCOORD(state->common->h, i - state->common->w);
-            x = BORDER + TILE_SIZE * (TLBORDER(state->common->w)-1);
-            x -= ((rowlen-j-1)*TILE_SIZE) * (TLBORDER(state->common->w)-1) / nfit;
+            sprintf(str, "%d", rowdata[j]);
+            draw_text(dr, x+TILE_SIZE/2, y+TILE_SIZE/2, FONT_VARIABLE,
+                      fontsize, ALIGN_HCENTRE | ALIGN_VCENTRE, colour, str);
         }
-
-        sprintf(str, "%d", rowdata[j]);
-        draw_text(dr, x+TILE_SIZE/2, y+TILE_SIZE/2, FONT_VARIABLE,
-                  TILE_SIZE/2, ALIGN_HCENTRE | ALIGN_VCENTRE, colour, str);
-    }
-
-    if (i < state->common->w) {
-        draw_update(dr, TOCOORD(state->common->w, i), 0,
-                    TILE_SIZE, BORDER + TLBORDER(state->common->h) * TILE_SIZE);
     } else {
-        draw_update(dr, 0, TOCOORD(state->common->h, i - state->common->w),
-                    BORDER + TLBORDER(state->common->w) * TILE_SIZE, TILE_SIZE);
+        int x, y;
+        size_t off = 0;
+        const char *spaces = "  ";
+
+        assert(rowlen <= state->common->rowsize);
+        *ds->strbuf = '\0';
+        /* Squish up a bit if there are lots of clues. */
+        if (rowlen > TLBORDER(state->common->w)) spaces++;
+        for (j = 0; j < rowlen; j++)
+            off += sprintf(ds->strbuf + off, "%s%d",
+                           j ? spaces : "", rowdata[j]);
+        y = ry;
+        x = BORDER + TILE_SIZE * (TLBORDER(state->common->w)-1);
+        draw_text(dr, x+TILE_SIZE, y+TILE_SIZE/2, FONT_VARIABLE,
+                  fontsize, ALIGN_HRIGHT | ALIGN_VCENTRE, colour, ds->strbuf);
     }
+
+    unclip(dr);
+    draw_update(dr, rx, ry, rw, rh);
 }
 
 static void game_redraw(drawing *dr, game_drawstate *ds,
@@ -1808,14 +1883,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     if (!ds->started) {
         /*
-         * The initial contents of the window are not guaranteed
-         * and can vary with front ends. To be on the safe side,
-         * all games should start by drawing a big background-
-         * colour rectangle covering the whole window.
-         */
-        draw_rect(dr, 0, 0, SIZE(ds->w), SIZE(ds->h), COL_BACKGROUND);
-
-        /*
          * Draw the grid outline.
          */
         draw_rect(dr, TOCOORD(ds->w, 0) - 1, TOCOORD(ds->h, 0) - 1,
@@ -1936,24 +2003,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 5mm squares by default.
      */
-    game_compute_size(params, 500, &pw, &ph);
+    game_compute_size(params, 500, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->common->w, h = state->common->h;
     int ink = print_mono_colour(dr, 0);
@@ -2027,12 +2091,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2046,7 +2112,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/pearl.R b/apps/plugins/puzzles/src/pearl.R
deleted file mode 100644
index 79bc7325c7..0000000000
--- a/apps/plugins/puzzles/src/pearl.R
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- makefile -*-
-
-PEARL_EXTRA    = dsf tree234 grid penrose loopgen tdq
-
-pearl          : [X] GTK COMMON pearl PEARL_EXTRA pearl-icon|no-icon
-pearl          : [G] WINDOWS COMMON pearl PEARL_EXTRA pearl.res?
-
-pearlbench     : [U] pearl[STANDALONE_SOLVER] PEARL_EXTRA STANDALONE m.lib
-pearlbench     : [C] pearl[STANDALONE_SOLVER] PEARL_EXTRA STANDALONE
-
-ALL += pearl[COMBINED] PEARL_EXTRA
-
-!begin am gtk
-GAMES += pearl
-!end
-
-!begin >list.c
-    A(pearl) \
-!end
-
-!begin >gamedesc.txt
-pearl:pearl.exe:Pearl:Loop-drawing puzzle:Draw a single closed loop, given clues about corner and straight squares.
-!end
diff --git a/apps/plugins/puzzles/src/pearl.c b/apps/plugins/puzzles/src/pearl.c
index 2657d45a67..95993172ca 100644
--- a/apps/plugins/puzzles/src/pearl.c
+++ b/apps/plugins/puzzles/src/pearl.c
@@ -35,7 +35,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "grid.h"
@@ -272,8 +277,12 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 5) return "Width must be at least five";
     if (params->h < 5) return "Height must be at least five";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->difficulty < 0 || params->difficulty >= DIFFCOUNT)
         return "Unknown difficulty level";
+    if (params->difficulty >= DIFF_TRICKY && params->w + params->h < 11)
+        return "Width or height must be at least six for Tricky";
 
     return NULL;
 }
@@ -287,7 +296,8 @@ static int pearl_solve(int w, int h, char *clues, char *result,
 {
     int W = 2*w+1, H = 2*h+1;
     short *workspace;
-    int *dsf, *dsfsize;
+    DSF *dsf;
+    int *dsfsize;
     int x, y, b, d;
     int ret = -1;
 
@@ -340,7 +350,7 @@ static int pearl_solve(int w, int h, char *clues, char *result,
      * We maintain a dsf of connected squares, together with a
      * count of the size of each equivalence class.
      */
-    dsf = snewn(w*h, int);
+    dsf = dsf_new(w*h);
     dsfsize = snewn(w*h, int);
 
     /*
@@ -583,7 +593,7 @@ static int pearl_solve(int w, int h, char *clues, char *result,
         {
             int nonblanks, loopclass;
 
-            dsf_init(dsf, w*h);
+            dsf_reinit(dsf);
             for (x = 0; x < w*h; x++)
                 dsfsize[x] = 1;
 
@@ -850,10 +860,39 @@ cleanup:
                if (ret == 1) assert(b < 0xD); /* we should have had a break by now */
             }
         }
+
+        /*
+         * Ensure we haven't left the _data structure_ inconsistent,
+         * regardless of the consistency of the _puzzle_. In
+         * particular, we should never have marked one square as
+         * linked to its neighbour if the neighbour is not
+         * reciprocally linked back to the original square.
+         *
+         * This can happen if we get part way through solving an
+         * impossible puzzle and then give up trying to make further
+         * progress. So here we fix it up to avoid confusing the rest
+         * of the game.
+         */
+        for (y = 0; y < h; y++) {
+            for (x = 0; x < w; x++) {
+                for (d = 1; d <= 8; d += d) {
+                    int nx = x + DX(d), ny = y + DY(d);
+                    int rlink;
+                    if (0 <= nx && nx < w && 0 <= ny && ny < h)
+                        rlink = result[ny*w+nx] & F(d);
+                    else
+                        rlink = 0;     /* off-board squares don't link back */
+
+                    /* If other square doesn't link to us, don't link to it */
+                    if (!rlink)
+                        result[y*w+x] &= ~d;
+                }
+            }
+        }
     }
 
     sfree(dsfsize);
-    sfree(dsf);
+    dsf_free(dsf);
     sfree(workspace);
     assert(ret >= 0);
     return ret;
@@ -941,9 +980,9 @@ static int pearl_loopgen_bias(void *vctx, char *board, int face)
              * to reprocess the edges for this boundary.
              */
             if (oldface == c || newface == c) {
-                grid_face *f = &g->faces[face];
+                grid_face *f = g->faces[face];
                 for (k = 0; k < f->order; k++)
-                    tdq_add(b->edges_todo, f->edges[k] - g->edges);
+                    tdq_add(b->edges_todo, f->edges[k]->index);
             }
         }
     }
@@ -959,15 +998,15 @@ static int pearl_loopgen_bias(void *vctx, char *board, int face)
          * the vertextypes_todo list.
          */
         while ((j = tdq_remove(b->edges_todo)) >= 0) {
-            grid_edge *e = &g->edges[j];
-            int fc1 = e->face1 ? board[e->face1 - g->faces] : FACE_BLACK;
-            int fc2 = e->face2 ? board[e->face2 - g->faces] : FACE_BLACK;
+            grid_edge *e = g->edges[j];
+            int fc1 = e->face1 ? board[e->face1->index] : FACE_BLACK;
+            int fc2 = e->face2 ? board[e->face2->index] : FACE_BLACK;
             bool oldedge = b->edges[j];
             bool newedge = (fc1==c) ^ (fc2==c);
             if (oldedge != newedge) {
                 b->edges[j] = newedge;
-                tdq_add(b->vertextypes_todo, e->dot1 - g->dots);
-                tdq_add(b->vertextypes_todo, e->dot2 - g->dots);
+                tdq_add(b->vertextypes_todo, e->dot1->index);
+                tdq_add(b->vertextypes_todo, e->dot2->index);
             }
         }
 
@@ -982,7 +1021,7 @@ static int pearl_loopgen_bias(void *vctx, char *board, int face)
          * old neighbours.
          */
         while ((j = tdq_remove(b->vertextypes_todo)) >= 0) {
-            grid_dot *d = &g->dots[j];
+            grid_dot *d = g->dots[j];
             int neighbours[2], type = 0, n = 0;
             
             for (k = 0; k < d->order; k++) {
@@ -990,10 +1029,10 @@ static int pearl_loopgen_bias(void *vctx, char *board, int face)
                 grid_dot *d2 = (e->dot1 == d ? e->dot2 : e->dot1);
                 /* dir == 0,1,2,3 for an edge going L,U,R,D */
                 int dir = (d->y == d2->y) + 2*(d->x+d->y > d2->x+d2->y);
-                int ei = e - g->edges;
+                int ei = e->index;
                 if (b->edges[ei]) {
                     type |= 1 << dir;
-                    neighbours[n] = d2 - g->dots; 
+                    neighbours[n] = d2->index;
                     n++;
                 }
             }
@@ -1048,9 +1087,8 @@ static int pearl_loopgen_bias(void *vctx, char *board, int face)
     return ctx->score;
 }
 
-static void pearl_loopgen(int w, int h, char *lines, random_state *rs)
+static void pearl_loopgen(int w, int h, char *lines, random_state *rs, grid *g)
 {
-    grid *g = grid_new(GRID_SQUARE, w-1, h-1, NULL);
     char *board = snewn(g->num_faces, char);
     int i, s = g->tilesize;
     struct pearl_loopgen_bias_ctx biasctx;
@@ -1102,7 +1140,7 @@ static void pearl_loopgen(int w, int h, char *lines, random_state *rs)
     }
 
     for (i = 0; i < g->num_edges; i++) {
-        grid_edge *e = g->edges + i;
+        grid_edge *e = g->edges[i];
         enum face_colour c1 = FACE_COLOUR(e->face1);
         enum face_colour c2 = FACE_COLOUR(e->face2);
         assert(c1 != FACE_GREY);
@@ -1130,7 +1168,6 @@ static void pearl_loopgen(int w, int h, char *lines, random_state *rs)
         }
     }
 
-    grid_free(g);
     sfree(board);
 
 #if defined LOOPGEN_DIAGNOSTICS && !defined GENERATION_DIAGNOSTICS
@@ -1153,11 +1190,11 @@ static void pearl_loopgen(int w, int h, char *lines, random_state *rs)
 }
 
 static int new_clues(const game_params *params, random_state *rs,
-                     char *clues, char *grid)
+                     char *clues, char *grid_out)
 {
     int w = params->w, h = params->h, diff = params->difficulty;
     int ngen = 0, x, y, d, ret, i;
-
+    grid *g = grid_new(GRID_SQUARE, w-1, h-1, NULL);
 
     /*
      * Difficulty exception: 5x5 Tricky is not generable (the
@@ -1168,13 +1205,13 @@ static int new_clues(const game_params *params, random_state *rs,
 
     while (1) {
         ngen++;
-        pearl_loopgen(w, h, grid, rs);
+        pearl_loopgen(w, h, grid_out, rs, g);
 
 #ifdef GENERATION_DIAGNOSTICS
         printf("grid array:\n");
         for (y = 0; y < h; y++) {
             for (x = 0; x < w; x++) {
-                int type = grid[y*w+x];
+                int type = grid_out[y*w+x];
                 char s[5], *p = s;
                 if (type & L) *p++ = 'L';
                 if (type & R) *p++ = 'R';
@@ -1193,7 +1230,7 @@ static int new_clues(const game_params *params, random_state *rs,
          */
         for (y = 0; y < h; y++)
             for (x = 0; x < w; x++) {
-                int type = grid[y*w+x];
+                int type = grid_out[y*w+x];
 
                 clues[y*w+x] = NOCLUE;
 
@@ -1207,7 +1244,7 @@ static int new_clues(const game_params *params, random_state *rs,
                     for (d = 1; d <= 8; d += d) if (type & d) {
                         int xx = x + DX(d), yy = y + DY(d);
                         assert(xx >= 0 && xx < w && yy >= 0 && yy < h);
-                        if ((bLU|bLD|bRU|bRD) & (1 << grid[yy*w+xx]))
+                        if ((bLU|bLD|bRU|bRD) & (1 << grid_out[yy*w+xx]))
                             break;
                     }
                     if (d <= 8)        /* we found one */
@@ -1221,7 +1258,7 @@ static int new_clues(const game_params *params, random_state *rs,
                     for (d = 1; d <= 8; d += d) if (type & d) {
                         int xx = x + DX(d), yy = y + DY(d);
                         assert(xx >= 0 && xx < w && yy >= 0 && yy < h);
-                        if (!((bLR|bUD) & (1 << grid[yy*w+xx])))
+                        if (!((bLR|bUD) & (1 << grid_out[yy*w+xx])))
                             break;
                     }
                     if (d > 8)         /* we didn't find a counterexample */
@@ -1247,7 +1284,7 @@ static int new_clues(const game_params *params, random_state *rs,
             /*
              * See if we can solve the puzzle just like this.
              */
-            ret = pearl_solve(w, h, clues, grid, diff, false);
+            ret = pearl_solve(w, h, clues, grid_out, diff, false);
             assert(ret > 0);           /* shouldn't be inconsistent! */
             if (ret != 1)
                 continue;                      /* go round and try again */
@@ -1256,7 +1293,7 @@ static int new_clues(const game_params *params, random_state *rs,
              * Check this puzzle isn't too easy.
              */
             if (diff > DIFF_EASY) {
-                ret = pearl_solve(w, h, clues, grid, diff-1, false);
+                ret = pearl_solve(w, h, clues, grid_out, diff-1, false);
                 assert(ret > 0);
                 if (ret == 1)
                     continue; /* too easy: try again */
@@ -1323,7 +1360,7 @@ static int new_clues(const game_params *params, random_state *rs,
                 clue = clues[y*w+x];
                 clues[y*w+x] = 0;              /* try removing this clue */
 
-                ret = pearl_solve(w, h, clues, grid, diff, false);
+                ret = pearl_solve(w, h, clues, grid_out, diff, false);
                 assert(ret > 0);
                 if (ret != 1)
                     clues[y*w+x] = clue;   /* oops, put it back again */
@@ -1344,6 +1381,7 @@ static int new_clues(const game_params *params, random_state *rs,
 
         break;                         /* got it */
     }
+    grid_free(g);
 
     debug(("%d %dx%d loops before finished puzzle.\n", ngen, w, h));
 
@@ -1491,29 +1529,35 @@ static char nbits[16] = { 0, 1, 1, 2,
 
 #define ERROR_CLUE 16
 
-static void dsf_update_completion(game_state *state, int ax, int ay, char dir,
-                                 int *dsf)
+/* Returns false if the state is invalid. */
+static bool dsf_update_completion(game_state *state, int ax, int ay, char dir,
+                                 DSF *dsf)
 {
     int w = state->shared->w /*, h = state->shared->h */;
     int ac = ay*w+ax, bx, by, bc;
 
-    if (!(state->lines[ac] & dir)) return; /* no link */
+    if (!(state->lines[ac] & dir)) return true; /* no link */
     bx = ax + DX(dir); by = ay + DY(dir);
 
-    assert(INGRID(state, bx, by)); /* should not have a link off grid */
+    if (!INGRID(state, bx, by))
+        return false; /* should not have a link off grid */
 
     bc = by*w+bx;
-    assert(state->lines[bc] & F(dir)); /* should have reciprocal link */
-    if (!(state->lines[bc] & F(dir))) return;
+    if (!(state->lines[bc] & F(dir)))
+        return false; /* should have reciprocal link */
+    if (!(state->lines[bc] & F(dir))) return true;
 
     dsf_merge(dsf, ac, bc);
+    return true;
 }
 
-static void check_completion(game_state *state, bool mark)
+/* Returns false if the state is invalid. */
+static bool check_completion(game_state *state, bool mark)
 {
     int w = state->shared->w, h = state->shared->h, x, y, i, d;
     bool had_error = false;
-    int *dsf, *component_state;
+    DSF *dsf;
+    int *component_state;
     int nsilly, nloop, npath, largest_comp, largest_size, total_pathsize;
     enum { COMP_NONE, COMP_LOOP, COMP_PATH, COMP_SILLY, COMP_EMPTY };
 
@@ -1532,13 +1576,16 @@ static void check_completion(game_state *state, bool mark)
      * same reasons, since Loopy and Pearl have basically the same
      * form of expected solution.
      */
-    dsf = snew_dsf(w*h);
+    dsf = dsf_new(w*h);
 
     /* Build the dsf. */
     for (x = 0; x < w; x++) {
         for (y = 0; y < h; y++) {
-            dsf_update_completion(state, x, y, R, dsf);
-            dsf_update_completion(state, x, y, D, dsf);
+            if (!dsf_update_completion(state, x, y, R, dsf) ||
+                !dsf_update_completion(state, x, y, D, dsf)) {
+                dsf_free(dsf);
+                return false;
+            }
         }
     }
 
@@ -1619,7 +1666,7 @@ static void check_completion(game_state *state, bool mark)
      * part of a single loop, for which our counter variables
      * nsilly,nloop,npath are enough. */
     sfree(component_state);
-    sfree(dsf);
+    dsf_free(dsf);
 
     /*
      * Check that no clues are contradicted. This code is similar to
@@ -1693,6 +1740,7 @@ static void check_completion(game_state *state, bool mark)
         if (!had_error)
             state->completed = true;
     }
+    return true;
 }
 
 /* completion check:
@@ -1810,18 +1858,53 @@ struct game_ui {
 
     int curx, cury;        /* grid position of keyboard cursor */
     bool cursor_active;    /* true iff cursor is shown */
+
+    /*
+     * User preference: general visual style of the GUI. GUI_MASYU is
+     * how this puzzle is traditionally presented, with clue dots in
+     * the middle of grid squares, and the solution loop connecting
+     * square-centres. GUI_LOOPY shifts the grid by half a square in
+     * each direction, so that the clue dots are at _vertices_ of the
+     * grid and the solution loop follows the grid edges, which you
+     * could argue is more logical.
+     */
+    enum { GUI_MASYU, GUI_LOOPY } gui_style;
 };
 
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int gui_style = -1;
+
+    if (!initialised) {
+        initialised = true;
+
+        switch (getenv_bool("PEARL_GUI_LOOPY", -1)) {
+          case 0:
+            gui_style = GUI_MASYU;
+            break;
+          case 1:
+            gui_style = GUI_LOOPY;
+            break;
+        }
+    }
+
+    if (gui_style != -1)
+        ui_out->gui_style = gui_style;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
-    int sz = state->shared->sz;
 
     ui->ndragcoords = -1;
-    ui->dragcoords = snewn(sz, int);
-    ui->cursor_active = false;
+    ui->dragcoords = state ? snewn(state->shared->sz, int) : NULL;
+    ui->cursor_active = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->curx = ui->cury = 0;
 
+    ui->gui_style = GUI_MASYU;
+    legacy_prefs_override(ui);
+
     return ui;
 }
 
@@ -1831,13 +1914,28 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Puzzle appearance";
+    ret[0].kw = "appearance";
+    ret[0].type = C_CHOICES;
+    ret[0].u.choices.choicenames = ":Traditional:Loopy-style";
+    ret[0].u.choices.choicekws = ":traditional:loopy";
+    ret[0].u.choices.selected = ui->gui_style;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
+    ui->gui_style = cfg[0].u.choices.selected;
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1845,11 +1943,25 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 {
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cursor_active) {
+        if (button == CURSOR_SELECT) {
+            if (ui->ndragcoords == -1) return "Start";
+            return "Stop";
+        }
+        if (button == CURSOR_SELECT2 && ui->ndragcoords >= 0)
+            return "Cancel";
+    }
+    return "";
+}
+
 #define PREFERRED_TILE_SIZE 31
 #define HALFSZ (ds->halfsz)
 #define TILE_SIZE (ds->halfsz*2 + 1)
 
-#define BORDER ((get_gui_style() == GUI_LOOPY) ? (TILE_SIZE/8) : (TILE_SIZE/2))
+#define BORDER ((ui->gui_style == GUI_LOOPY) ? (TILE_SIZE/8) : (TILE_SIZE/2))
 
 #define BORDER_WIDTH (max(TILE_SIZE / 32, 1))
 
@@ -1865,22 +1977,6 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 #define DS_FLASH (1 << 21)
 #define DS_CURSOR (1 << 22)
 
-enum { GUI_MASYU, GUI_LOOPY };
-
-static int get_gui_style(void)
-{
-    static int gui_style = -1;
-
-    if (gui_style == -1) {
-        char *env = getenv("PEARL_GUI_LOOPY");
-        if (env && (env[0] == 'y' || env[0] == 'Y'))
-            gui_style = GUI_LOOPY;
-        else
-            gui_style = GUI_MASYU;
-    }
-    return gui_style;
-}
-
 struct game_drawstate {
     int halfsz;
     bool started;
@@ -1891,6 +1987,56 @@ struct game_drawstate {
     char *draglines;            /* size w*h; lines flipped by current drag */
 };
 
+/*
+ * Routine shared between multiple callers to work out the intended
+ * effect of a drag path on the grid.
+ *
+ * Call it in a loop, like this:
+ *
+ *     bool clearing = true;
+ *     for (i = 0; i < ui->ndragcoords - 1; i++) {
+ *         int sx, sy, dx, dy, dir, oldstate, newstate;
+ *         interpret_ui_drag(state, ui, &clearing, i, &sx, &sy, &dx, &dy,
+ *                           &dir, &oldstate, &newstate);
+ *
+ *         [do whatever is needed to handle the fact that the drag
+ *         wants the edge from sx,sy to dx,dy (heading in direction
+ *         'dir' at the sx,sy end) to be changed from state oldstate
+ *         to state newstate, each of which equals either 0 or dir]
+ *     }
+ */
+static void interpret_ui_drag(const game_state *state, const game_ui *ui,
+                              bool *clearing, int i, int *sx, int *sy,
+                              int *dx, int *dy, int *dir,
+                              int *oldstate, int *newstate)
+{
+    int w = state->shared->w;
+    int sp = ui->dragcoords[i], dp = ui->dragcoords[i+1];
+    *sy = sp/w;
+    *sx = sp%w;
+    *dy = dp/w;
+    *dx = dp%w;
+    *dir = (*dy>*sy ? D : *dy<*sy ? U : *dx>*sx ? R : L);
+    *oldstate = state->lines[sp] & *dir;
+    if (*oldstate) {
+        /*
+         * The edge we've dragged over was previously
+         * present. Set it to absent, unless we've already
+         * stopped doing that.
+         */
+        *newstate = *clearing ? 0 : *dir;
+    } else {
+        /*
+         * The edge we've dragged over was previously
+         * absent. Set it to present, and cancel the
+         * 'clearing' flag so that all subsequent edges in
+         * the drag are set rather than cleared.
+         */
+        *newstate = *dir;
+        *clearing = false;
+    }
+}
+
 static void update_ui_drag(const game_state *state, game_ui *ui,
                            int gx, int gy)
 {
@@ -1919,13 +2065,42 @@ static void update_ui_drag(const game_state *state, game_ui *ui,
      * the drag path so far has the effect of truncating the path back
      * to that square, so a player can back out part of an uncommitted
      * drag without having to let go of the mouse.
+     *
+     * An exception is that you're allowed to drag round in a loop
+     * back to the very start of the drag, provided that doesn't
+     * create a vertex of the wrong degree. This allows a player who's
+     * after an extra challenge to draw the entire loop in a single
+     * drag, without it cancelling itself just before release.
      */
-    for (i = 0; i < ui->ndragcoords; i++)
+    for (i = 1; i < ui->ndragcoords; i++)
         if (pos == ui->dragcoords[i]) {
             ui->ndragcoords = i+1;
             return;
         }
 
+    if (pos == ui->dragcoords[0]) {
+        /* More complex check for a loop-shaped drag, which has to go
+         * through interpret_ui_drag to decide on the final degree of
+         * the start/end vertex. */
+        ui->dragcoords[ui->ndragcoords] = pos;
+        bool clearing = true;
+        int lines = state->lines[pos] & (L|R|U|D);
+        for (i = 0; i < ui->ndragcoords; i++) {
+            int sx, sy, dx, dy, dir, oldstate, newstate;
+            interpret_ui_drag(state, ui, &clearing, i, &sx, &sy, &dx, &dy,
+                              &dir, &oldstate, &newstate);
+            if (sx == gx && sy == gy)
+                lines ^= (oldstate ^ newstate);
+            if (dx == gx && dy == gy)
+                lines ^= (F(oldstate) ^ F(newstate));
+        }
+        if (NBITS(lines) > 2) {
+            /* Bad vertex degree: fall back to the backtracking behaviour. */
+            ui->ndragcoords = 1;
+            return;
+        }
+    }
+
     /*
      * Otherwise, dragging the mouse into a square that's a rook-move
      * away from the last one on the path extends the path.
@@ -1958,56 +2133,6 @@ static void update_ui_drag(const game_state *state, game_ui *ui,
      */
 }
 
-/*
- * Routine shared between interpret_move and game_redraw to work out
- * the intended effect of a drag path on the grid.
- *
- * Call it in a loop, like this:
- *
- *     bool clearing = true;
- *     for (i = 0; i < ui->ndragcoords - 1; i++) {
- *         int sx, sy, dx, dy, dir, oldstate, newstate;
- *         interpret_ui_drag(state, ui, &clearing, i, &sx, &sy, &dx, &dy,
- *                           &dir, &oldstate, &newstate);
- *
- *         [do whatever is needed to handle the fact that the drag
- *         wants the edge from sx,sy to dx,dy (heading in direction
- *         'dir' at the sx,sy end) to be changed from state oldstate
- *         to state newstate, each of which equals either 0 or dir]
- *     }
- */
-static void interpret_ui_drag(const game_state *state, const game_ui *ui,
-                              bool *clearing, int i, int *sx, int *sy,
-                              int *dx, int *dy, int *dir,
-                              int *oldstate, int *newstate)
-{
-    int w = state->shared->w;
-    int sp = ui->dragcoords[i], dp = ui->dragcoords[i+1];
-    *sy = sp/w;
-    *sx = sp%w;
-    *dy = dp/w;
-    *dx = dp%w;
-    *dir = (*dy>*sy ? D : *dy<*sy ? U : *dx>*sx ? R : L);
-    *oldstate = state->lines[sp] & *dir;
-    if (*oldstate) {
-        /*
-         * The edge we've dragged over was previously
-         * present. Set it to absent, unless we've already
-         * stopped doing that.
-         */
-        *newstate = *clearing ? 0 : *dir;
-    } else {
-        /*
-         * The edge we've dragged over was previously
-         * absent. Set it to present, and cancel the
-         * 'clearing' flag so that all subsequent edges in
-         * the drag are set rather than cleared.
-         */
-        *newstate = *dir;
-        *clearing = false;
-    }
-}
-
 static char *mark_in_direction(const game_state *state, int x, int y, int dir,
                                bool primary, char *buf)
 {
@@ -2018,11 +2143,11 @@ static char *mark_in_direction(const game_state *state, int x, int y, int dir,
 
     char ch = primary ? 'F' : 'M', *other;
 
-    if (!INGRID(state, x, y) || !INGRID(state, x2, y2)) return UI_UPDATE;
+    if (!INGRID(state, x, y) || !INGRID(state, x2, y2)) return MOVE_UI_UPDATE;
 
     /* disallow laying a mark over a line, or vice versa. */
     other = primary ? state->marks : state->lines;
-    if (other[y*w+x] & dir || other[y2*w+x2] & dir2) return UI_UPDATE;
+    if (other[y*w+x] & dir || other[y2*w+x2] & dir2) return MOVE_UI_UPDATE;
     
     sprintf(buf, "%c%d,%d,%d;%c%d,%d,%d", ch, dir, x, y, ch, dir2, x2, y2);
     return dupstr(buf);
@@ -2042,26 +2167,26 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char tmpbuf[80];
 
     bool shift = button & MOD_SHFT, control = button & MOD_CTRL;
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (IS_MOUSE_DOWN(button)) {
         ui->cursor_active = false;
 
         if (!INGRID(state, gx, gy)) {
             ui->ndragcoords = -1;
-            return NULL;
+            return MOVE_UI_UPDATE;
         }
 
         ui->clickx = x; ui->clicky = y;
         ui->dragcoords[0] = gy * w + gx;
         ui->ndragcoords = 0;           /* will be 1 once drag is confirmed */
 
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (button == LEFT_DRAG && ui->ndragcoords >= 0) {
         update_ui_drag(state, ui, gx, gy);
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_MOUSE_RELEASE(button)) release = true;
@@ -2071,42 +2196,48 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             ui->cursor_active = true;
         } else if (control || shift) {
             char *move;
-            if (ui->ndragcoords > 0) return NULL;
+            if (ui->ndragcoords > 0) return MOVE_NO_EFFECT;
             ui->ndragcoords = -1;
             move = mark_in_direction(state, ui->curx, ui->cury,
                                      KEY_DIRECTION(button), control, tmpbuf);
             if (control && !shift && *move)
-                move_cursor(button, &ui->curx, &ui->cury, w, h, false);
+                move_cursor(button, &ui->curx, &ui->cury, w, h, false, NULL);
             return move;
         } else {
-            move_cursor(button, &ui->curx, &ui->cury, w, h, false);
+            move_cursor(button, &ui->curx, &ui->cury, w, h, false, NULL);
             if (ui->ndragcoords >= 0)
                 update_ui_drag(state, ui, ui->curx, ui->cury);
         }
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_CURSOR_SELECT(button)) {
         if (!ui->cursor_active) {
             ui->cursor_active = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         } else if (button == CURSOR_SELECT) {
             if (ui->ndragcoords == -1) {
                 ui->ndragcoords = 0;
                 ui->dragcoords[0] = ui->cury * w + ui->curx;
                 ui->clickx = CENTERED_COORD(ui->curx);
                 ui->clicky = CENTERED_COORD(ui->cury);
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             } else release = true;
-        } else if (button == CURSOR_SELECT2 && ui->ndragcoords >= 0) {
-            ui->ndragcoords = -1;
-            return UI_UPDATE;
-        }
+        } else if (button == CURSOR_SELECT2) {
+            if (ui->ndragcoords >= 0) {
+                ui->ndragcoords = -1;
+                return MOVE_UI_UPDATE;
+            }
+            return MOVE_NO_EFFECT;
+        }
     }
 
     if (button == 27 || button == '\b') {
-        ui->ndragcoords = -1;
-        return UI_UPDATE;
+        if (ui->ndragcoords >= 0) {
+            ui->ndragcoords = -1;
+            return MOVE_UI_UPDATE;
+        }
+        return MOVE_NO_EFFECT;
     }
 
     if (release) {
@@ -2138,7 +2269,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
             ui->ndragcoords = -1;
 
-            return buf ? buf : UI_UPDATE;
+            return buf ? buf : MOVE_UI_UPDATE;
         } else if (ui->ndragcoords == 0) {
             /* Click (or tiny drag). Work out which edge we were
              * closest to. */
@@ -2159,12 +2290,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             cx = CENTERED_COORD(gx);
             cy = CENTERED_COORD(gy);
 
-            if (!INGRID(state, gx, gy)) return UI_UPDATE;
+            if (!INGRID(state, gx, gy)) return MOVE_UI_UPDATE;
 
             if (max(abs(x-cx),abs(y-cy)) < TILE_SIZE/4) {
                 /* TODO closer to centre of grid: process as a cell click not an edge click. */
 
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             } else {
                 int direction;
                 if (abs(x-cx) < abs(y-cy)) {
@@ -2183,7 +2314,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     if (button == 'H' || button == 'h')
         return dupstr("H");
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -2246,7 +2377,7 @@ static game_state *execute_move(const game_state *state, const char *move)
             goto badmove;
     }
 
-    check_completion(ret, true);
+    if (!check_completion(ret, true)) goto badmove;
 
     return ret;
 
@@ -2262,7 +2393,7 @@ badmove:
 #define FLASH_TIME 0.5F
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int halfsz; } ads, *ds = &ads;
@@ -2340,8 +2471,8 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
 }
 
 static void draw_lines_specific(drawing *dr, game_drawstate *ds,
-                                int x, int y, unsigned int lflags,
-                                unsigned int shift, int c)
+                                const game_ui *ui, int x, int y,
+                                unsigned int lflags, unsigned int shift, int c)
 {
     int ox = COORD(x), oy = COORD(y);
     int t2 = HALFSZ, t16 = HALFSZ/4;
@@ -2390,7 +2521,7 @@ static void draw_square(drawing *dr, game_drawstate *ds, const game_ui *ui,
               COL_CURSOR_BACKGROUND : COL_BACKGROUND);
               
 
-    if (get_gui_style() == GUI_LOOPY) {
+    if (ui->gui_style == GUI_LOOPY) {
         /* Draw small dot, underneath any lines. */
         draw_circle(dr, cx, cy, t16, COL_GRID, COL_GRID);
     } else {
@@ -2417,7 +2548,7 @@ static void draw_square(drawing *dr, game_drawstate *ds, const game_ui *ui,
             draw_line(dr, mx-msz, my-msz, mx+msz, my+msz, COL_BLACK);
             draw_line(dr, mx-msz, my+msz, mx+msz, my-msz, COL_BLACK);
         } else {
-            if (get_gui_style() == GUI_LOOPY) {
+            if (ui->gui_style == GUI_LOOPY) {
                 /* draw grid lines connecting centre of cells */
                 draw_line(dr, cx, cy, cx+xoff, cy+yoff, COL_GRID);
             }
@@ -2427,11 +2558,11 @@ static void draw_square(drawing *dr, game_drawstate *ds, const game_ui *ui,
     /* Draw each of the four directions, where laid (or error, or drag, etc.)
      * Order is important here, specifically for the eventual colours of the
      * exposed end caps. */
-    draw_lines_specific(dr, ds, x, y, lflags, 0,
+    draw_lines_specific(dr, ds, ui, x, y, lflags, 0,
                         (lflags & DS_FLASH ? COL_FLASH : COL_BLACK));
-    draw_lines_specific(dr, ds, x, y, lflags, DS_ESHIFT, COL_ERROR);
-    draw_lines_specific(dr, ds, x, y, lflags, DS_DSHIFT, COL_DRAGOFF);
-    draw_lines_specific(dr, ds, x, y, lflags, DS_DSHIFT, COL_DRAGON);
+    draw_lines_specific(dr, ds, ui, x, y, lflags, DS_ESHIFT, COL_ERROR);
+    draw_lines_specific(dr, ds, ui, x, y, lflags, DS_DSHIFT, COL_DRAGOFF);
+    draw_lines_specific(dr, ds, ui, x, y, lflags, DS_DSHIFT, COL_DRAGON);
 
     /* Draw a clue, if present */
     if (clue != NOCLUE) {
@@ -2458,18 +2589,9 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     bool force = false;
 
     if (!ds->started) {
-        /*
-         * The initial contents of the window are not guaranteed and
-         * can vary with front ends. To be on the safe side, all games
-         * should start by drawing a big background-colour rectangle
-         * covering the whole window.
-         */
-        draw_rect(dr, 0, 0, w*TILE_SIZE + 2*BORDER, h*TILE_SIZE + 2*BORDER,
-                  COL_BACKGROUND);
-
-        if (get_gui_style() == GUI_MASYU) {
+        if (ui->gui_style == GUI_MASYU) {
             /*
-             * Smaller black rectangle which is the main grid.
+             * Black rectangle which is the main grid.
              */
             draw_rect(dr, BORDER - BORDER_WIDTH, BORDER - BORDER_WIDTH,
                       w*TILE_SIZE + 2*BORDER_WIDTH + 1,
@@ -2560,47 +2682,64 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->shared->w, h = state->shared->h, x, y;
     int black = print_mono_colour(dr, 0);
     int white = print_mono_colour(dr, 1);
 
-    /* No GUI_LOOPY here: only use the familiar masyu style. */
-
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     game_drawstate *ds = game_new_drawstate(dr, state);
     game_set_size(dr, ds, NULL, tilesize);
 
-    /* Draw grid outlines (black). */
-    for (x = 0; x <= w; x++)
-        draw_line(dr, COORD(x), COORD(0), COORD(x), COORD(h), black);
-    for (y = 0; y <= h; y++)
-        draw_line(dr, COORD(0), COORD(y), COORD(w), COORD(y), black);
+    if (ui->gui_style == GUI_MASYU) {
+        /* Draw grid outlines (black). */
+        for (x = 0; x <= w; x++)
+            draw_line(dr, COORD(x), COORD(0), COORD(x), COORD(h), black);
+        for (y = 0; y <= h; y++)
+            draw_line(dr, COORD(0), COORD(y), COORD(w), COORD(y), black);
+    } else {
+        /* Draw small dots, and dotted lines connecting them. For
+         * added clarity, try to start and end the dotted lines a
+         * little way away from the dots. */
+        print_line_width(dr, TILE_SIZE / 40);
+        print_line_dotted(dr, true);
+        for (x = 0; x < w; x++) {
+            for (y = 0; y < h; y++) {
+                int cx = COORD(x) + HALFSZ, cy = COORD(y) + HALFSZ;
+                draw_circle(dr, cx, cy, tilesize/10, black, black);
+                if (x+1 < w)
+                    draw_line(dr, cx+tilesize/5, cy,
+                              cx+tilesize-tilesize/5, cy, black);
+                if (y+1 < h)
+                    draw_line(dr, cx, cy+tilesize/5,
+                              cx, cy+tilesize-tilesize/5, black);
+            }
+        }
+        print_line_dotted(dr, false);
+    }
 
     for (x = 0; x < w; x++) {
         for (y = 0; y < h; y++) {
             int cx = COORD(x) + HALFSZ, cy = COORD(y) + HALFSZ;
             int clue = state->shared->clues[y*w+x];
 
-            draw_lines_specific(dr, ds, x, y, state->lines[y*w+x], 0, black);
+            draw_lines_specific(dr, ds, ui, x, y,
+                                state->lines[y*w+x], 0, black);
 
             if (clue != NOCLUE) {
                 int c = (clue == CORNER) ? black : white;
@@ -2633,12 +2772,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2652,7 +2793,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
@@ -2661,7 +2802,7 @@ const struct game thegame = {
 #include <time.h>
 #include <stdarg.h>
 
-const char *quis = NULL;
+static const char *quis = NULL;
 
 static void usage(FILE *out) {
     fprintf(out, "usage: %s <params>\n", quis);
@@ -2720,7 +2861,7 @@ static void start_soak(game_params *p, random_state *rs, int nsecs)
     sfree(clues);
 }
 
-int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
     game_params *p = NULL;
     random_state *rs = NULL;
diff --git a/apps/plugins/puzzles/src/pegs.R b/apps/plugins/puzzles/src/pegs.R
deleted file mode 100644
index 1e79e99ca0..0000000000
--- a/apps/plugins/puzzles/src/pegs.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-PEGS_EXTRA = tree234
-
-pegs     : [X] GTK COMMON pegs PEGS_EXTRA pegs-icon|no-icon
-
-pegs     : [G] WINDOWS COMMON pegs PEGS_EXTRA pegs.res|noicon.res
-
-ALL += pegs[COMBINED] PEGS_EXTRA
-
-!begin am gtk
-GAMES += pegs
-!end
-
-!begin >list.c
-    A(pegs) \
-!end
-
-!begin >gamedesc.txt
-pegs:pegs.exe:Pegs:Peg solitaire puzzle:Jump pegs over each other to remove all but one.
-!end
diff --git a/apps/plugins/puzzles/src/pegs.c b/apps/plugins/puzzles/src/pegs.c
index ec12aa9552..c770bf3076 100644
--- a/apps/plugins/puzzles/src/pegs.c
+++ b/apps/plugins/puzzles/src/pegs.c
@@ -7,7 +7,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -70,7 +75,11 @@ static game_params *default_params(void)
 }
 
 static const struct game_params pegs_presets[] = {
+    {5, 7, TYPE_CROSS},
     {7, 7, TYPE_CROSS},
+    {5, 9, TYPE_CROSS},
+    {7, 9, TYPE_CROSS},
+    {9, 9, TYPE_CROSS},
     {7, 7, TYPE_OCTAGON},
     {5, 5, TYPE_RANDOM},
     {7, 7, TYPE_RANDOM},
@@ -89,7 +98,7 @@ static bool game_fetch_preset(int i, char **name, game_params **params)
     *ret = pegs_presets[i];
 
     strcpy(str, pegs_titletypes[ret->type]);
-    if (ret->type == TYPE_RANDOM)
+    if (ret->type == TYPE_CROSS || ret->type == TYPE_RANDOM)
         sprintf(str + strlen(str), " %dx%d", ret->w, ret->h);
 
     *name = dupstr(str);
@@ -182,14 +191,38 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (full && (params->w <= 3 || params->h <= 3))
         return "Width and height must both be greater than three";
+    if (params->w < 1 || params->h < 1)
+        return "Width and height must both be at least one";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
+
+    /*
+     * At http://www.gibell.net/pegsolitaire/GenCross/GenCrossBoards0.html
+     * George I. Bell asserts that various generalised cross-shaped
+     * boards are soluble starting (and finishing) with the centre
+     * hole.  We permit the symmetric ones.  Bell's notation for each
+     * soluble board is listed.
+     */
+    if (full && params->type == TYPE_CROSS) {
+        if (!((params->w == 9 && params->h == 5) || /* (3,1,3,1) */
+              (params->w == 5 && params->h == 9) || /* (1,3,1,3) */
+              (params->w == 9 && params->h == 9) || /* (3,3,3,3) */
+              (params->w == 7 && params->h == 5) || /* (2,1,2,1) */
+              (params->w == 5 && params->h == 7) || /* (1,2,1,2) */
+              (params->w == 9 && params->h == 7) || /* (3,2,3,2) */
+              (params->w == 7 && params->h == 9) || /* (2,3,2,3) */
+              (params->w == 7 && params->h == 7)))  /* (2,2,2,2) */
+            return "This board type is only supported at "
+                "5x7, 5x9, 7x7, 7x9, and 9x9";
+    }
 
     /*
-     * It might be possible to implement generalisations of Cross
-     * and Octagon, but only if I can find a proof that they're all
+     * It might be possible to implement generalisations of
+     * Octagon, but only if I can find a proof that they're all
      * soluble. For the moment, therefore, I'm going to disallow
-     * them at any size other than the standard one.
+     * it at any size other than the standard one.
      */
-    if (full && (params->type == TYPE_CROSS || params->type == TYPE_OCTAGON)) {
+    if (full && params->type == TYPE_OCTAGON) {
         if (params->w != 7 || params->h != 7)
             return "This board type is only supported at 7x7";
     }
@@ -658,12 +691,23 @@ static char *new_game_desc(const game_params *params, random_state *rs,
 
 static const char *validate_desc(const game_params *params, const char *desc)
 {
-    int len = params->w * params->h;
+    int len, i, npeg = 0, nhole = 0;
+
+    len = params->w * params->h;
 
     if (len != strlen(desc))
         return "Game description is wrong length";
     if (len != strspn(desc, "PHO"))
         return "Invalid character in game description";
+    for (i = 0; i < len; i++) {
+        npeg += desc[i] == 'P';
+        nhole += desc[i] == 'H';
+    }
+    /* The minimal soluble game has two pegs and a hole: "3x1:PPH". */
+    if (npeg < 2)
+        return "Too few pegs in game description";
+    if (nhole < 1)
+        return "Too few holes in game description";
 
     return NULL;
 }
@@ -706,12 +750,6 @@ 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;
@@ -751,7 +789,7 @@ static game_ui *new_ui(const game_state *state)
 
     ui->sx = ui->sy = ui->dx = ui->dy = 0;
     ui->dragging = false;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->cur_jumping = false;
 
     /* make sure we start the cursor somewhere on the grid. */
@@ -775,15 +813,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
@@ -800,6 +829,19 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     ui->cur_jumping = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    int w = state->w;
+
+    if (IS_CURSOR_SELECT(button)) {
+        if (!ui->cur_visible) return "";
+        if (ui->cur_jumping) return "Cancel";
+        if (state->grid[ui->cur_y*w+ui->cur_x] == GRID_PEG) return "Select";
+    }
+    return "";
+}
+
 #define PREFERRED_TILE_SIZE 33
 #define TILESIZE (ds->tilesize)
 #define BORDER (TILESIZE / 2)
@@ -845,16 +887,23 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         tx = FROMCOORD(x);
         ty = FROMCOORD(y);
-        if (tx >= 0 && tx < w && ty >= 0 && ty < h &&
-            state->grid[ty*w+tx] == GRID_PEG) {
-            ui->dragging = true;
-            ui->sx = tx;
-            ui->sy = ty;
-            ui->dx = x;
-            ui->dy = y;
-            ui->cur_visible = false;
-            ui->cur_jumping = false;
-            return UI_UPDATE;
+        if (tx >= 0 && tx < w && ty >= 0 && ty < h) {
+            switch (state->grid[ty*w+tx]) {
+            case GRID_PEG:
+                ui->dragging = true;
+                ui->sx = tx;
+                ui->sy = ty;
+                ui->dx = x;
+                ui->dy = y;
+                ui->cur_visible = false;
+                ui->cur_jumping = false;
+                return MOVE_UI_UPDATE;
+            case GRID_HOLE:
+                return MOVE_NO_EFFECT;
+            case GRID_OBST:
+            default:
+                return MOVE_UNUSED;
+            }
         }
     } else if (button == LEFT_DRAG && ui->dragging) {
         /*
@@ -862,7 +911,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
          */
         ui->dx = x;
         ui->dy = y;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else if (button == LEFT_RELEASE && ui->dragging) {
         int tx, ty, dx, dy;
 
@@ -874,18 +923,18 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         tx = FROMCOORD(x);
         ty = FROMCOORD(y);
         if (tx < 0 || tx >= w || ty < 0 || ty >= h)
-            return UI_UPDATE;          /* target out of range */
+            return MOVE_UI_UPDATE;             /* target out of range */
         dx = tx - ui->sx;
         dy = ty - ui->sy;
         if (max(abs(dx),abs(dy)) != 2 || min(abs(dx),abs(dy)) != 0)
-            return UI_UPDATE;          /* move length was wrong */
+            return MOVE_UI_UPDATE;             /* move length was wrong */
         dx /= 2;
         dy /= 2;
 
         if (state->grid[ty*w+tx] != GRID_HOLE ||
             state->grid[(ty-dy)*w+(tx-dx)] != GRID_PEG ||
             state->grid[ui->sy*w+ui->sx] != GRID_PEG)
-            return UI_UPDATE;          /* grid contents were invalid */
+            return MOVE_UI_UPDATE;             /* grid contents were invalid */
 
         /*
          * We have a valid move. Encode it simply as source and
@@ -898,14 +947,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             /* Not jumping; move cursor as usual, making sure we don't
              * leave the gameboard (which may be an irregular shape) */
             int cx = ui->cur_x, cy = ui->cur_y;
-            move_cursor(button, &cx, &cy, w, h, false);
+            move_cursor(button, &cx, &cy, w, h, false, NULL);
             ui->cur_visible = true;
             if (state->grid[cy*w+cx] == GRID_HOLE ||
                 state->grid[cy*w+cx] == GRID_PEG) {
                 ui->cur_x = cx;
                 ui->cur_y = cy;
             }
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         } else {
             int dx, dy, mx, my, jx, jy;
 
@@ -928,26 +977,26 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->cur_x = jx; ui->cur_y = jy;
                 return dupstr(buf);
             }
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else if (IS_CURSOR_SELECT(button)) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (ui->cur_jumping) {
             ui->cur_jumping = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (state->grid[ui->cur_y*w+ui->cur_x] == GRID_PEG) {
-            /* cursor is on peg: next arrow-move wil jump. */
+            /* cursor is on peg: next arrow-move will jump. */
             ui->cur_jumping = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
-        return NULL;
+        return MOVE_NO_EFFECT;
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -1006,7 +1055,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1135,10 +1184,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     }
 
     if (!ds->started) {
-        draw_rect(dr, 0, 0,
-                  TILESIZE * state->w + 2 * BORDER,
-                  TILESIZE * state->h + 2 * BORDER, COL_BACKGROUND);
-
         /*
          * Draw relief marks around all the squares that aren't
          * GRID_OBST.
@@ -1302,19 +1347,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame pegs
 #endif
@@ -1334,14 +1366,16 @@ const struct game thegame = {
     new_game,
     dup_game,
     free_game,
-    false, solve_game,
+    false, NULL, /* solve */
     true, game_can_format_as_text_now, game_text_format,
+    NULL, NULL, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1353,9 +1387,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/penrose-internal.h b/apps/plugins/puzzles/src/penrose-internal.h
new file mode 100644
index 0000000000..984cd35711
--- /dev/null
+++ b/apps/plugins/puzzles/src/penrose-internal.h
@@ -0,0 +1,289 @@
+#include "penrose.h"
+
+static inline unsigned num_subtriangles(char t)
+{
+    return (t == 'A' || t == 'B' || t == 'X' || t == 'Y') ? 3 : 2;
+}
+
+static inline unsigned sibling_edge(char t)
+{
+    switch (t) {
+      case 'A': case 'U': return 2;
+      case 'B': case 'V': return 1;
+      default: return 0;
+    }
+}
+
+/*
+ * Coordinate system for tracking Penrose-tile half-triangles.
+ * PenroseCoords simply stores an array of triangle types.
+ */
+typedef struct PenroseCoords {
+    char *c;
+    size_t nc, csize;
+} PenroseCoords;
+
+PenroseCoords *penrose_coords_new(void);
+void penrose_coords_free(PenroseCoords *pc);
+void penrose_coords_make_space(PenroseCoords *pc, size_t size);
+PenroseCoords *penrose_coords_copy(PenroseCoords *pc_in);
+
+/*
+ * Coordinate system for locating Penrose tiles in the plane.
+ *
+ * The 'Point' structure represents a single point by means of an
+ * integer linear combination of {1, t, t^2, t^3}, where t is the
+ * complex number exp(i pi/5) representing 1/10 of a turn about the
+ * origin.
+ *
+ * The 'PenroseTriangle' structure represents a half-tile triangle,
+ * giving both the locations of its vertices and its combinatorial
+ * coordinates. It also contains a linked-list pointer and a boolean
+ * flag, used during breadth-first search to generate all the tiles in
+ * an area and report them exactly once.
+ */
+typedef struct Point {
+    int coeffs[4];
+} Point;
+typedef struct PenroseTriangle PenroseTriangle;
+struct PenroseTriangle {
+    Point vertices[3];
+    PenroseCoords *pc;
+    PenroseTriangle *next; /* used in breadth-first search */
+    bool reported;
+};
+
+/* Fill in all the coordinates of a triangle starting from any single edge.
+ * Requires tri->pc to have been filled in, so that we know which shape of
+ * triangle we're placing. */
+void penrose_place(PenroseTriangle *tri, Point u, Point v, int index_of_u);
+
+/* Free a PenroseHalf and its contained coordinates, or a whole PenroseTile */
+void penrose_free(PenroseTriangle *tri);
+
+/*
+ * A Point is really a complex number, so we can add, subtract and
+ * multiply them.
+ */
+static inline Point point_add(Point a, Point b)
+{
+    Point r;
+    size_t i;
+    for (i = 0; i < 4; i++)
+        r.coeffs[i] = a.coeffs[i] + b.coeffs[i];
+    return r;
+}
+static inline Point point_sub(Point a, Point b)
+{
+    Point r;
+    size_t i;
+    for (i = 0; i < 4; i++)
+        r.coeffs[i] = a.coeffs[i] - b.coeffs[i];
+    return r;
+}
+static inline Point point_mul_by_t(Point x)
+{
+    Point r;
+    /* Multiply by t by using the identity t^4 - t^3 + t^2 - t + 1 = 0,
+     * so t^4 = t^3 - t^2 + t - 1 */
+    r.coeffs[0] = -x.coeffs[3];
+    r.coeffs[1] = x.coeffs[0] + x.coeffs[3];
+    r.coeffs[2] = x.coeffs[1] - x.coeffs[3];
+    r.coeffs[3] = x.coeffs[2] + x.coeffs[3];
+    return r;
+}
+static inline Point point_mul(Point a, Point b)
+{
+    size_t i, j;
+    Point r;
+
+    /* Initialise r to be a, scaled by b's t^3 term */
+    for (j = 0; j < 4; j++)
+        r.coeffs[j] = a.coeffs[j] * b.coeffs[3];
+
+    /* Now iterate r = t*r + (next coefficient down), by Horner's rule */
+    for (i = 3; i-- > 0 ;) {
+        r = point_mul_by_t(r);
+        for (j = 0; j < 4; j++)
+            r.coeffs[j] += a.coeffs[j] * b.coeffs[i];
+    }
+
+    return r;
+}
+static inline bool point_equal(Point a, Point b)
+{
+    size_t i;
+    for (i = 0; i < 4; i++)
+        if (a.coeffs[i] != b.coeffs[i])
+            return false;
+    return true;
+}
+
+/*
+ * Return the Point corresponding to a rotation of s steps around the
+ * origin, i.e. a rotation by 36*s degrees or s*pi/5 radians.
+ */
+static inline Point point_rot(int s)
+{
+    Point r = {{ 1, 0, 0, 0 }};
+    Point tpower = {{ 0, 1, 0, 0 }};
+
+    /* Reduce to a sensible range */
+    s = s % 10;
+    if (s < 0)
+        s += 10;
+
+    while (true) {
+        if (s & 1)
+            r = point_mul(r, tpower);
+        s >>= 1;
+        if (!s)
+            break;
+        tpower = point_mul(tpower, tpower);
+    }
+
+    return r;
+}
+
+/*
+ * PenroseContext is the shared context of a whole run of the
+ * algorithm. Its 'prototype' PenroseCoords object represents the
+ * coordinates of the starting triangle, and is extended as necessary;
+ * any other PenroseCoord that needs extending will copy the
+ * higher-order values from ctx->prototype as needed, so that once
+ * each choice has been made, it remains consistent.
+ *
+ * When we're inventing a random piece of tiling in the first place,
+ * we append to ctx->prototype by choosing a random (but legal)
+ * higher-level metatile for the current topmost one to turn out to be
+ * part of. When we're replaying a generation whose parameters are
+ * already stored, we don't have a random_state, and we make fixed
+ * decisions if not enough coordinates were provided, as in the
+ * corresponding hat.c system.
+ *
+ * For a normal (non-testing) caller, penrosectx_generate() is the
+ * main useful function. It breadth-first searches a whole area to
+ * generate all the triangles in it, starting from a (typically
+ * central) one with the coordinates of ctx->prototype. It takes two
+ * callback function: one that checks whether a triangle is within the
+ * bounds of the target area (and therefore the search should continue
+ * exploring its neighbours), and another that reports a full Penrose
+ * tile once both of its halves have been found and determined to be
+ * in bounds.
+ */
+typedef struct PenroseContext {
+    random_state *rs;
+    bool must_free_rs;
+    unsigned start_vertex; /* which vertex of 'prototype' is at the origin? */
+    int orientation;    /* orientation to put in PenrosePatchParams */
+    PenroseCoords *prototype;
+} PenroseContext;
+
+void penrosectx_init_random(PenroseContext *ctx, random_state *rs, int which);
+void penrosectx_init_from_params(
+    PenroseContext *ctx, const struct PenrosePatchParams *ps);
+void penrosectx_cleanup(PenroseContext *ctx);
+PenroseCoords *penrosectx_initial_coords(PenroseContext *ctx);
+void penrosectx_extend_coords(PenroseContext *ctx, PenroseCoords *pc,
+                              size_t n);
+void penrosectx_step(PenroseContext *ctx, PenroseCoords *pc,
+                     unsigned edge, unsigned *outedge);
+void penrosectx_generate(
+    PenroseContext *ctx,
+    bool (*inbounds)(void *inboundsctx,
+                     const PenroseTriangle *tri), void *inboundsctx,
+    void (*tile)(void *tilectx, const Point *vertices), void *tilectx);
+
+/* Subroutines that step around the tiling specified by a PenroseCtx,
+ * delivering both plane and combinatorial coordinates as they go */
+PenroseTriangle *penrose_initial(PenroseContext *ctx);
+PenroseTriangle *penrose_adjacent(PenroseContext *ctx,
+                                  const PenroseTriangle *src_spec,
+                                  unsigned src_edge, unsigned *dst_edge);
+
+/* For extracting the point coordinates */
+typedef struct Coord {
+    int c1, cr5;      /* coefficients of 1 and sqrt(5) respectively */
+} Coord;
+
+static inline Coord point_x(Point p)
+{
+    Coord x = {
+        4 * p.coeffs[0] + p.coeffs[1] - p.coeffs[2] + p.coeffs[3],
+        p.coeffs[1] + p.coeffs[2] - p.coeffs[3],
+    };
+    return x;
+}
+
+static inline Coord point_y(Point p)
+{
+    Coord y = {
+        2 * p.coeffs[1] + p.coeffs[2] + p.coeffs[3],
+        p.coeffs[2] + p.coeffs[3],
+    };
+    return y;
+}
+
+static inline int coord_sign(Coord x)
+{
+    if (x.c1 == 0 && x.cr5 == 0)
+        return 0;
+    if (x.c1 >= 0 && x.cr5 >= 0)
+        return +1;
+    if (x.c1 <= 0 && x.cr5 <= 0)
+        return -1;
+
+    if (x.c1 * x.c1 > 5 * x.cr5 * x.cr5)
+        return x.c1 < 0 ? -1 : +1;
+    else
+        return x.cr5 < 0 ? -1 : +1;
+}
+
+static inline Coord coord_construct(int c1, int cr5)
+{
+    Coord c = { c1, cr5 };
+    return c;
+}
+
+static inline Coord coord_integer(int c1)
+{
+    return coord_construct(c1, 0);
+}
+
+static inline Coord coord_add(Coord a, Coord b)
+{
+    Coord sum;
+    sum.c1 = a.c1 + b.c1;
+    sum.cr5 = a.cr5 + b.cr5;
+    return sum;
+}
+
+static inline Coord coord_sub(Coord a, Coord b)
+{
+    Coord diff;
+    diff.c1 = a.c1 - b.c1;
+    diff.cr5 = a.cr5 - b.cr5;
+    return diff;
+}
+
+static inline Coord coord_mul(Coord a, Coord b)
+{
+    Coord prod;
+    prod.c1 = a.c1 * b.c1 + 5 * a.cr5 * b.cr5;
+    prod.cr5 = a.c1 * b.cr5 + a.cr5 * b.c1;
+    return prod;
+}
+
+static inline Coord coord_abs(Coord a)
+{
+    int sign = coord_sign(a);
+    Coord abs;
+    abs.c1 = a.c1 * sign;
+    abs.cr5 = a.cr5 * sign;
+    return abs;
+}
+
+static inline int coord_cmp(Coord a, Coord b)
+{
+    return coord_sign(coord_sub(a, b));
+}
diff --git a/apps/plugins/puzzles/src/penrose-legacy.c b/apps/plugins/puzzles/src/penrose-legacy.c
new file mode 100644
index 0000000000..709d68d7f5
--- /dev/null
+++ b/apps/plugins/puzzles/src/penrose-legacy.c
@@ -0,0 +1,506 @@
+/* penrose-legacy.c: legacy Penrose tile generator.
+ *
+ * Works by choosing a small patch from a recursively expanded large
+ * region of tiling, using one of the two algorithms described at
+ *
+ * https://www.chiark.greenend.org.uk/~sgtatham/quasiblog/aperiodic-tilings/
+ *
+ * This method of generating Penrose tiling fragments is superseded by
+ * the completely different algorithm in penrose.c, using the other
+ * algorithm in that article (the 'combinatorial coordinates' one). We
+ * keep the legacy algorithm around only for interpreting Loopy game
+ * IDs generated by older versions of the code.
+ */
+
+#include <assert.h>
+#include <string.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+#include <stdio.h>
+
+#include "puzzles.h" /* for malloc routines, and PI */
+#include "penrose-legacy.h"
+
+/* -------------------------------------------------------
+ * 36-degree basis vector arithmetic routines.
+ */
+
+/* Imagine drawing a
+ * ten-point 'clock face' like this:
+ *
+ *                     -E
+ *                 -D   |   A
+ *                   \  |  /
+ *              -C.   \ | /   ,B
+ *                 `-._\|/_,-'
+ *                 ,-' /|\ `-.
+ *              -B'   / | \   `C
+ *                   /  |  \
+ *                 -A   |   D
+ *                      E
+ *
+ * In case the ASCII art isn't clear, those are supposed to be ten
+ * vectors of length 1, all sticking out from the origin at equal
+ * angular spacing (hence 36 degrees). Our basis vectors are A,B,C,D (I
+ * choose them to be symmetric about the x-axis so that the final
+ * translation into 2d coordinates will also be symmetric, which I
+ * think will avoid minor rounding uglinesses), so our vector
+ * representation sets
+ *
+ *   A = (1,0,0,0)
+ *   B = (0,1,0,0)
+ *   C = (0,0,1,0)
+ *   D = (0,0,0,1)
+ *
+ * The fifth vector E looks at first glance as if it needs to be
+ * another basis vector, but in fact it doesn't, because it can be
+ * represented in terms of the other four. Imagine starting from the
+ * origin and following the path -A, +B, -C, +D: you'll find you've
+ * traced four sides of a pentagram, and ended up one E-vector away
+ * from the origin. So we have
+ *
+ *   E = (-1,1,-1,1)
+ *
+ * This tells us that we can rotate any vector in this system by 36
+ * degrees: if we start with a*A + b*B + c*C + d*D, we want to end up
+ * with a*B + b*C + c*D + d*E, and we substitute our identity for E to
+ * turn that into a*B + b*C + c*D + d*(-A+B-C+D). In other words,
+ *
+ *   rotate_one_notch_clockwise(a,b,c,d) = (-d, d+a, -d+b, d+c)
+ *
+ * and you can verify for yourself that applying that operation
+ * repeatedly starting with (1,0,0,0) cycles round ten vectors and
+ * comes back to where it started.
+ *
+ * The other operation that may be required is to construct vectors
+ * with lengths that are multiples of phi. That can be done by
+ * observing that the vector C-B is parallel to E and has length 1/phi,
+ * and the vector D-A is parallel to E and has length phi. So this
+ * tells us that given any vector, we can construct one which points in
+ * the same direction and is 1/phi or phi times its length, like this:
+ *
+ *   divide_by_phi(vector) = rotate(vector, 2) - rotate(vector, 3)
+ *   multiply_by_phi(vector) = rotate(vector, 1) - rotate(vector, 4)
+ *
+ * where rotate(vector, n) means applying the above
+ * rotate_one_notch_clockwise primitive n times. Expanding out the
+ * applications of rotate gives the following direct representation in
+ * terms of the vector coordinates:
+ *
+ *   divide_by_phi(a,b,c,d) = (b-d, c+d-b, a+b-c, c-a)
+ *   multiply_by_phi(a,b,c,d) = (a+b-d, c+d, a+b, c+d-a)
+ *
+ * and you can verify for yourself that those two operations are
+ * inverses of each other (as you'd hope!).
+ *
+ * Having done all of this, testing for equality between two vectors is
+ * a trivial matter of comparing the four integer coordinates. (Which
+ * it _wouldn't_ have been if we'd kept E as a fifth basis vector,
+ * because then (-1,1,-1,1,0) and (0,0,0,0,1) would have had to be
+ * considered identical. So leaving E out is vital.)
+ */
+
+struct vector { int a, b, c, d; };
+
+static vector v_origin(void)
+{
+    vector v;
+    v.a = v.b = v.c = v.d = 0;
+    return v;
+}
+
+/* We start with a unit vector of B: this means we can easily
+ * draw an isoceles triangle centred on the X axis. */
+#ifdef TEST_VECTORS
+
+static vector v_unit(void)
+{
+    vector v;
+
+    v.b = 1;
+    v.a = v.c = v.d = 0;
+    return v;
+}
+
+#endif
+
+#define COS54 0.5877852
+#define SIN54 0.8090169
+#define COS18 0.9510565
+#define SIN18 0.3090169
+
+/* These two are a bit rough-and-ready for now. Note that B/C are
+ * 18 degrees from the x-axis, and A/D are 54 degrees. */
+double penrose_legacy_vx(vector *vs, int i)
+{
+    return (vs[i].a + vs[i].d) * COS54 +
+           (vs[i].b + vs[i].c) * COS18;
+}
+
+double penrose_legacy_vy(vector *vs, int i)
+{
+    return (vs[i].a - vs[i].d) * SIN54 +
+           (vs[i].b - vs[i].c) * SIN18;
+
+}
+
+static vector v_trans(vector v, vector trans)
+{
+    v.a += trans.a;
+    v.b += trans.b;
+    v.c += trans.c;
+    v.d += trans.d;
+    return v;
+}
+
+static vector v_rotate_36(vector v)
+{
+    vector vv;
+    vv.a = -v.d;
+    vv.b =  v.d + v.a;
+    vv.c = -v.d + v.b;
+    vv.d =  v.d + v.c;
+    return vv;
+}
+
+static vector v_rotate(vector v, int ang)
+{
+    int i;
+
+    assert((ang % 36) == 0);
+    while (ang < 0) ang += 360;
+    ang = 360-ang;
+    for (i = 0; i < (ang/36); i++)
+        v = v_rotate_36(v);
+    return v;
+}
+
+#ifdef TEST_VECTORS
+
+static vector v_scale(vector v, int sc)
+{
+    v.a *= sc;
+    v.b *= sc;
+    v.c *= sc;
+    v.d *= sc;
+    return v;
+}
+
+#endif
+
+static vector v_growphi(vector v)
+{
+    vector vv;
+    vv.a = v.a + v.b - v.d;
+    vv.b = v.c + v.d;
+    vv.c = v.a + v.b;
+    vv.d = v.c + v.d - v.a;
+    return vv;
+}
+
+static vector v_shrinkphi(vector v)
+{
+    vector vv;
+    vv.a = v.b - v.d;
+    vv.b = v.c + v.d - v.b;
+    vv.c = v.a + v.b - v.c;
+    vv.d = v.c - v.a;
+    return vv;
+}
+
+#ifdef TEST_VECTORS
+
+static const char *v_debug(vector v)
+{
+    static char buf[255];
+    sprintf(buf,
+             "(%d,%d,%d,%d)[%2.2f,%2.2f]",
+             v.a, v.b, v.c, v.d, v_x(&v,0), v_y(&v,0));
+    return buf;
+}
+
+#endif
+
+/* -------------------------------------------------------
+ * Tiling routines.
+ */
+
+static vector xform_coord(vector vo, int shrink, vector vtrans, int ang)
+{
+    if (shrink < 0)
+        vo = v_shrinkphi(vo);
+    else if (shrink > 0)
+        vo = v_growphi(vo);
+
+    vo = v_rotate(vo, ang);
+    vo = v_trans(vo, vtrans);
+
+    return vo;
+}
+
+
+#define XFORM(n,o,s,a) vs[(n)] = xform_coord(v_edge, (s), vs[(o)], (a))
+
+static int penrose_p2_small(penrose_legacy_state *state, int depth, int flip,
+                            vector v_orig, vector v_edge);
+
+static int penrose_p2_large(penrose_legacy_state *state, int depth, int flip,
+                            vector v_orig, vector v_edge)
+{
+    vector vv_orig, vv_edge;
+
+#ifdef DEBUG_PENROSE
+    {
+        vector vs[3];
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, 0);
+        XFORM(2, 0, 0, -36*flip);
+
+        state->new_tile(state, vs, 3, depth);
+    }
+#endif
+
+    if (flip > 0) {
+        vector vs[4];
+
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, -36);
+        XFORM(2, 0, 0, 0);
+        XFORM(3, 0, 0, 36);
+
+        state->new_tile(state, vs, 4, depth);
+    }
+    if (depth >= state->max_depth) return 0;
+
+    vv_orig = v_trans(v_orig, v_rotate(v_edge, -36*flip));
+    vv_edge = v_rotate(v_edge, 108*flip);
+
+    penrose_p2_small(state, depth+1, flip,
+                     v_orig, v_shrinkphi(v_edge));
+
+    penrose_p2_large(state, depth+1, flip,
+                     vv_orig, v_shrinkphi(vv_edge));
+    penrose_p2_large(state, depth+1, -flip,
+                     vv_orig, v_shrinkphi(vv_edge));
+
+    return 0;
+}
+
+static int penrose_p2_small(penrose_legacy_state *state, int depth, int flip,
+                            vector v_orig, vector v_edge)
+{
+    vector vv_orig;
+
+#ifdef DEBUG_PENROSE
+    {
+        vector vs[3];
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, 0);
+        XFORM(2, 0, -1, -36*flip);
+
+        state->new_tile(state, vs, 3, depth);
+    }
+#endif
+
+    if (flip > 0) {
+        vector vs[4];
+
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, -72);
+        XFORM(2, 0, -1, -36);
+        XFORM(3, 0, 0, 0);
+
+        state->new_tile(state, vs, 4, depth);
+    }
+
+    if (depth >= state->max_depth) return 0;
+
+    vv_orig = v_trans(v_orig, v_edge);
+
+    penrose_p2_large(state, depth+1, -flip,
+                     v_orig, v_shrinkphi(v_rotate(v_edge, -36*flip)));
+
+    penrose_p2_small(state, depth+1, flip,
+                     vv_orig, v_shrinkphi(v_rotate(v_edge, -144*flip)));
+
+    return 0;
+}
+
+static int penrose_p3_small(penrose_legacy_state *state, int depth, int flip,
+                            vector v_orig, vector v_edge);
+
+static int penrose_p3_large(penrose_legacy_state *state, int depth, int flip,
+                            vector v_orig, vector v_edge)
+{
+    vector vv_orig;
+
+#ifdef DEBUG_PENROSE
+    {
+        vector vs[3];
+        vs[0] = v_orig;
+        XFORM(1, 0, 1, 0);
+        XFORM(2, 0, 0, -36*flip);
+
+        state->new_tile(state, vs, 3, depth);
+    }
+#endif
+
+    if (flip > 0) {
+        vector vs[4];
+
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, -36);
+        XFORM(2, 0, 1, 0);
+        XFORM(3, 0, 0, 36);
+
+        state->new_tile(state, vs, 4, depth);
+    }
+    if (depth >= state->max_depth) return 0;
+
+    vv_orig = v_trans(v_orig, v_edge);
+
+    penrose_p3_large(state, depth+1, -flip,
+                     vv_orig, v_shrinkphi(v_rotate(v_edge, 180)));
+
+    penrose_p3_small(state, depth+1, flip,
+                     vv_orig, v_shrinkphi(v_rotate(v_edge, -108*flip)));
+
+    vv_orig = v_trans(v_orig, v_growphi(v_edge));
+
+    penrose_p3_large(state, depth+1, flip,
+                     vv_orig, v_shrinkphi(v_rotate(v_edge, -144*flip)));
+
+
+    return 0;
+}
+
+static int penrose_p3_small(penrose_legacy_state *state, int depth, int flip,
+                            vector v_orig, vector v_edge)
+{
+    vector vv_orig;
+
+#ifdef DEBUG_PENROSE
+    {
+        vector vs[3];
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, 0);
+        XFORM(2, 0, 0, -36*flip);
+
+        state->new_tile(state, vs, 3, depth);
+    }
+#endif
+
+    if (flip > 0) {
+        vector vs[4];
+
+        vs[0] = v_orig;
+        XFORM(1, 0, 0, -36);
+        XFORM(3, 0, 0, 0);
+        XFORM(2, 3, 0, -36);
+
+        state->new_tile(state, vs, 4, depth);
+    }
+    if (depth >= state->max_depth) return 0;
+
+    /* NB these two are identical to the first two of p3_large. */
+    vv_orig = v_trans(v_orig, v_edge);
+
+    penrose_p3_large(state, depth+1, -flip,
+                     vv_orig, v_shrinkphi(v_rotate(v_edge, 180)));
+
+    penrose_p3_small(state, depth+1, flip,
+                     vv_orig, v_shrinkphi(v_rotate(v_edge, -108*flip)));
+
+    return 0;
+}
+
+/* -------------------------------------------------------
+ * Utility routines.
+ */
+
+double penrose_legacy_side_length(double start_size, int depth)
+{
+  return start_size / pow(PHI, depth);
+}
+
+/*
+ * It turns out that an acute isosceles triangle with sides in ratio 1:phi:phi
+ * has an incentre which is conveniently 2*phi^-2 of the way from the apex to
+ * the base. Why's that convenient? Because: if we situate the incentre of the
+ * triangle at the origin, then we can place the apex at phi^-2 * (B+C), and
+ * the other two vertices at apex-B and apex-C respectively. So that's an acute
+ * triangle with its long sides of unit length, covering a circle about the
+ * origin of radius 1-(2*phi^-2), which is conveniently enough phi^-3.
+ *
+ * (later mail: this is an overestimate by about 5%)
+ */
+
+int penrose_legacy(penrose_legacy_state *state, int which, int angle)
+{
+    vector vo = v_origin();
+    vector vb = v_origin();
+
+    vo.b = vo.c = -state->start_size;
+    vo = v_shrinkphi(v_shrinkphi(vo));
+
+    vb.b = state->start_size;
+
+    vo = v_rotate(vo, angle);
+    vb = v_rotate(vb, angle);
+
+    if (which == PENROSE_P2)
+        return penrose_p2_large(state, 0, 1, vo, vb);
+    else
+        return penrose_p3_small(state, 0, 1, vo, vb);
+}
+
+/*
+ * We're asked for a MxN grid, which just means a tiling fitting into roughly
+ * an MxN space in some kind of reasonable unit - say, the side length of the
+ * two-arrow edges of the tiles. By some reasoning in a previous email, that
+ * means we want to pick some subarea of a circle of radius 3.11*sqrt(M^2+N^2).
+ * To cover that circle, we need to subdivide a triangle large enough that it
+ * contains a circle of that radius.
+ *
+ * Hence: start with those three vectors marking triangle vertices, scale them
+ * all up by phi repeatedly until the radius of the inscribed circle gets
+ * bigger than the target, and then recurse into that triangle with the same
+ * recursion depth as the number of times you scaled up. That will give you
+ * tiles of unit side length, covering a circle big enough that if you randomly
+ * choose an orientation and coordinates within the circle, you'll be able to
+ * get any valid piece of Penrose tiling of size MxN.
+ */
+#define INCIRCLE_RADIUS 0.22426 /* phi^-3 less 5%: see above */
+
+void penrose_legacy_calculate_size(
+    int which, int tilesize, int w, int h,
+    double *required_radius, int *start_size, int *depth)
+{
+    double rradius, size;
+    int n = 0;
+
+    /*
+     * Fudge factor to scale P2 and P3 tilings differently. This
+     * doesn't seem to have much relevance to questions like the
+     * average number of tiles per unit area; it's just aesthetic.
+     */
+    if (which == PENROSE_P2)
+        tilesize = tilesize * 3 / 2;
+    else
+        tilesize = tilesize * 5 / 4;
+
+    rradius = tilesize * 3.11 * sqrt((double)(w*w + h*h));
+    size = tilesize;
+
+    while ((size * INCIRCLE_RADIUS) < rradius) {
+        n++;
+        size = size * PHI;
+    }
+
+    *start_size = (int)size;
+    *depth = n;
+    *required_radius = rradius;
+}
diff --git a/apps/plugins/puzzles/src/penrose-legacy.h b/apps/plugins/puzzles/src/penrose-legacy.h
new file mode 100644
index 0000000000..514fd8b592
--- /dev/null
+++ b/apps/plugins/puzzles/src/penrose-legacy.h
@@ -0,0 +1,63 @@
+/* penrose-legacy.h: legacy Penrose tiling functions.
+ *
+ * Provides an interface with which to generate Penrose tilings
+ * by recursive subdivision of an initial tile of choice (one of the
+ * four sets of two pairs kite/dart, or thin/thick rhombus).
+ *
+ * You supply a callback function and a context pointer, which is
+ * called with each tile in turn: you choose how many times to recurse.
+ *
+ * This method of generating Penrose tiling fragments is superseded by
+ * the completely different algorithm in penrose.c. We keep the legacy
+ * algorithm around only for interpreting Loopy game IDs generated by
+ * older versions of the code.
+ */
+
+#ifndef PUZZLES_PENROSE_LEGACY_H
+#define PUZZLES_PENROSE_LEGACY_H
+
+#ifndef PHI
+#define PHI 1.6180339887
+#endif
+
+typedef struct vector vector;
+
+double penrose_legacy_vx(vector *vs, int i);
+double penrose_legacy_vy(vector *vs, int i);
+
+typedef struct penrose_legacy_state penrose_legacy_state;
+
+/* Return non-zero to clip the tree here (i.e. not recurse
+ * below this tile).
+ *
+ * Parameters are state, vector array, npoints, depth.
+ * ctx is inside state.
+ */
+typedef int (*tile_callback)(penrose_legacy_state *, vector *, int, int);
+
+struct penrose_legacy_state {
+    int start_size;  /* initial side length */
+    int max_depth;      /* Recursion depth */
+
+    tile_callback new_tile;
+    void *ctx;          /* for callback */
+};
+
+#ifndef PENROSE_ENUM_DEFINED
+#define PENROSE_ENUM_DEFINED
+enum { PENROSE_P2, PENROSE_P3 };
+#endif
+
+extern int penrose_legacy(penrose_legacy_state *state, int which, int angle);
+
+/* Returns the side-length of a penrose tile at recursion level
+ * gen, given a starting side length. */
+extern double penrose_legacy_side_length(double start_size, int depth);
+
+/* Calculate start size and recursion depth required to produce a
+ * width-by-height sized patch of penrose tiles with the given tilesize */
+extern void penrose_legacy_calculate_size(
+    int which, int tilesize, int w, int h,
+    double *required_radius, int *start_size, int *depth);
+
+#endif
diff --git a/apps/plugins/puzzles/src/penrose.c b/apps/plugins/puzzles/src/penrose.c
index ccde30d8b4..4d7dcc4347 100644
--- a/apps/plugins/puzzles/src/penrose.c
+++ b/apps/plugins/puzzles/src/penrose.c
@@ -1,629 +1,894 @@
-/* penrose.c
- *
- * Penrose tile generator.
+/*
+ * Generate Penrose tilings via combinatorial coordinates.
  *
- * Uses half-tile technique outlined on:
+ * For general explanation of the algorithm:
+ * https://www.chiark.greenend.org.uk/~sgtatham/quasiblog/aperiodic-tilings/
  *
- * http://tartarus.org/simon/20110412-penrose/penrose.xhtml
+ * I use exactly the same indexing system here that's described in the
+ * article. For the P2 tiling, acute isosceles triangles (half-kites)
+ * are assigned letters A,B, and obtuse ones (half-darts) U,V; for P3,
+ * acute triangles (half of a thin rhomb) are C,D and obtuse ones
+ * (half a thick rhomb) are X,Y. Edges of all triangles are indexed
+ * anticlockwise around the triangle, with 0 being the base and 1,2
+ * being the two equal legs.
  */
 
 #include <assert.h>
+#include <stddef.h>
 #include <string.h>
-#include <math.h>
-#include <stdio.h>
 
-#include "puzzles.h" /* for malloc routines, and PI */
+#include "puzzles.h"
 #include "penrose.h"
+#include "penrose-internal.h"
+#include "tree234.h"
 
-/* -------------------------------------------------------
- * 36-degree basis vector arithmetic routines.
- */
+bool penrose_valid_letter(char c, int which)
+{
+    switch (c) {
+      case 'A': case 'B': case 'U': case 'V':
+        return which == PENROSE_P2;
+      case 'C': case 'D': case 'X': case 'Y':
+        return which == PENROSE_P3;
+      default:
+        return false;
+    }
+}
 
-/* Imagine drawing a
- * ten-point 'clock face' like this:
- *
- *                     -E
- *                 -D   |   A
- *                   \  |  /
- *              -C.   \ | /   ,B
- *                 `-._\|/_,-'
- *                 ,-' /|\ `-.
- *              -B'   / | \   `C
- *                   /  |  \
- *                 -A   |   D
- *                      E
- *
- * In case the ASCII art isn't clear, those are supposed to be ten
- * vectors of length 1, all sticking out from the origin at equal
- * angular spacing (hence 36 degrees). Our basis vectors are A,B,C,D (I
- * choose them to be symmetric about the x-axis so that the final
- * translation into 2d coordinates will also be symmetric, which I
- * think will avoid minor rounding uglinesses), so our vector
- * representation sets
- *
- *   A = (1,0,0,0)
- *   B = (0,1,0,0)
- *   C = (0,0,1,0)
- *   D = (0,0,0,1)
- *
- * The fifth vector E looks at first glance as if it needs to be
- * another basis vector, but in fact it doesn't, because it can be
- * represented in terms of the other four. Imagine starting from the
- * origin and following the path -A, +B, -C, +D: you'll find you've
- * traced four sides of a pentagram, and ended up one E-vector away
- * from the origin. So we have
- *
- *   E = (-1,1,-1,1)
- *
- * This tells us that we can rotate any vector in this system by 36
- * degrees: if we start with a*A + b*B + c*C + d*D, we want to end up
- * with a*B + b*C + c*D + d*E, and we substitute our identity for E to
- * turn that into a*B + b*C + c*D + d*(-A+B-C+D). In other words,
- *
- *   rotate_one_notch_clockwise(a,b,c,d) = (-d, d+a, -d+b, d+c)
- *
- * and you can verify for yourself that applying that operation
- * repeatedly starting with (1,0,0,0) cycles round ten vectors and
- * comes back to where it started.
- *
- * The other operation that may be required is to construct vectors
- * with lengths that are multiples of phi. That can be done by
- * observing that the vector C-B is parallel to E and has length 1/phi,
- * and the vector D-A is parallel to E and has length phi. So this
- * tells us that given any vector, we can construct one which points in
- * the same direction and is 1/phi or phi times its length, like this:
- *
- *   divide_by_phi(vector) = rotate(vector, 2) - rotate(vector, 3)
- *   multiply_by_phi(vector) = rotate(vector, 1) - rotate(vector, 4)
- *
- * where rotate(vector, n) means applying the above
- * rotate_one_notch_clockwise primitive n times. Expanding out the
- * applications of rotate gives the following direct representation in
- * terms of the vector coordinates:
- *
- *   divide_by_phi(a,b,c,d) = (b-d, c+d-b, a+b-c, c-a)
- *   multiply_by_phi(a,b,c,d) = (a+b-d, c+d, a+b, c+d-a)
- *
- * and you can verify for yourself that those two operations are
- * inverses of each other (as you'd hope!).
+/*
+ * Result of attempting a transition within the coordinate system.
+ * INTERNAL means we've moved to a different child of the same parent,
+ * so the 'internal' substructure gives the type of the new triangle
+ * and which edge of it we came in through; EXTERNAL means we've moved
+ * out of the parent entirely, and the 'external' substructure tells
+ * us which edge of the parent triangle we left by, and if it's
+ * divided in two, which end of that edge (-1 for the left end or +1
+ * for the right end). If the parent edge is undivided, end == 0.
  *
- * Having done all of this, testing for equality between two vectors is
- * a trivial matter of comparing the four integer coordinates. (Which
- * it _wouldn't_ have been if we'd kept E as a fifth basis vector,
- * because then (-1,1,-1,1,0) and (0,0,0,0,1) would have had to be
- * considered identical. So leaving E out is vital.)
+ * The type FAIL _shouldn't_ ever come up! It occurs if you try to
+ * compute an incoming transition with an illegal value of 'end' (i.e.
+ * having the wrong idea of whether the edge is divided), or if you
+ * refer to a child triangle type that doesn't exist in that parent.
+ * If it ever happens in the production code then an assertion will
+ * fail. But it might be useful to other users of the same code.
  */
-
-struct vector { int a, b, c, d; };
-
-static vector v_origin(void)
+typedef struct TransitionResult {
+    enum { INTERNAL, EXTERNAL, FAIL } type;
+    union {
+        struct {
+            char new_child;
+            unsigned char new_edge;
+        } internal;
+        struct {
+            unsigned char parent_edge;
+            signed char end;
+        } external;
+    } u;
+} TransitionResult;
+
+/* Construction function to make an INTERNAL-type TransitionResult */
+static inline TransitionResult internal(char new_child, unsigned new_edge)
 {
-    vector v;
-    v.a = v.b = v.c = v.d = 0;
-    return v;
+    TransitionResult tr;
+    tr.type = INTERNAL;
+    tr.u.internal.new_child = new_child;
+    tr.u.internal.new_edge = new_edge;
+    return tr;
 }
 
-/* We start with a unit vector of B: this means we can easily
- * draw an isoceles triangle centred on the X axis. */
-#ifdef TEST_VECTORS
+/* Construction function to make an EXTERNAL-type TransitionResult */
+static inline TransitionResult external(unsigned parent_edge, int end)
+{
+    TransitionResult tr;
+    tr.type = EXTERNAL;
+    tr.u.external.parent_edge = parent_edge;
+    tr.u.external.end = end;
+    return tr;
+}
 
-static vector v_unit(void)
+/* Construction function to make a FAIL-type TransitionResult */
+static inline TransitionResult fail(void)
 {
-    vector v;
+    TransitionResult tr;
+    tr.type = FAIL;
+    return tr;
+}
 
-    v.b = 1;
-    v.a = v.c = v.d = 0;
-    return v;
+/*
+ * Compute a transition out of a triangle. Can return either INTERNAL
+ * or EXTERNAL types (or FAIL if it gets invalid data).
+ */
+static TransitionResult transition(char parent, char child, unsigned edge)
+{
+    switch (parent) {
+      case 'A':
+        switch (child) {
+          case 'A':
+            switch (edge) {
+              case 0: return external(2, -1);
+              case 1: return external(0, 0);
+              case 2: return internal('B', 1);
+            }
+          case 'B':
+            switch (edge) {
+              case 0: return internal('U', 1);
+              case 1: return internal('A', 2);
+              case 2: return external(1, +1);
+            }
+          case 'U':
+            switch (edge) {
+              case 0: return external(2, +1);
+              case 1: return internal('B', 0);
+              case 2: return external(1, -1);
+            }
+          default:
+            return fail();
+        }
+      case 'B':
+        switch (child) {
+          case 'A':
+            switch (edge) {
+              case 0: return internal('V', 2);
+              case 1: return external(2, -1);
+              case 2: return internal('B', 1);
+            }
+          case 'B':
+            switch (edge) {
+              case 0: return external(1, +1);
+              case 1: return internal('A', 2);
+              case 2: return external(0, 0);
+            }
+          case 'V':
+            switch (edge) {
+              case 0: return external(1, -1);
+              case 1: return external(2, +1);
+              case 2: return internal('A', 0);
+            }
+          default:
+            return fail();
+        }
+      case 'U':
+        switch (child) {
+          case 'B':
+            switch (edge) {
+              case 0: return internal('U', 1);
+              case 1: return external(2, 0);
+              case 2: return external(0, +1);
+            }
+          case 'U':
+            switch (edge) {
+              case 0: return external(1, 0);
+              case 1: return internal('B', 0);
+              case 2: return external(0, -1);
+            }
+          default:
+            return fail();
+        }
+      case 'V':
+        switch (child) {
+          case 'A':
+            switch (edge) {
+              case 0: return internal('V', 2);
+              case 1: return external(0, -1);
+              case 2: return external(1, 0);
+            }
+          case 'V':
+            switch (edge) {
+              case 0: return external(2, 0);
+              case 1: return external(0, +1);
+              case 2: return internal('A', 0);
+            }
+          default:
+            return fail();
+        }
+      case 'C':
+        switch (child) {
+          case 'C':
+            switch (edge) {
+              case 0: return external(1, +1);
+              case 1: return internal('Y', 1);
+              case 2: return external(0, 0);
+            }
+          case 'Y':
+            switch (edge) {
+              case 0: return external(2, 0);
+              case 1: return internal('C', 1);
+              case 2: return external(1, -1);
+            }
+          default:
+            return fail();
+        }
+      case 'D':
+        switch (child) {
+          case 'D':
+            switch (edge) {
+              case 0: return external(2, -1);
+              case 1: return external(0, 0);
+              case 2: return internal('X', 2);
+            }
+          case 'X':
+            switch (edge) {
+              case 0: return external(1, 0);
+              case 1: return external(2, +1);
+              case 2: return internal('D', 2);
+            }
+          default:
+            return fail();
+        }
+      case 'X':
+        switch (child) {
+          case 'C':
+            switch (edge) {
+              case 0: return external(2, +1);
+              case 1: return internal('Y', 1);
+              case 2: return internal('X', 1);
+            }
+          case 'X':
+            switch (edge) {
+              case 0: return external(1, 0);
+              case 1: return internal('C', 2);
+              case 2: return external(0, -1);
+            }
+          case 'Y':
+            switch (edge) {
+              case 0: return external(0, +1);
+              case 1: return internal('C', 1);
+              case 2: return external(2, -1);
+            }
+          default:
+            return fail();
+        }
+      case 'Y':
+        switch (child) {
+          case 'D':
+            switch (edge) {
+              case 0: return external(1, -1);
+              case 1: return internal('Y', 2);
+              case 2: return internal('X', 2);
+            }
+          case 'X':
+            switch (edge) {
+              case 0: return external(0, -1);
+              case 1: return external(1, +1);
+              case 2: return internal('D', 2);
+            }
+          case 'Y':
+            switch (edge) {
+              case 0: return external(2, 0);
+              case 1: return external(0, +1);
+              case 2: return internal('D', 1);
+            }
+          default:
+            return fail();
+        }
+      default:
+        return fail();
+    }
 }
 
-#endif
+/*
+ * Compute a transition into a parent triangle, after the above
+ * function reported an EXTERNAL transition out of a neighbouring
+ * parent and we had to recurse. Because we're coming inwards, this
+ * should always return an INTERNAL TransitionResult (or FAIL if it
+ * gets invalid data).
+ */
+static TransitionResult transition_in(char parent, unsigned edge, int end)
+{
+    #define EDGEEND(edge, end) (3 * (edge) + 1 + (end))
+
+    switch (parent) {
+      case 'A':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, 0): return internal('A', 1);
+          case EDGEEND(1, -1): return internal('B', 2);
+          case EDGEEND(1, +1): return internal('U', 2);
+          case EDGEEND(2, -1): return internal('U', 0);
+          case EDGEEND(2, +1): return internal('A', 0);
+          default:
+            return fail();
+        }
+      case 'B':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, 0): return internal('B', 2);
+          case EDGEEND(1, -1): return internal('B', 0);
+          case EDGEEND(1, +1): return internal('V', 0);
+          case EDGEEND(2, -1): return internal('V', 1);
+          case EDGEEND(2, +1): return internal('A', 1);
+          default:
+            return fail();
+        }
+      case 'U':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, -1): return internal('B', 2);
+          case EDGEEND(0, +1): return internal('U', 2);
+          case EDGEEND(1, 0): return internal('U', 0);
+          case EDGEEND(2, 0): return internal('B', 1);
+          default:
+            return fail();
+        }
+      case 'V':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, -1): return internal('V', 1);
+          case EDGEEND(0, +1): return internal('A', 1);
+          case EDGEEND(1, 0): return internal('A', 2);
+          case EDGEEND(2, 0): return internal('V', 0);
+          default:
+            return fail();
+        }
+      case 'C':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, 0): return internal('C', 2);
+          case EDGEEND(1, -1): return internal('C', 0);
+          case EDGEEND(1, +1): return internal('Y', 2);
+          case EDGEEND(2, 0): return internal('Y', 0);
+          default:
+            return fail();
+        }
+      case 'D':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, 0): return internal('D', 1);
+          case EDGEEND(1, 0): return internal('X', 0);
+          case EDGEEND(2, -1): return internal('X', 1);
+          case EDGEEND(2, +1): return internal('D', 0);
+          default:
+            return fail();
+        }
+      case 'X':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, -1): return internal('Y', 0);
+          case EDGEEND(0, +1): return internal('X', 2);
+          case EDGEEND(1, 0): return internal('X', 0);
+          case EDGEEND(2, -1): return internal('C', 0);
+          case EDGEEND(2, +1): return internal('Y', 2);
+          default:
+            return fail();
+        }
+      case 'Y':
+        switch (EDGEEND(edge, end)) {
+          case EDGEEND(0, +1): return internal('X', 0);
+          case EDGEEND(0, -1): return internal('Y', 1);
+          case EDGEEND(1, -1): return internal('X', 1);
+          case EDGEEND(1, +1): return internal('D', 0);
+          case EDGEEND(2, 0): return internal('Y', 0);
+          default:
+            return fail();
+        }
+      default:
+        return fail();
+    }
 
-#define COS54 0.5877852
-#define SIN54 0.8090169
-#define COS18 0.9510565
-#define SIN18 0.3090169
+    #undef EDGEEND
+}
 
-/* These two are a bit rough-and-ready for now. Note that B/C are
- * 18 degrees from the x-axis, and A/D are 54 degrees. */
-double v_x(vector *vs, int i)
+PenroseCoords *penrose_coords_new(void)
 {
-    return (vs[i].a + vs[i].d) * COS54 +
-           (vs[i].b + vs[i].c) * COS18;
+    PenroseCoords *pc = snew(PenroseCoords);
+    pc->nc = pc->csize = 0;
+    pc->c = NULL;
+    return pc;
 }
 
-double v_y(vector *vs, int i)
+void penrose_coords_free(PenroseCoords *pc)
 {
-    return (vs[i].a - vs[i].d) * SIN54 +
-           (vs[i].b - vs[i].c) * SIN18;
-
+    if (pc) {
+        sfree(pc->c);
+        sfree(pc);
+    }
 }
 
-static vector v_trans(vector v, vector trans)
+void penrose_coords_make_space(PenroseCoords *pc, size_t size)
 {
-    v.a += trans.a;
-    v.b += trans.b;
-    v.c += trans.c;
-    v.d += trans.d;
-    return v;
+    if (pc->csize < size) {
+        pc->csize = pc->csize * 5 / 4 + 16;
+        if (pc->csize < size)
+            pc->csize = size;
+        pc->c = sresize(pc->c, pc->csize, char);
+    }
 }
 
-static vector v_rotate_36(vector v)
+PenroseCoords *penrose_coords_copy(PenroseCoords *pc_in)
 {
-    vector vv;
-    vv.a = -v.d;
-    vv.b =  v.d + v.a;
-    vv.c = -v.d + v.b;
-    vv.d =  v.d + v.c;
-    return vv;
+    PenroseCoords *pc_out = penrose_coords_new();
+    penrose_coords_make_space(pc_out, pc_in->nc);
+    memcpy(pc_out->c, pc_in->c, pc_in->nc * sizeof(*pc_out->c));
+    pc_out->nc = pc_in->nc;
+    return pc_out;
 }
 
-static vector v_rotate(vector v, int ang)
+/*
+ * The main recursive function for computing the next triangle's
+ * combinatorial coordinates.
+ */
+static void penrosectx_step_recurse(
+    PenroseContext *ctx, PenroseCoords *pc, size_t depth,
+    unsigned edge, unsigned *outedge)
 {
-    int i;
+    TransitionResult tr;
+
+    penrosectx_extend_coords(ctx, pc, depth+2);
+
+    /* Look up the transition out of the starting triangle */
+    tr = transition(pc->c[depth+1], pc->c[depth], edge);
+
+    /* If we've left the parent triangle, recurse to find out what new
+     * triangle we've landed in at the next size up, and then call
+     * transition_in to find out which child of that parent we're
+     * going to */
+    if (tr.type == EXTERNAL) {
+        unsigned parent_outedge;
+        penrosectx_step_recurse(
+            ctx, pc, depth+1, tr.u.external.parent_edge, &parent_outedge);
+        tr = transition_in(pc->c[depth+1], parent_outedge, tr.u.external.end);
+    }
 
-    assert((ang % 36) == 0);
-    while (ang < 0) ang += 360;
-    ang = 360-ang;
-    for (i = 0; i < (ang/36); i++)
-        v = v_rotate_36(v);
-    return v;
+    /* Now we should definitely have ended up in a child of the
+     * (perhaps rewritten) parent triangle */
+    assert(tr.type == INTERNAL);
+    pc->c[depth] = tr.u.internal.new_child;
+    *outedge = tr.u.internal.new_edge;
 }
 
-#ifdef TEST_VECTORS
-
-static vector v_scale(vector v, int sc)
+void penrosectx_step(PenroseContext *ctx, PenroseCoords *pc,
+                     unsigned edge, unsigned *outedge)
 {
-    v.a *= sc;
-    v.b *= sc;
-    v.c *= sc;
-    v.d *= sc;
-    return v;
-}
+    /* Allow outedge to be NULL harmlessly, just in case */
+    unsigned dummy_outedge;
+    if (!outedge)
+        outedge = &dummy_outedge;
 
-#endif
+    penrosectx_step_recurse(ctx, pc, 0, edge, outedge);
+}
 
-static vector v_growphi(vector v)
+static Point penrose_triangle_post_edge(char c, unsigned edge)
 {
-    vector vv;
-    vv.a = v.a + v.b - v.d;
-    vv.b = v.c + v.d;
-    vv.c = v.a + v.b;
-    vv.d = v.c + v.d - v.a;
-    return vv;
+    static const Point acute_post_edge[3] = {
+        {{-1, 1, 0, 1}}, /* phi * t^3 */
+        {{-1, 1, -1, 1}}, /* t^4 */
+        {{-1, 1, 0, 0}}, /* 1/phi * t^3 */
+    };
+    static const Point obtuse_post_edge[3] = {
+        {{0, -1, 1, 0}}, /* 1/phi * t^4 */
+        {{0, 0, 1, 0}}, /* t^2 */
+        {{-1, 0, 0, 1}}, /* phi * t^4 */
+    };
+
+    switch (c) {
+      case 'A': case 'B': case 'C': case 'D':
+        return acute_post_edge[edge];
+      default: /* case 'U': case 'V': case 'X': case 'Y': */
+        return obtuse_post_edge[edge];
+    }
 }
 
-static vector v_shrinkphi(vector v)
+void penrose_place(PenroseTriangle *tri, Point u, Point v, int index_of_u)
 {
-    vector vv;
-    vv.a = v.b - v.d;
-    vv.b = v.c + v.d - v.b;
-    vv.c = v.a + v.b - v.c;
-    vv.d = v.c - v.a;
-    return vv;
+    unsigned i;
+    Point here = u, delta = point_sub(v, u);
+
+    for (i = 0; i < 3; i++) {
+        unsigned edge = (index_of_u + i) % 3;
+        tri->vertices[edge] = here;
+        here = point_add(here, delta);
+        delta = point_mul(delta, penrose_triangle_post_edge(
+                              tri->pc->c[0], edge));
+    }
 }
 
-#ifdef TEST_VECTORS
-
-static const char *v_debug(vector v)
+void penrose_free(PenroseTriangle *tri)
 {
-    static char buf[255];
-    sprintf(buf,
-             "(%d,%d,%d,%d)[%2.2f,%2.2f]",
-             v.a, v.b, v.c, v.d, v_x(&v,0), v_y(&v,0));
-    return buf;
+    penrose_coords_free(tri->pc);
+    sfree(tri);
 }
 
-#endif
-
-/* -------------------------------------------------------
- * Tiling routines.
- */
-
-static vector xform_coord(vector vo, int shrink, vector vtrans, int ang)
+static bool penrose_relative_probability(char c)
 {
-    if (shrink < 0)
-        vo = v_shrinkphi(vo);
-    else if (shrink > 0)
-        vo = v_growphi(vo);
-
-    vo = v_rotate(vo, ang);
-    vo = v_trans(vo, vtrans);
-
-    return vo;
+    /* Penrose tile probability ratios are always phi, so we can
+     * approximate that very well using two consecutive Fibonacci
+     * numbers */
+    switch (c) {
+      case 'A': case 'B': case 'X': case 'Y':
+        return 165580141;
+      case 'C': case 'D': case 'U': case 'V':
+        return 102334155;
+      default:
+        return 0;
+    }
 }
 
-
-#define XFORM(n,o,s,a) vs[(n)] = xform_coord(v_edge, (s), vs[(o)], (a))
-
-static int penrose_p2_small(penrose_state *state, int depth, int flip,
-                            vector v_orig, vector v_edge);
-
-static int penrose_p2_large(penrose_state *state, int depth, int flip,
-                            vector v_orig, vector v_edge)
+static char penrose_choose_random(const char *possibilities, random_state *rs)
 {
-    vector vv_orig, vv_edge;
-
-#ifdef DEBUG_PENROSE
-    {
-        vector vs[3];
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, 0);
-        XFORM(2, 0, 0, -36*flip);
-
-        state->new_tile(state, vs, 3, depth);
+    const char *p;
+    unsigned long value, limit = 0;
+
+    for (p = possibilities; *p; p++)
+        limit += penrose_relative_probability(*p);
+    value = random_upto(rs, limit);
+    for (p = possibilities; *p; p++) {
+        unsigned long curr = penrose_relative_probability(*p);
+        if (value < curr)
+            return *p;
+        value -= curr;
     }
-#endif
-
-    if (flip > 0) {
-        vector vs[4];
+    assert(false && "Probability overflow!");
+    return possibilities[0];
+}
 
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, -36);
-        XFORM(2, 0, 0, 0);
-        XFORM(3, 0, 0, 36);
+static const char *penrose_starting_tiles(int which)
+{
+    return which == PENROSE_P2 ? "ABUV" : "CDXY";
+}
 
-        state->new_tile(state, vs, 4, depth);
+static const char *penrose_valid_parents(char tile)
+{
+    switch (tile) {
+      case 'A': return "ABV";
+      case 'B': return "ABU";
+      case 'U': return "AU";
+      case 'V': return "BV";
+      case 'C': return "CX";
+      case 'D': return "DY";
+      case 'X': return "DXY";
+      case 'Y': return "CXY";
+      default: return NULL;
     }
-    if (depth >= state->max_depth) return 0;
-
-    vv_orig = v_trans(v_orig, v_rotate(v_edge, -36*flip));
-    vv_edge = v_rotate(v_edge, 108*flip);
-
-    penrose_p2_small(state, depth+1, flip,
-                     v_orig, v_shrinkphi(v_edge));
+}
 
-    penrose_p2_large(state, depth+1, flip,
-                     vv_orig, v_shrinkphi(vv_edge));
-    penrose_p2_large(state, depth+1, -flip,
-                     vv_orig, v_shrinkphi(vv_edge));
+void penrosectx_init_random(PenroseContext *ctx, random_state *rs, int which)
+{
+    ctx->rs = rs;
+    ctx->must_free_rs = false;
+    ctx->prototype = penrose_coords_new();
+    penrose_coords_make_space(ctx->prototype, 1);
+    ctx->prototype->c[0] = penrose_choose_random(
+        penrose_starting_tiles(which), rs);
+    ctx->prototype->nc = 1;
+    ctx->start_vertex = random_upto(rs, 3);
+    ctx->orientation = random_upto(rs, 10);
+}
 
-    return 0;
+void penrosectx_init_from_params(
+    PenroseContext *ctx, const struct PenrosePatchParams *ps)
+{
+    size_t i;
+
+    ctx->rs = NULL;
+    ctx->must_free_rs = false;
+    ctx->prototype = penrose_coords_new();
+    penrose_coords_make_space(ctx->prototype, ps->ncoords);
+    for (i = 0; i < ps->ncoords; i++)
+        ctx->prototype->c[i] = ps->coords[i];
+    ctx->prototype->nc = ps->ncoords;
+    ctx->start_vertex = ps->start_vertex;
+    ctx->orientation = ps->orientation;
 }
 
-static int penrose_p2_small(penrose_state *state, int depth, int flip,
-                            vector v_orig, vector v_edge)
+void penrosectx_cleanup(PenroseContext *ctx)
 {
-    vector vv_orig;
+    if (ctx->must_free_rs)
+        random_free(ctx->rs);
+    penrose_coords_free(ctx->prototype);
+}
 
-#ifdef DEBUG_PENROSE
-    {
-        vector vs[3];
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, 0);
-        XFORM(2, 0, -1, -36*flip);
+PenroseCoords *penrosectx_initial_coords(PenroseContext *ctx)
+{
+    return penrose_coords_copy(ctx->prototype);
+}
 
-        state->new_tile(state, vs, 3, depth);
+void penrosectx_extend_coords(PenroseContext *ctx, PenroseCoords *pc,
+                              size_t n)
+{
+    if (ctx->prototype->nc < n) {
+        penrose_coords_make_space(ctx->prototype, n);
+        while (ctx->prototype->nc < n) {
+            if (!ctx->rs) {
+                /*
+                 * For safety, similarly to spectre.c, we respond to a
+                 * lack of available random_state by making a
+                 * deterministic one.
+                 */
+                ctx->rs = random_new("dummy", 5);
+                ctx->must_free_rs = true;
+            }
+
+            ctx->prototype->c[ctx->prototype->nc] = penrose_choose_random(
+                penrose_valid_parents(ctx->prototype->c[ctx->prototype->nc-1]),
+                ctx->rs);
+            ctx->prototype->nc++;
+        }
     }
-#endif
-
-    if (flip > 0) {
-        vector vs[4];
-
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, -72);
-        XFORM(2, 0, -1, -36);
-        XFORM(3, 0, 0, 0);
 
-        state->new_tile(state, vs, 4, depth);
+    penrose_coords_make_space(pc, n);
+    while (pc->nc < n) {
+        pc->c[pc->nc] = ctx->prototype->c[pc->nc];
+        pc->nc++;
     }
-
-    if (depth >= state->max_depth) return 0;
-
-    vv_orig = v_trans(v_orig, v_edge);
-
-    penrose_p2_large(state, depth+1, -flip,
-                     v_orig, v_shrinkphi(v_rotate(v_edge, -36*flip)));
-
-    penrose_p2_small(state, depth+1, flip,
-                     vv_orig, v_shrinkphi(v_rotate(v_edge, -144*flip)));
-
-    return 0;
 }
 
-static int penrose_p3_small(penrose_state *state, int depth, int flip,
-                            vector v_orig, vector v_edge);
-
-static int penrose_p3_large(penrose_state *state, int depth, int flip,
-                            vector v_orig, vector v_edge)
+static Point penrose_triangle_edge_0_length(char c)
 {
-    vector vv_orig;
-
-#ifdef DEBUG_PENROSE
-    {
-        vector vs[3];
-        vs[0] = v_orig;
-        XFORM(1, 0, 1, 0);
-        XFORM(2, 0, 0, -36*flip);
-
-        state->new_tile(state, vs, 3, depth);
+    static const Point one = {{ 1, 0, 0, 0 }};
+    static const Point phi = {{ 1, 0, 1, -1 }};
+    static const Point invphi = {{ 0, 0, 1, -1 }};
+
+    switch (c) {
+        /* P2 tiling: unit-length edges are the long edges, i.e. edges
+         * 1,2 of AB and edge 0 of UV. So AB have edge 0 short. */
+      case 'A': case 'B':
+        return invphi;
+      case 'U': case 'V':
+        return one;
+
+        /* P3 tiling: unit-length edges are edges 1,2 of everything,
+         * so CD have edge 0 short and XY have it long. */
+      case 'C': case 'D':
+        return invphi;
+      default: /* case 'X': case 'Y': */
+        return phi;
     }
-#endif
+}
 
-    if (flip > 0) {
-        vector vs[4];
+PenroseTriangle *penrose_initial(PenroseContext *ctx)
+{
+    char type = ctx->prototype->c[0];
+    Point origin = {{ 0, 0, 0, 0 }};
+    Point edge0 = penrose_triangle_edge_0_length(type);
+    Point negoffset;
+    size_t i;
+    PenroseTriangle *tri = snew(PenroseTriangle);
+
+    /* Orient the triangle by deciding what vector edge #0 should traverse */
+    edge0 = point_mul(edge0, point_rot(ctx->orientation));
+
+    /* Place the triangle at an arbitrary position, in that orientation */
+    tri->pc = penrose_coords_copy(ctx->prototype);
+    penrose_place(tri, origin, edge0, 0);
+
+    /* Now translate so that the appropriate vertex is at the origin */
+    negoffset = tri->vertices[ctx->start_vertex];
+    for (i = 0; i < 3; i++)
+        tri->vertices[i] = point_sub(tri->vertices[i], negoffset);
+
+    return tri;
+}
 
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, -36);
-        XFORM(2, 0, 1, 0);
-        XFORM(3, 0, 0, 36);
+PenroseTriangle *penrose_adjacent(PenroseContext *ctx,
+                                  const PenroseTriangle *src_tri,
+                                  unsigned src_edge, unsigned *dst_edge_out)
+{
+    unsigned dst_edge;
+    PenroseTriangle *dst_tri = snew(PenroseTriangle);
+    dst_tri->pc = penrose_coords_copy(src_tri->pc);
+    penrosectx_step(ctx, dst_tri->pc, src_edge, &dst_edge);
+    penrose_place(dst_tri, src_tri->vertices[(src_edge+1) % 3],
+                  src_tri->vertices[src_edge], dst_edge);
+    if (dst_edge_out)
+        *dst_edge_out = dst_edge;
+    return dst_tri;
+}
 
-        state->new_tile(state, vs, 4, depth);
+static int penrose_cmp(void *av, void *bv)
+{
+    PenroseTriangle *a = (PenroseTriangle *)av, *b = (PenroseTriangle *)bv;
+    size_t i, j;
+
+    /* We should only ever need to compare the first two vertices of
+     * any triangle, because those force the rest */
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 4; j++) {
+            int ac = a->vertices[i].coeffs[j], bc = b->vertices[i].coeffs[j];
+            if (ac < bc)
+                return -1;
+            if (ac > bc)
+                return +1;
+        }
     }
-    if (depth >= state->max_depth) return 0;
-
-    vv_orig = v_trans(v_orig, v_edge);
-
-    penrose_p3_large(state, depth+1, -flip,
-                     vv_orig, v_shrinkphi(v_rotate(v_edge, 180)));
-
-    penrose_p3_small(state, depth+1, flip,
-                     vv_orig, v_shrinkphi(v_rotate(v_edge, -108*flip)));
-
-    vv_orig = v_trans(v_orig, v_growphi(v_edge));
-
-    penrose_p3_large(state, depth+1, flip,
-                     vv_orig, v_shrinkphi(v_rotate(v_edge, -144*flip)));
-
 
     return 0;
 }
 
-static int penrose_p3_small(penrose_state *state, int depth, int flip,
-                            vector v_orig, vector v_edge)
+static unsigned penrose_sibling_edge_index(char c)
 {
-    vector vv_orig;
-
-#ifdef DEBUG_PENROSE
-    {
-        vector vs[3];
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, 0);
-        XFORM(2, 0, 0, -36*flip);
-
-        state->new_tile(state, vs, 3, depth);
+    switch (c) {
+      case 'A': case 'U': return 2;
+      case 'B': case 'V': return 1;
+      default: return 0;
     }
-#endif
-
-    if (flip > 0) {
-        vector vs[4];
-
-        vs[0] = v_orig;
-        XFORM(1, 0, 0, -36);
-        XFORM(3, 0, 0, 0);
-        XFORM(2, 3, 0, -36);
+}
 
-        state->new_tile(state, vs, 4, depth);
-    }
-    if (depth >= state->max_depth) return 0;
+void penrosectx_generate(
+    PenroseContext *ctx,
+    bool (*inbounds)(void *inboundsctx,
+                     const PenroseTriangle *tri), void *inboundsctx,
+    void (*tile)(void *tilectx, const Point *vertices), void *tilectx)
+{
+    tree234 *placed = newtree234(penrose_cmp);
+    PenroseTriangle *qhead = NULL, *qtail = NULL;
 
-    /* NB these two are identical to the first two of p3_large. */
-    vv_orig = v_trans(v_orig, v_edge);
+    {
+        PenroseTriangle *tri = penrose_initial(ctx);
 
-    penrose_p3_large(state, depth+1, -flip,
-                     vv_orig, v_shrinkphi(v_rotate(v_edge, 180)));
+        add234(placed, tri);
 
-    penrose_p3_small(state, depth+1, flip,
-                     vv_orig, v_shrinkphi(v_rotate(v_edge, -108*flip)));
+        tri->next = NULL;
+        tri->reported = false;
 
-    return 0;
-}
+        if (inbounds(inboundsctx, tri))
+            qhead = qtail = tri;
+    }
 
-/* -------------------------------------------------------
- * Utility routines.
- */
+    while (qhead) {
+        PenroseTriangle *tri = qhead;
+        unsigned edge;
+        unsigned sibling_edge = penrose_sibling_edge_index(tri->pc->c[0]);
+
+        for (edge = 0; edge < 3; edge++) {
+            PenroseTriangle *new_tri, *found_tri;
+
+            new_tri = penrose_adjacent(ctx, tri, edge, NULL);
+
+            if (!inbounds(inboundsctx, new_tri)) {
+                penrose_free(new_tri);
+                continue;
+            }
+
+            found_tri = find234(placed, new_tri, NULL);
+            if (found_tri) {
+                if (edge == sibling_edge && !tri->reported &&
+                    !found_tri->reported) {
+                    /*
+                     * found_tri and tri are opposite halves of the
+                     * same tile; both are in the tree, and haven't
+                     * yet been reported as a completed tile.
+                     */
+                    unsigned new_sibling_edge = penrose_sibling_edge_index(
+                        found_tri->pc->c[0]);
+                    Point tilevertices[4] = {
+                        tri->vertices[(sibling_edge + 1) % 3],
+                        tri->vertices[(sibling_edge + 2) % 3],
+                        found_tri->vertices[(new_sibling_edge + 1) % 3],
+                        found_tri->vertices[(new_sibling_edge + 2) % 3],
+                    };
+                    tile(tilectx, tilevertices);
+
+                    tri->reported = true;
+                    found_tri->reported = true;
+                }
+
+                penrose_free(new_tri);
+                continue;
+            }
+
+            add234(placed, new_tri);
+            qtail->next = new_tri;
+            qtail = new_tri;
+            new_tri->next = NULL;
+            new_tri->reported = false;
+        }
 
-double penrose_side_length(double start_size, int depth)
-{
-  return start_size / pow(PHI, depth);
-}
+        qhead = qhead->next;
+    }
 
-void penrose_count_tiles(int depth, int *nlarge, int *nsmall)
-{
-  /* Steal sgt's fibonacci thingummy. */
+    {
+        PenroseTriangle *tri;
+        while ((tri = delpos234(placed, 0)) != NULL)
+            penrose_free(tri);
+        freetree234(placed);
+    }
 }
 
-/*
- * It turns out that an acute isosceles triangle with sides in ratio 1:phi:phi
- * has an incentre which is conveniently 2*phi^-2 of the way from the apex to
- * the base. Why's that convenient? Because: if we situate the incentre of the
- * triangle at the origin, then we can place the apex at phi^-2 * (B+C), and
- * the other two vertices at apex-B and apex-C respectively. So that's an acute
- * triangle with its long sides of unit length, covering a circle about the
- * origin of radius 1-(2*phi^-2), which is conveniently enough phi^-3.
- *
- * (later mail: this is an overestimate by about 5%)
- */
-
-int penrose(penrose_state *state, int which, int angle)
+const char *penrose_tiling_params_invalid(
+    const struct PenrosePatchParams *params, int which)
 {
-    vector vo = v_origin();
-    vector vb = v_origin();
-
-    vo.b = vo.c = -state->start_size;
-    vo = v_shrinkphi(v_shrinkphi(vo));
-
-    vb.b = state->start_size;
+    size_t i;
 
-    vo = v_rotate(vo, angle);
-    vb = v_rotate(vb, angle);
+    if (params->ncoords == 0)
+        return "expected at least one coordinate";
 
-    if (which == PENROSE_P2)
-        return penrose_p2_large(state, 0, 1, vo, vb);
-    else
-        return penrose_p3_small(state, 0, 1, vo, vb);
-}
-
-/*
- * We're asked for a MxN grid, which just means a tiling fitting into roughly
- * an MxN space in some kind of reasonable unit - say, the side length of the
- * two-arrow edges of the tiles. By some reasoning in a previous email, that
- * means we want to pick some subarea of a circle of radius 3.11*sqrt(M^2+N^2).
- * To cover that circle, we need to subdivide a triangle large enough that it
- * contains a circle of that radius.
- *
- * Hence: start with those three vectors marking triangle vertices, scale them
- * all up by phi repeatedly until the radius of the inscribed circle gets
- * bigger than the target, and then recurse into that triangle with the same
- * recursion depth as the number of times you scaled up. That will give you
- * tiles of unit side length, covering a circle big enough that if you randomly
- * choose an orientation and coordinates within the circle, you'll be able to
- * get any valid piece of Penrose tiling of size MxN.
- */
-#define INCIRCLE_RADIUS 0.22426 /* phi^-3 less 5%: see above */
-
-void penrose_calculate_size(int which, int tilesize, int w, int h,
-                            double *required_radius, int *start_size, int *depth)
-{
-    double rradius, size;
-    int n = 0;
-
-    /*
-     * Fudge factor to scale P2 and P3 tilings differently. This
-     * doesn't seem to have much relevance to questions like the
-     * average number of tiles per unit area; it's just aesthetic.
-     */
-    if (which == PENROSE_P2)
-        tilesize = tilesize * 3 / 2;
-    else
-        tilesize = tilesize * 5 / 4;
-
-    rradius = tilesize * 3.11 * sqrt((double)(w*w + h*h));
-    size = tilesize;
-
-    while ((size * INCIRCLE_RADIUS) < rradius) {
-        n++;
-        size = size * PHI;
+    for (i = 0; i < params->ncoords; i++) {
+        if (!penrose_valid_letter(params->coords[i], which))
+            return "invalid coordinate letter";
+        if (i > 0 && !strchr(penrose_valid_parents(params->coords[i-1]),
+                             params->coords[i]))
+            return "invalid pair of consecutive coordinates";
     }
 
-    *start_size = (int)size;
-    *depth = n;
-    *required_radius = rradius;
+    return NULL;
 }
 
-/* -------------------------------------------------------
- * Test code.
- */
-
-#ifdef TEST_PENROSE
-
-#include <stdio.h>
-#include <string.h>
+struct PenroseOutputCtx {
+    int xoff, yoff;
+    Coord xmin, xmax, ymin, ymax;
 
-int show_recursion = 0;
-int ntiles, nfinal;
+    penrose_tile_callback_fn external_cb;
+    void *external_cbctx;
+};
 
-int test_cb(penrose_state *state, vector *vs, int n, int depth)
+static bool inbounds(void *vctx, const PenroseTriangle *tri)
 {
-    int i, xoff = 0, yoff = 0;
-    double l = penrose_side_length(state->start_size, depth);
-    double rball = l / 10.0;
-    const char *col;
+    struct PenroseOutputCtx *octx = (struct PenroseOutputCtx *)vctx;
+    size_t i;
 
-    ntiles++;
-    if (state->max_depth == depth) {
-        col = n == 4 ? "black" : "green";
-        nfinal++;
-    } else {
-        if (!show_recursion)
-            return 0;
-        col = n == 4 ? "red" : "blue";
-    }
-    if (n != 4) yoff = state->start_size;
+    for (i = 0; i < 3; i++) {
+        Coord x = point_x(tri->vertices[i]);
+        Coord y = point_y(tri->vertices[i]);
 
-    printf("<polygon points=\"");
-    for (i = 0; i < n; i++) {
-        printf("%s%f,%f", (i == 0) ? "" : " ",
-               v_x(vs, i) + xoff, v_y(vs, i) + yoff);
+        if (coord_cmp(x, octx->xmin) < 0 || coord_cmp(x, octx->xmax) > 0 ||
+            coord_cmp(y, octx->ymin) < 0 || coord_cmp(y, octx->ymax) > 0)
+            return false;
     }
-    printf("\" style=\"fill: %s; fill-opacity: 0.2; stroke: %s\" />\n", col, col);
-    printf("<ellipse cx=\"%f\" cy=\"%f\" rx=\"%f\" ry=\"%f\" fill=\"%s\" />",
-           v_x(vs, 0) + xoff, v_y(vs, 0) + yoff, rball, rball, col);
 
-    return 0;
+    return true;
 }
 
-void usage_exit(void)
+static void null_output_tile(void *vctx, const Point *vertices)
 {
-    fprintf(stderr, "Usage: penrose-test [--recursion] P2|P3 SIZE DEPTH\n");
-    exit(1);
 }
 
-int main(int argc, char *argv[])
+static void really_output_tile(void *vctx, const Point *vertices)
 {
-    penrose_state ps;
-    int which = 0;
-
-    while (--argc > 0) {
-        char *p = *++argv;
-        if (!strcmp(p, "-h") || !strcmp(p, "--help")) {
-            usage_exit();
-        } else if (!strcmp(p, "--recursion")) {
-            show_recursion = 1;
-        } else if (*p == '-') {
-            fprintf(stderr, "Unrecognised option '%s'\n", p);
-            exit(1);
-        } else {
-            break;
-        }
+    struct PenroseOutputCtx *octx = (struct PenroseOutputCtx *)vctx;
+    size_t i;
+    int coords[16];
+
+    for (i = 0; i < 4; i++) {
+        Coord x = point_x(vertices[i]);
+        Coord y = point_y(vertices[i]);
+
+        coords[4*i + 0] = x.c1 + octx->xoff;
+        coords[4*i + 1] = x.cr5;
+        coords[4*i + 2] = y.c1 + octx->yoff;
+        coords[4*i + 3] = y.cr5;
     }
 
-    if (argc < 3) usage_exit();
-
-    if (strcmp(argv[0], "P2") == 0) which = PENROSE_P2;
-    else if (strcmp(argv[0], "P3") == 0) which = PENROSE_P3;
-    else usage_exit();
-
-    ps.start_size = atoi(argv[1]);
-    ps.max_depth = atoi(argv[2]);
-    ps.new_tile = test_cb;
-
-    ntiles = nfinal = 0;
-
-    printf("\
-<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n\
-<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n\
-\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n\
-\n\
-<svg xmlns=\"http://www.w3.org/2000/svg\"\n\
-xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n\n");
-
-    printf("<g>\n");
-    penrose(&ps, which);
-    printf("</g>\n");
+    octx->external_cb(octx->external_cbctx, coords);
+}
 
-    printf("<!-- %d tiles and %d leaf tiles total -->\n",
-           ntiles, nfinal);
+static void penrose_set_bounds(struct PenroseOutputCtx *octx, int w, int h)
+{
+    octx->xoff = w/2;
+    octx->yoff = h/2;
+    octx->xmin.c1 = -octx->xoff;
+    octx->xmax.c1 = -octx->xoff + w;
+    octx->ymin.c1 = octx->yoff - h;
+    octx->ymax.c1 = octx->yoff;
+    octx->xmin.cr5 = 0;
+    octx->xmax.cr5 = 0;
+    octx->ymin.cr5 = 0;
+    octx->ymax.cr5 = 0;
+}
 
-    printf("</svg>");
+void penrose_tiling_randomise(struct PenrosePatchParams *params, int which,
+                              int w, int h, random_state *rs)
+{
+    PenroseContext ctx[1];
+    struct PenroseOutputCtx octx[1];
 
-    return 0;
-}
+    penrose_set_bounds(octx, w, h);
 
-#endif
+    penrosectx_init_random(ctx, rs, which);
+    penrosectx_generate(ctx, inbounds, octx, null_output_tile, NULL);
 
-#ifdef TEST_VECTORS
+    params->orientation = ctx->orientation;
+    params->start_vertex = ctx->start_vertex;
+    params->ncoords = ctx->prototype->nc;
+    params->coords = snewn(params->ncoords, char);
+    memcpy(params->coords, ctx->prototype->c, params->ncoords);
 
-static void dbgv(const char *msg, vector v)
-{
-    printf("%s: %s\n", msg, v_debug(v));
+    penrosectx_cleanup(ctx);
 }
 
-int main(int argc, const char *argv[])
+void penrose_tiling_generate(
+    const struct PenrosePatchParams *params, int w, int h,
+    penrose_tile_callback_fn cb, void *cbctx)
 {
-   vector v = v_unit();
+    PenroseContext ctx[1];
+    struct PenroseOutputCtx octx[1];
 
-   dbgv("unit vector", v);
-   v = v_rotate(v, 36);
-   dbgv("rotated 36", v);
-   v = v_scale(v, 2);
-   dbgv("scaled x2", v);
-   v = v_shrinkphi(v);
-   dbgv("shrunk phi", v);
-   v = v_rotate(v, -36);
-   dbgv("rotated -36", v);
+    penrose_set_bounds(octx, w, h);
+    octx->external_cb = cb;
+    octx->external_cbctx = cbctx;
 
-   return 0;
+    penrosectx_init_from_params(ctx, params);
+    penrosectx_generate(ctx, inbounds, octx, really_output_tile, octx);
+    penrosectx_cleanup(ctx);
 }
-
-#endif
-/* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/puzzles/src/penrose.h b/apps/plugins/puzzles/src/penrose.h
index ba5ae16f2c..e6e927d618 100644
--- a/apps/plugins/puzzles/src/penrose.h
+++ b/apps/plugins/puzzles/src/penrose.h
@@ -1,59 +1,86 @@
-/* penrose.h
- *
- * Penrose tiling functions.
- *
- * Provides an interface with which to generate Penrose tilings
- * by recursive subdivision of an initial tile of choice (one of the
- * four sets of two pairs kite/dart, or thin/thick rhombus).
- *
- * You supply a callback function and a context pointer, which is
- * called with each tile in turn: you choose how many times to recurse.
- */
+#ifndef PUZZLES_PENROSE_H
+#define PUZZLES_PENROSE_H
 
-#ifndef _PENROSE_H
-#define _PENROSE_H
+struct PenrosePatchParams {
+    /*
+     * A patch of Penrose tiling is identified by giving
+     *
+     *  - the coordinates of the starting triangle, using a
+     *    combinatorial coordinate system
+     *
+     *  - which vertex of that triangle is at the centre point of the
+     *    tiling
+     *
+     *  - the orientation of the triangle's base edge, as a number
+     *    from 0 to 9, measured in tenths of a turn
+     *
+     * Coordinates are a sequence of letters. For a P2 tiling all
+     * letters are from the set {A,B,U,V}; for P3, {C,D,X,Y}.
+     */
+    unsigned start_vertex;
+    int orientation;
+    size_t ncoords;
+    char *coords;
+};
 
-#ifndef PHI
-#define PHI 1.6180339887
+#ifndef PENROSE_ENUM_DEFINED
+#define PENROSE_ENUM_DEFINED
+enum { PENROSE_P2, PENROSE_P3 };
 #endif
 
-typedef struct vector vector;
-
-double v_x(vector *vs, int i);
-double v_y(vector *vs, int i);
+bool penrose_valid_letter(char c, int which);
 
-typedef struct penrose_state penrose_state;
-
-/* Return non-zero to clip the tree here (i.e. not recurse
- * below this tile).
+/*
+ * Fill in PenrosePatchParams with a randomly selected set of
+ * coordinates, in enough detail to generate a patch of tiling filling
+ * a w x h area.
+ *
+ * Units of measurement: the tiling will be oriented such that
+ * horizontal tile edges are possible (and therefore vertical ones are
+ * not). Therefore, all x-coordinates will be rational linear
+ * combinations of 1 and sqrt(5), and all y-coordinates will be
+ * sin(pi/5) times such a rational linear combination. By scaling up
+ * appropriately we can turn those rational combinations into
+ * _integer_ combinations, so we do. Therefore, w is measured in units
+ * of 1/4, and h is measured in units of sin(pi/5)/2, on a scale where
+ * a length of 1 corresponds to the legs of the acute isosceles
+ * triangles in the tiling (hence, the long edges of P2 kites and
+ * darts, or all edges of P3 rhombs).
  *
- * Parameters are state, vector array, npoints, depth.
- * ctx is inside state.
+ * (In case it's useful, the y scale factor sin(pi/5)/2 is an
+ * algebraic number. Its minimal polynomial is 256x^4 - 80x^2 + 5.)
+ *
+ * The 'coords' field of the structure will be filled in with a new
+ * dynamically allocated array. Any previous pointer in that field
+ * will be overwritten.
  */
-typedef int (*tile_callback)(penrose_state *, vector *, int, int);
-
-struct penrose_state {
-    int start_size;  /* initial side length */
-    int max_depth;      /* Recursion depth */
-
-    tile_callback new_tile;
-    void *ctx;          /* for callback */
-};
+void penrose_tiling_randomise(struct PenrosePatchParams *params, int which,
+                              int w, int h, random_state *rs);
 
-enum { PENROSE_P2, PENROSE_P3 };
-
-extern int penrose(penrose_state *state, int which, int angle);
+/*
+ * Validate a PenrosePatchParams to ensure it contains no illegal
+ * coordinates. Returns NULL if it's acceptable, or an error string if
+ * not.
+ */
+const char *penrose_tiling_params_invalid(
+    const struct PenrosePatchParams *params, int which);
 
-/* Returns the side-length of a penrose tile at recursion level
- * gen, given a starting side length. */
-extern double penrose_side_length(double start_size, int depth);
+/*
+ * Generate the actual set of Penrose tiles from a PenrosePatchParams,
+ * passing each one to a callback. The callback receives the vertices
+ * of each point, in the form of an array of 4*4 integers. Each vertex
+ * is represented by four consecutive integers in this array, with the
+ * first two giving the x coordinate and the last two the y
+ * coordinate. Each pair of integers a,b represent a single coordinate
+ * whose value is a + b*sqrt(5). The units of measurement for x and y
+ * are as described above.
+ */
+typedef void (*penrose_tile_callback_fn)(void *ctx, const int *coords);
 
-/* Returns the count of each type of tile at a given recursion depth. */
-extern void penrose_count_tiles(int gen, int *nlarge, int *nsmall);
+#define PENROSE_NVERTICES 4
 
-/* Calculate start size and recursion depth required to produce a
- * width-by-height sized patch of penrose tiles with the given tilesize */
-extern void penrose_calculate_size(int which, int tilesize, int w, int h,
-                                   double *required_radius, int *start_size, int *depth);
+void penrose_tiling_generate(
+    const struct PenrosePatchParams *params, int w, int h,
+    penrose_tile_callback_fn cb, void *cbctx);
 
 #endif
diff --git a/apps/plugins/puzzles/src/printing.c b/apps/plugins/puzzles/src/printing.c
index d1a3badaaa..0a911949a7 100644
--- a/apps/plugins/puzzles/src/printing.c
+++ b/apps/plugins/puzzles/src/printing.c
@@ -10,6 +10,7 @@
 struct puzzle {
     const game *game;
     game_params *par;
+    game_ui *ui;
     game_state *st;
     game_state *st2;
 };
@@ -56,6 +57,7 @@ void document_free(document *doc)
 
     for (i = 0; i < doc->npuzzles; i++) {
         doc->puzzles[i].game->free_params(doc->puzzles[i].par);
+        doc->puzzles[i].game->free_ui(doc->puzzles[i].ui);
         doc->puzzles[i].game->free_game(doc->puzzles[i].st);
         if (doc->puzzles[i].st2)
             doc->puzzles[i].game->free_game(doc->puzzles[i].st2);
@@ -75,7 +77,7 @@ void document_free(document *doc)
  * another sheet (typically the solution to the first game_state).
  */
 void document_add_puzzle(document *doc, const game *game, game_params *par,
-                         game_state *st, game_state *st2)
+                         game_ui *ui, game_state *st, game_state *st2)
 {
     if (doc->npuzzles >= doc->puzzlesize) {
         doc->puzzlesize += 32;
@@ -83,6 +85,7 @@ void document_add_puzzle(document *doc, const game *game, game_params *par,
     }
     doc->puzzles[doc->npuzzles].game = game;
     doc->puzzles[doc->npuzzles].par = par;
+    doc->puzzles[doc->npuzzles].ui = ui;
     doc->puzzles[doc->npuzzles].st = st;
     doc->puzzles[doc->npuzzles].st2 = st2;
     doc->npuzzles++;
@@ -96,7 +99,11 @@ static void get_puzzle_size(const document *doc, struct puzzle *pz,
     float ww, hh, ourscale;
 
     /* Get the preferred size of the game, in mm. */
-    pz->game->print_size(pz->par, &ww, &hh);
+    {
+        game_ui *ui = pz->game->new_ui(pz->st);
+        pz->game->print_size(pz->par, ui, &ww, &hh);
+        pz->game->free_ui(ui);
+    }
 
     /* Adjust for user-supplied scale factor. */
     ourscale = doc->userscale;
@@ -270,9 +277,9 @@ void document_print_page(const document *doc, drawing *dr, int page_nr)
          * permit each game to choose its own?)
          */
         tilesize = 512;
-        pz->game->compute_size(pz->par, tilesize, &pixw, &pixh);
+        pz->game->compute_size(pz->par, tilesize, pz->ui, &pixw, &pixh);
         print_begin_puzzle(dr, xm, xc, ym, yc, pixw, pixh, w, scale);
-        pz->game->print(dr, pass == 0 ? pz->st : pz->st2, tilesize);
+        pz->game->print(dr, pass == 0 ? pz->st : pz->st2, pz->ui, tilesize);
         print_end_puzzle(dr);
     }
 
diff --git a/apps/plugins/puzzles/src/ps.c b/apps/plugins/puzzles/src/ps.c
deleted file mode 100644
index ab8a1589f4..0000000000
--- a/apps/plugins/puzzles/src/ps.c
+++ /dev/null
@@ -1,432 +0,0 @@
-/*
- * ps.c: PostScript printing functions.
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <string.h>
-#include <assert.h>
-
-#include "puzzles.h"
-
-struct psdata {
-    FILE *fp;
-    bool colour;
-    int ytop;
-    bool clipped;
-    float hatchthick, hatchspace;
-    int gamewidth, gameheight;
-    drawing *drawing;
-};
-
-static void ps_printf(psdata *ps, const char *fmt, ...)
-{
-    va_list ap;
-
-    va_start(ap, fmt);
-    vfprintf(ps->fp, fmt, ap);
-    va_end(ap);
-}
-
-static void ps_fill(psdata *ps, int colour)
-{
-    int hatch;
-    float r, g, b;
-
-    print_get_colour(ps->drawing, colour, ps->colour, &hatch, &r, &g, &b);
-
-    if (hatch < 0) {
-        if (ps->colour)
-            ps_printf(ps, "%g %g %g setrgbcolor fill\n", r, g, b);
-        else
-            ps_printf(ps, "%g setgray fill\n", r);
-    } else {
-        /* Clip to the region. */
-        ps_printf(ps, "gsave clip\n");
-        /* Hatch the entire game printing area. */
-        ps_printf(ps, "newpath\n");
-        if (hatch == HATCH_VERT || hatch == HATCH_PLUS)
-            ps_printf(ps, "0 %g %d {\n"
-                      "  0 moveto 0 %d rlineto\n"
-                      "} for\n", ps->hatchspace, ps->gamewidth,
-                      ps->gameheight);
-        if (hatch == HATCH_HORIZ || hatch == HATCH_PLUS)
-            ps_printf(ps, "0 %g %d {\n"
-                      "  0 exch moveto %d 0 rlineto\n"
-                      "} for\n", ps->hatchspace, ps->gameheight,
-                      ps->gamewidth);
-        if (hatch == HATCH_SLASH || hatch == HATCH_X)
-            ps_printf(ps, "%d %g %d {\n"
-                      "  0 moveto %d dup rlineto\n"
-                      "} for\n", -ps->gameheight, ps->hatchspace * ROOT2,
-                      ps->gamewidth, max(ps->gamewidth, ps->gameheight));
-        if (hatch == HATCH_BACKSLASH || hatch == HATCH_X)
-            ps_printf(ps, "0 %g %d {\n"
-                      "  0 moveto %d neg dup neg rlineto\n"
-                      "} for\n", ps->hatchspace * ROOT2,
-                      ps->gamewidth+ps->gameheight,
-                      max(ps->gamewidth, ps->gameheight));
-        ps_printf(ps, "0 setgray %g setlinewidth stroke grestore\n",
-                  ps->hatchthick);
-    }
-}
-
-static void ps_setcolour_internal(psdata *ps, int colour, const char *suffix)
-{
-    int hatch;
-    float r, g, b;
-
-    print_get_colour(ps->drawing, colour, ps->colour, &hatch, &r, &g, &b);
-
-    /*
-     * Stroking in hatched colours is not permitted.
-     */
-    assert(hatch < 0);
-    
-    if (ps->colour)
-        ps_printf(ps, "%g %g %g setrgbcolor%s\n", r, g, b, suffix);
-    else
-        ps_printf(ps, "%g setgray%s\n", r, suffix);
-}
-
-static void ps_setcolour(psdata *ps, int colour)
-{
-    ps_setcolour_internal(ps, colour, "");
-}
-
-static void ps_stroke(psdata *ps, int colour)
-{
-    ps_setcolour_internal(ps, colour, " stroke");
-}
-
-static void ps_draw_text(void *handle, int x, int y, int fonttype,
-                         int fontsize, int align, int colour,
-                         const char *text)
-{
-    psdata *ps = (psdata *)handle;
-
-    y = ps->ytop - y;
-    ps_setcolour(ps, colour);
-    ps_printf(ps, "/%s findfont %d scalefont setfont\n",
-              fonttype == FONT_FIXED ? "Courier-L1" : "Helvetica-L1",
-              fontsize);
-    if (align & ALIGN_VCENTRE) {
-        ps_printf(ps, "newpath 0 0 moveto (X) true charpath flattenpath"
-                  " pathbbox\n"
-                  "3 -1 roll add 2 div %d exch sub %d exch moveto pop pop\n",
-                  y, x);
-    } else {
-        ps_printf(ps, "%d %d moveto\n", x, y);
-    }
-    ps_printf(ps, "(");
-    while (*text) {
-        if (*text == '\\' || *text == '(' || *text == ')')
-            ps_printf(ps, "\\");
-        ps_printf(ps, "%c", *text);
-        text++;
-    }
-    ps_printf(ps, ") ");
-    if (align & (ALIGN_HCENTRE | ALIGN_HRIGHT))
-        ps_printf(ps, "dup stringwidth pop %sneg 0 rmoveto show\n",
-                  (align & ALIGN_HCENTRE) ? "2 div " : "");
-    else
-        ps_printf(ps, "show\n");
-}
-
-static void ps_draw_rect(void *handle, int x, int y, int w, int h, int colour)
-{
-    psdata *ps = (psdata *)handle;
-
-    y = ps->ytop - y;
-    /*
-     * Offset by half a pixel for the exactness requirement.
-     */
-    ps_printf(ps, "newpath %g %g moveto %d 0 rlineto 0 %d rlineto"
-              " %d 0 rlineto closepath\n", x - 0.5, y + 0.5, w, -h, -w);
-    ps_fill(ps, colour);
-}
-
-static void ps_draw_line(void *handle, int x1, int y1, int x2, int y2,
-                         int colour)
-{
-    psdata *ps = (psdata *)handle;
-
-    y1 = ps->ytop - y1;
-    y2 = ps->ytop - y2;
-    ps_printf(ps, "newpath %d %d moveto %d %d lineto\n", x1, y1, x2, y2);
-    ps_stroke(ps, colour);
-}
-
-static void ps_draw_polygon(void *handle, int *coords, int npoints,
-                            int fillcolour, int outlinecolour)
-{
-    psdata *ps = (psdata *)handle;
-
-    int i;
-
-    ps_printf(ps, "newpath %d %d moveto\n", coords[0], ps->ytop - coords[1]);
-
-    for (i = 1; i < npoints; i++)
-        ps_printf(ps, "%d %d lineto\n", coords[i*2], ps->ytop - coords[i*2+1]);
-
-    ps_printf(ps, "closepath\n");
-
-    if (fillcolour >= 0) {
-        ps_printf(ps, "gsave\n");
-        ps_fill(ps, fillcolour);
-        ps_printf(ps, "grestore\n");
-    }
-    ps_stroke(ps, outlinecolour);
-}
-
-static void ps_draw_circle(void *handle, int cx, int cy, int radius,
-                           int fillcolour, int outlinecolour)
-{
-    psdata *ps = (psdata *)handle;
-
-    cy = ps->ytop - cy;
-
-    ps_printf(ps, "newpath %d %d %d 0 360 arc closepath\n", cx, cy, radius);
-
-    if (fillcolour >= 0) {
-        ps_printf(ps, "gsave\n");
-        ps_fill(ps, fillcolour);
-        ps_printf(ps, "grestore\n");
-    }
-    ps_stroke(ps, outlinecolour);
-}
-
-static void ps_unclip(void *handle)
-{
-    psdata *ps = (psdata *)handle;
-
-    assert(ps->clipped);
-    ps_printf(ps, "grestore\n");
-    ps->clipped = false;
-}
- 
-static void ps_clip(void *handle, int x, int y, int w, int h)
-{
-    psdata *ps = (psdata *)handle;
-
-    if (ps->clipped)
-        ps_unclip(ps);
-
-    y = ps->ytop - y;
-    /*
-     * Offset by half a pixel for the exactness requirement.
-     */
-    ps_printf(ps, "gsave\n");
-    ps_printf(ps, "newpath %g %g moveto %d 0 rlineto 0 %d rlineto"
-              " %d 0 rlineto closepath\n", x - 0.5, y + 0.5, w, -h, -w);
-    ps_printf(ps, "clip\n");
-    ps->clipped = true;
-}
-
-static void ps_line_width(void *handle, float width)
-{
-    psdata *ps = (psdata *)handle;
-
-    ps_printf(ps, "%g setlinewidth\n", width);
-}
-
-static void ps_line_dotted(void *handle, bool dotted)
-{
-    psdata *ps = (psdata *)handle;
-
-    if (dotted) {
-        ps_printf(ps, "[ currentlinewidth 3 mul ] 0 setdash\n");
-    } else {
-        ps_printf(ps, "[ ] 0 setdash\n");
-    }
-}
-
-static char *ps_text_fallback(void *handle, const char *const *strings,
-                              int nstrings)
-{
-    /*
-     * We can handle anything in ISO 8859-1, and we'll manually
-     * translate it out of UTF-8 for the purpose.
-     */
-    int i, maxlen;
-    char *ret;
-
-    maxlen = 0;
-    for (i = 0; i < nstrings; i++) {
-        int len = strlen(strings[i]);
-        if (maxlen < len) maxlen = len;
-    }
-
-    ret = snewn(maxlen + 1, char);
-
-    for (i = 0; i < nstrings; i++) {
-        const char *p = strings[i];
-        char *q = ret;
-
-        while (*p) {
-            int c = (unsigned char)*p++;
-            if (c < 0x80) {
-                *q++ = c;              /* ASCII */
-            } else if ((c == 0xC2 || c == 0xC3) && (*p & 0xC0) == 0x80) {
-                *q++ = (c << 6) | (*p++ & 0x3F);   /* top half of 8859-1 */
-            } else {
-                break;
-            }
-        }
-
-        if (!*p) {
-            *q = '\0';
-            return ret;
-        }
-    }
-
-    assert(!"Should never reach here");
-    return NULL;
-}
-
-static void ps_begin_doc(void *handle, int pages)
-{
-    psdata *ps = (psdata *)handle;
-
-    fputs("%!PS-Adobe-3.0\n", ps->fp);
-    fputs("%%Creator: Simon Tatham's Portable Puzzle Collection\n", ps->fp);
-    fputs("%%DocumentData: Clean7Bit\n", ps->fp);
-    fputs("%%LanguageLevel: 1\n", ps->fp);
-    fprintf(ps->fp, "%%%%Pages: %d\n", pages);
-    fputs("%%DocumentNeededResources:\n", ps->fp);
-    fputs("%%+ font Helvetica\n", ps->fp);
-    fputs("%%+ font Courier\n", ps->fp);
-    fputs("%%EndComments\n", ps->fp);
-    fputs("%%BeginSetup\n", ps->fp);
-    fputs("%%IncludeResource: font Helvetica\n", ps->fp);
-    fputs("%%IncludeResource: font Courier\n", ps->fp);
-    fputs("%%EndSetup\n", ps->fp);
-    fputs("%%BeginProlog\n", ps->fp);
-    /*
-     * Re-encode Helvetica and Courier into ISO-8859-1, which gives
-     * us times and divide signs - and also (according to the
-     * Language Reference Manual) a bonus in that the ASCII '-' code
-     * point now points to a minus sign instead of a hyphen.
-     */
-    fputs("/Helvetica findfont " /* get the font dictionary */
-          "dup maxlength dict dup begin " /* create and open a new dict */
-          "exch " /* move the original font to top of stack */
-          "{1 index /FID ne {def} {pop pop} ifelse} forall "
-                                       /* copy everything except FID */
-          "/Encoding ISOLatin1Encoding def "
-                              /* set the thing we actually wanted to change */
-          "/FontName /Helvetica-L1 def " /* set a new font name */
-          "FontName end exch definefont" /* and define the font */
-          "\n", ps->fp);
-    fputs("/Courier findfont " /* get the font dictionary */
-          "dup maxlength dict dup begin " /* create and open a new dict */
-          "exch " /* move the original font to top of stack */
-          "{1 index /FID ne {def} {pop pop} ifelse} forall "
-                                       /* copy everything except FID */
-          "/Encoding ISOLatin1Encoding def "
-                              /* set the thing we actually wanted to change */
-          "/FontName /Courier-L1 def " /* set a new font name */
-          "FontName end exch definefont" /* and define the font */
-          "\n", ps->fp);
-    fputs("%%EndProlog\n", ps->fp);
-}
-
-static void ps_begin_page(void *handle, int number)
-{
-    psdata *ps = (psdata *)handle;
-
-    fprintf(ps->fp, "%%%%Page: %d %d\ngsave save\n%g dup scale\n",
-            number, number, 72.0 / 25.4);
-}
-
-static void ps_begin_puzzle(void *handle, float xm, float xc,
-                            float ym, float yc, int pw, int ph, float wmm)
-{
-    psdata *ps = (psdata *)handle;
-
-    fprintf(ps->fp, "gsave\n"
-            "clippath flattenpath pathbbox pop pop translate\n"
-            "clippath flattenpath pathbbox 4 2 roll pop pop\n"
-            "exch %g mul %g add exch dup %g mul %g add sub translate\n"
-            "%g dup scale\n"
-            "0 -%d translate\n", xm, xc, ym, yc, wmm/pw, ph);
-    ps->ytop = ph;
-    ps->clipped = false;
-    ps->gamewidth = pw;
-    ps->gameheight = ph;
-    ps->hatchthick = 0.2 * pw / wmm;
-    ps->hatchspace = 1.0 * pw / wmm;
-}
-
-static void ps_end_puzzle(void *handle)
-{
-    psdata *ps = (psdata *)handle;
-
-    fputs("grestore\n", ps->fp);
-}
-
-static void ps_end_page(void *handle, int number)
-{
-    psdata *ps = (psdata *)handle;
-
-    fputs("restore grestore showpage\n", ps->fp);
-}
-
-static void ps_end_doc(void *handle)
-{
-    psdata *ps = (psdata *)handle;
-
-    fputs("%%EOF\n", ps->fp);
-}
-
-static const struct drawing_api ps_drawing = {
-    ps_draw_text,
-    ps_draw_rect,
-    ps_draw_line,
-    ps_draw_polygon,
-    ps_draw_circle,
-    NULL /* draw_update */,
-    ps_clip,
-    ps_unclip,
-    NULL /* start_draw */,
-    NULL /* end_draw */,
-    NULL /* status_bar */,
-    NULL /* blitter_new */,
-    NULL /* blitter_free */,
-    NULL /* blitter_save */,
-    NULL /* blitter_load */,
-    ps_begin_doc,
-    ps_begin_page,
-    ps_begin_puzzle,
-    ps_end_puzzle,
-    ps_end_page,
-    ps_end_doc,
-    ps_line_width,
-    ps_line_dotted,
-    ps_text_fallback,
-};
-
-psdata *ps_init(FILE *outfile, bool colour)
-{
-    psdata *ps = snew(psdata);
-
-    ps->fp = outfile;
-    ps->colour = colour;
-    ps->ytop = 0;
-    ps->clipped = false;
-    ps->hatchthick = ps->hatchspace = ps->gamewidth = ps->gameheight = 0;
-    ps->drawing = drawing_new(&ps_drawing, NULL, ps);
-
-    return ps;
-}
-
-void ps_free(psdata *ps)
-{
-    drawing_free(ps->drawing);
-    sfree(ps);
-}
-
-drawing *ps_drawing_api(psdata *ps)
-{
-    return ps->drawing;
-}
diff --git a/apps/plugins/puzzles/src/puzzles.but b/apps/plugins/puzzles/src/puzzles.but
index ee519b8aa1..0eb3511cc0 100644
--- a/apps/plugins/puzzles/src/puzzles.but
+++ b/apps/plugins/puzzles/src/puzzles.but
@@ -36,7 +36,7 @@
 
 This is a collection of small one-player puzzle games.
 
-\copyright This manual is copyright 2004-2014 Simon Tatham. All rights
+\copyright This manual is copyright 2004-2024 Simon Tatham. All rights
 reserved. You may distribute this documentation under the MIT licence.
 See \k{licence} for the licence text in full.
 
@@ -130,12 +130,12 @@ current puzzle. (Only for puzzles which make sense to print, of
 course \dash it's hard to think of a sensible printable representation
 of Fifteen!)
 
-\dt \ii\e{Undo} (\q{U}, Ctrl+\q{Z}, Ctrl+\q{_})
+\dt \ii\e{Undo} (\q{U}, Ctrl+\q{Z}, Ctrl+\q{_}, \q{*})
 
 \dd Undoes a single move. (You can undo moves back to the start of the
 session.)
 
-\dt \ii\e{Redo} (\q{R}, Ctrl+\q{R})
+\dt \ii\e{Redo} (\q{R}, Ctrl+\q{R}, \q{#})
 
 \dd Redoes a previously undone move.
 
@@ -177,6 +177,22 @@ solving it yourself after seeing the answer, you can just press Undo.
 
 \dd Closes the application entirely.
 
+\dt \i\e{Preferences}
+
+\dd Where supported, brings up a dialog allowing you to configure
+personal preferences about a particular game. Some of these
+preferences will be specific to a particular game; others will be
+common to all games.
+
+\lcont{
+
+One option common to all games allows you to turn off the one-key
+shortcuts like \q{N} for new game or \q{Q} for quit, so that there's
+less chance of hitting them by accident. You can still access the same
+shortcuts with the Ctrl key.
+
+}
+
 \H{common-id} Specifying games with the \ii{game ID}
 
 There are two ways to save a game specification out of a puzzle and
@@ -348,6 +364,11 @@ in which case its behaviour is slightly different; see below.
 
 }
 
+\dt \cw{--delete-prefs}
+
+\dd This option causes the puzzle to delete the configuration file in
+which its user preferences were stored, if there is one.
+
 \dt \I{printing, on Unix}\cw{--print }\e{w}\cw{x}\e{h}
 
 \dd If this option is specified, instead of a puzzle being displayed,
@@ -535,6 +556,16 @@ feature and risk having ambiguous puzzles. (Also, finding \e{all}
 the possible solutions can be an additional challenge for an
 advanced player.)
 
+\H{net-prefs} \I{preferences, for Net}Net user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure when loops are highlighted
+as errors. By default, they're always highlighted; by changing this
+option, you can ask for a loop to be highlighted only if every tile
+forming part of the loop is locked. This avoids the loop highlighting
+acting as a spoiler for available deductions about squares you haven't
+even looked at yet.
+
 
 \C{cube} \i{Cube}
 
@@ -601,7 +632,8 @@ respectively.
 \cfg{winhelp-topic}{games.fifteen}
 
 The old ones are the best: this is the good old \q{\i{15-puzzle}}
-with sliding tiles. You have a 4\by\.4 square grid; 15 squares
+with sliding tiles, which dates from the 1870s.
+You have a 4\by\.4 square grid; 15 squares
 contain numbered tiles, and the sixteenth is empty. Your move is to
 choose a tile next to the empty space, and slide it into the space.
 The aim is to end up with the tiles in numerical order, with the
@@ -620,8 +652,9 @@ A left-click with the mouse in the row or column containing the empty
 space will move as many tiles as necessary to move the space to the
 mouse pointer.
 
-The arrow keys will move a tile adjacent to the space in the direction
-indicated (moving the space in the \e{opposite} direction).
+By default, the arrow keys will move a tile adjacent to the space in
+the direction indicated (moving the space in the \e{opposite}
+direction).
 
 Pressing \q{h} will make a suggested move.  Pressing \q{h} enough
 times will solve the game, but it may scramble your progress while
@@ -635,6 +668,18 @@ The only options available from the \q{Custom...} option on the \q{Type}
 menu are \e{Width} and \e{Height}, which are self-explanatory. (Once
 you've changed these, it's not a \q{15-puzzle} any more, of course!)
 
+\H{fifteen-prefs} \I{preferences, for Fifteen}Fifteen user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the sense of the arrow
+keys. With the default setting, \q{Move the tile}, the arrow key you
+press indicates the direction that you want a tile to move, so that
+(for example) if you want to move the tile left of the gap rightwards
+into the gap, you'd press Right. With the opposite setting, \q{Move
+the gap}, the behaviour of the arrow keys is reversed, and you would
+press Left to move the tile left of the gap into the gap, so that the
+\e{gap} ends up one square left of where it was.
+
 
 \C{sixteen} \i{Sixteen}
 
@@ -785,8 +830,7 @@ quite as good as hand-crafted puzzles would be, but on the plus side
 you get an inexhaustible supply of puzzles tailored to your own
 specification.
 
-\B{nikoli-rect} \W{http://www.nikoli.co.jp/en/puzzles/shikaku.html}\cw{http://www.nikoli.co.jp/en/puzzles/shikaku.html}
-(beware of Flash)
+\B{nikoli-rect} \W{https://www.nikoli.co.jp/en/puzzles/shikaku/}\cw{https://www.nikoli.co.jp/en/puzzles/shikaku/}
 
 \B{puzzle-palace-rect} \W{https://web.archive.org/web/20041024001459/http://www.puzzle.gr.jp/puzzle/sikaku/palm/index.html.en}\cw{https://web.archive.org/web/20041024001459/http://www.puzzle.gr.jp/puzzle/sikaku/palm/index.html.en}
 
@@ -880,10 +924,10 @@ Netslide was contributed to this collection by Richard Boulton.
 \cfg{winhelp-topic}{games.pattern}
 
 You have a grid of squares, which must all be filled in either black
-or white. Beside each row of the grid are listed the lengths of the
-runs of black squares on that row; above each column are listed the
-lengths of the runs of black squares in that column. Your aim is to
-fill in the entire grid black or white.
+or white. Beside each row of the grid are listed, in order, the
+lengths of the runs of black squares on that row; above each column
+are listed, in order, the lengths of the runs of black squares in that
+column. Your aim is to fill in the entire grid black or white.
 
 I first saw this puzzle form around 1995, under the name
 \q{\i{nonograms}}. I've seen it in various places since then, under
@@ -977,8 +1021,7 @@ of the modern form of the puzzle, and it was first published in
 of the history of the puzzle can be found on Wikipedia
 \k{wikipedia-solo}.
 
-\B{nikoli-solo} \W{http://www.nikoli.co.jp/en/puzzles/sudoku.html}\cw{http://www.nikoli.co.jp/en/puzzles/sudoku.html}
-(beware of Flash)
+\B{nikoli-solo} \W{https://www.nikoli.co.jp/en/puzzles/sudoku/}\cw{https://www.nikoli.co.jp/en/puzzles/sudoku/}
 
 \B{wikipedia-solo} \W{http://en.wikipedia.org/wiki/Sudoku}\cw{http://en.wikipedia.org/wiki/Sudoku}
 
@@ -1337,10 +1380,15 @@ after marking.
 
 Alternatively, with the keyboard, the up and down cursor keys can be
 used to select a peg colour, the left and right keys to select a
-peg position, and the space bar or Enter key to place a peg of the
+peg position, and the Enter key to place a peg of the
 selected colour in the chosen position. \q{D} or Backspace removes a
 peg, and Space adds a hold marker.
 
+The number keys can also be used to insert pegs: \q{1} inserts the
+top-most colour, \q{2} the second one, and so forth.  These also
+move the peg cursor to the right.  Pressing \q{L} will label the
+pegs with their numbers.
+
 Pressing \q{h} or \q{?} will fill the current guess with a suggested
 guess.  Using this is not recommended for 10 or more pegs as it is
 slow.
@@ -1395,6 +1443,13 @@ that, use one extra colour.
 this increases the search space (making things harder), and is turned on by
 default.
 
+\H{guess-prefs} \I{preferences, for Guess}Guess user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure whether pegs are labelled
+with their numbers.  Unlike the \q{L} key, this will persist between
+games.
+
 
 \C{pegs} \i{Pegs}
 
@@ -1442,8 +1497,9 @@ These parameters are available from the \q{Custom...} option on the
 
 \dd Controls whether you are given a board of a standard shape or a
 randomly generated shape. The two standard shapes currently
-supported are \q{Cross} and \q{Octagon} (also commonly known as the
-English and European traditional board layouts respectively).
+supported are \q{Cross} (in various sizes) and \q{Octagon}.
+The 7\by\.7 Cross is the traditional English board layout.
+The Octagon is the traditional French one.
 Selecting \q{Random} will give you a different board shape every
 time (but always one that is known to have a solution).
 
@@ -1530,6 +1586,11 @@ I originally saw this in the form of a Flash game called \i{Planarity}
 To move a point, click on it with the left mouse button and drag it
 into a new position.
 
+The cursor keys may also be used to navigate amongst the
+points. Pressing the Enter key will toggle dragging the
+currently-highlighted point. Pressing Tab or Space will cycle through
+all the points.
+
 (All the actions described in \k{common-actions} are also available.)
 
 \H{untangle-parameters} \I{parameters, for Untangle}Untangle parameters
@@ -1714,7 +1775,7 @@ grid because that would immediately cause a loop.)
 Credit for this puzzle goes to \i{Nikoli} \k{nikoli-slant}.
 
 \B{nikoli-slant}
-\W{http://www.nikoli.co.jp/ja/puzzles/gokigen_naname}\cw{http://www.nikoli.co.jp/ja/puzzles/gokigen_naname}
+\W{https://www.nikoli.co.jp/ja/puzzles/gokigen_naname/}\cw{https://www.nikoli.co.jp/ja/puzzles/gokigen_naname/}
 (in Japanese)
 
 \H{slant-controls} \i{Slant controls}
@@ -1763,6 +1824,12 @@ don't yet know what that direction is, and this might enable you to
 deduce something about still other squares.) Even at Hard level,
 guesswork and backtracking should never be necessary.
 
+\H{slant-prefs} \I{preferences, for Slant}Slant user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure which way round the mouse
+buttons work.
+
 
 \C{lightup} \i{Light Up}
 
@@ -1792,8 +1859,7 @@ Credit for this puzzle goes to \i{Nikoli} \k{nikoli-lightup}.
 Light Up was contributed to this collection by James Harvey.
 
 \B{nikoli-lightup}
-\W{http://www.nikoli.co.jp/en/puzzles/akari.html}\cw{http://www.nikoli.co.jp/en/puzzles/akari.html}
-(beware of Flash)
+\W{https://www.nikoli.co.jp/en/puzzles/akari/}\cw{https://www.nikoli.co.jp/en/puzzles/akari/}
 
 \H{lightup-controls} \i{Light Up controls}
 
@@ -1847,6 +1913,12 @@ noticeably.)
 backtracking or guessing, \q{Hard} means that some guesses will
 probably be necessary.
 
+\H{lightup-prefs} \I{preferences, for Light Up}Light Up user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure whether \q{this is not a
+light} marks are shown when the square is also lit.
+
 
 \C{map} \i{Map}
 
@@ -1856,7 +1928,7 @@ You are given a map consisting of a number of regions. Your task is
 to colour each region with one of four colours, in such a way that
 no two regions sharing a boundary have the same colour. You are
 provided with some regions already coloured, sufficient to make the
-remainder of the solution unique.
+remainder of the solution unique, and these cannot be changed.
 
 Only regions which share a length of border are required to be
 different colours. Two regions which meet at only one \e{point}
@@ -1864,9 +1936,9 @@ different colours. Two regions which meet at only one \e{point}
 
 I believe this puzzle is original; I've never seen an implementation
 of it anywhere else. The concept of a \i{four-colouring} puzzle was
-suggested by Owen Dunn; credit must also go to Nikoli and to Verity
+suggested by Alexandra Lanes; credit must also go to Nikoli and to Verity
 Allan for inspiring the train of thought that led to me realising
-Owen's suggestion was a viable puzzle. Thanks also to Gareth Taylor
+Alex's suggestion was a viable puzzle. Thanks also to Gareth Taylor
 for many detailed suggestions.
 
 \H{map-controls} \i{Map controls}
@@ -1940,6 +2012,12 @@ Unreasonable puzzles may require guessing and backtracking.
 
 }
 
+\H{map-prefs} \I{preferences, for Map}Map user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the style of the victory
+flash and also whether the regions start out labelled with numbers.
+
 
 \C{loopy} \i{Loopy}
 
@@ -1967,8 +2045,7 @@ and subsequently enhanced to handle various types of non-square grid
 by Lambros Lambrou.
 
 \B{nikoli-loopy}
-\W{http://www.nikoli.co.jp/en/puzzles/slitherlink.html}\cw{http://www.nikoli.co.jp/en/puzzles/slitherlink.html}
-(beware of Flash)
+\W{https://www.nikoli.co.jp/en/puzzles/slitherlink/}\cw{https://www.nikoli.co.jp/en/puzzles/slitherlink/}
 
 \H{loopy-controls} \i{Loopy controls}
 
@@ -2013,6 +2090,34 @@ same; this makes them the least confusing to play.
 \#{FIXME: what distinguishes Easy, Medium, and Hard? In particular,
 when are backtracking/guesswork required, if ever?}
 
+\H{loopy-prefs} \I{preferences, for Loopy}Loopy user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the following things:
+
+\q{Draw excluded grid lines faintly}. This is on by default: when a
+line of the grid has been explicitly excluded from the solution by
+right-clicking it, the line is still drawn, just in a faint grey
+colour. If you turn this option off, excluded lines are not drawn at
+all.
+
+\q{Auto-follow unique paths of edges}. This is off by default. When
+it's on, clicking to change the status of a single grid line will
+potentially propagate the change along multiple lines, if one or both
+ends of the line you clicked connect to only one other line. (The idea
+is that if two lines meet at a vertex and no other lines do at all,
+then those lines are either both part of the loop or neither, so
+there's no reason you should have to click separately to toggle each
+one.)
+
+In the mode \q{Based on grid only}, the effects of a click will only
+propagate across vertices that have degree 2 in the underlying grid.
+For example, in the square grid, the effect will \e{only} occur at the
+four grid corners.
+
+In the mode \q{Based on grid and game state}, the propagation will
+also take account of edges you've already excluded from the solution,
+so that it will do even more work for you.
 
 \C{inertia} \i{Inertia}
 
@@ -2171,8 +2276,7 @@ Credit for this puzzle goes to \i{Nikoli} \k{nikoli-bridges}.
 Bridges was contributed to this collection by James Harvey.
 
 \B{nikoli-bridges}
-\W{http://www.nikoli.co.jp/en/puzzles/hashiwokakero.html}\cw{http://www.nikoli.co.jp/en/puzzles/hashiwokakero.html}
-(beware of Flash)
+\W{https://www.nikoli.co.jp/en/puzzles/Hashiwokakero/}\cw{https://www.nikoli.co.jp/en/puzzles/Hashiwokakero/}
 
 \H{bridges-controls} \i{Bridges controls}
 
@@ -2217,6 +2321,9 @@ By pressing a number key, you can jump to the nearest island with that
 number.  Letters \q{a}, ..., \q{f} count as 10, ..., 15 and \q{0} as
 16.
 
+The \q{G} key will draw a grey line between each pair of islands that
+could be connected with a bridge or non-bridge but are currently not.
+
 Violations of the puzzle rules will be marked in red:
 
 \b An island with too many bridges will be highlighted in red.
@@ -2288,6 +2395,13 @@ tightly-packed islands.
 
 }
 
+\H{bridges-prefs} \I{preferences, for Bridges}Bridges user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure whether possible bridge
+locations are shown.  Unlike the \q{G} key, this will persist between
+games.
+
 
 \C{unequal} \i{Unequal}
 
@@ -2416,7 +2530,7 @@ English as \q{Spiral Galaxies}.
 
 Galaxies was contributed to this collection by James Harvey.
 
-\B{nikoli-galaxies} \W{http://www.nikoli.co.jp/en/puzzles/astronomical_show.html}\cw{http://www.nikoli.co.jp/en/puzzles/astronomical_show.html}
+\B{nikoli-galaxies} \W{https://www.nikoli.co.jp/en/puzzles/tentai_show/}\cw{https://www.nikoli.co.jp/en/puzzles/tentai_show/}
 
 \H{galaxies-controls} \i{Galaxies controls}
 
@@ -2489,7 +2603,7 @@ Credit for this puzzle goes to \i{Nikoli} \k{nikoli-fillomino}.
 Filling was contributed to this collection by Jonas K\u00F6{oe}lker.
 
 \B{nikoli-fillomino}
-\W{http://www.nikoli.co.jp/en/puzzles/fillomino.html}\cw{http://www.nikoli.co.jp/en/puzzles/fillomino.html}
+\W{https://www.nikoli.co.jp/en/puzzles/fillomino/}\cw{https://www.nikoli.co.jp/en/puzzles/fillomino/}
 
 \H{filling-controls} \I{controls, for Filling}Filling controls
 
@@ -2718,6 +2832,14 @@ level, some backtracking will be required, but the solution should
 still be unique. The remaining levels require increasingly complex
 reasoning to avoid having to backtrack.
 
+\H{towers-prefs} \I{preferences, for Towers}Towers user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the style of the game
+display. If you don't like the three-dimensional mode, selecting
+\q{2D} will switch to a simpler display style in which towers are
+shown by just writing their height in the square.
+
 
 \C{singles} \i{Singles}
 
@@ -2741,8 +2863,7 @@ Credit for this puzzle goes to \i{Nikoli} \k{nikoli-hitori} who call it
 Singles was contributed to this collection by James Harvey.
 
 \B{nikoli-hitori}
-\W{http://www.nikoli.com/en/puzzles/hitori.html}\cw{http://www.nikoli.com/en/puzzles/hitori.html}
-(beware of Flash)
+\W{https://www.nikoli.co.jp/en/puzzles/hitori/}\cw{https://www.nikoli.co.jp/en/puzzles/hitori/}
 
 \H{singles-controls} \i{Singles controls}
 
@@ -2750,7 +2871,9 @@ Singles was contributed to this collection by James Harvey.
 
 Left-clicking on an empty square will colour it black; left-clicking again 
 will restore the number. Right-clicking will add a circle (useful for 
-indicating that a cell is definitely not black). 
+indicating that a cell is definitely not black). Clicking outside the
+grid will toggle whether black squares completely hide the numbers on
+them, or display them in dark grey.
 
 You can also use the cursor keys to move around the grid. Pressing the
 return or space keys will turn a square black or add a circle respectively,
@@ -2771,6 +2894,12 @@ These parameters are available from the \q{Custom...} option on the
 
 \dd Controls the difficulty of the generated puzzle.
 
+\H{Singles-prefs} \I{preferences, for Singles}Singles user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure whether numbers on black
+squares are visible.  Unlike clicking outside the grid, this will
+persist between games.
 
 \C{magnets} \i{Magnets}
 
@@ -2925,6 +3054,13 @@ These parameters are available from the \q{Custom...} option on the
 (the start at the top left, and the end at the bottom right). If false the start
 and end squares are placed randomly (although always both shown). 
 
+\H{signpost-prefs} \I{preferences, for Signpost}Signpost user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the style of the victory
+effect.
+
+
 \C{range} \i{Range}
 
 \cfg{winhelp-topic}{games.range}
@@ -2959,7 +3095,7 @@ it \q{Kurodoko}, \q{Kuromasu} or \q{Where is Black Cells}.
 Range was contributed to this collection by Jonas K\u00F6{oe}lker.
 
 \B{nikoli-range}
-\W{http://www.nikoli.co.jp/en/puzzles/where_is_black_cells.html}\cw{http://www.nikoli.co.jp/en/puzzles/where_is_black_cells.html}
+\W{https://www.nikoli.co.jp/en/puzzles/kurodoko/}\cw{https://www.nikoli.co.jp/en/puzzles/kurodoko/}
 
 \H{range-controls} \I{controls, for Range}Range controls
 
@@ -2987,6 +3123,13 @@ These parameters are available from the \q{Custom...} option on the
 
 \dd Size of grid in squares.
 
+\H{range-prefs} \I{preferences, for Range}Range user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure which way round the mouse
+buttons work.
+
+
 \C{pearl} \i{Pearl}
 
 \cfg{winhelp-topic}{games.pearl}
@@ -3019,8 +3162,7 @@ Credit for this puzzle goes to \i{Nikoli}, who call it \q{Masyu}.
 Thanks to James Harvey for assistance with the implementation.
 
 \B{nikoli-pearl}
-\W{http://www.nikoli.co.jp/en/puzzles/masyu.html}\cw{http://www.nikoli.co.jp/en/puzzles/masyu.html}
-(beware of Flash)
+\W{https://www.nikoli.co.jp/en/puzzles/masyu/}\cw{https://www.nikoli.co.jp/en/puzzles/masyu/}
 
 \H{pearl-controls} \I{controls, for Pearl}Pearl controls
 
@@ -3054,6 +3196,41 @@ right click, respectively, on the edge in the direction of the key.
 These parameters are available from the \q{Custom...} option on the
 \q{Type} menu.
 
+\dt \e{Width}, \e{Height}
+
+\dd Size of grid in squares.
+
+\dt \e{Difficulty}
+
+\dd Controls the difficulty of the generated puzzle.
+
+\dt \e{Allow unsoluble}
+
+\dd If this is set, then the game will be generated in the simplest
+way: every clue square that can possibly be provided will be shown,
+and the generator will not check whether the puzzle can be uniquely
+solved.
+
+\lcont{
+
+This speeds up game generation, and allows much larger grids to be
+played. At least one possible solution will still always exist, but
+there's no guarantee that it will be unique, or that it will be
+possible to deduce it step by step.
+
+}
+
+\H{pearl-prefs} \I{preferences, for Pearl}Pearl user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the style of the game
+display. \q{Traditional} is the default mode, in which the loop runs
+between centres of grid squares, and each clue occupies a square.
+\q{Loopy-style} is an alternative mode that looks more like Loopy
+(\k{loopy}), in which the loop runs between grid \e{vertices}, and the
+clues also occupy vertices.
+
+
 \C{undead} \i{Undead}
 
 \cfg{winhelp-topic}{games.undead}
@@ -3088,12 +3265,13 @@ Undead was contributed to this collection by Steffen Bauer.
 Undead has a similar control system to Solo, Unequal and Keen.
 
 To play Undead, click the mouse in any empty square and then type a
-letter on the keyboard indicating the type of monster: \q{G} for a
-ghost, \q{V} for a vampire, or \q{Z} for a zombie. If you make a
+letter or number on the keyboard indicating the type of monster:
+\q{G} or \q{1} for a ghost, \q{V} or \q{2} for a vampire,
+or \q{Z} or \q{3} for a zombie. If you make a
 mistake, click the mouse in the incorrect square and press Space to
 clear it again (or use the Undo feature).
 
-If you \e{right}-click in a square and then type a letter, the
+If you \e{right}-click in a square and then type a letter or number, the
 corresponding monster will be shown in reduced size in that square, as
 a \q{pencil mark}. You can have pencil marks for multiple monsters in
 the same square. A square containing a full-size monster cannot also
@@ -3106,7 +3284,7 @@ monster, or you can use them as lists of the possible monster in a
 given square, or anything else you feel like.
 
 To erase a single pencil mark, right-click in the square and type
-the same letter again.
+the same letter or number again.
 
 All pencil marks in a square are erased when you left-click and type a
 monster letter, or when you left-click and press Space. Right-clicking
@@ -3114,7 +3292,7 @@ and pressing space will also erase pencil marks.
 
 As for Solo, the cursor keys can be used in conjunction with the letter
 keys to place monsters or pencil marks. Use the cursor keys to move a
-highlight around the grid, and type a monster letter to enter it in
+highlight around the grid, and type a monster letter or number to enter it in
 the highlighted square. Pressing return toggles the highlight into a
 mode in which you can enter or remove pencil marks.
 
@@ -3140,6 +3318,13 @@ These parameters are available from the \q{Custom...} option on the
 
 \dd Controls the difficulty of the generated puzzle.
 
+\H{undead-prefs} \I{preferences, for Undead}Undead user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure whether Undead uses letters
+or pictures to represent monsters.
+
+
 \C{unruly} \i{Unruly}
 
 \cfg{winhelp-topic}{games.unruly}
@@ -3329,15 +3514,20 @@ Credit for this puzzle goes to \i{Nikoli}, who call it \q{Five Cells}.
 Palisade was contributed to this collection by Jonas K\u00F6{oe}lker.
 
 \B{nikoli-palisade}
-\W{http://nikoli.co.jp/en/puzzles/five_cells.html}\cw{http://nikoli.co.jp/en/puzzles/five_cells.html}
+\W{https://www.nikoli.co.jp/en/puzzles/five_cells/}\cw{https://www.nikoli.co.jp/en/puzzles/five_cells/}
 
 \H{palisade-controls} \I{controls, for Palisade}Palisade controls
 
 Left-click to place an edge.  Right-click to indicate \q{no edge}.
-Alternatively, the arrow keys will move a keyboard cursor.  Holding
-Control while pressing an arrow key will place an edge.  Press
-Shift-arrowkey to switch off an edge.  Repeat an action to perform
-its inverse.
+
+Alternatively, the arrow keys will move a keyboard cursor. Depending
+on the \q{Cursor mode} preference (see \k{palisade-prefs}), the cursor
+will either navigate among the grid squares, or along their
+borders. In \q{Full-grid} mode, hold Control while pressing an arrow
+key to place an edge, and press Shift-arrowkey to switch off an
+edge. In \q{Half-grid} mode, press Enter to place an edge, and Space
+to switch off an edge. In either mode, you can repeat an action to
+perform its inverse.
 
 (All the actions described in \k{common-actions} are also available.)
 
@@ -3354,14 +3544,71 @@ These parameters are available from the \q{Custom...} option on the
 
 \dd The size of the regions into which the grid must be subdivided.
 
+\H{palisade-prefs} \I{preferences, for Palisade}Palisade user preferences
+
+On platforms that support user preferences, the \q{Preferences} option
+on the \q{Game} menu will let you configure the behavior of the cursor
+keys to either navigate among full grid squares, or along the borders
+of the grid squares.
+
+\C{mosaic} \i{Mosaic}
+
+\cfg{winhelp-topic}{games.mosaic}
+
+You are given a grid of squares, which you must colour either black or
+white.
+
+Some squares contain clue numbers. Each clue tells you the number of
+black squares in the 3\times\.3 region surrounding the clue \dash
+\e{including} the clue square itself.
+
+This game is variously known in other locations as: ArtMosaico, Count
+and Darken, Cuenta Y Sombrea, Fill-a-Pix, Fill-In, Komsu Karala,
+Magipic, Majipiku, Mosaico, Mosaik, Mozaiek, Nampre Puzzle,
+Nurie-Puzzle, Oekaki-Pix, Voisimage.
+
+Mosaic was contributed to this collection by Didi Kohen. Colour design
+by Michal Shomer. The implementation is loosely based on
+\W{https://github.com/mordechaim/Mosaic}\cw{github.com/mordechaim/Mosaic}.
+
+\H{mosaic-controls} \I{controls, for Mosaic}Mosaic controls
+
+To play Mosaic, click the mouse in a square to change its colour.
+Left-clicking an empty square will turn it black, and right-clicking
+will turn it white. Keep clicking the same button to cycle through the
+three possible states for the square.
+
+If you hold down the mouse button and drag, you can colour multiple
+cells in a single action.
+
+You can also use the cursor keys to move around the grid. Pressing the
+return or space keys will turn an empty square black or white
+respectively (and then cycle the colours in the same way as the mouse
+buttons), and pressing Backspace will reset a square to empty.
+
+\H{Mosaic-parameters} \I{parameters, for Mosaic}Mosaic parameters
+
+These parameters are available from the \q{Custom...} option on the
+\q{Type} menu.
+
+\dt \e{Width}, \e{Height}
+
+\dd Size of grid in squares.
+
+\dt \e{Aggressive generation}
+
+\dd With this option set, the game generator will try harder to
+eliminate unnecessary clues on the board. This slows down generation,
+so it's not recommended for boards larger than, say, 30\times\.30.
+
 \A{licence} \I{MIT licence}\ii{Licence}
 
-This software is \i{copyright} 2004-2014 Simon Tatham.
+This software is \i{copyright} 2004-2024 Simon Tatham.
 
 Portions copyright Richard Boulton, James Harvey, Mike Pinna, Jonas
 K\u00F6{oe}lker, Dariusz Olszewski, Michael Schierl, Lambros Lambrou,
 Bernd Schmidt, Steffen Bauer, Lennard Sprong, Rogier Goossens, Michael
-Quevillon and Asher Gordon.
+Quevillon, Asher Gordon, Didi Kohen, and Ben Harris.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation files
diff --git a/apps/plugins/puzzles/src/puzzles.h b/apps/plugins/puzzles/src/puzzles.h
index 29b00ddaf0..44a056d78f 100644
--- a/apps/plugins/puzzles/src/puzzles.h
+++ b/apps/plugins/puzzles/src/puzzles.h
@@ -18,6 +18,9 @@
 #define STR_INT(x) #x
 #define STR(x) STR_INT(x)
 
+/* An upper bound on the length of sprintf'ed integers (signed or unsigned). */
+#define MAX_DIGITS(x) (sizeof(x) * CHAR_BIT / 3 + 2)
+
 /* NB not perfect because they evaluate arguments multiple times. */
 #ifndef max
 #define max(x,y) ( (x)>(y) ? (x) : (y) )
@@ -69,6 +72,7 @@ enum {
                             (m) == CURSOR_RIGHT || (m) == CURSOR_LEFT )
 #define IS_CURSOR_SELECT(m) ( (m) == CURSOR_SELECT || (m) == CURSOR_SELECT2)
 #define IS_UI_FAKE_KEY(m) ( (m) > UI_LOWER_BOUND && (m) < UI_UPPER_BOUND )
+#define STRIP_BUTTON_MODIFIERS(m) ( (unsigned)(m) & ~MOD_MASK )
 
 /*
  * Flags in the back end's `flags' word.
@@ -83,14 +87,6 @@ enum {
 #define REQUIRE_NUMPAD ( 1 << 11 )
 /* end of `flags' word definitions */
 
-#ifdef _WIN32_WCE
-  /* Pocket PC devices have small, portrait screen that requires more vivid colours */
-  #define SMALL_SCREEN
-  #define PORTRAIT_SCREEN
-  #define VIVID_COLOURS
-  #define STYLUS_BASED
-#endif
-
 #define IGNOREARG(x) ( (x) = (x) )
 
 typedef struct frontend frontend;
@@ -132,8 +128,13 @@ typedef struct psdata psdata;
  */
 enum { C_STRING, C_CHOICES, C_BOOLEAN, C_END };
 struct config_item {
-    /* Not dynamically allocated */
+    /* Not dynamically allocated: the GUI display name for the option */
     const char *name;
+    /* Not dynamically allocated: the keyword identifier for the
+     * option. Only examined in the case where this structure is being
+     * used for options that appear in config files, i.e. the
+     * get_prefs method fills this in but configure does not. */
+    const char *kw;
     /* Value from the above C_* enum */
     int type;
     union {
@@ -151,6 +152,13 @@ struct config_item {
              */
             const char *choicenames;
             /*
+             * choicekws is non-NULL, not dynamically allocated, and
+             * contains a parallel list of keyword strings used to
+             * represent the enumeration in config files. As with 'kw'
+             * above, this is only expected to be set by get_prefs.
+             */
+            const char *choicekws;
+            /*
              * Indicates the chosen index from the options in
              * choicenames. In the above example, 0==Foo, 1==Bar and
              * 2==Baz.
@@ -256,8 +264,10 @@ void draw_text(drawing *dr, int x, int y, int fonttype, int fontsize,
                int align, int colour, const char *text);
 void draw_rect(drawing *dr, int x, int y, int w, int h, int colour);
 void draw_line(drawing *dr, int x1, int y1, int x2, int y2, int colour);
-void draw_polygon(drawing *dr, int *coords, int npoints,
+void draw_polygon(drawing *dr, const int *coords, int npoints,
                   int fillcolour, int outlinecolour);
+void draw_polygon_fallback(drawing *dr, const int *coords, int npoints,
+                           int fillcolour, int outlinecolour);
 void draw_circle(drawing *dr, int cx, int cy, int radius,
                  int fillcolour, int outlinecolour);
 void draw_thick_line(drawing *dr, float thickness,
@@ -307,13 +317,16 @@ void midend_free(midend *me);
 const game *midend_which_game(midend *me);
 void midend_set_params(midend *me, game_params *params);
 game_params *midend_get_params(midend *me);
-void midend_size(midend *me, int *x, int *y, bool user_size);
+void midend_size(midend *me, int *x, int *y, bool user_size,
+                 double device_pixel_ratio);
 void midend_reset_tilesize(midend *me);
 void midend_new_game(midend *me);
 void midend_restart_game(midend *me);
 void midend_stop_anim(midend *me);
-bool midend_process_key(midend *me, int x, int y, int button);
+enum { PKR_QUIT = 0, PKR_SOME_EFFECT, PKR_NO_EFFECT, PKR_UNUSED };
+int midend_process_key(midend *me, int x, int y, int button);
 key_label *midend_request_keys(midend *me, int *nkeys);
+const char *midend_current_key_label(midend *me, int button);
 void midend_force_redraw(midend *me);
 void midend_redraw(midend *me);
 float *midend_colours(midend *me, int *ncolours);
@@ -322,7 +335,7 @@ void midend_timer(midend *me, float tplus);
 struct preset_menu *midend_get_presets(midend *me, int *id_limit);
 int midend_which_preset(midend *me);
 bool midend_wants_statusbar(midend *me);
-enum { CFG_SETTINGS, CFG_SEED, CFG_DESC, CFG_FRONTEND_SPECIFIC };
+enum { CFG_SETTINGS, CFG_SEED, CFG_DESC, CFG_PREFS, CFG_FRONTEND_SPECIFIC };
 config_item *midend_get_config(midend *me, int which, char **wintitle);
 const char *midend_set_config(midend *me, int which, config_item *cfg);
 const char *midend_game_id(midend *me, const char *id);
@@ -343,6 +356,11 @@ void midend_serialise(midend *me,
 const char *midend_deserialise(midend *me,
                                bool (*read)(void *ctx, void *buf, int len),
                                void *rctx);
+const char *midend_load_prefs(
+    midend *me, bool (*read)(void *ctx, void *buf, int len), void *rctx);
+void midend_save_prefs(midend *me,
+                       void (*write)(void *ctx, const void *buf, int len),
+                       void *wctx);
 const char *identify_game(char **name,
                           bool (*read)(void *ctx, void *buf, int len),
                           void *rctx);
@@ -374,12 +392,22 @@ void free_cfg(config_item *cfg);
 void free_keys(key_label *keys, int nkeys);
 void obfuscate_bitmap(unsigned char *bmp, int bits, bool decode);
 char *fgetline(FILE *fp);
+char *make_prefs_path(const char *dir, const char *sep,
+                      const game *game, const char *suffix);
+int n_times_root_k(int n, int k);
 
 /* allocates output each time. len is always in bytes of binary data.
  * May assert (or just go wrong) if lengths are unchecked. */
 char *bin2hex(const unsigned char *in, int inlen);
 unsigned char *hex2bin(const char *in, int outlen);
 
+/* Returns 0 or 1 if the environment variable is set, or dflt if not.
+ * dflt may be a third value if it needs to be. */
+int getenv_bool(const char *name, int dflt);
+
+/* Mixes two colours in specified proportions. */
+void colour_mix(const float src1[3], const float src2[3], float p,
+                float dst[3]);
 /* Sets (and possibly dims) background from frontend default colour,
  * and auto-generates highlight and lowlight colours too. */
 void game_mkhighlight(frontend *fe, float *ret,
@@ -392,14 +420,15 @@ void game_mkhighlight_specific(frontend *fe, float *ret,
 /* Randomly shuffles an array of items. */
 void shuffle(void *array, int nelts, int eltsize, random_state *rs);
 
-/* Draw a rectangle outline, using the drawing API's draw_line. */
+/* Draw a rectangle outline, using the drawing API's draw_polygon. */
 void draw_rect_outline(drawing *dr, int x, int y, int w, int h,
                        int colour);
 
 /* Draw a set of rectangle corners (e.g. for a cursor display). */
 void draw_rect_corners(drawing *dr, int cx, int cy, int r, int col);
 
-void move_cursor(int button, int *x, int *y, int maxw, int maxh, bool wrap);
+char *move_cursor(int button, int *x, int *y, int maxw, int maxh, bool wrap,
+                  bool *visible);
 
 /* Used in netslide.c and sixteen.c for cursor movement around edge. */
 int c2pos(int w, int h, int cx, int cy);
@@ -416,37 +445,55 @@ void draw_text_outline(drawing *dr, int x, int y, int fonttype,
  * less than buffer size. */
 void copy_left_justified(char *buf, size_t sz, const char *str);
 
-/* An ugly, but working float-to-string implementation for platforms
- * that don't have one */
-int ftoa(char *buf, float f);
-
 /* Returns a generic label based on the value of `button.' To be used
    whenever a `label' field returned by the request_keys() game
    function is NULL. Dynamically allocated, to be freed by caller. */
 char *button2label(int button);
 
+/* Swap two regions of memory. The two regions must not
+ * overlap. (Note: the natural name for this might be "memswap", but
+ * the mem* namespace is reserved for future expansion by the C99
+ * standard per clause 7.26.11.1.) */
+void swap_regions(void *av, void *bv, size_t size);
+
+/* comparator for sorting ints with qsort() */
+int compare_integers(const void *av, const void *bv);
+
 /*
  * dsf.c
  */
-int *snew_dsf(int size);
-
-void print_dsf(int *dsf, int size);
-
-/* Return the canonical element of the equivalence class containing element
- * val.  If 'inverse' is non-NULL, this function will put into it a flag
- * indicating whether the canonical element is inverse to val. */
-int edsf_canonify(int *dsf, int val, bool *inverse);
-int dsf_canonify(int *dsf, int val);
-int dsf_size(int *dsf, int val);
-
-/* Allow the caller to specify that two elements should be in the same
- * equivalence class.  If 'inverse' is true, the elements are actually opposite
- * to one another in some sense.  This function will fail an assertion if the
- * caller gives it self-contradictory data, ie if two elements are claimed to
- * be both opposite and non-opposite. */
-void edsf_merge(int *dsf, int v1, int v2, bool inverse);
-void dsf_merge(int *dsf, int v1, int v2);
-void dsf_init(int *dsf, int len);
+typedef struct DSF DSF;
+DSF *dsf_new(int size);
+void dsf_free(DSF *dsf);
+
+void dsf_copy(DSF *to, DSF *from);
+
+/* Basic dsf operations, return the canonical element of a class,
+ * check if two elements are in the same class, and return the size of
+ * a class. These work on all types of dsf. */
+int dsf_canonify(DSF *dsf, int n);
+bool dsf_equivalent(DSF *dsf, int n1, int n2);
+int dsf_size(DSF *dsf, int n);
+
+/* Merge two elements and their classes. Not legal on a flip dsf. */
+void dsf_merge(DSF *dsf, int n1, int n2);
+
+/* Special dsf that tracks the minimal element of every equivalence
+ * class, and a function to query it. */
+DSF *dsf_new_min(int size);
+int dsf_minimal(DSF *dsf, int n);
+
+/* Special dsf that tracks whether pairs of elements in the same class
+ * have flipped sense relative to each other. Merge function takes an
+ * argument saying whether n1 and n2 are opposite to each other;
+ * canonify function will report whether n is opposite to the returned
+ * element. */
+DSF *dsf_new_flip(int size);
+void dsf_merge_flip(DSF *dsf, int n1, int n2, bool flip);
+int dsf_canonify_flip(DSF *dsf, int n, bool *flip);
+
+/* Reinitialise a dsf to the starting 'all elements distinct' state. */
+void dsf_reinit(DSF *dsf);
 
 /*
  * tdq.c
@@ -507,7 +554,7 @@ void random_free(random_state *state);
 char *random_state_encode(random_state *state);
 random_state *random_state_decode(const char *input);
 /* random.c also exports SHA, which occasionally comes in useful. */
-#if __STDC_VERSION__ >= 199901L
+#if HAVE_STDINT_H
 #include <stdint.h>
 typedef uint32_t uint32;
 #elif UINT_MAX >= 4294967295L
@@ -532,7 +579,7 @@ void SHA_Simple(const void *p, int len, unsigned char *output);
 document *document_new(int pw, int ph, float userscale);
 void document_free(document *doc);
 void document_add_puzzle(document *doc, const game *game, game_params *par,
-                         game_state *st, game_state *st2);
+                         game_ui *ui, game_state *st, game_state *st2);
 int document_npages(const document *doc);
 void document_begin(const document *doc, drawing *dr);
 void document_end(const document *doc, drawing *dr);
@@ -564,7 +611,9 @@ void free_combi(combi_ctx *combi);
  * divvy.c
  */
 /* divides w*h rectangle into pieces of size k. Returns w*h dsf. */
-int *divvy_rectangle(int w, int h, int k, random_state *rs);
+DSF *divvy_rectangle(int w, int h, int k, random_state *rs);
+/* Same, but only tries once, and may fail. (Exposed for test program.) */
+DSF *divvy_rectangle_attempt(int w, int h, int k, random_state *rs);
 
 /*
  * findloop.c
@@ -661,19 +710,24 @@ struct game {
     bool can_format_as_text_ever;
     bool (*can_format_as_text_now)(const game_params *params);
     char *(*text_format)(const game_state *state);
+    config_item *(*get_prefs)(game_ui *ui);
+    void (*set_prefs)(game_ui *ui, const config_item *cfg);
     game_ui *(*new_ui)(const game_state *state);
     void (*free_ui)(game_ui *ui);
     char *(*encode_ui)(const game_ui *ui);
-    void (*decode_ui)(game_ui *ui, const char *encoding);
+    void (*decode_ui)(game_ui *ui, const char *encoding,
+                      const game_state *state);
     key_label *(*request_keys)(const game_params *params, int *nkeys);
     void (*changed_state)(game_ui *ui, const game_state *oldstate,
                           const game_state *newstate);
+    const char *(*current_key_label)(const game_ui *ui,
+                                     const game_state *state, int button);
     char *(*interpret_move)(const game_state *state, game_ui *ui,
                             const game_drawstate *ds, int x, int y, int button);
     game_state *(*execute_move)(const game_state *state, const char *move);
     int preferred_tilesize;
     void (*compute_size)(const game_params *params, int tilesize,
-                         int *x, int *y);
+                         const game_ui *ui, int *x, int *y);
     void (*set_size)(drawing *dr, game_drawstate *ds,
                      const game_params *params, int tilesize);
     float *(*colours)(frontend *fe, int *ncolours);
@@ -693,51 +747,86 @@ struct game {
                                 int *x, int *y, int *w, int *h);
     int (*status)(const game_state *state);
     bool can_print, can_print_in_colour;
-    void (*print_size)(const game_params *params, float *x, float *y);
-    void (*print)(drawing *dr, const game_state *state, int tilesize);
+    void (*print_size)(const game_params *params, const game_ui *ui,
+                       float *x, float *y);
+    void (*print)(drawing *dr, const game_state *state, const game_ui *ui,
+                  int tilesize);
     bool wants_statusbar;
     bool is_timed;
     bool (*timing_state)(const game_state *state, game_ui *ui);
     int flags;
 };
 
+#define GET_HANDLE_AS_TYPE(dr, type) ((type*)((dr)->handle))
+
+struct drawing {
+    const drawing_api *api;
+    void *handle;
+};
+
 /*
  * Data structure containing the drawing API implemented by the
  * front end and also by cross-platform printing modules such as
  * PostScript.
  */
 struct drawing_api {
-    void (*draw_text)(void *handle, int x, int y, int fonttype, int fontsize,
+    /*
+     * API version. Increment this when there is a breaking change to
+     * this API which requires front ends to change.
+     *
+     * There is expliclty not a public LATEST_API_VERSION define, so
+     * that front end authors will need to manually intervene when the
+     * version number changes. Naturally, this should be done
+     * sparingly.
+     *
+     * If a function is ever added to this API, please move this field
+     * to the _end_ of the structure, so that changes thereafter will
+     * shift the position of the version and lead to a compilation
+     * error if old implementations are not updated. Then remove this
+     * comment.
+     *
+     * The latest version number is 1.
+     *
+     * Change log:
+     *
+     * Version 1 (2024-08-14): Introduction of version number, in
+     * conjunction with changing every API function to take `drawing
+     * *` instead of `void *`. See commit f379130 for the detailed
+     * rationale behind this change.
+     */
+    int version;
+
+    void (*draw_text)(drawing *dr, int x, int y, int fonttype, int fontsize,
                       int align, int colour, const char *text);
-    void (*draw_rect)(void *handle, int x, int y, int w, int h, int colour);
-    void (*draw_line)(void *handle, int x1, int y1, int x2, int y2,
+    void (*draw_rect)(drawing *dr, int x, int y, int w, int h, int colour);
+    void (*draw_line)(drawing *dr, int x1, int y1, int x2, int y2,
                       int colour);
-    void (*draw_polygon)(void *handle, int *coords, int npoints,
+    void (*draw_polygon)(drawing *dr, const int *coords, int npoints,
                          int fillcolour, int outlinecolour);
-    void (*draw_circle)(void *handle, int cx, int cy, int radius,
+    void (*draw_circle)(drawing *dr, int cx, int cy, int radius,
                         int fillcolour, int outlinecolour);
-    void (*draw_update)(void *handle, int x, int y, int w, int h);
-    void (*clip)(void *handle, int x, int y, int w, int h);
-    void (*unclip)(void *handle);
-    void (*start_draw)(void *handle);
-    void (*end_draw)(void *handle);
-    void (*status_bar)(void *handle, const char *text);
-    blitter *(*blitter_new)(void *handle, int w, int h);
-    void (*blitter_free)(void *handle, blitter *bl);
-    void (*blitter_save)(void *handle, blitter *bl, int x, int y);
-    void (*blitter_load)(void *handle, blitter *bl, int x, int y);
-    void (*begin_doc)(void *handle, int pages);
-    void (*begin_page)(void *handle, int number);
-    void (*begin_puzzle)(void *handle, float xm, float xc,
+    void (*draw_update)(drawing *dr, int x, int y, int w, int h);
+    void (*clip)(drawing *dr, int x, int y, int w, int h);
+    void (*unclip)(drawing *dr);
+    void (*start_draw)(drawing *dr);
+    void (*end_draw)(drawing *dr);
+    void (*status_bar)(drawing *dr, const char *text);
+    blitter *(*blitter_new)(drawing *dr, int w, int h);
+    void (*blitter_free)(drawing *dr, blitter *bl);
+    void (*blitter_save)(drawing *dr, blitter *bl, int x, int y);
+    void (*blitter_load)(drawing *dr, blitter *bl, int x, int y);
+    void (*begin_doc)(drawing *dr, int pages);
+    void (*begin_page)(drawing *dr, int number);
+    void (*begin_puzzle)(drawing *dr, float xm, float xc,
                          float ym, float yc, int pw, int ph, float wmm);
-    void (*end_puzzle)(void *handle);
-    void (*end_page)(void *handle, int number);
-    void (*end_doc)(void *handle);
-    void (*line_width)(void *handle, float width);
-    void (*line_dotted)(void *handle, bool dotted);
-    char *(*text_fallback)(void *handle, const char *const *strings,
+    void (*end_puzzle)(drawing *dr);
+    void (*end_page)(drawing *dr, int number);
+    void (*end_doc)(drawing *dr);
+    void (*line_width)(drawing *dr, float width);
+    void (*line_dotted)(drawing *dr, bool dotted);
+    char *(*text_fallback)(drawing *dr, const char *const *strings,
                            int nstrings);
-    void (*draw_thick_line)(void *handle, float thickness,
+    void (*draw_thick_line)(drawing *dr, float thickness,
                             float x1, float y1, float x2, float y2,
                             int colour);
 };
@@ -750,17 +839,29 @@ struct drawing_api {
 #ifdef COMBINED
 extern const game *gamelist[];
 extern const int gamecount;
+/* Also pre-declare every individual 'struct game' we expect */
+#define GAME(x) extern const game x;
+#include "generated-games.h"
+#undef GAME
 #else
 extern const game thegame;
 #endif
 
 /*
- * Special string value to return from interpret_move in the case
- * where the game UI has been updated but no actual move is being
- * appended to the undo chain. Must be declared as a non-const char,
- * but should never actually be modified by anyone.
+ * Special string values to return from interpret_move.
+ *
+ * MOVE_UI_UPDATE is for the case where the game UI has been updated
+ * but no actual move is being appended to the undo chain.
+ *
+ * MOVE_NO_EFFECT is for when the key was understood by the puzzle,
+ * but it happens that there isn't effect, not even a UI change.
+ *
+ * MOVE_UNUSED is for keys that the puzzle has no use for at all.
+ *
+ * Each must be declared as a non-const char, but should never
+ * actually be modified by anyone.
  */
-extern char UI_UPDATE[];
+extern char MOVE_UI_UPDATE[], MOVE_NO_EFFECT[], MOVE_UNUSED[];
 
 /* A little bit of help to lazy developers */
 #define DEFAULT_STATUSBAR_TEXT "Use status_bar() to fill this in."
diff --git a/apps/plugins/puzzles/src/random.c b/apps/plugins/puzzles/src/random.c
index fb54560c95..bd11f16601 100644
--- a/apps/plugins/puzzles/src/random.c
+++ b/apps/plugins/puzzles/src/random.c
@@ -109,7 +109,7 @@ void SHA_Init(SHA_State * s)
 
 void SHA_Bytes(SHA_State * s, const void *p, int len)
 {
-    unsigned char *q = (unsigned char *) p;
+    const unsigned char *q = (const unsigned char *) p;
     uint32 wordblock[16];
     uint32 lenw = len;
     int i;
@@ -254,12 +254,12 @@ unsigned long random_bits(random_state *state, int bits)
     }
 
     /*
-     * `(1 << bits) - 1' is not good enough, since if bits==32 on a
+     * `(1UL << bits) - 1' is not good enough, since if bits==32 on a
      * 32-bit machine, behaviour is undefined and Intel has a nasty
      * habit of shifting left by zero instead. We'll shift by
      * bits-1 and then separately shift by one.
      */
-    ret &= (1 << (bits-1)) * 2 - 1;
+    ret &= (1UL << (bits-1)) * 2 - 1;
     return ret;
 }
 
diff --git a/apps/plugins/puzzles/src/range.R b/apps/plugins/puzzles/src/range.R
deleted file mode 100644
index f1256efd1e..0000000000
--- a/apps/plugins/puzzles/src/range.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-RANGE_EXTRA = dsf
-
-range    : [X] GTK COMMON range RANGE_EXTRA range-icon|no-icon
-
-range    : [G] WINDOWS COMMON range RANGE_EXTRA range.res|noicon.res
-
-ALL += range[COMBINED] RANGE_EXTRA
-
-!begin am gtk
-GAMES += range
-!end
-
-!begin >list.c
-    A(range) \
-!end
-
-!begin >gamedesc.txt
-range:range.exe:Range:Visible-distance puzzle:Place black squares to limit the visible distance from each numbered cell.
-!end
diff --git a/apps/plugins/puzzles/src/range.c b/apps/plugins/puzzles/src/range.c
index fc0a5405f1..bc29f7604b 100644
--- a/apps/plugins/puzzles/src/range.c
+++ b/apps/plugins/puzzles/src/range.c
@@ -58,7 +58,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -911,8 +915,8 @@ static const char *validate_params(const game_params *params, bool full)
     int const w = params->w, h = params->h;
     if (w < 1) return "Error: width is less than 1";
     if (h < 1) return "Error: height is less than 1";
+    if (w > SCHAR_MAX - (h - 1)) return "Error: w + h is too big";
     if (w * h < 1) return "Error: size is less than 1";
-    if (w + h - 1 > SCHAR_MAX) return "Error: w + h is too big";
     /* I might be unable to store clues in my puzzle_size *grid; */
     if (full) {
         if (w == 2 && h == 2) return "Error: can't create 2x2 puzzles";
@@ -1221,28 +1225,101 @@ static char *game_text_format(const game_state *state)
 struct game_ui {
     puzzle_size r, c; /* cursor position */
     bool cursor_show;
+
+    /*
+     * User preference option to swap the left and right mouse
+     * buttons.
+     *
+     * The original puzzle submitter thought it would be more useful
+     * to have the left button turn an empty square into a dotted one,
+     * on the grounds that that was what you did most often; I (SGT)
+     * felt instinctively that the left button ought to place black
+     * squares and the right button place dots, on the grounds that
+     * that was consistent with many other puzzles in which the left
+     * button fills in the data used by the solution checker while the
+     * right button places pencil marks for the user's convenience.
+     *
+     * My first beta-player wasn't sure either, so I thought I'd
+     * pre-emptively put in a 'configuration' mechanism just in case.
+     */
+    bool swap_buttons;
 };
 
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static int initialised = false;
+    static int swap_buttons = -1;
+
+    if (!initialised) {
+        initialised = true;
+        swap_buttons = getenv_bool("RANGE_SWAP_BUTTONS", -1);
+    }
+
+    if (swap_buttons != -1)
+        ui_out->swap_buttons = swap_buttons;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
     struct game_ui *ui = snew(game_ui);
     ui->r = ui->c = 0;
-    ui->cursor_show = false;
+    ui->cursor_show = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+
+    ui->swap_buttons = false;
+    legacy_prefs_override(ui);
+
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Mouse button order";
+    ret[0].kw = "left-mouse-button";
+    ret[0].type = C_CHOICES;
+    ret[0].u.choices.choicenames =
+        ":Left to fill, right to dot:Left to dot, right to fill";
+    ret[0].u.choices.choicekws = ":fill:dot";
+    ret[0].u.choices.selected = ui->swap_buttons;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->swap_buttons = cfg[0].u.choices.selected;
+}
+
+static void free_ui(game_ui *ui)
+{
+    sfree(ui);
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    int cell;
+
+    if (IS_CURSOR_SELECT(button)) {
+        cell = state->grid[idx(ui->r, ui->c, state->params.w)];
+        if (!ui->cursor_show || cell > 0) return "";
+        switch (cell) {
+          case EMPTY:
+            return button == CURSOR_SELECT ? "Fill" : "Dot";
+          case WHITE:
+            return button == CURSOR_SELECT ? "Empty" : "Fill";
+          case BLACK:
+            return button == CURSOR_SELECT ? "Dot" : "Empty";
+        }
+    }
+    return "";
+
 }
 
 typedef struct drawcell {
@@ -1253,7 +1330,6 @@ typedef struct drawcell {
 struct game_drawstate {
     int tilesize;
     drawcell *grid;
-    bool started;
 };
 
 #define TILESIZE (ds->tilesize)
@@ -1283,38 +1359,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     }
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
-        /*
-         * Utterly awful hack, exactly analogous to the one in Slant,
-         * to configure the left and right mouse buttons the opposite
-         * way round.
-         *
-         * The original puzzle submitter thought it would be more
-         * useful to have the left button turn an empty square into a
-         * dotted one, on the grounds that that was what you did most
-         * often; I (SGT) felt instinctively that the left button
-         * ought to place black squares and the right button place
-         * dots, on the grounds that that was consistent with many
-         * other puzzles in which the left button fills in the data
-         * used by the solution checker while the right button places
-         * pencil marks for the user's convenience.
-         *
-         * My first beta-player wasn't sure either, so I thought I'd
-         * pre-emptively put in a 'configuration' mechanism just in
-         * case.
-         */
-        {
-            static int swap_buttons = -1;
-            if (swap_buttons < 0) {
-                char *env = getenv("RANGE_SWAP_BUTTONS");
-                swap_buttons = (env && (env[0] == 'y' || env[0] == 'Y'));
-            }
-            if (swap_buttons) {
-                if (button == LEFT_BUTTON)
-                    button = RIGHT_BUTTON;
-                else
-                    button = LEFT_BUTTON;
-            }
-        }
+        if (ui->swap_buttons) {
+            if (button == LEFT_BUTTON)
+                button = RIGHT_BUTTON;
+            else
+                button = LEFT_BUTTON;
+        }
     }
 
     switch (button) {
@@ -1355,14 +1405,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 else if (do_post)
                     return nfmtstr(40, "W,%d,%d", ui->r, ui->c);
                 else
-                    return UI_UPDATE;
+                    return MOVE_UI_UPDATE;
 
             } else if (!out_of_bounds(ui->r + dr[i], ui->c + dc[i], w, h)) {
                 ui->r += dr[i];
                 ui->c += dc[i];
             }
         } else ui->cursor_show = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (action == hint) {
@@ -1408,7 +1458,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 static bool find_errors(const game_state *state, bool *report)
 {
     int const w = state->params.w, h = state->params.h, n = w * h;
-    int *dsf;
+    DSF *dsf;
 
     int r, c, i;
 
@@ -1463,7 +1513,7 @@ static bool find_errors(const game_state *state, bool *report)
     /*
      * Check that all the white cells form a single connected component.
      */
-    dsf = snew_dsf(n);
+    dsf = dsf_new(n);
     for (r = 0; r < h-1; ++r)
         for (c = 0; c < w; ++c)
             if (state->grid[r*w+c] != BLACK &&
@@ -1474,11 +1524,12 @@ static bool find_errors(const game_state *state, bool *report)
             if (state->grid[r*w+c] != BLACK &&
                 state->grid[r*w+(c+1)] != BLACK)
                 dsf_merge(dsf, r*w+c, r*w+(c+1));
-    if (nblack + dsf_size(dsf, any_white_cell) < n) {
+    if (any_white_cell != -1 &&
+        nblack + dsf_size(dsf, any_white_cell) < n) {
         int biggest, canonical;
 
         if (!report) {
-            sfree(dsf);
+            dsf_free(dsf);
             goto found_error;
         }
 
@@ -1503,7 +1554,7 @@ static bool find_errors(const game_state *state, bool *report)
             if (state->grid[i] != BLACK && dsf_canonify(dsf, i) != canonical)
                 report[i] = true;
     }
-    sfree(dsf);
+    dsf_free(dsf);
 
     free_game(dup);
     return false; /* if report != NULL, this is ignored */
@@ -1604,13 +1655,12 @@ enum {
     COL_USER = COL_GRID,
     COL_ERROR,
     COL_LOWLIGHT,
-    COL_HIGHLIGHT = COL_ERROR, /* mkhighlight needs it, I don't */
     COL_CURSOR = COL_LOWLIGHT,
     NCOLOURS
 };
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     *x = (1 + params->w) * tilesize;
     *y = (1 + params->h) * tilesize;
@@ -1629,7 +1679,7 @@ static float *game_colours(frontend *fe, int *ncolours)
 {
     float *ret = snewn(3 * NCOLOURS, float);
 
-    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_HIGHLIGHT, COL_LOWLIGHT);
+    game_mkhighlight(fe, ret, COL_BACKGROUND, -1, COL_LOWLIGHT);
     COLOUR(ret, COL_GRID,  0.0F, 0.0F, 0.0F);
     COLOUR(ret, COL_ERROR, 1.0F, 0.0F, 0.0F);
 
@@ -1655,7 +1705,6 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     int i;
 
     ds->tilesize = 0;
-    ds->started = false;
 
     ds->grid = snewn(n, drawcell);
     for (i = 0; i < n; ++i)
@@ -1690,7 +1739,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
                         float animtime, float flashtime)
 {
     int const w = state->params.w, h = state->params.h, n = w * h;
-    int const wpx = (w+1) * ds->tilesize, hpx = (h+1) * ds->tilesize;
     int const flash = ((int) (flashtime * 5 / FLASH_TIME)) % 2;
 
     int r, c, i;
@@ -1701,12 +1749,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     assert (oldstate == NULL); /* only happens if animating moves */
 
-    if (!ds->started) {
-        ds->started = true;
-        draw_rect(dr, 0, 0, wpx, hpx, COL_BACKGROUND);
-        draw_update(dr, 0, 0, wpx, hpx);
-    }
-
     for (i = r = 0; r < h; ++r) {
         for (c = 0; c < w; ++c, ++i) {
             drawcell cell = makecell(state->grid[i], errors[i], false, flash);
@@ -1757,25 +1799,21 @@ static void draw_cell(drawing *draw, game_drawstate *ds, int r, int c,
     draw_update(draw, x, y, ts + 1, ts + 1);
 }
 
-static bool game_timing_state(const game_state *state, game_ui *ui)
-{
-    puts("warning: game_timing_state was called (this shouldn't happen)");
-    return false; /* the (non-existing) timer should not be running */
-}
-
 /* ----------------------------------------------------------------------
  * User interface: print
  */
 
-static void game_print_size(const game_params *params, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int print_width, print_height;
-    game_compute_size(params, 800, &print_width, &print_height);
+    game_compute_size(params, 800, ui, &print_width, &print_height);
     *x = print_width  / 100.0F;
     *y = print_height / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int const w = state->params.w, h = state->params.h;
     game_drawstate ds_obj, *ds = &ds_obj;
@@ -1821,12 +1859,14 @@ struct game const thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1840,6 +1880,6 @@ struct game const thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false, /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0, /* flags */
 };
diff --git a/apps/plugins/puzzles/src/rect.R b/apps/plugins/puzzles/src/rect.R
deleted file mode 100644
index 1448c0fa63..0000000000
--- a/apps/plugins/puzzles/src/rect.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-rect     : [X] GTK COMMON rect rect-icon|no-icon
-
-rect     : [G] WINDOWS COMMON rect rect.res|noicon.res
-
-ALL += rect[COMBINED]
-
-!begin am gtk
-GAMES += rect
-!end
-
-!begin >list.c
-    A(rect) \
-!end
-
-!begin >gamedesc.txt
-rect:rect.exe:Rectangles:Rectangles puzzle:Divide the grid into rectangles with areas equal to the numbers.
-!end
diff --git a/apps/plugins/puzzles/src/rect.c b/apps/plugins/puzzles/src/rect.c
index b13de75fd4..c3ee1ab478 100644
--- a/apps/plugins/puzzles/src/rect.c
+++ b/apps/plugins/puzzles/src/rect.c
@@ -26,7 +26,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -163,10 +167,7 @@ static char *encode_params(const game_params *params, bool full)
 
     sprintf(data, "%dx%d", params->w, params->h);
     if (full && params->expandfactor)
-    {
-        sprintf(data + strlen(data), "e");
-        ftoa(data + strlen(data), params->expandfactor);
-    }
+        sprintf(data + strlen(data), "e%g", params->expandfactor);
     if (full && !params->unique)
         strcat(data, "a");
 
@@ -192,7 +193,7 @@ static config_item *game_configure(const game_params *params)
 
     ret[2].name = "Expansion factor";
     ret[2].type = C_STRING;
-    ftoa(buf, params->expandfactor);
+    sprintf(buf, "%g", params->expandfactor);
     ret[2].u.string.sval = dupstr(buf);
 
     ret[3].name = "Ensure unique solution";
@@ -221,6 +222,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w <= 0 || params->h <= 0)
         return "Width and height must both be greater than zero";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->w*params->h < 2)
         return "Grid area must be greater than one";
     if (params->expandfactor < 0.0F)
@@ -2207,7 +2210,7 @@ static game_ui *new_ui(const game_state *state)
     reset_ui(ui);
     ui->erasing = false;
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->cur_dragging = false;
     return ui;
 }
@@ -2217,15 +2220,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void coord_round(float x, float y, int *xr, int *yr)
 {
     float xs, ys, xv, yv, dx, dy, dist;
@@ -2377,6 +2371,21 @@ struct game_drawstate {
     unsigned long *visible;
 };
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible &&
+        !(ui->drag_start_x >= 0 && !ui->cur_dragging)) {
+        if (ui->cur_dragging) {
+            if (!ui->dragged) return "Cancel";
+            if ((button == CURSOR_SELECT2) == ui->erasing) return "Done";
+            return "Cancel";
+        }
+        return button == CURSOR_SELECT ? "Mark" : "Erase";
+    }
+    return "";
+}
+
 static char *interpret_move(const game_state *from, game_ui *ui,
                             const game_drawstate *ds,
                             int x, int y, int button)
@@ -2385,7 +2394,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
     bool startdrag = false, enddrag = false, active = false, erasing = false;
     char buf[80], *ret;
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     coord_round(FROMCOORD((float)x), FROMCOORD((float)y), &xc, &yc);
 
@@ -2406,10 +2415,11 @@ static char *interpret_move(const game_state *from, game_ui *ui,
         enddrag = true;
         erasing = (button == RIGHT_RELEASE);
     } else if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h, false);
-        ui->cur_visible = true;
+        char *ret;
+        ret = move_cursor(button, &ui->cur_x, &ui->cur_y, from->w, from->h,
+                          false, &ui->cur_visible);
         active = true;
-        if (!ui->cur_dragging) return UI_UPDATE;
+        if (!ui->cur_dragging || ret != MOVE_UI_UPDATE) return ret;
         coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc);
     } else if (IS_CURSOR_SELECT(button)) {
         if (ui->drag_start_x >= 0 && !ui->cur_dragging) {
@@ -2422,7 +2432,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
         if (!ui->cur_visible) {
             assert(!ui->cur_dragging);
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         coord_round((float)ui->cur_x + 0.5F, (float)ui->cur_y + 0.5F, &xc, &yc);
         erasing = (button == CURSOR_SELECT2);
@@ -2443,7 +2453,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
             reset_ui(ui); /* cancel keyboard dragging */
             ui->cur_dragging = false;
         }
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else if (button != LEFT_DRAG && button != RIGHT_DRAG) {
         return NULL;
     }
@@ -2527,7 +2537,7 @@ static char *interpret_move(const game_state *from, game_ui *ui,
     if (ret)
         return ret;                    /* a move has been made */
     else if (active)
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     else
         return NULL;
 }
@@ -2621,7 +2631,7 @@ static game_state *execute_move(const game_state *from, const char *move)
 #define MAX4(x,y,z,w) ( max(max(x,y),max(z,w)) )
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2796,9 +2806,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         }
 
     if (!ds->started) {
-        draw_rect(dr, 0, 0,
-                  state->w * TILE_SIZE + 2*BORDER + 1,
-                  state->h * TILE_SIZE + 2*BORDER + 1, COL_BACKGROUND);
         draw_rect(dr, COORD(0)-1, COORD(0)-1,
                   ds->w*TILE_SIZE+3, ds->h*TILE_SIZE+3, COL_LINE);
         ds->started = true;
@@ -2901,24 +2908,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 5mm squares by default.
      */
-    game_compute_size(params, 500, &pw, &ph);
+    game_compute_size(params, 500, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->w, h = state->h;
     int ink = print_mono_colour(dr, 0);
@@ -2992,12 +2996,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -3011,7 +3017,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/resource.h b/apps/plugins/puzzles/src/resource.h
deleted file mode 100644
index f0bfa16d6d..0000000000
--- a/apps/plugins/puzzles/src/resource.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#define IDR_MENUBAR1                    101
-
-#define ID_GAME                         40005
-#define ID_TYPE                         40006
-
-#define IDS_CAP_GAME                    40105
-#define IDS_CAP_TYPE                    40106
-
-#define IDD_ABOUT                       2000
-#define IDC_ABOUT_CAPTION               2001
-#define IDC_ABOUT_LINE                  2002
-#define IDC_ABOUT_GAME                  2003
-#define IDC_ABOUT_VERSION               2004
-
-#define IDD_CONFIG                      2100
-#define IDC_CONFIG_CAPTION              2101
-#define IDC_CONFIG_LINE                 2102
-
-#define IDR_PADTOOLBAR                  4000
diff --git a/apps/plugins/puzzles/src/samegame.R b/apps/plugins/puzzles/src/samegame.R
deleted file mode 100644
index cc0d350041..0000000000
--- a/apps/plugins/puzzles/src/samegame.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-samegame : [X] GTK COMMON samegame samegame-icon|no-icon
-
-samegame : [G] WINDOWS COMMON samegame samegame.res|noicon.res
-
-ALL += samegame[COMBINED]
-
-!begin am gtk
-GAMES += samegame
-!end
-
-!begin >list.c
-    A(samegame) \
-!end
-
-!begin >gamedesc.txt
-samegame:samegame.exe:Same Game:Block-clearing puzzle:Clear the grid by removing touching groups of the same colour squares.
-!end
diff --git a/apps/plugins/puzzles/src/samegame.c b/apps/plugins/puzzles/src/samegame.c
index 615c60e0a5..30550e1f1c 100644
--- a/apps/plugins/puzzles/src/samegame.c
+++ b/apps/plugins/puzzles/src/samegame.c
@@ -67,7 +67,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -285,6 +290,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 1 || params->h < 1)
         return "Width and height must both be positive";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
 
     if (params->ncols > 9)
         return "Maximum of 9 colours";
@@ -858,6 +865,8 @@ static void gen_grid(int w, int h, int nc, int *grid, random_state *rs)
 
 #if defined GENERATION_DIAGNOSTICS || defined COUNT_FAILURES
     printf("%d failures\n", failures);
+#else
+    (void)failures;
 #endif
 #ifdef GENERATION_DIAGNOSTICS
     {
@@ -1013,12 +1022,6 @@ 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;
@@ -1065,7 +1068,7 @@ static game_ui *new_ui(const game_state *state)
     ui->nselected = 0;
 
     ui->xsel = ui->ysel = 0;
-    ui->displaysel = false;
+    ui->displaysel = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     return ui;
 }
@@ -1076,15 +1079,6 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void sel_clear(game_ui *ui, const game_state *state)
 {
     int i;
@@ -1099,14 +1093,25 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
     sel_clear(ui, newstate);
+}
 
-    /*
-     * If the game state has just changed into an unplayable one
-     * (either completed or impossible), we vanish the keyboard-
-     * control cursor.
-     */
-    if (newstate->complete || newstate->impossible)
-        ui->displaysel = false;
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button)) {
+        int x = ui->xsel, y = ui->ysel, c = COL(state,x,y);
+        if (c == 0) return "";
+        if (ISSEL(ui, x, y))
+            return button == CURSOR_SELECT2 ? "Unselect" : "Remove";
+        if ((x > 0 && COL(state,x-1,y) == c) ||
+            (x+1 < state->params.w && COL(state,x+1,y) == c) ||
+            (y > 0 && COL(state,x,y-1) == c) ||
+            (y+1 < state->params.h && COL(state,x,y+1) == c))
+            return "Select";
+        /* Cursor is over a lone square, so we can't select it. */
+        if (ui->nselected) return "Unselect";
+    }
+    return "";
 }
 
 static char *sel_movedesc(game_ui *ui, const game_state *state)
@@ -1274,30 +1279,25 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                             int x, int y, int button)
 {
     int tx, ty;
-    char *ret = UI_UPDATE;
-
-    ui->displaysel = false;
+    char *ret = MOVE_UI_UPDATE;
 
     if (button == RIGHT_BUTTON || button == LEFT_BUTTON) {
+        ui->displaysel = false;
         tx = FROMCOORD(x); ty= FROMCOORD(y);
     } else if (IS_CURSOR_MOVE(button)) {
-        int dx = 0, dy = 0;
-        ui->displaysel = true;
-        dx = (button == CURSOR_LEFT) ? -1 : ((button == CURSOR_RIGHT) ? +1 : 0);
-        dy = (button == CURSOR_DOWN) ? +1 : ((button == CURSOR_UP)    ? -1 : 0);
-        ui->xsel = (ui->xsel + state->params.w + dx) % state->params.w;
-        ui->ysel = (ui->ysel + state->params.h + dy) % state->params.h;
-        return ret;
+        return move_cursor(button, &ui->xsel, &ui->ysel,
+                           state->params.w, state->params.h,
+                           true, &ui->displaysel);
     } else if (IS_CURSOR_SELECT(button)) {
         ui->displaysel = true;
         tx = ui->xsel;
         ty = ui->ysel;
     } else
-        return NULL;
+        return MOVE_UNUSED;
 
     if (tx < 0 || tx >= state->params.w || ty < 0 || ty >= state->params.h)
-        return NULL;
-    if (COL(state, tx, ty) == 0) return NULL;
+        return MOVE_UNUSED;
+    if (COL(state, tx, ty) == 0) return MOVE_NO_EFFECT;
 
     if (ISSEL(ui,tx,ty)) {
         if (button == RIGHT_BUTTON || button == CURSOR_SELECT2)
@@ -1324,6 +1324,10 @@ static game_state *execute_move(const game_state *from, const char *move)
         move++;
 
         while (*move) {
+            if (!isdigit((unsigned char)*move)) {
+                free_game(ret);
+                return NULL;
+            }
             i = atoi(move);
             if (i < 0 || i >= ret->n) {
                 free_game(ret);
@@ -1353,12 +1357,12 @@ static game_state *execute_move(const game_state *from, const char *move)
 static void game_set_size(drawing *dr, game_drawstate *ds,
                           const game_params *params, int tilesize)
 {
-    ds->tilegap = 2;
+    ds->tilegap = (tilesize + 8) / 16;
     ds->tileinner = tilesize - ds->tilegap;
 }
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up tile size variables for macro expansion purposes */
     game_drawstate ads, *ds = &ads;
@@ -1372,7 +1376,7 @@ static float *game_colours(frontend *fe, int *ncolours)
 {
     float *ret = snewn(3 * NCOLOURS, float);
 
-    frontend_default_colour(fe, &ret[COL_BACKGROUND * 3]);
+    game_mkhighlight(fe, ret, COL_BACKGROUND, COL_HIGHLIGHT, COL_LOWLIGHT);
 
     ret[COL_1 * 3 + 0] = 0.0F;
     ret[COL_1 * 3 + 1] = 0.0F;
@@ -1386,8 +1390,8 @@ static float *game_colours(frontend *fe, int *ncolours)
     ret[COL_3 * 3 + 1] = 0.0F;
     ret[COL_3 * 3 + 2] = 0.0F;
 
-    ret[COL_4 * 3 + 0] = 1.0F;
-    ret[COL_4 * 3 + 1] = 1.0F;
+    ret[COL_4 * 3 + 0] = 0.7F;
+    ret[COL_4 * 3 + 1] = 0.7F;
     ret[COL_4 * 3 + 2] = 0.0F;
 
     ret[COL_5 * 3 + 0] = 1.0F;
@@ -1395,16 +1399,16 @@ static float *game_colours(frontend *fe, int *ncolours)
     ret[COL_5 * 3 + 2] = 1.0F;
 
     ret[COL_6 * 3 + 0] = 0.0F;
-    ret[COL_6 * 3 + 1] = 1.0F;
-    ret[COL_6 * 3 + 2] = 1.0F;
+    ret[COL_6 * 3 + 1] = 0.8F;
+    ret[COL_6 * 3 + 2] = 0.8F;
 
     ret[COL_7 * 3 + 0] = 0.5F;
     ret[COL_7 * 3 + 1] = 0.5F;
     ret[COL_7 * 3 + 2] = 1.0F;
 
-    ret[COL_8 * 3 + 0] = 0.5F;
-    ret[COL_8 * 3 + 1] = 1.0F;
-    ret[COL_8 * 3 + 2] = 0.5F;
+    ret[COL_8 * 3 + 0] = 0.2F;
+    ret[COL_8 * 3 + 1] = 0.8F;
+    ret[COL_8 * 3 + 2] = 0.2F;
 
     ret[COL_9 * 3 + 0] = 1.0F;
     ret[COL_9 * 3 + 1] = 0.5F;
@@ -1418,14 +1422,6 @@ static float *game_colours(frontend *fe, int *ncolours)
     ret[COL_SEL * 3 + 1] = 1.0F;
     ret[COL_SEL * 3 + 2] = 1.0F;
 
-    ret[COL_HIGHLIGHT * 3 + 0] = 1.0F;
-    ret[COL_HIGHLIGHT * 3 + 1] = 1.0F;
-    ret[COL_HIGHLIGHT * 3 + 2] = 1.0F;
-
-    ret[COL_LOWLIGHT * 3 + 0] = ret[COL_BACKGROUND * 3 + 0] * 2.0F / 3.0F;
-    ret[COL_LOWLIGHT * 3 + 1] = ret[COL_BACKGROUND * 3 + 1] * 2.0F / 3.0F;
-    ret[COL_LOWLIGHT * 3 + 2] = ret[COL_BACKGROUND * 3 + 2] * 2.0F / 3.0F;
-
     *ncolours = NCOLOURS;
     return ret;
 }
@@ -1462,6 +1458,7 @@ static void tile_redraw(drawing *dr, game_drawstate *ds,
                         int tile, int bgcolour)
 {
     int outer = bgcolour, inner = outer, col = tile & TILE_COLMASK;
+    int tile_w, tile_h, outer_w, outer_h;
 
     if (col) {
         if (tile & TILE_IMPOSSIBLE) {
@@ -1474,19 +1471,25 @@ static void tile_redraw(drawing *dr, game_drawstate *ds,
             outer = inner = col;
         }
     }
-    draw_rect(dr, COORD(x), COORD(y), TILE_INNER, TILE_INNER, outer);
-    draw_rect(dr, COORD(x)+TILE_INNER/4, COORD(y)+TILE_INNER/4,
-              TILE_INNER/2, TILE_INNER/2, inner);
-
-    if (dright)
-        draw_rect(dr, COORD(x)+TILE_INNER, COORD(y), TILE_GAP, TILE_INNER,
-                  (tile & TILE_JOINRIGHT) ? outer : bgcolour);
-    if (dbelow)
-        draw_rect(dr, COORD(x), COORD(y)+TILE_INNER, TILE_INNER, TILE_GAP,
-                  (tile & TILE_JOINDOWN) ? outer : bgcolour);
-    if (dright && dbelow)
-        draw_rect(dr, COORD(x)+TILE_INNER, COORD(y)+TILE_INNER, TILE_GAP, TILE_GAP,
-                  (tile & TILE_JOINDIAG) ? outer : bgcolour);
+    tile_w = dright ? TILE_SIZE : TILE_INNER;
+    tile_h = dbelow ? TILE_SIZE : TILE_INNER;
+    outer_w = (tile & TILE_JOINRIGHT) ? tile_w : TILE_INNER;
+    outer_h = (tile & TILE_JOINDOWN)  ? tile_h : TILE_INNER;
+    /* Draw the background if any of it will be visible. */
+    if (outer_w != tile_w || outer_h != tile_h || outer == bgcolour)
+        draw_rect(dr, COORD(x), COORD(y), tile_w, tile_h, bgcolour);
+    /* Draw the piece. */
+    if (outer != bgcolour)
+        draw_rect(dr, COORD(x), COORD(y), outer_w, outer_h, outer);
+    if (inner != outer)
+        draw_rect(dr, COORD(x)+TILE_INNER/4, COORD(y)+TILE_INNER/4,
+                  TILE_INNER/2, TILE_INNER/2, inner);
+    /* Reset bottom-right corner if necessary. */
+    if ((tile & (TILE_JOINRIGHT | TILE_JOINDOWN | TILE_JOINDIAG)) ==
+        (TILE_JOINRIGHT | TILE_JOINDOWN) && outer != bgcolour &&
+        TILE_GAP != 0)
+        draw_rect(dr, COORD(x)+TILE_INNER, COORD(y)+TILE_INNER,
+                  TILE_GAP, TILE_GAP, bgcolour);
 
     if (tile & TILE_HASSEL) {
         int sx = COORD(x)+2, sy = COORD(y)+2, ssz = TILE_INNER-5;
@@ -1512,13 +1515,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int coords[10];
 
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * state->params.w + 2 * BORDER,
-                  TILE_SIZE * state->params.h + 2 * BORDER, COL_BACKGROUND);
-        draw_update(dr, 0, 0,
-                    TILE_SIZE * state->params.w + 2 * BORDER,
-                    TILE_SIZE * state->params.h + 2 * BORDER);
-
         /*
          * Recessed area containing the whole puzzle.
          */
@@ -1541,7 +1537,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         ds->started = true;
     }
 
-    if (flashtime > 0.0) {
+    if (flashtime > 0.0F) {
         int frame = (int)(flashtime / FLASH_FRAME);
         bgcolour = (frame % 2 ? COL_LOWLIGHT : COL_HIGHLIGHT);
     } else
@@ -1564,8 +1560,13 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
             if ((tile & TILE_JOINRIGHT) && (tile & TILE_JOINDOWN) &&
                 COL(state,x+1,y+1) == col)
                 tile |= TILE_JOINDIAG;
-
-            if (ui->displaysel && ui->xsel == x && ui->ysel == y)
+            /*
+             * If the game state is an unplayable one (either
+             * completed or impossible), we hide the keyboard-control
+             * cursor.
+             */
+            if (ui->displaysel && ui->xsel == x && ui->ysel == y &&
+                !(state->complete || state->impossible))
                 tile |= TILE_HASSEL;
 
             /* For now we're never expecting oldstate at all (because we have
@@ -1637,19 +1638,6 @@ static int game_status(const game_state *state)
     return state->complete ? +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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame samegame
 #endif
@@ -1669,14 +1657,16 @@ const struct game thegame = {
     new_game,
     dup_game,
     free_game,
-    false, solve_game,
+    false, NULL, /* solve */
     true, game_can_format_as_text_now, game_text_format,
+    NULL, NULL, /* get_prefs, set_prefs */
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1688,8 +1678,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
diff --git a/apps/plugins/puzzles/src/signpost.R b/apps/plugins/puzzles/src/signpost.R
deleted file mode 100644
index 09ea367d57..0000000000
--- a/apps/plugins/puzzles/src/signpost.R
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- makefile -*-
-
-SIGNPOST_EXTRA = dsf
-
-signpost : [X] GTK COMMON signpost SIGNPOST_EXTRA signpost-icon|no-icon
-signpost : [G] WINDOWS COMMON signpost SIGNPOST_EXTRA signpost.res|noicon.res
-
-signpostsolver : [U] signpost[STANDALONE_SOLVER] SIGNPOST_EXTRA STANDALONE m.lib
-signpostsolver : [C] signpost[STANDALONE_SOLVER] SIGNPOST_EXTRA STANDALONE
-
-ALL += signpost[COMBINED] SIGNPOST_EXTRA
-
-!begin am gtk
-GAMES += signpost
-!end
-
-!begin >list.c
-    A(signpost) \
-!end
-
-!begin >gamedesc.txt
-signpost:signpost.exe:Signpost:Square-connecting puzzle:Connect the squares into a path following the arrows.
-!end
diff --git a/apps/plugins/puzzles/src/signpost.c b/apps/plugins/puzzles/src/signpost.c
index 9aee255ebe..9aed67bb4a 100644
--- a/apps/plugins/puzzles/src/signpost.c
+++ b/apps/plugins/puzzles/src/signpost.c
@@ -7,7 +7,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -57,7 +62,7 @@ struct game_state {
     int *nums;                  /* numbers, size n */
     unsigned int *flags;        /* flags, size n */
     int *next, *prev;           /* links to other cell indexes, size n (-1 absent) */
-    int *dsf;                   /* connects regions with a dsf. */
+    DSF *dsf;                   /* connects regions with a dsf. */
     int *numsi;                 /* for each number, which index is it in? (-1 absent) */
 };
 
@@ -168,7 +173,7 @@ static bool isvalidmove(const game_state *state, bool clever,
 
     /* can't create a new connection between cells in the same region
      * as that would create a loop. */
-    if (dsf_canonify(state->dsf, from) == dsf_canonify(state->dsf, to))
+    if (dsf_equivalent(state->dsf, from, to))
         return false;
 
     /* if both cells are actual numbers, can't drag if we're not
@@ -277,7 +282,7 @@ static void strip_nums(game_state *state) {
     memset(state->next, -1, state->n*sizeof(int));
     memset(state->prev, -1, state->n*sizeof(int));
     memset(state->numsi, -1, (state->n+1)*sizeof(int));
-    dsf_init(state->dsf, state->n);
+    dsf_reinit(state->dsf);
 }
 
 static bool check_nums(game_state *orig, game_state *copy, bool only_immutable)
@@ -421,6 +426,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 1) return "Width must be at least one";
     if (params->h < 1) return "Height must be at least one";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (full && params->w == 1 && params->h == 1)
         /* The UI doesn't let us move these from unsolved to solved,
          * so we disallow generating (but not playing) them. */
@@ -454,7 +461,7 @@ static game_state *blank_game(int w, int h)
     state->flags = snewn(state->n, unsigned int);
     state->next  = snewn(state->n, int);
     state->prev  = snewn(state->n, int);
-    state->dsf = snew_dsf(state->n);
+    state->dsf = dsf_new(state->n);
     state->numsi  = snewn(state->n+1, int);
 
     blank_game_into(state);
@@ -475,7 +482,7 @@ static void dup_game_to(game_state *to, const game_state *from)
     memcpy(to->next, from->next, to->n*sizeof(int));
     memcpy(to->prev, from->prev, to->n*sizeof(int));
 
-    memcpy(to->dsf, from->dsf, to->n*sizeof(int));
+    dsf_copy(to->dsf, from->dsf);
     memcpy(to->numsi, from->numsi, (to->n+1)*sizeof(int));
 }
 
@@ -493,7 +500,7 @@ static void free_game(game_state *state)
     sfree(state->flags);
     sfree(state->next);
     sfree(state->prev);
-    sfree(state->dsf);
+    dsf_free(state->dsf);
     sfree(state->numsi);
     sfree(state);
 }
@@ -1011,7 +1018,7 @@ static void connect_numbers(game_state *state)
 {
     int i, di, dni;
 
-    dsf_init(state->dsf, state->n);
+    dsf_reinit(state->dsf);
     for (i = 0; i < state->n; i++) {
         if (state->next[i] != -1) {
             assert(state->prev[state->next[i]] == i);
@@ -1028,8 +1035,8 @@ static void connect_numbers(game_state *state)
 
 static int compare_heads(const void *a, const void *b)
 {
-    struct head_meta *ha = (struct head_meta *)a;
-    struct head_meta *hb = (struct head_meta *)b;
+    const struct head_meta *ha = (const struct head_meta *)a;
+    const struct head_meta *hb = (const struct head_meta *)b;
 
     /* Heads with preferred colours first... */
     if (ha->preference && !hb->preference) return -1;
@@ -1380,8 +1387,32 @@ struct game_ui {
     bool dragging, drag_is_from;
     int sx, sy;         /* grid coords of start cell */
     int dx, dy;         /* pixel coords of drag posn */
+
+    /*
+     * Trivial and foolish configurable option done on purest whim.
+     * With this option enabled, the victory flash is done by rotating
+     * each square in the opposite direction from its immediate
+     * neighbours, so that they behave like a field of interlocking
+     * gears. With it disabled, they all rotate in the same direction.
+     * Choose for yourself which is more brain-twisting :-)
+     */
+    bool gear_mode;
 };
 
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int gear_mode = -1;
+
+    if (!initialised) {
+        initialised = true;
+        gear_mode = getenv_bool("SIGNPOST_GEARS", -1);
+    }
+
+    if (gear_mode != -1)
+        ui_out->gear_mode = gear_mode;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
@@ -1390,11 +1421,14 @@ static game_ui *new_ui(const game_state *state)
      * copy to clone, there's code that needs fixing in game_redraw too. */
 
     ui->cx = ui->cy = 0;
-    ui->cshow = false;
+    ui->cshow = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     ui->dragging = false;
     ui->sx = ui->sy = ui->dx = ui->dy = 0;
 
+    ui->gear_mode = false;
+    legacy_prefs_override(ui);
+
     return ui;
 }
 
@@ -1403,13 +1437,28 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Victory rotation effect";
+    ret[0].kw = "flash-type";
+    ret[0].type = C_CHOICES;
+    ret[0].u.choices.choicenames = ":Unidirectional:Meshing gears";
+    ret[0].u.choices.choicekws = ":unidirectional:gears";
+    ret[0].u.choices.selected = ui->gear_mode;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
+    ui->gear_mode = cfg[0].u.choices.selected;
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1421,6 +1470,26 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     }
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cshow) {
+        if (ui->dragging) {
+            if (ui->drag_is_from) {
+                if (isvalidmove(state, false, ui->sx, ui->sy, ui->cx, ui->cy))
+                    return "To here";
+            } else {
+                if (isvalidmove(state, false, ui->cx, ui->cy, ui->sx, ui->sy))
+                    return "From here";
+            }
+            return "Cancel";
+        } else {
+            return button == CURSOR_SELECT ? "From here" : "To here";
+        }
+    }
+    return "";
+}
+
 struct game_drawstate {
     int tilesize;
     bool started, solved;
@@ -1442,26 +1511,27 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char buf[80];
 
     if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cx, &ui->cy, state->w, state->h, false);
-        ui->cshow = true;
+        char *ret;
+        ret = move_cursor(button, &ui->cx, &ui->cy, state->w, state->h, false,
+                          &ui->cshow);
         if (ui->dragging) {
             ui->dx = COORD(ui->cx) + TILE_SIZE/2;
             ui->dy = COORD(ui->cy) + TILE_SIZE/2;
         }
-        return UI_UPDATE;
+        return ret;
     } else if (IS_CURSOR_SELECT(button)) {
         if (!ui->cshow)
             ui->cshow = true;
         else if (ui->dragging) {
             ui->dragging = false;
-            if (ui->sx == ui->cx && ui->sy == ui->cy) return UI_UPDATE;
+            if (ui->sx == ui->cx && ui->sy == ui->cy) return MOVE_UI_UPDATE;
             if (ui->drag_is_from) {
                 if (!isvalidmove(state, false, ui->sx, ui->sy, ui->cx, ui->cy))
-                    return UI_UPDATE;
+                    return MOVE_UI_UPDATE;
                 sprintf(buf, "L%d,%d-%d,%d", ui->sx, ui->sy, ui->cx, ui->cy);
             } else {
                 if (!isvalidmove(state, false, ui->cx, ui->cy, ui->sx, ui->sy))
-                    return UI_UPDATE;
+                    return MOVE_UI_UPDATE;
                 sprintf(buf, "L%d,%d-%d,%d", ui->cx, ui->cy, ui->sx, ui->sy);
             }
             return dupstr(buf);
@@ -1473,7 +1543,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             ui->dy = COORD(ui->cy) + TILE_SIZE/2;
             ui->drag_is_from = (button == CURSOR_SELECT);
         }
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
     if (IS_MOUSE_DOWN(button)) {
         if (ui->cshow) {
@@ -1502,19 +1572,19 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->dx = mx;
         ui->dy = my;
         ui->cshow = false;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else if (IS_MOUSE_DRAG(button) && ui->dragging) {
         ui->dx = mx;
         ui->dy = my;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     } else if (IS_MOUSE_RELEASE(button) && ui->dragging) {
         ui->dragging = false;
-        if (ui->sx == x && ui->sy == y) return UI_UPDATE; /* single click */
+        if (ui->sx == x && ui->sy == y) return MOVE_UI_UPDATE; /* single click */
 
         if (!INGRID(state, x, y)) {
             int si = ui->sy*w+ui->sx;
             if (state->prev[si] == -1 && state->next[si] == -1)
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             sprintf(buf, "%c%d,%d",
                     (int)(ui->drag_is_from ? 'C' : 'X'), ui->sx, ui->sy);
             return dupstr(buf);
@@ -1522,11 +1592,11 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (ui->drag_is_from) {
             if (!isvalidmove(state, false, ui->sx, ui->sy, x, y))
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             sprintf(buf, "L%d,%d-%d,%d", ui->sx, ui->sy, x, y);
         } else {
             if (!isvalidmove(state, false, x, y, ui->sx, ui->sy))
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             sprintf(buf, "L%d,%d-%d,%d", x, y, ui->sx, ui->sy);
         }
         return dupstr(buf);
@@ -1535,7 +1605,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     else if ((button == 'x' || button == 'X') && ui->cshow) {
         int si = ui->cy*w + ui->cx;
         if (state->prev[si] == -1 && state->next[si] == -1)
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         sprintf(buf, "%c%d,%d",
                 (int)((button == 'x') ? 'C' : 'X'), ui->cx, ui->cy);
         return dupstr(buf);
@@ -1641,7 +1711,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize, order; } ads, *ds = &ads;
@@ -1825,9 +1895,8 @@ static void draw_star(drawing *dr, int cx, int cy, int rad, int npoints,
     coords = snewn(npoints * 2 * 2, int);
 
     for (n = 0; n < npoints * 2; n++) {
-        /* hack to accomodate rockbox's concave polygon drawing */
-        a = 2.0 * PI * ((double)n / ((double)npoints * 2.0)) + angle_offset - PI / npoints;
-        r = (n % 2 == 0) ? (double)rad/2.0 : (double)rad;
+        a = 2.0 * PI * ((double)n / ((double)npoints * 2.0)) + angle_offset;
+        r = (n % 2) ? (double)rad/2.0 : (double)rad;
 
         /* We're rotating the point at (0, -r) by a degrees */
         coords[2*n+0] = cx + (int)( r * sin(a));
@@ -2082,7 +2151,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int aw = TILE_SIZE * state->w;
         int ah = TILE_SIZE * state->h;
-        draw_rect(dr, 0, 0, aw + 2 * BORDER, ah + 2 * BORDER, COL_BACKGROUND);
         draw_rect_outline(dr, BORDER - 1, BORDER - 1, aw + 2, ah + 2, COL_GRID);
         draw_update(dr, 0, 0, aw + 2 * BORDER, ah + 2 * BORDER);
     }
@@ -2127,28 +2195,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
             if (state->nums[i] != ds->nums[i] ||
                 f != ds->f[i] || dirp != ds->dirp[i] ||
                 force || !ds->started) {
-                int sign;
-                {
-                    /*
-                     * Trivial and foolish configurable option done on
-                     * purest whim. With this option enabled, the
-                     * victory flash is done by rotating each square
-                     * in the opposite direction from its immediate
-                     * neighbours, so that they behave like a field of
-                     * interlocking gears. With it disabled, they all
-                     * rotate in the same direction. Choose for
-                     * yourself which is more brain-twisting :-)
-                     */
-                    static int gear_mode = -1;
-                    if (gear_mode < 0) {
-                        char *env = getenv("SIGNPOST_GEARS");
-                        gear_mode = (env && (env[0] == 'y' || env[0] == 'Y'));
-                    }
-                    if (gear_mode)
-                        sign = 1 - 2 * ((x ^ y) & 1);
-                    else
-                        sign = 1;
-                }
+                int sign = (ui->gear_mode ? 1 - 2 * ((x ^ y) & 1) : 1);
                 tile_redraw(dr, ds,
                             BORDER + x * TILE_SIZE,
                             BORDER + y * TILE_SIZE,
@@ -2206,21 +2253,18 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
-    game_compute_size(params, 1300, &pw, &ph);
+    game_compute_size(params, 1300, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int ink = print_mono_colour(dr, 0);
     int x, y;
@@ -2273,12 +2317,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2292,7 +2338,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
@@ -2301,10 +2347,9 @@ const struct game thegame = {
 #include <time.h>
 #include <stdarg.h>
 
-const char *quis = NULL;
-int verbose = 0;
+static const char *quis = NULL;
 
-void usage(FILE *out) {
+static void usage(FILE *out) {
     fprintf(out, "usage: %s [--stdin] [--soak] [--seed SEED] <params>|<game id>\n", quis);
 }
 
@@ -2405,7 +2450,7 @@ static void process_desc(char *id)
     thegame.free_params(p);
 }
 
-int main(int argc, const char *argv[])
+int main(int argc, char *argv[])
 {
     char *id = NULL, *desc, *aux = NULL;
     const char *err;
diff --git a/apps/plugins/puzzles/src/singles.R b/apps/plugins/puzzles/src/singles.R
deleted file mode 100644
index a67aed2fbc..0000000000
--- a/apps/plugins/puzzles/src/singles.R
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- makefile -*-
-
-SINGLES_EXTRA = dsf LATIN
-
-singles : [X] GTK COMMON singles SINGLES_EXTRA singles-icon|no-icon
-singles : [G] WINDOWS COMMON singles SINGLES_EXTRA singles.res|noicon.res
-
-ALL += singles[COMBINED] SINGLES_EXTRA
-
-singlessolver : [U] singles[STANDALONE_SOLVER] SINGLES_EXTRA STANDALONE
-singlessolver : [C] singles[STANDALONE_SOLVER] SINGLES_EXTRA STANDALONE
-
-!begin am gtk
-GAMES += singles
-!end
-
-!begin >list.c
-    A(singles) \
-!end
-
-!begin >gamedesc.txt
-singles:singles.exe:Singles:Number-removing puzzle:Black out the right set of duplicate numbers.
-!end
diff --git a/apps/plugins/puzzles/src/singles.c b/apps/plugins/puzzles/src/singles.c
index 202ce08b20..07db8361ae 100644
--- a/apps/plugins/puzzles/src/singles.c
+++ b/apps/plugins/puzzles/src/singles.c
@@ -58,13 +58,17 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "latin.h"
 
 #ifdef STANDALONE_SOLVER
-bool verbose = false;
+static bool verbose = false;
 #endif
 
 #define PREFERRED_TILE_SIZE 32
@@ -82,7 +86,7 @@ bool verbose = false;
 #define FLASH_TIME 0.7F
 
 enum {
-    COL_BACKGROUND, COL_HIGHLIGHT, COL_LOWLIGHT,
+    COL_BACKGROUND, COL_UNUSED1, COL_LOWLIGHT,
     COL_BLACK, COL_WHITE, COL_BLACKNUM, COL_GRID,
     COL_CURSOR, COL_ERROR,
     NCOLOURS
@@ -254,7 +258,7 @@ static game_params *custom_params(const config_item *cfg)
 static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 2 || params->h < 2)
-        return "Width and neight must be at least two";
+        return "Width and height must be at least two";
     if (params->w > 10+26+26 || params->h > 10+26+26)
         return "Puzzle is too large";
     if (full) {
@@ -417,7 +421,7 @@ static void debug_state(const char *desc, game_state *state) {
     sfree(dbg);
 }
 
-static void connect_if_same(game_state *state, int *dsf, int i1, int i2)
+static void connect_if_same(game_state *state, DSF *dsf, int i1, int i2)
 {
     int c1, c2;
 
@@ -429,13 +433,13 @@ static void connect_if_same(game_state *state, int *dsf, int i1, int i2)
     dsf_merge(dsf, c1, c2);
 }
 
-static void connect_dsf(game_state *state, int *dsf)
+static void connect_dsf(game_state *state, DSF *dsf)
 {
     int x, y, i;
 
     /* Construct a dsf array for connected blocks; connections
      * tracked to right and down. */
-    dsf_init(dsf, state->n);
+    dsf_reinit(dsf);
     for (x = 0; x < state->w; x++) {
         for (y = 0; y < state->h; y++) {
             i = y*state->w + x;
@@ -494,7 +498,7 @@ static int check_rowcol(game_state *state, int starti, int di, int sz, unsigned
 
 static bool check_complete(game_state *state, unsigned flags)
 {
-    int *dsf = snewn(state->n, int);
+    DSF *dsf = dsf_new(state->n);
     int x, y, i, error = 0, nwhite, w = state->w, h = state->h;
 
     if (flags & CC_MARK_ERRORS) {
@@ -543,7 +547,7 @@ static bool check_complete(game_state *state, unsigned flags)
                 int size = dsf_size(dsf, i);
                 if (largest < size) {
                     largest = size;
-                    canonical = i;
+                    canonical = dsf_canonify(dsf, i);
                 }
             }
 
@@ -558,7 +562,7 @@ static bool check_complete(game_state *state, unsigned flags)
         }
     }
 
-    sfree(dsf);
+    dsf_free(dsf);
     return !(error > 0);
 }
 
@@ -1304,9 +1308,10 @@ found:
     return j;
 }
 
-static char *new_game_desc(const game_params *params, random_state *rs,
+static char *new_game_desc(const game_params *params_orig, random_state *rs,
                            char **aux, bool interactive)
 {
+    game_params *params = dup_params(params_orig);
     game_state *state = blank_game(params->w, params->h);
     game_state *tosolve = blank_game(params->w, params->h);
     int i, j, *scratch, *rownums, *colnums, x, y, ntries;
@@ -1315,6 +1320,12 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     digit *latin;
     struct solver_state *ss = solver_state_new(state);
 
+    /* Downgrade difficulty to Easy for puzzles so tiny that they aren't
+     * possible to generate at Tricky. These are 2x2, 2x3 and 3x3, i.e.
+     * any puzzle that doesn't have one dimension at least 4. */
+    if ((w < 4 || h < 4) && params->diff > DIFF_EASY)
+        params->diff = DIFF_EASY;
+
     scratch = snewn(state->n, int);
     rownums = snewn(h*o, int);
     colnums = snewn(w*o, int);
@@ -1408,6 +1419,7 @@ randomise:
 
     free_game(tosolve);
     free_game(state);
+    free_params(params);
     solver_state_free(ss);
     sfree(scratch);
     sfree(rownums);
@@ -1446,24 +1458,37 @@ static game_ui *new_ui(const game_state *state)
     game_ui *ui = snew(game_ui);
 
     ui->cx = ui->cy = 0;
-    ui->cshow = false;
+    ui->cshow = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->show_black_nums = false;
 
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Show numbers on black squares";
+    ret[0].kw = "show-black-nums";
+    ret[0].type = C_BOOLEAN;
+    ret[0].u.boolean.bval = ui->show_black_nums;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->show_black_nums = cfg[0].u.boolean.bval;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1473,6 +1498,18 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
         ui->cshow = false;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cshow) {
+        unsigned int f = state->flags[ui->cy * state->w + ui->cx];
+        if (f & F_BLACK) return "Restore";
+        if (f & F_CIRCLE) return "Remove";
+        return button == CURSOR_SELECT ? "Black" : "Circle";
+    }
+    return "";
+}
+
 #define DS_BLACK        0x1
 #define DS_CIRCLE       0x2
 #define DS_CURSOR       0x4
@@ -1497,11 +1534,10 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int i, x = FROMCOORD(mx), y = FROMCOORD(my);
     enum { NONE, TOGGLE_BLACK, TOGGLE_CIRCLE, UI } action = NONE;
 
-    if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cx, &ui->cy, state->w, state->h, true);
-        ui->cshow = true;
-        action = UI;
-    } else if (IS_CURSOR_SELECT(button)) {
+    if (IS_CURSOR_MOVE(button))
+        return move_cursor(button, &ui->cx, &ui->cy, state->w, state->h, true,
+                           &ui->cshow);
+    else if (IS_CURSOR_SELECT(button)) {
         x = ui->cx; y = ui->cy;
         if (!ui->cshow) {
             action = UI;
@@ -1519,14 +1555,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
         if (!INGRID(state, x, y)) {
             ui->show_black_nums = !ui->show_black_nums;
-            action = UI; /* this wants to be a per-game option. */
+            action = UI;
         } else if (button == LEFT_BUTTON) {
             action = TOGGLE_BLACK;
         } else if (button == RIGHT_BUTTON) {
             action = TOGGLE_CIRCLE;
         }
     }
-    if (action == UI) return UI_UPDATE;
+    if (action == UI) return MOVE_UI_UPDATE;
 
     if (action == TOGGLE_BLACK || action == TOGGLE_CIRCLE) {
         i = y * state->w + x;
@@ -1587,7 +1623,7 @@ badmove:
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1608,12 +1644,13 @@ 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);
+    game_mkhighlight(fe, ret, COL_BACKGROUND, -1, COL_LOWLIGHT);
     for (i = 0; i < 3; i++) {
         ret[COL_BLACK * 3 + i] = 0.0F;
         ret[COL_BLACKNUM * 3 + i] = 0.4F;
         ret[COL_WHITE * 3 + i] = 1.0F;
         ret[COL_GRID * 3 + i] = ret[COL_LOWLIGHT * 3 + i];
+        ret[COL_UNUSED1 * 3 + i] = 0.0F; /* To placate an assertion. */
     }
     ret[COL_CURSOR * 3 + 0] = 0.2F;
     ret[COL_CURSOR * 3 + 1] = 0.8F;
@@ -1708,7 +1745,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int wsz = TILE_SIZE * state->w + 2 * BORDER;
         int hsz = TILE_SIZE * state->h + 2 * BORDER;
-        draw_rect(dr, 0, 0, wsz, hsz, COL_BACKGROUND);
         draw_rect_outline(dr, COORD(0)-1, COORD(0)-1,
                           TILE_SIZE * state->w + 2, TILE_SIZE * state->h + 2,
                           COL_GRID);
@@ -1776,22 +1812,19 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /* 8mm squares by default. */
-    game_compute_size(params, 800, &pw, &ph);
+    game_compute_size(params, 800, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int ink = print_mono_colour(dr, 0);
     int paper = print_mono_colour(dr, 1);
@@ -1848,12 +1881,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1867,7 +1902,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/sixteen.R b/apps/plugins/puzzles/src/sixteen.R
deleted file mode 100644
index c63a27cef8..0000000000
--- a/apps/plugins/puzzles/src/sixteen.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-sixteen  : [X] GTK COMMON sixteen sixteen-icon|no-icon
-
-sixteen  : [G] WINDOWS COMMON sixteen sixteen.res|noicon.res
-
-ALL += sixteen[COMBINED]
-
-!begin am gtk
-GAMES += sixteen
-!end
-
-!begin >list.c
-    A(sixteen) \
-!end
-
-!begin >gamedesc.txt
-sixteen:sixteen.exe:Sixteen:Toroidal sliding block puzzle:Slide a row at a time to arrange the tiles into order.
-!end
diff --git a/apps/plugins/puzzles/src/sixteen.c b/apps/plugins/puzzles/src/sixteen.c
index 0b02038c43..38f6711a49 100644
--- a/apps/plugins/puzzles/src/sixteen.c
+++ b/apps/plugins/puzzles/src/sixteen.c
@@ -9,7 +9,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -173,6 +178,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->w < 2 || params->h < 2)
         return "Width and height must both be at least two";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->movetarget < 0)
         return "Number of shuffling moves may not be negative";
     return NULL;
@@ -567,7 +574,7 @@ static game_ui *new_ui(const game_state *state)
     game_ui *ui = snew(game_ui);
     ui->cur_x = 0;
     ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->cur_mode = unlocked;
 
     return ui;
@@ -578,18 +585,24 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible) {
+        if (ui->cur_x == -1 || ui->cur_x == state->w ||
+                ui->cur_y == -1 || ui->cur_y == state->h)
+            return button == CURSOR_SELECT2 ? "Back" : "Slide";
+        if (button == CURSOR_SELECT)
+            return ui->cur_mode == lock_tile ? "Unlock" : "Lock tile";
+        if (button == CURSOR_SELECT2)
+            return ui->cur_mode == lock_position ? "Unlock" : "Lock pos";
+    }
+    return "";
 }
 
 struct game_drawstate {
@@ -609,12 +622,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     bool shift = button & MOD_SHFT, control = button & MOD_CTRL;
     int pad = button & MOD_NUM_KEYPAD;
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (IS_CURSOR_MOVE(button) || pad) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
 
         if (control || shift || ui->cur_mode) {
@@ -622,9 +635,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             if (x < 0 || x >= state->w || y < 0 || y >= state->h)
                 return NULL;
             move_cursor(button | pad, &x, &y,
-                        state->w, state->h, false);
+                        state->w, state->h, false, NULL);
             move_cursor(button | pad, &xwrap, &ywrap,
-                        state->w, state->h, true);
+                        state->w, state->h, true, NULL);
 
             if (x != xwrap) {
                 sprintf(buf, "R%d,%c1", y, x ? '+' : '-');
@@ -645,7 +658,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             int x = ui->cur_x + 1, y = ui->cur_y + 1;
 
             move_cursor(button | pad, &x, &y,
-                        state->w + 2, state->h + 2, false);
+                        state->w + 2, state->h + 2, false, NULL);
 
             if (x == 0 && y == 0) {
                 int t = ui->cur_x;
@@ -669,7 +682,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             }
 
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     }
 
@@ -687,11 +700,11 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 const enum cursor_mode m = (button == CURSOR_SELECT2 ?
                                             lock_position : lock_tile);
                 ui->cur_mode = (ui->cur_mode == m ? unlocked : m);
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             }
         } else {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else {
         return NULL;
@@ -706,7 +719,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     else if (cy == state->h && cx >= 0 && cx < state->w)
         dy = +1, dx = 0;
     else
-        return UI_UPDATE;            /* invalid click location */
+        return MOVE_UI_UPDATE;            /* invalid click location */
 
     /* reverse direction if right hand button is pressed */
     if (button == RIGHT_BUTTON || button == CURSOR_SELECT2) {
@@ -748,11 +761,11 @@ static game_state *execute_move(const game_state *from, const char *move)
     }
 
     if (move[0] == 'R' && sscanf(move+1, "%d,%d", &cy, &dx) == 2 &&
-        cy >= 0 && cy < from->h) {
+        cy >= 0 && cy < from->h && -from->h <= dx && dx <= from->w ) {
         cx = dy = 0;
         n = from->w;
     } else if (move[0] == 'C' && sscanf(move+1, "%d,%d", &cx, &dy) == 2 &&
-               cx >= 0 && cx < from->w) {
+               cx >= 0 && cx < from->w && -from->h <= dy && dy <= from->h) {
         cy = dx = 0;
         n = from->h;
     } else
@@ -790,7 +803,7 @@ static game_state *execute_move(const game_state *from, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -937,13 +950,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int coords[10];
 
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * state->w + 2 * BORDER,
-                  TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND);
-        draw_update(dr, 0, 0,
-                    TILE_SIZE * state->w + 2 * BORDER,
-                    TILE_SIZE * state->h + 2 * BORDER);
-
         /*
          * Recessed area containing the whole puzzle.
          */
@@ -1165,19 +1171,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame sixteen
 #endif
@@ -1199,12 +1192,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1216,9 +1211,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/slant.R b/apps/plugins/puzzles/src/slant.R
deleted file mode 100644
index ff0d21f1eb..0000000000
--- a/apps/plugins/puzzles/src/slant.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-SLANT_EXTRA = dsf findloop
-
-slant    : [X] GTK COMMON slant SLANT_EXTRA slant-icon|no-icon
-
-slant    : [G] WINDOWS COMMON slant SLANT_EXTRA slant.res|noicon.res
-
-slantsolver :   [U] slant[STANDALONE_SOLVER] SLANT_EXTRA STANDALONE
-slantsolver :   [C] slant[STANDALONE_SOLVER] SLANT_EXTRA STANDALONE
-
-ALL += slant[COMBINED] SLANT_EXTRA
-
-!begin am gtk
-GAMES += slant
-!end
-
-!begin >list.c
-    A(slant) \
-!end
-
-!begin >gamedesc.txt
-slant:slant.exe:Slant:Maze-drawing puzzle:Draw a maze of slanting lines that matches the clues.
-!end
diff --git a/apps/plugins/puzzles/src/slant.c b/apps/plugins/puzzles/src/slant.c
index ed290fe57d..bd04b786e6 100644
--- a/apps/plugins/puzzles/src/slant.c
+++ b/apps/plugins/puzzles/src/slant.c
@@ -28,7 +28,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -51,7 +55,7 @@ enum {
  */
 #if defined STANDALONE_SOLVER
 #define SOLVER_DIAGNOSTICS
-bool verbose = false;
+static bool verbose = false;
 #elif defined SOLVER_DIAGNOSTICS
 #define verbose true
 #endif
@@ -226,6 +230,8 @@ static const char *validate_params(const game_params *params, bool full)
 
     if (params->w < 2 || params->h < 2)
         return "Width and height must both be at least two";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
 
     return NULL;
 }
@@ -238,7 +244,7 @@ struct solver_scratch {
      * Disjoint set forest which tracks the connected sets of
      * points.
      */
-    int *connected;
+    DSF *connected;
 
     /*
      * Counts the number of possible exits from each connected set
@@ -259,7 +265,7 @@ struct solver_scratch {
      * Another disjoint set forest. This one tracks _squares_ which
      * are known to slant in the same direction.
      */
-    int *equiv;
+    DSF *equiv;
 
     /*
      * Stores slash values which we know for an equivalence class.
@@ -306,10 +312,10 @@ static struct solver_scratch *new_scratch(int w, int h)
 {
     int W = w+1, H = h+1;
     struct solver_scratch *ret = snew(struct solver_scratch);
-    ret->connected = snewn(W*H, int);
+    ret->connected = dsf_new(W*H);
     ret->exits = snewn(W*H, int);
     ret->border = snewn(W*H, bool);
-    ret->equiv = snewn(w*h, int);
+    ret->equiv = dsf_new(w*h);
     ret->slashval = snewn(w*h, signed char);
     ret->vbitmap = snewn(w*h, unsigned char);
     return ret;
@@ -319,10 +325,10 @@ static void free_scratch(struct solver_scratch *sc)
 {
     sfree(sc->vbitmap);
     sfree(sc->slashval);
-    sfree(sc->equiv);
+    dsf_free(sc->equiv);
     sfree(sc->border);
     sfree(sc->exits);
-    sfree(sc->connected);
+    dsf_free(sc->connected);
     sfree(sc);
 }
 
@@ -330,7 +336,7 @@ static void free_scratch(struct solver_scratch *sc)
  * Wrapper on dsf_merge() which updates the `exits' and `border'
  * arrays.
  */
-static void merge_vertices(int *connected,
+static void merge_vertices(DSF *connected,
                            struct solver_scratch *sc, int i, int j)
 {
     int exits = -1;
@@ -376,7 +382,7 @@ static void decr_exits(struct solver_scratch *sc, int i)
 
 static void fill_square(int w, int h, int x, int y, int v,
                         signed char *soln,
-                        int *connected, struct solver_scratch *sc)
+                        DSF *connected, struct solver_scratch *sc)
 {
     int W = w+1 /*, H = h+1 */;
 
@@ -466,13 +472,13 @@ static int slant_solve(int w, int h, const signed char *clues,
      * Establish a disjoint set forest for tracking connectedness
      * between grid points.
      */
-    dsf_init(sc->connected, W*H);
+    dsf_reinit(sc->connected);
 
     /*
      * Establish a disjoint set forest for tracking which squares
      * are known to slant in the same direction.
      */
-    dsf_init(sc->equiv, w*h);
+    dsf_reinit(sc->equiv);
 
     /*
      * Clear the slashval array.
@@ -991,7 +997,8 @@ static void slant_generate(int w, int h, signed char *soln, random_state *rs)
 {
     int W = w+1, H = h+1;
     int x, y, i;
-    int *connected, *indices;
+    DSF *connected;
+    int *indices;
 
     /*
      * Clear the output.
@@ -1002,7 +1009,7 @@ static void slant_generate(int w, int h, signed char *soln, random_state *rs)
      * Establish a disjoint set forest for tracking connectedness
      * between grid points.
      */
-    connected = snew_dsf(W*H);
+    connected = dsf_new(W*H);
 
     /*
      * Prepare a list of the squares in the grid, and fill them in
@@ -1058,7 +1065,7 @@ static void slant_generate(int w, int h, signed char *soln, random_state *rs)
     }
 
     sfree(indices);
-    sfree(connected);
+    dsf_free(connected);
 }
 
 static char *new_game_desc(const game_params *params, random_state *rs,
@@ -1574,28 +1581,69 @@ static char *game_text_format(const game_state *state)
 struct game_ui {
     int cur_x, cur_y;
     bool cur_visible;
+
+    /*
+     * User preference option to swap the left and right mouse
+     * buttons. There isn't a completely obvious mapping of left and
+     * right buttons to the two directions of slash, and at least one
+     * player turned out not to have the same intuition as me.
+     */
+    bool swap_buttons;
 };
 
+static void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int swap_buttons = -1;
+
+    if (!initialised) {
+        initialised = true;
+        swap_buttons = getenv_bool("SLANT_SWAP_BUTTONS", -1);
+    }
+
+    if (swap_buttons != -1)
+        ui_out->swap_buttons = swap_buttons;
+}
+
 static game_ui *new_ui(const game_state *state)
 {
     game_ui *ui = snew(game_ui);
     ui->cur_x = ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+
+    ui->swap_buttons = false;
+    legacy_prefs_override(ui);
+
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *ret;
+
+    ret = snewn(2, config_item);
+
+    ret[0].name = "Mouse button order";
+    ret[0].kw = "left-button";
+    ret[0].type = C_CHOICES;
+    ret[0].u.choices.choicenames = ":Left \\, right /:Left /, right \\";
+    ret[0].u.choices.choicekws = ":\\:/";
+    ret[0].u.choices.selected = ui->swap_buttons;
+
+    ret[1].name = NULL;
+    ret[1].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->swap_buttons = cfg[0].u.choices.selected;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1603,6 +1651,22 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 {
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cur_visible) {
+        switch (state->soln[ui->cur_y*state->p.w+ui->cur_x]) {
+          case 0:
+            return button == CURSOR_SELECT ? "\\" : "/";
+          case -1:
+            return button == CURSOR_SELECT ? "/" : "Blank";
+          case +1:
+            return button == CURSOR_SELECT ? "Blank" : "\\";
+        }
+    }
+    return "";
+}
+
 #define PREFERRED_TILESIZE 32
 #define TILESIZE (ds->tilesize)
 #define BORDER TILESIZE
@@ -1638,7 +1702,6 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 
 struct game_drawstate {
     int tilesize;
-    bool started;
     long *grid;
     long *todraw;
 };
@@ -1653,51 +1716,34 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     enum { CLOCKWISE, ANTICLOCKWISE, NONE } action = NONE;
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
-        /*
-         * This is an utterly awful hack which I should really sort out
-         * by means of a proper configuration mechanism. One Slant
-         * player has observed that they prefer the mouse buttons to
-         * function exactly the opposite way round, so here's a
-         * mechanism for environment-based configuration. I cache the
-         * result in a global variable - yuck! - to avoid repeated
-         * lookups.
-         */
-        {
-            static int swap_buttons = -1;
-            if (swap_buttons < 0) {
-                char *env = getenv("SLANT_SWAP_BUTTONS");
-                swap_buttons = (env && (env[0] == 'y' || env[0] == 'Y'));
-            }
-            if (swap_buttons) {
-                if (button == LEFT_BUTTON)
-                    button = RIGHT_BUTTON;
-                else
-                    button = LEFT_BUTTON;
-            }
-        }
+        if (ui->swap_buttons) {
+            if (button == LEFT_BUTTON)
+                button = RIGHT_BUTTON;
+            else
+                button = LEFT_BUTTON;
+        }
         action = (button == LEFT_BUTTON) ? CLOCKWISE : ANTICLOCKWISE;
 
         x = FROMCOORD(x);
         y = FROMCOORD(y);
         if (x < 0 || y < 0 || x >= w || y >= h)
-            return NULL;
+            return MOVE_UNUSED;
         ui->cur_visible = false;
     } else if (IS_CURSOR_SELECT(button)) {
         if (!ui->cur_visible) {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         x = ui->cur_x;
         y = ui->cur_y;
 
         action = (button == CURSOR_SELECT2) ? ANTICLOCKWISE : CLOCKWISE;
     } else if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cur_x, &ui->cur_y, w, h, false);
-        ui->cur_visible = true;
-        return UI_UPDATE;
+        return move_cursor(button, &ui->cur_x, &ui->cur_y, w, h, false, &ui->cur_visible);
     } else if (button == '\\' || button == '\b' || button == '/') {
         int x = ui->cur_x, y = ui->cur_y;
-        if (button == ("\\" "\b" "/")[state->soln[y*w + x] + 1]) return NULL;
+        if (button == ("\\" "\b" "/")[state->soln[y*w + x] + 1])
+            return MOVE_NO_EFFECT;
         sprintf(buf, "%c%d,%d", button == '\b' ? 'C' : button, x, y);
         return dupstr(buf);
     }
@@ -1723,7 +1769,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         return dupstr(buf);
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -1774,7 +1820,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* fool the macros */
     struct dummy { int tilesize; } dummy, *ds = &dummy;
@@ -1832,7 +1878,6 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     struct game_drawstate *ds = snew(struct game_drawstate);
 
     ds->tilesize = 0;
-    ds->started = false;
     ds->grid = snewn((w+2)*(h+2), long);
     ds->todraw = snewn((w+2)*(h+2), long);
     for (i = 0; i < (w+2)*(h+2); i++)
@@ -1972,14 +2017,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     else
         flashing = false;
 
-    if (!ds->started) {
-        int ww, wh;
-        game_compute_size(&state->p, TILESIZE, &ww, &wh);
-        draw_rect(dr, 0, 0, ww, wh, COL_BACKGROUND);
-        draw_update(dr, 0, 0, ww, wh);
-        ds->started = true;
-    }
-
     /*
      * Loop over the grid and work out where all the slashes are.
      * We need to do this because a slash in one square affects the
@@ -2082,24 +2119,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->p.w, h = state->p.h, W = w+1;
     int ink = print_mono_colour(dr, 0);
@@ -2179,12 +2213,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_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,
@@ -2198,7 +2234,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/solo.R b/apps/plugins/puzzles/src/solo.R
deleted file mode 100644
index 081a76147e..0000000000
--- a/apps/plugins/puzzles/src/solo.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-SOLO_EXTRA = divvy dsf
-
-solo     : [X] GTK COMMON solo SOLO_EXTRA solo-icon|no-icon
-
-solo     : [G] WINDOWS COMMON solo SOLO_EXTRA solo.res|noicon.res
-
-solosolver :    [U] solo[STANDALONE_SOLVER] SOLO_EXTRA STANDALONE
-solosolver :    [C] solo[STANDALONE_SOLVER] SOLO_EXTRA STANDALONE
-
-ALL += solo[COMBINED] SOLO_EXTRA
-
-!begin am gtk
-GAMES += solo
-!end
-
-!begin >list.c
-    A(solo) \
-!end
-
-!begin >gamedesc.txt
-solo:solo.exe:Solo:Number placement puzzle:Fill in the grid so that each row, column and square block contains one of every digit.
-!end
diff --git a/apps/plugins/puzzles/src/solo.c b/apps/plugins/puzzles/src/solo.c
index 49753f41dc..2445501f57 100644
--- a/apps/plugins/puzzles/src/solo.c
+++ b/apps/plugins/puzzles/src/solo.c
@@ -20,7 +20,7 @@
  *     + while I'm revamping this area, filling in the _last_
  *       number in a nearly-full row or column should certainly be
  *       permitted even at the lowest difficulty level.
- *     + also Owen noticed that `Basic' grids requiring numeric
+ *     + also Alex noticed that `Basic' grids requiring numeric
  *       elimination are actually very hard, so I wonder if a
  *       difficulty gradation between that and positional-
  *       elimination-only might be in order
@@ -87,11 +87,15 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #ifdef STANDALONE_SOLVER
 #include <stdarg.h>
-int solver_show_working, solver_recurse_depth;
+static int solver_show_working, solver_recurse_depth;
 #endif
 
 #include "puzzles.h"
@@ -2638,6 +2642,7 @@ static void solver(int cr, struct block_structure *blocks,
     sfree(usage->row);
     sfree(usage->col);
     sfree(usage->blk);
+    sfree(usage->diag);
     if (usage->kblocks) {
         free_block_structure(usage->kblocks);
         free_block_structure(usage->extra_cages);
@@ -2969,6 +2974,7 @@ static bool gridgen(int cr, struct block_structure *blocks,
     sfree(usage->blk);
     sfree(usage->col);
     sfree(usage->row);
+    sfree(usage->diag);
     sfree(usage);
 
     return ret;
@@ -3222,7 +3228,7 @@ static char *encode_solve_move(int cr, digit *grid)
     return ret;
 }
 
-static void dsf_to_blocks(int *dsf, struct block_structure *blocks,
+static void dsf_to_blocks(DSF *dsf, struct block_structure *blocks,
                           int min_expected, int max_expected)
 {
     int cr = blocks->c * blocks->r, area = cr * cr;
@@ -3654,10 +3660,11 @@ static char *new_game_desc(const game_params *params, random_state *rs,
      * the puzzle size: all 2x2 puzzles appear to be Trivial
      * (DIFF_BLOCK) so we cannot hold out for even a Basic
      * (DIFF_SIMPLE) one.
+     * Jigsaw puzzles of size 2 and 3 are also all trivial.
      */
     dlev.maxdiff = params->diff;
     dlev.maxkdiff = params->kdiff;
-    if (c == 2 && r == 2)
+    if ((c == 2 && r == 2) || (r == 1 && c < 4))
         dlev.maxdiff = DIFF_BLOCK;
 
     grid = snewn(area, digit);
@@ -3684,11 +3691,11 @@ static char *new_game_desc(const game_params *params, random_state *rs,
          * constructing the block structure.
          */
         if (r == 1) {                  /* jigsaw mode */
-            int *dsf = divvy_rectangle(cr, cr, cr, rs);
+            DSF *dsf = divvy_rectangle(cr, cr, cr, rs);
 
             dsf_to_blocks (dsf, blocks, cr, cr);
 
-            sfree(dsf);
+            dsf_free(dsf);
         } else {                       /* basic Sudoku mode */
             for (y = 0; y < cr; y++)
                 for (x = 0; x < cr; x++)
@@ -3903,14 +3910,14 @@ static const char *spec_to_grid(const char *desc, digit *grid, int area)
  * end of the block spec, and return an error string or NULL if everything
  * is OK. The DSF is stored in *PDSF.
  */
-static const char *spec_to_dsf(const char **pdesc, int **pdsf,
+static const char *spec_to_dsf(const char **pdesc, DSF **pdsf,
                                int cr, int area)
 {
     const char *desc = *pdesc;
     int pos = 0;
-    int *dsf;
+    DSF *dsf;
 
-    *pdsf = dsf = snew_dsf(area);
+    *pdsf = dsf = dsf_new(area);
 
     while (*desc && *desc != ',') {
         int c;
@@ -3921,7 +3928,7 @@ static const char *spec_to_dsf(const char **pdesc, int **pdsf,
         else if (*desc >= 'a' && *desc <= 'z')
             c = *desc - 'a' + 1;
         else {
-            sfree(dsf);
+            dsf_free(dsf);
             return "Invalid character in game description";
         }
         desc++;
@@ -3936,7 +3943,7 @@ static const char *spec_to_dsf(const char **pdesc, int **pdsf,
              * side of it.
              */
             if (pos >= 2*cr*(cr-1)) {
-                sfree(dsf);
+                dsf_free(dsf);
                 return "Too much data in block structure specification";
             }
 
@@ -3966,7 +3973,7 @@ static const char *spec_to_dsf(const char **pdesc, int **pdsf,
      * edge at the end.
      */
     if (pos != 2*cr*(cr-1)+1) {
-        sfree(dsf);
+        dsf_free(dsf);
         return "Not enough data in block structure specification";
     }
 
@@ -4008,7 +4015,7 @@ static const char *validate_block_desc(const char **pdesc, int cr, int area,
                                        int min_nr_squares, int max_nr_squares)
 {
     const char *err;
-    int *dsf;
+    DSF *dsf;
 
     err = spec_to_dsf(pdesc, &dsf, cr, area);
     if (err) {
@@ -4037,7 +4044,7 @@ static const char *validate_block_desc(const char **pdesc, int cr, int area,
                 if (canons[c] == j) {
                     counts[c]++;
                     if (counts[c] > max_nr_squares) {
-                        sfree(dsf);
+                        dsf_free(dsf);
                         sfree(canons);
                         sfree(counts);
                         return "A jigsaw block is too big";
@@ -4047,7 +4054,7 @@ static const char *validate_block_desc(const char **pdesc, int cr, int area,
 
             if (c == ncanons) {
                 if (ncanons >= max_nr_blocks) {
-                    sfree(dsf);
+                    dsf_free(dsf);
                     sfree(canons);
                     sfree(counts);
                     return "Too many distinct jigsaw blocks";
@@ -4059,14 +4066,14 @@ static const char *validate_block_desc(const char **pdesc, int cr, int area,
         }
 
         if (ncanons < min_nr_blocks) {
-            sfree(dsf);
+            dsf_free(dsf);
             sfree(canons);
             sfree(counts);
             return "Not enough distinct jigsaw blocks";
         }
         for (c = 0; c < ncanons; c++) {
             if (counts[c] < min_nr_squares) {
-                sfree(dsf);
+                dsf_free(dsf);
                 sfree(canons);
                 sfree(counts);
                 return "A jigsaw block is too small";
@@ -4076,7 +4083,7 @@ static const char *validate_block_desc(const char **pdesc, int cr, int area,
         sfree(counts);
     }
 
-    sfree(dsf);
+    dsf_free(dsf);
     return NULL;
 }
 
@@ -4161,13 +4168,13 @@ static game_state *new_game(midend *me, const game_params *params,
 
     if (r == 1) {
         const char *err;
-        int *dsf;
+        DSF *dsf;
         assert(*desc == ',');
         desc++;
         err = spec_to_dsf(&desc, &dsf, cr, area);
         assert(err == NULL);
         dsf_to_blocks(dsf, state->blocks, cr, cr);
-        sfree(dsf);
+        dsf_free(dsf);
     } else {
         int x, y;
 
@@ -4179,13 +4186,13 @@ static game_state *new_game(midend *me, const game_params *params,
 
     if (params->killer) {
         const char *err;
-        int *dsf;
+        DSF *dsf;
         assert(*desc == ',');
         desc++;
         err = spec_to_dsf(&desc, &dsf, cr, area);
         assert(err == NULL);
         dsf_to_blocks(dsf, state->kblocks, cr, area);
-        sfree(dsf);
+        dsf_free(dsf);
         make_blocks_from_whichblock(state->kblocks);
 
         assert(*desc == ',');
@@ -4550,6 +4557,17 @@ struct game_ui {
      * allowed on immutable squares.
      */
     bool hcursor;
+
+    /*
+     * User preference option: if the user right-clicks in a square
+     * and presses a number or 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)
@@ -4558,8 +4576,9 @@ static game_ui *new_ui(const game_state *state)
 
     ui->hx = ui->hy = 0;
     ui->hpencil = false;
-    ui->hshow = false;
-    ui->hcursor = false;
+    ui->hshow = ui->hcursor = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+
+    ui->pencil_keep_highlight = false;
 
     return ui;
 }
@@ -4569,13 +4588,26 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    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 decode_ui(game_ui *ui, const char *encoding)
+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,
@@ -4594,6 +4626,14 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     }
 }
 
+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";
+    return "";
+}
+
 struct game_drawstate {
     bool started, xtype;
     int cr;
@@ -4613,7 +4653,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int tx, ty;
     char buf[80];
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     tx = (x + TILE_SIZE - BORDER) / TILE_SIZE - 1;
     ty = (y + TILE_SIZE - BORDER) / TILE_SIZE - 1;
@@ -4632,7 +4672,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hpencil = false;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (button == RIGHT_BUTTON) {
             /*
@@ -4652,20 +4692,19 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hshow = false;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     }
     if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->hx, &ui->hy, cr, cr, false);
-        ui->hshow = true;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return move_cursor(button, &ui->hx, &ui->hy, cr, cr, false,
+                           &ui->hshow);
     }
     if (ui->hshow &&
         (button == CURSOR_SELECT)) {
         ui->hpencil = !ui->hpencil;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (ui->hshow &&
@@ -4695,10 +4734,37 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (ui->hpencil && state->grid[ui->hy*cr+ui->hx])
             return NULL;
 
+        /*
+         * If you ask to fill a square with what it already contains,
+         * or blank it when it's already empty, that has no effect...
+         */
+        if ((!ui->hpencil || n == 0) && state->grid[ui->hy*cr+ui->hx] == n) {
+            bool anypencil = false;
+            int i;
+            for (i = 0; i < cr; i++)
+                anypencil = anypencil ||
+                    state->pencil[(ui->hy*cr+ui->hx) * cr + i];
+            if (!anypencil) {
+                /* ... expect to remove the cursor in mouse mode. */
+                if (!ui->hcursor) {
+                    ui->hshow = false;
+                    return MOVE_UI_UPDATE;
+                }
+                return NULL;
+            }
+        }
+
         sprintf(buf, "%c%d,%d,%d",
                 (char)(ui->hpencil && n > 0 ? 'P' : 'R'), ui->hx, ui->hy, n);
 
-        if (!ui->hcursor) ui->hshow = false;
+        /*
+         * 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 dupstr(buf);
     }
@@ -4787,7 +4853,7 @@ static game_state *execute_move(const game_state *from, const char *move)
 #define GETTILESIZE(cr, w) ( (double)(w-1) / (double)(cr+1) )
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -4920,6 +4986,18 @@ static void draw_number(drawing *dr, game_drawstate *ds,
                (ds->xtype && (ondiag0(y*cr+x) || ondiag1(y*cr+x))) ? COL_XDIAGONALS :
                COL_BACKGROUND));
 
+    /* pencil-mode highlight */
+    if ((hl & 15) == 2) {
+        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);
+    }
+
     /*
      * Draw the corners of thick lines in corner-adjacent squares,
      * which jut into this square by one pixel.
@@ -4933,18 +5011,6 @@ static void draw_number(drawing *dr, game_drawstate *ds,
     if (x+1 < cr && y+1 < cr && state->blocks->whichblock[y*cr+x] != state->blocks->whichblock[(y+1)*cr+x+1])
         draw_rect(dr, tx+TILE_SIZE-1-2*GRIDEXTRA, ty+TILE_SIZE-1-2*GRIDEXTRA, GRIDEXTRA, GRIDEXTRA, COL_GRID);
 
-    /* pencil-mode highlight */
-    if ((hl & 15) == 2) {
-        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);
-    }
-
     if (state->kblocks) {
         int t = GRIDEXTRA * 3;
         int kcx, kcy, kcw, kch;
@@ -5104,7 +5170,7 @@ static void draw_number(drawing *dr, game_drawstate *ds,
                 fw = (pr - pl) / (float)pw;
                 fh = (pb - pt) / (float)ph;
                 fs = min(fw, fh);
-                if (fs > bestsize) {
+                if (fs >= bestsize) {
                     bestsize = fs;
                     pbest = pw;
                 }
@@ -5175,14 +5241,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     if (!ds->started) {
         /*
-         * The initial contents of the window are not guaranteed
-         * and can vary with front ends. To be on the safe side,
-         * all games should start by drawing a big
-         * background-colour rectangle covering the whole window.
-         */
-        draw_rect(dr, 0, 0, SIZE(cr), SIZE(cr), COL_BACKGROUND);
-
-        /*
          * Draw the grid. We draw it as a big thick rectangle of
          * COL_GRID initially; individual calls to draw_number()
          * will poke the right-shaped holes in it.
@@ -5315,14 +5373,8 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
@@ -5331,7 +5383,7 @@ static void game_print_size(const game_params *params, float *x, float *y)
      * for this game, because players will want to jot down no end
      * of pencil marks in the squares.
      */
-    game_compute_size(params, 900, &pw, &ph);
+    game_compute_size(params, 900, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
@@ -5505,7 +5557,8 @@ static void outline_block_structure(drawing *dr, game_drawstate *ds,
     sfree(coords);
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int cr = state->cr;
     int ink = print_mono_colour(dr, 0);
@@ -5620,12 +5673,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     game_request_keys,
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -5639,7 +5694,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON | REQUIRE_NUMPAD,  /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/sort.c b/apps/plugins/puzzles/src/sort.c
index d1897b6fdf..e82f4ec6dc 100644
--- a/apps/plugins/puzzles/src/sort.c
+++ b/apps/plugins/puzzles/src/sort.c
@@ -9,26 +9,8 @@
 
 #include "puzzles.h"
 
-static void memswap(void *av, void *bv, size_t size)
-{
-    char t[4096];
-    char *a = (char *)av, *b = (char *)bv;
-
-    while (size > 0) {
-        size_t thissize = size < sizeof(t) ? size : sizeof(t);
-
-        memcpy(t, a, thissize);
-        memcpy(a, b, thissize);
-        memcpy(b, t, thissize);
-
-        size -= thissize;
-        a += thissize;
-        b += thissize;
-    }
-}
-
 #define PTR(i) ((char *)array + size * (i))
-#define SWAP(i,j) memswap(PTR(i), PTR(j), size)
+#define SWAP(i,j) swap_regions(PTR(i), PTR(j), size)
 #define CMP(i,j) cmp(PTR(i), PTR(j), ctx)
 
 #define LCHILD(i) (2*(i)+1)
@@ -87,74 +69,3 @@ void arraysort_fn(void *array, size_t nmemb, size_t size,
         downheap(array, i, size, cmp, ctx, 0);
     }
 }
-
-#ifdef SORT_TEST
-
-#include <stdlib.h>
-#include <time.h>
-
-int testcmp(const void *av, const void *bv, void *ctx)
-{
-    int a = *(const int *)av, b = *(const int *)bv;
-    const int *keys = (const int *)ctx;
-    return keys[a] < keys[b] ? -1 : keys[a] > keys[b] ? +1 : 0;
-}
-
-int resetcmp(const void *av, const void *bv)
-{
-    int a = *(const int *)av, b = *(const int *)bv;
-    return a < b ? -1 : a > b ? +1 : 0;
-}
-
-int main(int argc, char **argv)
-{
-    typedef int Array[3723];
-    Array data, keys;
-    int iteration;
-    unsigned seed;
-
-    seed = (argc > 1 ? strtoul(argv[1], NULL, 0) : time(NULL));
-    printf("Random seed = %u\n", seed);
-    srand(seed);
-
-    for (iteration = 0; iteration < 10000; iteration++) {
-        int j;
-        const char *fail = NULL;
-
-        for (j = 0; j < lenof(data); j++) {
-            data[j] = j;
-            keys[j] = rand();
-        }
-
-        arraysort(data, lenof(data), testcmp, keys);
-
-        for (j = 1; j < lenof(data); j++) {
-            if (keys[data[j]] < keys[data[j-1]])
-                fail = "output misordered";
-        }
-        if (!fail) {
-            Array reset;
-            memcpy(reset, data, sizeof(data));
-            qsort(reset, lenof(reset), sizeof(*reset), resetcmp);
-            for (j = 0; j < lenof(reset); j++)
-                if (reset[j] != j)
-                    fail = "output not permuted";
-        }
-
-        if (fail) {
-            printf("Failed at iteration %d: %s\n", iteration, fail);
-            printf("Key values:\n");
-            for (j = 0; j < lenof(keys); j++)
-                printf("  [%2d] %10d\n", j, keys[j]);
-            printf("Output sorted order:\n");
-            for (j = 0; j < lenof(data); j++)
-                printf("  [%2d] %10d\n", data[j], keys[data[j]]);
-            return 1;
-        }
-    }
-
-    printf("OK\n");
-    return 0;
-}
-
-#endif /* SORT_TEST */
diff --git a/apps/plugins/puzzles/src/spectre-internal.h b/apps/plugins/puzzles/src/spectre-internal.h
new file mode 100644
index 0000000000..e43d30bfef
--- /dev/null
+++ b/apps/plugins/puzzles/src/spectre-internal.h
@@ -0,0 +1,327 @@
+#include "spectre.h"
+
+/*
+ * List macro of the names for hexagon types, which will be reused all
+ * over the place.
+ *
+ * (I have to call the parameter to this list macro something other
+ * than X, because here, X is also one of the macro arguments!)
+ */
+#define HEX_LETTERS(Z) Z(G) Z(D) Z(J) Z(L) Z(X) Z(P) Z(S) Z(F) Z(Y)
+
+typedef enum Hex {
+    #define HEX_ENUM_DECL(x) HEX_##x,
+    HEX_LETTERS(HEX_ENUM_DECL)
+    #undef HEX_ENUM_DECL
+} Hex;
+
+static inline unsigned num_subhexes(Hex h)
+{
+    return h == HEX_G ? 7 : 8;
+}
+
+static inline unsigned num_spectres(Hex h)
+{
+    return h == HEX_G ? 2 : 1;
+}
+
+/*
+ * Data types used in the lookup tables.
+ */
+struct MapEntry {
+    bool internal;
+    unsigned char hi, lo;
+};
+struct MapEdge {
+    unsigned char startindex, len;
+};
+struct Possibility {
+    unsigned char hi, lo;
+    unsigned long prob;
+};
+
+/*
+ * Coordinate system for tracking Spectres and their hexagonal
+ * metatiles.
+ *
+ * SpectreCoords will store the index of a single Spectre within a
+ * smallest-size hexagon, plus an array of HexCoord each indexing a
+ * hexagon within the expansion of a larger hexagon.
+ *
+ * The last coordinate stored, sc->c[sc->nc-1], will have a hex type
+ * but no index (represented by index==-1). This means "we haven't
+ * decided yet what this level of metatile needs to be". If we need to
+ * refer to this level during the hatctx_step algorithm, we make it up
+ * at random, based on a table of what metatiles each type can
+ * possibly be part of, at what index.
+ */
+typedef struct HexCoord {
+    int index; /* index within that tile, or -1 if not yet known */
+    Hex type;  /* type of this hexagon */
+} HexCoord;
+
+typedef struct SpectreCoords {
+    int index;       /* index of Spectre within the order-0 hexagon */
+    HexCoord *c;
+    size_t nc, csize;
+
+    /* Used by spectre-test to four-colour output tilings, and
+     * maintained unconditionally because it's easier than making it
+     * conditional */
+    unsigned char hex_colour, prev_hex_colour, incoming_hex_edge;
+} SpectreCoords;
+
+SpectreCoords *spectre_coords_new(void);
+void spectre_coords_free(SpectreCoords *hc);
+void spectre_coords_make_space(SpectreCoords *hc, size_t size);
+SpectreCoords *spectre_coords_copy(SpectreCoords *hc_in);
+
+/*
+ * Coordinate system for locating Spectres in the plane.
+ *
+ * The 'Point' structure represents a single point by means of an
+ * integer linear combination of {1, d, d^2, d^3}, where d is the
+ * complex number exp(i pi/6) representing 1/12 of a turn about the
+ * origin.
+ *
+ * The 'Spectre' structure represents an entire Spectre in a tiling,
+ * giving both the locations of all of its vertices and its
+ * combinatorial coordinates. It also contains a linked-list pointer,
+ * used during breadth-first search to generate all the Spectres in an
+ * area.
+ */
+typedef struct Point {
+    int coeffs[4];
+} Point;
+typedef struct Spectre Spectre;
+struct Spectre {
+    Point vertices[14];
+    SpectreCoords *sc;
+    Spectre *next; /* used in breadth-first search */
+};
+
+/* Fill in all the coordinates of a Spectre starting from any single edge */
+void spectre_place(Spectre *spec, Point u, Point v, int index_of_u);
+
+/* Free a Spectre and its contained coordinates */
+void spectre_free(Spectre *spec);
+
+/*
+ * A Point is really a complex number, so we can add, subtract and
+ * multiply them.
+ */
+static inline Point point_add(Point a, Point b)
+{
+    Point r;
+    size_t i;
+    for (i = 0; i < 4; i++)
+        r.coeffs[i] = a.coeffs[i] + b.coeffs[i];
+    return r;
+}
+static inline Point point_sub(Point a, Point b)
+{
+    Point r;
+    size_t i;
+    for (i = 0; i < 4; i++)
+        r.coeffs[i] = a.coeffs[i] - b.coeffs[i];
+    return r;
+}
+static inline Point point_mul_by_d(Point x)
+{
+    Point r;
+    /* Multiply by d by using the identity d^4 - d^2 + 1 = 0, so d^4 = d^2+1 */
+    r.coeffs[0] = -x.coeffs[3];
+    r.coeffs[1] = x.coeffs[0];
+    r.coeffs[2] = x.coeffs[1] + x.coeffs[3];
+    r.coeffs[3] = x.coeffs[2];
+    return r;
+}
+static inline Point point_mul(Point a, Point b)
+{
+    size_t i, j;
+    Point r;
+
+    /* Initialise r to be a, scaled by b's d^3 term */
+    for (j = 0; j < 4; j++)
+        r.coeffs[j] = a.coeffs[j] * b.coeffs[3];
+
+    /* Now iterate r = d*r + (next coefficient down), by Horner's rule */
+    for (i = 3; i-- > 0 ;) {
+        r = point_mul_by_d(r);
+        for (j = 0; j < 4; j++)
+            r.coeffs[j] += a.coeffs[j] * b.coeffs[i];
+    }
+
+    return r;
+}
+static inline bool point_equal(Point a, Point b)
+{
+    size_t i;
+    for (i = 0; i < 4; i++)
+        if (a.coeffs[i] != b.coeffs[i])
+            return false;
+    return true;
+}
+
+/*
+ * Return the Point corresponding to a rotation of s steps around the
+ * origin, i.e. a rotation by 30*s degrees or s*pi/6 radians.
+ */
+static inline Point point_rot(int s)
+{
+    Point r = {{ 1, 0, 0, 0 }};
+    Point dpower = {{ 0, 1, 0, 0 }};
+
+    /* Reduce to a sensible range */
+    s = s % 12;
+    if (s < 0)
+        s += 12;
+
+    while (true) {
+        if (s & 1)
+            r = point_mul(r, dpower);
+        s >>= 1;
+        if (!s)
+            break;
+        dpower = point_mul(dpower, dpower);
+    }
+
+    return r;
+}
+
+/*
+ * SpectreContext is the shared context of a whole run of the
+ * algorithm. Its 'prototype' SpectreCoords object represents the
+ * coordinates of the starting Spectre, and is extended as necessary;
+ * any other SpectreCoord that needs extending will copy the
+ * higher-order values from ctx->prototype as needed, so that once
+ * each choice has been made, it remains consistent.
+ *
+ * When we're inventing a random piece of tiling in the first place,
+ * we append to ctx->prototype by choosing a random (but legal)
+ * higher-level metatile for the current topmost one to turn out to be
+ * part of. When we're replaying a generation whose parameters are
+ * already stored, we don't have a random_state, and we make fixed
+ * decisions if not enough coordinates were provided, as in the
+ * corresponding hat.c system.
+ *
+ * For a normal (non-testing) caller, spectrectx_generate() is the
+ * main useful function. It breadth-first searches a whole area to
+ * generate all the Spectres in it, starting from a (typically
+ * central) one with the coordinates of ctx->prototype. The callback
+ * function processes each Spectre as it's generated, and returns true
+ * or false to indicate whether that Spectre is within the bounds of
+ * the target area (and therefore the search should continue exploring
+ * its neighbours).
+ */
+typedef struct SpectreContext {
+    random_state *rs;
+    bool must_free_rs;
+    Point start_vertices[2]; /* vertices 0,1 of the starting Spectre */
+    int orientation;         /* orientation to put in SpectrePatchParams */
+    SpectreCoords *prototype;
+} SpectreContext;
+
+void spectrectx_init_random(SpectreContext *ctx, random_state *rs);
+void spectrectx_init_from_params(
+    SpectreContext *ctx, const struct SpectrePatchParams *ps);
+void spectrectx_cleanup(SpectreContext *ctx);
+SpectreCoords *spectrectx_initial_coords(SpectreContext *ctx);
+void spectrectx_extend_coords(SpectreContext *ctx, SpectreCoords *hc,
+                              size_t n);
+void spectrectx_step(SpectreContext *ctx, SpectreCoords *sc,
+                     unsigned edge, unsigned *outedge);
+void spectrectx_generate(SpectreContext *ctx,
+                         bool (*callback)(void *cbctx, const Spectre *spec),
+                         void *cbctx);
+
+/* For spectre-test to directly generate a tiling of hexes */
+void spectrectx_step_hex(SpectreContext *ctx, SpectreCoords *sc,
+                         size_t depth, unsigned edge, unsigned *outedge);
+
+/* Subroutines that step around the tiling specified by a SpectreCtx,
+ * delivering both plane and combinatorial coordinates as they go */
+Spectre *spectre_initial(SpectreContext *ctx);
+Spectre *spectre_adjacent(SpectreContext *ctx, const Spectre *src_spec,
+                          unsigned src_edge, unsigned *dst_edge);
+
+/* For extracting the point coordinates */
+typedef struct Coord {
+    int c1, cr3;      /* coefficients of 1 and sqrt(3) respectively */
+} Coord;
+
+static inline Coord point_x(Point p)
+{
+    Coord x = { 2 * p.coeffs[0] + p.coeffs[2], p.coeffs[1] };
+    return x;
+}
+
+static inline Coord point_y(Point p)
+{
+    Coord y = { 2 * p.coeffs[3] + p.coeffs[1], p.coeffs[2] };
+    return y;
+}
+
+static inline int coord_sign(Coord x)
+{
+    if (x.c1 == 0 && x.cr3 == 0)
+        return 0;
+    if (x.c1 >= 0 && x.cr3 >= 0)
+        return +1;
+    if (x.c1 <= 0 && x.cr3 <= 0)
+        return -1;
+
+    if (x.c1 * x.c1 > 3 * x.cr3 * x.cr3)
+        return x.c1 < 0 ? -1 : +1;
+    else
+        return x.cr3 < 0 ? -1 : +1;
+}
+
+static inline Coord coord_construct(int c1, int cr3)
+{
+    Coord c = { c1, cr3 };
+    return c;
+}
+
+static inline Coord coord_integer(int c1)
+{
+    return coord_construct(c1, 0);
+}
+
+static inline Coord coord_add(Coord a, Coord b)
+{
+    Coord sum;
+    sum.c1 = a.c1 + b.c1;
+    sum.cr3 = a.cr3 + b.cr3;
+    return sum;
+}
+
+static inline Coord coord_sub(Coord a, Coord b)
+{
+    Coord diff;
+    diff.c1 = a.c1 - b.c1;
+    diff.cr3 = a.cr3 - b.cr3;
+    return diff;
+}
+
+static inline Coord coord_mul(Coord a, Coord b)
+{
+    Coord prod;
+    prod.c1 = a.c1 * b.c1 + 3 * a.cr3 * b.cr3;
+    prod.cr3 = a.c1 * b.cr3 + a.cr3 * b.c1;
+    return prod;
+}
+
+static inline Coord coord_abs(Coord a)
+{
+    int sign = coord_sign(a);
+    Coord abs;
+    abs.c1 = a.c1 * sign;
+    abs.cr3 = a.cr3 * sign;
+    return abs;
+}
+
+static inline int coord_cmp(Coord a, Coord b)
+{
+    return coord_sign(coord_sub(a, b));
+}
diff --git a/apps/plugins/puzzles/src/spectre-tables-auto.h b/apps/plugins/puzzles/src/spectre-tables-auto.h
new file mode 100644
index 0000000000..a41c4e1d18
--- /dev/null
+++ b/apps/plugins/puzzles/src/spectre-tables-auto.h
@@ -0,0 +1,1220 @@
+/*
+ * Autogenerated transition tables for the Spectre tiling.
+ * Generated by auxiliary/spectre-gen.c.
+ */
+
+static const struct MapEntry hexmap_G[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 2, 0 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (X) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (X) */
+    { false, 3, 1 }, /* edge 2 of hex 1 (X) */
+    { false, 3, 0 }, /* edge 3 of hex 1 (X) */
+    { false, 2, 2 }, /* edge 4 of hex 1 (X) */
+    { false, 2, 1 }, /* edge 5 of hex 1 (X) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 2 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (P) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (P) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (P) */
+    { false, 5, 1 }, /* edge 3 of hex 4 (P) */
+    { false, 5, 0 }, /* edge 4 of hex 4 (P) */
+    { false, 4, 4 }, /* edge 5 of hex 4 (P) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 4, 3 }, /* edge 3 of hex 5 (D) */
+    { false, 4, 2 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (J) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (J) */
+    { false, 4, 1 }, /* edge 2 of hex 6 (J) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (J) */
+    { false, 3, 4 }, /* edge 4 of hex 6 (J) */
+    { false, 3, 3 }, /* edge 5 of hex 6 (J) */
+};
+static const struct MapEdge hexedges_G[] = {
+    {  0, 2 },
+    {  2, 3 },
+    {  5, 3 },
+    {  8, 5 },
+    { 13, 5 },
+    { 18, 2 },
+};
+static const struct MapEntry hexin_G[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 0 of edge 2 */
+    { true,  1, 5 }, /* subedge 1 of edge 2 */
+    { true,  1, 4 }, /* subedge 2 of edge 2 */
+    { true,  1, 3 }, /* subedge 0 of edge 3 */
+    { true,  1, 2 }, /* subedge 1 of edge 3 */
+    { true,  3, 3 }, /* subedge 2 of edge 3 */
+    { true,  6, 5 }, /* subedge 3 of edge 3 */
+    { true,  6, 4 }, /* subedge 4 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  6, 2 }, /* subedge 1 of edge 4 */
+    { true,  5, 4 }, /* subedge 2 of edge 4 */
+    { true,  5, 3 }, /* subedge 3 of edge 4 */
+    { true,  4, 5 }, /* subedge 4 of edge 4 */
+    { true,  4, 4 }, /* subedge 0 of edge 5 */
+    { true,  4, 3 }, /* subedge 1 of edge 5 */
+};
+static const struct MapEntry hexmap_D[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 1, 3 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (P) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (P) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (P) */
+    { false, 2, 1 }, /* edge 3 of hex 1 (P) */
+    { false, 2, 0 }, /* edge 4 of hex 1 (P) */
+    { false, 1, 4 }, /* edge 5 of hex 1 (P) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 2 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (X) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (X) */
+    { false, 0, 1 }, /* edge 2 of hex 4 (X) */
+    { false, 0, 0 }, /* edge 3 of hex 4 (X) */
+    { false, 5, 4 }, /* edge 4 of hex 4 (X) */
+    { false, 5, 3 }, /* edge 5 of hex 4 (X) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 2 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (X) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (X) */
+    { false, 5, 1 }, /* edge 2 of hex 7 (X) */
+    { false, 5, 0 }, /* edge 3 of hex 7 (X) */
+    { false, 4, 2 }, /* edge 4 of hex 7 (X) */
+    { false, 4, 1 }, /* edge 5 of hex 7 (X) */
+};
+static const struct MapEdge hexedges_D[] = {
+    {  0, 3 },
+    {  3, 5 },
+    {  8, 2 },
+    { 10, 4 },
+    { 14, 3 },
+    { 17, 5 },
+};
+static const struct MapEntry hexin_D[] = {
+    { true,  4, 3 }, /* subedge 0 of edge 0 */
+    { true,  4, 2 }, /* subedge 1 of edge 0 */
+    { true,  2, 1 }, /* subedge 2 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 3 of edge 1 */
+    { true,  1, 5 }, /* subedge 4 of edge 1 */
+    { true,  1, 4 }, /* subedge 0 of edge 2 */
+    { true,  1, 3 }, /* subedge 1 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  7, 5 }, /* subedge 1 of edge 4 */
+    { true,  7, 4 }, /* subedge 2 of edge 4 */
+    { true,  7, 3 }, /* subedge 0 of edge 5 */
+    { true,  7, 2 }, /* subedge 1 of edge 5 */
+    { true,  5, 3 }, /* subedge 2 of edge 5 */
+    { true,  4, 5 }, /* subedge 3 of edge 5 */
+    { true,  4, 4 }, /* subedge 4 of edge 5 */
+};
+static const struct MapEntry hexmap_J[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 1, 3 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (P) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (P) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (P) */
+    { false, 2, 1 }, /* edge 3 of hex 1 (P) */
+    { false, 2, 0 }, /* edge 4 of hex 1 (P) */
+    { false, 1, 4 }, /* edge 5 of hex 1 (P) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (Y) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (Y) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (Y) */
+    { false, 5, 4 }, /* edge 3 of hex 4 (Y) */
+    { false, 5, 3 }, /* edge 4 of hex 4 (Y) */
+    { false, 5, 2 }, /* edge 5 of hex 4 (Y) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 1 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 3, 4 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (P) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (P) */
+    { false, 5, 0 }, /* edge 2 of hex 7 (P) */
+    { false, 4, 1 }, /* edge 3 of hex 7 (P) */
+    { false, 4, 0 }, /* edge 4 of hex 7 (P) */
+    { false, 3, 5 }, /* edge 5 of hex 7 (P) */
+};
+static const struct MapEdge hexedges_J[] = {
+    {  0, 2 },
+    {  2, 5 },
+    {  7, 2 },
+    {  9, 6 },
+    { 15, 2 },
+    { 17, 5 },
+};
+static const struct MapEntry hexin_J[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 3 of edge 1 */
+    { true,  1, 5 }, /* subedge 4 of edge 1 */
+    { true,  1, 4 }, /* subedge 0 of edge 2 */
+    { true,  1, 3 }, /* subedge 1 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 4 of edge 3 */
+    { true,  7, 5 }, /* subedge 5 of edge 3 */
+    { true,  7, 4 }, /* subedge 0 of edge 4 */
+    { true,  7, 3 }, /* subedge 1 of edge 4 */
+    { true,  7, 2 }, /* subedge 0 of edge 5 */
+    { true,  5, 3 }, /* subedge 1 of edge 5 */
+    { true,  4, 5 }, /* subedge 2 of edge 5 */
+    { true,  4, 4 }, /* subedge 3 of edge 5 */
+    { true,  4, 3 }, /* subedge 4 of edge 5 */
+};
+static const struct MapEntry hexmap_L[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 1, 3 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (P) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (P) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (P) */
+    { false, 2, 1 }, /* edge 3 of hex 1 (P) */
+    { false, 2, 0 }, /* edge 4 of hex 1 (P) */
+    { false, 1, 4 }, /* edge 5 of hex 1 (P) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (Y) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (Y) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (Y) */
+    { false, 5, 5 }, /* edge 3 of hex 4 (Y) */
+    { false, 5, 4 }, /* edge 4 of hex 4 (Y) */
+    { false, 5, 3 }, /* edge 5 of hex 4 (Y) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 2 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (X) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (X) */
+    { false, 5, 1 }, /* edge 2 of hex 7 (X) */
+    { false, 5, 0 }, /* edge 3 of hex 7 (X) */
+    { false, 4, 2 }, /* edge 4 of hex 7 (X) */
+    { false, 4, 1 }, /* edge 5 of hex 7 (X) */
+};
+static const struct MapEdge hexedges_L[] = {
+    {  0, 2 },
+    {  2, 5 },
+    {  7, 2 },
+    {  9, 4 },
+    { 13, 3 },
+    { 16, 6 },
+};
+static const struct MapEntry hexin_L[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 3 of edge 1 */
+    { true,  1, 5 }, /* subedge 4 of edge 1 */
+    { true,  1, 4 }, /* subedge 0 of edge 2 */
+    { true,  1, 3 }, /* subedge 1 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  7, 5 }, /* subedge 1 of edge 4 */
+    { true,  7, 4 }, /* subedge 2 of edge 4 */
+    { true,  7, 3 }, /* subedge 0 of edge 5 */
+    { true,  7, 2 }, /* subedge 1 of edge 5 */
+    { true,  5, 3 }, /* subedge 2 of edge 5 */
+    { true,  4, 5 }, /* subedge 3 of edge 5 */
+    { true,  4, 4 }, /* subedge 4 of edge 5 */
+    { true,  4, 3 }, /* subedge 5 of edge 5 */
+};
+static const struct MapEntry hexmap_X[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 2, 0 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (Y) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (Y) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (Y) */
+    { false, 2, 3 }, /* edge 3 of hex 1 (Y) */
+    { false, 2, 2 }, /* edge 4 of hex 1 (Y) */
+    { false, 2, 1 }, /* edge 5 of hex 1 (Y) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (Y) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (Y) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (Y) */
+    { false, 5, 4 }, /* edge 3 of hex 4 (Y) */
+    { false, 5, 3 }, /* edge 4 of hex 4 (Y) */
+    { false, 5, 2 }, /* edge 5 of hex 4 (Y) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 1 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 3, 4 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (P) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (P) */
+    { false, 5, 0 }, /* edge 2 of hex 7 (P) */
+    { false, 4, 1 }, /* edge 3 of hex 7 (P) */
+    { false, 4, 0 }, /* edge 4 of hex 7 (P) */
+    { false, 3, 5 }, /* edge 5 of hex 7 (P) */
+};
+static const struct MapEdge hexedges_X[] = {
+    {  0, 2 },
+    {  2, 3 },
+    {  5, 4 },
+    {  9, 6 },
+    { 15, 2 },
+    { 17, 5 },
+};
+static const struct MapEntry hexin_X[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 0 of edge 2 */
+    { true,  1, 5 }, /* subedge 1 of edge 2 */
+    { true,  1, 4 }, /* subedge 2 of edge 2 */
+    { true,  1, 3 }, /* subedge 3 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 4 of edge 3 */
+    { true,  7, 5 }, /* subedge 5 of edge 3 */
+    { true,  7, 4 }, /* subedge 0 of edge 4 */
+    { true,  7, 3 }, /* subedge 1 of edge 4 */
+    { true,  7, 2 }, /* subedge 0 of edge 5 */
+    { true,  5, 3 }, /* subedge 1 of edge 5 */
+    { true,  4, 5 }, /* subedge 2 of edge 5 */
+    { true,  4, 4 }, /* subedge 3 of edge 5 */
+    { true,  4, 3 }, /* subedge 4 of edge 5 */
+};
+static const struct MapEntry hexmap_P[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 2, 0 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (Y) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (Y) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (Y) */
+    { false, 2, 3 }, /* edge 3 of hex 1 (Y) */
+    { false, 2, 2 }, /* edge 4 of hex 1 (Y) */
+    { false, 2, 1 }, /* edge 5 of hex 1 (Y) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (Y) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (Y) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (Y) */
+    { false, 5, 5 }, /* edge 3 of hex 4 (Y) */
+    { false, 5, 4 }, /* edge 4 of hex 4 (Y) */
+    { false, 5, 3 }, /* edge 5 of hex 4 (Y) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 2 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (X) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (X) */
+    { false, 5, 1 }, /* edge 2 of hex 7 (X) */
+    { false, 5, 0 }, /* edge 3 of hex 7 (X) */
+    { false, 4, 2 }, /* edge 4 of hex 7 (X) */
+    { false, 4, 1 }, /* edge 5 of hex 7 (X) */
+};
+static const struct MapEdge hexedges_P[] = {
+    {  0, 2 },
+    {  2, 3 },
+    {  5, 4 },
+    {  9, 4 },
+    { 13, 3 },
+    { 16, 6 },
+};
+static const struct MapEntry hexin_P[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 0 of edge 2 */
+    { true,  1, 5 }, /* subedge 1 of edge 2 */
+    { true,  1, 4 }, /* subedge 2 of edge 2 */
+    { true,  1, 3 }, /* subedge 3 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  7, 5 }, /* subedge 1 of edge 4 */
+    { true,  7, 4 }, /* subedge 2 of edge 4 */
+    { true,  7, 3 }, /* subedge 0 of edge 5 */
+    { true,  7, 2 }, /* subedge 1 of edge 5 */
+    { true,  5, 3 }, /* subedge 2 of edge 5 */
+    { true,  4, 5 }, /* subedge 3 of edge 5 */
+    { true,  4, 4 }, /* subedge 4 of edge 5 */
+    { true,  4, 3 }, /* subedge 5 of edge 5 */
+};
+static const struct MapEntry hexmap_S[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (L) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (L) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (L) */
+    { false, 1, 1 }, /* edge 3 of hex 0 (L) */
+    { false, 1, 0 }, /* edge 4 of hex 0 (L) */
+    { false, 0, 4 }, /* edge 5 of hex 0 (L) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (P) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (P) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (P) */
+    { false, 2, 1 }, /* edge 3 of hex 1 (P) */
+    { false, 2, 0 }, /* edge 4 of hex 1 (P) */
+    { false, 1, 2 }, /* edge 5 of hex 1 (P) */
+    { false, 0, 3 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 2 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (X) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (X) */
+    { false, 0, 1 }, /* edge 2 of hex 4 (X) */
+    { false, 0, 0 }, /* edge 3 of hex 4 (X) */
+    { false, 5, 4 }, /* edge 4 of hex 4 (X) */
+    { false, 5, 3 }, /* edge 5 of hex 4 (X) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 2 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (X) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (X) */
+    { false, 5, 1 }, /* edge 2 of hex 7 (X) */
+    { false, 5, 0 }, /* edge 3 of hex 7 (X) */
+    { false, 4, 2 }, /* edge 4 of hex 7 (X) */
+    { false, 4, 1 }, /* edge 5 of hex 7 (X) */
+};
+static const struct MapEdge hexedges_S[] = {
+    {  0, 5 },
+    {  5, 3 },
+    {  8, 2 },
+    { 10, 4 },
+    { 14, 3 },
+    { 17, 5 },
+};
+static const struct MapEntry hexin_S[] = {
+    { true,  4, 3 }, /* subedge 0 of edge 0 */
+    { true,  4, 2 }, /* subedge 1 of edge 0 */
+    { true,  2, 1 }, /* subedge 2 of edge 0 */
+    { true,  2, 0 }, /* subedge 3 of edge 0 */
+    { true,  0, 5 }, /* subedge 4 of edge 0 */
+    { true,  0, 4 }, /* subedge 0 of edge 1 */
+    { true,  0, 3 }, /* subedge 1 of edge 1 */
+    { true,  1, 5 }, /* subedge 2 of edge 1 */
+    { true,  1, 4 }, /* subedge 0 of edge 2 */
+    { true,  1, 3 }, /* subedge 1 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  7, 5 }, /* subedge 1 of edge 4 */
+    { true,  7, 4 }, /* subedge 2 of edge 4 */
+    { true,  7, 3 }, /* subedge 0 of edge 5 */
+    { true,  7, 2 }, /* subedge 1 of edge 5 */
+    { true,  5, 3 }, /* subedge 2 of edge 5 */
+    { true,  4, 5 }, /* subedge 3 of edge 5 */
+    { true,  4, 4 }, /* subedge 4 of edge 5 */
+};
+static const struct MapEntry hexmap_F[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 1, 3 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (P) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (P) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (P) */
+    { false, 2, 1 }, /* edge 3 of hex 1 (P) */
+    { false, 2, 0 }, /* edge 4 of hex 1 (P) */
+    { false, 1, 4 }, /* edge 5 of hex 1 (P) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (Y) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (Y) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (Y) */
+    { false, 5, 4 }, /* edge 3 of hex 4 (Y) */
+    { false, 5, 3 }, /* edge 4 of hex 4 (Y) */
+    { false, 5, 2 }, /* edge 5 of hex 4 (Y) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 1 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (Y) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (Y) */
+    { false, 5, 0 }, /* edge 2 of hex 7 (Y) */
+    { false, 4, 3 }, /* edge 3 of hex 7 (Y) */
+    { false, 4, 2 }, /* edge 4 of hex 7 (Y) */
+    { false, 4, 1 }, /* edge 5 of hex 7 (Y) */
+};
+static const struct MapEdge hexedges_F[] = {
+    {  0, 2 },
+    {  2, 5 },
+    {  7, 2 },
+    {  9, 4 },
+    { 13, 4 },
+    { 17, 5 },
+};
+static const struct MapEntry hexin_F[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 3 of edge 1 */
+    { true,  1, 5 }, /* subedge 4 of edge 1 */
+    { true,  1, 4 }, /* subedge 0 of edge 2 */
+    { true,  1, 3 }, /* subedge 1 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  7, 5 }, /* subedge 1 of edge 4 */
+    { true,  7, 4 }, /* subedge 2 of edge 4 */
+    { true,  7, 3 }, /* subedge 3 of edge 4 */
+    { true,  7, 2 }, /* subedge 0 of edge 5 */
+    { true,  5, 3 }, /* subedge 1 of edge 5 */
+    { true,  4, 5 }, /* subedge 2 of edge 5 */
+    { true,  4, 4 }, /* subedge 3 of edge 5 */
+    { true,  4, 3 }, /* subedge 4 of edge 5 */
+};
+static const struct MapEntry hexmap_Y[] = {
+    { true,  2, 5 }, /* edge 0 of hex 0 (F) */
+    { true,  3, 5 }, /* edge 1 of hex 0 (F) */
+    { true,  1, 0 }, /* edge 2 of hex 0 (F) */
+    { false, 2, 0 }, /* edge 3 of hex 0 (F) */
+    { false, 1, 2 }, /* edge 4 of hex 0 (F) */
+    { false, 1, 1 }, /* edge 5 of hex 0 (F) */
+    { true,  0, 2 }, /* edge 0 of hex 1 (Y) */
+    { true,  3, 4 }, /* edge 1 of hex 1 (Y) */
+    { false, 3, 0 }, /* edge 2 of hex 1 (Y) */
+    { false, 2, 3 }, /* edge 3 of hex 1 (Y) */
+    { false, 2, 2 }, /* edge 4 of hex 1 (Y) */
+    { false, 2, 1 }, /* edge 5 of hex 1 (Y) */
+    { false, 1, 0 }, /* edge 0 of hex 2 (G) */
+    { false, 0, 1 }, /* edge 1 of hex 2 (G) */
+    { true,  4, 1 }, /* edge 2 of hex 2 (G) */
+    { true,  5, 1 }, /* edge 3 of hex 2 (G) */
+    { true,  3, 0 }, /* edge 4 of hex 2 (G) */
+    { true,  0, 0 }, /* edge 5 of hex 2 (G) */
+    { true,  2, 4 }, /* edge 0 of hex 3 (S) */
+    { true,  5, 0 }, /* edge 1 of hex 3 (S) */
+    { true,  6, 0 }, /* edge 2 of hex 3 (S) */
+    { false, 3, 1 }, /* edge 3 of hex 3 (S) */
+    { true,  1, 1 }, /* edge 4 of hex 3 (S) */
+    { true,  0, 1 }, /* edge 5 of hex 3 (S) */
+    { true,  5, 2 }, /* edge 0 of hex 4 (Y) */
+    { true,  2, 2 }, /* edge 1 of hex 4 (Y) */
+    { false, 0, 0 }, /* edge 2 of hex 4 (Y) */
+    { false, 5, 4 }, /* edge 3 of hex 4 (Y) */
+    { false, 5, 3 }, /* edge 4 of hex 4 (Y) */
+    { false, 5, 2 }, /* edge 5 of hex 4 (Y) */
+    { true,  3, 1 }, /* edge 0 of hex 5 (D) */
+    { true,  2, 3 }, /* edge 1 of hex 5 (D) */
+    { true,  4, 0 }, /* edge 2 of hex 5 (D) */
+    { false, 5, 1 }, /* edge 3 of hex 5 (D) */
+    { true,  7, 1 }, /* edge 4 of hex 5 (D) */
+    { true,  6, 1 }, /* edge 5 of hex 5 (D) */
+    { true,  3, 2 }, /* edge 0 of hex 6 (F) */
+    { true,  5, 5 }, /* edge 1 of hex 6 (F) */
+    { true,  7, 0 }, /* edge 2 of hex 6 (F) */
+    { false, 4, 0 }, /* edge 3 of hex 6 (F) */
+    { false, 3, 3 }, /* edge 4 of hex 6 (F) */
+    { false, 3, 2 }, /* edge 5 of hex 6 (F) */
+    { true,  6, 2 }, /* edge 0 of hex 7 (Y) */
+    { true,  5, 4 }, /* edge 1 of hex 7 (Y) */
+    { false, 5, 0 }, /* edge 2 of hex 7 (Y) */
+    { false, 4, 3 }, /* edge 3 of hex 7 (Y) */
+    { false, 4, 2 }, /* edge 4 of hex 7 (Y) */
+    { false, 4, 1 }, /* edge 5 of hex 7 (Y) */
+};
+static const struct MapEdge hexedges_Y[] = {
+    {  0, 2 },
+    {  2, 3 },
+    {  5, 4 },
+    {  9, 4 },
+    { 13, 4 },
+    { 17, 5 },
+};
+static const struct MapEntry hexin_Y[] = {
+    { true,  4, 2 }, /* subedge 0 of edge 0 */
+    { true,  2, 1 }, /* subedge 1 of edge 0 */
+    { true,  2, 0 }, /* subedge 0 of edge 1 */
+    { true,  0, 5 }, /* subedge 1 of edge 1 */
+    { true,  0, 4 }, /* subedge 2 of edge 1 */
+    { true,  0, 3 }, /* subedge 0 of edge 2 */
+    { true,  1, 5 }, /* subedge 1 of edge 2 */
+    { true,  1, 4 }, /* subedge 2 of edge 2 */
+    { true,  1, 3 }, /* subedge 3 of edge 2 */
+    { true,  1, 2 }, /* subedge 0 of edge 3 */
+    { true,  3, 3 }, /* subedge 1 of edge 3 */
+    { true,  6, 5 }, /* subedge 2 of edge 3 */
+    { true,  6, 4 }, /* subedge 3 of edge 3 */
+    { true,  6, 3 }, /* subedge 0 of edge 4 */
+    { true,  7, 5 }, /* subedge 1 of edge 4 */
+    { true,  7, 4 }, /* subedge 2 of edge 4 */
+    { true,  7, 3 }, /* subedge 3 of edge 4 */
+    { true,  7, 2 }, /* subedge 0 of edge 5 */
+    { true,  5, 3 }, /* subedge 1 of edge 5 */
+    { true,  4, 5 }, /* subedge 2 of edge 5 */
+    { true,  4, 4 }, /* subedge 3 of edge 5 */
+    { true,  4, 3 }, /* subedge 4 of edge 5 */
+};
+static const struct MapEntry specmap_G[] = {
+    { false, 2,  2 }, /* edge  0 of Spectre 0 */
+    { false, 2,  1 }, /* edge  1 of Spectre 0 */
+    { false, 2,  0 }, /* edge  2 of Spectre 0 */
+    { false, 1,  2 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  2 }, /* edge  9 of Spectre 0 */
+    { true,  1,  7 }, /* edge 10 of Spectre 0 */
+    { true,  1,  6 }, /* edge 11 of Spectre 0 */
+    { true,  1,  5 }, /* edge 12 of Spectre 0 */
+    { true,  1,  4 }, /* edge 13 of Spectre 0 */
+    { false, 4,  1 }, /* edge  0 of Spectre 1 */
+    { false, 4,  0 }, /* edge  1 of Spectre 1 */
+    { false, 3,  1 }, /* edge  2 of Spectre 1 */
+    { false, 3,  0 }, /* edge  3 of Spectre 1 */
+    { true,  0, 13 }, /* edge  4 of Spectre 1 */
+    { true,  0, 12 }, /* edge  5 of Spectre 1 */
+    { true,  0, 11 }, /* edge  6 of Spectre 1 */
+    { true,  0, 10 }, /* edge  7 of Spectre 1 */
+    { false, 5,  1 }, /* edge  8 of Spectre 1 */
+    { false, 5,  0 }, /* edge  9 of Spectre 1 */
+    { false, 4,  5 }, /* edge 10 of Spectre 1 */
+    { false, 4,  4 }, /* edge 11 of Spectre 1 */
+    { false, 4,  3 }, /* edge 12 of Spectre 1 */
+    { false, 4,  2 }, /* edge 13 of Spectre 1 */
+};
+static const struct MapEdge specedges_G[] = {
+    {  0, 3 },
+    {  3, 3 },
+    {  6, 3 },
+    {  9, 2 },
+    { 11, 6 },
+    { 17, 3 },
+};
+static const struct MapEntry specin_G[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 2 of edge 1 */
+    { true,  0,  2 }, /* subedge 0 of edge 2 */
+    { true,  0,  1 }, /* subedge 1 of edge 2 */
+    { true,  0,  0 }, /* subedge 2 of edge 2 */
+    { true,  1,  3 }, /* subedge 0 of edge 3 */
+    { true,  1,  2 }, /* subedge 1 of edge 3 */
+    { true,  1,  1 }, /* subedge 0 of edge 4 */
+    { true,  1,  0 }, /* subedge 1 of edge 4 */
+    { true,  1, 13 }, /* subedge 2 of edge 4 */
+    { true,  1, 12 }, /* subedge 3 of edge 4 */
+    { true,  1, 11 }, /* subedge 4 of edge 4 */
+    { true,  1, 10 }, /* subedge 5 of edge 4 */
+    { true,  1,  9 }, /* subedge 0 of edge 5 */
+    { true,  1,  8 }, /* subedge 1 of edge 5 */
+    { true,  0,  9 }, /* subedge 2 of edge 5 */
+};
+static const struct MapEntry specmap_D[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  2 }, /* edge  1 of Spectre 0 */
+    { false, 2,  1 }, /* edge  2 of Spectre 0 */
+    { false, 2,  0 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  1 }, /* edge  6 of Spectre 0 */
+    { false, 0,  0 }, /* edge  7 of Spectre 0 */
+    { false, 5,  1 }, /* edge  8 of Spectre 0 */
+    { false, 5,  0 }, /* edge  9 of Spectre 0 */
+    { false, 4,  2 }, /* edge 10 of Spectre 0 */
+    { false, 4,  1 }, /* edge 11 of Spectre 0 */
+    { false, 4,  0 }, /* edge 12 of Spectre 0 */
+    { false, 3,  1 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_D[] = {
+    {  0, 2 },
+    {  2, 2 },
+    {  4, 3 },
+    {  7, 2 },
+    {  9, 3 },
+    { 12, 2 },
+};
+static const struct MapEntry specin_D[] = {
+    { true,  0,  7 }, /* subedge 0 of edge 0 */
+    { true,  0,  6 }, /* subedge 1 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 0 of edge 2 */
+    { true,  0,  2 }, /* subedge 1 of edge 2 */
+    { true,  0,  1 }, /* subedge 2 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 1 of edge 3 */
+    { true,  0, 12 }, /* subedge 0 of edge 4 */
+    { true,  0, 11 }, /* subedge 1 of edge 4 */
+    { true,  0, 10 }, /* subedge 2 of edge 4 */
+    { true,  0,  9 }, /* subedge 0 of edge 5 */
+    { true,  0,  8 }, /* subedge 1 of edge 5 */
+};
+static const struct MapEntry specmap_J[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  2 }, /* edge  1 of Spectre 0 */
+    { false, 2,  1 }, /* edge  2 of Spectre 0 */
+    { false, 2,  0 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  1 }, /* edge  9 of Spectre 0 */
+    { false, 5,  0 }, /* edge 10 of Spectre 0 */
+    { false, 4,  2 }, /* edge 11 of Spectre 0 */
+    { false, 4,  1 }, /* edge 12 of Spectre 0 */
+    { false, 4,  0 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_J[] = {
+    {  0, 3 },
+    {  3, 2 },
+    {  5, 3 },
+    {  8, 1 },
+    {  9, 3 },
+    { 12, 2 },
+};
+static const struct MapEntry specin_J[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 0 of edge 2 */
+    { true,  0,  2 }, /* subedge 1 of edge 2 */
+    { true,  0,  1 }, /* subedge 2 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 0 of edge 4 */
+    { true,  0, 12 }, /* subedge 1 of edge 4 */
+    { true,  0, 11 }, /* subedge 2 of edge 4 */
+    { true,  0, 10 }, /* subedge 0 of edge 5 */
+    { true,  0,  9 }, /* subedge 1 of edge 5 */
+};
+static const struct MapEntry specmap_L[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  2 }, /* edge  1 of Spectre 0 */
+    { false, 2,  1 }, /* edge  2 of Spectre 0 */
+    { false, 2,  0 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  0 }, /* edge  9 of Spectre 0 */
+    { false, 4,  2 }, /* edge 10 of Spectre 0 */
+    { false, 4,  1 }, /* edge 11 of Spectre 0 */
+    { false, 4,  0 }, /* edge 12 of Spectre 0 */
+    { false, 3,  1 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_L[] = {
+    {  0, 3 },
+    {  3, 2 },
+    {  5, 3 },
+    {  8, 2 },
+    { 10, 3 },
+    { 13, 1 },
+};
+static const struct MapEntry specin_L[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 0 of edge 2 */
+    { true,  0,  2 }, /* subedge 1 of edge 2 */
+    { true,  0,  1 }, /* subedge 2 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 1 of edge 3 */
+    { true,  0, 12 }, /* subedge 0 of edge 4 */
+    { true,  0, 11 }, /* subedge 1 of edge 4 */
+    { true,  0, 10 }, /* subedge 2 of edge 4 */
+    { true,  0,  9 }, /* subedge 0 of edge 5 */
+};
+static const struct MapEntry specmap_X[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  1 }, /* edge  1 of Spectre 0 */
+    { false, 2,  0 }, /* edge  2 of Spectre 0 */
+    { false, 1,  2 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  1 }, /* edge  9 of Spectre 0 */
+    { false, 5,  0 }, /* edge 10 of Spectre 0 */
+    { false, 4,  2 }, /* edge 11 of Spectre 0 */
+    { false, 4,  1 }, /* edge 12 of Spectre 0 */
+    { false, 4,  0 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_X[] = {
+    {  0, 3 },
+    {  3, 3 },
+    {  6, 2 },
+    {  8, 1 },
+    {  9, 3 },
+    { 12, 2 },
+};
+static const struct MapEntry specin_X[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 2 of edge 1 */
+    { true,  0,  2 }, /* subedge 0 of edge 2 */
+    { true,  0,  1 }, /* subedge 1 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 0 of edge 4 */
+    { true,  0, 12 }, /* subedge 1 of edge 4 */
+    { true,  0, 11 }, /* subedge 2 of edge 4 */
+    { true,  0, 10 }, /* subedge 0 of edge 5 */
+    { true,  0,  9 }, /* subedge 1 of edge 5 */
+};
+static const struct MapEntry specmap_P[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  1 }, /* edge  1 of Spectre 0 */
+    { false, 2,  0 }, /* edge  2 of Spectre 0 */
+    { false, 1,  2 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  0 }, /* edge  9 of Spectre 0 */
+    { false, 4,  2 }, /* edge 10 of Spectre 0 */
+    { false, 4,  1 }, /* edge 11 of Spectre 0 */
+    { false, 4,  0 }, /* edge 12 of Spectre 0 */
+    { false, 3,  1 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_P[] = {
+    {  0, 3 },
+    {  3, 3 },
+    {  6, 2 },
+    {  8, 2 },
+    { 10, 3 },
+    { 13, 1 },
+};
+static const struct MapEntry specin_P[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 2 of edge 1 */
+    { true,  0,  2 }, /* subedge 0 of edge 2 */
+    { true,  0,  1 }, /* subedge 1 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 1 of edge 3 */
+    { true,  0, 12 }, /* subedge 0 of edge 4 */
+    { true,  0, 11 }, /* subedge 1 of edge 4 */
+    { true,  0, 10 }, /* subedge 2 of edge 4 */
+    { true,  0,  9 }, /* subedge 0 of edge 5 */
+};
+static const struct MapEntry specmap_S[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  2 }, /* edge  1 of Spectre 0 */
+    { false, 2,  1 }, /* edge  2 of Spectre 0 */
+    { false, 2,  0 }, /* edge  3 of Spectre 0 */
+    { false, 0,  3 }, /* edge  4 of Spectre 0 */
+    { false, 0,  2 }, /* edge  5 of Spectre 0 */
+    { false, 0,  1 }, /* edge  6 of Spectre 0 */
+    { false, 0,  0 }, /* edge  7 of Spectre 0 */
+    { false, 5,  1 }, /* edge  8 of Spectre 0 */
+    { false, 5,  0 }, /* edge  9 of Spectre 0 */
+    { false, 4,  2 }, /* edge 10 of Spectre 0 */
+    { false, 4,  1 }, /* edge 11 of Spectre 0 */
+    { false, 4,  0 }, /* edge 12 of Spectre 0 */
+    { false, 3,  1 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_S[] = {
+    {  0, 6 },
+    {  6, 2 },
+    {  8, 3 },
+    { 11, 2 },
+    { 13, 3 },
+    { 16, 2 },
+};
+static const struct MapEntry specin_S[] = {
+    { true,  0,  7 }, /* subedge 0 of edge 0 */
+    { true,  0,  6 }, /* subedge 1 of edge 0 */
+    { true,  0,  5 }, /* subedge 2 of edge 0 */
+    { true,  0,  4 }, /* subedge 3 of edge 0 */
+    { false, 1,  1 }, /* subedge 4 of edge 0 */
+    { false, 1,  0 }, /* subedge 5 of edge 0 */
+    { false, 0,  5 }, /* subedge 0 of edge 1 */
+    { false, 0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 0 of edge 2 */
+    { true,  0,  2 }, /* subedge 1 of edge 2 */
+    { true,  0,  1 }, /* subedge 2 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 1 of edge 3 */
+    { true,  0, 12 }, /* subedge 0 of edge 4 */
+    { true,  0, 11 }, /* subedge 1 of edge 4 */
+    { true,  0, 10 }, /* subedge 2 of edge 4 */
+    { true,  0,  9 }, /* subedge 0 of edge 5 */
+    { true,  0,  8 }, /* subedge 1 of edge 5 */
+};
+static const struct MapEntry specmap_F[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  2 }, /* edge  1 of Spectre 0 */
+    { false, 2,  1 }, /* edge  2 of Spectre 0 */
+    { false, 2,  0 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  1 }, /* edge  9 of Spectre 0 */
+    { false, 5,  0 }, /* edge 10 of Spectre 0 */
+    { false, 4,  1 }, /* edge 11 of Spectre 0 */
+    { false, 4,  0 }, /* edge 12 of Spectre 0 */
+    { false, 3,  1 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_F[] = {
+    {  0, 3 },
+    {  3, 2 },
+    {  5, 3 },
+    {  8, 2 },
+    { 10, 2 },
+    { 12, 2 },
+};
+static const struct MapEntry specin_F[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 0 of edge 2 */
+    { true,  0,  2 }, /* subedge 1 of edge 2 */
+    { true,  0,  1 }, /* subedge 2 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 1 of edge 3 */
+    { true,  0, 12 }, /* subedge 0 of edge 4 */
+    { true,  0, 11 }, /* subedge 1 of edge 4 */
+    { true,  0, 10 }, /* subedge 0 of edge 5 */
+    { true,  0,  9 }, /* subedge 1 of edge 5 */
+};
+static const struct MapEntry specmap_Y[] = {
+    { false, 3,  0 }, /* edge  0 of Spectre 0 */
+    { false, 2,  1 }, /* edge  1 of Spectre 0 */
+    { false, 2,  0 }, /* edge  2 of Spectre 0 */
+    { false, 1,  2 }, /* edge  3 of Spectre 0 */
+    { false, 1,  1 }, /* edge  4 of Spectre 0 */
+    { false, 1,  0 }, /* edge  5 of Spectre 0 */
+    { false, 0,  2 }, /* edge  6 of Spectre 0 */
+    { false, 0,  1 }, /* edge  7 of Spectre 0 */
+    { false, 0,  0 }, /* edge  8 of Spectre 0 */
+    { false, 5,  1 }, /* edge  9 of Spectre 0 */
+    { false, 5,  0 }, /* edge 10 of Spectre 0 */
+    { false, 4,  1 }, /* edge 11 of Spectre 0 */
+    { false, 4,  0 }, /* edge 12 of Spectre 0 */
+    { false, 3,  1 }, /* edge 13 of Spectre 0 */
+};
+static const struct MapEdge specedges_Y[] = {
+    {  0, 3 },
+    {  3, 3 },
+    {  6, 2 },
+    {  8, 2 },
+    { 10, 2 },
+    { 12, 2 },
+};
+static const struct MapEntry specin_Y[] = {
+    { true,  0,  8 }, /* subedge 0 of edge 0 */
+    { true,  0,  7 }, /* subedge 1 of edge 0 */
+    { true,  0,  6 }, /* subedge 2 of edge 0 */
+    { true,  0,  5 }, /* subedge 0 of edge 1 */
+    { true,  0,  4 }, /* subedge 1 of edge 1 */
+    { true,  0,  3 }, /* subedge 2 of edge 1 */
+    { true,  0,  2 }, /* subedge 0 of edge 2 */
+    { true,  0,  1 }, /* subedge 1 of edge 2 */
+    { true,  0,  0 }, /* subedge 0 of edge 3 */
+    { true,  0, 13 }, /* subedge 1 of edge 3 */
+    { true,  0, 12 }, /* subedge 0 of edge 4 */
+    { true,  0, 11 }, /* subedge 1 of edge 4 */
+    { true,  0, 10 }, /* subedge 0 of edge 5 */
+    { true,  0,  9 }, /* subedge 1 of edge 5 */
+};
+static const struct Possibility poss_G[] = {
+    { HEX_G, 2, PROB_G },
+    { HEX_D, 2, PROB_D },
+    { HEX_J, 2, PROB_J },
+    { HEX_L, 2, PROB_L },
+    { HEX_X, 2, PROB_X },
+    { HEX_P, 2, PROB_P },
+    { HEX_S, 2, PROB_S },
+    { HEX_F, 2, PROB_F },
+    { HEX_Y, 2, PROB_Y },
+};
+static const struct Possibility poss_D[] = {
+    { HEX_G, 5, PROB_G },
+    { HEX_D, 5, PROB_D },
+    { HEX_J, 5, PROB_J },
+    { HEX_L, 5, PROB_L },
+    { HEX_X, 5, PROB_X },
+    { HEX_P, 5, PROB_P },
+    { HEX_S, 5, PROB_S },
+    { HEX_F, 5, PROB_F },
+    { HEX_Y, 5, PROB_Y },
+};
+static const struct Possibility poss_J[] = {
+    { HEX_G, 6, PROB_G },
+};
+static const struct Possibility poss_L[] = {
+    { HEX_S, 0, PROB_S },
+};
+static const struct Possibility poss_X[] = {
+    { HEX_G, 1, PROB_G },
+    { HEX_D, 4, PROB_D },
+    { HEX_D, 7, PROB_D },
+    { HEX_L, 7, PROB_L },
+    { HEX_P, 7, PROB_P },
+    { HEX_S, 4, PROB_S },
+    { HEX_S, 7, PROB_S },
+};
+static const struct Possibility poss_P[] = {
+    { HEX_G, 4, PROB_G },
+    { HEX_D, 1, PROB_D },
+    { HEX_J, 1, PROB_J },
+    { HEX_J, 7, PROB_J },
+    { HEX_L, 1, PROB_L },
+    { HEX_X, 7, PROB_X },
+    { HEX_S, 1, PROB_S },
+    { HEX_F, 1, PROB_F },
+};
+static const struct Possibility poss_S[] = {
+    { HEX_G, 3, PROB_G },
+    { HEX_D, 3, PROB_D },
+    { HEX_J, 3, PROB_J },
+    { HEX_L, 3, PROB_L },
+    { HEX_X, 3, PROB_X },
+    { HEX_P, 3, PROB_P },
+    { HEX_S, 3, PROB_S },
+    { HEX_F, 3, PROB_F },
+    { HEX_Y, 3, PROB_Y },
+};
+static const struct Possibility poss_F[] = {
+    { HEX_G, 0, PROB_G },
+    { HEX_D, 0, PROB_D },
+    { HEX_D, 6, PROB_D },
+    { HEX_J, 0, PROB_J },
+    { HEX_J, 6, PROB_J },
+    { HEX_L, 0, PROB_L },
+    { HEX_L, 6, PROB_L },
+    { HEX_X, 0, PROB_X },
+    { HEX_X, 6, PROB_X },
+    { HEX_P, 0, PROB_P },
+    { HEX_P, 6, PROB_P },
+    { HEX_S, 6, PROB_S },
+    { HEX_F, 0, PROB_F },
+    { HEX_F, 6, PROB_F },
+    { HEX_Y, 0, PROB_Y },
+    { HEX_Y, 6, PROB_Y },
+};
+static const struct Possibility poss_Y[] = {
+    { HEX_J, 4, PROB_J },
+    { HEX_L, 4, PROB_L },
+    { HEX_X, 1, PROB_X },
+    { HEX_X, 4, PROB_X },
+    { HEX_P, 1, PROB_P },
+    { HEX_P, 4, PROB_P },
+    { HEX_F, 4, PROB_F },
+    { HEX_F, 7, PROB_F },
+    { HEX_Y, 1, PROB_Y },
+    { HEX_Y, 4, PROB_Y },
+    { HEX_Y, 7, PROB_Y },
+};
+static const struct Possibility poss_spectre[] = {
+    { HEX_G, 0, PROB_G },
+    { HEX_G, 1, PROB_G },
+    { HEX_D, 0, PROB_D },
+    { HEX_J, 0, PROB_J },
+    { HEX_L, 0, PROB_L },
+    { HEX_X, 0, PROB_X },
+    { HEX_P, 0, PROB_P },
+    { HEX_S, 0, PROB_S },
+    { HEX_F, 0, PROB_F },
+    { HEX_Y, 0, PROB_Y },
+};
diff --git a/apps/plugins/puzzles/src/spectre-tables-manual.h b/apps/plugins/puzzles/src/spectre-tables-manual.h
new file mode 100644
index 0000000000..d57e6597dd
--- /dev/null
+++ b/apps/plugins/puzzles/src/spectre-tables-manual.h
@@ -0,0 +1,160 @@
+/*
+ * Handwritten data tables for the Spectre tiling.
+ *
+ * This file is used by both the final tiling generator in spectre.c,
+ * and by spectre-gen.c which auto-generates further tables to go with
+ * these.
+ */
+
+/*
+ * We generate the Spectre tiling based on the substitution system of
+ * 9 types of marked hexagon shown in the paper.
+ *
+ * The substitution expands each hexagon into 8 others, except for the
+ * G hex which expands to only seven. The layout, numbered with the
+ * indices we use in the arrays here, is as follows:
+ *
+ *     0 1
+ *    2 3
+ *   4 5 6
+ *      7
+ *
+ * That is: the hexes are oriented with a pair of vertical edges.
+ * Hexes 0 and 1 are horizontally adjacent; 2 and 3 are adjacent on
+ * the next row, with 3 nestling between 0 and 1; 4,5,6 are on the
+ * third row with 5 between 2 and 3; and 7 is by itself on a fourth
+ * row, between 5 and 6. In the expansion of the G hex, #7 is the
+ * missing one, so its indices are still consecutive from 0.
+ *
+ * These arrays list the type of each child hex. The hexes also have
+ * orientations, but those aren't listed here, because only
+ * spectre-gen needs to know them - by the time it's finished
+ * autogenerating transition tables, the orientations are baked into
+ * those and don't need to be consulted separately.
+ */
+
+static const Hex subhexes_G[] = {
+    HEX_F,
+    HEX_X,
+    HEX_G,
+    HEX_S,
+    HEX_P,
+    HEX_D,
+    HEX_J,
+    /* hex #7 is not present for this tile */
+};
+static const Hex subhexes_D[] = {
+    HEX_F,
+    HEX_P,
+    HEX_G,
+    HEX_S,
+    HEX_X,
+    HEX_D,
+    HEX_F,
+    HEX_X,
+};
+static const Hex subhexes_J[] = {
+    HEX_F,
+    HEX_P,
+    HEX_G,
+    HEX_S,
+    HEX_Y,
+    HEX_D,
+    HEX_F,
+    HEX_P,
+};
+static const Hex subhexes_L[] = {
+    HEX_F,
+    HEX_P,
+    HEX_G,
+    HEX_S,
+    HEX_Y,
+    HEX_D,
+    HEX_F,
+    HEX_X,
+};
+static const Hex subhexes_X[] = {
+    HEX_F,
+    HEX_Y,
+    HEX_G,
+    HEX_S,
+    HEX_Y,
+    HEX_D,
+    HEX_F,
+    HEX_P,
+};
+static const Hex subhexes_P[] = {
+    HEX_F,
+    HEX_Y,
+    HEX_G,
+    HEX_S,
+    HEX_Y,
+    HEX_D,
+    HEX_F,
+    HEX_X,
+};
+static const Hex subhexes_S[] = {
+    HEX_L,
+    HEX_P,
+    HEX_G,
+    HEX_S,
+    HEX_X,
+    HEX_D,
+    HEX_F,
+    HEX_X,
+};
+static const Hex subhexes_F[] = {
+    HEX_F,
+    HEX_P,
+    HEX_G,
+    HEX_S,
+    HEX_Y,
+    HEX_D,
+    HEX_F,
+    HEX_Y,
+};
+static const Hex subhexes_Y[] = {
+    HEX_F,
+    HEX_Y,
+    HEX_G,
+    HEX_S,
+    HEX_Y,
+    HEX_D,
+    HEX_F,
+    HEX_Y,
+};
+
+/*
+ * Shape of the Spectre itself.
+ *
+ * Vertex 0 is taken to be at the top of the Spectre's "head"; vertex
+ * 1 is the adjacent vertex, in the direction of the shorter edge of
+ * its "cloak".
+ *
+ * This array indicates how far to turn at each vertex, in 1/12 turns.
+ * All edges are the same length (counting the double-edge as two
+ * edges, which we do).
+ */
+static const int spectre_angles[14] = {
+    -3, -2, 3, -2, -3, 2, -3, 2, -3, -2, 0, -2, 3, -2,
+};
+
+/*
+ * The relative probabilities of the nine hex types, in the limit, as
+ * the expansion process is iterated more and more times. Used to
+ * choose the initial hex coordinates as if the segment of tiling came
+ * from the limiting distribution across the whole plane.
+ *
+ * This is obtained by finding the matrix that says how many hexes of
+ * each type are expanded from each starting hex, and taking the
+ * eigenvector that goes with its limiting eigenvalue.
+ */
+#define PROB_G 10000000                /* 1 */
+#define PROB_D 10000000                /* 1 */
+#define PROB_J  1270167                /* 4 - sqrt(15) */
+#define PROB_L  1270167                /* 4 - sqrt(15) */
+#define PROB_X  7459667                /* 2 sqrt(15) - 7 */
+#define PROB_P  7459667                /* 2 sqrt(15) - 7 */
+#define PROB_S 10000000                /* 1 */
+#define PROB_F 17459667                /* 2 sqrt(15) - 6 */
+#define PROB_Y 13810500                /* 13 - 3 sqrt(15) */
diff --git a/apps/plugins/puzzles/src/spectre.c b/apps/plugins/puzzles/src/spectre.c
new file mode 100644
index 0000000000..ba72304ff2
--- /dev/null
+++ b/apps/plugins/puzzles/src/spectre.c
@@ -0,0 +1,599 @@
+/*
+ * Code to generate patches of the aperiodic 'spectre' tiling
+ * discovered in 2023.
+ *
+ * Resources about the tiling from its discoverers:
+ * https://cs.uwaterloo.ca/~csk/spectre/
+ * https://arxiv.org/abs/2305.17743
+ *
+ * Writeup of the generation algorithm:
+ * https://www.chiark.greenend.org.uk/~sgtatham/quasiblog/aperiodic-spectre/
+ */
+
+#include <assert.h>
+#include <string.h>
+
+#include "puzzles.h"
+#include "tree234.h"
+
+#include "spectre-internal.h"
+
+#include "spectre-tables-manual.h"
+#include "spectre-tables-auto.h"
+
+static const char *const letters =
+    #define STRINGIFY(x) #x
+    HEX_LETTERS(STRINGIFY)
+    #undef STRINGIFY
+    ;
+
+bool spectre_valid_hex_letter(char letter)
+{
+    return strchr(letters, letter) != NULL;
+}
+
+static Hex hex_from_letter(char letter)
+{
+    char buf[2];
+    buf[0] = letter;
+    buf[1] = '\0';
+    return strcspn(letters, buf);
+}
+
+static Hex hex_to_letter(unsigned char letter)
+{
+    return letters[letter];
+}
+
+struct HexData {
+    const struct MapEntry *hexmap, *hexin, *specmap, *specin;
+    const struct MapEdge *hexedges, *specedges;
+    const Hex *subhexes;
+    const struct Possibility *poss;
+    size_t nposs;
+};
+
+static const struct HexData hexdata[] = {
+    #define HEXDATA_ENTRY(x) { hexmap_##x, hexin_##x, specmap_##x, \
+            specin_##x, hexedges_##x, specedges_##x, subhexes_##x, \
+            poss_##x, lenof(poss_##x) },
+    HEX_LETTERS(HEXDATA_ENTRY)
+    #undef HEXDATA_ENTRY
+};
+
+static const struct Possibility *choose_poss(
+    random_state *rs, const struct Possibility *poss, size_t nposs)
+{
+    /*
+     * If we needed to do this _efficiently_, we'd rewrite all those
+     * tables above as cumulative frequency tables and use binary
+     * search. But this happens about log n times in a grid of area n,
+     * so it hardly matters, and it's easier to keep the tables
+     * legible.
+     */
+    unsigned long limit = 0, value;
+    size_t i;
+
+    for (i = 0; i < nposs; i++)
+        limit += poss[i].prob;
+
+    value = random_upto(rs, limit);
+
+    for (i = 0; i+1 < nposs; i++) {
+        if (value < poss[i].prob)
+            return &poss[i];
+        value -= poss[i].prob;
+    }
+
+    assert(i == nposs - 1);
+    assert(value < poss[i].prob);
+    return &poss[i];
+}
+
+SpectreCoords *spectre_coords_new(void)
+{
+    SpectreCoords *sc = snew(SpectreCoords);
+    sc->nc = sc->csize = 0;
+    sc->c = NULL;
+    return sc;
+}
+
+void spectre_coords_free(SpectreCoords *sc)
+{
+    if (sc) {
+        sfree(sc->c);
+        sfree(sc);
+    }
+}
+
+void spectre_coords_make_space(SpectreCoords *sc, size_t size)
+{
+    if (sc->csize < size) {
+        sc->csize = sc->csize * 5 / 4 + 16;
+        if (sc->csize < size)
+            sc->csize = size;
+        sc->c = sresize(sc->c, sc->csize, HexCoord);
+    }
+}
+
+SpectreCoords *spectre_coords_copy(SpectreCoords *sc_in)
+{
+    SpectreCoords *sc_out = spectre_coords_new();
+    spectre_coords_make_space(sc_out, sc_in->nc);
+    memcpy(sc_out->c, sc_in->c, sc_in->nc * sizeof(*sc_out->c));
+    sc_out->nc = sc_in->nc;
+    sc_out->index = sc_in->index;
+    sc_out->hex_colour = sc_in->hex_colour;
+    sc_out->prev_hex_colour = sc_in->prev_hex_colour;
+    sc_out->incoming_hex_edge = sc_in->incoming_hex_edge;
+    return sc_out;
+}
+
+void spectre_place(Spectre *spec, Point u, Point v, int index_of_u)
+{
+    size_t i;
+    Point disp;
+
+    /* Vector from u to v */
+    disp = point_sub(v, u);
+
+    for (i = 0; i < 14; i++) {
+        spec->vertices[(i + index_of_u) % 14] = u;
+        u = point_add(u, disp);
+        disp = point_mul(disp, point_rot(
+                             spectre_angles[(i + 1 + index_of_u) % 14]));
+    }
+}
+
+Spectre *spectre_initial(SpectreContext *ctx)
+{
+    Spectre *spec = snew(Spectre);
+    spectre_place(spec, ctx->start_vertices[0], ctx->start_vertices[1], 0);
+    spec->sc = spectre_coords_copy(ctx->prototype);
+    return spec;
+}
+
+Spectre *spectre_adjacent(SpectreContext *ctx, const Spectre *src_spec,
+                          unsigned src_edge, unsigned *dst_edge_out)
+{
+    unsigned dst_edge;
+    Spectre *dst_spec = snew(Spectre);
+    dst_spec->sc = spectre_coords_copy(src_spec->sc);
+    spectrectx_step(ctx, dst_spec->sc, src_edge, &dst_edge);
+    spectre_place(dst_spec, src_spec->vertices[(src_edge+1) % 14],
+                  src_spec->vertices[src_edge], dst_edge);
+    if (dst_edge_out)
+        *dst_edge_out = dst_edge;
+    return dst_spec;
+}
+
+static int spectre_cmp(void *av, void *bv)
+{
+    Spectre *a = (Spectre *)av, *b = (Spectre *)bv;
+    size_t i, j;
+
+    /* We should only ever need to compare the first two vertices of
+     * any Spectre, because those force the rest */
+    for (i = 0; i < 2; i++) {
+        for (j = 0; j < 4; j++) {
+            int ac = a->vertices[i].coeffs[j], bc = b->vertices[i].coeffs[j];
+            if (ac < bc)
+                return -1;
+            if (ac > bc)
+                return +1;
+        }
+    }
+
+    return 0;
+}
+
+void spectre_free(Spectre *spec)
+{
+    spectre_coords_free(spec->sc);
+    sfree(spec);
+}
+
+static void spectrectx_start_vertices(SpectreContext *ctx, int orientation)
+{
+    Point minus_sqrt3 = point_add(point_rot(5), point_rot(-5));
+    Point basicedge = point_mul(point_add(point_rot(0), point_rot(-3)),
+                                point_rot(orientation));
+    Point diagonal = point_add(basicedge, point_mul(basicedge, point_rot(-3)));
+    ctx->start_vertices[0] = point_mul(diagonal, minus_sqrt3);
+    ctx->start_vertices[1] = point_add(ctx->start_vertices[0], basicedge);
+    ctx->orientation = orientation;
+}
+
+void spectrectx_init_random(SpectreContext *ctx, random_state *rs)
+{
+    const struct Possibility *poss;
+
+    ctx->rs = rs;
+    ctx->must_free_rs = false;
+    ctx->prototype = spectre_coords_new();
+    spectre_coords_make_space(ctx->prototype, 1);
+    poss = choose_poss(rs, poss_spectre, lenof(poss_spectre));
+    ctx->prototype->index = poss->lo;
+    ctx->prototype->c[0].type = poss->hi;
+    ctx->prototype->c[0].index = -1;
+    ctx->prototype->nc = 1;
+
+    /*
+     * Choose a random orientation for the starting Spectre.
+     *
+     * The obvious thing is to choose the orientation out of all 12
+     * possibilities. But we do it a more complicated way.
+     *
+     * The Spectres in a tiling can be partitioned into two
+     * equivalence classes under the relation 'orientation differs by
+     * a multiple of 1/6 turn'. One class is much more common than the
+     * other class: the 'odd'-orientation Spectres occur rarely (very
+     * like the rare reflected hats in the hats tiling).
+     *
+     * I think it's nicer to arrange that there's a consistent
+     * orientation for the _common_ class of Spectres, so that there
+     * will always be plenty of them in the 'canonical' orientation
+     * with the head upwards. So if the starting Spectre is in the
+     * even class, we pick an even orientation for it, and if it's in
+     * the odd class, we pick an odd orientation.
+     *
+     * An odd-class Spectre is easy to identify from SpectreCoords.
+     * They're precisely the ones expanded from a G hex with index 1,
+     * which means they're the ones that have index 1 _at all_.
+     */
+    spectrectx_start_vertices(ctx, random_upto(rs, 6) * 2 +
+                              ctx->prototype->index);
+
+    /* Initialiise the colouring fields deterministically but unhelpfully.
+     * spectre-test will set these up properly if it wants to */
+    ctx->prototype->hex_colour = 0;
+    ctx->prototype->prev_hex_colour = 0;
+    ctx->prototype->incoming_hex_edge = 0;
+}
+
+void spectrectx_init_from_params(
+    SpectreContext *ctx, const struct SpectrePatchParams *ps)
+{
+    size_t i;
+
+    ctx->rs = NULL;
+    ctx->must_free_rs = false;
+    ctx->prototype = spectre_coords_new();
+    spectre_coords_make_space(ctx->prototype, ps->ncoords);
+
+    ctx->prototype->index = ps->coords[0];
+    for (i = 1; i < ps->ncoords; i++)
+        ctx->prototype->c[i-1].index = ps->coords[i];
+    ctx->prototype->c[ps->ncoords-1].index = -1;
+    ctx->prototype->nc = ps->ncoords;
+
+    ctx->prototype->c[ps->ncoords-1].type = hex_from_letter(ps->final_hex);
+    for (i = ps->ncoords - 1; i-- > 0 ;) {
+        const struct HexData *h = &hexdata[ctx->prototype->c[i+1].type];
+        ctx->prototype->c[i].type = h->subhexes[ctx->prototype->c[i].index];
+    }
+
+    spectrectx_start_vertices(ctx, ps->orientation);
+
+    ctx->prototype->hex_colour = 0;
+    ctx->prototype->prev_hex_colour = 0;
+    ctx->prototype->incoming_hex_edge = 0;
+}
+
+void spectrectx_cleanup(SpectreContext *ctx)
+{
+    if (ctx->must_free_rs)
+        random_free(ctx->rs);
+    spectre_coords_free(ctx->prototype);
+}
+
+SpectreCoords *spectrectx_initial_coords(SpectreContext *ctx)
+{
+    return spectre_coords_copy(ctx->prototype);
+}
+
+/*
+ * Extend sc until it has at least n coordinates in, by copying from
+ * ctx->prototype if needed, and extending ctx->prototype if needed in
+ * order to do that.
+ */
+void spectrectx_extend_coords(SpectreContext *ctx, SpectreCoords *sc, size_t n)
+{
+    if (ctx->prototype->nc < n) {
+        spectre_coords_make_space(ctx->prototype, n);
+        while (ctx->prototype->nc < n) {
+            const struct HexData *h = &hexdata[
+                ctx->prototype->c[ctx->prototype->nc-1].type];
+            const struct Possibility *poss;
+
+            if (!ctx->rs) {
+                /*
+                 * If there's no random_state available, it must be
+                 * because we were given an explicit coordinate string
+                 * and ran off the end of it.
+                 *
+                 * The obvious thing to do here would be to make up an
+                 * answer non-randomly. But in fact there's a danger
+                 * that this leads to endless recursion within a
+                 * single coordinate step, if the hex edge we were
+                 * trying to traverse turns into another copy of
+                 * itself at the higher level. That happened in early
+                 * testing before I put the random_state in at all.
+                 *
+                 * To avoid that risk, in this situation - which
+                 * _shouldn't_ come up at all in sensibly play - we
+                 * make up a random_state, and free it when the
+                 * context goes away.
+                 */
+                ctx->rs = random_new("dummy", 5);
+                ctx->must_free_rs = true;
+            }
+
+            poss = choose_poss(ctx->rs, h->poss, h->nposs);
+            ctx->prototype->c[ctx->prototype->nc-1].index = poss->lo;
+            ctx->prototype->c[ctx->prototype->nc].type = poss->hi;
+            ctx->prototype->c[ctx->prototype->nc].index = -1;
+            ctx->prototype->nc++;
+        }
+    }
+
+    spectre_coords_make_space(sc, n);
+    while (sc->nc < n) {
+        assert(sc->c[sc->nc - 1].index == -1);
+        assert(sc->c[sc->nc - 1].type == ctx->prototype->c[sc->nc - 1].type);
+        sc->c[sc->nc - 1].index = ctx->prototype->c[sc->nc - 1].index;
+        sc->c[sc->nc].index = -1;
+        sc->c[sc->nc].type = ctx->prototype->c[sc->nc].type;
+        sc->nc++;
+    }
+}
+
+void spectrectx_step_hex(SpectreContext *ctx, SpectreCoords *sc,
+                         size_t depth, unsigned edge, unsigned *outedge)
+{
+    const struct HexData *h;
+    const struct MapEntry *m;
+
+    spectrectx_extend_coords(ctx, sc, depth+2);
+
+    assert(0 <= sc->c[depth].index);
+    assert(sc->c[depth].index < num_subhexes(sc->c[depth].type));
+    assert(0 <= edge);
+    assert(edge < 6);
+
+    h = &hexdata[sc->c[depth+1].type];
+    m = &h->hexmap[6 * sc->c[depth].index + edge];
+    if (!m->internal) {
+        unsigned recedge;
+        const struct MapEdge *me;
+        spectrectx_step_hex(ctx, sc, depth+1, m->hi, &recedge);
+        assert(recedge < 6);
+        h = &hexdata[sc->c[depth+1].type];
+        me = &h->hexedges[recedge];
+        assert(m->lo < me->len);
+        m = &h->hexin[me->startindex + me->len - 1 - m->lo];
+        assert(m->internal);
+    }
+    sc->c[depth].index = m->hi;
+    sc->c[depth].type = h->subhexes[sc->c[depth].index];
+    *outedge = m->lo;
+
+    if (depth == 0) {
+        /*
+         * Update the colouring fields to track the colour of the new
+         * hexagon.
+         */
+        unsigned char new_hex_colour;
+
+        if (!((edge ^ sc->incoming_hex_edge) & 1)) {
+            /* We're going out via the same parity of edge we came in
+             * on, so the new hex colour is the same as the previous
+             * one. */
+            new_hex_colour = sc->prev_hex_colour;
+        } else {
+            /* We're going out via the opposite parity of edge, so the
+             * new colour is the one of {0,1,2} that is neither this
+             * _nor_ the previous colour. */
+            new_hex_colour = 0+1+2 - sc->hex_colour - sc->prev_hex_colour;
+        }
+
+        sc->prev_hex_colour = sc->hex_colour;
+        sc->hex_colour = new_hex_colour;
+        sc->incoming_hex_edge = m->lo;
+    }
+}
+
+void spectrectx_step(SpectreContext *ctx, SpectreCoords *sc,
+                     unsigned edge, unsigned *outedge)
+{
+    const struct HexData *h;
+    const struct MapEntry *m;
+
+    assert(0 <= sc->index);
+    assert(sc->index < num_spectres(sc->c[0].type));
+    assert(0 <= edge);
+    assert(edge < 14);
+
+    h = &hexdata[sc->c[0].type];
+    m = &h->specmap[14 * sc->index + edge];
+
+    while (!m->internal) {
+        unsigned recedge;
+        const struct MapEdge *me;
+        spectrectx_step_hex(ctx, sc, 0, m->hi, &recedge);
+        assert(recedge < 6);
+        h = &hexdata[sc->c[0].type];
+        me = &h->specedges[recedge];
+        assert(m->lo < me->len);
+        m = &h->specin[me->startindex + me->len - 1 - m->lo];
+    }
+    sc->index = m->hi;
+    *outedge = m->lo;
+}
+
+void spectrectx_generate(SpectreContext *ctx,
+                         bool (*callback)(void *cbctx, const Spectre *spec),
+                         void *cbctx)
+{
+    tree234 *placed = newtree234(spectre_cmp);
+    Spectre *qhead = NULL, *qtail = NULL;
+
+    {
+        Spectre *spec = spectre_initial(ctx);
+
+        add234(placed, spec);
+
+        spec->next = NULL;
+
+        if (callback(cbctx, spec))
+            qhead = qtail = spec;
+    }
+
+    while (qhead) {
+        unsigned edge;
+        Spectre *spec = qhead;
+
+        for (edge = 0; edge < 14; edge++) {
+            Spectre *new_spec;
+
+            new_spec = spectre_adjacent(ctx, spec, edge, NULL);
+
+            if (find234(placed, new_spec, NULL)) {
+                spectre_free(new_spec);
+                continue;
+            }
+
+            if (!callback(cbctx, new_spec)) {
+                spectre_free(new_spec);
+                continue;
+            }
+
+            add234(placed, new_spec);
+            qtail->next = new_spec;
+            qtail = new_spec;
+            new_spec->next = NULL;
+        }
+
+        qhead = qhead->next;
+    }
+
+    {
+        Spectre *spec;
+        while ((spec = delpos234(placed, 0)) != NULL)
+            spectre_free(spec);
+        freetree234(placed);
+    }
+}
+
+const char *spectre_tiling_params_invalid(
+    const struct SpectrePatchParams *params)
+{
+    size_t i;
+    Hex h;
+
+    if (params->ncoords == 0)
+        return "expected at least one numeric coordinate";
+    if (!spectre_valid_hex_letter(params->final_hex))
+        return "invalid final hexagon type";
+
+    h = hex_from_letter(params->final_hex);
+    for (i = params->ncoords; i-- > 0 ;) {
+        unsigned limit = (i == 0) ? num_spectres(h) : num_subhexes(h);
+        if (params->coords[i] >= limit)
+            return "coordinate out of range";
+
+        if (i > 0)
+            h = hexdata[h].subhexes[params->coords[i]];
+    }
+
+    return NULL;
+}
+
+struct SpectreCallbackContext {
+    int xoff, yoff;
+    Coord xmin, xmax, ymin, ymax;
+
+    spectre_tile_callback_fn external_cb;
+    void *external_cbctx;
+};
+
+static bool spectre_internal_callback(void *vctx, const Spectre *spec)
+{
+    struct SpectreCallbackContext *ctx = (struct SpectreCallbackContext *)vctx;
+    size_t i;
+    int output_coords[4*14];
+
+    for (i = 0; i < 14; i++) {
+        Point p = spec->vertices[i];
+        Coord x = point_x(p), y = point_y(p);
+        if (coord_cmp(x, ctx->xmin) < 0 || coord_cmp(x, ctx->xmax) > 0 ||
+            coord_cmp(y, ctx->ymin) < 0 || coord_cmp(y, ctx->ymax) > 0)
+            return false;
+
+        output_coords[4*i + 0] = ctx->xoff + x.c1;
+        output_coords[4*i + 1] = x.cr3;
+        output_coords[4*i + 2] = ctx->yoff - y.c1;
+        output_coords[4*i + 3] = -y.cr3;
+    }
+
+    if (ctx->external_cb)
+        ctx->external_cb(ctx->external_cbctx, output_coords);
+
+    return true;
+}
+
+static void spectre_set_bounds(struct SpectreCallbackContext *cbctx,
+                               int w, int h)
+{
+    cbctx->xoff = w/2;
+    cbctx->yoff = h/2;
+    cbctx->xmin.c1 = -cbctx->xoff;
+    cbctx->xmax.c1 = -cbctx->xoff + w;
+    cbctx->ymin.c1 = cbctx->yoff - h;
+    cbctx->ymax.c1 = cbctx->yoff;
+    cbctx->xmin.cr3 = 0;
+    cbctx->xmax.cr3 = 0;
+    cbctx->ymin.cr3 = 0;
+    cbctx->ymax.cr3 = 0;
+}
+
+void spectre_tiling_randomise(struct SpectrePatchParams *ps, int w, int h,
+                              random_state *rs)
+{
+    SpectreContext ctx[1];
+    struct SpectreCallbackContext cbctx[1];
+    size_t i;
+
+    spectre_set_bounds(cbctx, w, h);
+    cbctx->external_cb = NULL;
+    cbctx->external_cbctx = NULL;
+
+    spectrectx_init_random(ctx, rs);
+    spectrectx_generate(ctx, spectre_internal_callback, cbctx);
+
+    ps->orientation = ctx->orientation;
+    ps->ncoords = ctx->prototype->nc;
+    ps->coords = snewn(ps->ncoords, unsigned char);
+    ps->coords[0] = ctx->prototype->index;
+    for (i = 1; i < ps->ncoords; i++)
+        ps->coords[i] = ctx->prototype->c[i-1].index;
+    ps->final_hex = hex_to_letter(ctx->prototype->c[ps->ncoords-1].type);
+
+    spectrectx_cleanup(ctx);
+}
+
+void spectre_tiling_generate(
+    const struct SpectrePatchParams *params, int w, int h,
+    spectre_tile_callback_fn external_cb, void *external_cbctx)
+{
+    SpectreContext ctx[1];
+    struct SpectreCallbackContext cbctx[1];
+
+    spectre_set_bounds(cbctx, w, h);
+    cbctx->external_cb = external_cb;
+    cbctx->external_cbctx = external_cbctx;
+
+    spectrectx_init_from_params(ctx, params);
+    spectrectx_generate(ctx, spectre_internal_callback, cbctx);
+    spectrectx_cleanup(ctx);
+}
diff --git a/apps/plugins/puzzles/src/spectre.h b/apps/plugins/puzzles/src/spectre.h
new file mode 100644
index 0000000000..97d7595e3a
--- /dev/null
+++ b/apps/plugins/puzzles/src/spectre.h
@@ -0,0 +1,72 @@
+#ifndef PUZZLES_SPECTRE_H
+#define PUZZLES_SPECTRE_H
+
+struct SpectrePatchParams {
+    /*
+     * A patch of Spectre tiling is identified by giving
+     *
+     *  - the coordinates of the central Spectre, using a
+     *    combinatorial coordinate system similar to the Hat tiling in
+     *    hat.h
+     *
+     *  - the orientation of that Spectre, as a number from 0 to 11 (a
+     *    multiple of 30 degrees), with 0 representing the 'head' of
+     *    the Spectre facing upwards, and numbers counting
+     *    anticlockwise.
+     *
+     * Coordinates are a sequence of small non-negative integers. The
+     * valid range for each coordinate depends on the next coordinate,
+     * or on final_hex if it's the last one in the list. The largest
+     * valid range is {0,...,7}.
+     *
+     * 'final_hex' is one of the letters GDJLXPSFY.
+     * spectre_valid_hex_letter() will check that.
+     */
+    int orientation;
+    size_t ncoords;
+    unsigned char *coords;
+    char final_hex;
+};
+
+bool spectre_valid_hex_letter(char c);
+
+/*
+ * Fill in SpectrePatchParams with a randomly selected set of
+ * coordinates, in enough detail to generate a patch of tiling filling
+ * a w x h area. The unit of measurement is 1/(2*sqrt(2)) of a Spectre
+ * edge, i.e. such that a single Spectre edge at 45 degrees would
+ * correspond to the vector (2,2).
+ *
+ * The 'coords' field of the structure will be filled in with a new
+ * dynamically allocated array. Any previous pointer in that field
+ * will be overwritten.
+ */
+void spectre_tiling_randomise(struct SpectrePatchParams *params, int w, int h,
+                              random_state *rs);
+
+/*
+ * Validate a SpectrePatchParams to ensure it contains no illegal
+ * coordinates. Returns NULL if it's acceptable, or an error string if
+ * not.
+ */
+const char *spectre_tiling_params_invalid(
+    const struct SpectrePatchParams *params);
+
+/*
+ * Generate the actual set of Spectre tiles from a SpectrePatchParams,
+ * passing each one to a callback. The callback receives the vertices
+ * of each point, in the form of an array of 4*14 integers. Each
+ * vertex is represented by four consecutive integers in this array,
+ * with the first two giving the x coordinate and the last two the y
+ * coordinate. Each pair of integers a,b represent a single coordinate
+ * whose value is a + b*sqrt(3). The unit of measurement is as above.
+ */
+typedef void (*spectre_tile_callback_fn)(void *ctx, const int *coords);
+
+#define SPECTRE_NVERTICES 14
+
+void spectre_tiling_generate(
+    const struct SpectrePatchParams *params, int w, int h,
+    spectre_tile_callback_fn cb, void *cbctx);
+
+#endif
diff --git a/apps/plugins/puzzles/src/tents.R b/apps/plugins/puzzles/src/tents.R
deleted file mode 100644
index 925661c761..0000000000
--- a/apps/plugins/puzzles/src/tents.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-TENTS_EXTRA = matching dsf
-
-tents    : [X] GTK COMMON tents TENTS_EXTRA tents-icon|no-icon
-
-tents    : [G] WINDOWS COMMON tents TENTS_EXTRA tents.res|noicon.res
-
-ALL += tents[COMBINED] TENTS_EXTRA
-
-tentssolver :   [U] tents[STANDALONE_SOLVER] TENTS_EXTRA STANDALONE
-tentssolver :   [C] tents[STANDALONE_SOLVER] TENTS_EXTRA STANDALONE
-
-!begin am gtk
-GAMES += tents
-!end
-
-!begin >list.c
-    A(tents) \
-!end
-
-!begin >gamedesc.txt
-tents:tents.exe:Tents:Tent-placing puzzle:Place a tent next to each tree.
-!end
diff --git a/apps/plugins/puzzles/src/tents.c b/apps/plugins/puzzles/src/tents.c
index ee06172baf..0d40959d26 100644
--- a/apps/plugins/puzzles/src/tents.c
+++ b/apps/plugins/puzzles/src/tents.c
@@ -32,7 +32,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "matching.h"
@@ -229,7 +234,7 @@
  */
 #if defined STANDALONE_SOLVER
 #define SOLVER_DIAGNOSTICS
-bool verbose = false;
+static bool verbose = false;
 #elif defined SOLVER_DIAGNOSTICS
 #define verbose true
 #endif
@@ -408,6 +413,8 @@ 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 four";
+    if (params->w > (INT_MAX - 1) / params->h)
+        return "Width times height must not be unreasonably large";
     return NULL;
 }
 
@@ -998,7 +1005,7 @@ static char *new_game_desc(const game_params *params_in, random_state *rs,
             int dy, dx;
             bool ok = true;
 
-            which = i + random_upto(rs, j);
+            which = i + random_upto(rs, w*h - i);
             tmp = order[which];
             order[which] = order[i];
             order[i] = tmp;
@@ -1188,6 +1195,21 @@ static char *new_game_desc(const game_params *params_in, random_state *rs,
     return ret;
 }
 
+/*
+ * Grid description format:
+ * 
+ * _ = tree
+ * a = 1 BLANK then TREE
+ * ...
+ * y = 25 BLANKs then TREE
+ * z = 25 BLANKs
+ * ! = set previous square to TENT
+ * - = set previous square to NONTENT
+ *
+ * Last character must be one that would insert a tree as the first
+ * square after the grid.
+ */
+
 static const char *validate_desc(const game_params *params, const char *desc)
 {
     int w = params->w, h = params->h;
@@ -1201,9 +1223,10 @@ static const char *validate_desc(const game_params *params, const char *desc)
             area += *desc - 'a' + 2;
         else if (*desc == 'z')
             area += 25;
-        else if (*desc == '!' || *desc == '-')
-            /* do nothing */;
-        else
+        else if (*desc == '!' || *desc == '-') {
+            if (area == 0 || area > w * h)
+                return "Tent or non-tent placed off the grid";
+        } else
             return "Invalid character in grid specification";
 
         desc++;
@@ -1436,7 +1459,7 @@ static game_ui *new_ui(const game_state *state)
     ui->drag_button = -1;
     ui->drag_ok = false;
     ui->cx = ui->cy = 0;
-    ui->cdisp = false;
+    ui->cdisp = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     return ui;
 }
 
@@ -1445,18 +1468,25 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    int w = state->p.w;
+    int v = state->grid[ui->cy*w+ui->cx];
+
+    if (IS_CURSOR_SELECT(button) && ui->cdisp) {
+        switch (v) {
+          case BLANK:
+            return button == CURSOR_SELECT ? "Tent" : "Green";
+          case TENT: case NONTENT: return "Clear";
+        }
+    }
+    return "";
 }
 
 struct game_drawstate {
@@ -1546,7 +1576,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char tmpbuf[80];
     bool shift = button & MOD_SHFT, control = button & MOD_CTRL;
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
         x = FROMCOORD(x);
@@ -1559,7 +1589,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->dsy = ui->dey = y;
         ui->drag_ok = true;
         ui->cdisp = false;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if ((IS_MOUSE_DRAG(button) || IS_MOUSE_RELEASE(button)) &&
@@ -1591,14 +1621,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
 
         if (IS_MOUSE_DRAG(button))
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
 
         /*
          * The drag has been released. Enact it.
          */
         if (!ui->drag_ok) {
             ui->drag_button = -1;
-            return UI_UPDATE;          /* drag was just cancelled */
+            return MOVE_UI_UPDATE;          /* drag was just cancelled */
         }
 
         xmin = min(ui->dsx, ui->dex);
@@ -1636,7 +1666,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (buflen == 0) {
             sfree(buf);
-            return UI_UPDATE;          /* drag was terminated */
+            return MOVE_UI_UPDATE;          /* drag was terminated */
         } else {
             buf[buflen] = '\0';
             return buf;
@@ -1644,11 +1674,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     }
 
     if (IS_CURSOR_MOVE(button)) {
-        ui->cdisp = true;
+        char *ret;
         if (shift || control) {
             int len = 0, i, indices[2];
             indices[0] = ui->cx + w * ui->cy;
-            move_cursor(button, &ui->cx, &ui->cy, w, h, false);
+            ret = move_cursor(button, &ui->cx, &ui->cy, w, h, false,
+                              &ui->cdisp);
             indices[1] = ui->cx + w * ui->cy;
 
             /* NONTENTify all unique traversed eligible squares */
@@ -1663,8 +1694,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             tmpbuf[len] = '\0';
             if (len) return dupstr(tmpbuf);
         } else
-            move_cursor(button, &ui->cx, &ui->cy, w, h, false);
-        return UI_UPDATE;
+            ret = move_cursor(button, &ui->cx, &ui->cy, w, h, false,
+                              &ui->cdisp);
+        return ret;
     }
     if (ui->cdisp) {
         char rep = 0;
@@ -1691,7 +1723,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
     } else if (IS_CURSOR_SELECT(button)) {
         ui->cdisp = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     return NULL;
@@ -1875,7 +1907,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* fool the macros */
     struct dummy { int tilesize; } dummy, *ds = &dummy;
@@ -1976,7 +2008,8 @@ static int *find_errors(const game_state *state, char *grid)
 {
     int w = state->p.w, h = state->p.h;
     int *ret = snewn(w*h + w + h, int);
-    int *tmp = snewn(w*h*2, int), *dsf = tmp + w*h;
+    int *tmp = snewn(w*h, int);
+    DSF *dsf;
     int x, y;
 
     /*
@@ -2193,7 +2226,7 @@ static int *find_errors(const game_state *state, char *grid)
      * all the tents in any component which has a smaller tree
      * count.
      */
-    dsf_init(dsf, w*h);
+    dsf = dsf_new(w*h);
     /* Construct the equivalence classes. */
     for (y = 0; y < h; y++) {
         for (x = 0; x < w-1; x++) {
@@ -2236,7 +2269,7 @@ static int *find_errors(const game_state *state, char *grid)
      * start of the game, before the user had done anything wrong!)
      */
 #define TENT(x) ((x)==TENT || (x)==BLANK)
-    dsf_init(dsf, w*h);
+    dsf_reinit(dsf);
     /* Construct the equivalence classes. */
     for (y = 0; y < h; y++) {
         for (x = 0; x < w-1; x++) {
@@ -2272,6 +2305,7 @@ static int *find_errors(const game_state *state, char *grid)
 #undef TENT
 
     sfree(tmp);
+    dsf_free(dsf);
     return ret;
 }
 
@@ -2411,14 +2445,6 @@ static void int_redraw(drawing *dr, game_drawstate *ds,
     }
 
     if (printing || !ds->started) {
-        if (!printing) {
-            int ww, wh;
-            game_compute_size(&state->p, TILESIZE, &ww, &wh);
-            draw_rect(dr, 0, 0, ww, wh, COL_BACKGROUND);
-            draw_update(dr, 0, 0, ww, wh);
-            ds->started = true;
-        }
-
         if (printing)
             print_line_width(dr, TILESIZE/64);
 
@@ -2572,24 +2598,21 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /*
      * I'll use 6mm squares by default.
      */
-    game_compute_size(params, 600, &pw, &ph);
+    game_compute_size(params, 600, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int c;
 
@@ -2628,12 +2651,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_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,
@@ -2647,7 +2672,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON,                   /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/towers.R b/apps/plugins/puzzles/src/towers.R
deleted file mode 100644
index c2bb78a2dc..0000000000
--- a/apps/plugins/puzzles/src/towers.R
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- makefile -*-
-
-TOWERS_EXTRA        = LATIN
-TOWERS_EXTRA_SOLVER = LATIN_SOLVER
-
-towers    : [X] GTK COMMON towers TOWERS_EXTRA towers-icon|no-icon
-
-towers    : [G] WINDOWS COMMON towers TOWERS_EXTRA towers.res|noicon.res
-
-towerssolver : [U] towers[STANDALONE_SOLVER] TOWERS_EXTRA_SOLVER STANDALONE
-towerssolver : [C] towers[STANDALONE_SOLVER] TOWERS_EXTRA_SOLVER STANDALONE
-
-ALL += towers[COMBINED] TOWERS_EXTRA
-
-!begin am gtk
-GAMES += towers
-!end
-
-!begin >list.c
-    A(towers) \
-!end
-
-!begin >gamedesc.txt
-towers:towers.exe:Towers:Tower-placing Latin square puzzle:Complete the latin square of towers in accordance with the clues.
-!end
diff --git a/apps/plugins/puzzles/src/towers.c b/apps/plugins/puzzles/src/towers.c
index 13c652b819..4dd9484ad9 100644
--- a/apps/plugins/puzzles/src/towers.c
+++ b/apps/plugins/puzzles/src/towers.c
@@ -23,7 +23,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "latin.h"
@@ -385,12 +389,12 @@ static int solver_easy(struct latin_solver *solver, void *vctx)
             return ret;
 
 #ifdef STANDALONE_SOLVER
-            if (solver_show_working)
-                sprintf(prefix, "%*slower bounds for clue %s %d:\n",
-                        solver_recurse_depth*4, "",
-                        cluepos[c/w], c%w+1);
-            else
-                prefix[0] = '\0';              /* placate optimiser */
+        if (solver_show_working)
+            sprintf(prefix, "%*slower bounds for clue %s %d:\n",
+                    solver_recurse_depth*4, "",
+                    cluepos[c/w], c%w+1);
+        else
+            prefix[0] = '\0';          /* placate optimiser */
 #endif
 
         i = 0;
@@ -893,6 +897,7 @@ static const char *validate_desc(const game_params *params, const char *desc)
             return "Too much data to fit in grid";
     }
 
+    if (*p) return "Rubbish at end of game description";
     return NULL;
 }
 
@@ -1154,16 +1159,59 @@ struct game_ui {
      * allowed on immutable squares.
      */
     bool hcursor;
+
+    /*
+     * User preference option which can be set to FALSE to disable the
+     * 3D graphical style, and instead just display the puzzle as if
+     * it was a Sudoku variant, i.e. each square just has a digit in
+     * it.
+     *
+     * I was initially a bit uncertain about whether the 3D style
+     * would be the right thing, on the basis that it uses up space in
+     * the cells and makes it hard to use many pencil marks. Actually
+     * nobody seems to have complained, but having put in the option
+     * while I was still being uncertain, it seems silly not to leave
+     * it in just in case.
+     */
+    int three_d;
+
+    /*
+     * User preference option: if the user right-clicks in a square
+     * and presses a number 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 void legacy_prefs_override(struct game_ui *ui_out)
+{
+    static bool initialised = false;
+    static int three_d = -1;
+
+    if (!initialised) {
+        initialised = true;
+        three_d = getenv_bool("TOWERS_2D", -1);
+    }
+
+    if (three_d != -1)
+        ui_out->three_d = three_d;
+}
+
 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->hshow = ui->hcursor = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+
+    ui->three_d = true;
+    ui->pencil_keep_highlight = false;
+    legacy_prefs_override(ui);
 
     return ui;
 }
@@ -1173,13 +1221,34 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    config_item *ret;
+
+    ret = snewn(3, 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 = "Puzzle appearance";
+    ret[1].kw = "appearance";
+    ret[1].type = C_CHOICES;
+    ret[1].u.choices.choicenames = ":2D:3D";
+    ret[1].u.choices.choicekws = ":2d:3d";
+    ret[1].u.choices.selected = ui->three_d;
+
+    ret[2].name = NULL;
+    ret[2].type = C_END;
+
+    return ret;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
+    ui->pencil_keep_highlight = cfg[0].u.boolean.bval;
+    ui->three_d = cfg[1].u.choices.selected;
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1198,6 +1267,14 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     }
 }
 
+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";
+    return "";
+}
+
 #define PREFERRED_TILESIZE 48
 #define TILESIZE (ds->tilesize)
 #define BORDER (TILESIZE * 9 / 8)
@@ -1221,8 +1298,6 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 
 struct game_drawstate {
     int tilesize;
-    bool three_d;       /* default 3D graphics are user-disableable */
-    bool started;
     long *tiles;                       /* (w+2)*(w+2) temp space */
     long *drawn;                       /* (w+2)*(w+2)*4: current drawn data */
     bool *errtmp;
@@ -1349,12 +1424,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     int tx, ty;
     char buf[80];
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     tx = FROMCOORD(x);
     ty = FROMCOORD(y);
 
-    if (ds->three_d) {
+    if (ui->three_d) {
         /*
          * In 3D mode, just locating the mouse click in the natural
          * square grid may not be sufficient to tell which tower the
@@ -1401,7 +1476,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hpencil = false;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (button == RIGHT_BUTTON) {
             /*
@@ -1421,7 +1496,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hshow = false;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else if (button == LEFT_BUTTON) {
         if (is_clue(state, tx, ty)) {
@@ -1444,16 +1519,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             }
             return NULL;
         }
-        move_cursor(button, &ui->hx, &ui->hy, w, w, false);
-        ui->hshow = true;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return move_cursor(button, &ui->hx, &ui->hy, w, w, false, &ui->hshow);
     }
     if (ui->hshow &&
         (button == CURSOR_SELECT)) {
         ui->hpencil = !ui->hpencil;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (ui->hshow &&
@@ -1476,10 +1549,31 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (state->clues->immutable[ui->hy*w+ui->hx])
             return NULL;
 
+        /*
+         * If you ask to fill a square with what it already contains,
+         * or blank it when it's already empty, that has no effect...
+         */
+        if ((!ui->hpencil || n == 0) && state->grid[ui->hy*w+ui->hx] == n &&
+            state->pencil[ui->hy*w+ui->hx] == 0) {
+            /* ... expect to remove the cursor in mouse mode. */
+            if (!ui->hcursor) {
+                ui->hshow = false;
+                return MOVE_UI_UPDATE;
+            }
+            return NULL;
+        }
+
         sprintf(buf, "%c%d,%d,%d",
                 (char)(ui->hpencil && n > 0 ? 'P' : 'R'), ui->hx, ui->hy, n);
 
-        if (!ui->hcursor) ui->hshow = false;
+        /*
+         * 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 dupstr(buf);
     }
@@ -1558,7 +1652,7 @@ static game_state *execute_move(const game_state *from, const char *move)
 #define SIZE(w) ((w) * TILESIZE + 2*BORDER)
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -1614,8 +1708,6 @@ static game_drawstate *game_new_drawstate(drawing *dr, const game_state *state)
     int i;
 
     ds->tilesize = 0;
-    ds->three_d = !getenv("TOWERS_2D");
-    ds->started = false;
     ds->tiles = snewn((w+2)*(w+2), long);
     ds->drawn = snewn((w+2)*(w+2)*4, long);
     for (i = 0; i < (w+2)*(w+2)*4; i++)
@@ -1633,8 +1725,8 @@ static void game_free_drawstate(drawing *dr, game_drawstate *ds)
     sfree(ds);
 }
 
-static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
-                      int x, int y, long tile)
+static void draw_tile(drawing *dr, game_drawstate *ds, const game_ui *ui,
+                      struct clues *clues, int x, int y, long tile)
 {
     int w = clues->w /* , a = w*w */;
     int tx, ty, bg;
@@ -1646,7 +1738,7 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
     bg = (tile & DF_HIGHLIGHT) ? COL_HIGHLIGHT : COL_BACKGROUND;
 
     /* draw tower */
-    if (ds->three_d && (tile & DF_PLAYAREA) && (tile & DF_DIGIT_MASK)) {
+    if (ui->three_d && (tile & DF_PLAYAREA) && (tile & DF_DIGIT_MASK)) {
         int coords[8];
         int xoff = X_3D_DISP(tile & DF_DIGIT_MASK, w);
         int yoff = Y_3D_DISP(tile & DF_DIGIT_MASK, w);
@@ -1747,10 +1839,10 @@ static void draw_tile(drawing *dr, game_drawstate *ds, struct clues *clues,
              * to put the pencil marks.
              */
             /* Start with the whole square, minus space for impinging towers */
-            pl = tx + (ds->three_d ? X_3D_DISP(w,w) : 0);
+            pl = tx + (ui->three_d ? X_3D_DISP(w,w) : 0);
             pr = tx + TILESIZE;
             pt = ty;
-            pb = ty + TILESIZE - (ds->three_d ? Y_3D_DISP(w,w) : 0);
+            pb = ty + TILESIZE - (ui->three_d ? Y_3D_DISP(w,w) : 0);
 
             /*
              * We arrange our pencil marks in a grid layout, with
@@ -1821,20 +1913,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int w = state->par.w /*, a = w*w */;
     int i, x, y;
 
-    if (!ds->started) {
-        /*
-         * The initial contents of the window are not guaranteed and
-         * can vary with front ends. To be on the safe side, all
-         * games should start by drawing a big background-colour
-         * rectangle covering the whole window.
-         */
-        draw_rect(dr, 0, 0, SIZE(w), SIZE(w), COL_BACKGROUND);
-
-        draw_update(dr, 0, 0, SIZE(w), SIZE(w));
-
-        ds->started = true;
-    }
-
     check_errors(state, ds->errtmp);
 
     /*
@@ -1900,13 +1978,13 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
                 ds->drawn[i*4+2] != bl || ds->drawn[i*4+3] != br) {
                 clip(dr, COORD(x-1), COORD(y-1), TILESIZE, TILESIZE);
 
-                draw_tile(dr, ds, state->clues, x-1, y-1, tr);
+                draw_tile(dr, ds, ui, state->clues, x-1, y-1, tr);
                 if (x > 0)
-                    draw_tile(dr, ds, state->clues, x-2, y-1, tl);
+                    draw_tile(dr, ds, ui, state->clues, x-2, y-1, tl);
                 if (y <= w)
-                    draw_tile(dr, ds, state->clues, x-1, y, br);
+                    draw_tile(dr, ds, ui, state->clues, x-1, y, br);
                 if (x > 0 && y <= w)
-                    draw_tile(dr, ds, state->clues, x-2, y, bl);
+                    draw_tile(dr, ds, ui, state->clues, x-2, y, bl);
 
                 unclip(dr);
                 draw_update(dr, COORD(x-1), COORD(y-1), TILESIZE, TILESIZE);
@@ -1953,26 +2031,21 @@ 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, float *x, float *y)
+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, &pw, &ph);
+    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, int tilesize)
+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);
@@ -2058,12 +2131,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     game_request_keys,
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILESIZE, game_compute_size, game_set_size,
@@ -2077,7 +2152,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON | REQUIRE_NUMPAD,  /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/tracks.R b/apps/plugins/puzzles/src/tracks.R
deleted file mode 100644
index 8b0ac97e0f..0000000000
--- a/apps/plugins/puzzles/src/tracks.R
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- makefile -*-
-
-TRACKS_EXTRA = dsf findloop
-
-tracks  : [X] GTK COMMON tracks TRACKS_EXTRA tracks-icon|no-icon
-
-tracks  : [G] WINDOWS COMMON tracks TRACKS_EXTRA tracks.res|noicon.res
-
-ALL += tracks[COMBINED] TRACKS_EXTRA
-
-trackssolver : [U] tracks[STANDALONE_SOLVER] TRACKS_EXTRA STANDALONE
-trackssolver : [C] tracks[STANDALONE_SOLVER] TRACKS_EXTRA STANDALONE
-
-!begin am gtk
-GAMES += tracks
-!end
-
-!begin >list.c
-    A(tracks) \
-!end
-
-!begin >gamedesc.txt
-tracks:tracks.exe:Tracks:Path-finding railway track puzzle:Fill in the railway track according to the clues.
-!end
diff --git a/apps/plugins/puzzles/src/tracks.c b/apps/plugins/puzzles/src/tracks.c
index 3cf5df70a1..a2d4560907 100644
--- a/apps/plugins/puzzles/src/tracks.c
+++ b/apps/plugins/puzzles/src/tracks.c
@@ -20,7 +20,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -196,6 +201,8 @@ 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 four";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     return NULL;
 }
 
@@ -242,6 +249,9 @@ static const int nbits[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4 };
 #define S_CLUE 8
 #define S_MARK 16
 
+#define S_FLASH_SHIFT   8  /* Position of tile in solved track */
+#define S_FLASH_WIDTH   8  /* Width of above sub-field */
+#define S_FLASH_MASK    ((1 << S_FLASH_WIDTH) - 1)
 #define S_TRACK_SHIFT   16 /* U/D/L/R flags for edge track indicators */
 #define S_NOTRACK_SHIFT 20 /* U/D/L/R flags for edge no-track indicators */
 
@@ -904,7 +914,7 @@ static game_state *new_game(midend *me, const game_params *params, const char *d
 }
 
 struct solver_scratch {
-    int *dsf;
+    DSF *dsf;
 };
 
 static int solve_set_sflag(game_state *state, int x, int y,
@@ -919,8 +929,8 @@ static int solve_set_sflag(game_state *state, int x, int y,
     if (state->sflags[i] & (f == S_TRACK ? S_NOTRACK : S_TRACK)) {
         solverdebug(("opposite flag already set there, marking IMPOSSIBLE"));
         state->impossible = true;
-    }
-    state->sflags[i] |= f;
+    } else
+        state->sflags[i] |= f;
     return 1;
 }
 
@@ -937,8 +947,8 @@ static int solve_set_eflag(game_state *state, int x, int y, int d,
     if (sf & (f == E_TRACK ? E_NOTRACK : E_TRACK)) {
         solverdebug(("opposite flag already set there, marking IMPOSSIBLE"));
         state->impossible = true;
-    }
-    S_E_SET(state, x, y, d, f);
+    } else
+        S_E_SET(state, x, y, d, f);
     return 1;
 }
 
@@ -1306,7 +1316,7 @@ static int solve_check_neighbours(game_state *state, bool both_ways)
 }
 
 static int solve_check_loop_sub(game_state *state, int x, int y, int dir,
-                                int *dsf, int startc, int endc)
+                                DSF *dsf, int startc, int endc)
 {
     int w = state->p.w, h = state->p.h, i = y*w+x, j, k;
     bool satisfied = true;
@@ -1358,13 +1368,13 @@ static int solve_check_loop_sub(game_state *state, int x, int y, int dir,
 static int solve_check_loop(game_state *state)
 {
     int w = state->p.w, h = state->p.h, x, y, i, j, did = 0;
-    int *dsf, startc, endc;
+    DSF *dsf;
+    int startc, endc;
 
     /* TODO eventually we should pull this out into a solver struct and keep it
        updated as we connect squares. For now we recreate it every time we try
        this particular solver step. */
-    dsf = snewn(w*h, int);
-    dsf_init(dsf, w*h);
+    dsf = dsf_new(w*h);
 
     /* Work out the connectedness of the current loop set. */
     for (x = 0; x < w; x++) {
@@ -1402,7 +1412,7 @@ static int solve_check_loop(game_state *state)
         }
     }
 
-    sfree(dsf);
+    dsf_free(dsf);
 
     return did;
 }
@@ -1455,8 +1465,8 @@ static int solve_bridge_sub(game_state *state, int x, int y, int d,
     assert(d == D || d == R);
 
     if (!sc->dsf)
-        sc->dsf = snew_dsf(wh);
-    dsf_init(sc->dsf, wh);
+        sc->dsf = dsf_new(wh);
+    dsf_reinit(sc->dsf);
 
     for (xi = 0; xi < w; xi++) {
         for (yi = 0; yi < h; yi++) {
@@ -1595,7 +1605,7 @@ static int tracks_solve(game_state *state, int diff, int *max_diff_out)
         break;
     }
 
-    sfree(sc->dsf);
+    dsf_free(sc->dsf);
 
     if (max_diff_out)
         *max_diff_out = max_diff;
@@ -1775,7 +1785,7 @@ static void debug_state(game_state *state, const char *what) {
 }
 
 static void dsf_update_completion(game_state *state, int ax, int ay,
-                                  char dir, int *dsf)
+                                  char dir, DSF *dsf)
 {
     int w = state->p.w, ai = ay*w+ax, bx, by, bi;
 
@@ -1820,12 +1830,37 @@ static int tracks_neighbour(int vertex, void *vctx)
         return -1;
 }
 
+/*
+ * The completion flash moves along the track, so we want to label
+ * each tile with how far along the track it is.  This is represented
+ * as an eight-bit field, which is more than enough when the
+ * completion flash is only 0.5 s long.
+ */
+static void set_flash_data(game_state *state)
+{
+    int ntrack = 0, x, y, n, d;
+    const int w = state->p.w;
+
+    for (x = 0; x < w; x++)
+        ntrack += state->numbers->numbers[x];
+    n = 0; x = 0; y = state->numbers->row_s; d = R;
+    do {
+        state->sflags[y*w + x] &= ~(S_FLASH_MASK << S_FLASH_SHIFT);
+        state->sflags[y*w + x] |=
+            n++ * (S_FLASH_MASK / (ntrack - 1)) << S_FLASH_SHIFT;
+        d = F(d); /* Find the direction we just arrived from. */
+        d = S_E_DIRS(state, x, y, E_TRACK) & ~d; /* Other track from here. */
+        x += DX(d); y += DY(d); /* Move to the next tile. */
+    } while (INGRID(state, x, y));
+}
+
 static bool check_completion(game_state *state, bool mark)
 {
     int w = state->p.w, h = state->p.h, x, y, i, target;
-    bool ret = true;
+    bool ret = true, pathret;
     int ntrack, nnotrack, ntrackcomplete;
-    int *dsf, pathclass;
+    DSF *dsf;
+    int pathclass;
     struct findloopstate *fls;
     struct tracks_neighbour_ctx ctx;
 
@@ -1844,60 +1879,7 @@ static bool check_completion(game_state *state, bool mark)
         }
     }
 
-    /* A cell is 'complete', for the purposes of marking the game as
-     * finished, if it has two edges marked as TRACK. But it only has
-     * to have one edge marked as TRACK, or be filled in as trackful
-     * without any specific edges known, to count towards checking
-     * row/column clue errors. */
-    for (x = 0; x < w; x++) {
-        target = state->numbers->numbers[x];
-        ntrack = nnotrack = ntrackcomplete = 0;
-        for (y = 0; y < h; y++) {
-            if (S_E_COUNT(state, x, y, E_TRACK) > 0 ||
-                state->sflags[y*w+x] & S_TRACK)
-                ntrack++;
-            if (S_E_COUNT(state, x, y, E_TRACK) == 2)
-                ntrackcomplete++;
-            if (state->sflags[y*w+x] & S_NOTRACK)
-                nnotrack++;
-        }
-        if (mark) {
-            if (ntrack > target || nnotrack > (h-target)) {
-                debug(("col %d error: target %d, track %d, notrack %d",
-                       x, target, ntrack, nnotrack));
-                state->num_errors[x] = 1;
-                ret = false;
-            }
-        }
-        if (ntrackcomplete != target)
-            ret = false;
-    }
-    for (y = 0; y < h; y++) {
-        target = state->numbers->numbers[w+y];
-        ntrack = nnotrack = ntrackcomplete = 0;
-        for (x = 0; x < w; x++) {
-            if (S_E_COUNT(state, x, y, E_TRACK) > 0 ||
-                state->sflags[y*w+x] & S_TRACK)
-                ntrack++;
-            if (S_E_COUNT(state, x, y, E_TRACK) == 2)
-                ntrackcomplete++;
-            if (state->sflags[y*w+x] & S_NOTRACK)
-                nnotrack++;
-        }
-        if (mark) {
-            if (ntrack > target || nnotrack > (w-target)) {
-                debug(("row %d error: target %d, track %d, notrack %d",
-                       y, target, ntrack, nnotrack));
-                state->num_errors[w+y] = 1;
-                ret = false;
-            }
-        }
-        if (ntrackcomplete != target)
-            ret = false;
-    }
-
-    dsf = snewn(w*h, int);
-    dsf_init(dsf, w*h);
+    dsf = dsf_new(w*h);
 
     for (x = 0; x < w; x++) {
         for (y = 0; y < h; y++) {
@@ -1949,9 +1931,75 @@ static bool check_completion(game_state *state, bool mark)
         }
     }
 
-    if (mark)
+    /*
+     * A cell is 'complete', for the purposes of marking the game as
+     * finished, if it has two edges marked as TRACK. But it only has
+     * to have one edge marked as TRACK, or be filled in as trackful
+     * without any specific edges known, to count towards checking
+     * row/column clue errors.
+     *
+     * This changes if we haven't found any other errors by this
+     * point, so the player has constructed a route from A to B.  In
+     * that case, we highlight any row/column where the actually laid
+     * tracks don't match the clue.
+     */
+    pathret = ret; /* Do we have a plausible solution so far? */
+    for (x = 0; x < w; x++) {
+        target = state->numbers->numbers[x];
+        ntrack = nnotrack = ntrackcomplete = 0;
+        for (y = 0; y < h; y++) {
+            if (S_E_COUNT(state, x, y, E_TRACK) > 0 ||
+                state->sflags[y*w+x] & S_TRACK)
+                ntrack++;
+            if (S_E_COUNT(state, x, y, E_TRACK) == 2)
+                ntrackcomplete++;
+            if (state->sflags[y*w+x] & S_NOTRACK)
+                nnotrack++;
+        }
+        if (mark) {
+            if (ntrack > target || nnotrack > (h-target) ||
+                (pathret && ntrackcomplete != target)) {
+                debug(("col %d error: target %d, track %d, notrack %d, "
+                       "pathret %d, trackcomplete %d",
+                       x, target, ntrack, nnotrack, pathret, ntrackcomplete));
+                state->num_errors[x] = 1;
+                ret = false;
+            }
+        }
+        if (ntrackcomplete != target)
+            ret = false;
+    }
+    for (y = 0; y < h; y++) {
+        target = state->numbers->numbers[w+y];
+        ntrack = nnotrack = ntrackcomplete = 0;
+        for (x = 0; x < w; x++) {
+            if (S_E_COUNT(state, x, y, E_TRACK) > 0 ||
+                state->sflags[y*w+x] & S_TRACK)
+                ntrack++;
+            if (S_E_COUNT(state, x, y, E_TRACK) == 2)
+                ntrackcomplete++;
+            if (state->sflags[y*w+x] & S_NOTRACK)
+                nnotrack++;
+        }
+        if (mark) {
+            if (ntrack > target || nnotrack > (w-target) ||
+                (pathret && ntrackcomplete != target)) {
+                debug(("row %d error: target %d, track %d, notrack %d, "
+                       "pathret %d, trackcomplete %d",
+                       y, target, ntrack, nnotrack, pathret, ntrackcomplete));
+                state->num_errors[w+y] = 1;
+                ret = false;
+            }
+        }
+        if (ntrackcomplete != target)
+            ret = false;
+    }
+
+    if (mark) {
         state->completed = ret;
-    sfree(dsf);
+        if (ret) set_flash_data(state);
+    }
+    dsf_free(dsf);
     return ret;
 }
 
@@ -1974,7 +2022,7 @@ static game_ui *new_ui(const game_state *state)
     ui->notrack = false;
     ui->dragging = false;
     ui->drag_sx = ui->drag_sy = ui->drag_ex = ui->drag_ey = -1;
-    ui->cursor_active = false;
+    ui->cursor_active = getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->curx = ui->cury = 1;
 
     return ui;
@@ -1985,27 +2033,19 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
-{
-}
-
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
                                const game_state *newstate)
 {
 }
 
-#define PREFERRED_TILE_SIZE 30
+#define PREFERRED_TILE_SIZE 33
 #define HALFSZ (ds->sz6*3)
 #define THIRDSZ (ds->sz6*2)
 #define TILE_SIZE (ds->sz6*6)
 
-#define BORDER (TILE_SIZE/8)
+#define MAX_BORDER (TILE_SIZE/8)
 #define LINE_THICK (TILE_SIZE/16)
+#define BORDER (ds->border)
 #define GRID_LINE_TL (ds->grid_line_tl)
 #define GRID_LINE_BR (ds->grid_line_br)
 #define GRID_LINE_ALL (ds->grid_line_all)
@@ -2028,7 +2068,7 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
 #define DS_CSHIFT 20    /* R/U/L/D shift, for cursor-on-edge */
 
 struct game_drawstate {
-    int sz6, grid_line_all, grid_line_tl, grid_line_br;
+    int sz6, border, grid_line_all, grid_line_tl, grid_line_br;
     bool started;
 
     int w, h, sz;
@@ -2120,6 +2160,35 @@ static bool ui_can_flip_square(const game_state *state, int x, int y, bool notra
     return true;
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (IS_CURSOR_SELECT(button) && ui->cursor_active) {
+        int gx = ui->curx / 2, gy = ui->cury / 2;
+        int w = state->p.w;
+        int direction =
+            ((ui->curx % 2) == 0) ? L : ((ui->cury % 2) == 0) ? U : 0;
+        if (direction &&
+            ui_can_flip_edge(state, gx, gy, direction,
+                             button == CURSOR_SELECT2)) {
+            unsigned ef = S_E_FLAGS(state, gx, gy, direction);
+            switch (button) {
+              case CURSOR_SELECT: return (ef & E_TRACK) ? "Clear" : "Track";
+              case CURSOR_SELECT2: return (ef & E_NOTRACK) ? "Clear" : "X";
+            }
+        }
+        if (!direction &&
+            ui_can_flip_square(state, gx, gy, button == CURSOR_SELECT2)) {
+            unsigned sf = state->sflags[gy*w+gx];
+            switch (button) {
+              case CURSOR_SELECT: return (sf & S_TRACK) ? "Clear" : "Track";
+              case CURSOR_SELECT2: return (sf & S_NOTRACK) ? "Clear" : "X";
+            }
+        }
+    }
+    return "";
+}
+
 static char *edge_flip_str(const game_state *state, int x, int y, int dir, bool notrack, char *buf) {
     unsigned ef = S_E_FLAGS(state, x, y, dir);
     char c;
@@ -2193,6 +2262,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (!INGRID(state, gx, gy)) {
             /* can't drag from off grid */
+            ui->drag_sx = ui->drag_sy = -1;
             return NULL;
         }
 
@@ -2209,13 +2279,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         ui->drag_sx = ui->drag_ex = gx;
         ui->drag_sy = ui->drag_ey = gy;
 
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_MOUSE_DRAG(button)) {
         ui->cursor_active = false;
         update_ui_drag(state, ui, gx, gy);
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_MOUSE_RELEASE(button)) {
@@ -2252,12 +2322,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             cy = CENTERED_COORD(gy);
 
             if (!INGRID(state, gx, gy) || FROMCOORD(x) != gx || FROMCOORD(y) != gy)
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
 
             if (max(abs(x-cx),abs(y-cy)) < TILE_SIZE/4) {
                 if (ui_can_flip_square(state, gx, gy, button == RIGHT_RELEASE))
                     return square_flip_str(state, gx, gy, button == RIGHT_RELEASE, tmpbuf);
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             } else {
                 if (abs(x-cx) < abs(y-cy)) {
                     /* Closest to top/bottom edge. */
@@ -2271,7 +2341,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                     return edge_flip_str(state, gx, gy, direction,
                             button == RIGHT_RELEASE, tmpbuf);
                 else
-                    return UI_UPDATE;
+                    return MOVE_UI_UPDATE;
             }
         }
     }
@@ -2284,7 +2354,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (!ui->cursor_active) {
             ui->cursor_active = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
 
         ui->curx = ui->curx + dx;
@@ -2295,17 +2365,17 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         }
         ui->curx = min(max(ui->curx, 1), 2*w-1);
         ui->cury = min(max(ui->cury, 1), 2*h-1);
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (IS_CURSOR_SELECT(button)) {
         if (!ui->cursor_active) {
             ui->cursor_active = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         /* click on square corner does nothing (shouldn't get here) */
         if ((ui->curx % 2) == 0 && (ui->cury % 2 == 0))
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
 
         gx = ui->curx / 2;
         gy = ui->cury / 2;
@@ -2317,7 +2387,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         else if (!direction &&
                  ui_can_flip_square(state, gx, gy, button == CURSOR_SELECT2))
             return square_flip_str(state, gx, gy, button == CURSOR_SELECT2, tmpbuf);
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
 #if 0
@@ -2334,6 +2404,7 @@ static game_state *execute_move(const game_state *state, const char *move)
     int w = state->p.w, x, y, n, i;
     char c, d;
     unsigned f;
+    bool move_is_solve = false;
     game_state *ret = dup_game(state);
 
     /* this is breaking the bank on GTK, which vsprintf's into a fixed-size buffer
@@ -2344,6 +2415,7 @@ static game_state *execute_move(const game_state *state, const char *move)
         c = *move;
         if (c == 'S') {
             ret->used_solve = true;
+            move_is_solve = true;
             move++;
         } else if (c == 'T' || c == 't' || c == 'N' || c == 'n') {
             /* set track, clear track; set notrack, clear notrack */
@@ -2355,6 +2427,9 @@ static game_state *execute_move(const game_state *state, const char *move)
             f = (c == 'T' || c == 't') ? S_TRACK : S_NOTRACK;
 
             if (d == 'S') {
+                if (!ui_can_flip_square(ret, x, y, f == S_NOTRACK) &&
+                    !move_is_solve)
+                    goto badmove;
                 if (c == 'T' || c == 'N')
                     ret->sflags[y*w+x] |= f;
                 else
@@ -2364,6 +2439,9 @@ static game_state *execute_move(const game_state *state, const char *move)
                     unsigned df = 1<<i;
 
                     if (MOVECHAR(df) == d) {
+                        if (!ui_can_flip_edge(ret, x, y, df, f == S_NOTRACK) &&
+                            !move_is_solve)
+                            goto badmove;
                         if (c == 'T' || c == 'N')
                             S_E_SET(ret, x, y, df, f);
                         else
@@ -2401,13 +2479,21 @@ static game_state *execute_move(const game_state *state, const char *move)
 #define FLASH_TIME 0.5F
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
-    /* Ick: fake up `ds->tilesize' for macro expansion purposes */
+    /* Ick: fake up `ds->sz6' and `ds->border` for macro expansion purposes */
     struct {
-        int sz6;
+        int sz6, border;
     } ads, *ds = &ads;
     ads.sz6 = tilesize/6;
+    ads.border = MAX_BORDER;
+    /*
+     * Allow a reduced border at small tile sizes because the steps
+     * are quite large and it's better to have a thin border than
+     * to go down to a smaller tile size.
+     */
+    if (ads.border <= 5)
+        ads.border = min(tilesize % 6, MAX_BORDER);
     *x = (params->w+2) * TILE_SIZE + 2 * BORDER;
     *y = (params->h+2) * TILE_SIZE + 2 * BORDER;
 }
@@ -2416,14 +2502,16 @@ static void game_set_size(drawing *dr, game_drawstate *ds,
                           const game_params *params, int tilesize)
 {
     ds->sz6 = tilesize/6;
+    ds->border = MAX_BORDER;
+    if (ds->border <= 5)
+        ds->border = min(tilesize % 6, MAX_BORDER);
     ds->grid_line_all = max(LINE_THICK, 1);
     ds->grid_line_br = ds->grid_line_all / 2;
     ds->grid_line_tl = ds->grid_line_all - ds->grid_line_br;
 }
 
 enum {
-    COL_BACKGROUND, COL_LOWLIGHT, COL_HIGHLIGHT,
-    COL_TRACK_BACKGROUND = COL_LOWLIGHT,
+    COL_BACKGROUND, COL_TRACK_BACKGROUND,
     COL_GRID, COL_CLUE, COL_CURSOR,
     COL_TRACK, COL_TRACK_CLUE, COL_SLEEPER,
     COL_DRAGON, COL_DRAGOFF,
@@ -2436,14 +2524,15 @@ 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);
+    game_mkhighlight(fe, ret, COL_BACKGROUND, -1, COL_TRACK_BACKGROUND);
+    colour_mix(&ret[COL_BACKGROUND*3], &ret[COL_TRACK_BACKGROUND*3], 0.5F,
+               &ret[COL_GRID*3]);
 
     for (i = 0; i < 3; i++) {
         ret[COL_TRACK_CLUE       * 3 + i] = 0.0F;
         ret[COL_TRACK            * 3 + i] = 0.5F;
         ret[COL_CLUE             * 3 + i] = 0.0F;
-        ret[COL_GRID             * 3 + i] = 0.75F;
-        ret[COL_CURSOR           * 3 + i] = 0.6F;
+        ret[COL_CURSOR           * 3 + i] = 0.3F;
         ret[COL_ERROR_BACKGROUND * 3 + i] = 1.0F;
     }
 
@@ -2535,7 +2624,8 @@ static void draw_thick_circle_outline(drawing *dr, float thickness,
         x2 = cx + r*(float)cos(th2);
         y1 = cy + r*(float)sin(th);
         y2 = cy + r*(float)sin(th2);
-        debug(("circ outline: x=%.2f -> %.2f, thick=%.2f", x1, x2, thickness));
+        debug(("circ outline: x=%.2f -> %.2f, thick=%.2f\n",
+               x1, x2, thickness));
         draw_thick_line(dr, thickness, x1, y1, x2, y2, colour);
     }
 }
@@ -2665,7 +2755,7 @@ static void draw_square(drawing *dr, game_drawstate *ds,
             curx = ox + TILE_SIZE - off; curw = 2*off + 1;
         }
 
-        draw_rect_outline(dr, curx, cury, curw, curh, COL_GRID);
+        draw_rect_outline(dr, curx, cury, curw, curh, COL_CURSOR);
     }
 
     /* Draw tracks themselves */
@@ -2777,20 +2867,11 @@ static void game_redraw(drawing *dr, game_drawstate *ds, const game_state *oldst
                         const game_state *state, int dir, const game_ui *ui,
                         float animtime, float flashtime)
 {
-    int i, x, y, flashing = 0, w = ds->w, h = ds->h;
+    int i, x, y, flashing, w = ds->w, h = ds->h;
     bool force = false;
     game_state *drag_state = NULL;
 
     if (!ds->started) {
-        /*
-         * The initial contents of the window are not guaranteed and
-         * can vary with front ends. To be on the safe side, all games
-         * should start by drawing a big background-colour rectangle
-         * covering the whole window.
-         */
-        draw_rect(dr, 0, 0, (w+2)*TILE_SIZE + 2*BORDER, (h+2)*TILE_SIZE + 2*BORDER,
-                  COL_BACKGROUND);
-
         draw_loop_ends(dr, ds, state, COL_CLUE);
 
         draw_rect(dr, COORD(0) - GRID_LINE_BR, COORD(0) - GRID_LINE_BR,
@@ -2812,11 +2893,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds, const game_state *oldst
         }
     }
 
-    if (flashtime > 0 &&
-            (flashtime <= FLASH_TIME/3 ||
-             flashtime >= FLASH_TIME*2/3))
-        flashing = DS_FLASH;
-
     if (ui->dragging)
         drag_state = copy_and_apply_drag(state, ui);
 
@@ -2824,6 +2900,16 @@ static void game_redraw(drawing *dr, game_drawstate *ds, const game_state *oldst
         for (y = 0; y < h; y++) {
             unsigned int f, f_d;
 
+            flashing = 0;
+            if (flashtime > 0) {
+                float flashpos =
+                    (state->sflags[y*w+x] >> S_FLASH_SHIFT & S_FLASH_MASK) /
+                    (float)S_FLASH_MASK;
+                if (flashtime > FLASH_TIME / 2 * flashpos &&
+                    flashtime <= FLASH_TIME / 2 * (flashpos + 1.0F))
+                    flashing = DS_FLASH;
+            }
+
             f = s2d_flags(state, x, y, ui) | flashing;
             f_d = drag_state ? s2d_flags(drag_state, x, y, ui) : f;
 
@@ -2890,22 +2976,19 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /* The Times uses 7mm squares */
-    game_compute_size(params, 700, &pw, &ph);
+    game_compute_size(params, 700, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w = state->p.w, h = state->p.h;
     int black = print_mono_colour(dr, 0), grey = print_grey_colour(dr, 0.5F);
@@ -2948,7 +3031,7 @@ static void game_print(drawing *dr, const game_state *state, int tilesize)
 #endif
 
 const struct game thegame = {
-    "Tracks", "games.tracks", "tracks",
+    "Train Tracks", "games.tracks", "tracks",
     default_params,
     game_fetch_preset, NULL,
     decode_params,
@@ -2964,12 +3047,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2983,7 +3068,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/tree234.c b/apps/plugins/puzzles/src/tree234.c
index ad8eb047cd..ef2c3ffaf7 100644
--- a/apps/plugins/puzzles/src/tree234.c
+++ b/apps/plugins/puzzles/src/tree234.c
@@ -29,33 +29,25 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#define TREE234_INTERNALS
 #include "tree234.h"
 
 #include "puzzles.h"                   /* for smalloc/sfree */
 
-#ifdef TEST
-#define LOG(x) (printf x)
-#define smalloc malloc
-#define srealloc realloc
-#define sfree free
+#ifdef DEBUG_TREE234
+#include <stdarg.h>
+static void logprintf(const char *fmt, ...)
+{
+    va_list ap;
+    va_start(ap, fmt);
+    vprintf(fmt, ap);
+    va_end(ap);
+}
+#define LOG(x) (logprintf x)
 #else
 #define LOG(x)
 #endif
 
-typedef struct node234_Tag node234;
-
-struct tree234_Tag {
-    node234 *root;
-    cmpfn234 cmp;
-};
-
-struct node234_Tag {
-    node234 *parent;
-    node234 *kids[4];
-    int counts[4];
-    void *elems[3];
-};
-
 /*
  * Create a 2-3-4 tree.
  */
@@ -327,7 +319,7 @@ static void *add234_internal(tree234 *t, void *e, int index) {
     }
 
     n = t->root;
-    while (n) {
+    do {
         LOG(("  node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n",
              n,
              n->kids[0], n->counts[0], n->elems[0],
@@ -380,7 +372,7 @@ static void *add234_internal(tree234 *t, void *e, int index) {
         if (!n->kids[ki])
             break;
         n = n->kids[ki];
-    }
+    } while (n);
 
     add234_insert(NULL, e, NULL, &t->root, n, ki);
 
@@ -1104,7 +1096,7 @@ static node234 *join234_internal(node234 *left, void *sep,
 
     return root;
 }
-static int height234(tree234 *t) {
+int height234(tree234 *t) {
     int level = 0;
     node234 *n = t->root;
     while (n) {
@@ -1452,749 +1444,3 @@ tree234 *copytree234(tree234 *t, copyfn234 copyfn, void *copyfnstate) {
 
     return t2;
 }
-
-#ifdef TEST
-
-/*
- * Test code for the 2-3-4 tree. This code maintains an alternative
- * representation of the data in the tree, in an array (using the
- * obvious and slow insert and delete functions). After each tree
- * operation, the verify() function is called, which ensures all
- * the tree properties are preserved:
- *  - node->child->parent always equals node
- *  - tree->root->parent always equals NULL
- *  - number of kids == 0 or number of elements + 1;
- *  - tree has the same depth everywhere
- *  - every node has at least one element
- *  - subtree element counts are accurate
- *  - any NULL kid pointer is accompanied by a zero count
- *  - in a sorted tree: ordering property between elements of a
- *    node and elements of its children is preserved
- * and also ensures the list represented by the tree is the same
- * list it should be. (This last check also doubly verifies the
- * ordering properties, because the `same list it should be' is by
- * definition correctly ordered. It also ensures all nodes are
- * distinct, because the enum functions would get caught in a loop
- * if not.)
- */
-
-#include <string.h>
-#include <stdarg.h>
-
-#define srealloc realloc
-
-/*
- * Error reporting function.
- */
-void error(char *fmt, ...) {
-    va_list ap;
-    printf("ERROR: ");
-    va_start(ap, fmt);
-    vfprintf(stdout, fmt, ap);
-    va_end(ap);
-    printf("\n");
-}
-
-/* The array representation of the data. */
-void **array;
-int arraylen, arraysize;
-cmpfn234 cmp;
-
-/* The tree representation of the same data. */
-tree234 *tree;
-
-/*
- * Routines to provide a diagnostic printout of a tree. Currently
- * relies on every element in the tree being a one-character string
- * :-)
- */
-typedef struct {
-    char **levels;
-} dispctx;
-
-int dispnode(node234 *n, int level, dispctx *ctx) {
-    if (level == 0) {
-        int xpos = strlen(ctx->levels[0]);
-        int len;
-
-        if (n->elems[2])
-            len = sprintf(ctx->levels[0]+xpos, " %s%s%s",
-                          n->elems[0], n->elems[1], n->elems[2]);
-        else if (n->elems[1])
-            len = sprintf(ctx->levels[0]+xpos, " %s%s",
-                          n->elems[0], n->elems[1]);
-        else
-            len = sprintf(ctx->levels[0]+xpos, " %s",
-                          n->elems[0]);
-        return xpos + 1 + (len-1) / 2;
-    } else {
-        int xpos[4], nkids;
-        int nodelen, mypos, myleft, x, i;
-
-        xpos[0] = dispnode(n->kids[0], level-3, ctx);
-        xpos[1] = dispnode(n->kids[1], level-3, ctx);
-        nkids = 2;
-        if (n->kids[2]) {
-            xpos[2] = dispnode(n->kids[2], level-3, ctx);
-            nkids = 3;
-        }
-        if (n->kids[3]) {
-            xpos[3] = dispnode(n->kids[3], level-3, ctx);
-            nkids = 4;
-        }
-
-        if (nkids == 4)
-            mypos = (xpos[1] + xpos[2]) / 2;
-        else if (nkids == 3)
-            mypos = xpos[1];
-        else
-            mypos = (xpos[0] + xpos[1]) / 2;
-        nodelen = nkids * 2 - 1;
-        myleft = mypos - ((nodelen-1)/2);
-        assert(myleft >= xpos[0]);
-        assert(myleft + nodelen-1 <= xpos[nkids-1]);
-
-        x = strlen(ctx->levels[level]);
-        while (x <= xpos[0] && x < myleft)
-            ctx->levels[level][x++] = ' ';
-        while (x < myleft)
-            ctx->levels[level][x++] = '_';
-        if (nkids==4)
-            x += sprintf(ctx->levels[level]+x, ".%s.%s.%s.",
-                         n->elems[0], n->elems[1], n->elems[2]);
-        else if (nkids==3)
-            x += sprintf(ctx->levels[level]+x, ".%s.%s.",
-                         n->elems[0], n->elems[1]);
-        else
-            x += sprintf(ctx->levels[level]+x, ".%s.",
-                         n->elems[0]);
-        while (x < xpos[nkids-1])
-            ctx->levels[level][x++] = '_';
-        ctx->levels[level][x] = '\0';
-
-        x = strlen(ctx->levels[level-1]);
-        for (i = 0; i < nkids; i++) {
-            int rpos, pos;
-            rpos = xpos[i];
-            if (i > 0 && i < nkids-1)
-                pos = myleft + 2*i;
-            else
-                pos = rpos;
-            if (rpos < pos)
-                rpos++;
-            while (x < pos && x < rpos)
-                ctx->levels[level-1][x++] = ' ';
-            if (x == pos)
-                ctx->levels[level-1][x++] = '|';
-            while (x < pos || x < rpos)
-                ctx->levels[level-1][x++] = '_';
-            if (x == pos)
-                ctx->levels[level-1][x++] = '|';
-        }
-        ctx->levels[level-1][x] = '\0';
-
-        x = strlen(ctx->levels[level-2]);
-        for (i = 0; i < nkids; i++) {
-            int rpos = xpos[i];
-
-            while (x < rpos)
-                ctx->levels[level-2][x++] = ' ';
-            ctx->levels[level-2][x++] = '|';
-        }
-        ctx->levels[level-2][x] = '\0';
-
-        return mypos;
-    }
-}
-
-void disptree(tree234 *t) {
-    dispctx ctx;
-    char *leveldata;
-    int width = count234(t);
-    int ht = height234(t) * 3 - 2;
-    int i;
-
-    if (!t->root) {
-        printf("[empty tree]\n");
-    }
-
-    leveldata = smalloc(ht * (width+2));
-    ctx.levels = smalloc(ht * sizeof(char *));
-    for (i = 0; i < ht; i++) {
-        ctx.levels[i] = leveldata + i * (width+2);
-        ctx.levels[i][0] = '\0';
-    }
-
-    (void) dispnode(t->root, ht-1, &ctx);
-
-    for (i = ht; i-- ;)
-        printf("%s\n", ctx.levels[i]);
-
-    sfree(ctx.levels);
-    sfree(leveldata);
-}
-
-typedef struct {
-    int treedepth;
-    int elemcount;
-} chkctx;
-
-int chknode(chkctx *ctx, int level, node234 *node,
-            void *lowbound, void *highbound) {
-    int nkids, nelems;
-    int i;
-    int count;
-
-    /* Count the non-NULL kids. */
-    for (nkids = 0; nkids < 4 && node->kids[nkids]; nkids++);
-    /* Ensure no kids beyond the first NULL are non-NULL. */
-    for (i = nkids; i < 4; i++)
-        if (node->kids[i]) {
-            error("node %p: nkids=%d but kids[%d] non-NULL",
-                   node, nkids, i);
-        } else if (node->counts[i]) {
-            error("node %p: kids[%d] NULL but count[%d]=%d nonzero",
-                   node, i, i, node->counts[i]);
-        }
-
-    /* Count the non-NULL elements. */
-    for (nelems = 0; nelems < 3 && node->elems[nelems]; nelems++);
-    /* Ensure no elements beyond the first NULL are non-NULL. */
-    for (i = nelems; i < 3; i++)
-        if (node->elems[i]) {
-            error("node %p: nelems=%d but elems[%d] non-NULL",
-                   node, nelems, i);
-        }
-
-    if (nkids == 0) {
-        /*
-         * If nkids==0, this is a leaf node; verify that the tree
-         * depth is the same everywhere.
-         */
-        if (ctx->treedepth < 0)
-            ctx->treedepth = level;    /* we didn't know the depth yet */
-        else if (ctx->treedepth != level)
-            error("node %p: leaf at depth %d, previously seen depth %d",
-                   node, level, ctx->treedepth);
-    } else {
-        /*
-         * If nkids != 0, then it should be nelems+1, unless nelems
-         * is 0 in which case nkids should also be 0 (and so we
-         * shouldn't be in this condition at all).
-         */
-        int shouldkids = (nelems ? nelems+1 : 0);
-        if (nkids != shouldkids) {
-            error("node %p: %d elems should mean %d kids but has %d",
-                   node, nelems, shouldkids, nkids);
-        }
-    }
-
-    /*
-     * nelems should be at least 1.
-     */
-    if (nelems == 0) {
-        error("node %p: no elems", node, nkids);
-    }
-
-    /*
-     * Add nelems to the running element count of the whole tree.
-     */
-    ctx->elemcount += nelems;
-
-    /*
-     * Check ordering property: all elements should be strictly >
-     * lowbound, strictly < highbound, and strictly < each other in
-     * sequence. (lowbound and highbound are NULL at edges of tree
-     * - both NULL at root node - and NULL is considered to be <
-     * everything and > everything. IYSWIM.)
-     */
-    if (cmp) {
-        for (i = -1; i < nelems; i++) {
-            void *lower = (i == -1 ? lowbound : node->elems[i]);
-            void *higher = (i+1 == nelems ? highbound : node->elems[i+1]);
-            if (lower && higher && cmp(lower, higher) >= 0) {
-                error("node %p: kid comparison [%d=%s,%d=%s] failed",
-                      node, i, lower, i+1, higher);
-            }
-        }
-    }
-
-    /*
-     * Check parent pointers: all non-NULL kids should have a
-     * parent pointer coming back to this node.
-     */
-    for (i = 0; i < nkids; i++)
-        if (node->kids[i]->parent != node) {
-            error("node %p kid %d: parent ptr is %p not %p",
-                   node, i, node->kids[i]->parent, node);
-        }
-
-
-    /*
-     * Now (finally!) recurse into subtrees.
-     */
-    count = nelems;
-
-    for (i = 0; i < nkids; i++) {
-        void *lower = (i == 0 ? lowbound : node->elems[i-1]);
-        void *higher = (i >= nelems ? highbound : node->elems[i]);
-        int subcount = chknode(ctx, level+1, node->kids[i], lower, higher);
-        if (node->counts[i] != subcount) {
-            error("node %p kid %d: count says %d, subtree really has %d",
-                  node, i, node->counts[i], subcount);
-        }
-        count += subcount;
-    }
-
-    return count;
-}
-
-void verifytree(tree234 *tree, void **array, int arraylen) {
-    chkctx ctx;
-    int i;
-    void *p;
-
-    ctx.treedepth = -1;                /* depth unknown yet */
-    ctx.elemcount = 0;                 /* no elements seen yet */
-    /*
-     * Verify validity of tree properties.
-     */
-    if (tree->root) {
-        if (tree->root->parent != NULL)
-            error("root->parent is %p should be null", tree->root->parent);
-        chknode(&ctx, 0, tree->root, NULL, NULL);
-    }
-    printf("tree depth: %d\n", ctx.treedepth);
-    /*
-     * Enumerate the tree and ensure it matches up to the array.
-     */
-    for (i = 0; NULL != (p = index234(tree, i)); i++) {
-        if (i >= arraylen)
-            error("tree contains more than %d elements", arraylen);
-        if (array[i] != p)
-            error("enum at position %d: array says %s, tree says %s",
-                   i, array[i], p);
-    }
-    if (ctx.elemcount != i) {
-        error("tree really contains %d elements, enum gave %d",
-               ctx.elemcount, i);
-    }
-    if (i < arraylen) {
-        error("enum gave only %d elements, array has %d", i, arraylen);
-    }
-    i = count234(tree);
-    if (ctx.elemcount != i) {
-        error("tree really contains %d elements, count234 gave %d",
-              ctx.elemcount, i);
-    }
-}
-void verify(void) { verifytree(tree, array, arraylen); }
-
-void internal_addtest(void *elem, int index, void *realret) {
-    int i, j;
-    void *retval;
-
-    if (arraysize < arraylen+1) {
-        arraysize = arraylen+1+256;
-        array = (array == NULL ? smalloc(arraysize*sizeof(*array)) :
-                 srealloc(array, arraysize*sizeof(*array)));
-    }
-
-    i = index;
-    /* now i points to the first element >= elem */
-    retval = elem;                  /* expect elem returned (success) */
-    for (j = arraylen; j > i; j--)
-        array[j] = array[j-1];
-    array[i] = elem;                /* add elem to array */
-    arraylen++;
-
-    if (realret != retval) {
-        error("add: retval was %p expected %p", realret, retval);
-    }
-
-    verify();
-}
-
-void addtest(void *elem) {
-    int i;
-    void *realret;
-
-    realret = add234(tree, elem);
-
-    i = 0;
-    while (i < arraylen && cmp(elem, array[i]) > 0)
-        i++;
-    if (i < arraylen && !cmp(elem, array[i])) {
-        void *retval = array[i];       /* expect that returned not elem */
-        if (realret != retval) {
-            error("add: retval was %p expected %p", realret, retval);
-        }
-    } else
-        internal_addtest(elem, i, realret);
-}
-
-void addpostest(void *elem, int i) {
-    void *realret;
-
-    realret = addpos234(tree, elem, i);
-
-    internal_addtest(elem, i, realret);
-}
-
-void delpostest(int i) {
-    int index = i;
-    void *elem = array[i], *ret;
-
-    /* i points to the right element */
-    while (i < arraylen-1) {
-        array[i] = array[i+1];
-        i++;
-    }
-    arraylen--;                        /* delete elem from array */
-
-    if (tree->cmp)
-        ret = del234(tree, elem);
-    else
-        ret = delpos234(tree, index);
-
-    if (ret != elem) {
-        error("del returned %p, expected %p", ret, elem);
-    }
-
-    verify();
-}
-
-void deltest(void *elem) {
-    int i;
-
-    i = 0;
-    while (i < arraylen && cmp(elem, array[i]) > 0)
-        i++;
-    if (i >= arraylen || cmp(elem, array[i]) != 0)
-        return;                        /* don't do it! */
-    delpostest(i);
-}
-
-/* A sample data set and test utility. Designed for pseudo-randomness,
- * and yet repeatability. */
-
-/*
- * This random number generator uses the `portable implementation'
- * given in ANSI C99 draft N869. It assumes `unsigned' is 32 bits;
- * change it if not.
- */
-int randomnumber(unsigned *seed) {
-    *seed *= 1103515245;
-    *seed += 12345;
-    return ((*seed) / 65536) % 32768;
-}
-
-int mycmp(void *av, void *bv) {
-    char const *a = (char const *)av;
-    char const *b = (char const *)bv;
-    return strcmp(a, b);
-}
-
-char *strings[] = {
-    "0", "2", "3", "I", "K", "d", "H", "J", "Q", "N", "n", "q", "j", "i",
-    "7", "G", "F", "D", "b", "x", "g", "B", "e", "v", "V", "T", "f", "E",
-    "S", "8", "A", "k", "X", "p", "C", "R", "a", "o", "r", "O", "Z", "u",
-    "6", "1", "w", "L", "P", "M", "c", "U", "h", "9", "t", "5", "W", "Y",
-    "m", "s", "l", "4",
-#if 0
-    "a", "ab", "absque", "coram", "de",
-    "palam", "clam", "cum", "ex", "e",
-    "sine", "tenus", "pro", "prae",
-    "banana", "carrot", "cabbage", "broccoli", "onion", "zebra",
-    "penguin", "blancmange", "pangolin", "whale", "hedgehog",
-    "giraffe", "peanut", "bungee", "foo", "bar", "baz", "quux",
-    "murfl", "spoo", "breen", "flarn", "octothorpe",
-    "snail", "tiger", "elephant", "octopus", "warthog", "armadillo",
-    "aardvark", "wyvern", "dragon", "elf", "dwarf", "orc", "goblin",
-    "pixie", "basilisk", "warg", "ape", "lizard", "newt", "shopkeeper",
-    "wand", "ring", "amulet"
-#endif
-};
-
-#define NSTR lenof(strings)
-
-void findtest(void) {
-    static const int rels[] = {
-        REL234_EQ, REL234_GE, REL234_LE, REL234_LT, REL234_GT
-    };
-    static const char *const relnames[] = {
-        "EQ", "GE", "LE", "LT", "GT"
-    };
-    int i, j, rel, index;
-    char *p, *ret, *realret, *realret2;
-    int lo, hi, mid, c;
-
-    for (i = 0; i < (int)NSTR; i++) {
-        p = strings[i];
-        for (j = 0; j < (int)(sizeof(rels)/sizeof(*rels)); j++) {
-            rel = rels[j];
-
-            lo = 0; hi = arraylen-1;
-            while (lo <= hi) {
-                mid = (lo + hi) / 2;
-                c = strcmp(p, array[mid]);
-                if (c < 0)
-                    hi = mid-1;
-                else if (c > 0)
-                    lo = mid+1;
-                else
-                    break;
-            }
-
-            if (c == 0) {
-                if (rel == REL234_LT)
-                    ret = (mid > 0 ? array[--mid] : NULL);
-                else if (rel == REL234_GT)
-                    ret = (mid < arraylen-1 ? array[++mid] : NULL);
-                else
-                    ret = array[mid];
-            } else {
-                assert(lo == hi+1);
-                if (rel == REL234_LT || rel == REL234_LE) {
-                    mid = hi;
-                    ret = (hi >= 0 ? array[hi] : NULL);
-                } else if (rel == REL234_GT || rel == REL234_GE) {
-                    mid = lo;
-                    ret = (lo < arraylen ? array[lo] : NULL);
-                } else
-                    ret = NULL;
-            }
-
-            realret = findrelpos234(tree, p, NULL, rel, &index);
-            if (realret != ret) {
-                error("find(\"%s\",%s) gave %s should be %s",
-                      p, relnames[j], realret, ret);
-            }
-            if (realret && index != mid) {
-                error("find(\"%s\",%s) gave %d should be %d",
-                      p, relnames[j], index, mid);
-            }
-            if (realret && rel == REL234_EQ) {
-                realret2 = index234(tree, index);
-                if (realret2 != realret) {
-                    error("find(\"%s\",%s) gave %s(%d) but %d -> %s",
-                          p, relnames[j], realret, index, index, realret2);
-                }
-            }
-#if 0
-            printf("find(\"%s\",%s) gave %s(%d)\n", p, relnames[j],
-                   realret, index);
-#endif
-        }
-    }
-
-    realret = findrelpos234(tree, NULL, NULL, REL234_GT, &index);
-    if (arraylen && (realret != array[0] || index != 0)) {
-        error("find(NULL,GT) gave %s(%d) should be %s(0)",
-              realret, index, array[0]);
-    } else if (!arraylen && (realret != NULL)) {
-        error("find(NULL,GT) gave %s(%d) should be NULL",
-              realret, index);
-    }
-
-    realret = findrelpos234(tree, NULL, NULL, REL234_LT, &index);
-    if (arraylen && (realret != array[arraylen-1] || index != arraylen-1)) {
-        error("find(NULL,LT) gave %s(%d) should be %s(0)",
-              realret, index, array[arraylen-1]);
-    } else if (!arraylen && (realret != NULL)) {
-        error("find(NULL,LT) gave %s(%d) should be NULL",
-              realret, index);
-    }
-}
-
-void splittest(tree234 *tree, void **array, int arraylen) {
-    int i;
-    tree234 *tree3, *tree4;
-    for (i = 0; i <= arraylen; i++) {
-        tree3 = copytree234(tree, NULL, NULL);
-        tree4 = splitpos234(tree3, i, false);
-        verifytree(tree3, array, i);
-        verifytree(tree4, array+i, arraylen-i);
-        join234(tree3, tree4);
-        freetree234(tree4);            /* left empty by join */
-        verifytree(tree3, array, arraylen);
-        freetree234(tree3);
-    }
-}
-
-int main(void) {
-    int in[NSTR];
-    int i, j, k;
-    int tworoot, tmplen;
-    unsigned seed = 0;
-    tree234 *tree2, *tree3, *tree4;
-    int c;
-
-    setvbuf(stdout, NULL, _IOLBF, 0);
-
-    for (i = 0; i < (int)NSTR; i++) in[i] = 0;
-    array = NULL;
-    arraylen = arraysize = 0;
-    tree = newtree234(mycmp);
-    cmp = mycmp;
-
-    verify();
-    for (i = 0; i < 10000; i++) {
-        j = randomnumber(&seed);
-        j %= NSTR;
-        printf("trial: %d\n", i);
-        if (in[j]) {
-            printf("deleting %s (%d)\n", strings[j], j);
-            deltest(strings[j]);
-            in[j] = 0;
-        } else {
-            printf("adding %s (%d)\n", strings[j], j);
-            addtest(strings[j]);
-            in[j] = 1;
-        }
-        disptree(tree);
-        findtest();
-    }
-
-    while (arraylen > 0) {
-        j = randomnumber(&seed);
-        j %= arraylen;
-        deltest(array[j]);
-    }
-
-    freetree234(tree);
-
-    /*
-     * Now try an unsorted tree. We don't really need to test
-     * delpos234 because we know del234 is based on it, so it's
-     * already been tested in the above sorted-tree code; but for
-     * completeness we'll use it to tear down our unsorted tree
-     * once we've built it.
-     */
-    tree = newtree234(NULL);
-    cmp = NULL;
-    verify();
-    for (i = 0; i < 1000; i++) {
-        printf("trial: %d\n", i);
-        j = randomnumber(&seed);
-        j %= NSTR;
-        k = randomnumber(&seed);
-        k %= count234(tree)+1;
-        printf("adding string %s at index %d\n", strings[j], k);
-        addpostest(strings[j], k);
-    }
-
-    /*
-     * While we have this tree in its full form, we'll take a copy
-     * of it to use in split and join testing.
-     */
-    tree2 = copytree234(tree, NULL, NULL);
-    verifytree(tree2, array, arraylen);/* check the copy is accurate */
-    /*
-     * Split tests. Split the tree at every possible point and
-     * check the resulting subtrees.
-     */
-    tworoot = (!tree2->root->elems[1]);/* see if it has a 2-root */
-    splittest(tree2, array, arraylen);
-    /*
-     * Now do the split test again, but on a tree that has a 2-root
-     * (if the previous one didn't) or doesn't (if the previous one
-     * did).
-     */
-    tmplen = arraylen;
-    while ((!tree2->root->elems[1]) == tworoot) {
-        delpos234(tree2, --tmplen);
-    }
-    printf("now trying splits on second tree\n");
-    splittest(tree2, array, tmplen);
-    freetree234(tree2);
-
-    /*
-     * Back to the main testing of uncounted trees.
-     */
-    while (count234(tree) > 0) {
-        printf("cleanup: tree size %d\n", count234(tree));
-        j = randomnumber(&seed);
-        j %= count234(tree);
-        printf("deleting string %s from index %d\n", (char *)array[j], j);
-        delpostest(j);
-    }
-    freetree234(tree);
-
-    /*
-     * Finally, do some testing on split/join on _sorted_ trees. At
-     * the same time, we'll be testing split on very small trees.
-     */
-    tree = newtree234(mycmp);
-    cmp = mycmp;
-    arraylen = 0;
-    for (i = 0; i < 17; i++) {
-        tree2 = copytree234(tree, NULL, NULL);
-        splittest(tree2, array, arraylen);
-        freetree234(tree2);
-        if (i < 16)
-            addtest(strings[i]);
-    }
-    freetree234(tree);
-
-    /*
-     * Test silly cases of join: join(emptytree, emptytree), and
-     * also ensure join correctly spots when sorted trees fail the
-     * ordering constraint.
-     */
-    tree = newtree234(mycmp);
-    tree2 = newtree234(mycmp);
-    tree3 = newtree234(mycmp);
-    tree4 = newtree234(mycmp);
-    assert(mycmp(strings[0], strings[1]) < 0);   /* just in case :-) */
-    add234(tree2, strings[1]);
-    add234(tree4, strings[0]);
-    array[0] = strings[0];
-    array[1] = strings[1];
-    verifytree(tree, array, 0);
-    verifytree(tree2, array+1, 1);
-    verifytree(tree3, array, 0);
-    verifytree(tree4, array, 1);
-
-    /*
-     * So:
-     *  - join(tree,tree3) should leave both tree and tree3 unchanged.
-     *  - joinr(tree,tree2) should leave both tree and tree2 unchanged.
-     *  - join(tree4,tree3) should leave both tree3 and tree4 unchanged.
-     *  - join(tree, tree2) should move the element from tree2 to tree.
-     *  - joinr(tree4, tree3) should move the element from tree4 to tree3.
-     *  - join(tree,tree3) should return NULL and leave both unchanged.
-     *  - join(tree3,tree) should work and create a bigger tree in tree3.
-     */
-    assert(tree == join234(tree, tree3));
-    verifytree(tree, array, 0);
-    verifytree(tree3, array, 0);
-    assert(tree2 == join234r(tree, tree2));
-    verifytree(tree, array, 0);
-    verifytree(tree2, array+1, 1);
-    assert(tree4 == join234(tree4, tree3));
-    verifytree(tree3, array, 0);
-    verifytree(tree4, array, 1);
-    assert(tree == join234(tree, tree2));
-    verifytree(tree, array+1, 1);
-    verifytree(tree2, array, 0);
-    assert(tree3 == join234r(tree4, tree3));
-    verifytree(tree3, array, 1);
-    verifytree(tree4, array, 0);
-    assert(NULL == join234(tree, tree3));
-    verifytree(tree, array+1, 1);
-    verifytree(tree3, array, 1);
-    assert(tree3 == join234(tree3, tree));
-    verifytree(tree3, array, 2);
-    verifytree(tree, array, 0);
-
-    return 0;
-}
-
-#endif
-
-#if 0 /* sorted list of strings might be useful */
-{
-    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x",
-}
-#endif
diff --git a/apps/plugins/puzzles/src/tree234.h b/apps/plugins/puzzles/src/tree234.h
index ccd943d69d..b58f939a0a 100644
--- a/apps/plugins/puzzles/src/tree234.h
+++ b/apps/plugins/puzzles/src/tree234.h
@@ -31,7 +31,11 @@
 #include <stdbool.h>
 
 /*
- * This typedef is opaque outside tree234.c itself.
+ * This typedef is typically opaque outside tree234.c itself. But you
+ * can define TREE234_INTERNALS to get a definition of it and its
+ * subsidiary node structure, as long as you're prepared to commit to
+ * responding to changes in the internals (which probably means you're
+ * tree234.c itself or tree234-test.c).
  */
 typedef struct tree234_Tag tree234;
 
@@ -39,6 +43,24 @@ typedef int (*cmpfn234)(void *, void *);
 
 typedef void *(*copyfn234)(void *state, void *element);
 
+#ifdef TREE234_INTERNALS
+typedef struct node234_Tag node234;
+
+struct tree234_Tag {
+    node234 *root;
+    cmpfn234 cmp;
+};
+
+struct node234_Tag {
+    node234 *parent;
+    node234 *kids[4];
+    int counts[4];
+    void *elems[3];
+};
+
+int height234(tree234 *t);
+#endif
+
 /*
  * Create a 2-3-4 tree. If `cmp' is NULL, the tree is unsorted, and
  * lookups by key will fail: you can only look things up by numeric
diff --git a/apps/plugins/puzzles/src/twiddle.R b/apps/plugins/puzzles/src/twiddle.R
deleted file mode 100644
index 1495c33181..0000000000
--- a/apps/plugins/puzzles/src/twiddle.R
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- makefile -*-
-
-twiddle  : [X] GTK COMMON twiddle twiddle-icon|no-icon
-
-twiddle  : [G] WINDOWS COMMON twiddle twiddle.res|noicon.res
-
-ALL += twiddle[COMBINED]
-
-!begin am gtk
-GAMES += twiddle
-!end
-
-!begin >list.c
-    A(twiddle) \
-!end
-
-!begin >gamedesc.txt
-twiddle:twiddle.exe:Twiddle:Rotational sliding block puzzle:Rotate the tiles around themselves to arrange them into order.
-!end
diff --git a/apps/plugins/puzzles/src/twiddle.c b/apps/plugins/puzzles/src/twiddle.c
index a107925aee..49d8db7825 100644
--- a/apps/plugins/puzzles/src/twiddle.c
+++ b/apps/plugins/puzzles/src/twiddle.c
@@ -10,7 +10,12 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -123,14 +128,16 @@ static void decode_params(game_params *ret, char const *string)
     while (*string) {
         if (*string == 'r') {
             ret->rowsonly = true;
+            string++;
         } else if (*string == 'o') {
             ret->orientable = true;
+            string++;
         } else if (*string == 'm') {
             string++;
             ret->movetarget = atoi(string);
-            while (string[1] && isdigit((unsigned char)string[1])) string++;
-        }
-        string++;
+            while (*string && isdigit((unsigned char)*string)) string++;
+        } else
+            string++;
     }
 }
 
@@ -210,6 +217,8 @@ static const char *validate_params(const game_params *params, bool full)
         return "Width must be at least the rotating block size";
     if (params->h < params->n)
         return "Height must be at least the rotating block size";
+    if (params->w > INT_MAX / params->h)
+        return "Width times height must not be unreasonably large";
     if (params->movetarget < 0)
         return "Number of shuffling moves may not be negative";
     return NULL;
@@ -523,18 +532,6 @@ static void free_game(game_state *state)
     sfree(state);
 }
 
-static int compare_int(const void *av, const void *bv)
-{
-    const int *a = (const int *)av;
-    const int *b = (const int *)bv;
-    if (*a < *b)
-        return -1;
-    else if (*a > *b)
-        return +1;
-    else
-        return 0;
-}
-
 static char *solve_game(const game_state *state, const game_state *currstate,
                         const char *aux, const char **error)
 {
@@ -615,7 +612,7 @@ static game_ui *new_ui(const game_state *state)
 
     ui->cur_x = 0;
     ui->cur_y = 0;
-    ui->cur_visible = false;
+    ui->cur_visible = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     return ui;
 }
@@ -625,18 +622,20 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    if (!ui->cur_visible) return "";
+    switch (button) {
+      case CURSOR_SELECT: return "Turn left";
+      case CURSOR_SELECT2: return "Turn right";
+    }
+    return "";
 }
 
 struct game_drawstate {
@@ -657,18 +656,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
     button = button & (~MOD_MASK | MOD_NUM_KEYPAD);
 
-    if (IS_CURSOR_MOVE(button)) {
-        if (button == CURSOR_LEFT && ui->cur_x > 0)
-            ui->cur_x--;
-        if (button == CURSOR_RIGHT && (ui->cur_x+n) < (w))
-            ui->cur_x++;
-        if (button == CURSOR_UP && ui->cur_y > 0)
-            ui->cur_y--;
-        if (button == CURSOR_DOWN && (ui->cur_y+n) < (h))
-            ui->cur_y++;
-        ui->cur_visible = true;
-        return UI_UPDATE;
-    }
+    if (IS_CURSOR_MOVE(button))
+        return move_cursor(button, &ui->cur_x, &ui->cur_y, w-n+1, h-n+1,
+                           false, &ui->cur_visible);
 
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON) {
         /*
@@ -691,7 +681,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             dir = (button == CURSOR_SELECT2) ? -1 : +1;
         } else {
             ui->cur_visible = true;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     } else if (button == 'a' || button == 'A' || button==MOD_NUM_KEYPAD+'7') {
         x = y = 0;
@@ -756,7 +746,7 @@ static game_state *execute_move(const game_state *from, const char *move)
          * conveniently being able to get hold of a clean state from
          * which to practise manoeuvres.
          */
-        qsort(ret->grid, ret->w*ret->h, sizeof(int), compare_int);
+        qsort(ret->grid, ret->w*ret->h, sizeof(int), compare_integers);
         for (i = 0; i < ret->w*ret->h; i++)
             ret->grid[i] &= ~3;
         ret->used_solve = true;
@@ -791,7 +781,7 @@ static game_state *execute_move(const game_state *from, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -870,8 +860,8 @@ static void rotate(int *xy, struct rotation *rot)
         xf2 = rot->c * xf + rot->s * yf;
         yf2 = - rot->s * xf + rot->c * yf;
 
-        xy[0] = (int)(xf2 + rot->ox + 0.5);   /* round to nearest */
-        xy[1] = (int)(yf2 + rot->oy + 0.5);   /* round to nearest */
+        xy[0] = (int)(xf2 + rot->ox + 0.5F);   /* round to nearest */
+        xy[1] = (int)(yf2 + rot->oy + 0.5F);   /* round to nearest */
     }
 }
 
@@ -1058,7 +1048,7 @@ static int highlight_colour(float angle)
         COL_LOWLIGHT,
     };
 
-    return colours[(int)((angle + 2*PI) / (PI/16)) & 31];
+    return colours[(int)((angle + 2*(float)PI) / ((float)PI/16)) & 31];
 }
 
 static float game_anim_length_real(const game_state *oldstate,
@@ -1135,13 +1125,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     if (!ds->started) {
         int coords[10];
 
-        draw_rect(dr, 0, 0,
-                  TILE_SIZE * state->w + 2 * BORDER,
-                  TILE_SIZE * state->h + 2 * BORDER, COL_BACKGROUND);
-        draw_update(dr, 0, 0,
-                    TILE_SIZE * state->w + 2 * BORDER,
-                    TILE_SIZE * state->h + 2 * BORDER);
-
         /*
          * Recessed area containing the whole puzzle.
          */
@@ -1189,7 +1172,7 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         rot->cw = rot->ch = TILE_SIZE * state->n;
         rot->ox = rot->cx + rot->cw/2;
         rot->oy = rot->cy + rot->ch/2;
-        angle = (float)((-PI/2 * lastr) * (1.0 - animtime / anim_max));
+        angle = ((-(float)PI/2 * lastr) * (1.0F - animtime / anim_max));
         rot->c = (float)cos(angle);
         rot->s = (float)sin(angle);
 
@@ -1282,19 +1265,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     }
 }
 
-static bool game_timing_state(const game_state *state, game_ui *ui)
-{
-    return true;
-}
-
-static void game_print_size(const game_params *params, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame twiddle
 #endif
@@ -1316,12 +1286,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -1333,9 +1305,9 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     true,                              /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                                 /* flags */
 };
 
diff --git a/apps/plugins/puzzles/src/undead.R b/apps/plugins/puzzles/src/undead.R
deleted file mode 100644
index 5907ed6b74..0000000000
--- a/apps/plugins/puzzles/src/undead.R
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- makefile -*-
-
-undead : [X] GTK COMMON undead undead-icon|no-icon
-undead : [G] WINDOWS COMMON undead undead.res|noicon.res
-
-ALL += undead[COMBINED]
-
-!begin am gtk
-GAMES += undead
-!end
-
-!begin >list.c
-    A(undead) \
-!end
-
-!begin >gamedesc.txt
-undead:undead.exe:Undead:Monster-placing puzzle:Place ghosts, vampires and zombies so that the right numbers of them can be seen in mirrors.
-!end
diff --git a/apps/plugins/puzzles/src/undead.c b/apps/plugins/puzzles/src/undead.c
index 4dba828d48..0213d0e2e4 100644
--- a/apps/plugins/puzzles/src/undead.c
+++ b/apps/plugins/puzzles/src/undead.c
@@ -35,7 +35,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
@@ -193,9 +197,9 @@ static game_params *custom_params(const config_item *cfg)
 
 static const char *validate_params(const game_params *params, bool full)
 {
-    if ((params->w * params->h ) > 54)  return "Grid is too big";
     if (params->w < 3)                  return "Width must be at least 3";
     if (params->h < 3)                  return "Height must be at least 3";
+    if (params->w > 54 / params->h)     return "Grid is too big";
     if (params->diff >= DIFFCOUNT)      return "Unknown difficulty rating";
     return NULL;
 }
@@ -972,7 +976,7 @@ static int path_cmp(const void *a, const void *b) {
 
 static char *new_game_desc(const game_params *params, random_state *rs,
                            char **aux, bool interactive) {
-    int i,count,c,w,h,r,p,g;
+    int count,c,w,h,r,p,g;
     game_state *new;
 
     /* Variables for puzzle generation algorithm */
@@ -993,7 +997,6 @@ static char *new_game_desc(const game_params *params, random_state *rs,
     char *e;
     char *desc; 
 
-    i = 0;
     while (true) {
         new = new_state(params);
         abort = false;
@@ -1031,7 +1034,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
         /* Monsters / Mirrors ratio should be balanced */
         ratio = (float)new->common->num_total /
             (float)(new->common->params.w * new->common->params.h);
-        if (ratio < 0.48 || ratio > 0.78) {
+        if (ratio < 0.48F || ratio > 0.78F) {
             free_game(new);
             continue;
         }        
@@ -1253,7 +1256,6 @@ static char *new_game_desc(const game_params *params, random_state *rs,
          * difficulty level, free memory and start from scratch */    
         sfree(old_guess);
         free_game(new);
-        i++;
     }
     
     /* We have a valid puzzle! */
@@ -1574,6 +1576,8 @@ static char *solve_game(const game_state *state_start, const game_state *currsta
     }
 
 /*  printf("Puzzle solved at level %s, iterations %d, ambiguous %d\n", (solved_bruteforce ? "TRICKY" : "NORMAL"), iterative_depth, count_ambiguous); */
+    (void)iterative_depth;
+    (void)count_ambiguous;
 
     move = snewn(solve_state->common->num_total * 4 +2, char);
     c = move;
@@ -1640,31 +1644,64 @@ struct game_ui {
     int hx, hy;                         /* as for solo.c, highlight pos */
     bool hshow, hpencil, hcursor;       /* show state, type, and ?cursor. */
     bool ascii;
+
+    /*
+     * User preference option: if the user right-clicks in a square
+     * and presses a monster 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->hx = ui->hy = ui->hshow = ui->hcursor =
+        getenv_bool("PUZZLES_SHOW_CURSOR", false);
     ui->ascii = false;
+
+    ui->pencil_keep_highlight = false;
+
     return ui;
 }
 
-static void free_ui(game_ui *ui) {
-    sfree(ui);
-    return;
+static config_item *get_prefs(game_ui *ui)
+{
+    config_item *ret;
+
+    ret = snewn(3, 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 = "Monster representation";
+    ret[1].kw = "monsters";
+    ret[1].type = C_CHOICES;
+    ret[1].u.choices.choicenames = ":Pictures:Letters";
+    ret[1].u.choices.choicekws = ":pictures:letters";
+    ret[1].u.choices.selected = ui->ascii;
+
+    ret[2].name = NULL;
+    ret[2].type = C_END;
+
+    return ret;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->pencil_keep_highlight = cfg[0].u.boolean.bval;
+    ui->ascii = cfg[1].u.choices.selected;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
-{
+static void free_ui(game_ui *ui) {
+    sfree(ui);
     return;
 }
 
@@ -1681,6 +1718,20 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     }
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    int xi;
+
+    if (ui->hshow && button == CURSOR_SELECT)
+        return ui->hpencil ? "Ink" : "Pencil";
+    if (button == CURSOR_SELECT2) {
+        xi = state->common->xinfo[ui->hx + ui->hy*(state->common->params.w+2)];
+        if (xi >= 0 && !state->common->fixed[xi]) return "Clear";
+    }
+    return "";
+}
+
 struct game_drawstate {
     int tilesize;
     bool started, solved;
@@ -1743,7 +1794,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
     if (button == 'a' || button == 'A') {
         ui->ascii = !ui->ascii;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (button == 'm' || button == 'M') {
@@ -1755,22 +1806,30 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (xi >= 0 && !state->common->fixed[xi]) {
             if (button == 'g' || button == 'G' || button == '1') {
                 if (!ui->hcursor) ui->hshow = false;
+                if (state->guess[xi] == 1)
+                    return ui->hcursor ? NULL : MOVE_UI_UPDATE;
                 sprintf(buf,"G%d",xi);
                 return dupstr(buf);
             }
             if (button == 'v' || button == 'V' || button == '2') {
                 if (!ui->hcursor) ui->hshow = false;
+                if (state->guess[xi] == 2)
+                    return ui->hcursor ? NULL : MOVE_UI_UPDATE;
                 sprintf(buf,"V%d",xi);
                 return dupstr(buf);
             }
             if (button == 'z' || button == 'Z' || button == '3') {
                 if (!ui->hcursor) ui->hshow = false;
+                if (state->guess[xi] == 4)
+                    return ui->hcursor ? NULL : MOVE_UI_UPDATE;
                 sprintf(buf,"Z%d",xi);
                 return dupstr(buf);
             }
             if (button == 'e' || button == 'E' || button == CURSOR_SELECT2 ||
                 button == '0' || button == '\b' ) {
                 if (!ui->hcursor) ui->hshow = false;
+                if (state->guess[xi] == 7 && state->pencils[xi] == 0)
+                    return ui->hcursor ? NULL : MOVE_UI_UPDATE;
                 sprintf(buf,"E%d",xi);
                 return dupstr(buf);
             }
@@ -1790,45 +1849,42 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             }
         ui->hshow = true;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
     if (ui->hshow && button == CURSOR_SELECT) {
         ui->hpencil = !ui->hpencil;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     if (ui->hshow && ui->hpencil) {
         xi = state->common->xinfo[ui->hx + ui->hy*(state->common->params.w+2)];
         if (xi >= 0 && !state->common->fixed[xi]) {
+            buf[0] = '\0';
+
             if (button == 'g' || button == 'G' || button == '1') {
                 sprintf(buf,"g%d",xi);
-                if (!ui->hcursor) {
-                    ui->hpencil = false;
-                    ui->hshow = false;
-                }
-                return dupstr(buf);
-            }
-            if (button == 'v' || button == 'V' || button == '2') {
+            } else if (button == 'v' || button == 'V' || button == '2') {
                 sprintf(buf,"v%d",xi);
-                if (!ui->hcursor) {
-                    ui->hpencil = false;
-                    ui->hshow = false;
-                }
-                return dupstr(buf);
-            }
-            if (button == 'z' || button == 'Z' || button == '3') {
+            } else if (button == 'z' || button == 'Z' || button == '3') {
                 sprintf(buf,"z%d",xi);
-                if (!ui->hcursor) {
-                    ui->hpencil = false;
-                    ui->hshow = false;
-                }
-                return dupstr(buf);
-            }
-            if (button == 'e' || button == 'E' || button == CURSOR_SELECT2 ||
-                button == '0' || button == '\b') {
+            } else if (button == 'e' || button == 'E' ||
+                       button == CURSOR_SELECT2 || button == '0' ||
+                       button == '\b') {
+                if (state->pencils[xi] == 0)
+                    return ui->hcursor ? NULL : MOVE_UI_UPDATE;
                 sprintf(buf,"E%d",xi);
-                if (!ui->hcursor) {
+            }
+
+            if (buf[0]) {
+                /*
+                 * 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->hpencil = false;
                     ui->hshow = false;
                 }
@@ -1847,14 +1903,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                     ui->hpencil = false;
                     ui->hcursor = false;
                     ui->hx = gx; ui->hy = gy;
-                    return UI_UPDATE;
+                    return MOVE_UI_UPDATE;
                 }
                 else if (button == RIGHT_BUTTON && g == 7) {
                     ui->hshow = true;
                     ui->hpencil = true;
                     ui->hcursor = false;
                     ui->hx = gx; ui->hy = gy;
-                    return UI_UPDATE;
+                    return MOVE_UI_UPDATE;
                 }
             }
             else if (ui->hshow) {
@@ -1865,14 +1921,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                             ui->hpencil = false;
                             ui->hcursor = false;
                             ui->hx = 0; ui->hy = 0;
-                            return UI_UPDATE;
+                            return MOVE_UI_UPDATE;
                         }
                         else {
                             ui->hshow = true;
                             ui->hpencil = false;
                             ui->hcursor = false;
                             ui->hx = gx; ui->hy = gy;
-                            return UI_UPDATE;
+                            return MOVE_UI_UPDATE;
                         }
                     }
                     else {
@@ -1880,7 +1936,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                         ui->hpencil = false;
                         ui->hcursor = false;
                         ui->hx = gx; ui->hy = gy;
-                        return UI_UPDATE;
+                        return MOVE_UI_UPDATE;
                     }
                 }
                 else if (button == RIGHT_BUTTON) {
@@ -1889,7 +1945,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                         ui->hpencil = true;
                         ui->hcursor = false;
                         ui->hx = gx; ui->hy = gy;
-                        return UI_UPDATE;
+                        return MOVE_UI_UPDATE;
                     }
                     else {
                         if (gx == ui->hx && gy == ui->hy) {
@@ -1897,14 +1953,14 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                             ui->hpencil = false;
                             ui->hcursor = false;
                             ui->hx = 0; ui->hy = 0;
-                            return UI_UPDATE;
+                            return MOVE_UI_UPDATE;
                         }
                         else if (g == 7) {
                             ui->hshow = true;
                             ui->hpencil = true;
                             ui->hcursor = false;
                             ui->hx = gx; ui->hy = gy;
-                            return UI_UPDATE;
+                            return MOVE_UI_UPDATE;
                         }
                     }
                 }
@@ -2056,11 +2112,11 @@ static game_state *execute_move(const game_state *state, const char *move)
         if (c == 'S') {
             move++;
             solver = true;
-        }
-        if (c == 'G' || c == 'V' || c == 'Z' || c == 'E' ||
-            c == 'g' || c == 'v' || c == 'z') {
+        } else if (c == 'G' || c == 'V' || c == 'Z' || c == 'E' ||
+                   c == 'g' || c == 'v' || c == 'z') {
             move++;
-            sscanf(move, "%d%n", &x, &n);
+            if (sscanf(move, "%d%n", &x, &n) != 1) goto badmove;
+            if (x < 0 || x >= ret->common->num_total) goto badmove;
             if (c == 'G') ret->guess[x] = 1;
             if (c == 'V') ret->guess[x] = 2;
             if (c == 'Z') ret->guess[x] = 4;
@@ -2069,23 +2125,26 @@ static game_state *execute_move(const game_state *state, const char *move)
             if (c == 'v') ret->pencils[x] ^= 2;
             if (c == 'z') ret->pencils[x] ^= 4;
             move += n;
-        }
-        if (c == 'D' && sscanf(move + 1, "%d,%d%n", &x, &y, &n) == 2 &&
-            is_clue(ret, x, y)) {
+        } else if (c == 'D' && sscanf(move + 1, "%d,%d%n", &x, &y, &n) == 2 &&
+                   is_clue(ret, x, y)) {
             ret->hints_done[clue_index(ret, x, y)] ^= 1;
             move += n + 1;
-        }
-        if (c == 'M') {
+        } else if (c == 'M') {
             /*
              * Fill in absolutely all pencil marks in unfilled
              * squares, for those who like to play by the rigorous
              * approach of starting off in that state and eliminating
              * things.
              */
-            for (i = 0; i < ret->common->wh; i++)
+            for (i = 0; i < ret->common->num_total; i++)
                 if (ret->guess[i] == 7)
                     ret->pencils[i] = 7;
             move++;
+        } else {
+            /* Unknown move type. */
+        badmove:
+            free_game(ret);
+            return NULL;
         }
         if (*move == ';') move++;
     }
@@ -2118,7 +2177,7 @@ static game_state *execute_move(const game_state *state, const char *move)
 #define PREFERRED_TILE_SIZE 64
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize; } ads, *ds = &ads;
@@ -2402,7 +2461,7 @@ static void draw_monster(drawing *dr, game_drawstate *ds, int x, int y,
 static void draw_monster_count(drawing *dr, game_drawstate *ds,
                                const game_state *state, int c, bool hflash) {
     int dx,dy;
-    char buf[8];
+    char buf[MAX_DIGITS(int) + 1];
     char bufm[8];
     
     dy = TILESIZE/4;
@@ -2447,7 +2506,7 @@ static void draw_path_hint(drawing *dr, game_drawstate *ds,
                            const struct game_params *params,
                            int hint_index, bool hflash, int hint) {
     int x, y, color, dx, dy, text_dx, text_dy, text_size;
-    char buf[4];
+    char buf[MAX_DIGITS(int) + 1];
 
     if (ds->hint_errors[hint_index])
         color = COL_ERROR;
@@ -2605,8 +2664,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     /* Draw static grid components at startup */    
     if (!ds->started) { 
-        draw_rect(dr, 0, 0, 2*BORDER+(ds->w+2)*TILESIZE,
-                  2*BORDER+(ds->h+3)*TILESIZE, COL_BACKGROUND);
         draw_rect(dr, BORDER+TILESIZE-1, BORDER+2*TILESIZE-1,
                   (ds->w)*TILESIZE +3, (ds->h)*TILESIZE +3, COL_GRID);
         for (i=0;i<ds->w;i++)
@@ -2745,19 +2802,6 @@ static int game_status(const game_state *state)
     return state->solved;
 }
 
-static bool game_timing_state(const game_state *state, game_ui *ui)
-{
-    return true;
-}
-
-static void game_print_size(const game_params *params, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame undead
 #endif
@@ -2779,12 +2823,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     game_request_keys,
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2796,8 +2842,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     false,                 /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                     /* flags */
 };
diff --git a/apps/plugins/puzzles/src/unequal.R b/apps/plugins/puzzles/src/unequal.R
deleted file mode 100644
index 077407ffff..0000000000
--- a/apps/plugins/puzzles/src/unequal.R
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- makefile -*-
-
-UNEQUAL_EXTRA        = LATIN
-UNEQUAL_EXTRA_SOLVER = LATIN_SOLVER
-
-unequal  : [X] GTK COMMON unequal UNEQUAL_EXTRA unequal-icon|no-icon
-
-unequal  : [G] WINDOWS COMMON unequal UNEQUAL_EXTRA unequal.res|noicon.res
-
-unequalsolver : [U] unequal[STANDALONE_SOLVER] UNEQUAL_EXTRA_SOLVER STANDALONE
-unequalsolver : [C] unequal[STANDALONE_SOLVER] UNEQUAL_EXTRA_SOLVER STANDALONE
-
-ALL += unequal[COMBINED] UNEQUAL_EXTRA
-
-!begin am gtk
-GAMES += unequal
-!end
-
-!begin >list.c
-    A(unequal) \
-!end
-
-!begin >gamedesc.txt
-unequal:unequal.exe:Unequal:Latin square puzzle:Complete the latin square in accordance with the > signs.
-!end
diff --git a/apps/plugins/puzzles/src/unequal.c b/apps/plugins/puzzles/src/unequal.c
index 153954e510..ab32e4ab79 100644
--- a/apps/plugins/puzzles/src/unequal.c
+++ b/apps/plugins/puzzles/src/unequal.c
@@ -21,7 +21,11 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 #include "latin.h" /* contains typedef for digit */
@@ -84,6 +88,7 @@ struct game_params {
 #define ADJ_TO_SPENT(x) ((x) << 9)
 
 #define F_ERROR_MASK (F_ERROR|F_ERROR_UP|F_ERROR_RIGHT|F_ERROR_DOWN|F_ERROR_LEFT)
+#define F_SPENT_MASK (F_SPENT_UP|F_SPENT_RIGHT|F_SPENT_DOWN|F_SPENT_LEFT)
 
 struct game_state {
     int order;
@@ -890,13 +895,14 @@ static int solver_state(game_state *state, int maxdiff)
     struct latin_solver solver;
     int diff;
 
-    latin_solver_alloc(&solver, state->nums, state->order);
-
-    diff = latin_solver_main(&solver, maxdiff,
-                             DIFF_LATIN, DIFF_SET, DIFF_EXTREME,
-                             DIFF_EXTREME, DIFF_RECURSIVE,
-                             unequal_solvers, unequal_valid, ctx,
-                             clone_ctx, free_ctx);
+    if (latin_solver_alloc(&solver, state->nums, state->order))
+        diff = latin_solver_main(&solver, maxdiff,
+                                 DIFF_LATIN, DIFF_SET, DIFF_EXTREME,
+                                 DIFF_EXTREME, DIFF_RECURSIVE,
+                                 unequal_solvers, unequal_valid, ctx,
+                                 clone_ctx, free_ctx);
+    else
+        diff = DIFF_IMPOSSIBLE;
 
     memcpy(state->hints, solver.cube, state->order*state->order*state->order);
 
@@ -1073,7 +1079,7 @@ static int gg_best_clue(game_state *state, int *scratch, digit *latin)
 }
 
 #ifdef STANDALONE_SOLVER
-int maxtries;
+static int maxtries;
 #define MAXTRIES maxtries
 #else
 #define MAXTRIES 50
@@ -1430,6 +1436,17 @@ static char *solve_game(const game_state *state, const game_state *currstate,
 struct game_ui {
     int hx, hy;                         /* as for solo.c, highlight pos */
     bool hshow, hpencil, hcursor;       /* show state, type, and ?cursor. */
+
+    /*
+     * User preference option: if the user right-clicks in a square
+     * and presses a number 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)
@@ -1438,8 +1455,9 @@ static game_ui *new_ui(const game_state *state)
 
     ui->hx = ui->hy = 0;
     ui->hpencil = false;
-    ui->hshow = false;
-    ui->hcursor = false;
+    ui->hshow = ui->hcursor = getenv_bool("PUZZLES_SHOW_CURSOR", false);
+
+    ui->pencil_keep_highlight = false;
 
     return ui;
 }
@@ -1449,13 +1467,26 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    return NULL;
+    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 decode_ui(game_ui *ui, const char *encoding)
+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,
@@ -1470,6 +1501,14 @@ static void game_changed_state(game_ui *ui, const game_state *oldstate,
     }
 }
 
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
+{
+    if (ui->hshow && IS_CURSOR_SELECT(button))
+        return ui->hpencil ? "Ink" : "Pencil";
+    return "";
+}
+
 struct game_drawstate {
     int tilesize, order;
     bool started;
@@ -1491,7 +1530,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
     char buf[80];
     bool shift_or_control = button & (MOD_SHFT | MOD_CTRL);
 
-    button &= ~MOD_MASK;
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     if (x >= 0 && x < ds->order && y >= 0 && y < ds->order && IS_MOUSE_DOWN(button)) {
         if (oy - COORD(y) > TILE_SIZE && ox - COORD(x) > TILE_SIZE)
@@ -1527,7 +1566,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hshow = true;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
         if (button == RIGHT_BUTTON) {
             /* pencil highlighting for non-filled squares */
@@ -1541,7 +1580,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->hshow = true;
             }
             ui->hcursor = false;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
     }
 
@@ -1549,7 +1588,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (shift_or_control) {
             int nx = ui->hx, ny = ui->hy, i;
             bool self;
-            move_cursor(button, &nx, &ny, ds->order, ds->order, false);
+            move_cursor(button, &nx, &ny, ds->order, ds->order, false, NULL);
             ui->hshow = true;
             ui->hcursor = true;
 
@@ -1557,12 +1596,12 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                                   ny != ui->hy + adjthan[i].dy); ++i);
 
             if (i == 4)
-                return UI_UPDATE; /* invalid direction, i.e. out of
+                return MOVE_UI_UPDATE; /* invalid direction, i.e. out of
                                    * the board */
 
             if (!(GRID(state, flags, ui->hx, ui->hy) & adjthan[i].f ||
                   GRID(state, flags, nx,     ny    ) & adjthan[i].fo))
-                return UI_UPDATE; /* no clue to toggle */
+                return MOVE_UI_UPDATE; /* no clue to toggle */
 
             if (state->mode == MODE_ADJACENT)
                 self = (adjthan[i].dx >= 0 && adjthan[i].dy >= 0);
@@ -1570,24 +1609,23 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 self = (GRID(state, flags, ui->hx, ui->hy) & adjthan[i].f);
 
             if (self)
-                sprintf(buf, "F%d,%d,%d", ui->hx, ui->hy,
+                sprintf(buf, "F%d,%d,%u", ui->hx, ui->hy,
                         ADJ_TO_SPENT(adjthan[i].f));
             else
-                sprintf(buf, "F%d,%d,%d", nx, ny,
+                sprintf(buf, "F%d,%d,%u", nx, ny,
                         ADJ_TO_SPENT(adjthan[i].fo));
 
             return dupstr(buf);
         } else {
-            move_cursor(button, &ui->hx, &ui->hy, ds->order, ds->order, false);
-            ui->hshow = true;
             ui->hcursor = true;
-            return UI_UPDATE;
+            return move_cursor(button, &ui->hx, &ui->hy, ds->order, ds->order,
+                               false, &ui->hshow);
         }
     }
     if (ui->hshow && IS_CURSOR_SELECT(button)) {
         ui->hpencil = !ui->hpencil;
         ui->hcursor = true;
-        return UI_UPDATE;
+        return MOVE_UI_UPDATE;
     }
 
     n = c2n(button, state->order);
@@ -1604,11 +1642,37 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         if (ui->hpencil && GRID(state, nums, ui->hx, ui->hy) > 0)
             return NULL;        /* can't change hints on filled square (!) */
 
+        /*
+         * If you ask to fill a square with what it already contains,
+         * or blank it when it's already empty, that has no effect...
+         */
+        if ((!ui->hpencil || n == 0) &&
+            GRID(state, nums, ui->hx, ui->hy) == n) {
+            bool anypencil = false;
+            int i;
+            for (i = 0; i < state->order; i++)
+                anypencil = anypencil || HINT(state, ui->hx, ui->hy, i);
+            if (!anypencil) {
+                /* ... expect to remove the cursor in mouse mode. */
+                if (!ui->hcursor) {
+                    ui->hshow = false;
+                    return MOVE_UI_UPDATE;
+                }
+                return NULL;
+            }
+        }
 
         sprintf(buf, "%c%d,%d,%d",
                 (char)(ui->hpencil && n > 0 ? 'P' : 'R'), ui->hx, ui->hy, n);
 
-        if (!ui->hcursor) ui->hshow = false;
+        /*
+         * 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 dupstr(buf);
     }
@@ -1624,7 +1688,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 static game_state *execute_move(const game_state *state, const char *move)
 {
     game_state *ret = NULL;
-    int x, y, n, i, rc;
+    int x, y, n, i;
 
     debug(("execute_move: %s", move));
 
@@ -1649,7 +1713,7 @@ static game_state *execute_move(const game_state *state, const char *move)
         const char *p;
 
         ret = dup_game(state);
-        ret->completed = ret->cheated = true;
+        ret->cheated = true;
 
         p = move+1;
         for (i = 0; i < state->order*state->order; i++) {
@@ -1660,8 +1724,8 @@ static game_state *execute_move(const game_state *state, const char *move)
             p++;
         }
         if (*p) goto badmove;
-        rc = check_complete(ret->nums, ret, true);
-        assert(rc > 0);
+        if (!ret->completed && check_complete(ret->nums, ret, true) > 0)
+            ret->completed = true;
         return ret;
     } else if (move[0] == 'M') {
         ret = dup_game(state);
@@ -1678,7 +1742,8 @@ static game_state *execute_move(const game_state *state, const char *move)
         check_complete(ret->nums, ret, true);
         return ret;
     } else if (move[0] == 'F' && sscanf(move+1, "%d,%d,%d", &x, &y, &n) == 3 &&
-               x >= 0 && x < state->order && y >= 0 && y < state->order) {
+               x >= 0 && x < state->order && y >= 0 && y < state->order &&
+               (n & ~F_SPENT_MASK) == 0) {
         ret = dup_game(state);
         GRID(ret, flags, x, y) ^= n;
         return ret;
@@ -1696,7 +1761,7 @@ badmove:
 #define DRAW_SIZE (TILE_SIZE*ds->order + GAP_SIZE*(ds->order-1) + BORDER*2)
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     /* Ick: fake up `ds->tilesize' for macro expansion purposes */
     struct { int tilesize, order; } ads, *ds = &ads;
@@ -1779,18 +1844,18 @@ static void draw_gt(drawing *dr, int ox, int oy,
 {
     int coords[12];
     int xdx = (dx1+dx2 ? 0 : 1), xdy = (dx1+dx2 ? 1 : 0);
-    coords[0] = ox + xdx + dx1;
-    coords[1] = oy + xdy + dy1;
-    coords[2] = ox + xdx + dx1 + dx2;
-    coords[3] = oy + xdy + dy1 + dy2;
-    coords[4] = ox - xdx + dx1 + dx2;
-    coords[5] = oy - xdy + dy1 + dy2;
-    coords[6] = ox - xdx + dx1;
-    coords[7] = oy - xdy + dy1;
-    coords[8] = ox - xdx;
-    coords[9] = oy - xdy;
-    coords[10] = ox + xdx;
-    coords[11] = oy + xdy;
+    coords[0] = ox + xdx;
+    coords[1] = oy + xdy;
+    coords[2] = ox + xdx + dx1;
+    coords[3] = oy + xdy + dy1;
+    coords[4] = ox + xdx + dx1 + dx2;
+    coords[5] = oy + xdy + dy1 + dy2;
+    coords[6] = ox - xdx + dx1 + dx2;
+    coords[7] = oy - xdy + dy1 + dy2;
+    coords[8] = ox - xdx + dx1;
+    coords[9] = oy - xdy + dy1;
+    coords[10] = ox - xdx;
+    coords[11] = oy - xdy;
     draw_polygon(dr, coords, 6, col, col);
 }
 
@@ -2059,22 +2124,19 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /* 10mm squares by default, roughly the same as Grauniad. */
-    game_compute_size(params, 1000, &pw, &ph);
+    game_compute_size(params, 1000, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int ink = print_mono_colour(dr, 0);
     int x, y, o = state->order, ox, oy, n;
@@ -2133,12 +2195,14 @@ const struct game thegame = {
     free_game,
     true, solve_game,
     true, game_can_format_as_text_now, game_text_format,
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     game_request_keys,
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     PREFERRED_TILE_SIZE, game_compute_size, game_set_size,
@@ -2152,7 +2216,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     REQUIRE_RBUTTON | REQUIRE_NUMPAD,  /* flags */
 };
 
@@ -2165,7 +2229,7 @@ const struct game thegame = {
 #include <time.h>
 #include <stdarg.h>
 
-const char *quis = NULL;
+static const char *quis = NULL;
 
 #if 0 /* currently unused */
 
@@ -2233,13 +2297,14 @@ static int solve(game_params *p, char *desc, int debug)
     solver_show_working = debug;
     game_debug(state);
 
-    latin_solver_alloc(&solver, state->nums, state->order);
-
-    diff = latin_solver_main(&solver, DIFF_RECURSIVE,
-                             DIFF_LATIN, DIFF_SET, DIFF_EXTREME,
-                             DIFF_EXTREME, DIFF_RECURSIVE,
-                             unequal_solvers, unequal_valid, ctx,
-                             clone_ctx, free_ctx);
+    if (latin_solver_alloc(&solver, state->nums, state->order))
+        diff = latin_solver_main(&solver, DIFF_RECURSIVE,
+                                 DIFF_LATIN, DIFF_SET, DIFF_EXTREME,
+                                 DIFF_EXTREME, DIFF_RECURSIVE,
+                                 unequal_solvers, unequal_valid, ctx,
+                                 clone_ctx, free_ctx);
+    else
+        diff = DIFF_IMPOSSIBLE;
 
     free_ctx(ctx);
 
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/plugins/puzzles/src/unruly.R b/apps/plugins/puzzles/src/unruly.R
deleted file mode 100644
index 064ccc35ba..0000000000
--- a/apps/plugins/puzzles/src/unruly.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-unruly : [X] GTK COMMON unruly unruly-icon|no-icon
-unruly : [G] WINDOWS COMMON unruly unruly.res|noicon.res
-
-unrulysolver : [U] unruly[STANDALONE_SOLVER] STANDALONE
-unrulysolver : [C] unruly[STANDALONE_SOLVER] STANDALONE
-
-ALL += unruly[COMBINED]
-
-!begin am gtk
-GAMES += unruly
-!end
-
-!begin >list.c
-    A(unruly) \
-!end
-
-!begin >gamedesc.txt
-unruly:unruly.exe:Unruly:Black and white grid puzzle:Fill in the black and white grid to avoid runs of three.
-!end
diff --git a/apps/plugins/puzzles/src/unruly.c b/apps/plugins/puzzles/src/unruly.c
index a1f06332e0..01685b7838 100644
--- a/apps/plugins/puzzles/src/unruly.c
+++ b/apps/plugins/puzzles/src/unruly.c
@@ -47,12 +47,16 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
 
 #include "puzzles.h"
 
 #ifdef STANDALONE_SOLVER
-bool solver_verbose = false;
+static bool solver_verbose = false;
 #endif
 
 enum {
@@ -81,6 +85,7 @@ struct game_params {
     int diff;
 };
 #define DIFFLIST(A)                             \
+    A(TRIVIAL,Trivial, t)                       \
     A(EASY,Easy, e)                             \
     A(NORMAL,Normal, n)                         \
 
@@ -95,6 +100,7 @@ static char const unruly_diffchars[] = DIFFLIST(ENCODE);
 #define DIFFCONFIG DIFFLIST(CONFIG)
 
 static const struct game_params unruly_presets[] = {
+    { 8,  8, false, DIFF_TRIVIAL},
     { 8,  8, false, DIFF_EASY},
     { 8,  8, false, DIFF_NORMAL},
     {10, 10, false, DIFF_EASY},
@@ -284,6 +290,8 @@ static const char *validate_params(const game_params *params, bool full)
         return "Width and height must both be even";
     if (params->w2 < 6 || params->h2 < 6)
         return "Width and height must be at least 6";
+    if (params->w2 > INT_MAX / params->h2)
+        return "Width times height must not be unreasonably large";
     if (params->unique) {
         static const long A177790[] = {
             /*
@@ -349,7 +357,7 @@ static const char *validate_desc(const game_params *params, const char *desc)
     return NULL;
 }
 
-static game_state *blank_state(int w2, int h2, bool unique)
+static game_state *blank_state(int w2, int h2, bool unique, bool new_common)
 {
     game_state *state = snew(game_state);
     int s = w2 * h2;
@@ -358,12 +366,14 @@ static game_state *blank_state(int w2, int h2, bool unique)
     state->h2 = h2;
     state->unique = unique;
     state->grid = snewn(s, char);
-    state->common = snew(unruly_common);
-    state->common->refcount = 1;
-    state->common->immutable = snewn(s, bool);
-
     memset(state->grid, EMPTY, s);
-    memset(state->common->immutable, 0, s*sizeof(bool));
+
+    if (new_common) {
+        state->common = snew(unruly_common);
+        state->common->refcount = 1;
+        state->common->immutable = snewn(s, bool);
+        memset(state->common->immutable, 0, s*sizeof(bool));
+    }
 
     state->completed = state->cheated = false;
 
@@ -376,7 +386,7 @@ static game_state *new_game(midend *me, const game_params *params,
     int w2 = params->w2, h2 = params->h2;
     int s = w2 * h2;
 
-    game_state *state = blank_state(w2, h2, params->unique);
+    game_state *state = blank_state(w2, h2, params->unique, true);
 
     const char *p = desc;
     int pos = 0;
@@ -413,7 +423,7 @@ static game_state *dup_game(const game_state *state)
     int w2 = state->w2, h2 = state->h2;
     int s = w2 * h2;
 
-    game_state *ret = blank_state(w2, h2, state->unique);
+    game_state *ret = blank_state(w2, h2, state->unique, false);
 
     memcpy(ret->grid, state->grid, s);
     ret->common = state->common;
@@ -743,6 +753,61 @@ static int unruly_solver_fill_row(game_state *state, int i, bool horizontal,
     return ret;
 }
 
+static int unruly_solver_check_single_gap(game_state *state,
+                                          int *complete, bool horizontal,
+                                          int *rowcount, int *colcount,
+                                          char fill)
+{
+    int w2 = state->w2, h2 = state->h2;
+    int count = (horizontal ? h2 : w2); /* number of rows to check */
+    int target = (horizontal ? w2 : h2) / 2; /* target number of 0s/1s */
+    int *other = (horizontal ? rowcount : colcount);
+
+    int ret = 0;
+
+    int i;
+    /* Check for completed rows/cols for one number, then fill in the rest */
+    for (i = 0; i < count; i++) {
+        if (complete[i] == target && other[i] == target - 1) {
+#ifdef STANDALONE_SOLVER
+            if (solver_verbose) {
+                printf("Solver: Row %i has only one square left which must be "
+                       "%c\n", i, (fill == N_ZERO ? '0' : '1'));
+            }
+#endif
+            ret += unruly_solver_fill_row(state, i, horizontal, rowcount,
+                                          colcount, fill);
+        }
+    }
+
+    return ret;
+}
+
+static int unruly_solver_check_all_single_gap(game_state *state,
+                                              struct unruly_scratch *scratch)
+{
+    int ret = 0;
+
+    ret +=
+        unruly_solver_check_single_gap(state, scratch->ones_rows, true,
+                                       scratch->zeros_rows,
+                                       scratch->zeros_cols, N_ZERO);
+    ret +=
+        unruly_solver_check_single_gap(state, scratch->ones_cols, false,
+                                       scratch->zeros_rows,
+                                       scratch->zeros_cols, N_ZERO);
+    ret +=
+        unruly_solver_check_single_gap(state, scratch->zeros_rows, true,
+                                       scratch->ones_rows,
+                                       scratch->ones_cols, N_ONE);
+    ret +=
+        unruly_solver_check_single_gap(state, scratch->zeros_cols, false,
+                                       scratch->ones_rows,
+                                       scratch->ones_cols, N_ONE);
+
+    return ret;
+}
+
 static int unruly_solver_check_complete_nums(game_state *state,
                                              int *complete, bool horizontal,
                                              int *rowcount, int *colcount,
@@ -1140,11 +1205,24 @@ static int unruly_solve_game(game_state *state,
 
         /* Keep using the simpler techniques while they produce results */
         if (done) {
-            if (maxdiff < DIFF_EASY)
-                maxdiff = DIFF_EASY;
+            if (maxdiff < DIFF_TRIVIAL)
+                maxdiff = DIFF_TRIVIAL;
             continue;
         }
 
+        /* Check for rows with only one unfilled square */
+        done += unruly_solver_check_all_single_gap(state, scratch);
+
+        if (done) {
+            if (maxdiff < DIFF_TRIVIAL)
+                maxdiff = DIFF_TRIVIAL;
+            continue;
+        }
+
+        /* Easy techniques */
+        if (diff < DIFF_EASY)
+            break;
+
         /* Check for completed rows */
         done += unruly_solver_check_all_complete_nums(state, scratch);
 
@@ -1302,7 +1380,7 @@ static char *new_game_desc(const game_params *params, random_state *rs,
 
         while (true) {
             attempts++;
-            state = blank_state(w2, h2, params->unique);
+            state = blank_state(w2, h2, params->unique, true);
             scratch = unruly_new_scratch(state);
             if (unruly_fill_game(state, scratch, rs))
                 break;
@@ -1320,6 +1398,8 @@ static char *new_game_desc(const game_params *params, random_state *rs,
             temp_verbose = solver_verbose;
             solver_verbose = false;
         }
+#else
+        (void)attempts;
 #endif
 
         unruly_free_scratch(scratch);
@@ -1439,7 +1519,7 @@ static game_ui *new_ui(const game_state *state)
     game_ui *ret = snew(game_ui);
 
     ret->cx = ret->cy = 0;
-    ret->cursor = false;
+    ret->cursor = getenv_bool("PUZZLES_SHOW_CURSOR", false);
 
     return ret;
 }
@@ -1449,18 +1529,30 @@ static void free_ui(game_ui *ui)
     sfree(ui);
 }
 
-static char *encode_ui(const game_ui *ui)
-{
-    return NULL;
-}
-
-static void decode_ui(game_ui *ui, const char *encoding)
+static void game_changed_state(game_ui *ui, const game_state *oldstate,
+                               const game_state *newstate)
 {
 }
 
-static void game_changed_state(game_ui *ui, const game_state *oldstate,
-                               const game_state *newstate)
+static const char *current_key_label(const game_ui *ui,
+                                     const game_state *state, int button)
 {
+    int hx = ui->cx, hy = ui->cy;
+    int w2 = state->w2;
+    char i = state->grid[hy * w2 + hx];
+
+    if (ui->cursor && IS_CURSOR_SELECT(button)) {
+        if (state->common->immutable[hy * w2 + hx]) return "";
+        switch (i) {
+          case EMPTY:
+            return button == CURSOR_SELECT ? "Black" : "White";
+          case N_ONE:
+            return button == CURSOR_SELECT ? "White" : "Empty";
+          case N_ZERO:
+            return button == CURSOR_SELECT ? "Empty" : "Black";
+        }
+    }
+    return "";
 }
 
 struct game_drawstate {
@@ -1520,7 +1612,9 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
     int w2 = state->w2, h2 = state->h2;
 
-    button &= ~MOD_MASK;
+    char *nullret = MOVE_NO_EFFECT;
+
+    button = STRIP_BUTTON_MODIFIERS(button);
 
     /* Mouse click */
     if (button == LEFT_BUTTON || button == RIGHT_BUTTON ||
@@ -1529,17 +1623,18 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             && oy >= (ds->tilesize / 2) && gy < h2) {
             hx = gx;
             hy = gy;
-            ui->cursor = false;
+            if (ui->cursor) {
+                ui->cursor = false;
+                nullret = MOVE_UI_UPDATE;
+            }
         } else
-            return NULL;
+            return MOVE_UNUSED;
     }
 
     /* Keyboard move */
-    if (IS_CURSOR_MOVE(button)) {
-        move_cursor(button, &ui->cx, &ui->cy, w2, h2, false);
-        ui->cursor = true;
-        return UI_UPDATE;
-    }
+    if (IS_CURSOR_MOVE(button))
+        return move_cursor(button, &ui->cx, &ui->cy, w2, h2, false,
+                           &ui->cursor);
 
     /* Place one */
     if ((ui->cursor && (button == CURSOR_SELECT || button == CURSOR_SELECT2
@@ -1551,7 +1646,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
         char c, i;
 
         if (state->common->immutable[hy * w2 + hx])
-            return NULL;
+            return nullret;
 
         c = '-';
         i = state->grid[hy * w2 + hx];
@@ -1571,13 +1666,13 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (state->grid[hy * w2 + hx] ==
             (c == '0' ? N_ZERO : c == '1' ? N_ONE : EMPTY))
-            return NULL;               /* don't put no-ops on the undo chain */
+            return nullret; /* don't put no-ops on the undo chain */
 
         sprintf(buf, "P%c,%d,%d", c, hx, hy);
 
         return dupstr(buf);
     }
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -1637,7 +1732,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     *x = tilesize * (params->w2 + 1);
     *y = tilesize * (params->h2 + 1);
@@ -1788,9 +1883,6 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
     int x, y, i;
 
     if (!ds->started) {
-        /* Main window background */
-        draw_rect(dr, 0, 0, TILE_SIZE * (w2+1), TILE_SIZE * (h2+1),
-                  COL_BACKGROUND);
         /* Outer edge of grid */
         draw_rect(dr, COORD(0)-TILE_SIZE/10, COORD(0)-TILE_SIZE/10,
                   TILE_SIZE*w2 + 2*(TILE_SIZE/10) - 1,
@@ -1878,22 +1970,19 @@ 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, float *x, float *y)
+static void game_print_size(const game_params *params, const game_ui *ui,
+                            float *x, float *y)
 {
     int pw, ph;
 
     /* Using 7mm squares */
-    game_compute_size(params, 700, &pw, &ph);
+    game_compute_size(params, 700, ui, &pw, &ph);
     *x = pw / 100.0F;
     *y = ph / 100.0F;
 }
 
-static void game_print(drawing *dr, const game_state *state, int tilesize)
+static void game_print(drawing *dr, const game_state *state, const game_ui *ui,
+                       int tilesize)
 {
     int w2 = state->w2, h2 = state->h2;
     int x, y;
@@ -1946,12 +2035,14 @@ const struct game thegame = {
     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,
-    encode_ui,
-    decode_ui,
+    NULL, /* encode_ui */
+    NULL, /* decode_ui */
     NULL, /* game_request_keys */
     game_changed_state,
+    current_key_label,
     interpret_move,
     execute_move,
     DEFAULT_TILE_SIZE, game_compute_size, game_set_size,
@@ -1965,7 +2056,7 @@ const struct game thegame = {
     game_status,
     true, false, game_print_size, game_print,
     false,                      /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     0,                          /* flags */
 };
 
@@ -1979,7 +2070,7 @@ const struct game thegame = {
 
 /* Most of the standalone solver code was copied from unequal.c and singles.c */
 
-const char *quis;
+static const char *quis;
 
 static void usage_exit(const char *msg)
 {
diff --git a/apps/plugins/puzzles/src/untangle.R b/apps/plugins/puzzles/src/untangle.R
deleted file mode 100644
index a57f1e56fd..0000000000
--- a/apps/plugins/puzzles/src/untangle.R
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- makefile -*-
-
-UNTANGLE_EXTRA = tree234
-
-untangle : [X] GTK COMMON untangle UNTANGLE_EXTRA untangle-icon|no-icon
-
-untangle : [G] WINDOWS COMMON untangle UNTANGLE_EXTRA untangle.res|noicon.res
-
-ALL += untangle[COMBINED] UNTANGLE_EXTRA
-
-!begin am gtk
-GAMES += untangle
-!end
-
-!begin >list.c
-    A(untangle) \
-!end
-
-!begin >gamedesc.txt
-untangle:untangle.exe:Untangle:Planar graph layout puzzle:Reposition the points so that the lines do not cross.
-!end
diff --git a/apps/plugins/puzzles/src/untangle.c b/apps/plugins/puzzles/src/untangle.c
index 0d3e0e6135..f0647c83e9 100644
--- a/apps/plugins/puzzles/src/untangle.c
+++ b/apps/plugins/puzzles/src/untangle.c
@@ -20,10 +20,6 @@
  *    requirements are adequately expressed by a single scalar tile
  *    size), and probably complicate the rest of the puzzles' API as a
  *    result. So I'm not sure I really want to do it.
- *
- *  - It would be nice if we could somehow auto-detect a real `long
- *    long' type on the host platform and use it in place of my
- *    hand-hacked int64s. It'd be faster and more reliable.
  */
 
 #include <stdio.h>
@@ -31,7 +27,15 @@
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
-#include <math.h>
+#include <limits.h>
+#ifdef NO_TGMATH_H
+#  include <math.h>
+#else
+#  include <tgmath.h>
+#endif
+#if HAVE_STDINT_H
+#  include <stdint.h>
+#endif
 
 #include "puzzles.h"
 #include "tree234.h"
@@ -39,7 +43,6 @@
 #define CIRCLE_RADIUS 6
 #define DRAG_THRESHOLD (CIRCLE_RADIUS * 2)
 #define PREFERRED_TILESIZE 64
-#define CURSOR_GRANULARITY 5
 
 #define FLASH_TIME 0.30F
 #define ANIM_TIME 0.13F
@@ -49,9 +52,7 @@ enum {
     COL_SYSBACKGROUND,
     COL_BACKGROUND,
     COL_LINE,
-#ifdef SHOW_CROSSINGS
     COL_CROSSEDLINE,
-#endif
     COL_OUTLINE,
     COL_POINT,
     COL_DRAGPOINT,
@@ -93,9 +94,7 @@ struct game_state {
     game_params params;
     int w, h;                          /* extent of coordinate system only */
     point *pts;
-#ifdef SHOW_CROSSINGS
     int *crosses;                      /* mark edges which are crossed */
-#endif
     struct graph *graph;
     bool completed, cheated, just_solved;
 };
@@ -208,6 +207,8 @@ static const char *validate_params(const game_params *params, bool full)
 {
     if (params->n < 4)
         return "Number of points must be at least four";
+    if (params->n > INT_MAX / 3)
+        return "Number of points must not be unreasonably large";
     return NULL;
 }
 
@@ -216,6 +217,9 @@ static const char *validate_params(const game_params *params, bool full)
  * integer overflow at the very core of cross().
  */
 
+#if !HAVE_STDINT_H
+/* For prehistoric C implementations, do this the hard way */
+
 typedef struct {
     long hi;
     unsigned long lo;
@@ -295,6 +299,21 @@ static int64 dotprod64(long a, long b, long p, long q)
     return ab;
 }
 
+#else /* HAVE_STDINT_H */
+
+typedef int64_t int64;
+#define greater64(i,j) ((i) > (j))
+#define sign64(i) ((i) < 0 ? -1 : (i)==0 ? 0 : +1)
+#define mulu32to64(x,y) ((int64_t)(unsigned long)(x) * (unsigned long)(y))
+#define mul32to64(x,y) ((int64_t)(long)(x) * (long)(y))
+
+static int64 dotprod64(long a, long b, long p, long q)
+{
+    return (int64)a * b + (int64)p * q;
+}
+
+#endif /* HAVE_STDINT_H */
+
 /*
  * Determine whether the line segments between a1 and a2, and
  * between b1 and b2, intersect. We count it as an intersection if
@@ -419,7 +438,9 @@ static void addedge(tree234 *edges, int a, int b)
     e->a = min(a, b);
     e->b = max(a, b);
 
-    add234(edges, e);
+    if (add234(edges, e) != e)
+        /* Duplicate edge. */
+        sfree(e);
 }
 
 static bool isedge(tree234 *edges, int a, int b)
@@ -441,8 +462,8 @@ typedef struct vertex {
 
 static int vertcmpC(const void *av, const void *bv)
 {
-    const vertex *a = (vertex *)av;
-    const vertex *b = (vertex *)bv;
+    const vertex *a = (const vertex *)av;
+    const vertex *b = (const vertex *)bv;
 
     if (a->param < b->param)
         return -1;
@@ -754,6 +775,8 @@ static const char *validate_desc(const game_params *params, const char *desc)
                 return "Expected ',' after number in game description";
             desc++;                    /* eat comma */
         }
+        if (a == b)
+            return "Node linked to itself in game description";
     }
 
     return NULL;
@@ -765,10 +788,8 @@ static void mark_crossings(game_state *state)
     int i, j;
     edge *e, *e2;
 
-#ifdef SHOW_CROSSINGS
     for (i = 0; (e = index234(state->graph->edges, i)) != NULL; i++)
         state->crosses[i] = false;
-#endif
 
     /*
      * Check correctness: for every pair of edges, see whether they
@@ -782,11 +803,7 @@ static void mark_crossings(game_state *state)
             if (cross(state->pts[e2->a], state->pts[e2->b],
                       state->pts[e->a], state->pts[e->b])) {
                 ok = false;
-#ifdef SHOW_CROSSINGS
                 state->crosses[i] = state->crosses[j] = true;
-#else
-                goto done;             /* multi-level break - sorry */
-#endif
             }
         }
     }
@@ -795,9 +812,6 @@ static void mark_crossings(game_state *state)
      * e == NULL if we've gone through all the edge pairs
      * without finding a crossing.
      */
-#ifndef SHOW_CROSSINGS
-    done:
-#endif
     if (ok)
         state->completed = true;
 }
@@ -834,10 +848,8 @@ static game_state *new_game(midend *me, const game_params *params,
         addedge(state->graph->edges, a, b);
     }
 
-#ifdef SHOW_CROSSINGS
     state->crosses = snewn(count234(state->graph->edges), int);
     mark_crossings(state);             /* sets up `crosses' and `completed' */
-#endif
 
     return state;
 }
@@ -857,11 +869,9 @@ static game_state *dup_game(const game_state *state)
     ret->completed = state->completed;
     ret->cheated = state->cheated;
     ret->just_solved = state->just_solved;
-#ifdef SHOW_CROSSINGS
     ret->crosses = snewn(count234(ret->graph->edges), int);
     memcpy(ret->crosses, state->crosses,
            count234(ret->graph->edges) * sizeof(int));
-#endif
 
     return ret;
 }
@@ -1025,19 +1035,10 @@ static char *solve_game(const game_state *state, const game_state *currstate,
     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 NULL;
-}
-
 struct game_ui {
+    /* Invariant: at most one of {dragpoint, cursorpoint} may be valid
+     * at any time. */
     int dragpoint;                     /* point being dragged; -1 if none */
-
     int cursorpoint;                   /* point being highlighted, but
                                         * not dragged by the cursor,
                                         * again -1 if none */
@@ -1046,6 +1047,26 @@ struct game_ui {
     bool just_dragged;                 /* reset in game_changed_state */
     bool just_moved;                   /* _set_ in game_changed_state */
     float anim_length;
+
+    /*
+     * User preference option to snap dragged points to a coarse-ish
+     * grid. Requested by a user who otherwise found themself spending
+     * too much time struggling to get lines nicely horizontal or
+     * vertical.
+     */
+    bool snap_to_grid;
+
+    /*
+     * User preference option to highlight graph edges involved in a
+     * crossing.
+     */
+    bool show_crossed_edges;
+
+    /*
+     * User preference option to show vertices as numbers instead of
+     * circular blobs, so you can easily tell them apart.
+     */
+    bool vertex_numbers;
 };
 
 static game_ui *new_ui(const game_state *state)
@@ -1054,21 +1075,51 @@ static game_ui *new_ui(const game_state *state)
     ui->dragpoint = -1;
     ui->cursorpoint = -1;
     ui->just_moved = ui->just_dragged = false;
+    ui->snap_to_grid = false;
+    ui->show_crossed_edges = false;
+    ui->vertex_numbers = false;
     return ui;
 }
 
-static void free_ui(game_ui *ui)
+static config_item *get_prefs(game_ui *ui)
 {
-    sfree(ui);
+    config_item *cfg;
+
+    cfg = snewn(4, config_item);
+
+    cfg[0].name = "Snap points to a grid";
+    cfg[0].kw = "snap-to-grid";
+    cfg[0].type = C_BOOLEAN;
+    cfg[0].u.boolean.bval = ui->snap_to_grid;
+
+    cfg[1].name = "Show edges that cross another edge";
+    cfg[1].kw = "show-crossed-edges";
+    cfg[1].type = C_BOOLEAN;
+    cfg[1].u.boolean.bval = ui->show_crossed_edges;
+
+    cfg[2].name = "Display style for vertices";
+    cfg[2].kw = "vertex-style";
+    cfg[2].type = C_CHOICES;
+    cfg[2].u.choices.choicenames = ":Circles:Numbers";
+    cfg[2].u.choices.choicekws = ":circle:number";
+    cfg[2].u.choices.selected = ui->vertex_numbers;
+
+    cfg[3].name = NULL;
+    cfg[3].type = C_END;
+
+    return cfg;
 }
 
-static char *encode_ui(const game_ui *ui)
+static void set_prefs(game_ui *ui, const config_item *cfg)
 {
-    return NULL;
+    ui->snap_to_grid = cfg[0].u.boolean.bval;
+    ui->show_crossed_edges = cfg[1].u.boolean.bval;
+    ui->vertex_numbers = cfg[2].u.choices.selected;
 }
 
-static void decode_ui(game_ui *ui, const char *encoding)
+static void free_ui(game_ui *ui)
 {
+    sfree(ui);
 }
 
 static void game_changed_state(game_ui *ui, const game_state *oldstate,
@@ -1085,6 +1136,66 @@ struct game_drawstate {
     long *x, *y;
 };
 
+static void place_dragged_point(const game_state *state, game_ui *ui,
+                                const game_drawstate *ds, int x, int y)
+{
+    if (ui->snap_to_grid) {
+        /*
+         * We snap points to a grid that has n-1 vertices on each
+         * side. This should be large enough to permit a straight-
+         * line drawing of any n-vertex planar graph, and moreover,
+         * any specific planar embedding of that graph.
+         *
+         * Source: David Eppstein's book 'Forbidden Configurations in
+         * Discrete Geometry' mentions (section 16.3, page 182) that
+         * the point configuration he describes as GRID(n-1,n-1) -
+         * that is, the vertices of a square grid with n-1 vertices on
+         * each side - is universal for n-vertex planar graphs. In
+         * other words (from definitions earlier in the chapter), if a
+         * graph G admits any drawing in the plane at all, then it can
+         * be drawn with straight lines, and with all vertices being
+         * vertices of that grid.
+         *
+         * That fact by itself only says that _some_ planar embedding
+         * of G can be drawn in this grid. We'd prefer that _all_
+         * embeddings of G can be so drawn, because 'snap to grid' is
+         * supposed to be a UI affordance, not an extra puzzle
+         * challenge, so we don't want to constrain the player's
+         * choice of planar embedding.
+         *
+         * But it doesn't make a difference. Proof: given a specific
+         * planar embedding of G, triangulate it, by adding extra
+         * edges to every face of degree > 3. When this process
+         * terminates with every face a triangle, we have a new graph
+         * G' such that no edge can be added without it ceasing to be
+         * planar. Standard theorems say that a maximal planar graph
+         * is 3-connected, and that a 3-connected planar graph has a
+         * _unique_ embedding. So any drawing of G' in the plane can
+         * be converted into a drawing of G in the desired embedding,
+         * by simply removing all the extra edges that we added to
+         * turn G into G'. And G' is still an n-vertex planar graph,
+         * hence it can be drawn in GRID(n-1,n-1). []
+         */
+        int d = state->params.n - 1;
+
+        /* Calculate position in terms of the snapping grid. */
+        x = d * x / (state->w * ds->tilesize);
+        y = d * y / (state->h * ds->tilesize);
+        /* Convert to standard co-ordinates, applying a half-square offset. */
+        ui->newpoint.x = (x * 2 + 1) * state->w;
+        ui->newpoint.y = (y * 2 + 1) * state->h;
+        ui->newpoint.d = d * 2;
+    } else {
+        ui->newpoint.x = x;
+        ui->newpoint.y = y;
+        ui->newpoint.d = ds->tilesize;
+    }
+}
+
+static float normsq(point pt) {
+    return (pt.x * pt.x + pt.y * pt.y) / (pt.d * pt.d);
+}
+
 static char *interpret_move(const game_state *state, game_ui *ui,
                             const game_drawstate *ds,
                             int x, int y, int button)
@@ -1119,23 +1230,20 @@ static char *interpret_move(const game_state *state, game_ui *ui,
 
         if (bestd <= DRAG_THRESHOLD * DRAG_THRESHOLD) {
             ui->dragpoint = best;
-            ui->cursorpoint = -1;
-            ui->newpoint.x = x;
-            ui->newpoint.y = y;
-            ui->newpoint.d = ds->tilesize;
-            return UI_UPDATE;
+            ui->cursorpoint = -1; /* eliminate the cursor point, if any */
+            place_dragged_point(state, ui, ds, x, y);
+            return MOVE_UI_UPDATE;
         }
-
+        return MOVE_NO_EFFECT;
     } else if (IS_MOUSE_DRAG(button) && ui->dragpoint >= 0) {
-        ui->newpoint.x = x;
-        ui->newpoint.y = y;
-        ui->newpoint.d = ds->tilesize;
-        return UI_UPDATE;
+        place_dragged_point(state, ui, ds, x, y);
+        return MOVE_UI_UPDATE;
     } else if (IS_MOUSE_RELEASE(button) && ui->dragpoint >= 0) {
         int p = ui->dragpoint;
         char buf[80];
 
         ui->dragpoint = -1;            /* terminate drag, no matter what */
+        ui->cursorpoint = -1;          /* also eliminate the cursor point */
 
         /*
          * First, see if we're within range. The user can cancel a
@@ -1145,7 +1253,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             ui->newpoint.x >= (long)state->w*ui->newpoint.d ||
             ui->newpoint.y < 0 ||
             ui->newpoint.y >= (long)state->h*ui->newpoint.d)
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
 
         /*
          * We aren't cancelling the drag. Construct a move string
@@ -1155,109 +1263,140 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->newpoint.x, ui->newpoint.y, ui->newpoint.d);
         ui->just_dragged = true;
         return dupstr(buf);
+    } else if (IS_MOUSE_DRAG(button) || IS_MOUSE_RELEASE(button)) {
+        return MOVE_NO_EFFECT;
     }
-    else if(IS_CURSOR_MOVE(button))
-    {
-        if(ui->dragpoint < 0)
-        {
-            /* We're selecting a point here. */
-            /* Search all the points and find the closest one (2-D) in
-             * the given direction. */
-            int i, best;
-            long bestd;
-
-            if(ui->cursorpoint < 0)
-            {
+    else if(IS_CURSOR_MOVE(button)) {
+        if(ui->dragpoint < 0) {
+            /*
+             * We're selecting a point with the cursor keys.
+             *
+             * If no point is currently highlighted, we assume the "0"
+             * point is highlighted to begin. Then, we search all the
+             * points and find the nearest one (by Euclidean distance)
+             * in the quadrant corresponding to the cursor key
+             * direction. A point is in the right quadrant if and only
+             * if the azimuth angle to that point from the cursor
+             * point is within a [-45 deg, +45 deg] interval from the
+             * direction vector of the cursor key.
+             *
+             * An important corner case here is if another point is in
+             * the exact same location as the currently highlighted
+             * point (which is a possibility with the "snap to grid"
+             * preference). In this case, we do not consider the other
+             * point as a candidate point, so as to prevent the cursor
+             * from being "stuck" on any point. The player can still
+             * select the overlapped point by dragging the highlighted
+             * point away and then navigating back.
+             */
+            int i, best = -1;
+            float bestd = 0;
+
+            if(ui->cursorpoint < 0) {
                 ui->cursorpoint = 0;
             }
 
-            /*
-             * Begin drag. We drag the vertex _nearest_ to the pointer,
-             * just in case one is nearly on top of another and we want
-             * to drag the latter. However, we drag nothing at all if
-             * the nearest vertex is outside DRAG_THRESHOLD.
-             */
-            best = -1;
-            bestd = 0;
+            point cur = state->pts[ui->cursorpoint];
 
             for (i = 0; i < n; i++) {
-                long px, py, dx, dy, d;
-                float angle;
-                int right_direction;
+                point delta;
+                float distsq;
+                point p = state->pts[i];
+                int right_direction = false;
+
                 if(i == ui->cursorpoint)
                     continue;
 
-                px = state->pts[i].x * ds->tilesize / state->pts[i].d;
-                py = state->pts[i].y * ds->tilesize / state->pts[i].d;
-                dx = px - state->pts[ui->cursorpoint].x * ds->tilesize / state->pts[ui->cursorpoint].d;
-                dy = py - state->pts[ui->cursorpoint].y * ds->tilesize / state->pts[ui->cursorpoint].d;
-                d = dx*dx + dy*dy;
+                /* Compute the vector p - cur. Check that it lies in
+                 * the correct quadrant. */
+                delta.x = p.x * cur.d - cur.x * p.d;
+                delta.y = p.y * cur.d - cur.y * p.d;
+                delta.d = cur.d * p.d;
 
-                /* Figure out if this point falls into a 90 degree
-                 * range extending from the current point */
+                if(delta.x == 0 && delta.y == 0)
+                    continue; /* overlaps cursor point - skip */
 
-                angle = atan2(-dy, dx); /* negate y to adjust for raster coordinates */
-
-                /* offset to [0..2*PI] */
-                if(angle < 0)
-                    angle += 2*PI;
+                switch(button) {
+                case CURSOR_UP:
+                    right_direction = (delta.y <= -delta.x) && (delta.y <= delta.x);
+                    break;
+                case CURSOR_DOWN:
+                    right_direction = (delta.y >= -delta.x) && (delta.y >= delta.x);
+                    break;
+                case CURSOR_LEFT:
+                    right_direction = (delta.y >= delta.x) && (delta.y <= -delta.x);
+                    break;
+                case CURSOR_RIGHT:
+                    right_direction = (delta.y <= delta.x) && (delta.y >= -delta.x);
+                    break;
+                }
 
-                right_direction = false;
+                if(!right_direction)
+                    continue;
 
-                if((button == CURSOR_UP && (1*PI/4 <= angle && angle <= 3*PI/4))   ||
-                   (button == CURSOR_LEFT && (3*PI/4 <= angle && angle <= 5*PI/4)) ||
-                   (button == CURSOR_DOWN && (5*PI/4 <= angle && angle <= 7*PI/4)) ||
-                   (button == CURSOR_RIGHT && (angle >= 7*PI/4 || angle <= 1*PI/4)))
-                    right_direction = true;
+                /* Compute squared Euclidean distance */
+                distsq = normsq(delta);
 
-                if ((best == -1 || bestd > d) && right_direction) {
+                if (best == -1 || distsq < bestd) {
                     best = i;
-                    bestd = d;
+                    bestd = distsq;
                 }
             }
 
-            if(best >= 0)
-            {
+            if(best >= 0) {
                 ui->cursorpoint = best;
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
             }
         }
-        else if(ui->dragpoint >= 0)
-        {
-            /* dragging */
-            switch(button)
-            {
+        else if(ui->dragpoint >= 0) {
+            /* Dragging a point with the cursor keys. */
+            int movement_increment = ds->tilesize / 2;
+            int dx = 0, dy = 0;
+
+            switch(button) {
             case CURSOR_UP:
-                ui->newpoint.y -= ds->tilesize / CURSOR_GRANULARITY;
-                return UI_UPDATE;
+                dy = -movement_increment;
+                break;
             case CURSOR_DOWN:
-                ui->newpoint.y += ds->tilesize / CURSOR_GRANULARITY;
-                return UI_UPDATE;
+                dy = movement_increment;
+                break;
             case CURSOR_LEFT:
-                ui->newpoint.x -= ds->tilesize / CURSOR_GRANULARITY;
-                return UI_UPDATE;
+                dx = -movement_increment;
+                break;
             case CURSOR_RIGHT:
-                ui->newpoint.x += ds->tilesize / CURSOR_GRANULARITY;
-                return UI_UPDATE;
+                dx = movement_increment;
+                break;
             default:
                 break;
             }
+
+            /* This code has a slightly inconvenient interaction with
+             * the snap to grid feature: if the point being dragged
+             * originates on a non-grid point which is in the bottom
+             * half or right half (or both) of a grid cell (a 75%
+             * probability), then dragging point right (if it
+             * originates from the right half) or down (if it
+             * originates from the bottom half) will cause the point
+             * to move one more grid cell than intended in that
+             * direction. I (F. Wei) it wasn't worth handling this
+             * corner case - if anyone feels inclined, please feel
+             * free to do so. */
+            place_dragged_point(state, ui, ds,
+                                ui->newpoint.x * ds->tilesize / ui->newpoint.d + dx,
+                                ui->newpoint.y * ds->tilesize / ui->newpoint.d + dy);
+            return MOVE_UI_UPDATE;
         }
-    }
-    else if(IS_CURSOR_SELECT(button))
-    {
-        if(ui->dragpoint < 0 && ui->cursorpoint >= 0)
-        {
+    } else if(button == CURSOR_SELECT) {
+        if(ui->dragpoint < 0 && ui->cursorpoint >= 0) {
             /* begin drag */
             ui->dragpoint = ui->cursorpoint;
             ui->cursorpoint = -1;
             ui->newpoint.x = state->pts[ui->dragpoint].x * ds->tilesize / state->pts[ui->dragpoint].d;
             ui->newpoint.y = state->pts[ui->dragpoint].y * ds->tilesize / state->pts[ui->dragpoint].d;
             ui->newpoint.d = ds->tilesize;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
-        else if(ui->dragpoint >= 0)
-        {
+        else if(ui->dragpoint >= 0) {
             /* end drag */
             int p = ui->dragpoint;
             char buf[80];
@@ -1273,7 +1412,7 @@ static char *interpret_move(const game_state *state, game_ui *ui,
                 ui->newpoint.x >= (long)state->w*ui->newpoint.d ||
                 ui->newpoint.y < 0 ||
                 ui->newpoint.y >= (long)state->h*ui->newpoint.d)
-                return UI_UPDATE;
+                return MOVE_UI_UPDATE;
 
             /*
              * We aren't cancelling the drag. Construct a move string
@@ -1284,14 +1423,29 @@ static char *interpret_move(const game_state *state, game_ui *ui,
             ui->just_dragged = true;
             return dupstr(buf);
         }
-        else if(ui->cursorpoint < 0)
-        {
+        else if(ui->cursorpoint < 0) {
             ui->cursorpoint = 0;
-            return UI_UPDATE;
+            return MOVE_UI_UPDATE;
         }
+    } else if(STRIP_BUTTON_MODIFIERS(button) == CURSOR_SELECT2 ||
+              STRIP_BUTTON_MODIFIERS(button) == '\t') {
+        /* Use spacebar or tab to cycle through the points. Shift
+         * reverses cycle direction. */
+        if(ui->dragpoint >= 0)
+            return MOVE_NO_EFFECT;
+        if(ui->cursorpoint < 0) {
+            ui->cursorpoint = 0;
+            return MOVE_UI_UPDATE;
+        }
+        assert(ui->cursorpoint >= 0);
+
+        /* cursorpoint is valid - increment it */
+        int direction = (button & MOD_SHFT) ? -1 : 1;
+        ui->cursorpoint = (ui->cursorpoint + direction + state->params.n) % state->params.n;
+        return MOVE_UI_UPDATE;
     }
 
-    return NULL;
+    return MOVE_UNUSED;
 }
 
 static game_state *execute_move(const game_state *state, const char *move)
@@ -1334,7 +1488,7 @@ static game_state *execute_move(const game_state *state, const char *move)
  */
 
 static void game_compute_size(const game_params *params, int tilesize,
-                              int *x, int *y)
+                              const game_ui *ui, int *x, int *y)
 {
     *x = *y = COORDLIMIT(params->n) * tilesize;
 }
@@ -1363,11 +1517,9 @@ static float *game_colours(frontend *fe, int *ncolours)
     ret[COL_LINE * 3 + 1] = 0.0F;
     ret[COL_LINE * 3 + 2] = 0.0F;
 
-#ifdef SHOW_CROSSINGS
     ret[COL_CROSSEDLINE * 3 + 0] = 1.0F;
     ret[COL_CROSSEDLINE * 3 + 1] = 0.0F;
     ret[COL_CROSSEDLINE * 3 + 2] = 0.0F;
-#endif
 
     ret[COL_OUTLINE * 3 + 0] = 0.0F;
     ret[COL_OUTLINE * 3 + 1] = 0.0F;
@@ -1491,15 +1643,16 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
         ds->y[i] = y;
     }
 
-    if (ds->bg == bg && ds->dragpoint == ui->dragpoint && ds->cursorpoint == ui->cursorpoint && !points_moved)
+    if (ds->bg == bg &&
+        ds->dragpoint == ui->dragpoint &&
+        ds->cursorpoint == ui->cursorpoint && !points_moved)
         return;                        /* nothing to do */
 
     ds->dragpoint = ui->dragpoint;
+    ds->cursorpoint = ui->cursorpoint;
     ds->bg = bg;
 
-    game_compute_size(&state->params, ds->tilesize, &w, &h);
-
-    clip(dr, 0, 0, w, h);
+    game_compute_size(&state->params, ds->tilesize, ui, &w, &h);
     draw_rect(dr, 0, 0, w, h, bg);
 
     /*
@@ -1508,23 +1661,28 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
 
     for (i = 0; (e = index234(state->graph->edges, i)) != NULL; i++) {
         draw_line(dr, ds->x[e->a], ds->y[e->a], ds->x[e->b], ds->y[e->b],
-#ifdef SHOW_CROSSINGS
-                  (oldstate?oldstate:state)->crosses[i] ?
-                  COL_CROSSEDLINE :
-#endif
-                  COL_LINE);
+                  ui->show_crossed_edges &&
+                  (oldstate?oldstate:state)->crosses[i] ?
+                  COL_CROSSEDLINE : COL_LINE);
     }
 
     /*
      * Draw the points.
-     * 
-     * When dragging, we should not only vary the colours, but
-     * leave the point being dragged until last.
+     *
+     * When dragging, we vary the point colours to highlight the drag
+     * point and neighbour points. The draw order is defined so that
+     * the most relevant points (i.e., the dragged point and cursor
+     * point) are drawn last, so they appear on top of other points.
      */
+    static const int draw_order[] = {
+        COL_POINT,
+        COL_NEIGHBOUR,
+        COL_CURSORPOINT,
+        COL_DRAGPOINT
+    };
+
     for (j = 0; j < 4; j++) {
-        int thisc = (j == 0 ? COL_POINT :
-                     (j == 1 ? COL_NEIGHBOUR :
-                      j == 2 ? COL_CURSORPOINT : COL_DRAGPOINT));
+        int thisc = draw_order[j];
         for (i = 0; i < state->params.n; i++) {
             int c;
 
@@ -1540,19 +1698,17 @@ static void game_redraw(drawing *dr, game_drawstate *ds,
             }
 
             if (c == thisc) {
-#ifdef VERTEX_NUMBERS
-                draw_circle(dr, ds->x[i], ds->y[i], DRAG_THRESHOLD, bg, bg);
-                {
-                    char buf[80];
-                    sprintf(buf, "%d", i);
-                    draw_text(dr, ds->x[i], ds->y[i], FONT_VARIABLE,
+                if (ui->vertex_numbers) {
+                    char buf[80];
+                    draw_circle(dr, ds->x[i], ds->y[i], DRAG_THRESHOLD, bg, bg);
+                    sprintf(buf, "%d", i);
+                    draw_text(dr, ds->x[i], ds->y[i], FONT_VARIABLE,
                               DRAG_THRESHOLD*3/2,
-                              ALIGN_VCENTRE|ALIGN_HCENTRE, c, buf);
-                }
-#else
-                draw_circle(dr, ds->x[i], ds->y[i], CIRCLE_RADIUS,
-                            c, COL_OUTLINE);
-#endif
+                              ALIGN_VCENTRE|ALIGN_HCENTRE, c, buf);
+                } else {
+                    draw_circle(dr, ds->x[i], ds->y[i], CIRCLE_RADIUS,
+                                c, COL_OUTLINE);
+                }
             }
         }
     }
@@ -1587,17 +1743,20 @@ static void game_get_cursor_location(const game_ui *ui,
                                      const game_params *params,
                                      int *x, int *y, int *w, int *h)
 {
-    if(ui->dragpoint >= 0 || ui->cursorpoint >= 0) {
-        int idx = (ui->dragpoint >= 0) ? ui->dragpoint : ui->cursorpoint;
+    point pt;
+    if(ui->dragpoint >= 0)
+        pt = ui->newpoint;
+    else if(ui->cursorpoint >= 0)
+        pt = state->pts[ui->cursorpoint];
+    else
+        return;
 
-        int cx, cy;
-        cx = ds->x[idx];
-        cy = ds->y[idx];
+    int cx = ds->tilesize * pt.x / pt.d;
+    int cy = ds->tilesize * pt.y / pt.d;
 
-        *x = cx - CIRCLE_RADIUS;
-        *y = cy - CIRCLE_RADIUS;
-        *w = *h = 2 * CIRCLE_RADIUS + 1;
-    }
+    *x = cx - CIRCLE_RADIUS;
+    *y = cy - CIRCLE_RADIUS;
+    *w = *h = 2 * CIRCLE_RADIUS + 1;
 }
 
 static int game_status(const game_state *state)
@@ -1605,19 +1764,6 @@ 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, float *x, float *y)
-{
-}
-
-static void game_print(drawing *dr, const game_state *state, int tilesize)
-{
-}
-
 #ifdef COMBINED
 #define thegame untangle
 #endif
@@ -1638,13 +1784,15 @@ const struct game thegame = {
     dup_game,
     free_game,
     true, solve_game,
-    false, game_can_format_as_text_now, game_text_format,
+    false, NULL, NULL, /* can_format_as_text_now, text_format */
+    get_prefs, set_prefs,
     new_ui,
     free_ui,
-    encode_ui,
-    decode_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,
@@ -1656,8 +1804,8 @@ const struct game thegame = {
     game_flash_length,
     game_get_cursor_location,
     game_status,
-    false, false, game_print_size, game_print,
+    false, false, NULL, NULL,          /* print_size, print */
     false,                             /* wants_statusbar */
-    false, game_timing_state,
+    false, NULL,                       /* timing_state */
     SOLVE_ANIMATES,                    /* flags */
 };
diff --git a/apps/plugins/puzzles/src/version.c b/apps/plugins/puzzles/src/version.c
index 1cef29feb7..73632f9b37 100644
--- a/apps/plugins/puzzles/src/version.c
+++ b/apps/plugins/puzzles/src/version.c
@@ -2,6 +2,7 @@
  * Puzzles version numbering.
  */
 
+#include "puzzles.h"
 #include "version.h"
 
 char ver[] = VER;
diff --git a/apps/plugins/puzzles/src/version.h b/apps/plugins/puzzles/src/version.h
index 997e00592b..20d2800fee 100644
--- a/apps/plugins/puzzles/src/version.h
+++ b/apps/plugins/puzzles/src/version.h
@@ -9,3 +9,5 @@
  */
 
 #define VER "Unidentified build"
+
+#define VERSIONINFO_BINARY_VERSION 0,0,0,0
diff --git a/apps/plugins/puzzles/src/windows.c b/apps/plugins/puzzles/src/windows.c
deleted file mode 100644
index 38559c5454..0000000000
--- a/apps/plugins/puzzles/src/windows.c
+++ /dev/null
@@ -1,3821 +0,0 @@
-/*
- * windows.c: Windows front end for my puzzle collection.
- */
-
-#include <windows.h>
-#include <commctrl.h>
-#ifndef NO_HTMLHELP
-#include <htmlhelp.h>
-#endif /* NO_HTMLHELP */
-
-#ifdef _WIN32_WCE
-#include <commdlg.h>
-#include <aygshell.h>
-#endif
-
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <time.h>
-
-#include "puzzles.h"
-
-#ifdef _WIN32_WCE
-#include "resource.h"
-#endif
-
-#define IDM_NEW       0x0010
-#define IDM_RESTART   0x0020
-#define IDM_UNDO      0x0030
-#define IDM_REDO      0x0040
-#define IDM_COPY      0x0050
-#define IDM_SOLVE     0x0060
-#define IDM_QUIT      0x0070
-#define IDM_CONFIG    0x0080
-#define IDM_DESC      0x0090
-#define IDM_SEED      0x00A0
-#define IDM_HELPC     0x00B0
-#define IDM_GAMEHELP  0x00C0
-#define IDM_ABOUT     0x00D0
-#define IDM_SAVE      0x00E0
-#define IDM_LOAD      0x00F0
-#define IDM_PRINT     0x0100
-#define IDM_PRESETS   0x0110
-#define IDM_GAMES     0x0300
-
-#define IDM_KEYEMUL   0x0400
-
-#define HELP_FILE_NAME  "puzzles.hlp"
-#define HELP_CNT_NAME   "puzzles.cnt"
-#ifndef NO_HTMLHELP
-#define CHM_FILE_NAME   "puzzles.chm"
-#endif /* NO_HTMLHELP */
-
-#ifndef NO_HTMLHELP
-typedef HWND (CALLBACK *htmlhelp_t)(HWND, LPCSTR, UINT, DWORD);
-static htmlhelp_t htmlhelp;
-static HINSTANCE hh_dll;
-#endif /* NO_HTMLHELP */
-enum { NONE, HLP, CHM } help_type;
-char *help_path;
-bool help_has_contents;
-
-#ifndef FILENAME_MAX
-#define FILENAME_MAX    (260)
-#endif
-
-#ifndef HGDI_ERROR
-#define HGDI_ERROR ((HANDLE)GDI_ERROR)
-#endif
-
-#ifdef COMBINED
-#define CLASSNAME "Puzzles"
-#else
-#define CLASSNAME thegame.name
-#endif
-
-#ifdef _WIN32_WCE
-
-/*
- * Wrapper implementations of functions not supplied by the
- * PocketPC API.
- */
-
-#define SHGetSubMenu(hWndMB,ID_MENU) (HMENU)SendMessage((hWndMB), SHCMBM_GETSUBMENU, (WPARAM)0, (LPARAM)ID_MENU)
-
-#undef MessageBox
-
-int MessageBox(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType)
-{
-    TCHAR wText[2048];
-    TCHAR wCaption[2048];
-
-    MultiByteToWideChar (CP_ACP, 0, lpText,    -1, wText,    2048);
-    MultiByteToWideChar (CP_ACP, 0, lpCaption, -1, wCaption, 2048);
-
-    return MessageBoxW (hWnd, wText, wCaption, uType);
-}
-
-BOOL SetDlgItemTextA(HWND hDlg, int nIDDlgItem, LPCSTR lpString)
-{
-    TCHAR wText[256];
-
-    MultiByteToWideChar (CP_ACP, 0, lpString, -1, wText, 256);
-    return SetDlgItemTextW(hDlg, nIDDlgItem, wText);
-}
-
-LPCSTR getenv(LPCSTR buf)
-{
-    return NULL;
-}
-
-BOOL GetKeyboardState(PBYTE pb)
-{
-  return false;
-}
-
-static TCHAR wClassName[256], wGameName[256];
-
-#endif
-
-#ifdef DEBUGGING
-static FILE *debug_fp = NULL;
-static HANDLE debug_hdl = INVALID_HANDLE_VALUE;
-static int debug_got_console = 0;
-
-void dputs(char *buf)
-{
-    /*DWORD dw;
-
-    if (!debug_got_console) {
-        if (AllocConsole()) {
-            debug_got_console = 1;
-            debug_hdl = GetStdHandle(STD_OUTPUT_HANDLE);
-        }
-    }
-    if (!debug_fp) {
-        debug_fp = fopen("debug.log", "w");
-    }
-
-    if (debug_hdl != INVALID_HANDLE_VALUE) {
-        WriteFile(debug_hdl, buf, strlen(buf), &dw, NULL);
-    }
-    if (debug_fp) {
-      fputs(buf, debug_fp);
-      fflush(debug_fp);
-    }*/
-    OutputDebugString(buf);
-}
-
-void debug_printf(const char *fmt, ...)
-{
-    char buf[4096];
-    va_list ap;
-    static int debugging = -1;
-
-    if (debugging == -1)
-        debugging = getenv("DEBUG_PUZZLES") ? 1 : 0;
-
-    if (debugging) {
-        va_start(ap, fmt);
-        _vsnprintf(buf, 4095, fmt, ap);
-        dputs(buf);
-        va_end(ap);
-    }
-}
-#endif
-
-#ifndef _WIN32_WCE
-#define WINFLAGS (WS_OVERLAPPEDWINDOW &~ \
-                      (WS_MAXIMIZEBOX | WS_OVERLAPPED))
-#else
-#define WINFLAGS (WS_CAPTION | WS_SYSMENU)
-#endif
-
-static void new_game_size(frontend *fe, float scale);
-
-struct font {
-    HFONT font;
-    int type;
-    int size;
-};
-
-struct cfg_aux {
-    int ctlid;
-};
-
-struct blitter {
-    HBITMAP bitmap;
-    frontend *fe;
-    int x, y, w, h;
-};
-
-enum { CFG_PRINT = CFG_FRONTEND_SPECIFIC };
-
-struct preset_menuitemref {
-    HMENU which_menu;
-    int item_index;
-};
-
-struct frontend {
-    const game *game;
-    midend *me;
-    HWND hwnd, statusbar, cfgbox;
-#ifdef _WIN32_WCE
-    HWND numpad;  /* window handle for the numeric pad */
-#endif
-    HINSTANCE inst;
-    HBITMAP bitmap, prevbm;
-    RECT bitmapPosition;  /* game bitmap position within game window */
-    HDC hdc;
-    COLORREF *colours;
-    HBRUSH *brushes;
-    HPEN *pens;
-    HRGN clip;
-    HMENU gamemenu, typemenu;
-    UINT timer;
-    DWORD timer_last_tickcount;
-    struct preset_menu *preset_menu;
-    struct preset_menuitemref *preset_menuitems;
-    int n_preset_menuitems;
-    struct font *fonts;
-    int nfonts, fontsize;
-    config_item *cfg;
-    struct cfg_aux *cfgaux;
-    int cfg_which, dlg_done;
-    HFONT cfgfont;
-    HBRUSH oldbr;
-    HPEN oldpen;
-    bool help_running;
-    enum { DRAWING, PRINTING, NOTHING } drawstatus;
-    DOCINFO di;
-    int printcount, printw, printh;
-    bool printsolns, printcurr, printcolour;
-    float printscale;
-    int printoffsetx, printoffsety;
-    float printpixelscale;
-    int fontstart;
-    int linewidth;
-    bool linedotted;
-    drawing *dr;
-    int xmin, ymin;
-    float puzz_scale;
-};
-
-void frontend_free(frontend *fe)
-{
-    midend_free(fe->me);
-
-    sfree(fe->colours);
-    sfree(fe->brushes);
-    sfree(fe->pens);
-    sfree(fe->fonts);
-
-    sfree(fe);
-}
-
-static void update_type_menu_tick(frontend *fe);
-static void update_copy_menu_greying(frontend *fe);
-
-void fatal(const char *fmt, ...)
-{
-    char buf[2048];
-    va_list ap;
-
-    va_start(ap, fmt);
-    vsprintf(buf, fmt, ap);
-    va_end(ap);
-
-    MessageBox(NULL, buf, "Fatal error", MB_ICONEXCLAMATION | MB_OK);
-
-    exit(1);
-}
-
-char *geterrstr(void)
-{
-    LPVOID lpMsgBuf;
-    DWORD dw = GetLastError();
-    char *ret;
-
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-        FORMAT_MESSAGE_FROM_SYSTEM,
-        NULL,
-        dw,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        (LPTSTR) &lpMsgBuf,
-        0, NULL );
-
-    ret = dupstr(lpMsgBuf);
-
-    LocalFree(lpMsgBuf);
-
-    return ret;
-}
-
-void get_random_seed(void **randseed, int *randseedsize)
-{
-    SYSTEMTIME *st = snew(SYSTEMTIME);
-
-    GetLocalTime(st);
-
-    *randseed = (void *)st;
-    *randseedsize = sizeof(SYSTEMTIME);
-}
-
-static void win_status_bar(void *handle, const char *text)
-{
-#ifdef _WIN32_WCE
-    TCHAR wText[255];
-#endif
-    frontend *fe = (frontend *)handle;
-
-#ifdef _WIN32_WCE
-    MultiByteToWideChar (CP_ACP, 0, text, -1, wText, 255);
-    SendMessage(fe->statusbar, SB_SETTEXT,
-                (WPARAM) 255 | SBT_NOBORDERS,
-                (LPARAM) wText);
-#else
-    SetWindowText(fe->statusbar, text);
-#endif
-}
-
-static blitter *win_blitter_new(void *handle, int w, int h)
-{
-    blitter *bl = snew(blitter);
-
-    memset(bl, 0, sizeof(blitter));
-    bl->w = w;
-    bl->h = h;
-    bl->bitmap = 0;
-
-    return bl;
-}
-
-static void win_blitter_free(void *handle, blitter *bl)
-{
-    if (bl->bitmap) DeleteObject(bl->bitmap);
-    sfree(bl);
-}
-
-static void blitter_mkbitmap(frontend *fe, blitter *bl)
-{
-    HDC hdc = GetDC(fe->hwnd);
-    bl->bitmap = CreateCompatibleBitmap(hdc, bl->w, bl->h);
-    ReleaseDC(fe->hwnd, hdc);
-}
-
-/* BitBlt(dstDC, dstX, dstY, dstW, dstH, srcDC, srcX, srcY, dType) */
-
-static void win_blitter_save(void *handle, blitter *bl, int x, int y)
-{
-    frontend *fe = (frontend *)handle;
-    HDC hdc_win, hdc_blit;
-    HBITMAP prev_blit;
-
-    assert(fe->drawstatus == DRAWING);
-
-    if (!bl->bitmap) blitter_mkbitmap(fe, bl);
-
-    bl->x = x; bl->y = y;
-
-    hdc_win = GetDC(fe->hwnd);
-    hdc_blit = CreateCompatibleDC(hdc_win);
-    if (!hdc_blit) fatal("hdc_blit failed: 0x%x", GetLastError());
-
-    prev_blit = SelectObject(hdc_blit, bl->bitmap);
-    if (prev_blit == NULL || prev_blit == HGDI_ERROR)
-        fatal("SelectObject for hdc_main failed: 0x%x", GetLastError());
-
-    if (!BitBlt(hdc_blit, 0, 0, bl->w, bl->h,
-                fe->hdc, x, y, SRCCOPY))
-        fatal("BitBlt failed: 0x%x", GetLastError());
-
-    SelectObject(hdc_blit, prev_blit);
-    DeleteDC(hdc_blit);
-    ReleaseDC(fe->hwnd, hdc_win);
-}
-
-static void win_blitter_load(void *handle, blitter *bl, int x, int y)
-{
-    frontend *fe = (frontend *)handle;
-    HDC hdc_win, hdc_blit;
-    HBITMAP prev_blit;
-
-    assert(fe->drawstatus == DRAWING);
-
-    assert(bl->bitmap); /* we should always have saved before loading */
-
-    if (x == BLITTER_FROMSAVED) x = bl->x;
-    if (y == BLITTER_FROMSAVED) y = bl->y;
-
-    hdc_win = GetDC(fe->hwnd);
-    hdc_blit = CreateCompatibleDC(hdc_win);
-
-    prev_blit = SelectObject(hdc_blit, bl->bitmap);
-
-    BitBlt(fe->hdc, x, y, bl->w, bl->h,
-           hdc_blit, 0, 0, SRCCOPY);
-
-    SelectObject(hdc_blit, prev_blit);
-    DeleteDC(hdc_blit);
-    ReleaseDC(fe->hwnd, hdc_win);
-}
-
-void frontend_default_colour(frontend *fe, float *output)
-{
-    DWORD c = GetSysColor(COLOR_MENU); /* ick */
-
-    output[0] = (float)(GetRValue(c) / 255.0);
-    output[1] = (float)(GetGValue(c) / 255.0);
-    output[2] = (float)(GetBValue(c) / 255.0);
-}
-
-static POINT win_transform_point(frontend *fe, int x, int y)
-{
-    POINT ret;
-
-    assert(fe->drawstatus != NOTHING);
-
-    if (fe->drawstatus == PRINTING) {
-        ret.x = (int)(fe->printoffsetx + fe->printpixelscale * x);
-        ret.y = (int)(fe->printoffsety + fe->printpixelscale * y);
-    } else {
-        ret.x = x;
-        ret.y = y;
-    }
-
-    return ret;
-}
-
-static void win_text_colour(frontend *fe, int colour)
-{
-    assert(fe->drawstatus != NOTHING);
-
-    if (fe->drawstatus == PRINTING) {
-        int hatch;
-        float r, g, b;
-        print_get_colour(fe->dr, colour, fe->printcolour, &hatch, &r, &g, &b);
-
-        /*
-         * Displaying text in hatched colours is not permitted.
-         */
-        assert(hatch < 0);
-
-        SetTextColor(fe->hdc, RGB(r * 255, g * 255, b * 255));
-    } else {
-        SetTextColor(fe->hdc, fe->colours[colour]);
-    }
-}
-
-static void win_set_brush(frontend *fe, int colour)
-{
-    HBRUSH br;
-    assert(fe->drawstatus != NOTHING);
-
-    if (fe->drawstatus == PRINTING) {
-        int hatch;
-        float r, g, b;
-        print_get_colour(fe->dr, colour, fe->printcolour, &hatch, &r, &g, &b);
-
-        if (hatch < 0) {
-            br = CreateSolidBrush(RGB(r * 255, g * 255, b * 255));
-        } else {
-#ifdef _WIN32_WCE
-            /*
-             * This is only ever required during printing, and the
-             * PocketPC port doesn't support printing.
-             */
-            fatal("CreateHatchBrush not supported");
-#else
-            br = CreateHatchBrush(hatch == HATCH_BACKSLASH ? HS_FDIAGONAL :
-                                  hatch == HATCH_SLASH ? HS_BDIAGONAL :
-                                  hatch == HATCH_HORIZ ? HS_HORIZONTAL :
-                                  hatch == HATCH_VERT ? HS_VERTICAL :
-                                  hatch == HATCH_PLUS ? HS_CROSS :
-                                  /* hatch == HATCH_X ? */ HS_DIAGCROSS,
-                                  RGB(0,0,0));
-#endif
-        }
-    } else {
-        br = fe->brushes[colour];
-    }
-    fe->oldbr = SelectObject(fe->hdc, br);
-}
-
-static void win_reset_brush(frontend *fe)
-{
-    HBRUSH br;
-
-    assert(fe->drawstatus != NOTHING);
-
-    br = SelectObject(fe->hdc, fe->oldbr);
-    if (fe->drawstatus == PRINTING)
-        DeleteObject(br);
-}
-
-static void win_set_pen(frontend *fe, int colour, bool thin)
-{
-    HPEN pen;
-    assert(fe->drawstatus != NOTHING);
-
-    if (fe->drawstatus == PRINTING) {
-        int hatch;
-        float r, g, b;
-        int width = thin ? 0 : fe->linewidth;
-
-        if (fe->linedotted)
-            width = 0;
-
-        print_get_colour(fe->dr, colour, fe->printcolour, &hatch, &r, &g, &b);
-        /*
-         * Stroking in hatched colours is not permitted.
-         */
-        assert(hatch < 0);
-        pen = CreatePen(fe->linedotted ? PS_DOT : PS_SOLID,
-                        width, RGB(r * 255, g * 255, b * 255));
-    } else {
-        pen = fe->pens[colour];
-    }
-    fe->oldpen = SelectObject(fe->hdc, pen);
-}
-
-static void win_reset_pen(frontend *fe)
-{
-    HPEN pen;
-
-    assert(fe->drawstatus != NOTHING);
-
-    pen = SelectObject(fe->hdc, fe->oldpen);
-    if (fe->drawstatus == PRINTING)
-        DeleteObject(pen);
-}
-
-static void win_clip(void *handle, int x, int y, int w, int h)
-{
-    frontend *fe = (frontend *)handle;
-    POINT p, q;
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    p = win_transform_point(fe, x, y);
-    q = win_transform_point(fe, x+w, y+h);
-    IntersectClipRect(fe->hdc, p.x, p.y, q.x, q.y);
-}
-
-static void win_unclip(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    SelectClipRgn(fe->hdc, NULL);
-}
-
-static void win_draw_text(void *handle, int x, int y, int fonttype,
-                          int fontsize, int align, int colour,
-                          const char *text)
-{
-    frontend *fe = (frontend *)handle;
-    POINT xy;
-    int i;
-    LOGFONT lf;
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (fe->drawstatus == PRINTING)
-        fontsize = (int)(fontsize * fe->printpixelscale);
-
-    xy = win_transform_point(fe, x, y);
-
-    /*
-     * Find or create the font.
-     */
-    for (i = fe->fontstart; i < fe->nfonts; i++)
-        if (fe->fonts[i].type == fonttype && fe->fonts[i].size == fontsize)
-            break;
-
-    if (i == fe->nfonts) {
-        if (fe->fontsize <= fe->nfonts) {
-            fe->fontsize = fe->nfonts + 10;
-            fe->fonts = sresize(fe->fonts, fe->fontsize, struct font);
-        }
-
-        fe->nfonts++;
-
-        fe->fonts[i].type = fonttype;
-        fe->fonts[i].size = fontsize;
-
-        memset (&lf, 0, sizeof(LOGFONT));
-        lf.lfHeight = -fontsize;
-        lf.lfWeight = (fe->drawstatus == PRINTING ? 0 : FW_BOLD);
-        lf.lfCharSet = DEFAULT_CHARSET;
-        lf.lfOutPrecision = OUT_DEFAULT_PRECIS;
-        lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
-        lf.lfQuality = DEFAULT_QUALITY;
-        lf.lfPitchAndFamily = (fonttype == FONT_FIXED ?
-                               FIXED_PITCH | FF_DONTCARE :
-                               VARIABLE_PITCH | FF_SWISS);
-#ifdef _WIN32_WCE
-        wcscpy(lf.lfFaceName, TEXT("Tahoma"));
-#endif
-
-        fe->fonts[i].font = CreateFontIndirect(&lf);
-    }
-
-    /*
-     * Position and draw the text.
-     */
-    {
-        HFONT oldfont;
-        TEXTMETRIC tm;
-        SIZE size;
-        WCHAR wText[256];
-        MultiByteToWideChar (CP_UTF8, 0, text, -1, wText, 256);
-
-        oldfont = SelectObject(fe->hdc, fe->fonts[i].font);
-        if (GetTextMetrics(fe->hdc, &tm)) {
-            if (align & ALIGN_VCENTRE)
-                xy.y -= (tm.tmAscent+tm.tmDescent)/2;
-            else
-                xy.y -= tm.tmAscent;
-        }
-        if (GetTextExtentPoint32W(fe->hdc, wText, wcslen(wText), &size))
-        {
-            if (align & ALIGN_HCENTRE)
-                xy.x -= size.cx / 2;
-            else if (align & ALIGN_HRIGHT)
-                xy.x -= size.cx;
-        }
-        SetBkMode(fe->hdc, TRANSPARENT);
-        win_text_colour(fe, colour);
-        ExtTextOutW(fe->hdc, xy.x, xy.y, 0, NULL, wText, wcslen(wText), NULL);
-        SelectObject(fe->hdc, oldfont);
-    }
-}
-
-static void win_draw_rect(void *handle, int x, int y, int w, int h, int colour)
-{
-    frontend *fe = (frontend *)handle;
-    POINT p, q;
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (fe->drawstatus == DRAWING && w == 1 && h == 1) {
-        /*
-         * Rectangle() appears to get uppity if asked to draw a 1x1
-         * rectangle, presumably on the grounds that that's beneath
-         * its dignity and you ought to be using SetPixel instead.
-         * So I will.
-         */
-        SetPixel(fe->hdc, x, y, fe->colours[colour]);
-    } else {
-        win_set_brush(fe, colour);
-        win_set_pen(fe, colour, true);
-        p = win_transform_point(fe, x, y);
-        q = win_transform_point(fe, x+w, y+h);
-        Rectangle(fe->hdc, p.x, p.y, q.x, q.y);
-        win_reset_brush(fe);
-        win_reset_pen(fe);
-    }
-}
-
-static void win_draw_line(void *handle, int x1, int y1, int x2, int y2, int colour)
-{
-    frontend *fe = (frontend *)handle;
-    POINT pp[2];
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    win_set_pen(fe, colour, false);
-    pp[0] = win_transform_point(fe, x1, y1);
-    pp[1] = win_transform_point(fe, x2, y2);
-    Polyline(fe->hdc, pp, 2);
-    if (fe->drawstatus == DRAWING)
-        SetPixel(fe->hdc, pp[1].x, pp[1].y, fe->colours[colour]);
-    win_reset_pen(fe);
-}
-
-static void win_draw_circle(void *handle, int cx, int cy, int radius,
-                            int fillcolour, int outlinecolour)
-{
-    frontend *fe = (frontend *)handle;
-    POINT p, q;
-
-    assert(outlinecolour >= 0);
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (fillcolour >= 0)
-        win_set_brush(fe, fillcolour);
-    else
-        fe->oldbr = SelectObject(fe->hdc, GetStockObject(NULL_BRUSH));
-
-    win_set_pen(fe, outlinecolour, false);
-    p = win_transform_point(fe, cx - radius, cy - radius);
-    q = win_transform_point(fe, cx + radius, cy + radius);
-    Ellipse(fe->hdc, p.x, p.y, q.x+1, q.y+1);
-    win_reset_brush(fe);
-    win_reset_pen(fe);
-}
-
-static void win_draw_polygon(void *handle, int *coords, int npoints,
-                             int fillcolour, int outlinecolour)
-{
-    frontend *fe = (frontend *)handle;
-    POINT *pts;
-    int i;
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    pts = snewn(npoints+1, POINT);
-
-    for (i = 0; i <= npoints; i++) {
-        int j = (i < npoints ? i : 0);
-        pts[i] = win_transform_point(fe, coords[j*2], coords[j*2+1]);
-    }
-
-    assert(outlinecolour >= 0);
-
-    if (fillcolour >= 0) {
-        win_set_brush(fe, fillcolour);
-        win_set_pen(fe, outlinecolour, false);
-        Polygon(fe->hdc, pts, npoints);
-        win_reset_brush(fe);
-        win_reset_pen(fe);
-    } else {
-        win_set_pen(fe, outlinecolour, false);
-        Polyline(fe->hdc, pts, npoints+1);
-        win_reset_pen(fe);
-    }
-
-    sfree(pts);
-}
-
-static void win_start_draw(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    HDC hdc_win;
-
-    assert(fe->drawstatus == NOTHING);
-
-    hdc_win = GetDC(fe->hwnd);
-    fe->hdc = CreateCompatibleDC(hdc_win);
-    fe->prevbm = SelectObject(fe->hdc, fe->bitmap);
-    ReleaseDC(fe->hwnd, hdc_win);
-    fe->clip = NULL;
-#ifndef _WIN32_WCE
-    SetMapMode(fe->hdc, MM_TEXT);
-#endif
-    fe->drawstatus = DRAWING;
-}
-
-static void win_draw_update(void *handle, int x, int y, int w, int h)
-{
-    frontend *fe = (frontend *)handle;
-    RECT r;
-
-    if (fe->drawstatus != DRAWING)
-        return;
-
-    r.left = x;
-    r.top = y;
-    r.right = x + w;
-    r.bottom = y + h;
-
-    OffsetRect(&r, fe->bitmapPosition.left, fe->bitmapPosition.top);
-    InvalidateRect(fe->hwnd, &r, false);
-}
-
-static void win_end_draw(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-    assert(fe->drawstatus == DRAWING);
-    SelectObject(fe->hdc, fe->prevbm);
-    DeleteDC(fe->hdc);
-    if (fe->clip) {
-        DeleteObject(fe->clip);
-        fe->clip = NULL;
-    }
-    fe->drawstatus = NOTHING;
-}
-
-static void win_line_width(void *handle, float width)
-{
-    frontend *fe = (frontend *)handle;
-
-    assert(fe->drawstatus != DRAWING);
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    fe->linewidth = (int)(width * fe->printpixelscale);
-}
-
-static void win_line_dotted(void *handle, bool dotted)
-{
-    frontend *fe = (frontend *)handle;
-
-    assert(fe->drawstatus != DRAWING);
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    fe->linedotted = dotted;
-}
-
-static void win_begin_doc(void *handle, int pages)
-{
-    frontend *fe = (frontend *)handle;
-
-    assert(fe->drawstatus != DRAWING);
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (StartDoc(fe->hdc, &fe->di) <= 0) {
-        char *e = geterrstr();
-        MessageBox(fe->hwnd, e, "Error starting to print",
-                   MB_ICONERROR | MB_OK);
-        sfree(e);
-        fe->drawstatus = NOTHING;
-    }
-
-    /*
-     * Push a marker on the font stack so that we won't use the
-     * same fonts for printing and drawing. (This is because
-     * drawing seems to look generally better in bold, but printing
-     * is better not in bold.)
-     */
-    fe->fontstart = fe->nfonts;
-}
-
-static void win_begin_page(void *handle, int number)
-{
-    frontend *fe = (frontend *)handle;
-
-    assert(fe->drawstatus != DRAWING);
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (StartPage(fe->hdc) <= 0) {
-        char *e = geterrstr();
-        MessageBox(fe->hwnd, e, "Error starting a page",
-                   MB_ICONERROR | MB_OK);
-        sfree(e);
-        fe->drawstatus = NOTHING;
-    }
-}
-
-static void win_begin_puzzle(void *handle, float xm, float xc,
-                             float ym, float yc, int pw, int ph, float wmm)
-{
-    frontend *fe = (frontend *)handle;
-    int ppw, pph, pox, poy;
-    float mmpw, mmph, mmox, mmoy;
-    float scale;
-
-    assert(fe->drawstatus != DRAWING);
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    ppw = GetDeviceCaps(fe->hdc, HORZRES);
-    pph = GetDeviceCaps(fe->hdc, VERTRES);
-    mmpw = (float)GetDeviceCaps(fe->hdc, HORZSIZE);
-    mmph = (float)GetDeviceCaps(fe->hdc, VERTSIZE);
-
-    /*
-     * Compute the puzzle's position on the logical page.
-     */
-    mmox = xm * mmpw + xc;
-    mmoy = ym * mmph + yc;
-
-    /*
-     * Work out what that comes to in pixels.
-     */
-    pox = (int)(mmox * (float)ppw / mmpw);
-    poy = (int)(mmoy * (float)pph / mmph);
-
-    /*
-     * And determine the scale.
-     * 
-     * I need a scale such that the maximum puzzle-coordinate
-     * extent of the rectangle (pw * scale) is equal to the pixel
-     * equivalent of the puzzle's millimetre width (wmm * ppw /
-     * mmpw).
-     */
-    scale = (wmm * ppw) / (mmpw * pw);
-
-    /*
-     * Now store pox, poy and scale for use in the main drawing
-     * functions.
-     */
-    fe->printoffsetx = pox;
-    fe->printoffsety = poy;
-    fe->printpixelscale = scale;
-
-    fe->linewidth = 1;
-    fe->linedotted = false;
-}
-
-static void win_end_puzzle(void *handle)
-{
-    /* Nothing needs to be done here. */
-}
-
-static void win_end_page(void *handle, int number)
-{
-    frontend *fe = (frontend *)handle;
-
-    assert(fe->drawstatus != DRAWING);
-
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (EndPage(fe->hdc) <= 0) {
-        char *e = geterrstr();
-        MessageBox(fe->hwnd, e, "Error finishing a page",
-                   MB_ICONERROR | MB_OK);
-        sfree(e);
-        fe->drawstatus = NOTHING;
-    }
-}
-
-static void win_end_doc(void *handle)
-{
-    frontend *fe = (frontend *)handle;
-
-    assert(fe->drawstatus != DRAWING);
-
-    /*
-     * Free all the fonts created since we began printing.
-     */
-    while (fe->nfonts > fe->fontstart) {
-        fe->nfonts--;
-        DeleteObject(fe->fonts[fe->nfonts].font);
-    }
-    fe->fontstart = 0;
-
-    /*
-     * The MSDN web site sample code doesn't bother to call EndDoc
-     * if an error occurs half way through printing. I expect doing
-     * so would cause the erroneous document to actually be
-     * printed, or something equally undesirable.
-     */
-    if (fe->drawstatus == NOTHING)
-        return;
-
-    if (EndDoc(fe->hdc) <= 0) {
-        char *e = geterrstr();
-        MessageBox(fe->hwnd, e, "Error finishing printing",
-                   MB_ICONERROR | MB_OK);
-        sfree(e);
-        fe->drawstatus = NOTHING;
-    }
-}
-
-char *win_text_fallback(void *handle, const char *const *strings, int nstrings)
-{
-    /*
-     * We assume Windows can cope with any UTF-8 likely to be
-     * emitted by a puzzle.
-     */
-    return dupstr(strings[0]);
-}
-
-const struct drawing_api win_drawing = {
-    win_draw_text,
-    win_draw_rect,
-    win_draw_line,
-    win_draw_polygon,
-    win_draw_circle,
-    win_draw_update,
-    win_clip,
-    win_unclip,
-    win_start_draw,
-    win_end_draw,
-    win_status_bar,
-    win_blitter_new,
-    win_blitter_free,
-    win_blitter_save,
-    win_blitter_load,
-    win_begin_doc,
-    win_begin_page,
-    win_begin_puzzle,
-    win_end_puzzle,
-    win_end_page,
-    win_end_doc,
-    win_line_width,
-    win_line_dotted,
-    win_text_fallback,
-};
-
-void print(frontend *fe)
-{
-#ifndef _WIN32_WCE
-    PRINTDLG pd;
-    char doctitle[256];
-    document *doc;
-    midend *nme = NULL;  /* non-interactive midend for bulk puzzle generation */
-    int i;
-    const char *err = NULL;
-
-    /*
-     * Create our document structure and fill it up with puzzles.
-     */
-    doc = document_new(fe->printw, fe->printh, fe->printscale / 100.0F);
-    for (i = 0; i < fe->printcount; i++) {
-        if (i == 0 && fe->printcurr) {
-            err = midend_print_puzzle(fe->me, doc, fe->printsolns);
-        } else {
-            if (!nme) {
-                game_params *params;
-
-                nme = midend_new(NULL, fe->game, NULL, NULL);
-
-                /*
-                 * Set the non-interactive mid-end to have the same
-                 * parameters as the standard one.
-                 */
-                params = midend_get_params(fe->me);
-                midend_set_params(nme, params);
-                fe->game->free_params(params);
-            }
-
-            midend_new_game(nme);
-            err = midend_print_puzzle(nme, doc, fe->printsolns);
-        }
-        if (err)
-            break;
-    }
-    if (nme)
-        midend_free(nme);
-
-    if (err) {
-        MessageBox(fe->hwnd, err, "Error preparing puzzles for printing",
-                   MB_ICONERROR | MB_OK);
-        document_free(doc);
-        return;
-    }
-
-    memset(&pd, 0, sizeof(pd));
-    pd.lStructSize = sizeof(pd);
-    pd.hwndOwner = fe->hwnd;
-    pd.hDevMode = NULL;
-    pd.hDevNames = NULL;
-    pd.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC |
-        PD_NOPAGENUMS | PD_NOSELECTION;
-    pd.nCopies = 1;
-    pd.nFromPage = pd.nToPage = 0xFFFF;
-    pd.nMinPage = pd.nMaxPage = 1;
-
-    if (!PrintDlg(&pd)) {
-        document_free(doc);
-        return;
-    }
-
-    /*
-     * Now pd.hDC is a device context for the printer.
-     */
-
-    /*
-     * FIXME: IWBNI we put up an Abort box here.
-     */
-
-    memset(&fe->di, 0, sizeof(fe->di));
-    fe->di.cbSize = sizeof(fe->di);
-    sprintf(doctitle, "Printed puzzles from %s (from Simon Tatham's"
-            " Portable Puzzle Collection)", fe->game->name);
-    fe->di.lpszDocName = doctitle;
-    fe->di.lpszOutput = NULL;
-    fe->di.lpszDatatype = NULL;
-    fe->di.fwType = 0;
-
-    fe->drawstatus = PRINTING;
-    fe->hdc = pd.hDC;
-
-    fe->dr = drawing_new(&win_drawing, NULL, fe);
-    document_print(doc, fe->dr);
-    drawing_free(fe->dr);
-    fe->dr = NULL;
-
-    fe->drawstatus = NOTHING;
-
-    DeleteDC(pd.hDC);
-    document_free(doc);
-#endif
-}
-
-void deactivate_timer(frontend *fe)
-{
-    if (!fe)
-        return;                        /* for non-interactive midend */
-    if (fe->hwnd) KillTimer(fe->hwnd, fe->timer);
-    fe->timer = 0;
-}
-
-void activate_timer(frontend *fe)
-{
-    if (!fe)
-        return;                        /* for non-interactive midend */
-    if (!fe->timer) {
-        fe->timer = SetTimer(fe->hwnd, 1, 20, NULL);
-        fe->timer_last_tickcount = GetTickCount();
-    }
-}
-
-void write_clip(HWND hwnd, char *data)
-{
-    HGLOBAL clipdata;
-    int len, i, j;
-    char *data2;
-    void *lock;
-
-    /*
-     * Windows expects CRLF in the clipboard, so we must convert
-     * any \n that has come out of the puzzle backend.
-     */
-    len = 0;
-    for (i = 0; data[i]; i++) {
-        if (data[i] == '\n')
-            len++;
-        len++;
-    }
-    data2 = snewn(len+1, char);
-    j = 0;
-    for (i = 0; data[i]; i++) {
-        if (data[i] == '\n')
-            data2[j++] = '\r';
-        data2[j++] = data[i];
-    }
-    assert(j == len);
-    data2[j] = '\0';
-
-    clipdata = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, len + 1);
-    if (!clipdata) {
-        sfree(data2);
-        return;
-    }
-    lock = GlobalLock(clipdata);
-    if (!lock) {
-        GlobalFree(clipdata);
-        sfree(data2);
-        return;
-    }
-    memcpy(lock, data2, len);
-    ((unsigned char *) lock)[len] = 0;
-    GlobalUnlock(clipdata);
-
-    if (OpenClipboard(hwnd)) {
-        EmptyClipboard();
-        SetClipboardData(CF_TEXT, clipdata);
-        CloseClipboard();
-    } else
-        GlobalFree(clipdata);
-
-    sfree(data2);
-}
-
-/*
- * Set up Help and see if we can find a help file.
- */
-static void init_help(void)
-{
-#ifndef _WIN32_WCE
-    char b[2048], *p, *q, *r;
-    FILE *fp;
-
-    /*
-     * Find the executable file path, so we can look alongside
-     * it for help files. Trim the filename off the end.
-     */
-    GetModuleFileName(NULL, b, sizeof(b) - 1);
-    r = b;
-    p = strrchr(b, '\\');
-    if (p && p >= r) r = p+1;
-    q = strrchr(b, ':');
-    if (q && q >= r) r = q+1;
-
-#ifndef NO_HTMLHELP
-    /*
-     * Try HTML Help first.
-     */
-    strcpy(r, CHM_FILE_NAME);
-    if ( (fp = fopen(b, "r")) != NULL) {
-        fclose(fp);
-
-        /*
-         * We have a .CHM. See if we can use it.
-         */
-        hh_dll = LoadLibrary("hhctrl.ocx");
-        if (hh_dll) {
-            htmlhelp = (htmlhelp_t)GetProcAddress(hh_dll, "HtmlHelpA");
-            if (!htmlhelp)
-                FreeLibrary(hh_dll);
-        }
-        if (htmlhelp) {
-            help_path = dupstr(b);
-            help_type = CHM;
-            return;
-        }
-    }
-#endif /* NO_HTMLHELP */
-
-    /*
-     * Now try old-style .HLP.
-     */
-    strcpy(r, HELP_FILE_NAME);
-    if ( (fp = fopen(b, "r")) != NULL) {
-        fclose(fp);
-
-        help_path = dupstr(b);
-        help_type = HLP;
-
-        /*
-         * See if there's a .CNT file alongside it.
-         */
-        strcpy(r, HELP_CNT_NAME);
-        if ( (fp = fopen(b, "r")) != NULL) {
-            fclose(fp);
-            help_has_contents = true;
-        } else
-            help_has_contents = false;
-
-        return;
-    }
-
-    help_type = NONE;          /* didn't find any */
-#endif
-}
-
-#ifndef _WIN32_WCE
-
-/*
- * Start Help.
- */
-static void start_help(frontend *fe, const char *topic)
-{
-    char *str = NULL;
-    int cmd;
-
-    switch (help_type) {
-      case HLP:
-        assert(help_path);
-        if (topic) {
-            str = snewn(10+strlen(topic), char);
-            sprintf(str, "JI(`',`%s')", topic);
-            cmd = HELP_COMMAND;
-        } else if (help_has_contents) {
-            cmd = HELP_FINDER;
-        } else {
-            cmd = HELP_CONTENTS;
-        }
-        WinHelp(fe->hwnd, help_path, cmd, (DWORD)str);
-        fe->help_running = true;
-        break;
-      case CHM:
-#ifndef NO_HTMLHELP
-        assert(help_path);
-        assert(htmlhelp);
-        if (topic) {
-            str = snewn(20 + strlen(topic) + strlen(help_path), char);
-            sprintf(str, "%s::/%s.html>main", help_path, topic);
-        } else {
-            str = dupstr(help_path);
-        }
-        htmlhelp(fe->hwnd, str, HH_DISPLAY_TOPIC, 0);
-        fe->help_running = true;
-        break;
-#endif /* NO_HTMLHELP */
-      case NONE:
-        assert(!"This shouldn't happen");
-        break;
-    }
-
-    sfree(str);
-}
-
-/*
- * Stop Help on window cleanup.
- */
-static void stop_help(frontend *fe)
-{
-    if (fe->help_running) {
-        switch (help_type) {
-          case HLP:
-            WinHelp(fe->hwnd, help_path, HELP_QUIT, 0);
-            break;
-          case CHM:
-#ifndef NO_HTMLHELP
-            assert(htmlhelp);
-            htmlhelp(NULL, NULL, HH_CLOSE_ALL, 0);
-            break;
-#endif /* NO_HTMLHELP */
-          case NONE:
-            assert(!"This shouldn't happen");
-            break;
-        }
-        fe->help_running = false;
-    }
-}
-
-#endif
-
-/*
- * Terminate Help on process exit.
- */
-static void cleanup_help(void)
-{
-    /* Nothing to do currently.
-     * (If we were running HTML Help single-threaded, this is where we'd
-     * call HH_UNINITIALIZE.) */
-}
-
-static int get_statusbar_height(frontend *fe)
-{
-    int sy;
-    if (fe->statusbar) {
-        RECT sr;
-        GetWindowRect(fe->statusbar, &sr);
-        sy = sr.bottom - sr.top;
-    } else {
-        sy = 0;
-    }
-    return sy;
-}
-
-static void adjust_statusbar(frontend *fe, RECT *r)
-{
-    int sy;
-
-    if (!fe->statusbar) return;
-
-    sy = get_statusbar_height(fe);
-#ifndef _WIN32_WCE
-    SetWindowPos(fe->statusbar, NULL, 0, r->bottom-r->top-sy, r->right-r->left,
-                 sy, SWP_NOZORDER);
-#endif
-}
-
-static void get_menu_size(HWND wh, RECT *r)
-{
-    HMENU bar = GetMenu(wh);
-    RECT rect;
-    int i;
-
-    SetRect(r, 0, 0, 0, 0);
-    for (i = 0; i < GetMenuItemCount(bar); i++) {
-        GetMenuItemRect(wh, bar, i, &rect);
-        UnionRect(r, r, &rect);
-    }
-}
-
-/*
- * Given a proposed new puzzle size (cx,cy), work out the actual
- * puzzle size that would be (px,py) and the window size including
- * furniture (wx,wy).
- */
-
-static bool check_window_resize(frontend *fe, int cx, int cy,
-                                int *px, int *py, int *wx, int *wy)
-{
-    RECT r;
-    int x, y, sy = get_statusbar_height(fe);
-    bool changed = false;
-
-    /* disallow making window thinner than menu bar */
-    x = max(cx, fe->xmin);
-    y = max(cy - sy, fe->ymin);
-
-    /*
-     * See if we actually got the window size we wanted, and adjust
-     * the puzzle size if not.
-     */
-    midend_size(fe->me, &x, &y, true);
-    if (x != cx || y != cy) {
-        /*
-         * Resize the window, now we know what size we _really_
-         * want it to be.
-         */
-        r.left = r.top = 0;
-        r.right = x;
-        r.bottom = y + sy;
-        AdjustWindowRectEx(&r, WINFLAGS, true, 0);
-        *wx = r.right - r.left;
-        *wy = r.bottom - r.top;
-        changed = true;
-    }
-
-    *px = x;
-    *py = y;
-
-    fe->puzz_scale =
-      (float)midend_tilesize(fe->me) / (float)fe->game->preferred_tilesize;
-
-    return changed;
-}
-
-/*
- * Given the current window size, make sure it's sane for the
- * current puzzle and resize if necessary.
- */
-
-static void check_window_size(frontend *fe, int *px, int *py)
-{
-    RECT r;
-    int wx, wy, cx, cy;
-
-    GetClientRect(fe->hwnd, &r);
-    cx = r.right - r.left;
-    cy = r.bottom - r.top;
-
-    if (check_window_resize(fe, cx, cy, px, py, &wx, &wy)) {
-#ifdef _WIN32_WCE
-        SetWindowPos(fe->hwnd, NULL, 0, 0, wx, wy,
-                     SWP_NOMOVE | SWP_NOZORDER);
-#endif
-        ;
-    }
-
-    GetClientRect(fe->hwnd, &r);
-    adjust_statusbar(fe, &r);
-}
-
-static void get_max_puzzle_size(frontend *fe, int *x, int *y)
-{
-    RECT r, sr;
-
-    if (SystemParametersInfo(SPI_GETWORKAREA, 0, &sr, false)) {
-        *x = sr.right - sr.left;
-        *y = sr.bottom - sr.top;
-        r.left = 100;
-        r.right = 200;
-        r.top = 100;
-        r.bottom = 200;
-        AdjustWindowRectEx(&r, WINFLAGS, true, 0);
-        *x -= r.right - r.left - 100;
-        *y -= r.bottom - r.top - 100;
-    } else {
-        *x = *y = INT_MAX;
-    }
-
-    if (fe->statusbar != NULL) {
-        GetWindowRect(fe->statusbar, &sr);
-        *y -= sr.bottom - sr.top;
-    }
-}
-
-#ifdef _WIN32_WCE
-/* Toolbar buttons on the numeric pad */
-static TBBUTTON tbNumpadButtons[] =
-{
-    {0, IDM_KEYEMUL + '1', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {1, IDM_KEYEMUL + '2', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {2, IDM_KEYEMUL + '3', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {3, IDM_KEYEMUL + '4', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {4, IDM_KEYEMUL + '5', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {5, IDM_KEYEMUL + '6', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {6, IDM_KEYEMUL + '7', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {7, IDM_KEYEMUL + '8', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {8, IDM_KEYEMUL + '9', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1},
-    {9, IDM_KEYEMUL + ' ', TBSTATE_ENABLED, TBSTYLE_BUTTON,  0, -1}
-};
-#endif
-
-/*
- * Allocate a new frontend structure and create its main window.
- */
-static frontend *frontend_new(HINSTANCE inst)
-{
-    frontend *fe;
-    const char *nogame = "Puzzles (no game selected)";
-
-    fe = snew(frontend);
-
-    fe->inst = inst;
-
-    fe->game = NULL;
-    fe->me = NULL;
-
-    fe->timer = 0;
-    fe->hwnd = NULL;
-
-    fe->help_running = false;
-
-    fe->drawstatus = NOTHING;
-    fe->dr = NULL;
-    fe->fontstart = 0;
-
-    fe->fonts = NULL;
-    fe->nfonts = fe->fontsize = 0;
-
-    fe->colours = NULL;
-    fe->brushes = NULL;
-    fe->pens = NULL;
-
-    fe->puzz_scale = 1.0;
-
-    #ifdef _WIN32_WCE
-    MultiByteToWideChar (CP_ACP, 0, nogame, -1, wGameName, 256);
-    fe->hwnd = CreateWindowEx(0, wClassName, wGameName,
-                              WS_VISIBLE,
-                              CW_USEDEFAULT, CW_USEDEFAULT,
-                              CW_USEDEFAULT, CW_USEDEFAULT,
-                              NULL, NULL, inst, NULL);
-
-    {
-        SHMENUBARINFO mbi;
-        RECT rc, rcBar, rcTB, rcClient;
-
-        memset (&mbi, 0, sizeof(SHMENUBARINFO));
-        mbi.cbSize     = sizeof(SHMENUBARINFO);
-        mbi.hwndParent = fe->hwnd;
-        mbi.nToolBarId = IDR_MENUBAR1;
-        mbi.hInstRes   = inst;
-
-        SHCreateMenuBar(&mbi);
-
-        GetWindowRect(fe->hwnd, &rc);
-        GetWindowRect(mbi.hwndMB, &rcBar);
-        rc.bottom -= rcBar.bottom - rcBar.top;
-        MoveWindow(fe->hwnd, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, false);
-
-        fe->numpad = NULL;
-    }
-#else
-    fe->hwnd = CreateWindowEx(0, CLASSNAME, nogame,
-                              WS_OVERLAPPEDWINDOW &~
-                              (WS_MAXIMIZEBOX),
-                              CW_USEDEFAULT, CW_USEDEFAULT,
-                              CW_USEDEFAULT, CW_USEDEFAULT,
-                              NULL, NULL, inst, NULL);
-    if (!fe->hwnd) {
-        DWORD lerr = GetLastError();
-        printf("no window: 0x%x\n", (unsigned)lerr);
-    }
-#endif
-
-    fe->gamemenu = NULL;
-    fe->preset_menu = NULL;
-
-    fe->statusbar = NULL;
-    fe->bitmap = NULL;
-
-    SetWindowLongPtr(fe->hwnd, GWLP_USERDATA, (LONG_PTR)fe);
-
-    return fe;
-}
-
-static void savefile_write(void *wctx, const void *buf, int len)
-{
-    FILE *fp = (FILE *)wctx;
-    fwrite(buf, 1, len, fp);
-}
-
-static bool savefile_read(void *wctx, void *buf, int len)
-{
-    FILE *fp = (FILE *)wctx;
-    int ret;
-
-    ret = fread(buf, 1, len, fp);
-    return (ret == len);
-}
-
-/*
- * Create an appropriate midend structure to go in a puzzle window,
- * given a game type and/or a command-line argument.
- *
- * 'arg' can be either a game ID string (descriptive, random, or a
- * plain set of parameters) or the filename of a save file. The two
- * boolean flag arguments indicate which possibilities are
- * permissible.
- */
-static midend *midend_for_new_game(frontend *fe, const game *cgame,
-                                   char *arg, bool maybe_game_id,
-                                   bool maybe_save_file, char **error)
-{
-    midend *me = NULL;
-
-    if (!arg) {
-        if (me) midend_free(me);
-        me = midend_new(fe, cgame, &win_drawing, fe);
-        midend_new_game(me);
-    } else {
-        FILE *fp;
-        const char *err_param, *err_load;
-
-        /*
-         * See if arg is a valid filename of a save game file.
-         */
-        err_load = NULL;
-        if (maybe_save_file && (fp = fopen(arg, "r")) != NULL) {
-            const game *loadgame;
-
-#ifdef COMBINED
-            /*
-             * Find out what kind of game is stored in the save
-             * file; if we're going to end up loading that, it
-             * will have to override our caller's judgment as to
-             * what game to initialise our midend with.
-             */
-            char *id_name;
-            err_load = identify_game(&id_name, savefile_read, fp);
-            if (!err_load) {
-                int i;
-                for (i = 0; i < gamecount; i++)
-                    if (!strcmp(id_name, gamelist[i]->name))
-                        break;
-                if (i == gamecount) {
-                    err_load = "Save file is for a game not supported by"
-                        " this program";
-                } else {
-                    loadgame = gamelist[i];
-                    rewind(fp); /* go back to the start for actual load */
-                }
-            }
-#else
-            loadgame = cgame;
-#endif
-            if (!err_load) {
-                if (me) midend_free(me);
-                me = midend_new(fe, loadgame, &win_drawing, fe);
-                err_load = midend_deserialise(me, savefile_read, fp);
-            }
-        } else {
-            err_load = "Unable to open file";
-        }
-
-        if (maybe_game_id && (!maybe_save_file || err_load)) {
-            /*
-             * See if arg is a game description.
-             */
-            if (me) midend_free(me);
-            me = midend_new(fe, cgame, &win_drawing, fe);
-            err_param = midend_game_id(me, arg);
-            if (!err_param) {
-                midend_new_game(me);
-            } else {
-                if (maybe_save_file) {
-                    *error = snewn(256 + strlen(arg) + strlen(err_param) +
-                                   strlen(err_load), char);
-                    sprintf(*error, "Supplied argument \"%s\" is neither a"
-                            " game ID (%s) nor a save file (%s)",
-                            arg, err_param, err_load);
-                } else {
-                    *error = dupstr(err_param);
-                }
-                midend_free(me);
-                sfree(fe);
-                return NULL;
-            }
-        } else if (err_load) {
-            *error = dupstr(err_load);
-            midend_free(me);
-            sfree(fe);
-            return NULL;
-        }
-    }
-
-    return me;
-}
-
-static void populate_preset_menu(frontend *fe,
-                                 struct preset_menu *menu, HMENU winmenu)
-{
-    int i;
-    for (i = 0; i < menu->n_entries; i++) {
-        struct preset_menu_entry *entry = &menu->entries[i];
-        UINT_PTR id_or_sub;
-        UINT flags = MF_ENABLED;
-
-        if (entry->params) {
-            id_or_sub = (UINT_PTR)(IDM_PRESETS + 0x10 * entry->id);
-
-            fe->preset_menuitems[entry->id].which_menu = winmenu;
-            fe->preset_menuitems[entry->id].item_index =
-                GetMenuItemCount(winmenu);
-        } else {
-            HMENU winsubmenu = CreateMenu();
-            id_or_sub = (UINT_PTR)winsubmenu;
-            flags |= MF_POPUP;
-
-            populate_preset_menu(fe, entry->submenu, winsubmenu);
-        }
-
-        /*
-         * FIXME: we ought to go through and do something with ampersands
-         * here.
-         */
-
-#ifndef _WIN32_WCE
-        AppendMenu(winmenu, flags, id_or_sub, entry->title);
-#else
-        {
-            TCHAR wName[255];
-            MultiByteToWideChar(CP_ACP, 0, entry->title, -1, wName, 255);
-            AppendMenu(winmenu, flags, id_or_sub, wName);
-        }
-#endif
-    }
-}
-
-/*
- * Populate a frontend structure with a new midend structure, and
- * create any window furniture that it needs.
- *
- * Previously-allocated memory and window furniture will be freed by
- * this function.
- *
- */
-static int fe_set_midend(frontend *fe, midend *me)
-{
-    int x, y;
-    RECT r;
-
-    if (fe->me) {
-        midend_free(fe->me);
-        fe->preset_menu = NULL;
-        sfree(fe->preset_menuitems);
-    }
-    fe->me = me;
-    fe->game = midend_which_game(fe->me);
-
-    {
-        int i, ncolours;
-        float *colours;
-
-        colours = midend_colours(fe->me, &ncolours);
-
-        if (fe->colours) sfree(fe->colours);
-        if (fe->brushes) sfree(fe->brushes);
-        if (fe->pens) sfree(fe->pens);
-
-        fe->colours = snewn(ncolours, COLORREF);
-        fe->brushes = snewn(ncolours, HBRUSH);
-        fe->pens = snewn(ncolours, HPEN);
-
-        for (i = 0; i < ncolours; i++) {
-            fe->colours[i] = RGB(255 * colours[i*3+0],
-                                 255 * colours[i*3+1],
-                                 255 * colours[i*3+2]);
-            fe->brushes[i] = CreateSolidBrush(fe->colours[i]);
-            fe->pens[i] = CreatePen(PS_SOLID, 1, fe->colours[i]);
-        }
-        sfree(colours);
-    }
-
-    if (fe->statusbar)
-        DestroyWindow(fe->statusbar);
-    if (midend_wants_statusbar(fe->me)) {
-        fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME,
-                                       TEXT(DEFAULT_STATUSBAR_TEXT),
-                                       WS_CHILD | WS_VISIBLE,
-                                       0, 0, 0, 0, /* status bar does these */
-                                       NULL, NULL, fe->inst, NULL);
-    } else
-        fe->statusbar = NULL;
-
-    get_max_puzzle_size(fe, &x, &y);
-    midend_size(fe->me, &x, &y, false);
-
-    r.left = r.top = 0;
-    r.right = x;
-    r.bottom = y;
-    AdjustWindowRectEx(&r, WINFLAGS, true, 0);
-
-#ifdef _WIN32_WCE
-    if (fe->numpad)
-        DestroyWindow(fe->numpad);
-    if (fe->game->flags & REQUIRE_NUMPAD)
-    {
-        fe->numpad = CreateToolbarEx (fe->hwnd,
-                                      WS_VISIBLE | WS_CHILD | CCS_NOPARENTALIGN | TBSTYLE_FLAT,
-                                      0, 10, fe->inst, IDR_PADTOOLBAR,
-                                      tbNumpadButtons, sizeof (tbNumpadButtons) / sizeof (TBBUTTON),
-                                      0, 0, 14, 15, sizeof (TBBUTTON));
-        GetWindowRect(fe->numpad, &rcTB);
-        GetClientRect(fe->hwnd, &rcClient);
-        MoveWindow(fe->numpad, 
-                   0, 
-                   rcClient.bottom - (rcTB.bottom - rcTB.top) - 1,
-                   rcClient.right,
-                   rcTB.bottom - rcTB.top,
-                   false);
-        SendMessage(fe->numpad, TB_SETINDENT, (rcClient.right - (10 * 21)) / 2, 0);
-    }
-    else {
-        fe->numpad = NULL;
-    }
-    MultiByteToWideChar (CP_ACP, 0, fe->game->name, -1, wGameName, 256);
-    SetWindowText(fe->hwnd, wGameName);
-#else
-    SetWindowText(fe->hwnd, fe->game->name);
-#endif
-
-    if (fe->statusbar)
-        DestroyWindow(fe->statusbar);
-    if (midend_wants_statusbar(fe->me)) {
-        RECT sr;
-        fe->statusbar = CreateWindowEx(0, STATUSCLASSNAME, TEXT("ooh"),
-                                       WS_CHILD | WS_VISIBLE,
-                                       0, 0, 0, 0, /* status bar does these */
-                                       fe->hwnd, NULL, fe->inst, NULL);
-#ifdef _WIN32_WCE
-        /* Flat status bar looks better on the Pocket PC */
-        SendMessage(fe->statusbar, SB_SIMPLE, (WPARAM) true, 0);
-        SendMessage(fe->statusbar, SB_SETTEXT,
-                                (WPARAM) 255 | SBT_NOBORDERS,
-                                (LPARAM) L"");
-#endif
-
-        /*
-         * Now resize the window to take account of the status bar.
-         */
-        GetWindowRect(fe->statusbar, &sr);
-        GetWindowRect(fe->hwnd, &r);
-#ifndef _WIN32_WCE
-        SetWindowPos(fe->hwnd, NULL, 0, 0, r.right - r.left,
-                     r.bottom - r.top + sr.bottom - sr.top,
-                     SWP_NOMOVE | SWP_NOZORDER);
-#endif
-    } else {
-        fe->statusbar = NULL;
-    }
-
-    {
-        HMENU oldmenu = GetMenu(fe->hwnd);
-
-#ifndef _WIN32_WCE
-        HMENU bar = CreateMenu();
-        HMENU menu = CreateMenu();
-        RECT menusize;
-
-        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)menu, "&Game");
-#else
-        HMENU menu = SHGetSubMenu(SHFindMenuBar(fe->hwnd), ID_GAME);
-        DeleteMenu(menu, 0, MF_BYPOSITION);
-#endif
-        fe->gamemenu = menu;
-        AppendMenu(menu, MF_ENABLED, IDM_NEW, TEXT("&New"));
-        AppendMenu(menu, MF_ENABLED, IDM_RESTART, TEXT("&Restart"));
-#ifndef _WIN32_WCE
-        /* ...here I run out of sensible accelerator characters. */
-        AppendMenu(menu, MF_ENABLED, IDM_DESC, TEXT("Speci&fic..."));
-        AppendMenu(menu, MF_ENABLED, IDM_SEED, TEXT("Rando&m Seed..."));
-#endif
-
-        assert(!fe->preset_menu);
-
-        fe->preset_menu = midend_get_presets(
-            fe->me, &fe->n_preset_menuitems);
-        fe->preset_menuitems = snewn(fe->n_preset_menuitems,
-                                     struct preset_menuitemref);
-        {
-            int i;
-            for (i = 0; i < fe->n_preset_menuitems; i++)
-                fe->preset_menuitems[i].which_menu = NULL;
-        }
-        if (fe->preset_menu->n_entries > 0 || fe->game->can_configure) {
-#ifndef _WIN32_WCE
-            HMENU sub = CreateMenu();
-
-            AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)sub, "&Type");
-#else
-            HMENU sub = SHGetSubMenu(SHFindMenuBar(fe->hwnd), ID_TYPE);
-            DeleteMenu(sub, 0, MF_BYPOSITION);
-#endif
-
-            populate_preset_menu(fe, fe->preset_menu, sub);
-
-            if (fe->game->can_configure) {
-                AppendMenu(sub, MF_ENABLED, IDM_CONFIG, TEXT("&Custom..."));
-            }
-
-            fe->typemenu = sub;
-        } else {
-            fe->typemenu = INVALID_HANDLE_VALUE;
-        }
-
-#ifdef COMBINED
-#ifdef _WIN32_WCE
-#error Windows CE does not support COMBINED build.
-#endif
-        {
-            HMENU games = CreateMenu();
-            int i;
-
-            AppendMenu(menu, MF_SEPARATOR, 0, 0);
-            AppendMenu(menu, MF_ENABLED|MF_POPUP, (UINT)games, "&Other");
-            for (i = 0; i < gamecount; i++) {
-                if (strcmp(gamelist[i]->name, fe->game->name) != 0) {
-                    /* only include those games that aren't the same as the
-                     * game we're currently playing. */
-                    AppendMenu(games, MF_ENABLED, IDM_GAMES + i, gamelist[i]->name);
-                }
-            }
-        }
-#endif
-
-        AppendMenu(menu, MF_SEPARATOR, 0, 0);
-#ifndef _WIN32_WCE
-        AppendMenu(menu, MF_ENABLED, IDM_LOAD, TEXT("&Load..."));
-        AppendMenu(menu, MF_ENABLED, IDM_SAVE, TEXT("&Save..."));
-        AppendMenu(menu, MF_SEPARATOR, 0, 0);
-        if (fe->game->can_print) {
-            AppendMenu(menu, MF_ENABLED, IDM_PRINT, TEXT("&Print..."));
-            AppendMenu(menu, MF_SEPARATOR, 0, 0);
-        }
-#endif
-        AppendMenu(menu, MF_ENABLED, IDM_UNDO, TEXT("Undo"));
-        AppendMenu(menu, MF_ENABLED, IDM_REDO, TEXT("Redo"));
-#ifndef _WIN32_WCE
-        if (fe->game->can_format_as_text_ever) {
-            AppendMenu(menu, MF_SEPARATOR, 0, 0);
-            AppendMenu(menu, MF_ENABLED, IDM_COPY, TEXT("&Copy"));
-        }
-#endif
-        if (fe->game->can_solve) {
-            AppendMenu(menu, MF_SEPARATOR, 0, 0);
-            AppendMenu(menu, MF_ENABLED, IDM_SOLVE, TEXT("Sol&ve"));
-        }
-        AppendMenu(menu, MF_SEPARATOR, 0, 0);
-#ifndef _WIN32_WCE
-        AppendMenu(menu, MF_ENABLED, IDM_QUIT, TEXT("E&xit"));
-        menu = CreateMenu();
-        AppendMenu(bar, MF_ENABLED|MF_POPUP, (UINT)menu, TEXT("&Help"));
-#endif
-        AppendMenu(menu, MF_ENABLED, IDM_ABOUT, TEXT("&About"));
-#ifndef _WIN32_WCE
-        if (help_type != NONE) {
-            char *item;
-            AppendMenu(menu, MF_SEPARATOR, 0, 0);
-            AppendMenu(menu, MF_ENABLED, IDM_HELPC, TEXT("&Contents"));
-            assert(fe->game->name);
-            item = snewn(10+strlen(fe->game->name), char); /*ick*/
-            sprintf(item, "&Help on %s", fe->game->name);
-            AppendMenu(menu, MF_ENABLED, IDM_GAMEHELP, item);
-            sfree(item);
-        }
-        DestroyMenu(oldmenu);
-        SetMenu(fe->hwnd, bar);
-        get_menu_size(fe->hwnd, &menusize);
-        fe->xmin = (menusize.right - menusize.left) + 25;
-#endif
-    }
-
-    if (fe->bitmap) DeleteObject(fe->bitmap);
-    fe->bitmap = NULL;
-    new_game_size(fe, fe->puzz_scale); /* initialises fe->bitmap */
-
-    return 0;
-}
-
-static void show_window(frontend *fe)
-{
-    ShowWindow(fe->hwnd, SW_SHOWNORMAL);
-    SetForegroundWindow(fe->hwnd);
-
-    update_type_menu_tick(fe);
-    update_copy_menu_greying(fe);
-
-    midend_redraw(fe->me);
-}
-
-#ifdef _WIN32_WCE
-static HFONT dialog_title_font()
-{
-    static HFONT hf = NULL;
-    LOGFONT lf;
-
-    if (hf)
-        return hf;
-
-    memset (&lf, 0, sizeof(LOGFONT));
-    lf.lfHeight = -11; /* - ((8 * GetDeviceCaps(hdc, LOGPIXELSY)) / 72) */
-    lf.lfWeight = FW_BOLD;
-    wcscpy(lf.lfFaceName, TEXT("Tahoma"));
-
-    return hf = CreateFontIndirect(&lf);
-}
-
-static void make_dialog_full_screen(HWND hwnd)
-{
-    SHINITDLGINFO shidi;
-
-    /* Make dialog full screen */
-    shidi.dwMask = SHIDIM_FLAGS;
-    shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIZEDLGFULLSCREEN |
-                    SHIDIF_EMPTYMENU;
-    shidi.hDlg = hwnd;
-    SHInitDialog(&shidi);
-}
-#endif
-
-static int CALLBACK AboutDlgProc(HWND hwnd, UINT msg,
-                                 WPARAM wParam, LPARAM lParam)
-{
-    frontend *fe = (frontend *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-
-    switch (msg) {
-      case WM_INITDIALOG:
-#ifdef _WIN32_WCE
-        {
-            char title[256];
-
-            make_dialog_full_screen(hwnd);
-
-            sprintf(title, "About %.250s", fe->game->name);
-            SetDlgItemTextA(hwnd, IDC_ABOUT_CAPTION, title);
-
-            SendDlgItemMessage(hwnd, IDC_ABOUT_CAPTION, WM_SETFONT,
-                               (WPARAM) dialog_title_font(), 0);
-
-            SetDlgItemTextA(hwnd, IDC_ABOUT_GAME, fe->game->name);
-            SetDlgItemTextA(hwnd, IDC_ABOUT_VERSION, ver);
-        }
-#endif
-        return 1;
-
-      case WM_COMMAND:
-        if (LOWORD(wParam) == IDOK)
-#ifdef _WIN32_WCE
-            EndDialog(hwnd, 1);
-#else
-            fe->dlg_done = 1;
-#endif
-        return 0;
-
-      case WM_CLOSE:
-#ifdef _WIN32_WCE
-        EndDialog(hwnd, 1);
-#else
-        fe->dlg_done = 1;
-#endif
-        return 0;
-    }
-
-    return 0;
-}
-
-/*
- * Wrappers on midend_{get,set}_config, which extend the CFG_*
- * enumeration to add CFG_PRINT.
- */
-static config_item *frontend_get_config(frontend *fe, int which,
-                                        char **wintitle)
-{
-    if (which < CFG_FRONTEND_SPECIFIC) {
-        return midend_get_config(fe->me, which, wintitle);
-    } else if (which == CFG_PRINT) {
-        config_item *ret;
-        int i;
-
-        *wintitle = snewn(40 + strlen(fe->game->name), char);
-        sprintf(*wintitle, "%s print setup", fe->game->name);
-
-        ret = snewn(8, config_item);
-
-        i = 0;
-
-        ret[i].name = "Number of puzzles to print";
-        ret[i].type = C_STRING;
-        ret[i].u.string.sval = dupstr("1");
-        i++;
-
-        ret[i].name = "Number of puzzles across the page";
-        ret[i].type = C_STRING;
-        ret[i].u.string.sval = dupstr("1");
-        i++;
-
-        ret[i].name = "Number of puzzles down the page";
-        ret[i].type = C_STRING;
-        ret[i].u.string.sval = dupstr("1");
-        i++;
-
-        ret[i].name = "Percentage of standard size";
-        ret[i].type = C_STRING;
-        ret[i].u.string.sval = dupstr("100.0");
-        i++;
-
-        ret[i].name = "Include currently shown puzzle";
-        ret[i].type = C_BOOLEAN;
-        ret[i].u.boolean.bval = true;
-        i++;
-
-        ret[i].name = "Print solutions";
-        ret[i].type = C_BOOLEAN;
-        ret[i].u.boolean.bval = false;
-        i++;
-
-        if (fe->game->can_print_in_colour) {
-            ret[i].name = "Print in colour";
-            ret[i].type = C_BOOLEAN;
-            ret[i].u.boolean.bval = false;
-            i++;
-        }
-
-        ret[i].name = NULL;
-        ret[i].type = C_END;
-        i++;
-
-        return ret;
-    } else {
-        assert(!"We should never get here");
-        return NULL;
-    }
-}
-
-static const char *frontend_set_config(
-    frontend *fe, int which, config_item *cfg)
-{
-    if (which < CFG_FRONTEND_SPECIFIC) {
-        return midend_set_config(fe->me, which, cfg);
-    } else if (which == CFG_PRINT) {
-        if ((fe->printcount = atoi(cfg[0].u.string.sval)) <= 0)
-            return "Number of puzzles to print should be at least one";
-        if ((fe->printw = atoi(cfg[1].u.string.sval)) <= 0)
-            return "Number of puzzles across the page should be at least one";
-        if ((fe->printh = atoi(cfg[2].u.string.sval)) <= 0)
-            return "Number of puzzles down the page should be at least one";
-        if ((fe->printscale = (float)atof(cfg[3].u.string.sval)) <= 0)
-            return "Print size should be positive";
-        fe->printcurr = cfg[4].u.boolean.bval;
-        fe->printsolns = cfg[5].u.boolean.bval;
-        fe->printcolour = fe->game->can_print_in_colour &&
-            cfg[6].u.boolean.bval;
-        return NULL;
-    } else {
-        assert(!"We should never get here");
-        return "Internal error";
-    }
-}
-
-#ifdef _WIN32_WCE
-/* Separate version of mkctrl function for the Pocket PC. */
-/* Control coordinates should be specified in dialog units. */
-HWND mkctrl(frontend *fe, int x1, int x2, int y1, int y2,
-            LPCTSTR wclass, int wstyle,
-            int exstyle, const char *wtext, INT_PTR wid)
-{
-    RECT rc;
-    TCHAR wwtext[256];
-
-    /* Convert dialog units into pixels */
-    rc.left = x1;  rc.right  = x2;
-    rc.top  = y1;  rc.bottom = y2;
-    MapDialogRect(fe->cfgbox, &rc);
-
-    MultiByteToWideChar (CP_ACP, 0, wtext, -1, wwtext, 256);
-
-    return CreateWindowEx(exstyle, wclass, wwtext,
-                          wstyle | WS_CHILD | WS_VISIBLE,
-                          rc.left, rc.top,
-                          rc.right - rc.left, rc.bottom - rc.top,
-                          fe->cfgbox, (HMENU) wid, fe->inst, NULL);
-}
-
-static void create_config_controls(frontend * fe)
-{
-    int id, nctrls;
-    int col1l, col1r, col2l, col2r, y;
-    config_item *i;
-    struct cfg_aux *j;
-    HWND ctl;
-
-    /* Control placement done in dialog units */
-    col1l = 4;   col1r = 96;   /* Label column */
-    col2l = 100; col2r = 154;  /* Input column (edit boxes and combo boxes) */
-
-    /*
-     * Count the controls so we can allocate cfgaux.
-     */
-    for (nctrls = 0, i = fe->cfg; i->type != C_END; i++)
-        nctrls++;
-    fe->cfgaux = snewn(nctrls, struct cfg_aux);
-
-    id = 1000;
-    y = 22; /* Leave some room for the dialog title */
-    for (i = fe->cfg, j = fe->cfgaux; i->type != C_END; i++, j++) {
-        switch (i->type) {
-          case C_STRING:
-            /*
-             * Edit box with a label beside it.
-             */
-            mkctrl(fe, col1l, col1r, y + 1, y + 11,
-                   TEXT("Static"), SS_LEFTNOWORDWRAP, 0, i->name, id++);
-            mkctrl(fe, col2l, col2r, y, y + 12,
-                   TEXT("EDIT"), WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL,
-                   0, "", (j->ctlid = id++));
-            SetDlgItemTextA(fe->cfgbox, j->ctlid, i->u.string.sval);
-            break;
-
-          case C_BOOLEAN:
-            /*
-             * Simple checkbox.
-             */
-            mkctrl(fe, col1l, col2r, y + 1, y + 11, TEXT("BUTTON"),
-                   BS_NOTIFY | BS_AUTOCHECKBOX | WS_TABSTOP,
-                   0, i->name, (j->ctlid = id++));
-            CheckDlgButton(fe->cfgbox, j->ctlid, (i->u.boolean.bval != 0));
-            break;
-
-          case C_CHOICES:
-            /*
-             * Drop-down list with a label beside it.
-             */
-            mkctrl(fe, col1l, col1r, y + 1, y + 11,
-                   TEXT("STATIC"), SS_LEFTNOWORDWRAP, 0, i->name, id++);
-            ctl = mkctrl(fe, col2l, col2r, y, y + 48,
-                         TEXT("COMBOBOX"), WS_BORDER | WS_TABSTOP |
-                         CBS_DROPDOWNLIST | CBS_HASSTRINGS,
-                         0, "", (j->ctlid = id++));
-            {
-                char c;
-                const char *p, *q;
-                char *str;
-
-                p = i->u.choices.choicenames;
-                c = *p++;
-                while (*p) {
-                    q = p;
-                    while (*q && *q != c) q++;
-                    str = snewn(q-p+1, char);
-                    strncpy(str, p, q-p);
-                    str[q-p] = '\0';
-                    {
-                        TCHAR ws[50];
-                        MultiByteToWideChar (CP_ACP, 0, str, -1, ws, 50);
-                        SendMessage(ctl, CB_ADDSTRING, 0, (LPARAM)ws);
-                    }
-                    
-                    sfree(str);
-                    if (*q) q++;
-                    p = q;
-                }
-            }
-            SendMessage(ctl, CB_SETCURSEL, i->u.choices.selected, 0);
-            break;
-        }
-
-        y += 15;
-    }
-
-}
-#endif
-
-static int CALLBACK ConfigDlgProc(HWND hwnd, UINT msg,
-                                  WPARAM wParam, LPARAM lParam)
-{
-    frontend *fe = (frontend *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-    config_item *i;
-    struct cfg_aux *j;
-
-    switch (msg) {
-      case WM_INITDIALOG:
-#ifdef _WIN32_WCE
-        {
-            char *title;
-
-            fe = (frontend *) lParam;
-            SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
-            fe->cfgbox = hwnd;
-
-            fe->cfg = frontend_get_config(fe, fe->cfg_which, &title);
-
-            make_dialog_full_screen(hwnd);
-
-            SetDlgItemTextA(hwnd, IDC_CONFIG_CAPTION, title);
-            SendDlgItemMessage(hwnd, IDC_CONFIG_CAPTION, WM_SETFONT,
-                               (WPARAM) dialog_title_font(), 0);
-
-            create_config_controls(fe);
-        }
-#endif
-        return 1;
-
-      case WM_COMMAND:
-        /*
-         * OK and Cancel are special cases.
-         */
-        if ((LOWORD(wParam) == IDOK || LOWORD(wParam) == IDCANCEL)) {
-            if (LOWORD(wParam) == IDOK) {
-                const char *err = frontend_set_config(
-                    fe, fe->cfg_which, fe->cfg);
-
-                if (err) {
-                    MessageBox(hwnd, err, "Validation error",
-                               MB_ICONERROR | MB_OK);
-                } else {
-#ifdef _WIN32_WCE
-                    EndDialog(hwnd, 2);
-#else
-                    fe->dlg_done = 2;
-#endif
-                }
-            } else {
-#ifdef _WIN32_WCE
-                EndDialog(hwnd, 1);
-#else
-                fe->dlg_done = 1;
-#endif
-            }
-            return 0;
-        }
-
-        /*
-         * First find the control whose id this is.
-         */
-        for (i = fe->cfg, j = fe->cfgaux; i->type != C_END; i++, j++) {
-            if (j->ctlid == LOWORD(wParam))
-                break;
-        }
-        if (i->type == C_END)
-            return 0;                  /* not our problem */
-
-        if (i->type == C_STRING && HIWORD(wParam) == EN_CHANGE) {
-            char buffer[4096];
-#ifdef _WIN32_WCE
-            TCHAR wBuffer[4096];
-            GetDlgItemText(fe->cfgbox, j->ctlid, wBuffer, 4096);
-            WideCharToMultiByte(CP_ACP, 0, wBuffer, -1, buffer, 4096, NULL, NULL);
-#else
-            GetDlgItemText(fe->cfgbox, j->ctlid, buffer, lenof(buffer));
-#endif
-            buffer[lenof(buffer)-1] = '\0';
-            sfree(i->u.string.sval);
-            i->u.string.sval = dupstr(buffer);
-        } else if (i->type == C_BOOLEAN && 
-                   (HIWORD(wParam) == BN_CLICKED ||
-                    HIWORD(wParam) == BN_DBLCLK)) {
-            i->u.boolean.bval = IsDlgButtonChecked(fe->cfgbox, j->ctlid);
-        } else if (i->type == C_CHOICES &&
-                   HIWORD(wParam) == CBN_SELCHANGE) {
-            i->u.choices.selected = SendDlgItemMessage(fe->cfgbox, j->ctlid,
-                                                       CB_GETCURSEL, 0, 0);
-        }
-
-        return 0;
-
-      case WM_CLOSE:
-        fe->dlg_done = 1;
-        return 0;
-    }
-
-    return 0;
-}
-
-#ifndef _WIN32_WCE
-HWND mkctrl(frontend *fe, int x1, int x2, int y1, int y2,
-            char *wclass, int wstyle,
-            int exstyle, const char *wtext, INT_PTR wid)
-{
-    HWND ret;
-    ret = CreateWindowEx(exstyle, wclass, wtext,
-                         wstyle | WS_CHILD | WS_VISIBLE, x1, y1, x2-x1, y2-y1,
-                         fe->cfgbox, (HMENU) wid, fe->inst, NULL);
-    SendMessage(ret, WM_SETFONT, (WPARAM)fe->cfgfont, MAKELPARAM(true, 0));
-    return ret;
-}
-#endif
-
-static void about(frontend *fe)
-{
-#ifdef _WIN32_WCE
-    DialogBox(fe->inst, MAKEINTRESOURCE(IDD_ABOUT), fe->hwnd, AboutDlgProc);
-#else
-    int i;
-    WNDCLASS wc;
-    MSG msg;
-    TEXTMETRIC tm;
-    HDC hdc;
-    HFONT oldfont;
-    SIZE size;
-    int gm, id;
-    int winwidth, winheight, y;
-    int height, width, maxwid;
-    const char *strings[16];
-    int lengths[16];
-    int nstrings = 0;
-    char titlebuf[512];
-
-    sprintf(titlebuf, "About %.250s", fe->game->name);
-
-    strings[nstrings++] = fe->game->name;
-    strings[nstrings++] = "from Simon Tatham's Portable Puzzle Collection";
-    strings[nstrings++] = ver;
-
-    wc.style = CS_DBLCLKS | CS_SAVEBITS;
-    wc.lpfnWndProc = DefDlgProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = DLGWINDOWEXTRA + 8;
-    wc.hInstance = fe->inst;
-    wc.hIcon = NULL;
-    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1);
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = "GameAboutBox";
-    RegisterClass(&wc);
-
-    hdc = GetDC(fe->hwnd);
-    SetMapMode(hdc, MM_TEXT);
-
-    fe->dlg_done = 0;
-
-    fe->cfgfont = CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72),
-                             0, 0, 0, 0,
-                             false, false, false, DEFAULT_CHARSET,
-                             OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-                             DEFAULT_QUALITY,
-                             FF_SWISS,
-                             "MS Shell Dlg");
-
-    oldfont = SelectObject(hdc, fe->cfgfont);
-    if (GetTextMetrics(hdc, &tm)) {
-        height = tm.tmAscent + tm.tmDescent;
-        width = tm.tmAveCharWidth;
-    } else {
-        height = width = 30;
-    }
-
-    /*
-     * Figure out the layout of the About box by measuring the
-     * length of each piece of text.
-     */
-    maxwid = 0;
-    winheight = height/2;
-
-    for (i = 0; i < nstrings; i++) {
-        if (GetTextExtentPoint32(hdc, strings[i], strlen(strings[i]), &size))
-            lengths[i] = size.cx;
-        else
-            lengths[i] = 0;            /* *shrug* */
-        if (maxwid < lengths[i])
-            maxwid = lengths[i];
-        winheight += height * 3 / 2 + (height / 2);
-    }
-
-    winheight += height + height * 7 / 4;      /* OK button */
-    winwidth = maxwid + 4*width;
-
-    SelectObject(hdc, oldfont);
-    ReleaseDC(fe->hwnd, hdc);
-
-    /*
-     * Create the dialog, now that we know its size.
-     */
-    {
-        RECT r, r2;
-
-        r.left = r.top = 0;
-        r.right = winwidth;
-        r.bottom = winheight;
-
-        AdjustWindowRectEx(&r, (WS_OVERLAPPEDWINDOW /*|
-                                DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
-                                WS_CAPTION | WS_SYSMENU*/) &~
-                           (WS_MAXIMIZEBOX | WS_OVERLAPPED),
-                           false, 0);
-
-        /*
-         * Centre the dialog on its parent window.
-         */
-        r.right -= r.left;
-        r.bottom -= r.top;
-        GetWindowRect(fe->hwnd, &r2);
-        r.left = (r2.left + r2.right - r.right) / 2;
-        r.top = (r2.top + r2.bottom - r.bottom) / 2;
-        r.right += r.left;
-        r.bottom += r.top;
-
-        fe->cfgbox = CreateWindowEx(0, wc.lpszClassName, titlebuf,
-                                    DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
-                                    WS_CAPTION | WS_SYSMENU,
-                                    r.left, r.top,
-                                    r.right-r.left, r.bottom-r.top,
-                                    fe->hwnd, NULL, fe->inst, NULL);
-    }
-
-    SendMessage(fe->cfgbox, WM_SETFONT, (WPARAM)fe->cfgfont, false);
-
-    SetWindowLongPtr(fe->cfgbox, GWLP_USERDATA, (LONG_PTR)fe);
-    SetWindowLongPtr(fe->cfgbox, DWLP_DLGPROC, (LONG_PTR)AboutDlgProc);
-
-    id = 1000;
-    y = height/2;
-    for (i = 0; i < nstrings; i++) {
-        int border = width*2 + (maxwid - lengths[i]) / 2;
-        mkctrl(fe, border, border+lengths[i], y+height*1/8, y+height*9/8,
-               "Static", 0, 0, strings[i], id++);
-        y += height*3/2;
-
-        assert(y < winheight);
-        y += height/2;
-    }
-
-    y += height/2;                     /* extra space before OK */
-    mkctrl(fe, width*2, maxwid+width*2, y, y+height*7/4, "BUTTON",
-           BS_PUSHBUTTON | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
-           "OK", IDOK);
-
-    SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0);
-
-    EnableWindow(fe->hwnd, false);
-    ShowWindow(fe->cfgbox, SW_SHOWNORMAL);
-    while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) {
-        if (!IsDialogMessage(fe->cfgbox, &msg))
-            DispatchMessage(&msg);
-        if (fe->dlg_done)
-            break;
-    }
-    EnableWindow(fe->hwnd, true);
-    SetForegroundWindow(fe->hwnd);
-    DestroyWindow(fe->cfgbox);
-    DeleteObject(fe->cfgfont);
-#endif
-}
-
-static bool get_config(frontend *fe, int which)
-{
-#ifdef _WIN32_WCE
-    fe->cfg_which = which;
-
-    return DialogBoxParam(fe->inst,
-                          MAKEINTRESOURCE(IDD_CONFIG),
-                          fe->hwnd, ConfigDlgProc,
-                          (LPARAM) fe) == 2;
-#else
-    config_item *i;
-    struct cfg_aux *j;
-    char *title;
-    WNDCLASS wc;
-    MSG msg;
-    TEXTMETRIC tm;
-    HDC hdc;
-    HFONT oldfont;
-    SIZE size;
-    HWND ctl;
-    int gm, id, nctrls;
-    int winwidth, winheight, col1l, col1r, col2l, col2r, y;
-    int height, width, maxlabel, maxcheckbox;
-
-    wc.style = CS_DBLCLKS | CS_SAVEBITS;
-    wc.lpfnWndProc = DefDlgProc;
-    wc.cbClsExtra = 0;
-    wc.cbWndExtra = DLGWINDOWEXTRA + 8;
-    wc.hInstance = fe->inst;
-    wc.hIcon = NULL;
-    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-    wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1);
-    wc.lpszMenuName = NULL;
-    wc.lpszClassName = "GameConfigBox";
-    RegisterClass(&wc);
-
-    hdc = GetDC(fe->hwnd);
-    SetMapMode(hdc, MM_TEXT);
-
-    fe->dlg_done = 0;
-
-    fe->cfgfont = CreateFont(-MulDiv(8, GetDeviceCaps(hdc, LOGPIXELSY), 72),
-                             0, 0, 0, 0,
-                             false, false, false, DEFAULT_CHARSET,
-                             OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-                             DEFAULT_QUALITY,
-                             FF_SWISS,
-                             "MS Shell Dlg");
-
-    oldfont = SelectObject(hdc, fe->cfgfont);
-    if (GetTextMetrics(hdc, &tm)) {
-        height = tm.tmAscent + tm.tmDescent;
-        width = tm.tmAveCharWidth;
-    } else {
-        height = width = 30;
-    }
-
-    fe->cfg = frontend_get_config(fe, which, &title);
-    fe->cfg_which = which;
-
-    /*
-     * Figure out the layout of the config box by measuring the
-     * length of each piece of text.
-     */
-    maxlabel = maxcheckbox = 0;
-    winheight = height/2;
-
-    for (i = fe->cfg; i->type != C_END; i++) {
-        switch (i->type) {
-          case C_STRING:
-          case C_CHOICES:
-            /*
-             * Both these control types have a label filling only
-             * the left-hand column of the box.
-             */
-            if (GetTextExtentPoint32(hdc, i->name, strlen(i->name), &size) &&
-                maxlabel < size.cx)
-                maxlabel = size.cx;
-            winheight += height * 3 / 2 + (height / 2);
-            break;
-
-          case C_BOOLEAN:
-            /*
-             * Checkboxes take up the whole of the box width.
-             */
-            if (GetTextExtentPoint32(hdc, i->name, strlen(i->name), &size) &&
-                maxcheckbox < size.cx)
-                maxcheckbox = size.cx;
-            winheight += height + (height / 2);
-            break;
-        }
-    }
-
-    winheight += height + height * 7 / 4;      /* OK / Cancel buttons */
-
-    col1l = 2*width;
-    col1r = col1l + maxlabel;
-    col2l = col1r + 2*width;
-    col2r = col2l + 30*width;
-    if (col2r < col1l+2*height+maxcheckbox)
-        col2r = col1l+2*height+maxcheckbox;
-    winwidth = col2r + 2*width;
-
-    SelectObject(hdc, oldfont);
-    ReleaseDC(fe->hwnd, hdc);
-
-    /*
-     * Create the dialog, now that we know its size.
-     */
-    {
-        RECT r, r2;
-
-        r.left = r.top = 0;
-        r.right = winwidth;
-        r.bottom = winheight;
-
-        AdjustWindowRectEx(&r, (WS_OVERLAPPEDWINDOW /*|
-                                DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
-                                WS_CAPTION | WS_SYSMENU*/) &~
-                           (WS_MAXIMIZEBOX | WS_OVERLAPPED),
-                           false, 0);
-
-        /*
-         * Centre the dialog on its parent window.
-         */
-        r.right -= r.left;
-        r.bottom -= r.top;
-        GetWindowRect(fe->hwnd, &r2);
-        r.left = (r2.left + r2.right - r.right) / 2;
-        r.top = (r2.top + r2.bottom - r.bottom) / 2;
-        r.right += r.left;
-        r.bottom += r.top;
-
-        fe->cfgbox = CreateWindowEx(0, wc.lpszClassName, title,
-                                    DS_MODALFRAME | WS_POPUP | WS_VISIBLE |
-                                    WS_CAPTION | WS_SYSMENU,
-                                    r.left, r.top,
-                                    r.right-r.left, r.bottom-r.top,
-                                    fe->hwnd, NULL, fe->inst, NULL);
-        sfree(title);
-    }
-
-    SendMessage(fe->cfgbox, WM_SETFONT, (WPARAM)fe->cfgfont, false);
-
-    SetWindowLongPtr(fe->cfgbox, GWLP_USERDATA, (LONG_PTR)fe);
-    SetWindowLongPtr(fe->cfgbox, DWLP_DLGPROC, (LONG_PTR)ConfigDlgProc);
-
-    /*
-     * Count the controls so we can allocate cfgaux.
-     */
-    for (nctrls = 0, i = fe->cfg; i->type != C_END; i++)
-        nctrls++;
-    fe->cfgaux = snewn(nctrls, struct cfg_aux);
-
-    id = 1000;
-    y = height/2;
-    for (i = fe->cfg, j = fe->cfgaux; i->type != C_END; i++, j++) {
-        switch (i->type) {
-          case C_STRING:
-            /*
-             * Edit box with a label beside it.
-             */
-            mkctrl(fe, col1l, col1r, y+height*1/8, y+height*9/8,
-                   "Static", 0, 0, i->name, id++);
-            ctl = mkctrl(fe, col2l, col2r, y, y+height*3/2,
-                         "EDIT", WS_TABSTOP | ES_AUTOHSCROLL,
-                         WS_EX_CLIENTEDGE, "", (j->ctlid = id++));
-            SetWindowText(ctl, i->u.string.sval);
-            y += height*3/2;
-            break;
-
-          case C_BOOLEAN:
-            /*
-             * Simple checkbox.
-             */
-            mkctrl(fe, col1l, col2r, y, y+height, "BUTTON",
-                   BS_NOTIFY | BS_AUTOCHECKBOX | WS_TABSTOP,
-                   0, i->name, (j->ctlid = id++));
-            CheckDlgButton(fe->cfgbox, j->ctlid, i->u.boolean.bval);
-            y += height;
-            break;
-
-          case C_CHOICES:
-            /*
-             * Drop-down list with a label beside it.
-             */
-            mkctrl(fe, col1l, col1r, y+height*1/8, y+height*9/8,
-                   "STATIC", 0, 0, i->name, id++);
-            ctl = mkctrl(fe, col2l, col2r, y, y+height*41/2,
-                         "COMBOBOX", WS_TABSTOP |
-                         CBS_DROPDOWNLIST | CBS_HASSTRINGS,
-                         WS_EX_CLIENTEDGE, "", (j->ctlid = id++));
-            {
-                char c;
-                const char *p, *q;
-                char *str;
-
-                SendMessage(ctl, CB_RESETCONTENT, 0, 0);
-                p = i->u.choices.choicenames;
-                c = *p++;
-                while (*p) {
-                    q = p;
-                    while (*q && *q != c) q++;
-                    str = snewn(q-p+1, char);
-                    strncpy(str, p, q-p);
-                    str[q-p] = '\0';
-                    SendMessage(ctl, CB_ADDSTRING, 0, (LPARAM)str);
-                    sfree(str);
-                    if (*q) q++;
-                    p = q;
-                }
-            }
-
-            SendMessage(ctl, CB_SETCURSEL, i->u.choices.selected, 0);
-
-            y += height*3/2;
-            break;
-        }
-
-        assert(y < winheight);
-        y += height/2;
-    }
-
-    y += height/2;                     /* extra space before OK and Cancel */
-    mkctrl(fe, col1l, (col1l+col2r)/2-width, y, y+height*7/4, "BUTTON",
-           BS_PUSHBUTTON | WS_TABSTOP | BS_DEFPUSHBUTTON, 0,
-           "OK", IDOK);
-    mkctrl(fe, (col1l+col2r)/2+width, col2r, y, y+height*7/4, "BUTTON",
-           BS_PUSHBUTTON | WS_TABSTOP, 0, "Cancel", IDCANCEL);
-
-    SendMessage(fe->cfgbox, WM_INITDIALOG, 0, 0);
-
-    EnableWindow(fe->hwnd, false);
-    ShowWindow(fe->cfgbox, SW_SHOWNORMAL);
-    while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) {
-        if (!IsDialogMessage(fe->cfgbox, &msg))
-            DispatchMessage(&msg);
-        if (fe->dlg_done)
-            break;
-    }
-    EnableWindow(fe->hwnd, true);
-    SetForegroundWindow(fe->hwnd);
-    DestroyWindow(fe->cfgbox);
-    DeleteObject(fe->cfgfont);
-
-    free_cfg(fe->cfg);
-    sfree(fe->cfgaux);
-
-    return (fe->dlg_done == 2);
-#endif
-}
-
-#ifdef _WIN32_WCE
-static void calculate_bitmap_position(frontend *fe, int x, int y)
-{
-    /* Pocket PC - center the game in the full screen window */
-    int yMargin;
-    RECT rcClient;
-
-    GetClientRect(fe->hwnd, &rcClient);
-    fe->bitmapPosition.left = (rcClient.right  - x) / 2;
-    yMargin = rcClient.bottom - y;
-
-    if (fe->numpad != NULL) {
-        RECT rcPad;
-        GetWindowRect(fe->numpad, &rcPad);
-        yMargin -= rcPad.bottom - rcPad.top;
-    }
-
-    if (fe->statusbar != NULL) {
-        RECT rcStatus;
-        GetWindowRect(fe->statusbar, &rcStatus);
-        yMargin -= rcStatus.bottom - rcStatus.top;
-    }
-
-    fe->bitmapPosition.top = yMargin / 2;
-
-    fe->bitmapPosition.right  = fe->bitmapPosition.left + x;
-    fe->bitmapPosition.bottom = fe->bitmapPosition.top  + y;
-}
-#else
-static void calculate_bitmap_position(frontend *fe, int x, int y)
-{
-    /* Plain Windows - position the game in the upper-left corner */
-    fe->bitmapPosition.left = 0;
-    fe->bitmapPosition.top = 0;
-    fe->bitmapPosition.right  = fe->bitmapPosition.left + x;
-    fe->bitmapPosition.bottom = fe->bitmapPosition.top  + y;
-}
-#endif
-
-static void new_bitmap(frontend *fe, int x, int y)
-{
-    HDC hdc;
-
-    if (fe->bitmap) DeleteObject(fe->bitmap);
-
-    hdc = GetDC(fe->hwnd);
-    fe->bitmap = CreateCompatibleBitmap(hdc, x, y);
-    calculate_bitmap_position(fe, x, y);
-    ReleaseDC(fe->hwnd, hdc);
-}
-
-static void new_game_size(frontend *fe, float scale)
-{
-    RECT r, sr;
-    int x, y;
-
-    get_max_puzzle_size(fe, &x, &y);
-    midend_size(fe->me, &x, &y, false);
-
-    if (scale != 1.0) {
-      x = (int)((float)x * fe->puzz_scale);
-      y = (int)((float)y * fe->puzz_scale);
-      midend_size(fe->me, &x, &y, true);
-    }
-    fe->ymin = (fe->xmin * y) / x;
-
-    r.left = r.top = 0;
-    r.right = x;
-    r.bottom = y;
-    AdjustWindowRectEx(&r, WINFLAGS, true, 0);
-
-    if (fe->statusbar != NULL) {
-        GetWindowRect(fe->statusbar, &sr);
-    } else {
-        sr.left = sr.right = sr.top = sr.bottom = 0;
-    }
-#ifndef _WIN32_WCE
-    SetWindowPos(fe->hwnd, NULL, 0, 0,
-                 r.right - r.left,
-                 r.bottom - r.top + sr.bottom - sr.top,
-                 SWP_NOMOVE | SWP_NOZORDER);
-#endif
-
-    check_window_size(fe, &x, &y);
-
-#ifndef _WIN32_WCE
-    if (fe->statusbar != NULL)
-        SetWindowPos(fe->statusbar, NULL, 0, y, x,
-                     sr.bottom - sr.top, SWP_NOZORDER);
-#endif
-
-    new_bitmap(fe, x, y);
-
-#ifdef _WIN32_WCE
-    InvalidateRect(fe->hwnd, NULL, true);
-#endif
-    midend_redraw(fe->me);
-}
-
-/*
- * Given a proposed new window rect, work out the resulting
- * difference in client size (from current), and use to try
- * and resize the puzzle, returning (wx,wy) as the actual
- * new window size.
- */
-
-static void adjust_game_size(frontend *fe, RECT *proposed, bool isedge,
-                             int *wx_r, int *wy_r)
-{
-    RECT cr, wr;
-    int nx, ny, xdiff, ydiff, wx, wy;
-
-    /* Work out the current window sizing, and thus the
-     * difference in size we're asking for. */
-    GetClientRect(fe->hwnd, &cr);
-    wr = cr;
-    AdjustWindowRectEx(&wr, WINFLAGS, true, 0);
-
-    xdiff = (proposed->right - proposed->left) - (wr.right - wr.left);
-    ydiff = (proposed->bottom - proposed->top) - (wr.bottom - wr.top);
-
-    if (isedge) {
-      /* These next four lines work around the fact that midend_size
-       * is happy to shrink _but not grow_ if you change one dimension
-       * but not the other. */
-      if (xdiff > 0 && ydiff == 0)
-        ydiff = (xdiff * (wr.right - wr.left)) / (wr.bottom - wr.top);
-      if (xdiff == 0 && ydiff > 0)
-        xdiff = (ydiff * (wr.bottom - wr.top)) / (wr.right - wr.left);
-    }
-
-    if (check_window_resize(fe,
-                            (cr.right - cr.left) + xdiff,
-                            (cr.bottom - cr.top) + ydiff,
-                            &nx, &ny, &wx, &wy)) {
-        new_bitmap(fe, nx, ny);
-        midend_force_redraw(fe->me);
-    } else {
-        /* reset size to current window size */
-        wx = wr.right - wr.left;
-        wy = wr.bottom - wr.top;
-    }
-    /* Re-fetch rectangle; size limits mean we might not have
-     * taken it quite to the mouse drag positions. */
-    GetClientRect(fe->hwnd, &cr);
-    adjust_statusbar(fe, &cr);
-
-    *wx_r = wx; *wy_r = wy;
-}
-
-static void update_type_menu_tick(frontend *fe)
-{
-    int total, n, i;
-
-    if (fe->typemenu == INVALID_HANDLE_VALUE)
-        return;
-
-    n = midend_which_preset(fe->me);
-
-    for (i = 0; i < fe->n_preset_menuitems; i++) {
-        if (fe->preset_menuitems[i].which_menu) {
-            int flag = (i == n ? MF_CHECKED : MF_UNCHECKED);
-            CheckMenuItem(fe->preset_menuitems[i].which_menu,
-                          fe->preset_menuitems[i].item_index,
-                          MF_BYPOSITION | flag);
-        }
-    }
-
-    if (fe->game->can_configure) {
-        int flag = (n < 0 ? MF_CHECKED : MF_UNCHECKED);
-        /* "Custom" menu item is at the bottom of the top-level Type menu */
-        total = GetMenuItemCount(fe->typemenu);
-        CheckMenuItem(fe->typemenu, total - 1, MF_BYPOSITION | flag);
-    }
-
-    DrawMenuBar(fe->hwnd);
-}
-
-static void update_copy_menu_greying(frontend *fe)
-{
-    UINT enable = (midend_can_format_as_text_now(fe->me) ?
-                   MF_ENABLED : MF_GRAYED);
-    EnableMenuItem(fe->gamemenu, IDM_COPY, MF_BYCOMMAND | enable);
-}
-
-static void new_game_type(frontend *fe)
-{
-    midend_new_game(fe->me);
-    new_game_size(fe, 1.0);
-    update_type_menu_tick(fe);
-    update_copy_menu_greying(fe);
-}
-
-static bool is_alt_pressed(void)
-{
-    BYTE keystate[256];
-    int r = GetKeyboardState(keystate);
-    if (!r)
-        return false;
-    if (keystate[VK_MENU] & 0x80)
-        return true;
-    if (keystate[VK_RMENU] & 0x80)
-        return true;
-    return false;
-}
-
-static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
-                                WPARAM wParam, LPARAM lParam)
-{
-    frontend *fe = (frontend *)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-    int cmd;
-
-    switch (message) {
-      case WM_CLOSE:
-        DestroyWindow(hwnd);
-        return 0;
-      case WM_COMMAND:
-#ifdef _WIN32_WCE
-        /* Numeric pad sends WM_COMMAND messages */
-        if ((wParam >= IDM_KEYEMUL) && (wParam < IDM_KEYEMUL + 256))
-        {
-            midend_process_key(fe->me, 0, 0, wParam - IDM_KEYEMUL);
-        }
-#endif
-        cmd = wParam & ~0xF;           /* low 4 bits reserved to Windows */
-        switch (cmd) {
-          case IDM_NEW:
-            if (!midend_process_key(fe->me, 0, 0, UI_NEWGAME))
-                PostQuitMessage(0);
-            break;
-          case IDM_RESTART:
-            midend_restart_game(fe->me);
-            break;
-          case IDM_UNDO:
-            if (!midend_process_key(fe->me, 0, 0, UI_UNDO))
-                PostQuitMessage(0);
-            break;
-          case IDM_REDO:
-            if (!midend_process_key(fe->me, 0, 0, UI_REDO))
-                PostQuitMessage(0);
-            break;
-          case IDM_COPY:
-            {
-                char *text = midend_text_format(fe->me);
-                if (text)
-                    write_clip(hwnd, text);
-                else
-                    MessageBeep(MB_ICONWARNING);
-                sfree(text);
-            }
-            break;
-          case IDM_SOLVE:
-            {
-                const char *msg = midend_solve(fe->me);
-                if (msg)
-                    MessageBox(hwnd, msg, "Unable to solve",
-                               MB_ICONERROR | MB_OK);
-            }
-            break;
-          case IDM_QUIT:
-            if (!midend_process_key(fe->me, 0, 0, UI_QUIT))
-                PostQuitMessage(0);
-            break;
-          case IDM_CONFIG:
-            if (get_config(fe, CFG_SETTINGS))
-                new_game_type(fe);
-            break;
-          case IDM_SEED:
-            if (get_config(fe, CFG_SEED))
-                new_game_type(fe);
-            break;
-          case IDM_DESC:
-            if (get_config(fe, CFG_DESC))
-                new_game_type(fe);
-            break;
-          case IDM_PRINT:
-            if (get_config(fe, CFG_PRINT))
-                print(fe);
-            break;
-          case IDM_ABOUT:
-            about(fe);
-            break;
-          case IDM_LOAD:
-          case IDM_SAVE:
-            {
-                OPENFILENAME of;
-                char filename[FILENAME_MAX];
-                int ret;
-
-                memset(&of, 0, sizeof(of));
-                of.hwndOwner = hwnd;
-                of.lpstrFilter = "All Files (*.*)\0*\0\0\0";
-                of.lpstrCustomFilter = NULL;
-                of.nFilterIndex = 1;
-                of.lpstrFile = filename;
-                filename[0] = '\0';
-                of.nMaxFile = lenof(filename);
-                of.lpstrFileTitle = NULL;
-                of.lpstrTitle = (cmd == IDM_SAVE ?
-                                 "Enter name of game file to save" :
-                                 "Enter name of saved game file to load");
-                of.Flags = 0;
-#ifdef OPENFILENAME_SIZE_VERSION_400
-                of.lStructSize = OPENFILENAME_SIZE_VERSION_400;
-#else
-                of.lStructSize = sizeof(of);
-#endif
-                of.lpstrInitialDir = NULL;
-
-                if (cmd == IDM_SAVE)
-                    ret = GetSaveFileName(&of);
-                else
-                    ret = GetOpenFileName(&of);
-
-                if (ret) {
-                    if (cmd == IDM_SAVE) {
-                        FILE *fp;
-
-                        if ((fp = fopen(filename, "r")) != NULL) {
-                            char buf[256 + FILENAME_MAX];
-                            fclose(fp);
-                            /* file exists */
-
-                            sprintf(buf, "Are you sure you want to overwrite"
-                                    " the file \"%.*s\"?",
-                                    FILENAME_MAX, filename);
-                            if (MessageBox(hwnd, buf, "Question",
-                                           MB_YESNO | MB_ICONQUESTION)
-                                != IDYES)
-                                break;
-                        }
-
-                        fp = fopen(filename, "w");
-
-                        if (!fp) {
-                            MessageBox(hwnd, "Unable to open save file",
-                                       "Error", MB_ICONERROR | MB_OK);
-                            break;
-                        }
-
-                        midend_serialise(fe->me, savefile_write, fp);
-
-                        fclose(fp);
-                    } else {
-                        FILE *fp = fopen(filename, "r");
-                        const char *err = NULL;
-                        char *err_w = NULL;
-                        midend *me = fe->me;
-#ifdef COMBINED
-                        char *id_name;
-#endif
-
-                        if (!fp) {
-                            MessageBox(hwnd, "Unable to open saved game file",
-                                       "Error", MB_ICONERROR | MB_OK);
-                            break;
-                        }
-
-#ifdef COMBINED
-                        /*
-                         * This save file might be from a different
-                         * game.
-                         */
-                        err = identify_game(&id_name, savefile_read, fp);
-                        if (!err) {
-                            int i;
-                            for (i = 0; i < gamecount; i++)
-                                if (!strcmp(id_name, gamelist[i]->name))
-                                    break;
-                            if (i == gamecount) {
-                                err = "Save file is for a game not "
-                                    "supported by this program";
-                            } else {
-                                me = midend_for_new_game(fe, gamelist[i], NULL,
-                                                         false, false, &err_w);
-                                err = err_w;
-                                rewind(fp); /* for the actual load */
-                            }
-                            sfree(id_name);
-                        }
-#endif
-                        if (!err)
-                            err = midend_deserialise(me, savefile_read, fp);
-
-                        fclose(fp);
-
-                        if (err) {
-                            MessageBox(hwnd, err, "Error", MB_ICONERROR|MB_OK);
-                            sfree(err_w);
-                            break;
-                        }
-
-                        if (fe->me != me)
-                            fe_set_midend(fe, me);
-                        new_game_size(fe, 1.0);
-                    }
-                }
-            }
-
-            break;
-#ifndef _WIN32_WCE
-          case IDM_HELPC:
-            start_help(fe, NULL);
-            break;
-          case IDM_GAMEHELP:
-            assert(help_type != NONE);
-            start_help(fe, help_type == CHM ?
-                       fe->game->htmlhelp_topic : fe->game->winhelp_topic);
-            break;
-#endif
-          default:
-#ifdef COMBINED
-            if (wParam >= IDM_GAMES && wParam < (IDM_GAMES + (WPARAM)gamecount)) {
-                int p = wParam - IDM_GAMES;
-                char *error = NULL;
-                fe_set_midend(fe, midend_for_new_game(fe, gamelist[p], NULL,
-                                                      false, false, &error));
-                sfree(error);
-            } else
-#endif
-            {
-                game_params *preset = preset_menu_lookup_by_id(
-                    fe->preset_menu,
-                    ((wParam &~ 0xF) - IDM_PRESETS) / 0x10);
-
-                if (preset) {
-                    midend_set_params(fe->me, preset);
-                    new_game_type(fe);
-                }
-            }
-            break;
-        }
-        break;
-      case WM_DESTROY:
-#ifndef _WIN32_WCE
-        stop_help(fe);
-#endif
-        frontend_free(fe);
-        PostQuitMessage(0);
-        return 0;
-      case WM_PAINT:
-        {
-            PAINTSTRUCT p;
-            HDC hdc, hdc2;
-            HBITMAP prevbm;
-            RECT rcDest;
-
-            hdc = BeginPaint(hwnd, &p);
-            hdc2 = CreateCompatibleDC(hdc);
-            prevbm = SelectObject(hdc2, fe->bitmap);
-#ifdef _WIN32_WCE
-            FillRect(hdc, &(p.rcPaint), (HBRUSH) GetStockObject(WHITE_BRUSH));
-#endif
-            IntersectRect(&rcDest, &(fe->bitmapPosition), &(p.rcPaint));
-            BitBlt(hdc,
-                   rcDest.left, rcDest.top,
-                   rcDest.right - rcDest.left,
-                   rcDest.bottom - rcDest.top,
-                   hdc2,
-                   rcDest.left - fe->bitmapPosition.left,
-                   rcDest.top - fe->bitmapPosition.top,
-                   SRCCOPY);
-            SelectObject(hdc2, prevbm);
-            DeleteDC(hdc2);
-            EndPaint(hwnd, &p);
-        }
-        return 0;
-      case WM_KEYDOWN:
-        {
-            int key = -1;
-            BYTE keystate[256];
-            int r = GetKeyboardState(keystate);
-            int shift = (r && (keystate[VK_SHIFT] & 0x80)) ? MOD_SHFT : 0;
-            int ctrl = (r && (keystate[VK_CONTROL] & 0x80)) ? MOD_CTRL : 0;
-
-            switch (wParam) {
-              case VK_LEFT:
-                if (!(lParam & 0x01000000))
-                    key = MOD_NUM_KEYPAD | '4';
-                else
-                    key = shift | ctrl | CURSOR_LEFT;
-                break;
-              case VK_RIGHT:
-                if (!(lParam & 0x01000000))
-                    key = MOD_NUM_KEYPAD | '6';
-                else
-                    key = shift | ctrl | CURSOR_RIGHT;
-                break;
-              case VK_UP:
-                if (!(lParam & 0x01000000))
-                    key = MOD_NUM_KEYPAD | '8';
-                else
-                    key = shift | ctrl | CURSOR_UP;
-                break;
-              case VK_DOWN:
-                if (!(lParam & 0x01000000))
-                    key = MOD_NUM_KEYPAD | '2';
-                else
-                    key = shift | ctrl | CURSOR_DOWN;
-                break;
-                /*
-                 * Diagonal keys on the numeric keypad.
-                 */
-              case VK_PRIOR:
-                if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '9';
-                break;
-              case VK_NEXT:
-                if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '3';
-                break;
-              case VK_HOME:
-                if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '7';
-                break;
-              case VK_END:
-                if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '1';
-                break;
-              case VK_INSERT:
-                if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '0';
-                break;
-              case VK_CLEAR:
-                if (!(lParam & 0x01000000)) key = MOD_NUM_KEYPAD | '5';
-                break;
-                /*
-                 * Numeric keypad keys with Num Lock on.
-                 */
-              case VK_NUMPAD4: key = MOD_NUM_KEYPAD | '4'; break;
-              case VK_NUMPAD6: key = MOD_NUM_KEYPAD | '6'; break;
-              case VK_NUMPAD8: key = MOD_NUM_KEYPAD | '8'; break;
-              case VK_NUMPAD2: key = MOD_NUM_KEYPAD | '2'; break;
-              case VK_NUMPAD5: key = MOD_NUM_KEYPAD | '5'; break;
-              case VK_NUMPAD9: key = MOD_NUM_KEYPAD | '9'; break;
-              case VK_NUMPAD3: key = MOD_NUM_KEYPAD | '3'; break;
-              case VK_NUMPAD7: key = MOD_NUM_KEYPAD | '7'; break;
-              case VK_NUMPAD1: key = MOD_NUM_KEYPAD | '1'; break;
-              case VK_NUMPAD0: key = MOD_NUM_KEYPAD | '0'; break;
-            }
-
-            if (key != -1) {
-                if (!midend_process_key(fe->me, 0, 0, key))
-                    PostQuitMessage(0);
-            } else {
-                MSG m;
-                m.hwnd = hwnd;
-                m.message = WM_KEYDOWN;
-                m.wParam = wParam;
-                m.lParam = lParam & 0xdfff;
-                TranslateMessage(&m);
-            }
-        }
-        break;
-      case WM_LBUTTONDOWN:
-      case WM_RBUTTONDOWN:
-      case WM_MBUTTONDOWN:
-        {
-            int button;
-
-            /*
-             * Shift-clicks count as middle-clicks, since otherwise
-             * two-button Windows users won't have any kind of
-             * middle click to use.
-             */
-            if (message == WM_MBUTTONDOWN || (wParam & MK_SHIFT))
-                button = MIDDLE_BUTTON;
-            else if (message == WM_RBUTTONDOWN || is_alt_pressed())
-                button = RIGHT_BUTTON;
-            else
-#ifndef _WIN32_WCE
-                button = LEFT_BUTTON;
-#else
-                if ((fe->game->flags & REQUIRE_RBUTTON) == 0)
-                    button = LEFT_BUTTON;
-                else
-                {
-                    SHRGINFO shrgi;
-
-                    shrgi.cbSize     = sizeof(SHRGINFO);
-                    shrgi.hwndClient = hwnd;
-                    shrgi.ptDown.x   = (signed short)LOWORD(lParam);
-                    shrgi.ptDown.y   = (signed short)HIWORD(lParam);
-                    shrgi.dwFlags    = SHRG_RETURNCMD;
-
-                    if (GN_CONTEXTMENU == SHRecognizeGesture(&shrgi))
-                        button = RIGHT_BUTTON;
-                    else
-                        button = LEFT_BUTTON;
-                }
-#endif
-
-            if (!midend_process_key(fe->me,
-                                    (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
-                                    (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
-                                    button))
-                PostQuitMessage(0);
-
-            SetCapture(hwnd);
-        }
-        break;
-      case WM_LBUTTONUP:
-      case WM_RBUTTONUP:
-      case WM_MBUTTONUP:
-        {
-            int button;
-
-            /*
-             * Shift-clicks count as middle-clicks, since otherwise
-             * two-button Windows users won't have any kind of
-             * middle click to use.
-             */
-            if (message == WM_MBUTTONUP || (wParam & MK_SHIFT))
-                button = MIDDLE_RELEASE;
-            else if (message == WM_RBUTTONUP || is_alt_pressed())
-                button = RIGHT_RELEASE;
-            else
-                button = LEFT_RELEASE;
-
-            if (!midend_process_key(fe->me,
-                                    (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
-                                    (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
-                                    button))
-                PostQuitMessage(0);
-
-            ReleaseCapture();
-        }
-        break;
-      case WM_MOUSEMOVE:
-        {
-            int button;
-
-            if (wParam & (MK_MBUTTON | MK_SHIFT))
-                button = MIDDLE_DRAG;
-            else if (wParam & MK_RBUTTON || is_alt_pressed())
-                button = RIGHT_DRAG;
-            else
-                button = LEFT_DRAG;
-            
-            if (!midend_process_key(fe->me,
-                                    (signed short)LOWORD(lParam) - fe->bitmapPosition.left,
-                                    (signed short)HIWORD(lParam) - fe->bitmapPosition.top,
-                                    button))
-                PostQuitMessage(0);
-        }
-        break;
-      case WM_CHAR:
-        {
-            int key = (unsigned char)wParam;
-            if (key == '\x1A') {
-                BYTE keystate[256];
-                if (GetKeyboardState(keystate) &&
-                    (keystate[VK_SHIFT] & 0x80) &&
-                    (keystate[VK_CONTROL] & 0x80))
-                    key = UI_REDO;
-            }
-            if (!midend_process_key(fe->me, 0, 0, key))
-                PostQuitMessage(0);
-        }
-        return 0;
-      case WM_TIMER:
-        if (fe->timer) {
-            DWORD now = GetTickCount();
-            float elapsed = (float) (now - fe->timer_last_tickcount) * 0.001F;
-            midend_timer(fe->me, elapsed);
-            fe->timer_last_tickcount = now;
-        }
-        return 0;
-#ifndef _WIN32_WCE
-      case WM_SIZING:
-        {
-            RECT *sr = (RECT *)lParam;
-            int wx, wy;
-            bool isedge = false;
-
-            if (wParam == WMSZ_TOP ||
-                wParam == WMSZ_RIGHT ||
-                wParam == WMSZ_BOTTOM ||
-                wParam == WMSZ_LEFT) isedge = true;
-            adjust_game_size(fe, sr, isedge, &wx, &wy);
-
-            /* Given the window size the puzzles constrain
-             * us to, work out which edge we should be moving. */
-            if (wParam == WMSZ_TOP ||
-                wParam == WMSZ_TOPLEFT ||
-                wParam == WMSZ_TOPRIGHT) {
-                sr->top = sr->bottom - wy;
-            } else {
-                sr->bottom = sr->top + wy;
-            }
-            if (wParam == WMSZ_LEFT ||
-                wParam == WMSZ_TOPLEFT ||
-                wParam == WMSZ_BOTTOMLEFT) {
-                sr->left = sr->right - wx;
-            } else {
-                sr->right = sr->left + wx;
-            }
-            return true;
-        }
-        break;
-#endif
-    }
-
-    return DefWindowProc(hwnd, message, wParam, lParam);
-}
-
-#ifdef _WIN32_WCE
-static int FindPreviousInstance()
-{
-    /* Check if application is running. If it's running then focus on the window */
-    HWND hOtherWnd = NULL;
-
-    hOtherWnd = FindWindow (wGameName, wGameName);
-    if (hOtherWnd)
-    {
-        SetForegroundWindow (hOtherWnd);
-        return true;
-    }
-
-    return false;
-}
-#endif
-
-/*
- * Split a complete command line into argc/argv, attempting to do it
- * exactly the same way the Visual Studio C library would do it (so
- * that our console utilities, which receive argc and argv already
- * broken apart by the C library, will have their command lines
- * processed in the same way as the GUI utilities which get a whole
- * command line and must call this function).
- * 
- * Does not modify the input command line.
- * 
- * The final parameter (argstart) is used to return a second array
- * of char * pointers, the same length as argv, each one pointing
- * at the start of the corresponding element of argv in the
- * original command line. So if you get half way through processing
- * your command line in argc/argv form and then decide you want to
- * treat the rest as a raw string, you can. If you don't want to,
- * `argstart' can be safely left NULL.
- */
-void split_into_argv(char *cmdline, int *argc, char ***argv,
-                     char ***argstart)
-{
-    char *p;
-    char *outputline, *q;
-    char **outputargv, **outputargstart;
-    int outputargc;
-
-    /*
-     * These argument-breaking rules apply to Visual Studio 7, which
-     * is currently the compiler expected to be used for the Windows
-     * port of my puzzles. Visual Studio 10 has different rules,
-     * lacking the curious mod 3 behaviour of consecutive quotes
-     * described below; I presume they fixed a bug. As and when we
-     * migrate to a newer compiler, we'll have to adjust this to
-     * match; however, for the moment we faithfully imitate in our GUI
-     * utilities what our CLI utilities can't be prevented from doing.
-     *
-     * When I investigated this, at first glance the rules appeared to
-     * be:
-     *
-     *  - Single quotes are not special characters.
-     *
-     *  - Double quotes are removed, but within them spaces cease
-     *    to be special.
-     *
-     *  - Backslashes are _only_ special when a sequence of them
-     *    appear just before a double quote. In this situation,
-     *    they are treated like C backslashes: so \" just gives a
-     *    literal quote, \\" gives a literal backslash and then
-     *    opens or closes a double-quoted segment, \\\" gives a
-     *    literal backslash and then a literal quote, \\\\" gives
-     *    two literal backslashes and then opens/closes a
-     *    double-quoted segment, and so forth. Note that this
-     *    behaviour is identical inside and outside double quotes.
-     *
-     *  - Two successive double quotes become one literal double
-     *    quote, but only _inside_ a double-quoted segment.
-     *    Outside, they just form an empty double-quoted segment
-     *    (which may cause an empty argument word).
-     *
-     *  - That only leaves the interesting question of what happens
-     *    when one or more backslashes precedes two or more double
-     *    quotes, starting inside a double-quoted string. And the
-     *    answer to that appears somewhat bizarre. Here I tabulate
-     *    number of backslashes (across the top) against number of
-     *    quotes (down the left), and indicate how many backslashes
-     *    are output, how many quotes are output, and whether a
-     *    quoted segment is open at the end of the sequence:
-     * 
-     *                      backslashes
-     * 
-     *               0         1      2      3      4
-     * 
-     *         0   0,0,y  |  1,0,y  2,0,y  3,0,y  4,0,y
-     *            --------+-----------------------------
-     *         1   0,0,n  |  0,1,y  1,0,n  1,1,y  2,0,n
-     *    q    2   0,1,n  |  0,1,n  1,1,n  1,1,n  2,1,n
-     *    u    3   0,1,y  |  0,2,n  1,1,y  1,2,n  2,1,y
-     *    o    4   0,1,n  |  0,2,y  1,1,n  1,2,y  2,1,n
-     *    t    5   0,2,n  |  0,2,n  1,2,n  1,2,n  2,2,n
-     *    e    6   0,2,y  |  0,3,n  1,2,y  1,3,n  2,2,y
-     *    s    7   0,2,n  |  0,3,y  1,2,n  1,3,y  2,2,n
-     *         8   0,3,n  |  0,3,n  1,3,n  1,3,n  2,3,n
-     *         9   0,3,y  |  0,4,n  1,3,y  1,4,n  2,3,y
-     *        10   0,3,n  |  0,4,y  1,3,n  1,4,y  2,3,n
-     *        11   0,4,n  |  0,4,n  1,4,n  1,4,n  2,4,n
-     * 
-     * 
-     *      [Test fragment was of the form "a\\\"""b c" d.]
-     * 
-     * There is very weird mod-3 behaviour going on here in the
-     * number of quotes, and it even applies when there aren't any
-     * backslashes! How ghastly.
-     * 
-     * With a bit of thought, this extremely odd diagram suddenly
-     * coalesced itself into a coherent, if still ghastly, model of
-     * how things work:
-     * 
-     *  - As before, backslashes are only special when one or more
-     *    of them appear contiguously before at least one double
-     *    quote. In this situation the backslashes do exactly what
-     *    you'd expect: each one quotes the next thing in front of
-     *    it, so you end up with n/2 literal backslashes (if n is
-     *    even) or (n-1)/2 literal backslashes and a literal quote
-     *    (if n is odd). In the latter case the double quote
-     *    character right after the backslashes is used up.
-     * 
-     *  - After that, any remaining double quotes are processed. A
-     *    string of contiguous unescaped double quotes has a mod-3
-     *    behaviour:
-     * 
-     *     * inside a quoted segment, a quote ends the segment.
-     *     * _immediately_ after ending a quoted segment, a quote
-     *       simply produces a literal quote.
-     *     * otherwise, outside a quoted segment, a quote begins a
-     *       quoted segment.
-     * 
-     *    So, for example, if we started inside a quoted segment
-     *    then two contiguous quotes would close the segment and
-     *    produce a literal quote; three would close the segment,
-     *    produce a literal quote, and open a new segment. If we
-     *    started outside a quoted segment, then two contiguous
-     *    quotes would open and then close a segment, producing no
-     *    output (but potentially creating a zero-length argument);
-     *    but three quotes would open and close a segment and then
-     *    produce a literal quote.
-     */
-
-    /*
-     * First deal with the simplest of all special cases: if there
-     * aren't any arguments, return 0,NULL,NULL.
-     */
-    while (*cmdline && isspace(*cmdline)) cmdline++;
-    if (!*cmdline) {
-        if (argc) *argc = 0;
-        if (argv) *argv = NULL;
-        if (argstart) *argstart = NULL;
-        return;
-    }
-
-    /*
-     * This will guaranteeably be big enough; we can realloc it
-     * down later.
-     */
-    outputline = snewn(1+strlen(cmdline), char);
-    outputargv = snewn(strlen(cmdline)+1 / 2, char *);
-    outputargstart = snewn(strlen(cmdline)+1 / 2, char *);
-
-    p = cmdline; q = outputline; outputargc = 0;
-
-    while (*p) {
-        bool quote;
-
-        /* Skip whitespace searching for start of argument. */
-        while (*p && isspace(*p)) p++;
-        if (!*p) break;
-
-        /* We have an argument; start it. */
-        outputargv[outputargc] = q;
-        outputargstart[outputargc] = p;
-        outputargc++;
-        quote = false;
-
-        /* Copy data into the argument until it's finished. */
-        while (*p) {
-            if (!quote && isspace(*p))
-                break;                 /* argument is finished */
-
-            if (*p == '"' || *p == '\\') {
-                /*
-                 * We have a sequence of zero or more backslashes
-                 * followed by a sequence of zero or more quotes.
-                 * Count up how many of each, and then deal with
-                 * them as appropriate.
-                 */
-                int i, slashes = 0, quotes = 0;
-                while (*p == '\\') slashes++, p++;
-                while (*p == '"') quotes++, p++;
-
-                if (!quotes) {
-                    /*
-                     * Special case: if there are no quotes,
-                     * slashes are not special at all, so just copy
-                     * n slashes to the output string.
-                     */
-                    while (slashes--) *q++ = '\\';
-                } else {
-                    /* Slashes annihilate in pairs. */
-                    while (slashes >= 2) slashes -= 2, *q++ = '\\';
-
-                    /* One remaining slash takes out the first quote. */
-                    if (slashes) quotes--, *q++ = '"';
-
-                    if (quotes > 0) {
-                        /* Outside a quote segment, a quote starts one. */
-                        if (!quote) quotes--, quote = true;
-
-                        /* Now we produce (n+1)/3 literal quotes... */
-                        for (i = 3; i <= quotes+1; i += 3) *q++ = '"';
-
-                        /* ... and end in a quote segment iff 3 divides n. */
-                        quote = (quotes % 3 == 0);
-                    }
-                }
-            } else {
-                *q++ = *p++;
-            }
-        }
-
-        /* At the end of an argument, just append a trailing NUL. */
-        *q++ = '\0';
-    }
-
-    outputargv = sresize(outputargv, outputargc, char *);
-    outputargstart = sresize(outputargstart, outputargc, char *);
-
-    if (argc) *argc = outputargc;
-    if (argv) *argv = outputargv; else sfree(outputargv);
-    if (argstart) *argstart = outputargstart; else sfree(outputargstart);
-}
-
-int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
-{
-    MSG msg;
-    char *error = NULL;
-    const game *gg;
-    frontend *fe;
-    midend *me;
-    int argc;
-    char **argv;
-
-    split_into_argv(cmdline, &argc, &argv, NULL);
-
-#ifdef _WIN32_WCE
-    MultiByteToWideChar (CP_ACP, 0, CLASSNAME, -1, wClassName, 256);
-    if (FindPreviousInstance ())
-        return 0;
-#endif
-
-    InitCommonControls();
-
-    if (!prev) {
-        WNDCLASS wndclass;
-
-        wndclass.style = 0;
-        wndclass.lpfnWndProc = WndProc;
-        wndclass.cbClsExtra = 0;
-        wndclass.cbWndExtra = 0;
-        wndclass.hInstance = inst;
-        wndclass.hIcon = LoadIcon(inst, MAKEINTRESOURCE(200));
-#ifndef _WIN32_WCE
-        if (!wndclass.hIcon)           /* in case resource file is absent */
-            wndclass.hIcon = LoadIcon(inst, IDI_APPLICATION);
-#endif
-        wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
-        wndclass.hbrBackground = NULL;
-        wndclass.lpszMenuName = NULL;
-#ifdef _WIN32_WCE
-        wndclass.lpszClassName = wClassName;
-#else
-        wndclass.lpszClassName = CLASSNAME;
-#endif
-
-        RegisterClass(&wndclass);
-    }
-
-    while (*cmdline && isspace((unsigned char)*cmdline))
-        cmdline++;
-
-    init_help();
-
-#ifdef COMBINED
-    gg = gamelist[0];
-    if (argc > 0) {
-        int i;
-        for (i = 0; i < gamecount; i++) {
-            const char *p = gamelist[i]->name;
-            char *q = argv[0];
-            while (*p && *q) {
-                if (isspace((unsigned char)*p)) {
-                    while (*q && isspace((unsigned char)*q))
-                        q++;
-                } else {
-                    if (tolower((unsigned char)*p) !=
-                        tolower((unsigned char)*q))
-                        break;
-                    q++;
-                }
-                p++;
-            }
-            if (!*p) {
-                gg = gamelist[i];
-                --argc;
-                ++argv;
-                break;
-            }
-        }
-    }
-#else
-    gg = &thegame;
-#endif
-
-    fe = frontend_new(inst);
-    me = midend_for_new_game(fe, gg, argc > 0 ? argv[0] : NULL,
-                             true, true, &error);
-    if (!me) {
-        char buf[128];
-#ifdef COMBINED
-        sprintf(buf, "Puzzles Error");
-#else
-        sprintf(buf, "%.100s Error", gg->name);
-#endif
-        MessageBox(NULL, error, buf, MB_OK|MB_ICONERROR);
-        sfree(error);
-        return 1;
-    }
-    fe_set_midend(fe, me);
-    show_window(fe);
-
-    while (GetMessage(&msg, NULL, 0, 0)) {
-        DispatchMessage(&msg);
-    }
-
-    DestroyWindow(fe->hwnd);
-    cleanup_help();
-
-    return msg.wParam;
-}
-/* vim: set shiftwidth=4 tabstop=8: */
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c
index 5688ff93d3..3d762c6db7 100644
--- a/apps/plugins/random_folder_advance_config.c
+++ b/apps/plugins/random_folder_advance_config.c
@@ -309,7 +309,6 @@ static int edit_list(void)
     dirs_count = list->count;
 
     rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1, NULL);
-    rb->gui_synclist_set_icon_callback(&lists,NULL);
     rb->gui_synclist_set_nb_items(&lists,list->count);
     rb->gui_synclist_select_item(&lists, 0);
 
diff --git a/apps/plugins/rb_info.c b/apps/plugins/rb_info.c
index a89cc658cc..31b06d6f75 100644
--- a/apps/plugins/rb_info.c
+++ b/apps/plugins/rb_info.c
@@ -518,7 +518,6 @@ static void synclist_set(char* menu_id, int selected_item, int items, int sel_si
     {
         rb->gui_synclist_set_title(&lists, NULL,-1);
     }
-    rb->gui_synclist_set_icon_callback(&lists,NULL);
     rb->gui_synclist_set_voice_callback(&lists, list_voice_cb);
     rb->gui_synclist_set_nb_items(&lists,items);
     rb->gui_synclist_select_item(&lists, selected_item);
diff --git a/apps/plugins/rockbox-fonts.config b/apps/plugins/rockbox-fonts.config
index 4995d71864..8762ff5c74 100644
--- a/apps/plugins/rockbox-fonts.config
+++ b/apps/plugins/rockbox-fonts.config
@@ -54,12 +54,16 @@ font: 18-Adobe-Helvetica
 font: 18-Adobe-Helvetica-Bold
 font: 18-Fixed
 font: 18-Fixed-Bold
+font: 18-Terminus
+font: 18-Terminus-Bold
 font: 19-Nimbus
 font: 20-Terminus
 font: 20-Terminus-Bold
 font: 21-Adobe-Helvetica
 font: 21-Adobe-Helvetica-Bold
 font: 22-ProFont
+font: 22-Terminus
+font: 22-Terminus-Bold
 font: 24-Terminus
 font: 24-Terminus-Bold
 font: 27-Adobe-Helvetica
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c
index b48259a0e4..8a511bea42 100644
--- a/apps/plugins/stats.c
+++ b/apps/plugins/stats.c
@@ -19,184 +19,27 @@
  *
  ****************************************************************************/
 #include "plugin.h"
-#include "lib/pluginlib_actions.h"
+#include "lib/mul_id3.h" /* collect_dir_stats & display_dir_stats */
 
-
-static int files, dirs, audiofiles, m3ufiles, imagefiles, videofiles, largestdir;
-static int lasttick;
-static bool cancel;
-
-
-/* we use PLA */
-#define STATS_STOP PLA_EXIT
-
-#if (CONFIG_KEYPAD == IPOD_1G2G_PAD) \
-    || (CONFIG_KEYPAD == IPOD_3G_PAD) \
-    || (CONFIG_KEYPAD == IPOD_4G_PAD)
-#define STATS_STOP2 PLA_UP
-#else
-#define STATS_STOP2 PLA_CANCEL
-#endif
-
-/* this set the context to use with PLA */
-static const struct button_mapping *plugin_contexts[] = { pla_main_ctx };
-
-/* we don't have yet a filetype attribute for image files */
-static const char *image_exts[] = {"bmp","jpg","jpe","jpeg","png","ppm"};
-
-/* neither for video ones */
-static const char *video_exts[] = {"mpg","mpeg","mpv","m2v"};
-
-static void prn(const char *str, int y)
-{
-    rb->lcd_puts(0,y,str);
-#ifdef HAVE_REMOTE_LCD
-    rb->lcd_remote_puts(0,y,str);
-#endif
-}
-
-static void update_screen(void)
-{
-    char buf[32];
-
-    rb->lcd_clear_display();
-#ifdef HAVE_REMOTE_LCD
-    rb->lcd_remote_clear_display();
-#endif
-
-    rb->snprintf(buf, sizeof(buf), "Total Files: %d", files);
-    prn(buf,0);
-    rb->snprintf(buf, sizeof(buf), "Audio: %d", audiofiles);
-    prn(buf,1);
-    rb->snprintf(buf, sizeof(buf), "Playlists: %d", m3ufiles);
-    prn(buf,2);
-    rb->snprintf(buf, sizeof(buf), "Images: %d", imagefiles);
-    prn(buf,3);
-    rb->snprintf(buf, sizeof(buf), "Videos: %d", videofiles);
-    prn(buf,4);
-    rb->snprintf(buf, sizeof(buf), "Directories: %d", dirs);
-    prn(buf,5);
-    rb->snprintf(buf, sizeof(buf), "Max files in Dir: %d", largestdir);
-    prn(buf,6);
-
-    rb->lcd_update();
-#ifdef HAVE_REMOTE_LCD
-    rb->lcd_remote_update();
-#endif
-}
-
-static void traversedir(char* location, char* name)
-{
-    int button;
-    struct dirent *entry;
-    DIR* dir;
-    char fullpath[MAX_PATH];
-    int files_in_dir = 0;
-
-    rb->snprintf(fullpath, sizeof(fullpath), "%s/%s", location, name);
-    dir = rb->opendir(fullpath);
-    if (dir) {
-        entry = rb->readdir(dir);
-        while (entry) {
-            if (cancel)
-                break;
-            /* Skip .. and . */
-            if (rb->strcmp(entry->d_name, ".") && rb->strcmp(entry->d_name, ".."))
-            {
-                struct dirinfo info = rb->dir_get_info(dir, entry);
-                if (info.attribute & ATTR_DIRECTORY) {
-                    traversedir(fullpath, entry->d_name);
-                    dirs++;
-                }
-                else {
-                    files_in_dir++; files++;
-
-                    /* get the filetype from the filename */
-                    int attr = rb->filetype_get_attr(entry->d_name);
-                    switch (attr & FILE_ATTR_MASK)
-                    {
-                    case FILE_ATTR_AUDIO:
-                        audiofiles++;
-                        break;
-
-                    case FILE_ATTR_M3U:
-                        m3ufiles++;
-                        break;
- 
-                    default:
-                    {
-                        /* use hardcoded filetype_exts to count
-                         * image and video files until we get
-                         * new attributes added to filetypes.h */
-                        char *ptr = rb->strrchr(entry->d_name,'.');
-                        if(ptr) {
-                            unsigned i;
-                            ptr++;
-                            for(i=0;i<ARRAYLEN(image_exts);i++) {
-                                if(!rb->strcasecmp(ptr,image_exts[i])) {
-                                    imagefiles++; break;
-                                }
-                            }
-
-                            if (i >= ARRAYLEN(image_exts)) {
-                                /* not found above - try video files */
-                                for(i=0;i<ARRAYLEN(video_exts);i++) {
-                                    if(!rb->strcasecmp(ptr,video_exts[i])) {
-                                        videofiles++; break;
-                                    }
-                                }
-                            }
-                        }
-                        } /* default: */
-                    } /* switch */
-                }
-            }
-
-            if (*rb->current_tick - lasttick > (HZ/2)) {
-                update_screen();
-                lasttick = *rb->current_tick;
-                button = pluginlib_getaction(TIMEOUT_NOBLOCK, plugin_contexts,
-                               ARRAYLEN(plugin_contexts));
-                if (button == STATS_STOP || button == STATS_STOP2) {
-                    cancel = true;
-                    break;
-                }
-            }
-
-            entry = rb->readdir(dir);
-        }
-        rb->closedir(dir);
-    }
-    if (largestdir < files_in_dir)
-        largestdir = files_in_dir;
-}
-
-/* this is the plugin entry point */
 enum plugin_status plugin_start(const void* parameter)
-{
-    int button;
-
+{    
     (void)parameter;
-
-    files = 0;
-    dirs = 0;
-    audiofiles = 0;
-    m3ufiles = 0;
-    imagefiles = 0;
-    videofiles = 0;
-    largestdir = 0;
-    cancel = false;
-
-    rb->splash(HZ, "Counting...");
-    update_screen();
-    lasttick = *rb->current_tick;
-
-    traversedir("", "");
-    if (cancel) {
-        rb->splash(HZ, "Aborted");
+    int button, success;
+    static struct dir_stats stats;
+    stats.dirname[0] = '/';
+    stats.count_all = true;
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    rb->cpu_boost(true);
+#endif
+    display_dir_stats(&stats);
+    success = collect_dir_stats(&stats, NULL);
+#ifdef HAVE_ADJUSTABLE_CPU_FREQ
+    rb->cpu_boost(false);
+#endif
+    if (!success)
         return PLUGIN_OK;
-    }
-    update_screen();
+
+    display_dir_stats(&stats);
 #ifdef HAVE_BACKLIGHT
 #ifdef HAVE_REMOTE_LCD
     rb->remote_backlight_on();
@@ -204,21 +47,15 @@ enum plugin_status plugin_start(const void* parameter)
     rb->backlight_on();
 #endif
     rb->splash(HZ, "Done");
-    update_screen();
+    display_dir_stats(&stats);
     while (1) {
-
-        button = pluginlib_getaction(TIMEOUT_BLOCK, plugin_contexts,
-                               ARRAYLEN(plugin_contexts));
-        switch (button) {
-            case STATS_STOP:
-            case STATS_STOP2:
+        switch (button = rb->get_action(CONTEXT_STD, TIMEOUT_BLOCK))
+        {
+            case ACTION_STD_CANCEL:
                 return PLUGIN_OK;
-                break;
             default:
-                if (rb->default_event_handler(button) == SYS_USB_CONNECTED) {
+                if (rb->default_event_handler(button) == SYS_USB_CONNECTED)
                     return PLUGIN_USB_CONNECTED;
-                }
-                break;
         }
     }
     return PLUGIN_OK;
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c
index efa6f4a22a..10373e1cc9 100644
--- a/apps/plugins/superdom.c
+++ b/apps/plugins/superdom.c
@@ -385,9 +385,13 @@ static int calc_strength(int colour, int x, int y)
                 if(a && b) /* diagonally adjacent, give less influence */
                 {
                     score += 5;
-                    if(board[x + a][y + b].tank || board[x + a][y + b].farm)
+                    if(board[x + a][y + b].tank)
                         score += 15;
-                    if(board[x + a][y + b].plane || board[x + a][y + b].ind)
+                    if(board[x + a][y + b].farm)
+                        score += 15;
+                    if(board[x + a][y + b].plane)
+                        score += 20;
+                    if (board[x + a][y + b].ind)
                         score += 20;
                     if(board[x + a][y + b].nuke)
                         score += 10;
@@ -397,10 +401,14 @@ static int calc_strength(int colour, int x, int y)
                 else
                 {
                     score += 10;
-                    if(board[x + a][y + b].tank || board[x + a][y + b].farm)
+                    if(board[x + a][y + b].tank)
+                        score += 30;
+                    if(board[x + a][y + b].farm)
                         score += 30;
-                    if(board[x + a][y + b].plane || board[x + a][y + b].ind)
-                        score += 40;
+                    if(board[x + a][y + b].plane)
+                        score += 20;
+                    if(board[x + a][y + b].ind)
+                        score += 20;
                     if(board[x + a][y + b].nuke)
                         score += 20;
                     if(board[x + a][y + b].men)
@@ -1943,7 +1951,7 @@ static void computer_allocate(void)
     }
     if(superdom_settings.compdiff>=AI_BUILD_INDS_FARMS_LEVEL && compres.cash>=PRICE_FACTORY+100)
     {
-        int i = 0;
+        int cnt = 0;
         do
         {
             if(compres.farms<compres.inds)
@@ -1966,7 +1974,7 @@ static void computer_allocate(void)
                     break;
                 }
             }
-        } while(compres.cash>=PRICE_FACTORY + 100 && i++ < 3);
+        } while(compres.cash>=PRICE_FACTORY + 100 && cnt++ < 3);
     }
     /* AI will buy nukes first if possible */
     if(compres.cash > PRICE_NUKE + PRICE_TANK && superdom_settings.compdiff>=AI_BUILD_NUKES_LEVEL)
diff --git a/apps/plugins/tagcache/tagcache.c b/apps/plugins/tagcache/tagcache.c
index cce9efbed9..23651a4471 100644
--- a/apps/plugins/tagcache/tagcache.c
+++ b/apps/plugins/tagcache/tagcache.c
@@ -761,7 +761,6 @@ static int commit_menu(void)
     int selection, ret = 0;
 
     rb->gui_synclist_init(&lists,list_get_name_cb,0, false, 1, NULL);
-    rb->gui_synclist_set_icon_callback(&lists, NULL);
     rb->gui_synclist_set_nb_items(&lists, 9);
     rb->gui_synclist_select_item(&lists, 0);
 
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c
index 8740606c58..f7d62ca07a 100644
--- a/apps/plugins/text_editor.c
+++ b/apps/plugins/text_editor.c
@@ -212,7 +212,6 @@ static bool save_changes(int overwrite)
 static void setup_lists(struct gui_synclist *lists, int sel)
 {
     rb->gui_synclist_init(lists,list_get_name_cb,0, false, 1, NULL);
-    rb->gui_synclist_set_icon_callback(lists,NULL);
     rb->gui_synclist_set_nb_items(lists,line_count);
     rb->gui_synclist_select_item(lists, sel);
     rb->gui_synclist_draw(lists);
diff --git a/apps/plugins/vbrfix.c b/apps/plugins/vbrfix.c
index 5aaf2ffada..622a0a4f07 100644
--- a/apps/plugins/vbrfix.c
+++ b/apps/plugins/vbrfix.c
@@ -155,8 +155,8 @@ static bool vbr_fix(const char *selected_file)
 
     xingupdate(0);
 
-    rc = rb->mp3info(&entry, selected_file);
-    if(rc) {
+    rc = rb->get_metadata(&entry, -1, selected_file);
+    if(!rc) {
         fileerror(rc);
         return true;
     }
diff --git a/apps/plugins/viewers.config b/apps/plugins/viewers.config
index 45bbfeef0b..d745a29cfe 100644
--- a/apps/plugins/viewers.config
+++ b/apps/plugins/viewers.config
@@ -34,6 +34,7 @@ rvf,viewers/video,4
 mp3,viewers/vbrfix,5
 m3u,viewers/search,-
 m3u,viewers/iriverify,-
+m3u,viewers/cue_playlist,-
 lrc,apps/lrcplayer,1
 lrc8,apps/lrcplayer,1
 snc,apps/lrcplayer,1
diff --git a/apps/radio/presets.c b/apps/radio/presets.c
index 046525c3b6..b87d2dd285 100644
--- a/apps/radio/presets.c
+++ b/apps/radio/presets.c
@@ -485,7 +485,6 @@ int handle_radio_presets(void)
 
     gui_synclist_init(&lists, presets_get_name, NULL, false, 1, NULL);
     gui_synclist_set_title(&lists, str(LANG_PRESET), NOICON);
-    gui_synclist_set_icon_callback(&lists, NULL);
     if(global_settings.talk_file)
         gui_synclist_set_voice_callback(&lists, presets_speak_name);
     gui_synclist_set_nb_items(&lists, num_presets);
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/screens.c b/apps/screens.c
index c88482d559..e3a73f3de2 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -656,10 +656,10 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
                 }
                 break;
             case LANG_FORMAT:
-                if (id3->codectype >= AFMT_NUM_CODECS)
+                if (id3->codectype == AFMT_UNKNOWN && info->track_ct > 1)
                     return NULL;
 
-                strmemccpy(buffer, audio_formats[id3->codectype].label, buffer_len);
+                strmemccpy(buffer, get_codec_string(id3->codectype), buffer_len);
 
                 val=buffer;
                 if(say_it)
@@ -900,7 +900,6 @@ int view_runtime(void)
     gui_synclist_set_title(&lists, str(LANG_RUNNING_TIME), NOICON);
     if(global_settings.talk_menu)
         gui_synclist_set_voice_callback(&lists, runtime_speak_data);
-    gui_synclist_set_icon_callback(&lists, NULL);
     gui_synclist_set_nb_items(&lists, 4);
 
     while(1)
diff --git a/apps/settings.h b/apps/settings.h
index 1df1e0b418..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 */
@@ -803,6 +811,7 @@ struct user_settings
 #ifdef HAVE_REMOTE_LCD
     unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */
 #endif
+    char player_name[64];  /* Name of the local player */
 
     struct compressor_settings compressor_settings;
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 09a45f1faa..a9f627bfa6 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -998,7 +998,7 @@ const struct settings_list settings[] = {
                   play_frequency, LANG_FREQUENCY, 0, "playback frequency", "auto",
                   UNIT_KHZ, formatter_freq_unit_0_is_auto,
                   getlang_freq_unit_0_is_auto,
-                  playback_frequency_callback, 
+                  playback_frequency_callback,
 #if HAVE_PLAY_FREQ >= 192
                   7,0,SAMPR_44,SAMPR_48,SAMPR_88,SAMPR_96,SAMPR_176,SAMPR_192),
 #elif HAVE_PLAY_FREQ >= 96
@@ -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",
@@ -1883,7 +1891,7 @@ const struct settings_list settings[] = {
 #ifdef HAVE_BACKLIGHT
     CHOICE_SETTING(0, backlight_on_button_hold,
                    LANG_BACKLIGHT_ON_BUTTON_HOLD,
-#ifdef HAS_BUTTON_HOLD                   
+#ifdef HAS_BUTTON_HOLD
                    1,
 #else
                    0,
@@ -2217,6 +2225,8 @@ const struct settings_list settings[] = {
     VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"),
 #endif
 
+    TEXT_SETTING(F_THEMESETTING, player_name, "player name", "", NULL, NULL),
+
 #ifdef HAVE_MORSE_INPUT
     OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL),
 #endif
diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 6eda05ec44..6baa6e1328 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -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 ea2a756a46..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++;
         }
     }
@@ -1452,9 +1476,9 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
 #else
         true
 #endif
-        , 0);
+        , 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 */
@@ -1676,7 +1703,7 @@ entry_skip_formatter:
 
         if (init)
         {
-            if (!show_search_progress(false, total_count))
+            if (!show_search_progress(false, total_count, 0, 0))
             {   /* user aborted */
                 tagcache_search_finish(&tcs);
                 tree_unlock_cache(c);
@@ -1710,7 +1737,7 @@ entry_skip_formatter:
 
     while (tagcache_get_next(&tcs, tcs_buf, tcs_bufsz))
     {
-        if (!show_search_progress(false, total_count))
+        if (!show_search_progress(false, total_count, 0, 0))
             break;
         total_count++;
     }
@@ -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)
@@ -2229,11 +2396,11 @@ static bool tagtree_insert_selection(int position, bool queue,
 #else
         true
 #endif
-        , 0);
+        , 0, 0, 0);
 
     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/talk.c b/apps/talk.c
index 2e73001c46..b5622ad6d1 100644
--- a/apps/talk.c
+++ b/apps/talk.c
@@ -44,6 +44,7 @@
 #include "debug.h"
 #include "panic.h"
 #include "misc.h" /* time_split_units() */
+#include "mv.h"
 
 /***************** Constants *****************/
 
@@ -776,7 +777,7 @@ static int _talk_spell(const char* spell, size_t len, bool enqueue)
             talk_id(VOICE_DOT, true);
         else if (c == ' ')
             talk_id(VOICE_PAUSE, true);
-        else if (c == '/')
+        else if (c == PATH_SEPCH)
             talk_id(VOICE_CHAR_SLASH, true);
 
         while (QUEUE_LEVEL == QUEUE_SIZE - 1) /* queue full - busy loop */
@@ -1139,12 +1140,12 @@ int talk_file(const char *root, const char *dir, const char *file,
 {
     char buf[MAX_PATH];
     const char *fmt = "%s%s%s%s%s";
-    /* Does root end with a slash */
-    if(root && root[0] && root[strlen(root)-1] != '/')
-        fmt = "%s/%s%s%s%s";
+    /* Does root end with a slash? */
+    if(root && root[0] && root[strlen(root)-1] != PATH_SEPCH)
+        fmt = "%s" PATH_SEPSTR "%s%s%s%s";
     snprintf(buf, MAX_PATH, fmt,
              root ? root : "",
-             dir ? dir : "", dir ? "/" : "",
+             dir ? dir : "", dir ? PATH_SEPSTR : "",
              file ? file : "",
              ext ? ext : "");
     return _talk_file(buf, prefix_ids, enqueue);
@@ -1167,6 +1168,21 @@ int talk_file_or_spell(const char *dirname, const char *filename,
     return 0;
 }
 
+#ifdef HAVE_MULTIVOLUME
+int talk_volume_id(int volume)
+{
+    if (volume == -1)
+        return 0;
+
+    int drive = volume_drive(volume);
+    // XXX voice "VOLUME" or something like that?
+
+    talk_id(drive? LANG_DISK_NAME_MMC : LANG_DISK_NAME_INTERNAL, true);
+    talk_value(volume, UNIT_INT, true);
+    return 1;
+}
+#endif
+
 /* Play a directory's .talk thumbnail, fallback to spelling the filename, or
    go straight to spelling depending on settings. */
 int talk_dir_or_spell(const char* dirname,
@@ -1174,13 +1190,14 @@ int talk_dir_or_spell(const char* dirname,
 {
     if (global_settings.talk_dir_clip)
     {   /* .talk clips enabled */
-        if(talk_file(dirname, NULL, dir_thumbnail_name, NULL,
+        if (talk_file(dirname, NULL, dir_thumbnail_name, NULL,
                               prefix_ids, enqueue) >0)
             return 0;
     }
-    if (global_settings.talk_dir == TALK_SPEAK_SPELL)
+    if (global_settings.talk_dir == TALK_SPEAK_SPELL) {
         /* Either .talk clips disabled or as a fallback */
         return talk_spell_basename(dirname, prefix_ids, enqueue);
+    }
     return 0;
 }
 
@@ -1190,25 +1207,43 @@ int talk_fullpath(const char* path, bool enqueue)
 {
     do_enqueue(enqueue);  /* cut off all the pending stuff */
 
-    if(path[0] != '/')
+    if(path[0] != PATH_SEPCH)
         /* path ought to start with /... */
         return talk_spell(path, true);
     talk_id(VOICE_CHAR_SLASH, true);
     char buf[MAX_PATH];
     strmemccpy(buf, path, MAX_PATH);
     char *start = buf+1; /* start of current component */
-    char *ptr = strchr(start, '/'); /* end of current component */
+    char *ptr = strchr(start, PATH_SEPCH); /* end of current component */
     while(ptr) { /* There are more slashes ahead */
         /* temporarily poke a NULL at end of component to truncate string */
         *ptr = '\0';
-        talk_dir_or_spell(buf, NULL, true);
-        *ptr = '/'; /* restore string */
+#ifdef HAVE_MULTIVOLUME
+        if (start == buf+1) {
+            int vol = path_get_volume_id(buf+1);
+            if (!talk_volume_id(vol))
+                talk_dir_or_spell(buf, NULL, true);
+        } else
+#endif
+            talk_dir_or_spell(buf, NULL, true);
+        *ptr = PATH_SEPCH; /* restore string */
         talk_id(VOICE_CHAR_SLASH, true);
         start = ptr+1; /* setup for next component */
-        ptr = strchr(start, '/');
+        ptr = strchr(start, PATH_SEPCH);
+    }
+
+    /* no more slashes, figure out final component */
+    if (!*start) {
+        return 1;
+    }
+
+    DIR* dir = opendir(buf);
+    if (dir) {
+        closedir(dir);
+        return talk_dir_or_spell(buf, NULL, true);
+    } else {
+        return talk_file_or_spell(NULL, buf, NULL, true);
     }
-    /* no more slashes, final component is a filename */
-    return talk_file_or_spell(NULL, buf, NULL, true);
 }
 
 /* say a numeric value, this word ordering works for english,
diff --git a/apps/talk.h b/apps/talk.h
index 6139b9ec46..507d5cbed1 100644
--- a/apps/talk.h
+++ b/apps/talk.h
@@ -145,6 +145,10 @@ void talk_fractional(char *tbuf, int value, int unit);
 void talk_time(const struct tm *tm, bool enqueue);
 void talk_date(const struct tm *tm, bool enqueue);
 
+#ifdef HAVE_MULTIVOLUME
+int talk_volume_id(int volume);
+#endif
+
 /* speaks hr, min, sec, ms; unit_idx is lowest or base unit of the time value */
 int talk_time_intervals(long time, int unit_idx, bool enqueue);
 
diff --git a/apps/tree.c b/apps/tree.c
index d9d23d277a..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)
@@ -1005,7 +1019,7 @@ static int dirbrowse(void)
             }
         }
     }
-    return true;
+    return GO_TO_ROOT;
 }
 
 int create_playlist(void)
@@ -1101,12 +1115,13 @@ int rockbox_browse(struct browse_context *browse)
                 ret_val = dirbrowse();
         }
     }
+
+    tc.is_browsing = false;
+
     backup_count--;
     if (backup_count >= 0)
         tc = backups[backup_count];
 
-    tc.is_browsing = false;
-
     return ret_val;
 }
 
@@ -1251,6 +1266,12 @@ static void say_filetype(int attr)
 
 static int ft_play_dirname(char* name)
 {
+#ifdef HAVE_MULTIVOLUME
+    int vol = path_get_volume_id(name);
+    if (talk_volume_id(vol))
+        return 1;
+#endif
+
     return talk_file(tc.currdir, name, dir_thumbnail_name, NULL,
                      global_settings.talk_filetype ?
                      TALK_IDARRAY(VOICE_DIR) : NULL,
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 */