Revised the color mapping system