Fixed color bugs