Major rework of color picker per #27.