Refactor transformations, repeaters and shapes, add animation duration