Initial fix for color picker.  Completely working now except for a slight bug with the default color restore function. #123