big refactor of topic -> theme, subtopic -> topic