Improved highlighting regex.