Change ThemeModel to Theme