Refactoring and all Kinetic Shapes and Properties.