Improve color management