Add back theme chooser