I think I have the grid, except for 16a and 16d.
I think I have the extra letters from across clues...
they could form a hyphenated word if one letter is different.
All but one of the same letters from down clues.
I have the unclued 17d, 26a (not 16a yet).
I haven't been able to put these together to make a theme.