Add space between matching token and its underline
Use white underline for matching tags