merged old theme chooser