Add better color-picker support. #1