Use BookletState changes

We've made some backwards incompatible changes (sorry).