improved color mapping