diff --git a/ChangeLog b/ChangeLog
index acf1aaf7..08dbbbc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2020-07-16 (12.19)
+	COMMON: Fix 'Print #' on Windows to use Windows line endings
+
+2020-07-12 (12.19)
+	ANDROID: fix layout issue with samsung mobiles
+	ANDROID: save and restore the selected theme
+	ANDROID: fix access to external storage
+
+2020-06-14 (12.19)
+	UI: Use theme colours in main display #94
+	UI: Added theme menu
+
+2020-06-14 (12.19)
+	FLTK: line numbers colours #93
+	SDL: restore window size #95
+
+2020-06-06 (12.19)
+	COMMON: minor performance tweak
+
+2020-05-11 (12.19)
+	ANDROID: complain when samsung keyboard detected
+	COMMON: fix compile warnings
+
+2020-05-11 (12.19)
+	FLTK: Fix compile warnings with updated gcc
+
+2020-05-10 (12.19)
+	COMMON: Fix ABSMIN/ABSMAX transposed #96
+
+2020-05-09 (12.19)
+	COMMON: Fix crash when passing non-array to CHART
+	SDL: show icon in linux build
+
+2020-05-07 (12.19)
+	COMMON: Fix image.save() to array destination
+
+2020-05-04 (12.19)
+	COMMON: INPUT crash #99
+	COMMON: Fix compile warnings with updated gcc
+
+2020-03-07 (12.19)
+	COMMON: implement DEFINEKEY undo #92
+	UI: added R157 colour theme #94
+
+2020-02-13 (12.19)
+	AUDIO: fix integration with latest version of miniaudio library
+
 2020-02-13 (0.12.18)
 	Fix path for HOME constant
 
