Fix a bunch of color issues