Reworked color management