better highlighting color
biiig refactor
Merge branch 'refactor'