reorganize code
Merge branch 'add-highlight-property'