I enjoyed this too, though It was my quickest solve ever.
And I agree that one of the thematics does seem out of place, unless my knowledge of the subject and research are both defective.
I do have one small residual query, on 12 down, which I assume is not thematic. What is the last letter of the answer?
I have a perfectly good answer, as a noun, but the first word of the clue seems superfluous. Chambers seems to recognise only the verb form.