Merge "Use correct prefix highlight color"