The trouble with this is deciding what goes into what theme, and what if they cross over into another theme as well? Some stamps just seem to defy fitting into any category.

And do I keep any word stamps with the images, or file them with words/definitions etc?

Note to self: Do not buy any more, the folder is full!
So I pulled all the images from the various folders they were in, except for the Christmas ones. They will stay with Christmas stamps. Which explains the stamp mountain on my desk.
I sorted them back out into complete sets.

Of course, this now means I have to re-organise the Expedit while I try to find it.
What I did do was to get images of all the stamp sets, and print them out onto A5 paper. In one or two cases, I had to stamp the images onto sheets and scan them in, as the stamp sets are now retired and I couldn't find images anywhere.
It does mean I can print more than one copy, so I can file one with the CB stamps, and one within the theme(s) it fits, in A5 binders, which will be easier to flick through than the stamp binders. I'm hoping this will work better than previous systems.
Edit: Two hours later, stamp found- along with two others I hadn't missed yet! And the Expedit is clean & tidy again.