Changes to colors
More highlighting related changes