restructuring the theme