Advanced highlighting (fixes #9)