WIP: ThemeProblemSolver #7

Draft
Kocoder wants to merge 10 commits from ThemeProblemSolver into master

10 Commits