Improve support for color tokenization.