Fix 2 lines in subs
Add seps to Jesting to divide by themes. Add non-jesting