first revamping of the theme