correct team names + refactor color names