Added color vectors for races
Fixed conflicts