Updating: improving contrib/HTML/canvas-2d