Fixed 2 COLORS-related highlighting issues