Changes to make Theme chooser compatable