As I type this still two clues to go, annoyingly (I have ideas but cannot confirm), but the theme is all sorted. For a while was puzzled by the cross-checking entries, and then grabbed hold of the wrong end of the stick on 7d, but once the penny dropped the left half of the puzzle finally became clear. On the easy side even with all of the different clue types to keep track of.
In other news, may as well give my traditional University Challenge plug. A must-win match on Monday against Pembroke. Actually every game from now is win or bust... but one step at a time, eh?