Reworking the theme a bit more