Merge in changes from client projects needs a little clean up
Change back to default colors