Added framework for canvases in Upgrades menu. Markus, you fix my trail of failure :D. Repainting does NOT work.
Removed conflicts