Adding New Themes to FrameworkBuilder

Using Framework Builder from current version of SuperSuite - DW CS6

I have dynamic themes going on all the pages on my site. The theme is called dynamically on each page based on a value from a recordset on the page (I created a recordset called "rsTheme" so that the variable that triggers the theme and the Variable Value will have the same name on every page). So far, so good - works like a charn switching between themes based on database value.

My problem is that if I add a new theme I have to go to each page to update the Dynamic Theme server behavior on each page. When I click the "Apply to all pages that use this template" option checkbox DreamWeaver hangs and the other pages aren't updated. Have to force close to get back in.

Am I missing a simpler way to do this? Kind of defeats some of the beauty of FB if I have to update every page everytime I add a theme.

Complications: I have dynamic data on the template page, and I have a dynamically generated menu on the template page as well. I wonder if all of these recorsets are getting in the way of the Apply to all pages?

Any help is greatly appreciated. FB is really brilliant and will simplify my workflow dramatically if I can get this to work properly.