Crikey! This one's difficult (for me, anyway) to enter into the grid. I've got probably about 75% of the solutions and many/most of the 2 themed groups but seem to be so few places where one can enter solutions with confidence. I've got so many places in the grid where I'm thinking 'well, it could be that, or it could be that, or, wait a minute, it could also be that....'
Probably time to put it down and come back to it tomorrow.