More color coding
Merge branch 'dev' of https://github.com/paddy3883/Arigato into dev