Add support for text color & text highlight color