cleanup
using colour library
added separate teams and colors