Tactics Grouped by Theme

Does anybody know where I can find a PGN or CBH with lots of tactics positions grouped by theme?

Themes like Double Attack, Skewer, X-Ray, Discovered, Windmill, Interference, Blocking, Deflection, Decoy, Overload, Pin, Zugzwang, Zwischenzug, Desperado, Line Opening and Closing, Removal of Defender, etc.

I know of books like "Chess Tactics from Scratch", "Test Your Tactical Ability", "Chess Tactics for Kids", but they only have a few, basic, themes;

Does there exist a book with a more comprehensive list of themes than the ones mentioned above?

I know that chess.com and chesstempo has tactics trainer by theme, but apart from being a premium feature, I would like something offline, like a book or a database.

Thanks in advance!

In the king chess website you will find what you are looking for. Go to the learn tab and choose thr course, than you can download the png of each problem.