Code cleanup
Remove default tap highlight colour
Optimised build
Merge branch 'v2'