Highlighting now uses classes rather than inline styles