Refactor get_by_subtheme. closes #9