Add highlight-style support
add highlightStyle options in tests
fix tests after rebase