Fixed all color issues