diff --git a/apps/plugins/puzzles/README.rockbox b/apps/plugins/puzzles/README.rockbox
index b0c54b287f..dc45e73ade 100644
--- a/apps/plugins/puzzles/README.rockbox
+++ b/apps/plugins/puzzles/README.rockbox
@@ -26,3 +26,6 @@ original. Updating the upstream version is now as simple as copying a
 fresh set of sources to src/. Several hacks were used to accomplish
 this: a global include specified on the command line, and a directory
 of dummy header files.
+
+August 2017: Every game that can be played with only the cursor keys
+is now functional.
diff --git a/apps/plugins/puzzles/rockbox.c b/apps/plugins/puzzles/rockbox.c
index 62ed3e9479..509528c95a 100644
--- a/apps/plugins/puzzles/rockbox.c
+++ b/apps/plugins/puzzles/rockbox.c
@@ -562,11 +562,14 @@ static void rb_draw_poly(void *handle, int *coords, int npoints,
             xlcd_filltriangle(x1, y1,
                               x2, y2,
                               x3, y3);
+
+#ifdef DEBUG_MENU
             if(settings.polyanim)
             {
                 rb->lcd_update();
-                rb->sleep(HZ/5);
+                rb->sleep(HZ/4);
             }
+#endif
 #if 0
             /* debug code */
             rb->lcd_set_foreground(LCD_RGBPACK(255,0,0));
@@ -616,6 +619,14 @@ static void rb_draw_poly(void *handle, int *coords, int npoints,
         }
         else
             draw_antialiased_line(x1, y1, x2, y2);
+
+#ifdef DEBUG_MENU
+        if(settings.polyanim)
+        {
+            rb->lcd_update();
+            rb->sleep(HZ/4);
+        }
+#endif
     }
 
     int x1, y1, x2, y2;
@@ -1117,6 +1128,8 @@ static bool config_menu(void)
     char *title;
     config_item *config = midend_get_config(me, CFG_SETTINGS, &title);
 
+    rb->lcd_setfont(FONT_UI);
+
     bool success = false;
 
     if(!config)