Bug fixes in the animation
Coloring fixes