Fixed color handling, improved hints