Add better color-picker support