Start work on color picker
Resolve merge conflict