refactor thematic plan