Add highlight-style support in compare