Remove Animate, add Variables and Mixins