Fixed Coloring and Highlight Issues