Add color swatches
Set color
Painting feature
Make canvas better
merged in from upstream