removed datamodels, added some themes