Added support for dynamic Theme swhitching.