Added theme chooser and images