rework of the theme and pages.