add team colors to widget
optimize core
Merge branch 'master' into dev