diff --git a/index.html b/index.html
index 6a8efb6..b132d0d 100644
--- a/index.html
+++ b/index.html
@@ -126,17 +126,14 @@
 // lex.opacity = 1
 
 </script>
-<script src="js/ext/colorcode.js"></script>
 <script src="js/ext/dataUriToBlob.js"></script>
 <script src="js/ext/FileSaver.js"></script>
 <script src="js/ext/oktween.js"></script>
 
 <script src="js/util.js"></script>
-<script src="js/ext/png.js"></script>
 <script src="js/ext/unicode.js"></script>
 <script src="js/ext/color.js"></script>
 <script src="js/dither.js"></script>
-<script src="js/undo.js"></script>
 <script src="js/clipboard.js"></script>
 <script src="js/ext/upload.js"></script>
 <script src="js/ext/user.js"></script>
diff --git a/js/clipboard.js b/js/clipboard.js
index f636af9..ef89fb2 100644
--- a/js/clipboard.js
+++ b/js/clipboard.js
@@ -100,7 +100,70 @@ var clipboard = (function () {
       if (!data.match(/\x03/))
         return exports.import_text();
 
-      var json = colorcode.to_json(data, {fg:0, bg:1})
+      var to_json = function(string, opts){
+        var lines_in = string.split(/\r?\n/)
+        var lines_out = []
+        var w = 0, h = 0
+        for (var y = 0; y < lines_in.length; y++) {
+          var bg = 1, fg = 15
+          var cells = [], line = lines_in[y]
+          if (line.length === 0) {
+            continue
+          } else {
+            for (var x = 0; x < line.length; x++) {
+              switch (line[x]) {
+              case "\x02":  // ^B (unimplemented)
+                break
+              case "\x03":  // ^C
+                var parseColour = function(line, x) {
+                  if (/1[0-5]/.test(line.substr(x, 2))) {
+                    colour = parseInt(line.substr(x, 2))
+                    return [colour, x + 2]
+                  } else if (/0[0-9]/.test(line.substr(x, 2))) {
+                    colour = parseInt(line.substr(x, 2))
+                    return [colour, x + 2]
+                  } else if (/[0-9]/.test(line.substr(x, 1))) {
+                    colour = parseInt(line.substr(x, 1))
+                    return [colour, x + 1]
+                  } else {
+                    return [undefined, x]
+                  }
+                }
+                var bg_ = undefined, fg_ = undefined, x_ = x + 1;
+                [fg_, x_] = parseColour(line, x_)
+                if (line[x_] === ",") {
+                  [bg_, x_] = parseColour(line, x_ + 1)
+                }
+                if ((bg_ == undefined) && (fg_ == undefined)) {
+                  [bg, fg] = [1, 15]
+                } else {
+                  bg = (bg_ != undefined) ? bg_ : bg;
+                  fg = (fg_ != undefined) ? fg_ : fg;
+                };
+                if (x_ != x) {x = x_ - 1}; break;
+              case "\x06":  // ^F (unimplemented)
+                break
+              case "\x0f":  // ^O
+                [bg, fg] = [1, 15]; break;
+              case "\x16":  // ^V
+                [bg, fg] = [fg, bg]; break;
+              case "\x1f":  // ^_ (unimplemented)
+                break
+              default:
+                cells.push({bg: bg, fg: bg, value: line[x]})
+              }
+            }
+            if (cells.length > 0) {
+              if (w < cells.length) {
+                w = cells.length
+              }
+              lines_out.push(cells); h++;
+            }
+          }
+        }
+        return {h: h, lines: lines_out, w: w}
+      }
+      var json = to_json(data, {fg:0, bg:1})
 
       if (!no_undo) undo.new()
       if (!no_undo) undo.save_rect(0,0, canvas.w, canvas.h)
@@ -114,7 +177,7 @@ var clipboard = (function () {
         var row = canvas.aa[y]
         for (var x = 0, char; char = line[x]; x++){
           var lex = row[x]
-          lex.char = String.fromCharCode(char.value)
+          lex.char = char.value
           lex.fg = char.fg
           lex.bg = char.bg
           lex.opacity = 1
@@ -211,9 +274,11 @@ var clipboard = (function () {
         var c = canvas.rotated ? clipboard.rotate_canvas() : clipboard.canvas
         if (done_fn) done_fn(c)
       }
+      var to_canvas = function(fn, opts){
+      }
 
       var start = Date.now();
-      colorcode.to_canvas(canvas.mirc(), opts)
+      to_canvas(canvas.mirc(), opts)
       var total = Date.now() - start;
       console.log("took " + total)
     },
diff --git a/js/ext/colorcode.js b/js/ext/colorcode.js
deleted file mode 100644
index 1d035d3..0000000
--- a/js/ext/colorcode.js
+++ /dev/null
@@ -1,551 +0,0 @@
-!function(e){if("object"==typeof exports)module.exports=e();else if("function"==typeof define&&define.amd)define(e);else{var o;"undefined"!=typeof window?o=window:"undefined"!=typeof global?o=global:"undefined"!=typeof self&&(o=self),o.colorcode=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-var colorcode = {};
-module.exports = colorcode;
-colorcode.to_json = require('./src/to_json');
-colorcode.from_json = require('./src/from_json');
-colorcode.style = require('./src/style');
-colorcode.to_canvas = require('./src/canvas');
-colorcode.color = require('./src/color');
-colorcode.font = require('./src/font');
-
-},{"./src/canvas":2,"./src/color":3,"./src/font":4,"./src/from_json":8,"./src/style":9,"./src/to_json":10}],2:[function(require,module,exports){
-var to_json = require('./to_json');
-var fontload = require('./font').load;
-var style = require('./style');
-var color = require('./color');
-
-// node-canvas
-var Canvas = require('canvas');
-if (typeof Image === "undefined") Image = Canvas.Image;
-
-var make_canvas = function(){
-  if (typeof document === "undefined" && typeof Canvas !== "undefined")
-    return new Canvas();
-  else
-    return document.createElement("canvas");
-}
-
-var canvas_tmp;
-
-var render_colorcode = function(json, canvas, font, opts){
-
-  var cw = font.char_w
-    , ch = font.char_h
-    , ctx = canvas.getContext('2d')
-    , canvas_tmp = canvas_tmp || make_canvas()
-    , ctx_tmp = canvas_tmp.getContext("2d")
-
-  var palette = color.palettes[opts.palette || style.palette];
-  var bg = opts.bg || style.bg;
-
-  canvas_tmp.width = cw;
-  canvas_tmp.height = ch;
-  
-  canvas.width = json.w * cw;
-  canvas.height = json.h * ch;
-
-  // pre fill entire canvas with bg color
-  // is this a good optimization?
-  if (bg === color.transparent_index){
-    // already cleared when resized above
-    // canvas.clearRect(0,0, canvas.width,canvas.height);
-  } else {
-    ctx.fillStyle = palette[bg];
-    ctx.fillRect(0,0, canvas.width,canvas.height);
-  }
-
-  for (var l=0; l<json.lines.length; l++){
-    var line = json.lines[l];
-    for (var c=0; c<line.length; c++){
-      var char = line[c];
-      var x = c * cw
-      var y = l * ch
-      
-      // draw bg for this char if not already filled
-      if (char.bg !== bg) {
-        if (char.bg === color.transparent_index) {
-            ctx.clearRect(x, y, cw, ch)
-        } else { 
-          ctx.fillStyle = palette[char.bg]
-          ctx.fillRect(x, y, cw, ch);
-        }
-      }
-
-      if (font.is_char_blank(char.value)) continue;
-
-      // draw char in fg
-      var fg = palette[char.fg]
-      if (fg !== color.transparent){
-        ctx_tmp.globalCompositeOperation = 'source-over'
-        ctx_tmp.fillStyle = fg
-        ctx_tmp.fillRect(0,0,cw,ch)
-        ctx_tmp.globalCompositeOperation = 'destination-in'
-        font.render_char(font, char.value, ctx_tmp, 0, 0, char)
-        ctx.drawImage(canvas_tmp, x, y)
-      } else { // transparent foreground punches out bg
-        ctx.globalCompositeOperation = 'destination-out'
-        font.render_char(font, char.value, ctx, x, y, char)
-        ctx.globalCompositeOperation = 'source-over'
-      }
-
-    }
-  }
-
-  if (opts.done) opts.done(canvas)
-
-
-}
-
-var to_canvas = function(string_or_json, opts){
-  opts = opts || {};
-  
-  if (typeof string_or_json === 'string')
-    string_or_json = to_json(string_or_json, opts);
-  
-  var canvas = opts.canvas || make_canvas();
-  var font_name = opts.font || style.font;
-
-  fontload(font_name, function(font){ 
-    render_colorcode(string_or_json, canvas, font, opts)
-  });
-
-  return canvas;
-}
-
-module.exports = to_canvas;
-
-},{"./color":3,"./font":4,"./style":9,"./to_json":10,"canvas":11}],3:[function(require,module,exports){
-var style = require('./style');
-
-var color = {};
-module.exports = color;
-
-style.palette = 'mirc';
-
-color.transparent_index = 99;
-color.transparent = 'rgba(0,0,0,0)';
-var ps = color.palettes = {};
-
-ps.mirc = [
- 'rgb(255,255,255)'
-,'rgb(0,0,0)'
-,'rgb(0,0,127)'
-,'rgb(0,147,0)'
-,'rgb(255,0,0)'
-,'rgb(127,0,0)'
-,'rgb(156,0,156)'
-,'rgb(252,127,0)'
-,'rgb(255,255,0)'
-,'rgb(0,252,0)'
-,'rgb(0,147,147)'
-,'rgb(0,255,255)'
-,'rgb(0,0,252)'
-,'rgb(255,0,255)'
-,'rgb(127,127,127)'
-,'rgb(210,210,210)'
-];
-
-ps.winxp = [
- 'rgb(255,255,255)'
-,'rgb(0,0,0)'
-,'rgb(0,0,128)'
-,'rgb(0,128,0)'
-,'rgb(255,0,0)'
-,'rgb(128,0,0)'
-,'rgb(128,0,128)'
-,'rgb(255,128,0)'
-,'rgb(255,255,0)'
-,'rgb(0,255,0)'
-,'rgb(0,128,128)'
-,'rgb(0,255,255)'
-,'rgb(0,0,255)'
-,'rgb(255,0,255)'
-,'rgb(128,128,128)'
-,'rgb(192,192,192)'
-];
-
-ps.vga = [
- 'rgb(255,255,255)'
-,'rgb(0,0,0)'
-,'rgb(0,0,170)'
-,'rgb(0,170,0)'
-,'rgb(255,85,85)'
-,'rgb(170,0,0)'
-,'rgb(170,0,170)'
-,'rgb(170,85,0)'
-,'rgb(255,255,85)'
-,'rgb(85,255,85)'
-,'rgb(0,170,170)'
-,'rgb(85,255,255)'
-,'rgb(85,85,255)'
-,'rgb(255,85,255)'
-,'rgb(85,85,85)'
-,'rgb(170,170,170)'
-];
-
-ps.c64 = [
- 'rgb(255,255,255)'
-,'rgb(0,0,0)'
-,'rgb(69,32,170)'
-,'rgb(101,170,69)'
-,'rgb(138,101,32)'
-,'rgb(138,69,32)'
-,'rgb(138,69,170)'
-,'rgb(101,69,0)'
-,'rgb(207,207,101)'
-,'rgb(170,239,138)'
-,'rgb(138,138,138)'
-,'rgb(101,170,207)'
-,'rgb(138,101,223)'	
-,'rgb(207,138,101)'
-,'rgb(69,69,69)'
-,'rgb(170,170,170)'
-];
-
-ps.appleii = [
- 'rgb(255,255,255)' 
-,'rgb(0,0,0)'
-,'rgb(64,53,121)'
-,'rgb(64,75,7)'
-,'rgb(191,180,248)'
-,'rgb(109,41,64)'
-,'rgb(218,60,241)'
-,'rgb(218,104,15)'
-,'rgb(191,202,134)'
-,'rgb(38,195,16)'
-,'rgb(19,87,64)'
-,'rgb(146,214,191)'
-,'rgb(37,151,240)'
-,'rgb(236,168,191)'
-,'rgb(128,128,128)'
-,'rgb(128,128,128)'
-];
-
-
-},{"./style":9}],4:[function(require,module,exports){
-var __dirname="/src";var style = require('./style');
-// node-canvas
-var Canvas = require('canvas');
-if (typeof Image === "undefined") Image = Canvas.Image;
-
-var font = {};
-module.exports = font;
-
-// hack for loading fonts in node... todo, fix this
-font.img_path = "";
-if (typeof document === "undefined") font.img_path = __dirname + "/../examples/web/"
-
-
-font.list = {};
-
-var fsexps = require('./font/fixedsys');
-var cp437s = require('./font/cp437');
-for (f in fsexps) font.list[fsexps[f].name] = fsexps[f];
-for (f in cp437s) font.list[cp437s[f].name] = cp437s[f];
-
-style.font = 'fixedsys_8x16';
-
-var err_font_load = function(){
-  console.log("couldn't load font")
-}
-
-
-font.load = function(font_name, callback_fn){
-  if (!(font_name in font.list)) { return;} // todo error
-  
-  var f = font.list[font_name]
-  
-  if (f.loaded) {
-    callback_fn(f);
-  } else {
-    f.sheet = new Image();
-    f.sheet.crossOrigin = 'anonymous'
-    // node-canvas doesn't have addEventListener :(
-    f.sheet.onload = function(){
-      f.loaded = true
-      callback_fn(f);
-    }
-    f.sheet.src = font.img_path + f.sheet_url
-
-  }
-}
-
-
-},{"./font/cp437":5,"./font/fixedsys":6,"./style":9,"canvas":11}],5:[function(require,module,exports){
-var cp437s = [[8,8],[8,12],[8,14],[8,16],[10,10],[10,16],[12,12],[16,16]]
-var fonts = {};
-module.exports = fonts;
-
-// utf8 -> cp437 function by sheetjs
-// edited from https://github.com/SheetJS/js-codepage/blob/master/bits/437.js
-var cp437 = (function(){ var d = "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\t\n\u000b\f\r\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ÇüéâäàåçêëèïîìÄÅÉæÆôöòûùÿÖÜ¢£¥₧ƒáíóúñѪº¿⌐¬½¼¡«»░▒▓│┤╡╢╖╕╣║╗╝╜╛┐└┴┬├─┼╞╟╚╔╩╦╠═╬╧╨╤╥╙╘╒╓╫╪┘┌█▄▌▐▀αßΓπΣσµτΦΘΩδ∞φε∩≡±≥≤⌠⌡÷≈°∙·√ⁿ²■ ", D = [], e = {}; for(var i=0;i!=d.length;++i) { if(d.charCodeAt(i) !== 0xFFFD) e[d[i]] = i; D[i] = d.charAt(i); } return {"enc": e, "dec": D }; })();
-
-var render_char = function(font, char_value, ctx, ctx_x, ctx_y){
-  char_value = cp437.enc[String.fromCharCode(char_value)] | 0;
-  var sheet_x = (char_value % font.sheet_w_in_chars) * font.char_w
-  var sheet_y = ((char_value / font.sheet_w_in_chars) |0) * font.char_h
-  ctx.drawImage(font.sheet, 
-               sheet_x|0, sheet_y|0, font.char_w, font.char_h,
-               ctx_x|0, ctx_y|0, font.char_w, font.char_h)
-
-}
-
-for (var i=0, wh; wh=cp437s[i]; i++){
-  var font = {};
-  font.is_char_blank = require('../fontutil').is_char_blank;
-  font.render_char = render_char;
-  font.name = 'cp437_' + wh[0] + 'x' + wh[1];
-  font.sheet_url = './img/' + font.name + '.png'
-  font.sheet_w_in_chars = 16;
-  font.char_w = wh[0]
-  font.char_h = wh[1]
-  fonts[font.name] = font;
-}
-
-
-
-// window.cp437 = cp437;
-
-},{"../fontutil":7}],6:[function(require,module,exports){
-var fsexps = [[8,16,0],[8,15,1],[8,8,5]]
-var fonts = {};
-module.exports = fonts;
-
-var render_char = function(font, char_value, ctx, ctx_x, ctx_y, char){
-  var sheet_x = 0, sheet_y = 3;
-  if (char_value >= 0x20 && char_value <= 0x7e){ // ascii
-    sheet_x = (char_value - 0x20) * font.char_w_sheet
-    if (char.i){ // italic
-      sheet_y = 1 * font.char_h_sheet + 3
-    }
- } else if (char_value >= 0x80 && char_value <= 0xff){ // latin-1
-    sheet_x = (char_value - 0x80) * font.char_w_sheet; 
-    sheet_y = 2 * font.char_h_sheet + 3
- } else if (char_value >= 0x0100 && char_value <= 0x017f){ // latin a
-    sheet_x = (char_value - 0x0100) * font.char_w_sheet; 
-    sheet_y = 3 * font.char_h_sheet + 3
- } else if (char_value >= 0x0180 && char_value <= 0x024f){ // latin b
-    sheet_x = (char_value - 0x0180) * font.char_w_sheet; 
-    sheet_y = 4 * font.char_h_sheet + 3
- } else if (char_value >= 0x2500 && char_value <= 0x25ff){ // geom
-    sheet_x = (char_value - 0x2500) * font.char_w_sheet; 
-    sheet_y = 5 * font.char_h_sheet + 3
-  } else if (char_value >= 0x2600 && char_value <= 0x26ff){ // emoji
-    sheet_x = (char_value - 0x2600) * font.char_w_sheet; 
-    sheet_y = 6 * font.char_h_sheet + 3
-  }
-
-  // var sheet_x = (char_value % font.sheet_w_in_chars) * font.char_w
-  // var sheet_y = ((char_value / font.sheet_w_in_chars) |0) * font.char_h + 3
-  ctx.drawImage(font.sheet, 
-               sheet_x|0, (sheet_y|0) + font.y_adj, font.char_w, font.char_h,
-               ctx_x|0, ctx_y|0, font.char_w, font.char_h)
-
-}
-
-for (var i=0, wh; wh=fsexps[i]; i++){
-  var font = {
-    name: 'fixedsys_' + wh[0] + 'x' + wh[1],
-    sheet_url: './img/fsex-simple.png',
-    sheet_w_in_chars: 128,
-    char_w_sheet: 8,
-    char_h_sheet: 16,
-    char_w: wh[0],
-    char_h: wh[1],
-    y_adj: wh[2],
-    is_char_blank: require('../fontutil').is_char_blank,
-    render_char: render_char
-  }
-  fonts[font.name] = font
-}
-},{"../fontutil":7}],7:[function(require,module,exports){
-var util = {};
-module.exports = util;
-
-util.is_char_blank = function(char_value){
-  if (char_value === 32) return true;
-}
-
-util.render_char = function(font, char_value, ctx, ctx_x, ctx_y){
-  var sheet_x = (char_value % font.sheet_w_in_chars) * font.char_w
-  var sheet_y = ((char_value / font.sheet_w_in_chars) |0) * font.char_h
-  ctx.drawImage(font.sheet, 
-               sheet_x|0, sheet_y|0, font.char_w, font.char_h,
-               ctx_x|0, ctx_y|0, font.char_w, font.char_h)
-
-}
-
-
-},{}],8:[function(require,module,exports){
-var char_color = '\x03';
-
-var make_colorcode_fgbg = function(fg, bg){
-  // pad numbers: this prevents irc parsing confusion
-  // when the character after the colorcode is a number
-  if (fg < 10) fg = "0" + fg;
-  if (bg < 10) bg = "0" + bg;
-  return char_color + fg + "," + bg
-}
-
-var colorcode_from_json = function(json, opts){
-  var out = "";
-  for (var li=0, line; line=json.lines[li]; li++){
-    for (var ci=0, char; char=line[ci]; ci++){
-      out += make_colorcode_fgbg(char.fg, char.bg)
-      out += String.fromCharCode(char.value)
-    }   
-    out += "\n";
-  }
-  return out;
-}
-
-
-module.exports = colorcode_from_json;
-
-},{}],9:[function(require,module,exports){
-// default settings for fonts, colors, etc
-var style = {};
-module.exports = style;
-
-},{}],10:[function(require,module,exports){
-var char_color = '\x03';
-var regexp_color = /(^[\d]{1,2})?(?:,([\d]{1,2}))?/;
-
-var style_chars = {
-  '\x02': 'bold',
-  '\x1d': 'italic',
-  '\x1f': 'underline',
-  '\x0f': 'reset',
-  '\x16': 'inverse'
-};
-
-var Style = function(style){
-  this.b = style.b;
-  this.i = style.i;
-  this.u = style.u;
-  this.fg = style.fg;
-  this.bg = style.bg;
-};
-
-var style_fns = {};
-
-style_fns.bold = function(style){ style.b = !style.b };
-
-style_fns.italic = function(style){ style.i = !style.i };
-
-style_fns.underline = function(style){ style.u = !style.u };
-
-style_fns.inverse = function(style){
-  var tmp = style.fg;
-  style.fg = style.bg;
-  style.bg = tmp;
-};
-
-style_fns.reset = function(style, base_style){
-  style.b =  base_style.b;
-  style.i =  base_style.i;
-  style.u =  base_style.u;
-  style.fg = base_style.fg;
-  style.bg = base_style.bg;
-};
-
-var colorcode_to_json = function(string, opts){
-  // looks like its already converted
-  if (typeof string === 'object' &&
-      'lines' in string &&
-      'w' in string &&
-      'h' in string)
-    return string;
- 
-
-  opts = opts || {};
-  var d = colorcode_to_json.defaults;
-
-  var base_style = {
-    b:  "b" in opts ? opts.b : d.b,
-    i:  "i" in opts ? opts.i : d.i,
-    u:  "u" in opts ? opts.u : d.u,
-    fg: "fg" in opts ? opts.fg : d.fg,
-    bg: "bg" in opts ? opts.bg : d.bg
-  };
-
-  var lines_in = string.split(/\r?\n/);
-  var lines_out = [];
-  var w = 0, h = 0;
-
-  for (var i=0; i<lines_in.length; i++){
-    var line = lines_in[i];
-    if (line.length === 0) continue; // skip blank lines
-    var json_line = line_to_json(line, base_style);
-    if (w < json_line.length) w = json_line.length;
-    lines_out.push(json_line);
-    h++;
-  }
-
-  return {w:w, h:h, lines:lines_out};
-};
-
-colorcode_to_json.defaults = {
-  b: false
-, i: false
-, u: false
-, fg: 1
-, bg: 99
-};
-
-var line_to_json = function(line, base_style){
-  var out = [];
-  var pos = -1;
-  var len = line.length -1;
-  var char;
-  var style = new Style(base_style); 
-  
-  while (pos < len){ pos++;
-
-    char = line[pos];
-    
-    // next char is a styling char
-    if (char in style_chars){
-      style_fns[style_chars[char]](style, base_style);
-      continue;
-    }
-
-    // next char is a color styling char, with possible color nums after
-    if (char === char_color){
-      var matches = line.substr(pos+1,5).match(regexp_color);
-      
-      // \x03 without color code is a soft style reset 
-      if (matches[1] === undefined && matches[2] === undefined) {
-        style.fg = base_style.fg;
-        style.bg = base_style.bg;
-        continue;
-      }
-
-      if (matches[1] !== undefined)
-        style.fg = Number(matches[1]);
-
-      if (matches[2] !== undefined)
-        style.bg = Number(matches[2]);
-
-      pos += matches[0].length;
-      continue;
-       
-    }
-
-    // otherwise, next char is treated as normal content
-    var data = new Style(style);
-    //data.value = char;
-    data.value = char.charCodeAt(0);
-
-    out.push(data);
-  }
-  return out;
-};
-
-module.exports = colorcode_to_json;
-
-},{}],11:[function(require,module,exports){
-
-},{}]},{},[1])
-(1)
-});
\ No newline at end of file
diff --git a/js/ext/png.js b/js/ext/png.js
deleted file mode 100644
index e9b326e..0000000
--- a/js/ext/png.js
+++ /dev/null
@@ -1,226 +0,0 @@
-var PNG = (function(){
-
-var crc32 = function(u8){
-  var table = new Uint32Array([
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-  ])
-
-  var crc = 0 ^ (-1)
-
-  for(var i = 0; i < u8.length; i++){
-    crc = (crc >>> 8) ^ table[(crc ^ u8[i]) & 0xFF]
-  }
-
-  //return (crc ^ (-1)) // signed
-  return (crc ^ (-1)) >>> 0
-}
-
-var signature = new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10])
-var te, td
-
-// decodes chunks in png
-// see http://www.w3.org/TR/PNG/#5Chunk-layout
-// returns something like
-// [{length: Number,
-//   type: String[4],
-//   crc: Number,
-//   data: Uint8Array[]  // optional
-// }, ...]
-var decode = function(buf, err){
-  var u8a = new Uint8Array(buf)
-  var dv = new DataView(buf)
-  td = td || new TextDecoder('utf-8')
-  err = err || function(msg){ throw new Error(msg) }
-
-  var out = []
-  var pos = 0
-
-  if (u8a.length < signature.length) return err("not a valid png")
-  for (var i=0; i<signature.length; i++){
-    if (signature[i] !== u8a[i]) return err("not a valid png")
-    pos += 1
-  }
-
-  var done = false
-  while (!done){
-    var chunk = {}
-
-    if (pos + 4 > u8a.length) return err("unexpected end of file")
-    chunk.length = dv.getInt32(pos, false)
-    pos += 4
-
-    if (pos + 4 > u8a.length) return err("unexpected end of file")
-    chunk.type = td.decode(new DataView(buf, pos, 4))
-    pos += 4
-
-    if (chunk.length){
-      if (pos + chunk.length > u8a.length) return err('unexpected end of file')
-      chunk.data = new Uint8Array(buf, pos, chunk.length)
-      pos += chunk.length
-    }
-
-    if (pos + 4 > u8a.length) return err("unexpected end of file")
-    //chunk.crc = new Uint8Array(buf, pos, 4)
-    chunk.crc = dv.getUint32(pos, false)
-    pos += 4
-   
-
-    out.push(chunk)
-    //done = true
-    //console.log(pos.length, u8a.length)
-    if (pos === u8a.length) done = true
-  }
-
-
-  return out
-}
-
-var encode = function(chunks){
-  te = te || new TextEncoder('utf-8')
-
-  var size = 8 // inital png signature
-  for (var i=0, c; c=chunks[i]; i++){
-    size += 4 // length
-    size += 4 // type
-    size += c.length // data
-    size += 4 // crc32 
-  }
-
-  var buf = new ArrayBuffer(size)
-  var u8 = new Uint8Array(buf)
-  var dv = new DataView(buf)
-  var pos = 0
-
-  u8.set(signature, 0)
-  pos += 8
-
-  for (var i=0, c; c=chunks[i]; i++){
-    dv.setInt32(pos, c.length, false) // length
-    pos += 4
-    var chunk_type_u8 = te.encode(c.type) // type
-    u8.set(chunk_type_u8, pos)
-    pos += 4
-    if (c.length){
-      u8.set(c.data, pos) // data
-      pos += c.length
-    }
-    //u8.set(c.crc, pos) // crc32
-    dv.setUint32(pos, c.crc, false) // crc32
-    pos += 4
-  }
-
-  return u8
-}
-
-
-var make_itxt_chunk = function(keyword, txt){
-  te = te || new TextEncoder('utf-8')
-  var keyword_u8 = te.encode(keyword)
-  var txt_u8 = te.encode(txt)
-  var header_u8 = new Uint8Array(keyword_u8.length + 5)
-  header_u8.set(keyword_u8, 0)
-  // header has keyword, then a null byte and some additional fields
-  // see http://www.w3.org/TR/PNG/#11iTXt
-  var chunk = {type: 'iTXt'}
-  chunk.length = header_u8.length + txt_u8.length
-  var u8 = new Uint8Array(4 + chunk.length)
-  // put type and data on the same u8 array so we can calculate crc
-  u8.set(te.encode(chunk.type), 0)
-  u8.set(header_u8, 4)
-  u8.set(txt_u8, header_u8.length + 4)
-  chunk.crc = crc32(u8)
-  chunk.data = new Uint8Array(u8.buffer, 4)
-  return chunk
-}
-
-var read_cstring = function(u8, pos){
-  var str = ""
-  while (pos < u8.length){
-    if (u8[pos] === 0) return str
-    str += String.fromCharCode(u8[pos])
-    pos++
-  }
-  return str
-}
-
-var decode_itxt_chunk = function(chunk){
-  td = td || new TextDecoder('utf-8')
-  var data = {}
-  var pos = 0
-  data.keyword = read_cstring(chunk.data, 0)
-  pos += data.keyword.length + 1
-  data.compression = chunk.data[pos]
-  pos += 1
-  data.compression_method = chunk.data[pos]
-  pos += 1
-  data.language = read_cstring(chunk.data, pos)
-  pos += data.language.length + 1
-  data.translated_keyword = read_cstring(chunk.data, pos)
-  pos += data.translated_keyword.length + 1
-  var data_u8 = chunk.data.subarray(pos)
-  data.data = td.decode(data_u8)
-  return data
-}
-
-var canvas_to_blob_with_colorcode = function(canvas, cc){
-  var u8 = dataUriToUint8Array(canvas.toDataURL())
-  var chunks = decode(u8.buffer)
-  var itxt_chunk = make_itxt_chunk('colorcode', cc)
-  // assume we wanna insert the chunk very last, just in front of the end
-  chunks.splice(chunks.length - 1, 0, itxt_chunk)
-  var blob = new Blob([encode(chunks)], {type: 'image/png'})
-  return blob
-}
-
-var exports = {}
-exports.crc32 = crc32
-exports.decode = decode
-exports.encode = encode
-exports.make_itxt_chunk = make_itxt_chunk
-exports.decode_itxt_chunk = decode_itxt_chunk
-exports.canvas_to_blob_with_colorcode = canvas_to_blob_with_colorcode
-return exports
-
-})()