Improve highlight colors to be more easily scannable