Fixed a few color issues