Reworking the theme