ST: Updated matcher for current class highlighting