tidy up styles, themes and clear some lint warnings