more color picker work

Nearing complete implementation of color picker (minus bug fixes)