Adding more robust color management