fixed color scheme and highlighting