Refactored highlights
Merge pull request #205 from squix78/DevBranch

Refactored highlights