Fixed color conflicts