Revert "Remove origin-x and origin-y from shape"

This reverts commit 5e89e9feadebb47127a1a776a3f60fb06bad4635.