Fixed color issues