Fix animation and colors