Rebased to shape style