Change canvases and input surface

There are now only 3 canvases (previously 5) and the original canvas is
used as the input surface.
Merge branch 'master' into gh-pages