Various highlighting improvements and bug fixes. Reproducible: Always Steps to Reproduce: 1. 2. 3.
done