Fixed color issues again