Prep for Beta 6

Addition of the color picker