Cleanup. Add Color Chooser