Add highlight-style support