add additional highlight colors
refactor command structure
Merge branch 'devlamer'