Improved color mapping