Polish the theme a litte bit