theme dependable widget management?

I have a number of themes in one installation that I wish to show the demo sites, and each theme uses different widgets. Problem is, when I switch theme (using wonderful WP Theme Demo Bar), it messes up my widget items.

Is there a plugin that can assign widgets to a a specific theme? So that when a user chooses to preview a demo site, it shows exactly the correct widgets.
Thanks!