Adding support for multiselection of themes