Adding theme chooser stuff