Fix color vortex animation
Add pause button.
Finish merge from master