Cloverjo, my 15 A isn't thematic. It might be what you have, maybe needing a hyphen - I didn't check.
17 A and 17 D are both thematic. I got them from letters I had and from the theme, so I didn't work out all the stuff mentioned in the preamble.
For 17 A, I think 'pirates' is the definition for the entry.
I'm unsure how 17 D works, so won't give a hint that may be unhelpful!