Added themes choice list to model