Improved CSS Highlighting