Improved coloring. Added mapping for string values.