correct enum name and add colors to particles
Merge branch 'Joe'