Continue working on the theme