[REFACTOR] Fix keyframe mixin, add makemove animation