Organize highlighting better in Vim