Fixed most color issues