more full integration of the theme