Polishing the theme