diff --git a/configure.ac b/configure.ac
index ea0dd25e..91490042 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.12.18])
+AC_INIT([smallbasic], [12.19])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET
@@ -74,8 +74,8 @@ function checkDebugMode() {
    AC_MSG_RESULT([$with_debug])
    if test "$with_debug" = "yes" || test "$with_debug" = "full"
    then
-     CFLAGS="${CFLAGS} -g -O0"
-     CXXFLAGS="${CXXFLAGS} -g -O0"
+     CFLAGS="${CFLAGS} -g -O0 -fstack-protector-all"
+     CXXFLAGS="${CXXFLAGS} -g -O0 -fstack-protector-all"
      AC_DEFINE(_DEBUG, 1, [debugging build enabled])
    fi
    AC_SUBST(CFLAGS)
@@ -204,6 +204,8 @@ function buildSDL() {
 
      PACKAGE_CFLAGS="${PACKAGE_CFLAGS} ${FONTCONFIG_CFLAGS}"
 
+     (cd images && xxd -i sb-desktop-128x128.png > ../src/platform/sdl/icon.h)
+
      dnl backlinking support for modules
      PACKAGE_LIBS="${PACKAGE_LIBS} -ldl -no-pie"
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
@@ -211,7 +213,7 @@ function buildSDL() {
    esac
 
    PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `pkg-config freetype2 --cflags` -fno-exceptions"
-   CXXFLAGS="${CXXFLAGS} -fno-rtti -std=c++11"
+   CXXFLAGS="${CXXFLAGS} -fno-rtti -std=c++14"
 
    dnl preconfigured values for SDL build
    AC_DEFINE(_SDL, 1, [Defined when building SDL version])
@@ -343,7 +345,7 @@ function buildFLTK() {
    esac
 
    FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk-config --cxxflags`"
-   FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++11 -Wno-unknown-pragmas"
+   FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++14 -Wno-unknown-pragmas"
    PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images`"
 
    dnl do not depend on cygwin.dll under cygwin build
@@ -441,6 +443,13 @@ echo ${TARGET}
 echo "CFLAGS=${CFLAGS}"
 echo "CXXFLAGS=${CXXFLAGS}"
 echo "PACKAGE_LIBS=${PACKAGE_LIBS}"
+
+if test x$ac_build_sdl = xyes; then
+   echo
+   echo "sdl2: `sdl2-config --version`"
+   echo "freetype: `pkg-config --version freetype2`"
+fi
+
 echo
 
 if test x$ac_build_dist = xyes; then
diff --git a/debian/changelog b/debian/changelog
index c3cd6ba9..26518299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,8 @@
+smallbasic (0.12.19) unstable; urgency=low
+  * Various see web site
+
+ -- Chris Warren-Smith <cwarrensmith@gmail.com>  Sun, 22 Mar 2020 09:45:25 +1000
+
 smallbasic (0.12.18) unstable; urgency=low
   * Various see web site
 
diff --git a/samples/distro-examples/tests/input.bas b/samples/distro-examples/tests/input.bas
new file mode 100644
index 00000000..a467bdd5
--- /dev/null
+++ b/samples/distro-examples/tests/input.bas
@@ -0,0 +1,3 @@
+v = "111111111111111111111111111111111111111111111111111111111111111111111111111"
+sinput v; k
+print k
diff --git a/samples/distro-examples/tests/keymap.bas b/samples/distro-examples/tests/keymap.bas
new file mode 100644
index 00000000..81d45897
--- /dev/null
+++ b/samples/distro-examples/tests/keymap.bas
@@ -0,0 +1,35 @@
+sub foo
+  ? "f"
+end
+
+definekey 2, foo
+definekey 1, foo
+definekey 1, foo
+definekey 1, foo
+definekey 1, 1
+definekey 1, 2
+definekey 1, 3
+definekey 1, 2
+definekey 1, 3
+definekey 2, 0
+definekey 2, 0
+definekey 2, 0
+definekey 2, 0
+
+definekey asc("x"), foo
+definekey asc("x"), foo
+definekey asc("y"), foo
+definekey asc("z"), foo
+definekey asc("f"), foo
+definekey asc("x"), 0
+definekey asc("y"), 0
+definekey asc("z"), 0
+
+if (instr(sbver, "SDL") <> 0) then
+  while 1
+    ? ".";
+    delay 10
+  wend
+endif
+
+print "done"
diff --git a/samples/distro-examples/tests/output/all.out b/samples/distro-examples/tests/output/all.out
index caca2746..9a837c11 100644
--- a/samples/distro-examples/tests/output/all.out
+++ b/samples/distro-examples/tests/output/all.out
@@ -83,8 +83,8 @@ VIEW:
 WINDOW:
 WRITE:
 ABS:12.2222
-ABSMAX:1
-ABSMIN:9
+ABSMAX:9
+ABSMIN:1
 ACOS:nan
 ACOSH:3.2010898763691
 ACOT:0.0811223921009
diff --git a/samples/distro-examples/tests/output/input.out b/samples/distro-examples/tests/output/input.out
new file mode 100644
index 00000000..79627b1d
--- /dev/null
+++ b/samples/distro-examples/tests/output/input.out
@@ -0,0 +1 @@
+1.11111111111111E+74
diff --git a/samples/distro-examples/tests/output/keymap.out b/samples/distro-examples/tests/output/keymap.out
new file mode 100644
index 00000000..19f86f49
--- /dev/null
+++ b/samples/distro-examples/tests/output/keymap.out
@@ -0,0 +1 @@
+done
diff --git a/src/common/blib.c b/src/common/blib.c
index 2825205b..d6b44d3a 100644
--- a/src/common/blib.c
+++ b/src/common/blib.c
@@ -530,7 +530,7 @@ void cmd_print(int output) {
     if (code_peek() == kwTYPE_EOC || code_peek() == kwTYPE_LINE) {
       // There are no parameters
       if (dev_fstatus(handle)) {
-        dev_fwrite(handle, (byte *) "\n", 1);
+        dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
       } else {
         err_fopen();
       }
@@ -642,7 +642,7 @@ void cmd_print(int output) {
   };
 
   if (last_op == 0) {
-    pv_write("\n", output, handle);
+    pv_write(output == PV_FILE ? OS_LINESEPARATOR : "\n", output, handle);
   }
 }
 
@@ -751,7 +751,7 @@ void cmd_input(int input) {
         inps = malloc(SB_TEXTLINE_SIZE + 1);
         if (prompt.v.p.ptr) {
           // prime output buffer with prompt text
-          int prompt_len = strlen(prompt.v.p.ptr);
+          int prompt_len = v_strlen(&prompt);
           int len = prompt_len < SB_TEXTLINE_SIZE ? prompt_len : SB_TEXTLINE_SIZE;
           strncpy(inps, prompt.v.p.ptr, len);
           inps[len] = 0;
@@ -2835,14 +2835,20 @@ void cmd_definekey(void) {
 
   if (!prog_error) {
     par_getcomma();
-
-    if (code_peek() != kwTYPE_CALL_UDF) {
-      err_syntax(kwDEFINEKEY, "%I,%G");
-    } else {
+    switch (code_peek()) {
+    case kwTYPE_INT:
+      prog_ip++;
+      keymap_remove(key, code_getint());
+      break;
+    case kwTYPE_CALL_UDF:
       keymap_add(key, prog_ip);
 
       // skip ahead to avoid immediate call
       prog_ip += BC_CTRLSZ + 1;
+      break;
+    default:
+      err_syntax(kwDEFINEKEY, "%I,%G");
+      break;
     }
   }
   v_free(&var);
@@ -2902,7 +2908,7 @@ void cmd_call_vfunc() {
     if (code_peek() == kwTYPE_LEVEL_BEGIN) {
       code_skipnext();
     }
-    v_func->v.fn.cb(map);
+    v_func->v.fn.cb(map, NULL);
     if (code_peek() == kwTYPE_LEVEL_END) {
       code_skipnext();
     }
diff --git a/src/common/blib_db.c b/src/common/blib_db.c
index f0e52e5d..e8b619c9 100644
--- a/src/common/blib_db.c
+++ b/src/common/blib_db.c
@@ -725,7 +725,7 @@ void cmd_fsaveln() {
     for (int i = 0; i < v_asize(array_p); i++) {
       var_p = v_elem(array_p, i);
       fprint_var(handle, var_p);
-      dev_fwrite(handle, (byte *)"\n", 1);
+      dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
     }
   } else {
     // parameter is an string
diff --git a/src/common/blib_func.c b/src/common/blib_func.c
index da5e5e80..46938e19 100644
--- a/src/common/blib_func.c
+++ b/src/common/blib_func.c
@@ -122,19 +122,20 @@ void dar_next(long funcCode, var_t *r, var_t *elem_p) {
       v_set(r, elem_p);
     }
     break;
-  default:                     // numeric
+  default:
+    // numeric
     n = v_getval(elem_p);
 
     switch (funcCode) {
     case kwABSMIN:
       n = fabsl(n);
-      if (r->v.n < n) {
+      if (n < r->v.n) {
         r->v.n = n;
       }
       break;
     case kwABSMAX:
       n = fabsl(n);
-      if (r->v.n > n) {
+      if (n > r->v.n) {
         r->v.n = n;
       }
       break;
@@ -145,8 +146,8 @@ void dar_next(long funcCode, var_t *r, var_t *elem_p) {
     case kwSUMSV:
       r->v.n += (n * n);
       break;
-    }                         // sw2
-  }                           // sw1
+    }
+  }
 }
 
 /*
diff --git a/src/common/blib_graph.c b/src/common/blib_graph.c
index f56ee869..54f1bfe7 100644
--- a/src/common/blib_graph.c
+++ b/src/common/blib_graph.c
@@ -884,36 +884,35 @@ void cmd_chart_fstr(var_num_t v, char *buf) {
 }
 
 /*
- *   draw a chart
+ * draw a chart
  *
- *   x1,y1-x2,y2 = the area to draw
- *   vals = the values
- *   count = the number of the values
- *   xvals, xcount = for ruler the xvalues (use NULL for default)
- *   chart = chart type (1=line chart, 0=bar chart, 5=points)
- *   marks = marks type (2 & ruler, 1 & marks)
+ * x1,y1-x2,y2 = the area to draw
+ * vals = the values
+ * count = the number of the values
+ * xvals, xcount = for ruler the xvalues (use NULL for default)
+ * chart = chart type (1=line chart, 0=bar chart, 5=points)
+ * marks = marks type (2 & ruler, 1 & marks)
  */
-void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_num_t *xvals, int xcount,
-                int chart, int marks) {
-  int *pts;
-  int rx1, dx, dy, i;
-  var_num_t vmin, vmax, lx, ly;
+void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count,
+                var_num_t *xvals, int xcount, int chart, int marks) {
+  var_num_t lx, ly;
   char buf[32];
   int32_t color = 0;
-
-  rx1 = x1;
+  int rx1 = x1;
 
   // ready
   dev_settextcolor(0, 15);
-  pts = (int *) malloc(sizeof(int) * count * 2);
+  int *pts = (int *) malloc(sizeof(int) * count * 2);
 
-  if (marks & 0x2) {            // ruler
+  if (marks & 0x2) {
+    // ruler
     x1 += dev_textwidth("00000") + 1;
     y2 -= (dev_textheight("0") + 1);
   }
 
   if (marks & 0x1) {
-    if (chart == 1) {           // line
+    if (chart == 1) {
+      // line
       x1 += 2;
       x2 -= 2;
       y1 += 2;
@@ -921,12 +920,13 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
     }
   }
 
-  dx = (x2 - x1);
-  dy = (y2 - y1);
+  int dx = (x2 - x1);
+  int dy = (y2 - y1);
 
   // limits
-  vmin = vmax = vals[0];
-  for (i = 1; i < count; i++) {
+  var_num_t vmin = vals[0];
+  var_num_t vmax = vals[0];
+  for (int i = 1; i < count; i++) {
     if (vmin > vals[i]) {
       vmin = vals[i];
     }
@@ -944,22 +944,22 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
   ly = ((var_num_t) dy) / (vmax - vmin);
 
   // calc points
-  for (i = 0; i < count; i++) {
-    pts[i * 2] = x1 + i * lx;
-    pts[i * 2 + 1] = y1 + (dy - ((vals[i] - vmin) * ly));
+  for (int i = 0; i < count; i++) {
+    int x = x1 + i * lx;
+    int y = y1 + (dy - ((vals[i] - vmin) * ly));
+    pts[i * 2] = x > 0 ? x : 0;
+    pts[i * 2 + 1] = y > 0 ? y : 0;
   }
 
   // draw ruler
   if (marks & 0x2) {
-    int fh, fw, n, y, x;
-    var_num_t v;
-
     // vertical
-    fh = dev_textheight("0");
-    n = dy / (fh * 1.5);
+    int fh = dev_textheight("0");
+    int n = dy / (fh * 1.5);
 
     if ((n - 1) > 0) {
-      for (i = 0; i <= n; i++) {
+      for (int i = 0; i <= n; i++) {
+        var_num_t v;
         if (i == 0) {
           v = vmin;
         }
@@ -970,8 +970,7 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
         }
         cmd_chart_fstr(v, buf);
 
-        y = y1 + (dy - ((v - vmin) * ly));
-
+        int y = y1 + (dy - ((v - vmin) * ly));
         if (i != 0) {
           dev_setxy(rx1 + 1, y + 1, 0);
         } else {
@@ -983,7 +982,7 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
     }
 
     // horizontal
-    fw = dev_textwidth("000");
+    int fw = dev_textwidth("000");
     n = -1;
     if (count <= 24) {
       if (count * (fw * 1.34) < dx) {
@@ -995,7 +994,8 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
       n = dx / (fw * 1.5);
     }
     if ((n - 1) > 0) {
-      for (i = 0; i < n; i++) {
+      for (int i = 0; i < n; i++) {
+        var_num_t v;
         if (i == 0) {
           v = 0;
         } else {
@@ -1003,12 +1003,10 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
         }
         if (xvals) {
           // I have xvals
-          var_num_t x, dx;
-          var_num_t xmin, xmax;
-
-          xmin = xvals[0];
-          xmax = xvals[xcount - 1];
-          dx = xmax - xmin;
+          var_num_t x;
+          var_num_t xmin = xvals[0];
+          var_num_t xmax = xvals[xcount - 1];
+          var_num_t dx = xmax - xmin;
           if (i == 0) {
             x = xmin;
           } else if (i == n) {
@@ -1022,12 +1020,10 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
           ftostr(i + 1, buf);
         }
 
-        //
         buf[3] = '\0';
         fw = dev_textwidth(buf);
 
-        x = x1 + v * lx;
-
+        int x = x1 + v * lx;
         if (chart == 1 || chart == 5) {
           dev_setxy(x - fw, y2 + 1, 0);
         } else {
@@ -1052,32 +1048,29 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
 
   // draw
   switch (chart) {
-
-  case 1:                      // line chart
-  case 5:                      // points
+  case 1:
+  case 5:
+    // line chart
+    // points
     if (chart == 5) {
-      for (i = 0; i < count; i++) {
+      for (int i = 0; i < count; i++) {
         dev_setpixel(pts[i * 2], pts[i * 2 + 1]);
       }
     } else {
-      for (i = 1; i < count; i++) {
+      for (int i = 1; i < count; i++) {
         dev_line(pts[(i - 1) * 2], pts[(i - 1) * 2 + 1], pts[i * 2], pts[i * 2 + 1]);
       }
     }
 
     // draw marks
     if (marks & 0x1) {
-      for (i = 0; i < count; i++) {
-        int mx, my;
-        int fh, fw;
-
+      for (int i = 0; i < count; i++) {
         cmd_chart_fstr(vals[i], buf);
 
-        fw = dev_textwidth(buf);
-        fh = dev_textheight(buf);
-
-        mx = pts[i * 2] - fw / 2;
-        my = pts[i * 2 + 1];
+        int fw = dev_textwidth(buf);
+        int fh = dev_textheight(buf);
+        int mx = pts[i * 2] - fw / 2;
+        int my = pts[i * 2 + 1];
 
         if (my > (y1 + (y2 - y1) / 2)) {
           my -= fh;
@@ -1090,15 +1083,17 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
         }
         dev_setxy(mx, my, 0);
         dev_print(buf);
-        dev_rect(pts[i * 2] - 2, pts[i * 2 + 1] - 2, pts[i * 2] + 2, pts[i * 2 + 1] + 2, 1);
+        dev_rect(pts[i * 2] - 2, pts[i * 2 + 1] - 2,
+                 pts[i * 2] + 2, pts[i * 2 + 1] + 2, 1);
       }
     }
     break;
 
-  case 2:                      // bar chart
+  case 2:
+    // bar chart
     // draw rect
     color = 0;
-    for (i = 1; i < count; i++) {
+    for (int i = 1; i < count; i++) {
       if (os_color_depth > 2) {
         dev_setcolor(color);
         color++;
@@ -1112,22 +1107,19 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
     if (os_color_depth > 2) {
       dev_setcolor(color);
     }
-    dev_rect(pts[(count - 1) * 2], pts[(count - 1) * 2 + 1], pts[(count - 1) * 2] + lx - 1, y2, 1);
+    dev_rect(pts[(count - 1) * 2], pts[(count - 1) * 2 + 1],
+             pts[(count - 1) * 2] + lx - 1, y2, 1);
 
     // draw marks
     if (marks & 0x1) {
       color = 0;
-      for (i = 0; i < count; i++) {
-        int mx, my;
-        int fh, fw;
-
+      for (int i = 0; i < count; i++) {
         cmd_chart_fstr(vals[i], buf);
 
-        fw = dev_textwidth(buf);
-        fh = dev_textheight(buf);
-
-        mx = pts[i * 2] + lx / 2 - fw / 2;
-        my = pts[i * 2 + 1];
+        int fw = dev_textwidth(buf);
+        int fh = dev_textheight(buf);
+        int mx = pts[i * 2] + lx / 2 - fw / 2;
+        int my = pts[i * 2 + 1];
 
         if (os_color_depth > 2) {
           if (my - fh >= y1) {
@@ -1162,7 +1154,6 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
     break;
   };
 
-  //
   free(pts);
 }
 
@@ -1170,79 +1161,54 @@ void chart_draw(int x1, int y1, int x2, int y2, var_num_t *vals, int count, var_
 //  CHART
 //
 void cmd_chart() {
-  var_t *var_p, *elem_p;
-  int i, count;
-  var_num_t *vals;
   int32_t prev_fgcolor = dev_fgcolor;
   int32_t prev_bgcolor = dev_bgcolor;
-
-  // parameters
-  int chart;
-  int marks = 0;
-  int x1 = 0, y1 = 0, x2 = os_graf_mx, y2 = os_graf_my;
+  int x1 = 0;
+  int y1 = 0;
+  int x2 = os_graf_mx;
+  int y2 = os_graf_my;
 
   // chart type
-  chart = par_getint();
-  if (prog_error)
-    return;
-
-  par_getcomma();
-  if (prog_error)
-    return;
+  int chart = par_getint(); IF_PROG_ERR_RTN;
+  par_getcomma();           IF_PROG_ERR_RTN;
 
   // array
-  var_p = par_getvarray();
-  if (prog_error)
+  var_t *var_p = par_getvarray(); IF_PROG_ERR_RTN;
+  if (!var_p || var_p->type != V_ARRAY) {
+    err_varisnotarray();
     return;
-  count = v_asize(var_p);
+  }
 
   // optional labels-flag
+  int marks;
   if (code_peek() == kwTYPE_SEP) {
-    par_getcomma();
-    if (prog_error)
-      return;
-    marks = par_getint();
-    if (prog_error)
-      return;
+    par_getcomma();         IF_PROG_ERR_RTN;
+    marks = par_getint();   IF_PROG_ERR_RTN;
 
     // optional x1,y1,x2,y2
     if (code_peek() == kwTYPE_SEP) {
-      par_getcomma();
-      if (prog_error)
-        return;
-      x1 = par_getint();
-      if (prog_error)
-        return;
-      par_getcomma();
-      if (prog_error)
-        return;
-      y1 = par_getint();
-      if (prog_error)
-        return;
-      par_getcomma();
-      if (prog_error)
-        return;
-      x2 = par_getint();
-      if (prog_error)
-        return;
-      par_getcomma();
-      if (prog_error)
-        return;
-      y2 = par_getint();
-      if (prog_error)
-        return;
+      par_getcomma();       IF_PROG_ERR_RTN;
+      x1 = par_getint();    IF_PROG_ERR_RTN;
+      par_getcomma();       IF_PROG_ERR_RTN;
+      y1 = par_getint();    IF_PROG_ERR_RTN;
+      par_getcomma();       IF_PROG_ERR_RTN;
+      x2 = par_getint();    IF_PROG_ERR_RTN;
+      par_getcomma();       IF_PROG_ERR_RTN;
+      y2 = par_getint();    IF_PROG_ERR_RTN;
     }
+  } else {
+    marks = 0;
   }
 
   // get array's values
-  vals = (var_num_t *) malloc(sizeof(var_num_t) * count);
-  for (i = 0; i < count; i++) {
-    elem_p = v_elem(var_p, i);
+  int count = v_asize(var_p);
+  var_num_t *vals = (var_num_t *) malloc(sizeof(var_num_t) * count);
+  for (int i = 0; i < count; i++) {
+    var_t *elem_p = v_elem(var_p, i);
     if (prog_error) {
       free(vals);
       return;
     }
-
     switch (elem_p->type) {
     case V_INT:
       vals[i] = elem_p->v.i;
@@ -1260,10 +1226,8 @@ void cmd_chart() {
     }
   }
 
-  //
   chart_draw(x1, y1, x2, y2, vals, count, NULL, 0, chart, marks);
 
-  //
   free(vals);
   dev_settextcolor(prev_fgcolor, prev_bgcolor);
 }
diff --git a/src/common/brun.c b/src/common/brun.c
index 58ed89b0..fcf62cc8 100644
--- a/src/common/brun.c
+++ b/src/common/brun.c
@@ -352,7 +352,7 @@ void cmd_chain(void) {
   if (var.type == V_STR) {
     if (access(var.v.p.ptr, R_OK) == 0) {
       // argument is a file name
-      int h = open(var.v.p.ptr, O_BINARY | O_RDONLY, 0644);
+      int h = open(var.v.p.ptr, O_BINARY | O_RDONLY);
       if (h != -1) {
         struct stat st;
         if (fstat(h, &st) == 0) {
@@ -1144,7 +1144,7 @@ int brun_create_task(const char *filename, byte *preloaded_bc, int libf) {
       return search_task(fname);
     }
     // open & load
-    int h = open(fname, O_RDWR | O_BINARY, 0660);
+    int h = open(fname, O_RDWR | O_BINARY);
     if (h == -1) {
       panic("File '%s' not found", fname);
     }
diff --git a/src/common/eval.c b/src/common/eval.c
index 56d04d9a..3087c79c 100644
--- a/src/common/eval.c
+++ b/src/common/eval.c
@@ -19,17 +19,17 @@
 #define IP           prog_ip
 #define CODE(x)      prog_source[(x)]
 #define CODE_PEEK()  CODE(IP)
-#define V_FREE(v)                       \
-  if ((v) && ((v)->type == V_STR ||     \
-              (v)->type == V_MAP ||     \
-              (v)->type == V_ARRAY)) {  \
-    v_free((v));                        \
+#define V_FREE(v)                               \
+  if ((v) && ((v)->type == V_STR ||             \
+              (v)->type == V_MAP ||             \
+              (v)->type == V_ARRAY)) {          \
+    v_free((v));                                \
   }
-#define V_FREE2(v)               \
-  if (((v)->type == V_STR ||     \
-       (v)->type == V_MAP ||     \
-       (v)->type == V_ARRAY)) {  \
-    v_free((v));                 \
+#define V_FREE2(v)                              \
+  if (((v)->type == V_STR ||                    \
+       (v)->type == V_MAP ||                    \
+       (v)->type == V_ARRAY)) {                 \
+    v_free((v));                                \
   }
 
 /**
@@ -379,7 +379,7 @@ static inline void oper_mul(var_t *r, var_t *left) {
         } else {
           err_matop();
         }
-     } else if (op == '*') {
+      } else if (op == '*') {
         mat_mul(left, r);
       } else {
         err_matop();
@@ -748,6 +748,7 @@ static inline void eval_var(var_t *r, var_t *var_p) {
   if (prog_error) {
     return;
   }
+
   switch (var_p->type) {
   case V_INT:
     r->type = V_INT;
@@ -770,7 +771,7 @@ static inline void eval_var(var_t *r, var_t *var_p) {
     v_set(r, var_p);
     break;
   case V_FUNC:
-    var_p->v.fn.cb(r);
+    var_p->v.fn.cb(var_p, r);
     break;
   case V_NIL:
     r->type = V_NIL;
@@ -1245,23 +1246,6 @@ void eval(var_t *r) {
       r->v.n = code_getreal();
       break;
 
-    case kwTYPE_STR:
-      // string - constant
-      IP++;
-      V_FREE(r);
-      v_eval_str(r);
-      break;
-
-    case kwTYPE_LOGOPR:
-      IP++;
-      oper_log(r, left);
-      break;
-
-    case kwTYPE_CMPOPR:
-      IP++;
-      oper_cmp(r, left);
-      break;
-
     case kwTYPE_ADDOPR:
       IP++;
       oper_add(r, left);
@@ -1272,17 +1256,6 @@ void eval(var_t *r) {
       oper_mul(r, left);
       break;
 
-    case kwTYPE_POWOPR:
-      IP++;
-      oper_powr(r, left);
-      break;
-
-    case kwTYPE_UNROPR:
-      // unary
-      IP++;
-      oper_unary(r);
-      break;
-
     case kwTYPE_VAR:
       // variable
       V_FREE(r);
@@ -1317,15 +1290,10 @@ void eval(var_t *r) {
       IP++;
       if (!eval_sp) {
         err_syntax_unknown();
-      } else {
-        eval_sp--;
-        left = &eval_stk[eval_sp];
+        return;
       }
-      break;
-
-    case kwTYPE_EVAL_SC:
-      IP++;
-      eval_shortc(r);
+      eval_sp--;
+      left = &eval_stk[eval_sp];
       break;
 
     case kwTYPE_CALLF:
@@ -1334,48 +1302,80 @@ void eval(var_t *r) {
       eval_callf(r);
       break;
 
+    case kwTYPE_STR:
+      // string - constant
+      IP++;
+      V_FREE(r);
+      v_eval_str(r);
+      break;
+
+    case kwTYPE_LOGOPR:
+      IP++;
+      oper_log(r, left);
+      break;
+
+    case kwTYPE_CMPOPR:
+      IP++;
+      oper_cmp(r, left);
+      break;
+
+    case kwTYPE_POWOPR:
+      IP++;
+      oper_powr(r, left);
+      break;
+
+    case kwTYPE_UNROPR:
+      // unary
+      IP++;
+      oper_unary(r);
+      break;
+
+    case kwTYPE_EVAL_SC:
+      IP++;
+      eval_shortc(r);
+      break;
+
     case kwTYPE_CALL_UDF:
       eval_call_udf(r);
       break;
 
-    default:
-      // less used codes
-      switch (code) {
-      case kwTYPE_CALLEXTF:
-        // [lib][index] external functions
-        IP++;
-        eval_extf(r);
-        break;
-
-      case kwTYPE_PTR:
-        // UDF pointer - constant
-        IP++;
-        eval_ptr(r);
-        break;
+    case kwTYPE_CALLEXTF:
+      // [lib][index] external functions
+      IP++;
+      eval_extf(r);
+      break;
 
-      case kwBYREF:
-        // unexpected code
-        err_evsyntax();
-        break;
+    case kwTYPE_PTR:
+      // UDF pointer - constant
+      IP++;
+      eval_ptr(r);
+      break;
 
-      default: {
-        if (code == kwTYPE_EOC ||
-            code == kwTYPE_SEP ||
-            code == kwTO ||
-            kw_check_evexit(code)) {
-          // restore stack pointer
-          eval_sp = eval_pos;
+    case kwBYREF:
+      // unexpected code
+      err_evsyntax();
+      return;
+
+    default: {
+      if (code == kwTYPE_LINE ||
+          code == kwTYPE_SEP ||
+          code == kwTO ||
+          code == kwTHEN ||
+          code == kwSTEP ||
+          kw_check_evexit(code)) {
+        // restore stack pointer
+        eval_sp = eval_pos;
 
-          // normal exit
-          return;
-        }
-        rt_raise("UNKNOWN ERROR. IP:%d=0x%02X", IP, code);
-        if (!opt_quiet) {
-          hex_dump(prog_source, prog_length);
-        }
-      }};
-    }
+        // normal exit
+        return;
+      }
+      rt_raise("UNKNOWN ERROR. IP:%d=0x%02X", IP, code);
+      if (!opt_quiet) {
+        hex_dump(prog_source, prog_length);
+      }
+    }};
   }
+
   // restore stack pointer
   eval_sp = eval_pos;
 }
diff --git a/src/common/keymap.c b/src/common/keymap.c
index 351175bb..ed4b7c72 100644
--- a/src/common/keymap.c
+++ b/src/common/keymap.c
@@ -30,7 +30,7 @@ struct key_map_s {
   int key;         // key definition
 };
 
-key_map_s* keymap = 0;
+key_map_s *keymap = 0;
 
 /**
  * Prepare task_t exec.keymap for keymap handling at program init
@@ -42,7 +42,7 @@ void keymap_init() {
 /**
  * Handler for keymap_free()
  */
-void keymap_delete(key_map_s* km) {
+void keymap_delete(key_map_s *km) {
   if (km) {
     keymap_delete(km->next);
     free(km);
@@ -61,13 +61,13 @@ void keymap_free() {
  * DEFINEKEY command handler to add a keymap 
  */
 void keymap_add(uint32_t key, bcip_t ip) {
-  key_map_s* km = (key_map_s*) malloc(sizeof (key_map_s));
+  key_map_s *km = (key_map_s *)malloc(sizeof(key_map_s));
   km->next = 0;
   km->ip = ip;
   km->key = key;
 
   // add the new mapping onto the linked list
-  key_map_s* head = keymap;
+  key_map_s *head = keymap;
   if (!head) {
     keymap = km;
   } else {
@@ -78,12 +78,38 @@ void keymap_add(uint32_t key, bcip_t ip) {
   }
 }
 
+/**
+ * DEFINEKEY key, 0
+ */
+void keymap_remove(uint32_t key, int level) {
+  key_map_s *head = keymap;
+  key_map_s *prev = head;
+
+  while (head) {
+    if (head->key == key) {
+      key_map_s *current = head;
+      prev->next = head->next;
+      head = head->next;
+      free(current);
+      if (current == prev) {
+        prev = head;
+      }
+      if (current == keymap) {
+        keymap = head;
+      }
+    } else {
+      prev = head;
+      head = head->next;
+    }
+  }
+}
+
 /**
  * invokes the handler for the given key
  */
 int keymap_invoke(uint32_t key) {
   int result = 0;
-  key_map_s* head = keymap;
+  key_map_s *head = keymap;
   while (head) {
     if (head->key == key) {
       bcip_t ip = prog_ip; // store current ip
@@ -175,7 +201,7 @@ void timer_free(timer_s *timer) {
 }
 
 void timer_add(var_num_t interval, bcip_t ip) {
-  timer_s* timer = (timer_s*) malloc(sizeof (timer_s));
+  timer_s *timer = (timer_s *)malloc(sizeof (timer_s));
   timer->next = NULL;
   timer->ip = ip;
   timer->interval = interval;
@@ -195,7 +221,7 @@ void timer_add(var_num_t interval, bcip_t ip) {
 }
 
 void timer_run(uint32_t now) {
-  timer_s* timer = prog_timer;
+  timer_s *timer = prog_timer;
   while (timer) {
     if (timer->value == 0) {
       // start timer
diff --git a/src/common/keymap.h b/src/common/keymap.h
index e8d50d71..8b7c070a 100644
--- a/src/common/keymap.h
+++ b/src/common/keymap.h
@@ -87,6 +87,7 @@ extern "C" {
 void keymap_init();
 void keymap_free();
 void keymap_add(uint32_t key, bcip_t ip);
+void keymap_remove(uint32_t key, int level);
 int keymap_invoke(uint32_t key);
 int keymap_kbhit();
 int keymap_kbpeek();
diff --git a/src/common/kw.c b/src/common/kw.c
index 82399de0..989c9a13 100644
--- a/src/common/kw.c
+++ b/src/common/kw.c
@@ -10,32 +10,6 @@
 #include "common/var.h"
 #include "common/scan.h"
 
-/*
- * valid exit codes from eval
- */
-code_t kw_eval_validexit[] = {
-  kwTYPE_EOC,
-  kwTYPE_LINE,
-  kwTYPE_SEP,
-  kwFILLED,
-  kwCOLOR,
-  kwUSE,
-  kwTO,
-  kwIN,
-  kwSTEP,
-  kwFORSEP,
-  kwINPUTSEP,
-  kwINPUT,
-  kwOUTPUTSEP,
-  kwAPPENDSEP,
-  kwAS,
-  kwUSING,
-  kwTHEN,
-  kwDO,
-  kwBACKG,
-  0
-};
-
 /*
  * functions without parameters
  */
@@ -53,31 +27,41 @@ bid_t kw_noarg_func_table[] = {
   0
 };
 
-//
-int kw_check(code_t *table, code_t code) {
-  register int i;
-
-  for (i = 0; table[i] != 0; i++) {
-    if (code == table[i]) {
-      return 1;
-    }
-  }
-  return 0;
-}
-
-//
+/*
+ * valid exit codes from eval
+ */
 int kw_check_evexit(code_t code) {
-  return kw_check(kw_eval_validexit, code);
+  switch (code) {
+  case kwTYPE_EOC:
+  case kwTYPE_LINE:
+  case kwTYPE_SEP:
+  case kwFILLED:
+  case kwCOLOR:
+  case kwUSE:
+  case kwTO:
+  case kwIN:
+  case kwSTEP:
+  case kwFORSEP:
+  case kwINPUTSEP:
+  case kwINPUT:
+  case kwOUTPUTSEP:
+  case kwAPPENDSEP:
+  case kwAS:
+  case kwUSING:
+  case kwTHEN:
+  case kwDO:
+  case kwBACKG:
+    return 1;
+  default:
+    return 0;
+  }
 }
 
-/*
- */
 int kw_getcmdname(code_t code, char *dest) {
-  int i;
   int found = 0;
 
   *dest = '\0';
-  for (i = 0; keyword_table[i].name[0] != '\0'; i++) {
+  for (int i = 0; keyword_table[i].name[0] != '\0'; i++) {
     if (code == keyword_table[i].code) {
       strcpy(dest, keyword_table[i].name);
       found++;
@@ -90,14 +74,11 @@ int kw_getcmdname(code_t code, char *dest) {
   return found;
 }
 
-/*
- */
 int kw_getfuncname(bid_t code, char *dest) {
-  int i;
   int found = 0;
 
   *dest = '\0';
-  for (i = 0; func_table[i].name[0] != '\0'; i++) {
+  for (int i = 0; func_table[i].name[0] != '\0'; i++) {
     if (code == func_table[i].fcode) {
       strcpy(dest, func_table[i].name);
       found++;
@@ -110,14 +91,11 @@ int kw_getfuncname(bid_t code, char *dest) {
   return found;
 }
 
-/*
- */
 int kw_getprocname(bid_t code, char *dest) {
-  int i;
   int found = 0;
 
   *dest = '\0';
-  for (i = 0; proc_table[i].name[0] != '\0'; i++) {
+  for (int i = 0; proc_table[i].name[0] != '\0'; i++) {
     if (code == proc_table[i].pcode) {
       strcpy(dest, proc_table[i].name);
       found++;
@@ -130,12 +108,8 @@ int kw_getprocname(bid_t code, char *dest) {
   return found;
 }
 
-/*
- */
 int kw_noarg_func(bid_t code) {
-  int i;
-
-  for (i = 0; kw_noarg_func_table[i] != 0; i++) {
+  for (int i = 0; kw_noarg_func_table[i] != 0; i++) {
     if (kw_noarg_func_table[i] == code) {
       return 1;
     }
diff --git a/src/common/kw.h b/src/common/kw.h
index fda521a1..e692796d 100644
--- a/src/common/kw.h
+++ b/src/common/kw.h
@@ -55,42 +55,42 @@ extern "C" {
  * special seperators too like INPUT, APPEND, FORSEP
  * and, of course, root commands like REPEAT-UNTIL, IF, etc
  */
-enum keyword {                // line 50
+enum keyword {
   kwTYPE_INT = 0x1, /* 32b Integer */
   kwTYPE_NUM, /* 64b Real */
-  kwTYPE_STR, /* String */
-  kwTYPE_LOGOPR, /* Logical operator */
-  kwTYPE_CMPOPR, /* Comparation operator */
   kwTYPE_ADDOPR, /* ADD/SUB operator */
   kwTYPE_MULOPR, /* MUL/DIV/IDIV operator */
-  kwTYPE_POWOPR, /* POW(x,y) operator */
-  kwTYPE_UNROPR, /* Unary operator */
   kwTYPE_VAR, /* Variable */
-  kwTYPE_UDS_EL, /* Structure element */
-  kwTYPE_SEP, /* Separator */
-  kwTYPE_LINE, /* Debug info: SOURCE LINE */
   kwTYPE_LEVEL_BEGIN, /* Parenthesis ( */
   kwTYPE_LEVEL_END, /* Parenthesis ) */
-  kwTYPE_EOC, /* End-Of-Command mark */
   kwTYPE_EVPUSH, /* PUSH R */
   kwTYPE_EVPOP, /* POP L */
-  kwTYPE_EVAL_SC, /* Evalulation short-circuit begin */
   kwTYPE_CALLF, /* Call a build-in function */
-  kwTYPE_CALLP, /* Call a build-in procedure */
+  kwTYPE_STR, /* String */
+  kwTYPE_LOGOPR, /* Logical operator */
+  kwTYPE_CMPOPR, /* Comparation operator */
+  kwTYPE_POWOPR, /* POW(x,y) operator */
+  kwTYPE_UNROPR, /* Unary operator */
+  kwTYPE_EVAL_SC, /* Evalulation short-circuit begin */
   kwTYPE_CALL_UDF, /* Call user defined function */
+  kwTYPE_CALLEXTF, /* Call an external function */
+  kwTYPE_PTR, /* Address pointer, eg f=@foo */
+  kwBYREF, /* end eval switch block */
   kwTYPE_CALL_UDP, /* Call user defined procedure */
   kwTYPE_CALL_PTR, /* Call user defined procedure or function from address pointer */
   kwTYPE_CALL_VFUNC, /* Call virtual function */
-  kwTYPE_CALLEXTF, /* Call an external function */
   kwTYPE_CALLEXTP, /* Call an external procedure */
   kwTYPE_CRVAR, /* Create dynamic variable (PARAMETERS OR LOCALS) */
   kwTYPE_RET, /* Return from UDF|UDP */
   kwTYPE_PARAM, /* Parameters */
-  kwTYPE_PTR, /* Address pointer, eg f=@foo */
+  kwTYPE_CALLP, /* Call a build-in procedure */
+  kwTYPE_EOC, /* End-Of-Command mark */
+  kwTYPE_UDS_EL, /* Structure element */
+  kwTYPE_SEP, /* Separator */
+  kwTYPE_LINE, /* Debug info: SOURCE LINE */
   kwLOCAL, /* Create local variables */
   kwFUNC, /* USER DEFINED FUNCTION */
   kwPROC, /* USER DEFINED PROCEDURE */
-  kwBYREF,
   kwDECLARE,
   kwIMPORT,
   kwEXPORT,
diff --git a/src/common/smbas.h b/src/common/smbas.h
index 59823acd..ab463193 100644
--- a/src/common/smbas.h
+++ b/src/common/smbas.h
@@ -133,6 +133,9 @@ EXTERN char gsb_last_errmsg[SB_ERRMSG_SIZE + 1]; /**< last error message     */
 #include "common/units.h"
 #include "common/tasks.h"
 
+#define IF_PROG_ERR_RTN if (ctask->error) { return; }
+#define IF_PROG_ERR_BRK if (ctask->error) { break; }
+
 // emulation
 #define prog_line           ctask->line
 #define comp_line           ctask->line
diff --git a/src/common/sys.h b/src/common/sys.h
index 413ea599..fa28742a 100644
--- a/src/common/sys.h
+++ b/src/common/sys.h
@@ -54,8 +54,10 @@ extern "C" {
 
 #if defined(_Win32)
  #define SB_VERSYS "Win"
+ #define OS_LINESEPARATOR  "\r\n"
 #else
  #define SB_VERSYS "Unix"
+ #define OS_LINESEPARATOR  "\r\n"
 #endif
 
 #if UINTPTR_MAX == 0xffffffff
diff --git a/src/common/units.c b/src/common/units.c
index 87e18f1b..a3b19202 100644
--- a/src/common/units.c
+++ b/src/common/units.c
@@ -147,7 +147,7 @@ int open_unit(const char *file) {
   }
 
   // open unit
-  h = open(unitname, O_RDWR | O_BINARY, 0660);
+  h = open(unitname, O_RDWR | O_BINARY);
   if (h == -1) {
     return -1;
   }
@@ -218,18 +218,15 @@ int close_unit(int uid) {
  * @return 0 on success
  */
 int import_unit(int uid) {
-  char buf[SB_KEYWORD_SIZE + 1];int i;
-
   if (uid >= 0) {
     unit_t *u = &units[uid];
     if (u->status == unit_loaded) {
-      for (i = 0; i < u->hdr.sym_count; i++) {
-        // build the name
-        // with any path component removed from the name
+      for (int i = 0; i < u->hdr.sym_count; i++) {
+        // build the name with any path component removed from the name
+        char buf[SB_KEYWORD_SIZE + SB_KEYWORD_SIZE + 1];
         char *dir_sep = strrchr(u->hdr.base, OS_DIRSEP);
         sprintf(buf, "%s.%s",
-            dir_sep ? dir_sep + 1 : u->hdr.base, u->symbols[i].symbol);
-
+                dir_sep ? dir_sep + 1 : u->hdr.base, u->symbols[i].symbol);
         switch (u->symbols[i].type) {
         case stt_function:
           comp_add_external_func(buf, uid | UID_UNIT_BIT);
@@ -242,12 +239,10 @@ int import_unit(int uid) {
           break;
         };
       }
-    }
-    else {
+    } else {
       return -2;
     }
-  }
-  else {
+  } else {
     return -1;
   }
 
diff --git a/src/common/var.c b/src/common/var.c
index 2dfad5ac..aa9983c6 100644
--- a/src/common/var.c
+++ b/src/common/var.c
@@ -767,15 +767,15 @@ void v_zerostr(var_t *r) {
 void v_input2var(const char *str, var_t *var) {
   v_free(var);
 
-  if (strlen(str) == 0) {
+  if (!str || str[0] == '\0') {
     // no data
     v_setstr(var, str);
   } else {
-    char buf[INT_STR_LEN];
     int type;
     var_int_t lv;
     var_num_t dv;
 
+    char *buf = strdup(str);
     char *sb = strdup(str);
     char *np = get_numexpr(sb, buf, &type, &lv, &dv);
 
@@ -787,6 +787,7 @@ void v_input2var(const char *str, var_t *var) {
       v_setstr(var, str);
     }
     free(sb);
+    free(buf);
   }
 }
 
diff --git a/src/common/var_map.c b/src/common/var_map.c
index cbe6f629..5e9946f2 100644
--- a/src/common/var_map.c
+++ b/src/common/var_map.c
@@ -90,7 +90,7 @@ int map_length(const var_p_t var_p) {
 
 var_p_t map_get(var_p_t base, const char *name) {
   var_p_t result;
-  if (base->type == V_MAP) {
+  if (base != NULL && base->type == V_MAP) {
     result = hashmap_get(base, name);
   } else {
     result = NULL;
diff --git a/src/include/module.h b/src/include/module.h
index 78f90415..abe94f4a 100644
--- a/src/include/module.h
+++ b/src/include/module.h
@@ -54,7 +54,7 @@ void sblib_close(void);
  *
  * plugin based event handling
  */
-int sblib_events(int wait_flag);
+int sblib_events(int wait_flag, int *w, int *h);
 
 /**
  * @ingroup modlib
@@ -130,7 +130,6 @@ int sblib_func_exec(int index, int param_count, slib_par_t *params, var_t *retva
  *
  * overrides for osd_xx functions
  */
-int  sblib_events(int);
 int  sblib_getpen(int code);
 int  sblib_getx();
 int  sblib_gety();
diff --git a/src/include/var.h b/src/include/var.h
index f5a2eadd..11819e4f 100644
--- a/src/include/var.h
+++ b/src/include/var.h
@@ -47,7 +47,7 @@ extern "C" {
 #endif
 
 struct var_s;
-typedef void (*method) (struct var_s *self);
+typedef void (*method) (struct var_s *self, struct var_s *retval);
 
 typedef struct var_s {
   union {
diff --git a/src/lib/jsmn b/src/lib/jsmn
index 7b6858a5..053d3cd2 160000
--- a/src/lib/jsmn
+++ b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit 7b6858a5855299d173c5ab2b46e611bf9961cbef
+Subproject commit 053d3cd29200edb1bfd181d917d140c16c1f8834
diff --git a/src/lib/lodepng b/src/lib/lodepng
index e34ac045..34628e89 160000
--- a/src/lib/lodepng
+++ b/src/lib/lodepng
@@ -1 +1 @@
-Subproject commit e34ac04553e51a6982ae234d98ce6b76dd57a6a1
+Subproject commit 34628e89e80cd007179b25b0b2695e6af0f57fac
diff --git a/src/lib/miniaudio b/src/lib/miniaudio
index df2903a0..b80f7f94 160000
--- a/src/lib/miniaudio
+++ b/src/lib/miniaudio
@@ -1 +1 @@
-Subproject commit df2903a0bcaf0126f9ad43d2b1238891b55bc2f6
+Subproject commit b80f7f949152f93a0af499b4d6d07b8e60d0e673
diff --git a/src/lib/stb b/src/lib/stb
index f54acd4e..b42009b3 160000
--- a/src/lib/stb
+++ b/src/lib/stb
@@ -1 +1 @@
-Subproject commit f54acd4e13430c5122cab4ca657705c84aa61b08
+Subproject commit b42009b3b9d4ca35bc703f5310eedc74f584be58
diff --git a/src/platform/android/app/build.gradle b/src/platform/android/app/build.gradle
index 4f2cb966..7918d71a 100644
--- a/src/platform/android/app/build.gradle
+++ b/src/platform/android/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 
 android {
   // app can use the API features included in this API level and lower.
-  compileSdkVersion 28
+  compileSdkVersion 29
 
   // can override some attributes in main/AndroidManifest.xml
   defaultConfig {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 28
-    versionCode 39
-    versionName "0.12.17"
+    versionCode 40
+    versionName "12.19"
     resConfigs "en"
   }
 
diff --git a/src/platform/android/app/src/main/assets/main.bas b/src/platform/android/app/src/main/assets/main.bas
index 42256323..4ef23fe2 100644
--- a/src/platform/android/app/src/main/assets/main.bas
+++ b/src/platform/android/app/src/main/assets/main.bas
@@ -1,19 +1,23 @@
-const app = "main.bas?"
-const boldOn = chr(27) + "[1m"
-const boldOff = chr(27) + "[21m"
-const scrollHome = chr(27) + "m"
+const boldOn = "\033[1m"
+const boldOff = "\033[21m"
+const scrollHome = "\033m"
 const char_h = txth("Q")
 const char_w = txtw(".")
 const lineSpacing = 2 + char_h
-const idxEdit = 6
-const idxFiles = 7
-const colGrey = rgb(100, 100, 100)
-const colBkGnd = rgb(31, 28, 31)
-const colText = 2
-const colLink = 3
+const wnd = window()
+const theme = wnd.theme
+const colBkGnd = theme.background
+const colText  = theme.text5
+const colFile  = theme.text2
+const colDir   = theme.text3
+const colText2 = theme.text4
+const colNav   = theme.text1
+const colNav2  = theme.text6
 const menu_gap = -(char_w / 2)
 const is_sdl = instr(sbver, "SDL") != 0
 const onlineUrl = "http://smallbasic.github.io/samples/index.bas"
+const idxEdit = 6
+const idxFiles = 7
 const saveasId = "__bn_saveas__"
 const renameId = "__bn_rename__"
 const deleteId = "__bn_delete__"
@@ -37,7 +41,7 @@ func mk_bn(value, lab, fg)
   bn.value = value
   bn.label = lab
   bn.color = fg
-  mk_bn = bn
+  return bn
 end
 
 func mk_menu(value, lab, x)
@@ -46,9 +50,9 @@ func mk_menu(value, lab, x)
   bn.y = ypos * char_h
   bn.value = value
   bn.label = "[" + lab + "]"
-  bn.color = colLink
+  bn.color = colNav
   bn.type = "link"
-  mk_menu = bn
+  return bn
 end
 
 func mk_scratch()
@@ -72,7 +76,6 @@ func mk_scratch()
       tsave scratch_file, text
       result = true
     catch e
-      local wnd = window()
       logprint e
       wnd.alert("Failed to create: " + scratch_file)
     end try
@@ -87,7 +90,7 @@ sub do_okay_button(bn_extra)
   button.label = "[Close]"
   button.x = (xmax - txtw(button.label)) / 2
   button.y = ypos * char_h
-  button.color = colLink
+  button.color = colNav
   button.type = "link"
   if (ismap(bn_extra)) then
     frm.inputs << bn_extra
@@ -117,7 +120,7 @@ sub do_about()
     print "__)| | |(_||||_)/--\__)|\_"
   endif
   print
-  color 7
+  color colText
   print "Version "; sbver
   print
   print "Copyright (c) 2002-2020 Chris Warren-Smith"
@@ -133,17 +136,17 @@ sub do_about()
   else
     bn_home.label = "https://smallbasic.github.io/pages/android.html"
   endif
-  bn_home.color = colLink
+  bn_home.color = colNav
   print:print
 
-  color colGrey
+  color colText2
   print "SmallBASIC comes with ABSOLUTELY NO WARRANTY. ";
   print "This program is free software; you can use it ";
   print "redistribute it and/or modify it under the terms of the ";
   print "GNU General Public License version 2 as published by ";
   print "the Free Software Foundation." + chr(10)
   print
-  color 7
+  color colText
   server_info()
   do_okay_button(bn_home)
   clear_screen()
@@ -152,7 +155,7 @@ end
 sub do_setup()
   local frm
 
-  color 3, colBkGnd
+  color colText, colBkGnd
   cls
   print boldOn + "Setup web service port number."
   print boldOff
@@ -161,7 +164,7 @@ sub do_setup()
   print "this screen without making any changes."
   print "The current setting is: " + env("serverSocket")
   print
-  color 15, 3
+  color colText, colBkGnd
   input socket
 
   if (len(socket) > 0) then
@@ -174,7 +177,7 @@ sub do_setup()
     env("serverToken=" + token)
   endif
 
-  color 3, colBkGnd
+  color colText, colBkGnd
   cls
   print "Web service port number: " + env("serverSocket")
   print
@@ -196,7 +199,6 @@ sub do_setup()
   env("fontId=" + frm.inputs(0).selectedIndex)
 
   local msg = "You must restart SmallBASIC for this change to take effect."
-  local wnd = window()
   wnd.alert(msg, "Restart required")
   clear_screen()
 end
@@ -293,9 +295,9 @@ end
 
 sub listFiles(byref frm, path, sortDir, byref basList)
   local lastItem, bn, abbr, gap, n, lab, name, txtcol, i
-  local name_col = 3
-  local size_col = 3
-  local date_col = 3
+  local name_col = colNav
+  local size_col = colNav
+  local date_col = colNav
 
   if (right(path, 1) != "/") then
     path += "/"
@@ -307,28 +309,28 @@ sub listFiles(byref frm, path, sortDir, byref basList)
     sort basList use filecmpfunc0(x,y)
   case 1
     sort basList use filecmpfunc1(x,y)
-    name_col = 6
+    name_col = colNav2
   case 2
     sort basList use filecmpfunc2(x,y)
-    size_col = 5
+    size_col = colNav2
   case 3
     sort basList use filecmpfunc3(x,y)
-    size_col = 6
+    size_col = colNav2
   case 4
     sort basList use filecmpfunc4(x,y)
-    date_col = 5
+    date_col = colNav2
   case 5
     sort basList use filecmpfunc5(x,y)
-    date_col = 6
+    date_col = colNav2
   end select
 
-  bn = mk_bn(0, "Files in " + path, 7)
+  bn = mk_bn(0, "Files in " + path, colText)
   bn.type = "label"
   bn.x = 0
   bn.y = -lineSpacing
   frm.inputs << bn
 
-  bn = mk_bn(backId, "[Go up]", 3)
+  bn = mk_bn(backId, "[Go up]", colNav)
   bn.type = "link"
   bn.x = 0
   bn.y = -linespacing
@@ -358,7 +360,7 @@ sub listFiles(byref frm, path, sortDir, byref basList)
   lastItem = len(basList) - 1
   for i = 0 to lastItem
     node = basList(i)
-    txtcol = iff(node.dir, 3, 2)
+    txtcol = iff(node.dir, colDir, colFile)
     name = node.name
     if (abbr) then
       bn = mk_bn(path + name, name, txtcol)
@@ -377,7 +379,7 @@ sub listFiles(byref frm, path, sortDir, byref basList)
 
       gap = 12 - len(str(node.size))
       n = iff(gap > 1, gap, 1)
-      bn = mk_bn(0, node.size + space(n) + timestamp(node.mtime), colGrey)
+      bn = mk_bn(0, node.size + space(n) + timestamp(node.mtime), colText)
       bn.type = "label"
       bn.y = -1
       gap = 29 - len(name)
@@ -388,7 +390,7 @@ sub listFiles(byref frm, path, sortDir, byref basList)
 end
 
 sub manageFiles()
-  local f, wnd, bn_edit, bn_files, selectedFile
+  local f, bn_edit, bn_files, selectedFile
 
   func fileCmpFunc(l, r)
     local f1 = lower(l)
@@ -425,7 +427,7 @@ sub manageFiles()
     bn_edit.y = char_h + 4
     bn_edit.width = xmax
     bn_edit.type = "text"
-    bn_edit.color = "white"
+    bn_edit.color = colText2
     bn_edit.resizable = TRUE
     bn_edit.help = "Enter file name, and then click New."
     bn_files.x = x1
@@ -518,7 +520,7 @@ sub manageFiles()
     else
       tload selectedFile, buffer
       wnd.graphicsScreen2()
-      color 7
+      color colText
       cls
       len_buffer = len(buffer) - 1
       for i = 0 to len_buffer
@@ -569,7 +571,6 @@ sub manageFiles()
 
   createUI()
   reloadList(0)
-  wnd = window()
   wnd.showKeypad()
 
   while 1
@@ -606,7 +607,6 @@ func changeDir(s)
     chdir s
     return true
   catch e
-    local wnd = window()
     wnd.alert(e)
     return false
   end try
@@ -695,17 +695,17 @@ sub main
     elif (frm.value == sortNameId) then
       cls
       sortDir = iff(sortDir==0,1,0)
-      env("sortDir="+sortDir)
+      env("sortDir=" + sortDir)
       frm = makeUI(path, sortDir)
     elif (frm.value == sortSizeId) then
       cls
       sortDir = iff(sortDir==3,2,3)
-      env("sortDir="+sortDir)
+      env("sortDir=" + sortDir)
       frm = makeUI(path, sortDir)
     elif (frm.value == sortDateId) then
       cls
       sortDir = iff(sortDir==5,4,5)
-      env("sortDir="+sortDir)
+      env("sortDir=" + sortDir)
       frm = makeUI(path, sortDir)
     fi
   wend
diff --git a/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java b/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java
index 95e93a85..fa2f7b7b 100644
--- a/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java
+++ b/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/MainActivity.java
@@ -21,9 +21,11 @@
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
+import android.provider.Settings;
 import android.util.Base64;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -82,7 +84,7 @@
 /**
  * Extends NativeActivity to provide interface methods for runtime.cpp
  *
- * @author chrisws
+ * @author Chris Warren-Smith
  */
 public class MainActivity extends NativeActivity {
   private static final String TAG = "smallbasic";
@@ -342,6 +344,12 @@ public boolean getUntrusted() {
     return this._untrusted;
   }
 
+  public int getWindowHeight() {
+    Rect rect = new Rect();
+    findViewById(android.R.id.content).getWindowVisibleDisplayFrame(rect);
+    return rect.height();
+  }
+
   @Override
   public void onGlobalLayout() {
     super.onGlobalLayout();
@@ -586,11 +594,17 @@ public void onClick(DialogInterface dialog, int which) {}
   public void showKeypad(final boolean show) {
     Log.i(TAG, "showKeypad: " + show);
     final View view = getWindow().getDecorView();
+    final Activity activity = this;
     runOnUiThread(new Runnable() {
       public void run() {
         InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
         if (imm != null) {
           if (show) {
+            String id = Settings.Secure.getString(activity.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
+            if ("com.sec.android.inputmethod/.SamsungKeypad".equals(id)) {
+              String message = getResources().getString(R.string.samsung_keyboard);
+              Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
+            }
             imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
           } else {
             imm.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
@@ -771,6 +785,10 @@ private String getExternalStorage() {
       } else {
         result = path;
       }
+    } else if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+      // https://commonsware.com/blog/2019/06/07/death-external-storage-end-saga.html
+      File[] dirs = getExternalMediaDirs();
+      result = dirs[0].getAbsolutePath();
     } else {
       result = getInternalStorage();
     }
diff --git a/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/TextToSpeechAdapter.java b/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/TextToSpeechAdapter.java
index 0278028d..1ff45944 100644
--- a/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/TextToSpeechAdapter.java
+++ b/src/platform/android/app/src/main/java/net/sourceforge/smallbasic/TextToSpeechAdapter.java
@@ -1,12 +1,12 @@
 package net.sourceforge.smallbasic;
 
-import java.util.Locale;
-
 import android.content.Context;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.TextToSpeech.OnInitListener;
 import android.util.Log;
 
+import java.util.Locale;
+
 class TextToSpeechAdapter implements OnInitListener {
   private static final String TAG = "smallbasic";
   private final TextToSpeech _tts;
diff --git a/src/platform/android/app/src/main/res/values/strings.xml b/src/platform/android/app/src/main/res/values/strings.xml
index e31bb091..bb11245f 100644
--- a/src/platform/android/app/src/main/res/values/strings.xml
+++ b/src/platform/android/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">SmallBASIC</string>
+  <string name="samsung_keyboard">Samsung keyboard not supported. Please use an alternative keyboard.</string>
   <style name="SBTheme" parent="android:Theme.Holo.Light">
     <item name="android:windowActionBar">false</item>
     <item name="android:windowNoTitle">true</item>
diff --git a/src/platform/android/build.gradle b/src/platform/android/build.gradle
index ae627614..b25df99f 100644
--- a/src/platform/android/build.gradle
+++ b/src/platform/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.5.3'
+    classpath 'com.android.tools.build:gradle:4.0.1'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }
diff --git a/src/platform/android/jni/Android.mk b/src/platform/android/jni/Android.mk
index 31cbe948..da280376 100644
--- a/src/platform/android/jni/Android.mk
+++ b/src/platform/android/jni/Android.mk
@@ -7,7 +7,7 @@
 
 JNI_PATH := $(call my-dir)
 SB_HOME := $(JNI_PATH)/../../../..
-FREETYPE_HOME := $(HOME)/android-sdk/freetype-2.7.1
+FREETYPE_HOME := $(HOME)/android-sdk/freetype-2.10.2
 
 include $(call all-subdir-makefiles)
 LOCAL_PATH := $(JNI_PATH)
diff --git a/src/platform/android/jni/freetype/Android.mk b/src/platform/android/jni/freetype/Android.mk
index 104f63a8..db9ea73a 100644
--- a/src/platform/android/jni/freetype/Android.mk
+++ b/src/platform/android/jni/freetype/Android.mk
@@ -27,6 +27,7 @@ LOCAL_SRC_FILES:=                               \
   $(FREETYPE_HOME)/src/pcf/pcf.c                \
   $(FREETYPE_HOME)/src/psaux/psaux.c            \
   $(FREETYPE_HOME)/src/bdf/bdf.c                \
+  $(FREETYPE_HOME)/src/base/ftdebug.c           \
   $(FREETYPE_HOME)/src/base/ftbbox.c            \
   $(FREETYPE_HOME)/src/base/ftbitmap.c          \
   $(FREETYPE_HOME)/src/base/ftglyph.c           \
diff --git a/src/platform/android/jni/runtime.cpp b/src/platform/android/jni/runtime.cpp
index b49ce1dc..c9d41798 100644
--- a/src/platform/android/jni/runtime.cpp
+++ b/src/platform/android/jni/runtime.cpp
@@ -15,6 +15,7 @@
 #include "platform/android/jni/runtime.h"
 #include "lib/maapi.h"
 #include "ui/utils.h"
+#include "ui/theme.h"
 #include "languages/messages.en.h"
 #include "include/osd.h"
 #include "common/sbapp.h"
@@ -33,6 +34,7 @@
 #define SERVER_SOCKET_KEY "serverSocket"
 #define SERVER_TOKEN_KEY "serverToken"
 #define MUTE_AUDIO_KEY "muteAudio"
+#define THEME_KEY "theme"
 #define OPT_IDE_KEY "optIde"
 #define GBOARD_KEY_QUESTION 274
 #define EVENT_TYPE_EXIT 100
@@ -504,6 +506,12 @@ void Runtime::loadConfig() {
   int fontSize = getInteger("getStartupFontSize");
   trace("fontSize = %d", fontSize);
 
+  int height = getInteger("getWindowHeight");
+  if (height !=  _graphics->getHeight()) {
+    // height adjustment for bottom virtual navigation bar
+    onResize(_graphics->getWidth(), height);
+  }
+
   _output->setTextColor(DEFAULT_FOREGROUND, DEFAULT_BACKGROUND);
   _output->setFontSize(fontSize);
   _initialFontSize = _output->getFontSize();
@@ -539,6 +547,13 @@ void Runtime::loadConfig() {
     if (s) {
       opt_ide = s->toInteger();
     }
+    s = settings.get(THEME_KEY);
+    if (s) {
+      int id = s->toInteger();
+      if (id > -1 && id < NUM_THEMES) {
+        g_themeId = id;
+      }
+    }
     loadEnvConfig(settings, SERVER_SOCKET_KEY);
     loadEnvConfig(settings, SERVER_TOKEN_KEY);
     loadEnvConfig(settings, FONT_ID_KEY);
@@ -590,6 +605,7 @@ void Runtime::saveConfig() {
     fprintf(fp, "%s=%d\n", FONT_SCALE_KEY, _fontScale);
     fprintf(fp, "%s=%d\n", MUTE_AUDIO_KEY, opt_mute_audio);
     fprintf(fp, "%s=%d\n", OPT_IDE_KEY, opt_ide);
+    fprintf(fp, "%s=%d\n", THEME_KEY, g_themeId);
     for (int i = 0; environ[i] != nullptr; i++) {
       char *env = environ[i];
       if (strstr(env, SERVER_SOCKET_KEY) != nullptr ||
diff --git a/src/platform/android/jni/runtime.h b/src/platform/android/jni/runtime.h
index e9bb23ac..45d84a10 100644
--- a/src/platform/android/jni/runtime.h
+++ b/src/platform/android/jni/runtime.h
@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2016 Chris Warren-Smith.
+// Copyright(C) 2001-2020 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -61,6 +61,8 @@ struct Runtime : public System {
   void runShell();
   char *loadResource(const char *fileName);
   void optionsBox(StringList *items);
+  void restoreWindowRect() {}
+  void saveWindowRect() {}
   void setWindowSize(int width, int height) {};
   void setWindowTitle(const char *title) {}
   void share(const char *path) { setString("share", path); }
diff --git a/src/platform/console/Makefile.am b/src/platform/console/Makefile.am
index 0e26bd8a..ccdd8daa 100644
--- a/src/platform/console/Makefile.am
+++ b/src/platform/console/Makefile.am
@@ -11,10 +11,10 @@ bin_PROGRAMS = sbasic
 
 sbasic_SOURCES =    \
   ../../lib/lodepng/lodepng.cpp ../../lib/lodepng/lodepng.h \
-  ../console/main.cpp	\
-  ../console/device.cpp \
-  ../console/image.cpp \
-  ../console/decomp.c
+  main.cpp	\
+  device.cpp \
+  image.cpp \
+  decomp.c
 
 sbasic_LDADD = -L$(top_srcdir)/src/common -lsb_common @PACKAGE_LIBS@
 
@@ -27,8 +27,8 @@ sbasic_DEPENDENCIES = $(top_srcdir)/src/common/libsb_common.a
 TEST_DIR=../../../samples/distro-examples/tests
 UNIT_TESTS=array break byref eval-test iifs matrices metaa ongoto \
 	         uds hash pass1 call_tau short-circuit strings stack-test \
-           replace-test read-data proc optchk letbug ptr ref \
-           trycatch chain stream-files split-join sprint all scope goto
+           replace-test read-data proc optchk letbug ptr ref input \
+           trycatch chain stream-files split-join sprint all scope goto keymap
 
 test: ${bin_PROGRAMS}
 	@for utest in $(UNIT_TESTS); do                             \
diff --git a/src/platform/console/device.cpp b/src/platform/console/device.cpp
index 1d6698b5..cca2d7c8 100644
--- a/src/platform/console/device.cpp
+++ b/src/platform/console/device.cpp
@@ -21,7 +21,7 @@ typedef int  (*getx_fn)();
 typedef int  (*gety_fn)();
 typedef void (*setxy_fn)(int x, int y);
 typedef void (*write_fn)(const char *str);
-typedef int  (*events_fn)(int);
+typedef int  (*events_fn)(int, int*, int*);
 typedef void (*setcolor_fn)(long color);
 typedef void (*line_fn)(int x1, int y1, int x2, int y2);
 typedef void (*ellipse_fn)(int xc, int yc, int xr, int yr, int fill);
@@ -117,19 +117,14 @@ int osd_devinit() {
   init_fn devinit = (init_fn)slib_get_func("sblib_devinit");
   if (devinit) {
     devinit(prog_file, opt_pref_width, opt_pref_height);
-    os_graf_mx = opt_pref_width;
-    os_graf_my = opt_pref_height;
-  } else {
-    os_graf_mx = 80;
-    os_graf_my = 25;
   }
+  os_graf_mx = opt_pref_width;
+  os_graf_my = opt_pref_height;
 
   if (p_write == NULL) {
     p_write = default_write;
   }
 
-  os_color_depth = 1;
-  osd_cls();
   return 1;
 }
 
@@ -209,7 +204,17 @@ void osd_write(const char *str) {
 int osd_events(int wait_flag) {
   int result = 0;
   if (p_events) {
-    result = p_events(wait_flag);
+    int x = os_graf_mx;
+    int y = os_graf_my;
+    result = p_events(wait_flag, &x, &y);
+    if (x != os_graf_mx || y != os_graf_my) {
+      os_graf_mx = x;
+      os_graf_my = y;
+      dev_viewport(0, 0, 0, 0);
+      dev_window(0, 0, 0, 0);
+      setsysvar_int(SYSVAR_XMAX, os_graf_mx);
+      setsysvar_int(SYSVAR_YMAX, os_graf_my);
+    }
   }
   return result;
 }
diff --git a/src/platform/console/image.cpp b/src/platform/console/image.cpp
index aac513ab..2ac5abfb 100644
--- a/src/platform/console/image.cpp
+++ b/src/platform/console/image.cpp
@@ -253,7 +253,7 @@ ImageBuffer *load_xpm_image(char **data) {
 //
 // png.clip(10, 10, 10, 10)
 //
-void cmd_image_clip(var_s *self) {
+void cmd_image_clip(var_s *self, var_s *) {
   var_int_t left, top, right, bottom;
   ImageBuffer *image = load_image(self);
   if (par_massget("iiii", &left, &top, &right, &bottom) == 4) {
@@ -298,7 +298,7 @@ void cmd_image_clip(var_s *self) {
 // end
 // png.filter(use colorToAlpha(x))
 //
-void cmd_image_filter(var_s *self) {
+void cmd_image_filter(var_s *self, var_s *) {
   ImageBuffer *image_buffer = load_image(self);
   if (code_peek() == kwUSE && image_buffer != NULL) {
     code_skipnext();
@@ -340,7 +340,7 @@ void cmd_image_filter(var_s *self) {
 // png2 = image(w, h)
 // png2.paste(png1, 0, 0)
 //
-void cmd_image_paste(var_s *self) {
+void cmd_image_paste(var_s *self, var_s *) {
   var_int_t x, y;
   var_t *var;
   ImageBuffer *image = load_image(self);
@@ -384,7 +384,7 @@ void cmd_image_paste(var_s *self) {
 // png.save("horse1.png")
 // png.save(#1)
 //
-void cmd_image_save(var_s *self) {
+void cmd_image_save(var_s *self, var_s *) {
   ImageBuffer *image = load_image(self);
   dev_file_t *filep = NULL;
   byte code = code_peek();
diff --git a/src/platform/console/main.cpp b/src/platform/console/main.cpp
index b58b567b..e3b3d276 100644
--- a/src/platform/console/main.cpp
+++ b/src/platform/console/main.cpp
@@ -340,7 +340,6 @@ int main(int argc, char *argv[]) {
   opt_autolocal = 0;
   opt_command[0] = '\0';
   opt_file_permitted = 1;
-  opt_graphics = 0;
   opt_ide = 0;
   opt_loadmod = 0;
   opt_modpath[0] = 0;
@@ -349,6 +348,9 @@ int main(int argc, char *argv[]) {
   opt_pref_width = 0;
   opt_quiet = 1;
   opt_verbose = 0;
+  opt_graphics = 1;
+  os_graphics = 1;
+  os_color_depth = 16;
 
   console_init();
 
diff --git a/src/platform/fltk/EditorWidget.cxx b/src/platform/fltk/EditorWidget.cxx
index ad0e0899..95d593a9 100644
--- a/src/platform/fltk/EditorWidget.cxx
+++ b/src/platform/fltk/EditorWidget.cxx
@@ -815,11 +815,7 @@ void EditorWidget::getInput(char *result, int size) {
   if (wnd->isBreakExec()) {
     brun_break();
   } else {
-    const char *value = _commandText->value();
-    int valueLen = strlen(value);
-    int len = (valueLen < size) ? valueLen : size;
-    strncpy(result, value, len);
-    result[len] = 0;
+    strlcpy(result, _commandText->value(), size);
   }
   setCommand(cmd_find);
 }
diff --git a/src/platform/fltk/EditorWidget.h b/src/platform/fltk/EditorWidget.h
index 156a82ae..ff34d36b 100644
--- a/src/platform/fltk/EditorWidget.h
+++ b/src/platform/fltk/EditorWidget.h
@@ -56,7 +56,8 @@ enum StyleField {
   st_numbers,
   st_operators,
   st_selection,
-  st_background
+  st_background,
+  st_lineNumbers
 };
 
 enum CommandOpt {
diff --git a/src/platform/fltk/MainWindow.cxx b/src/platform/fltk/MainWindow.cxx
index 8e2f4fc5..7c84fb8a 100644
--- a/src/platform/fltk/MainWindow.cxx
+++ b/src/platform/fltk/MainWindow.cxx
@@ -544,18 +544,19 @@ void MainWindow::editor_plugin(Fl_Widget *w, void *eventData) {
   if (editWidget) {
     Fl_Text_Editor *editor = editWidget->getEditor();
     char filename[PATH_MAX];
-    char path[PATH_MAX];
-    strcpy(filename, editWidget->getFilename());
+    strlcpy(filename, editWidget->getFilename(), PATH_MAX);
 
     if (runMode == edit_state) {
       if (editWidget->checkSave(false) && filename[0]) {
+        char path[PATH_MAX];
         int pos = editor->insert_position();
         int row, col, s1r, s1c, s2r, s2c;
         editWidget->getRowCol(&row, &col);
         editWidget->getSelStartRowCol(&s1r, &s1c);
         editWidget->getSelEndRowCol(&s2r, &s2c);
-        snprintf(opt_command, sizeof(opt_command), "%s|%d|%d|%d|%d|%d|%d",
-                 filename, row - 1, col, s1r - 1, s1c, s2r - 1, s2c);
+        strlcpy(opt_command, filename, PATH_MAX);
+        snprintf(path, sizeof(path), "|%d|%d|%d|%d|%d|%d", row - 1, col, s1r - 1, s1c, s2r - 1, s2c);
+        strlcat(opt_command, path, PATH_MAX);
         runMode = run_state;
         editWidget->runState(rs_run);
         snprintf(path, sizeof(path), "%s/%s", packageHome, (const char *)eventData);
@@ -626,17 +627,6 @@ void MainWindow::load_file(Fl_Widget *w, void *eventData) {
 
 //--Startup functions-----------------------------------------------------------
 
-/**
- *Adds a plug-in to the menu
- */
-void MainWindow::addPlugin(Fl_Menu_Bar *menu, const char *label, const char *filename) {
-  char path[PATH_MAX];
-  snprintf(path, PATH_MAX, "%s/%s", pluginHome, filename);
-  if (access(path, R_OK) == 0) {
-    menu->add(label, 0, editor_plugin_cb, strdup(path));
-  }
-}
-
 /**
  * scan for recent files
  */
@@ -952,7 +942,6 @@ MainWindow::MainWindow(int w, int h) :
   m->add("&File/_Close Others", 0, close_other_tabs_cb);
   m->add("&File/&Save File", FL_CTRL + 's', EditorWidget::save_file_cb);
   m->add("&File/_Save File &As", FL_CTRL + FL_SHIFT + 'S', save_file_as_cb);
-  addPlugin(m, "&File/Publish Online", "publish.bas");
   m->add("&File/_Export", FL_CTRL + FL_F+9, export_file_cb);
   m->add("&File/E&xit", FL_CTRL + 'q', quit_cb);
   m->add("&Edit/_&Undo", FL_CTRL + 'z', EditorWidget::undo_cb);
@@ -974,6 +963,7 @@ MainWindow::MainWindow(int w, int h) :
   m->add("&View/Theme/&Shian", 0, set_theme_cb, (void *)(intptr_t)2);
   m->add("&View/Theme/&Atom 1", 0, set_theme_cb, (void *)(intptr_t)3);
   m->add("&View/Theme/&Atom 2", 0, set_theme_cb, (void *)(intptr_t)4);
+  m->add("&View/Theme/&R157", 0, set_theme_cb, (void *)(intptr_t)5);
   m->add("&View/Text Color/_Background", 0, EditorWidget::set_color_cb, (void *)st_background);
   m->add("&View/Text Color/Text", 0, EditorWidget::set_color_cb, (void *)st_text);
   m->add("&View/Text Color/Comments", 0, EditorWidget::set_color_cb, (void *)st_comments);
@@ -983,7 +973,8 @@ MainWindow::MainWindow(int w, int h) :
   m->add("&View/Text Color/_Subs", 0, EditorWidget::set_color_cb, (void *)st_subs);
   m->add("&View/Text Color/Numbers", 0, EditorWidget::set_color_cb, (void *)st_numbers);
   m->add("&View/Text Color/Operators", 0, EditorWidget::set_color_cb, (void *)st_operators);
-  m->add("&View/Text Color/Find Matches", 0, EditorWidget::set_color_cb, (void *)st_findMatches);
+  m->add("&View/Text Color/_Find Matches", 0, EditorWidget::set_color_cb, (void *)st_findMatches);
+  m->add("&View/Text Color/Line Numbers", 0, EditorWidget::set_color_cb, (void *)st_lineNumbers);
   m->add("&View/Text Size/&Increase", FL_CTRL + ']', font_size_incr_cb);
   m->add("&View/Text Size/&Decrease", FL_CTRL + '[', font_size_decr_cb);
 
diff --git a/src/platform/fltk/MainWindow.h b/src/platform/fltk/MainWindow.h
index b6d55798..b965da8b 100644
--- a/src/platform/fltk/MainWindow.h
+++ b/src/platform/fltk/MainWindow.h
@@ -72,7 +72,6 @@ struct MainWindow : public BaseWindow {
   bool isIdeHidden();           // whether to run without the IDE displayed
   bool isInteractive();         // whether to run without an interface
   bool isModal();               // whether a modal gui loop is active
-  void addPlugin(Fl_Menu_Bar *menu, const char *label, const char *filename);
   void busyMessage();
   int  handle(int e);
   void loadHelp(const char *path);
diff --git a/src/platform/fltk/Profile.cxx b/src/platform/fltk/Profile.cxx
index 238a6452..6c584970 100644
--- a/src/platform/fltk/Profile.cxx
+++ b/src/platform/fltk/Profile.cxx
@@ -29,6 +29,8 @@ const char *helpThemeIdKey = "helpThemeId";
 // in BasicEditor.cxx
 extern Fl_Text_Display::Style_Table_Entry styletable[];
 
+static StyleField lastStyle = st_lineNumbers;
+
 //
 // Profile constructor
 //
@@ -74,6 +76,7 @@ void Profile::loadEditTheme(int themeId) {
   styletable[9].color = get_color(_theme._syntax_command); // J - operators
   styletable[10].color = get_color(_theme._selection_background); // K Selection Background
   styletable[11].color = get_color(_theme._background); // L Background
+  styletable[12].color = get_color(_theme._number_color); // M Line numbers
 }
 
 //
@@ -186,6 +189,7 @@ void Profile::updateTheme() {
   _theme._syntax_command = styletable[9].color >> 8;
   _theme._selection_background = styletable[10].color >> 8;
   _theme._background = styletable[11].color >> 8;
+  _theme._number_color = styletable[12].color >> 8;
 }
 
 //
@@ -236,7 +240,7 @@ void Profile::restoreStyles(Properties<String *> *profile) {
     _font = get_font(fontName->c_str());
   }
 
-  for (int i = 0; i <= st_background; i++) {
+  for (int i = 0; i <= lastStyle; i++) {
     char buffer[4];
     sprintf(buffer, "%02d", i);
     String *color = profile->get(buffer);
@@ -244,12 +248,10 @@ void Profile::restoreStyles(Properties<String *> *profile) {
       Fl_Color c = get_color(color->c_str(), NO_COLOR);
       if (c != (Fl_Color)NO_COLOR) {
         styletable[i].color = c;
-        if (i == st_background) {
-          _theme._background = c >> 8;
-        }
       }
     }
   }
+  updateTheme();
 }
 
 //
@@ -347,7 +349,7 @@ void Profile::saveStyles(FILE *fp) {
   saveValue(fp, fontSizeKey, (int)styletable[0].size);
   saveValue(fp, fontNameKey, styletable[0].font);
 
-  for (int i = 0; i <= st_background; i++) {
+  for (int i = 0; i <= lastStyle; i++) {
     Fl::get_color(styletable[i].color, r, g, b);
     fprintf(fp, "%02d=#%02x%02x%02x\n", i, r, g, b);
   }
diff --git a/src/platform/fltk/runtime.h b/src/platform/fltk/runtime.h
index 7803dea1..657a094a 100755
--- a/src/platform/fltk/runtime.h
+++ b/src/platform/fltk/runtime.h
@@ -25,6 +25,8 @@ struct Runtime : public System {
   void enableCursor(bool enabled);
   int handle(int event);
   void optionsBox(StringList *items);
+  void restoreWindowRect() {}
+  void saveWindowRect() {}
   MAEvent processEvents(int waitFlag);
   bool run(const char *bas) { return execute(bas); }
   void runSamples();
diff --git a/src/platform/sdl/runtime.cpp b/src/platform/sdl/runtime.cpp
index fc882e6e..d8b87f1e 100644
--- a/src/platform/sdl/runtime.cpp
+++ b/src/platform/sdl/runtime.cpp
@@ -298,7 +298,6 @@ int Runtime::runShell(const char *startupBas, bool runWait, int fontScale, int d
     _output->setFontSize(fontSize);
   }
 
-
   audio_open();
   net_init();
 
@@ -805,6 +804,16 @@ char *Runtime::getClipboardText() {
   return result;
 }
 
+void Runtime::restoreWindowRect() {
+  SDL_SetWindowPosition(_window, _saveRect.x, _saveRect.y);
+  SDL_SetWindowSize(_window, _saveRect.w, _saveRect.h);
+  setWindowSize(_saveRect.w, _saveRect.h);
+}
+
+void Runtime::saveWindowRect() {
+  setWindowRect(_saveRect);
+}
+
 //
 // System platform methods
 //
diff --git a/src/platform/sdl/runtime.h b/src/platform/sdl/runtime.h
index 30bdd1b8..d62f0b87 100644
--- a/src/platform/sdl/runtime.h
+++ b/src/platform/sdl/runtime.h
@@ -45,6 +45,8 @@ struct Runtime : public System {
   MAEvent processEvents(int waitFlag);
   void processEvent(MAEvent &event);
   void pushEvent(MAEvent *event);
+  void restoreWindowRect();
+  void saveWindowRect();
   void setWindowSize(int width, int height);
   void setWindowTitle(const char *title);
   void share(const char *path) {}
@@ -63,6 +65,7 @@ struct Runtime : public System {
   int _menuX, _menuY;
   bool _fullscreen;
   SDL_Rect _windowRect;
+  SDL_Rect _saveRect;
   Graphics *_graphics;
   Stack<MAEvent *> *_eventQueue;
   SDL_Window *_window;
diff --git a/src/platform/sdl/syswm.cpp b/src/platform/sdl/syswm.cpp
index 30189bc6..d9064254 100644
--- a/src/platform/sdl/syswm.cpp
+++ b/src/platform/sdl/syswm.cpp
@@ -80,9 +80,24 @@ void browseFile(SDL_Window *window, const char *url) {
 #else
 #include <unistd.h>
 #include <errno.h>
+#include "icon.h"
+#include "lib/lodepng/lodepng.h"
 
 void loadIcon(SDL_Window *window) {
-  // handled via smallbasic.desktop
+  unsigned w, h;
+  unsigned char *image;
+  if (!lodepng_decode32(&image, &w, &h, sb_desktop_128x128_png, sb_desktop_128x128_png_len)) {
+    SDL_Surface *surf =
+      SDL_CreateRGBSurfaceFrom(image, w, h,
+                               32, w * 4,
+                               0x000000ff,
+                               0x0000ff00,
+                               0x00ff0000,
+                               0xff000000);
+    SDL_SetWindowIcon(window, surf);
+    SDL_FreeSurface(surf);
+    free(image);
+  }
 }
 
 int getStartupFontSize(SDL_Window *window) {
diff --git a/src/ui/audio.cpp b/src/ui/audio.cpp
index a21f1b38..efe38b58 100644
--- a/src/ui/audio.cpp
+++ b/src/ui/audio.cpp
@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2020 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -32,7 +32,7 @@ struct Sound;
 static ma_device device;
 static ma_device_config config;
 static strlib::Queue<Sound *> queue;
-static strlib::Properties<Sound *> cache;
+static int queuePos = 0;
 
 struct Sound {
   Sound(int frequency, int millis, int volume);
@@ -41,7 +41,7 @@ struct Sound {
 
   ma_result construct(const char *path);
 
-  ma_sine_wave *_tone;
+  ma_waveform *_tone;
   ma_decoder *_decoder;
   uint32_t _start;
   uint32_t _duration;
@@ -59,8 +59,11 @@ Sound::Sound(int frequency, int millis, int volume) :
   _decoder(nullptr),
   _start(0),
   _duration(millis) {
-  _tone = (ma_sine_wave *)malloc(sizeof(ma_sine_wave));
-  ma_sine_wave_init(volume / 100.0, frequency, DEFAULT_SAMPLE_RATE, _tone);
+  _tone = (ma_waveform *)malloc(sizeof(ma_waveform));
+  ma_waveform_config config =
+    ma_waveform_config_init(DEFAULT_FORMAT, DEFAULT_CHANNELS, DEFAULT_SAMPLE_RATE,
+                            ma_waveform_type_sine, volume / 100.0, frequency);
+  ma_waveform_init(&config, _tone);
 }
 
 Sound::~Sound() {
@@ -82,20 +85,25 @@ static void data_callback(ma_device *device, void *output, const void *input, ma
   if (queue.empty()) {
     usleep(MILLIS_TO_MICROS(10));
   } else {
-    Sound *sound = queue.front();
+    queuePos = (queuePos + 1) % queue.size();
+    Sound *sound = queue[queuePos];
     if (sound->_decoder != nullptr) {
       // play audio track
-      ma_decoder_read_pcm_frames(sound->_decoder, output, frameCount);
+      ma_uint64 framesRead = ma_decoder_read_pcm_frames(sound->_decoder, output, frameCount);
+      if (framesRead == 0) {
+        // finished playing
+        queue.pop(false);
+      }
     } else if (sound->_start == 0) {
       // start new sound
       sound->_start = dev_get_millisecond_count();
-      ma_sine_wave_read_f32(sound->_tone, frameCount, (float*)output);
+      ma_waveform_read_pcm_frames(sound->_tone, (float *)output, frameCount);
     } else if (dev_get_millisecond_count() - sound->_start > sound->_duration) {
       // sound has timed out
-      queue.pop(sound->_decoder == nullptr);
+      queue.pop(false);
     } else {
       // continue sound
-      ma_sine_wave_read_f32(sound->_tone, frameCount, (float*)output);
+      ma_waveform_read_pcm_frames(sound->_tone, (float *)output, frameCount);
     }
   }
 }
@@ -122,8 +130,18 @@ static void setup_format(ma_format format, ma_uint32 channels, ma_uint32 sampleR
   }
 }
 
+static void device_start() {
+  if (ma_device__get_state(&device) != MA_STATE_STARTED) {
+    ma_result result = ma_device_start(&device);
+    if (result != MA_SUCCESS) {
+      err_throw("Failed to start audio [%d]", result);
+    }
+  }
+}
+
 bool audio_open() {
   setup_config(DEFAULT_FORMAT, DEFAULT_CHANNELS, DEFAULT_SAMPLE_RATE);
+  queuePos = 0;
   return (ma_device_init(nullptr, &config, &device) == MA_SUCCESS);
 }
 
@@ -133,32 +151,19 @@ void audio_close() {
 }
 
 void osd_audio(const char *path) {
-  Sound *sound = cache.get(path);
-  if (sound) {
+  Sound *sound = new Sound();
+  ma_result result = sound->construct(path);
+  if (result != MA_SUCCESS) {
+    delete sound;
+    err_throw("Failed to open sound file [%d]", result);
+  } else {
+    setup_format(sound->_decoder->outputFormat,
+                 sound->_decoder->outputChannels,
+                 sound->_decoder->outputSampleRate);
     ma_mutex_lock(&device.lock);
     queue.push(sound);
     ma_mutex_unlock(&device.lock);
-  } else {
-    sound = new Sound();
-    ma_result result = sound->construct(path);
-    if (result != MA_SUCCESS) {
-      delete sound;
-      err_throw("Failed to open sound file [%d]", result);
-    } else {
-      setup_format(sound->_decoder->outputFormat,
-                   sound->_decoder->outputChannels,
-                   sound->_decoder->outputSampleRate);
-      ma_mutex_lock(&device.lock);
-      queue.push(sound);
-      cache.put(path, sound);
-      ma_mutex_unlock(&device.lock);
-      if (queue.size() == 1) {
-        result = ma_device_start(&device);
-        if (result != MA_SUCCESS) {
-          err_throw("Failed to start audio [%d]", result);
-        }
-      }
-    }
+    device_start();
   }
 }
 
@@ -180,7 +185,7 @@ void osd_clear_sound_queue() {
   }
 
   queue.removeAll();
-  cache.removeAll();
+  queuePos = 0;
 }
 
 void osd_sound(int frequency, int millis, int volume, int background) {
@@ -190,13 +195,13 @@ void osd_sound(int frequency, int millis, int volume, int background) {
   ma_mutex_unlock(&device.lock);
 
   if (!background) {
-    ma_device_start(&device);
+    device_start();
     usleep(MILLIS_TO_MICROS(millis));
     ma_device_stop(&device);
     ma_mutex_lock(&device.lock);
     queue.pop();
     ma_mutex_unlock(&device.lock);
   } else  if (queue.size() == 1) {
-    ma_device_start(&device);
+    device_start();
   }
 }
diff --git a/src/ui/form.cpp b/src/ui/form.cpp
index 37c7cdd2..13a44980 100644
--- a/src/ui/form.cpp
+++ b/src/ui/form.cpp
@@ -116,7 +116,7 @@ void FormLink::clicked(int x, int y, bool pressed) {
   }
 }
 
-void cmd_form_close(var_s *self) {
+void cmd_form_close(var_s *self, var_s *) {
   g_system->getOutput()->removeInputs();
   g_system->getOutput()->resetScroll();
 
@@ -129,7 +129,7 @@ void cmd_form_close(var_s *self) {
   v_free(&arg);
 }
 
-void cmd_form_refresh(var_s *self) {
+void cmd_form_refresh(var_s *self, var_s *) {
   var_t arg;
   v_init(&arg);
   eval(&arg);
@@ -138,7 +138,7 @@ void cmd_form_refresh(var_s *self) {
   g_system->getOutput()->updateInputs(self, setVars);
 }
 
-void cmd_form_do_events(var_s *self) {
+void cmd_form_do_events(var_s *self, var_s *) {
   // apply any variable changes onto attached widgets
   if (g_system->isRunning()) {
     AnsiWidget *out = g_system->getOutput();
diff --git a/src/ui/image.cpp b/src/ui/image.cpp
index 3b36f0e0..38065e43 100644
--- a/src/ui/image.cpp
+++ b/src/ui/image.cpp
@@ -37,17 +37,17 @@ void reset_image_cache() {
 }
 
 ImageBuffer::ImageBuffer() :
+  _filename(nullptr),
+  _image(nullptr),
   _bid(0),
-  _filename(NULL),
-  _image(NULL),
   _width(0),
   _height(0) {
 }
 
 ImageBuffer::ImageBuffer(ImageBuffer &o) :
-  _bid(o._bid),
   _filename(o._filename),
   _image(o._image),
+  _bid(o._bid),
   _width(o._width),
   _height(o._height) {
 }
@@ -55,8 +55,8 @@ ImageBuffer::ImageBuffer(ImageBuffer &o) :
 ImageBuffer::~ImageBuffer() {
   free(_filename);
   free(_image);
-  _filename = NULL;
-  _image = NULL;
+  _filename = nullptr;
+  _image = nullptr;
 }
 
 ImageDisplay::ImageDisplay() : Shape(0, 0, 0, 0),
@@ -66,7 +66,7 @@ ImageDisplay::ImageDisplay() : Shape(0, 0, 0, 0),
   _opacity(0),
   _id(0),
   _bid(0),
-  _buffer(NULL) {
+  _buffer(nullptr) {
 }
 
 ImageDisplay::ImageDisplay(ImageDisplay &o) : Shape(o._x, o._y, o._width, o._height) {
@@ -102,7 +102,7 @@ void ImageDisplay::draw(int x, int y, int w, int h, int cw) {
 }
 
 dev_file_t *eval_filep() {
-  dev_file_t *result = NULL;
+  dev_file_t *result = nullptr;
   code_skipnext();
   if (code_getnext() == '#') {
     int handle = par_getint();
@@ -121,7 +121,7 @@ uint8_t *get_image_data(int x, int y, int w, int h) {
   rc.height = h;
   int size = w * h * 4;
   uint8_t *result = (uint8_t *)malloc(size);
-  if (result != NULL) {
+  if (result != nullptr) {
     g_system->getOutput()->redraw();
     maGetImageData(HANDLE_SCREEN, result, &rc, w * 4);
   }
@@ -133,7 +133,7 @@ ImageBuffer *load_image(var_int_t x) {
   int count = par_massget("iii", &y, &w, &h);
   int width = g_system->getOutput()->getWidth();
   int height = g_system->getOutput()->getHeight();
-  ImageBuffer *result = NULL;
+  ImageBuffer *result = nullptr;
 
   if (prog_error || count == 0 || count == 2) {
     err_throw(ERR_PARAM);
@@ -146,14 +146,14 @@ ImageBuffer *load_image(var_int_t x) {
       h = MIN(h, height);
     }
     uint8_t* image = get_image_data(x, y, w, h);
-    if (image == NULL) {
+    if (image == nullptr) {
       err_throw(ERR_IMAGE_LOAD, "Failed to load screen image");
     } else {
       result = new ImageBuffer();
       result->_bid = ++nextId;
       result->_width = w;
       result->_height = h;
-      result->_filename = NULL;
+      result->_filename = nullptr;
       result->_image = image;
       cache.add(result);
     }
@@ -163,7 +163,7 @@ ImageBuffer *load_image(var_int_t x) {
 
 // share image buffer from another image variable
 ImageBuffer *load_image(var_t *var) {
-  ImageBuffer *result = NULL;
+  ImageBuffer *result = nullptr;
   if (var->type == V_MAP) {
     int bid = map_get_int(var, IMG_BID, -1);
     if (bid != -1) {
@@ -199,7 +199,7 @@ ImageBuffer *load_image(var_t *var) {
     result->_bid = ++nextId;
     result->_width = w;
     result->_height = h;
-    result->_filename = NULL;
+    result->_filename = nullptr;
     result->_image = image;
     cache.add(result);
   }
@@ -207,7 +207,7 @@ ImageBuffer *load_image(var_t *var) {
 }
 
 ImageBuffer *load_image(const unsigned char* buffer, int32_t size) {
-  ImageBuffer *result = NULL;
+  ImageBuffer *result = nullptr;
   unsigned w, h;
   unsigned char *image;
   unsigned error = 0;
@@ -218,7 +218,7 @@ ImageBuffer *load_image(const unsigned char* buffer, int32_t size) {
     result->_bid = ++nextId;
     result->_width = w;
     result->_height = h;
-    result->_filename = NULL;
+    result->_filename = nullptr;
     result->_image = image;
     cache.add(result);
   } else {
@@ -228,16 +228,16 @@ ImageBuffer *load_image(const unsigned char* buffer, int32_t size) {
 }
 
 ImageBuffer *load_image(dev_file_t *filep) {
-  ImageBuffer *result = NULL;
+  ImageBuffer *result = nullptr;
   List_each(ImageBuffer *, it, cache) {
     ImageBuffer *next = (*it);
-    if (next->_filename != NULL && strcmp(next->_filename, filep->name) == 0) {
+    if (next->_filename != nullptr && strcmp(next->_filename, filep->name) == 0) {
       result = next;
       break;
     }
   }
 
-  if (result == NULL) {
+  if (result == nullptr) {
     unsigned w, h;
     unsigned char *image;
     unsigned error = 0;
@@ -286,13 +286,13 @@ ImageBuffer *load_xpm_image(char **data) {
   unsigned w, h;
   unsigned char *image;
   unsigned error = xpm_decode32(&image, &w, &h, data);
-  ImageBuffer *result = NULL;
+  ImageBuffer *result = nullptr;
   if (!error) {
     result = new ImageBuffer();
     result->_bid = ++nextId;
     result->_width = w;
     result->_height = h;
-    result->_filename = NULL;
+    result->_filename = nullptr;
     result->_image = image;
     cache.add(result);
   } else {
@@ -301,7 +301,7 @@ ImageBuffer *load_xpm_image(char **data) {
   return result;
 }
 
-void cmd_image_show(var_s *self) {
+void cmd_image_show(var_s *self, var_s *) {
   ImageDisplay image;
   image._bid = map_get_int(self, IMG_BID, -1);
 
@@ -316,7 +316,7 @@ void cmd_image_show(var_s *self) {
   var_int_t x, y, z, op;
   int count = par_massget("iiii", &x, &y, &z, &op);
 
-  if (prog_error || image._buffer == NULL || count == 1 || count > 4) {
+  if (prog_error || image._buffer == nullptr || count == 1 || count > 4) {
     err_throw(ERR_PARAM);
   } else {
     // 0, 2, 3, 4 arguments accepted
@@ -351,14 +351,14 @@ void cmd_image_show(var_s *self) {
   }
 }
 
-void cmd_image_hide(var_s *self) {
+void cmd_image_hide(var_s *self, var_s *) {
   int id = map_get_int(self, IMG_ID, -1);
   g_system->getOutput()->removeImage(id);
 }
 
-void cmd_image_save(var_s *self) {
+void cmd_image_save(var_s *self, var_s *) {
   unsigned id = map_get_int(self, IMG_BID, -1);
-  ImageBuffer *image = NULL;
+  ImageBuffer *image = nullptr;
   List_each(ImageBuffer *, it, cache) {
     ImageBuffer *next = (*it);
     if (next->_bid == id) {
@@ -367,8 +367,8 @@ void cmd_image_save(var_s *self) {
     }
   }
 
-  var_t *array = NULL;
-  dev_file_t *filep = NULL;
+  var_t *array = nullptr;
+  dev_file_t *filep = nullptr;
   byte code = code_peek();
   switch (code) {
   case kwTYPE_SEP:
@@ -380,15 +380,19 @@ void cmd_image_save(var_s *self) {
   }
 
   bool saved = false;
-  if (!prog_error && image != NULL) {
+  if (!prog_error && image != nullptr) {
     int w = image->_width;
     int h = image->_height;
-    if (filep != NULL && filep->open_flags == DEV_FILE_OUTPUT) {
+    if (filep != nullptr && filep->open_flags == DEV_FILE_OUTPUT) {
       if (!lodepng_encode32_file(filep->name, image->_image, w, h)) {
         saved = true;
       }
-    } else if (array != NULL) {
-      v_tomatrix(array, h, w);
+    } else if (array != nullptr) {
+      v_tomatrix(array, w, h);
+      //     x0   x1   x2    (w=3,h=2)
+      // y0  rgba rgba rgba  ypos=0
+      // y1  rgba rgba rgba  ypos=12
+      //
       for (int y = 0; y < h; y++) {
         int yoffs = (4 * y * w);
         for (int x = 0; x < w; x++) {
@@ -430,13 +434,13 @@ void create_image(var_p_t var, ImageBuffer *image) {
 
 // loads an image for the form image input type
 ImageDisplay *create_display_image(var_p_t var, const char *name) {
-  ImageDisplay *result = NULL;
-  if (name != NULL && var != NULL) {
+  ImageDisplay *result = nullptr;
+  if (name != nullptr && var != nullptr) {
     dev_file_t file;
     strlcpy(file.name, name, sizeof(file.name));
     file.type = ft_stream;
     ImageBuffer *buffer = load_image(&file);
-    if (buffer != NULL) {
+    if (buffer != nullptr) {
       result = new ImageDisplay();
       result->_buffer = buffer;
       result->_bid = buffer->_bid;
@@ -468,22 +472,23 @@ ImageDisplay *create_display_image(var_p_t var, const char *name) {
 void screen_dump() {
   int width = g_system->getOutput()->getWidth();
   int height = g_system->getOutput()->getHeight();
-  uint8_t* image = get_image_data(0, 0, width, height);
-  if (image != NULL) {
+  auto image = get_image_data(0, 0, width, height);
+  if (image != nullptr) {
     const char *path = gsb_bas_dir;
 #if defined(_ANDROID)
     path = getenv("EXTERNAL_STORAGE");
 #endif
     for (int i = 0; i < 1000; i++) {
-      char file[OS_PATHNAME_SIZE];
-      if (strstr(path, "://") != NULL) {
-        sprintf(file, "sbasic_dump_%d.png", i);
-      } else {
-        sprintf(file, "%ssbasic_dump_%d.png", path, i);
+      String file;
+      if (strstr(path, "://") == nullptr) {
+        file.append(path);
       }
-      if (access(file, R_OK) != 0) {
-        g_system->systemPrint("Saving screen to %s\n", file);
-        unsigned error = lodepng_encode32_file(file, image, width, height);
+      file.append("sbasic_dump_");
+      file.append(i);
+      file.append(".png");
+      if (access(file.c_str(), R_OK) != 0) {
+        g_system->systemPrint("Saving screen to %s\n", file.c_str());
+        unsigned error = lodepng_encode32_file(file.c_str(), image, width, height);
         if (error) {
           g_system->systemPrint("Error: %s\n", lodepng_error_text(error));
         }
@@ -496,14 +501,14 @@ void screen_dump() {
 
 extern "C" void v_create_image(var_p_t var) {
   var_t arg;
-  ImageBuffer *image = NULL;
-  dev_file_t *filep = NULL;
+  ImageBuffer *image = nullptr;
+  dev_file_t *filep = nullptr;
 
   byte code = code_peek();
   switch (code) {
   case kwTYPE_SEP:
     filep = eval_filep();
-    if (filep != NULL) {
+    if (filep != nullptr) {
       image = load_image(filep);
     }
     break;
@@ -551,7 +556,7 @@ extern "C" void v_create_image(var_p_t var) {
     break;
   };
 
-  if (image != NULL) {
+  if (image != nullptr) {
     create_image(var, image);
   } else {
     err_throw(ERR_BAD_FILE_HANDLE);
diff --git a/src/ui/image.h b/src/ui/image.h
index 16f5adfb..d7467120 100644
--- a/src/ui/image.h
+++ b/src/ui/image.h
@@ -17,9 +17,9 @@ struct ImageBuffer {
   ImageBuffer(ImageBuffer &imageBuffer);
   virtual ~ImageBuffer();
 
-  unsigned _bid;
   char *_filename;
   unsigned char *_image;
+  unsigned _bid;
   int _width;
   int _height;
 };
diff --git a/src/ui/inputs.cpp b/src/ui/inputs.cpp
index bdad4095..4f6654d5 100644
--- a/src/ui/inputs.cpp
+++ b/src/ui/inputs.cpp
@@ -18,9 +18,9 @@
 
 extern System *g_system;
 
-FormList *activeList = NULL;
-FormInput *focusInput = NULL;
-FormEditInput *focusEdit = NULL;
+FormList *activeList = nullptr;
+FormInput *focusInput = nullptr;
+FormEditInput *focusEdit = nullptr;
 int background = DEFAULT_BACKGROUND;
 int foreground = DEFAULT_FOREGROUND;
 
@@ -33,9 +33,9 @@ FormEditInput *get_focus_edit() {
 
 bool form_ui::optionSelected(int index) {
   bool result = false;
-  if (activeList != NULL) {
+  if (activeList != nullptr) {
     activeList->optionSelected(index);
-    activeList = NULL;
+    activeList = nullptr;
     result = false;
   }
   return result;
@@ -48,20 +48,20 @@ void set_input_defaults(int fg, int bg) {
 
 int get_color(var_p_t value, int def) {
   int result = def;
-  if (value != NULL && value->type == V_INT) {
+  if (value != nullptr && value->type == V_INT) {
     result = value->v.i;
     if (result < 0) {
       result = -result;
     } else if (result < 16) {
       result = colors[result];
     }
-  } else if (value != NULL && value->type == V_STR &&
+  } else if (value != nullptr && value->type == V_STR &&
              value->v.p.length) {
     const char *n = value->v.p.ptr;
     if (n[0] == '0' && n[1] == 'x' && n[2]) {
-      result = strtol(n + 2, NULL, 16);
+      result = strtol(n + 2, nullptr, 16);
     } else if (n[0] == '#' && n[1]) {
-      result = strtol(n + 1, NULL, 16);
+      result = strtol(n + 1, nullptr, 16);
     } else if (strcasecmp(n, "black") == 0) {
       result = DEFAULT_BACKGROUND;
     } else if (strcasecmp(n, "red") == 0) {
@@ -121,7 +121,7 @@ FormInput::FormInput(int x, int y, int w, int h) :
 
 FormInput::~FormInput() {
   if (focusInput == this) {
-    focusInput = NULL;
+    focusInput = nullptr;
   }
 }
 
@@ -133,23 +133,23 @@ void FormInput::construct(var_p_t form, var_p_t field, int id) {
   _id = id;
 
   var_p_t v_id = map_get(field, FORM_INPUT_ID);
-  if (v_id == NULL) {
+  if (v_id == nullptr) {
     map_add_var(field, FORM_INPUT_ID, _id);
   } else {
     v_setint(v_id, _id);
   }
 
   var_p_t v_onclick = map_get(field, FORM_INPUT_ONCLICK);
-  if (v_onclick != NULL && v_onclick->type == V_PTR) {
+  if (v_onclick != nullptr && v_onclick->type == V_PTR) {
     _onclick = v_onclick->v.ap.p;
   }
 
   const char *caption = getText();
-  MAExtent extent = maGetTextSize(caption != NULL && caption[0] ? caption : "Z");
+  MAExtent extent = maGetTextSize(caption != nullptr && caption[0] ? caption : "Z");
   int textW = EXTENT_X(extent);
   int textH = EXTENT_Y(extent);
 
-  if (_width <= 0 && caption != NULL) {
+  if (_width <= 0 && caption != nullptr) {
     _width = textW + padding(false);
   }
 
@@ -238,25 +238,23 @@ void FormInput::drawLink(const char *caption, int dx, int dy, int sw, int chw) {
 }
 
 void FormInput::drawText(const char *caption, int dx, int dy, int sw, int chw) {
-  int strWidth = chw * (caption == NULL ? 0 : strlen(caption));
-  int width = sw - dx;
-  if (width > _width) {
-    width = _width;
-  }
-  if (caption == NULL) {
-    // nothing to draw
-  } else if (strWidth > width) {
-    int len = width / chw;
-    if (len > 0) {
-      char *buffer = new char[len + 1];
-      strncpy(buffer, caption, len - 1);
-      buffer[len - 1] = '~';
-      buffer[len] = 0;
-      maDrawText(dx, dy, buffer, len);
-      delete [] buffer;
+  if (caption != nullptr) {
+    int strWidth = chw * strlen(caption);
+    int width = sw - dx;
+    if (width > _width) {
+      width = _width;
+    }
+    if (strWidth > width) {
+      int len = width / chw;
+      if (len > 0) {
+        maDrawText(dx, dy, caption, len - 1);
+        if (caption[len - 1] != ' ') {
+          maDrawText(dx + ((len - 1) * chw), dy, "~", 1);
+        }
+      }
+    } else if (strWidth) {
+      maDrawText(dx, dy, caption, strlen(caption));
     }
-  } else if (strWidth) {
-    maDrawText(dx, dy, caption, strlen(caption));
   }
 }
 
@@ -282,10 +280,10 @@ void FormInput::setHelpTextColor() {
 
 // returns the field var attached to the field
 var_p_t FormInput::getField(var_p_t form) {
-  var_p_t result = NULL;
+  var_p_t result = nullptr;
   if (form->type == V_MAP) {
     var_p_t inputs = map_get(form, FORM_INPUTS);
-    if (inputs != NULL && inputs->type == V_ARRAY) {
+    if (inputs != nullptr && inputs->type == V_ARRAY) {
       for (unsigned i = 0; i < v_asize(inputs) && !result; i++) {
         var_p_t elem = v_elem(inputs, i);
         if (elem->type == V_MAP && (_id == map_get_int(elem, FORM_INPUT_ID, -1))) {
@@ -302,19 +300,19 @@ bool FormInput::updateUI(var_p_t form, var_p_t field) {
   bool updated = false;
 
   var_p_t var = map_get(field, FORM_INPUT_LABEL);
-  if (var == NULL) {
+  if (var == nullptr) {
     var = map_get(form, FORM_INPUT_LABEL);
   }
-  if (var != NULL) {
+  if (var != nullptr) {
     setText(v_getstr(var));
     updated = true;
   }
 
   var_p_t v_bg = map_get(field, FORM_INPUT_BG);
-  if (v_bg == NULL) {
+  if (v_bg == nullptr) {
     v_bg = map_get(form, FORM_INPUT_BG);
   }
-  if (v_bg != NULL) {
+  if (v_bg != nullptr) {
     int bg = get_color(v_bg, _bg);
     if (bg != _bg) {
       updated = true;
@@ -323,10 +321,10 @@ bool FormInput::updateUI(var_p_t form, var_p_t field) {
   }
 
   var_p_t v_fg = map_get(field, FORM_INPUT_FG);
-  if (v_fg == NULL) {
+  if (v_fg == nullptr) {
     v_fg = map_get(form, FORM_INPUT_FG);
   }
-  if (v_fg != NULL) {
+  if (v_fg != nullptr) {
     int fg = get_color(v_fg, _fg);
     if (fg != _fg) {
       updated = true;
@@ -361,10 +359,10 @@ bool FormInput::edit(int key, int screenWidth, int charWidth) {
 // set the widget value onto the form value
 void FormInput::updateForm(var_p_t form) {
   var_p_t field = getField(form);
-  if (field != NULL) {
+  if (field != nullptr) {
     var_p_t inputValue = map_get(field, FORM_INPUT_VALUE);
     var_p_t value = map_get(form, FORM_VALUE);
-    if (value != NULL && inputValue != NULL) {
+    if (value != nullptr && inputValue != nullptr) {
       v_set(value, inputValue);
     }
   }
@@ -375,9 +373,9 @@ bool FormInput::hasFocus() const {
 }
 
 void FormInput::setFocus(bool focus) {
-  focusEdit = NULL;
+  focusEdit = nullptr;
   if (!_noFocus && focus == (focusInput != this)) {
-    focusInput = focus ? this : NULL;
+    focusInput = focus ? this : nullptr;
     g_system->getOutput()->setDirty();
   }
 }
@@ -401,7 +399,7 @@ FormLabel::FormLabel(const char *caption, int x, int y, int w, int h) :
 bool FormLabel::updateUI(var_p_t form, var_p_t field) {
   bool updated = FormInput::updateUI(form, field);
   var_p_t var = map_get(field, FORM_INPUT_LABEL);
-  if (var != NULL && var->type == V_STR && !_label.equals(var->v.p.ptr)) {
+  if (var != nullptr && var->type == V_STR && !_label.equals(var->v.p.ptr)) {
     _label = var->v.p.ptr;
     updated = true;
   }
@@ -409,14 +407,8 @@ bool FormLabel::updateUI(var_p_t form, var_p_t field) {
 }
 
 void FormLabel::draw(int x, int y, int w, int h, int chw) {
-  int len = _label.length();
-  if (len > 0) {
-    if (len * chw >= _width) {
-      len = _width / chw;
-    }
-    maSetColor(_fg);
-    maDrawText(x, y, _label.c_str(), len);
-  }
+  maSetColor(_fg);
+  drawText(_label.c_str(), x, y, w, chw);
 }
 
 //
@@ -446,7 +438,7 @@ FormEditInput::FormEditInput(int x, int y, int w, int h) :
 
 FormEditInput::~FormEditInput() {
   if (focusEdit == this) {
-    focusEdit = NULL;
+    focusEdit = nullptr;
   }
 }
 
@@ -488,8 +480,8 @@ int FormEditInput::getControlKey(int key) {
 
 void FormEditInput::setFocus(bool focus) {
   if (!_noFocus && focus == (focusInput != this)) {
-    focusInput = focus ? this : NULL;
-    focusEdit = focus ? this : NULL;
+    focusInput = focus ? this : nullptr;
+    focusEdit = focus ? this : nullptr;
     g_system->getOutput()->setDirty();
   }
 }
@@ -501,7 +493,7 @@ FormLineInput::FormLineInput(const char *value, const char *help, int size, bool
                              int x, int y, int w, int h) :
   FormEditInput(x, y, w, h),
   _help(help),
-  _buffer(NULL),
+  _buffer(nullptr),
   _size(size),
   _scroll(0),
   _mark(-1),
@@ -509,7 +501,7 @@ FormLineInput::FormLineInput(const char *value, const char *help, int size, bool
   _grow(grow) {
   _buffer = new char[_size + 1];
   _buffer[0] = '\0';
-  if (value != NULL && value[0]) {
+  if (value != nullptr && value[0]) {
     int len = MIN(strlen(value), (unsigned)_size);
     memcpy(_buffer, value, len);
     _buffer[len] = '\0';
@@ -519,7 +511,7 @@ FormLineInput::FormLineInput(const char *value, const char *help, int size, bool
 
 FormLineInput::~FormLineInput() {
   delete [] _buffer;
-  _buffer = NULL;
+  _buffer = nullptr;
 }
 
 void FormLineInput::clicked(int x, int y, bool pressed) {
@@ -583,7 +575,7 @@ void FormLineInput::draw(int x, int y, int w, int h, int chw) {
 
 bool FormLineInput::edit(int key, int screenWidth, int charWidth) {
   int wChars;
-  int len = _buffer == NULL ? 0 : strlen(_buffer);
+  int len = _buffer == nullptr ? 0 : strlen(_buffer);
 
   key = getControlKey(key);
   switch (key) {
@@ -694,14 +686,14 @@ bool FormLineInput::edit(int key, int screenWidth, int charWidth) {
 
 void FormLineInput::selectAll() {
   _point = 0;
-  _mark = _buffer == NULL ? -0 : strlen(_buffer);
+  _mark = _buffer == nullptr ? -0 : strlen(_buffer);
 }
 
 void FormLineInput::updateField(var_p_t form) {
   var_p_t field = getField(form);
-  if (field != NULL) {
+  if (field != nullptr) {
     var_p_t value = map_get(field, FORM_INPUT_VALUE);
-    if (value != NULL) {
+    if (value != nullptr) {
       v_setstr(value, _buffer);
     }
   }
@@ -710,7 +702,7 @@ void FormLineInput::updateField(var_p_t form) {
 bool FormLineInput::updateUI(var_p_t form, var_p_t field) {
   bool updated = FormInput::updateUI(form, field);
   var_p_t var = map_get(field, FORM_INPUT_VALUE);
-  if (var != NULL) {
+  if (var != nullptr) {
     const char *value = v_getstr(var);
     if (value && strcmp(value, _buffer) != 0) {
       int len = MIN(strlen(value), (unsigned)_size);
@@ -724,7 +716,7 @@ bool FormLineInput::updateUI(var_p_t form, var_p_t field) {
 }
 
 char *FormLineInput::copy(bool cut) {
-  char *result = NULL;
+  char *result = nullptr;
   int len = strlen(_buffer);
   int start = MIN(_mark, _point);
   if (_mark != -1 && start < len) {
@@ -759,7 +751,7 @@ void FormLineInput::cut() {
 void FormLineInput::paste(const char *text) {
   int len = strlen(_buffer);
   int avail = _size - (len + 1);
-  if (text != NULL && avail > 0) {
+  if (text != nullptr && avail > 0) {
     int index = _scroll + _point;
     int count = strlen(text);
     if (count > avail) {
@@ -881,10 +873,10 @@ FormList::FormList(ListModel *model, int x, int y, int w, int h) :
 
 FormList::~FormList() {
   if (activeList == this) {
-    activeList = NULL;
+    activeList = nullptr;
   }
   delete _model;
-  _model = NULL;
+  _model = nullptr;
 }
 
 void FormList::optionSelected(int index) {
@@ -912,7 +904,7 @@ void FormList::selectIndex(int index) {
 bool FormList::updateUI(var_p_t form, var_p_t field) {
   bool updated = FormInput::updateUI(form, field);
   var_p_t var = map_get(field, FORM_INPUT_VALUE);
-  if (var != NULL && (var->type == V_ARRAY || var->type == V_STR)) {
+  if (var != nullptr && (var->type == V_ARRAY || var->type == V_STR)) {
     // update list control with new array or string variable
     _model->clear();
     _model->create(var);
@@ -921,7 +913,7 @@ bool FormList::updateUI(var_p_t form, var_p_t field) {
 
   // set the selectedIndex
   var = map_get(field, FORM_INPUT_INDEX);
-  if (var != NULL) {
+  if (var != nullptr) {
     selectIndex(v_getint(var));
     updated = true;
   }
@@ -934,7 +926,7 @@ void FormList::updateForm(var_p_t form) {
 
   // set the form value
   var_p_t value = map_get(form, FORM_VALUE);
-  if (value == NULL) {
+  if (value == nullptr) {
     value = map_add_var(form, FORM_VALUE, 0);
   }
   if (selected) {
@@ -945,9 +937,9 @@ void FormList::updateForm(var_p_t form) {
 
   // set the selectedIndex
   var_p_t field = getField(form);
-  if (field != NULL) {
+  if (field != nullptr) {
     value = map_get(field, FORM_INPUT_INDEX);
-    if (value != NULL) {
+    if (value != nullptr) {
       v_setint(value, _model->selected());
     }
   }
@@ -1062,7 +1054,7 @@ bool FormListBox::selected(MAPoint2d pt, int offsX, int offsY, bool &redraw) {
     _topIndex++;
     redraw = true;
   } else {
-    activeList = NULL;
+    activeList = nullptr;
   }
   return result;
 }
diff --git a/src/ui/system.cpp b/src/ui/system.cpp
index 9cbe441a..37dfcf85 100644
--- a/src/ui/system.cpp
+++ b/src/ui/system.cpp
@@ -20,6 +20,7 @@
 #include "common/keymap.h"
 #include "ui/system.h"
 #include "ui/inputs.h"
+#include "ui/theme.h"
 
 #define MENU_CONSOLE    0
 #define MENU_SOURCE     1
@@ -45,7 +46,8 @@
 #define MENU_HELP       21
 #define MENU_SHORTCUT   22
 #define MENU_SHARE      23
-#define MENU_SIZE       24
+#define MENU_THEME      24
+#define MENU_SIZE       25
 #define MENU_COMPLETION_0  (MENU_SIZE + 1)
 #define MENU_COMPLETION_1  (MENU_SIZE + 2)
 #define MENU_COMPLETION_2  (MENU_SIZE + 3)
@@ -78,6 +80,7 @@
 #define MENU_STR_ON      "ON"
 #define MENU_STR_AUDIO   " Audio  [%s] "
 #define MENU_STR_EDITOR  " Editor [%s] "
+#define MENU_STR_THEME   " Theme  [%s] "
 #define MENU_STR_CONSOLE " Console "
 #define MENU_STR_CONTROL " Control Mode [%s] "
 #define MENU_STR_DEBUG   " Debug "
@@ -155,6 +158,8 @@ bool System::execute(const char *bas) {
   _state = kRunState;
   setWindowTitle(bas);
   showCursor(kArrow);
+  saveWindowRect();
+
   int result = ::sbasic_main(bas);
   if (isRunning()) {
     _state = kActiveState;
@@ -163,6 +168,10 @@ bool System::execute(const char *bas) {
   if (_editor == nullptr) {
     opt_command[0] = '\0';
   }
+
+  if (!_mainBas) {
+    restoreWindowRect();
+  }
   enableCursor(true);
   opt_file_permitted = 1;
   opt_loadmod = 0;
@@ -398,6 +407,10 @@ void System::handleMenu(MAEvent &event) {
   case MENU_EDITMODE:
     opt_ide = (opt_ide == IDE_NONE ? IDE_INTERNAL : IDE_NONE);
     break;
+  case MENU_THEME:
+    g_themeId = (g_themeId + 1) % NUM_THEMES;
+    setRestart();
+    break;
   case MENU_AUDIO:
     opt_mute_audio = !opt_mute_audio;
     break;
@@ -594,7 +607,7 @@ char *System::readSource(const char *fileName) {
   } else {
     buffer = loadResource(fileName);
     if (!buffer) {
-      int h = open(fileName, O_BINARY | O_RDONLY, 0644);
+      int h = open(fileName, O_BINARY | O_RDONLY);
       if (h != -1) {
         struct stat st;
         if (fstat(h, &st) == 0) {
@@ -618,10 +631,10 @@ char *System::readSource(const char *fileName) {
   }
   if (buffer != nullptr) {
     delete [] _programSrc;
-    int len = strlen(buffer);
-    _programSrc = new char[len + 1];
-    strncpy(_programSrc, buffer, len);
-    _programSrc[len] = '\0';
+    int len = strlen(buffer) + 1;
+    _programSrc = new char[len];
+    memcpy(_programSrc, buffer, len);
+    _programSrc[len - 1] = '\0';
     _srcRendered = false;
     systemPrint("Opened: %s %d bytes\n", fileName, len);
   }
@@ -1007,6 +1020,9 @@ void System::showMenu() {
         sprintf(buffer, MENU_STR_EDITOR, opt_ide == IDE_NONE ? MENU_STR_OFF : MENU_STR_ON);
         items->add(new String(buffer));
         _systemMenu[index++] = MENU_EDITMODE;
+        sprintf(buffer, MENU_STR_THEME, themeName());
+        items->add(new String(buffer));
+        _systemMenu[index++] = MENU_THEME;
       }
       sprintf(buffer, MENU_STR_AUDIO, (opt_mute_audio ? MENU_STR_OFF : MENU_STR_ON));
       items->add(new String(buffer));
diff --git a/src/ui/system.h b/src/ui/system.h
index 8a6432aa..7c2f9b99 100755
--- a/src/ui/system.h
+++ b/src/ui/system.h
@@ -62,6 +62,8 @@ struct System {
   virtual MAEvent processEvents(int waitFlag) = 0;
   virtual char *loadResource(const char *fileName);
   virtual void optionsBox(StringList *items) = 0;
+  virtual void restoreWindowRect() = 0;
+  virtual void saveWindowRect() = 0;
   virtual void setWindowSize(int width, int height) = 0;
   virtual void setWindowTitle(const char *title) = 0;
   virtual void share(const char *path) = 0;
diff --git a/src/ui/textedit.cpp b/src/ui/textedit.cpp
index ac8c7307..b5bdf7b7 100644
--- a/src/ui/textedit.cpp
+++ b/src/ui/textedit.cpp
@@ -67,7 +67,6 @@ int textedit_move_to_word_next(EditBuffer *str, int c) {
 #define LINE_BUFFER_SIZE 200
 #define INDENT_LEVEL 2
 #define HELP_WIDTH 22
-#define NUM_THEMES 6
 #define TWISTY1_OPEN  "> "
 #define TWISTY1_CLOSE "< "
 #define TWISTY2_OPEN  "  > "
@@ -90,6 +89,18 @@ int g_lineMarker[MAX_MARKERS] = {
   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
 };
 
+const char *themeName() {
+  switch (g_themeId) {
+  case 0: return "Dark";
+  case 1: return "Light";
+  case 2: return "Shian";
+  case 3: return "ATOM 1";
+  case 4: return "ATOM 2";
+  case 5: return "R157";
+  default: return "";
+  }
+}
+
 // see: http://ethanschoonover.com/solarized#features
 #define sol_base03  0x002b36
 #define sol_base02  0x073642
@@ -156,6 +167,12 @@ const int atom2[] = {
   0x0083f8, 0xff9d00, 0x31ccac, 0xc679dd, 0x0083f8
 };
 
+const int r157[] = {
+  0x80dfff, 0xa7aebc, 0xffffff, 0xa7aebc, 0xa7aebc, 0xd0d6e1,
+  0x2e3436, 0x888a85, 0x000000, 0x4d483b, 0x000000, 0x576375,
+  0xffffff, 0xffc466, 0xffcce0, 0xffff66, 0x0083f8
+};
+
 int g_user_theme[] = {
   0xc8cedb, 0xa7aebc, 0x484f5f, 0xa7aebc, 0xa7aebc, 0x00bb00,
   0x2e3436, 0x888a85, 0x000000, 0x4d483b, 0x000000, 0x2b313a,
@@ -163,7 +180,7 @@ int g_user_theme[] = {
 };
 
 const int* themes[] = {
-  solarized_dark, solarized_light, shian, atom1, atom2, g_user_theme
+  solarized_dark, solarized_light, shian, atom1, atom2, r157, g_user_theme
 };
 
 const char *helpText =
diff --git a/src/ui/textedit.h b/src/ui/textedit.h
index cdfa5a60..3b9c5fc5 100644
--- a/src/ui/textedit.h
+++ b/src/ui/textedit.h
@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2019 Chris Warren-Smith.
+// Copyright(C) 2001-2020 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -20,40 +20,12 @@
 #include <ctype.h>
 #include "lib/stb/stb_textedit.h"
 #include "ui/inputs.h"
+#include "ui/theme.h"
 #include "common/smbas.h"
 #include "common/keymap.h"
 
-extern unsigned g_themeId;
-extern int g_user_theme[];
-#define THEME_COLOURS 17
-
 struct TextEditInput;
 
-struct EditTheme {
-  EditTheme();
-  EditTheme(int fg, int bg);
-  void setId(const unsigned themeId);
-  void selectTheme(const int theme[]);
-
-  int _color;
-  int _background;
-  int _selection_color;
-  int _selection_background;
-  int _number_color;
-  int _number_selection_color;
-  int _number_selection_background;
-  int _cursor_color;
-  int _cursor_background;
-  int _match_background;
-  int _row_cursor;
-  int _syntax_comments;
-  int _syntax_text;
-  int _syntax_command;
-  int _syntax_statement;
-  int _syntax_digit;
-  int _row_marker;
-};
-
 struct StackTraceNode {
   StackTraceNode(const char *keyword, int type, int line)
     : _keyword(keyword), _type(type), _line(line) {}
diff --git a/src/ui/theme.h b/src/ui/theme.h
new file mode 100644
index 00000000..bd8fb493
--- /dev/null
+++ b/src/ui/theme.h
@@ -0,0 +1,45 @@
+// This file is part of SmallBASIC
+//
+// Copyright(C) 2001-2020 Chris Warren-Smith.
+//
+// This program is distributed under the terms of the GPL v2.0 or later
+// Download the GNU Public License (GPL) from www.gnu.org
+//
+
+#ifndef THEME_H
+#define THEME_H
+
+#define THEME_COLOURS 17
+#define NUM_THEMES 6
+
+extern unsigned g_themeId;
+extern int g_user_theme[];
+
+const char *themeName();
+
+struct EditTheme {
+  EditTheme();
+  EditTheme(int fg, int bg);
+  void setId(const unsigned themeId);
+  void selectTheme(const int theme[]);
+
+  int _color;
+  int _background;
+  int _selection_color;
+  int _selection_background;
+  int _number_color;
+  int _number_selection_color;
+  int _number_selection_background;
+  int _cursor_color;
+  int _cursor_background;
+  int _match_background;
+  int _row_cursor;
+  int _syntax_comments;
+  int _syntax_text;
+  int _syntax_command;
+  int _syntax_statement;
+  int _syntax_digit;
+  int _row_marker;
+};
+
+#endif
diff --git a/src/ui/utils.h b/src/ui/utils.h
index c4448afc..e3159fa5 100644
--- a/src/ui/utils.h
+++ b/src/ui/utils.h
@@ -17,7 +17,7 @@
 #endif
 
 #define DEFAULT_FOREGROUND 0xa1a1a1
-#define DEFAULT_BACKGROUND 0
+#define DEFAULT_BACKGROUND 0x1f1c1f
 #define HANDLE_SCREEN_BUFFER HANDLE_SCREEN
 #define USER_MESSAGE_EXIT 1000
 
diff --git a/src/ui/window.cpp b/src/ui/window.cpp
index 1335096d..79e775c5 100644
--- a/src/ui/window.cpp
+++ b/src/ui/window.cpp
@@ -11,6 +11,7 @@
 #include "common/pproc.h"
 #include "lib/maapi.h"
 #include "ui/system.h"
+#include "ui/theme.h"
 
 extern System *g_system;
 
@@ -26,6 +27,7 @@ extern System *g_system;
 #define WINDOW_INSET    "insetTextScreen"
 #define WINDOW_SETFONT  "setFont"
 #define WINDOW_SETSIZE  "setSize"
+#define WINDOW_THEME    "theme"
 
 // returns the next set of string variable arguments as a String list
 StringList *get_items() {
@@ -58,23 +60,23 @@ StringList *get_items() {
   return items;
 }
 
-void cmd_window_select_screen1(var_s *self) {
+void cmd_window_select_screen1(var_s *self, var_s *) {
   g_system->getOutput()->selectScreen(USER_SCREEN1);
 }
 
-void cmd_window_select_screen2(var_s *self) {
+void cmd_window_select_screen2(var_s *self, var_s *) {
   g_system->getOutput()->selectScreen(USER_SCREEN2);
 }
 
-void cmd_window_select_screen3(var_s *self) {
+void cmd_window_select_screen3(var_s *self, var_s *) {
   g_system->getOutput()->selectScreen(TEXT_SCREEN);
 }
 
-void cmd_window_show_keypad(var_s *self) {
+void cmd_window_show_keypad(var_s *self, var_s *) {
   maShowVirtualKeyboard();
 }
 
-void cmd_window_inset(var_s *self) {
+void cmd_window_inset(var_s *self, var_s *) {
   var_int_t x, y, w, h;
   par_massget("IIII", &x, &y, &w, &h);
   if (!prog_error) {
@@ -89,7 +91,7 @@ void cmd_window_inset(var_s *self) {
   }
 }
 
-void cmd_window_set_font(var_s *self) {
+void cmd_window_set_font(var_s *self, var_s *) {
   var_num_t size;
   var_int_t bold, italic;
   char *unit = NULL;
@@ -101,13 +103,29 @@ void cmd_window_set_font(var_s *self) {
   pfree(unit);
 }
 
-void cmd_window_set_size(var_s *self) {
+void cmd_window_set_size(var_s *self, var_s *) {
   var_int_t width, height;
   par_massget("II", &width, &height);
   g_system->setWindowSize(width, height);
 }
 
-void cmd_window_alert(var_s *self) {
+void cmd_window_get_theme(var_s *, var_s *retval) {
+  if (retval != nullptr) {
+    EditTheme theme;
+    theme.setId(g_themeId);
+    v_init(retval);
+    map_init(retval);
+    map_set_int(retval, "background", -theme._background);
+    map_set_int(retval, "text1", -theme._color);
+    map_set_int(retval, "text2", -theme._syntax_text);
+    map_set_int(retval, "text3", -theme._syntax_comments);
+    map_set_int(retval, "text4", -theme._syntax_command);
+    map_set_int(retval, "text5", -theme._syntax_statement);
+    map_set_int(retval, "text6", -theme._syntax_digit);
+  }
+}
+
+void cmd_window_alert(var_s *self, var_s *) {
   StringList *items = get_items();
   if (!prog_error && items->size() > 0) {
     const char *message = items->size() > 0 ? (*items)[0]->c_str() : "";
@@ -117,17 +135,21 @@ void cmd_window_alert(var_s *self) {
   delete items;
 }
 
-void cmd_window_ask(var_s *self) {
+void cmd_window_ask(var_s *self, var_s *retval) {
   StringList *items = get_items();
   if (!prog_error && items->size() > 0) {
     const char *message = items->size() > 0 ? (*items)[0]->c_str() : "";
     const char *title   = items->size() > 1 ? (*items)[1]->c_str() : "";
-    map_set_int(self, WINDOW_ASK_RTN, g_system->ask(title, message, false));
+    int result = g_system->ask(title, message, false);
+    map_set_int(self, WINDOW_ASK_RTN, result);
+    if (retval != nullptr) {
+      v_setint(retval, result);
+    }
   }
   delete items;
 }
 
-void cmd_window_menu(var_s *self) {
+void cmd_window_menu(var_s *self, var_s *) {
   StringList *items = get_items();
   if (!prog_error && items->size() > 0) {
     g_system->optionsBox(items);
@@ -135,7 +157,7 @@ void cmd_window_menu(var_s *self) {
   delete items;
 }
 
-void cmd_window_message(var_s *self) {
+void cmd_window_message(var_s *self, var_s *) {
   var_t arg;
   v_init(&arg);
   eval(&arg);
@@ -158,6 +180,7 @@ extern "C" void v_create_window(var_p_t var) {
   v_create_func(var, WINDOW_INSET, cmd_window_inset);
   v_create_func(var, WINDOW_SETFONT, cmd_window_set_font);
   v_create_func(var, WINDOW_SETSIZE, cmd_window_set_size);
+  v_create_func(var, WINDOW_THEME, cmd_window_get_theme);
 }
 
 extern "C" void dev_show_page() {