Add canvas, rename some constants