restore theme chooser compatability, or at least until the themers update the themes to match the new code

Change-Id: Ib3b075b23b98cb6f08c45b6f1e1069c0bde8a0be