You're Welcome
In the mock bookings that I've done today, the All Included does state Basic Bev, Wifi and Grats.
And yes, I believe any repricing going forward will be with the new booking model/options. I have 5 sailings booked. 3 Retreat and 2 w/Indulge. I believe I have the best prices I'll see for these but if there is a significant drop, I'll have to weigh my options at that time to best suit my vacay style.
Patty