Refactor the theme