Theme chooser fixes