re-building the theme