Better order of modes in switch statement
Not mix error count to error list
Decorate tools color
Merge branch 'Thanh'