Crypto Categories #2

I rather liked the first Crypto Categories puzzle, so I thought I'd do another one. While I could easily have kept some of the same categories from the original puzzle (using different members of those categories, naturally), I decided I'd rather come up with 18 new categories, which made it somewhat difficult for me. It probably also makes it difficult for you, as these categories seem to be a bit tougher than those in the first one. This puzzle also has something sneaky (or perhaps not so sneaky) in common with yesterday's Diagramless; can you figure out what it is? (Here's a hint: if I had been planning this fully ahead of time, I would have posted today's puzzle before yesterday's.)

ETA: I forgot to include a clarification for three of the categories. If you see an asterisk by a category, it means you should ignore any number which comes at the end of the name. I have added this clarification to the puzzle and uploaded a new file.