Some changes in the base theme, added some models