Iconic D&D Locations

I'm going to be slipping into fantasy mode for a bit in anticipation for Swords & Wizardry Appreciation Day on the 17th. This will get me back in the right mindset for the subject matter as well as "flushing the system" a bit. I've been working on either the kitchen sink Sci-Fi setting or the house ruleset that I'm starting to get a little burned out on sci-fi at the moment. That never lasts, though, so fear not I'll be back to sci-fi before you know it!

I talked a bit the other day about building a Swords & Wizardry campaign based on iconic D&D settings. The base of the setting will largely be the Known World, aka Mystara  that was fleshed out in the Basic D&D GAZ series of sourcebooks (along with that of the Savage Coast). I'm thinking of adding the Hollow World into the mix as well, only not as a world-within-a-world but possibly as another continent. There were also be some other changes to add in other bits like Barovia from Ravenloft since Castle Ravenloft is an iconic D&D location. I've got through many of my adventures and made a note of locations that the setting will contain.

Castle Ravenloft/Barovia
Temple of Elemental Evil
White Plume Mountain
Keep on the Borderland
Caves of Chaos
Tomb of Horrors
Castle Greyhawk
Menzoberranzan
Barrier Peaks
Sigil, City of Doors (to tie in any planar bits I may toss in)
Shady Dragon Inn
Palace of the Silver Princess
Lost City of Cynidecia
Castle Caldwell
Castle Amber
Ruins of Undermountain
Palace of the Vampire Queen
Thunderdelve Mountain
Isle of Dread
Xak Tsaroth
Sunless Citadel

There are others and so this list will undoubtedly grow. I'm also sure that I'll miss a few even after my extensive search, so if there are any suggestions, I'm more than open to them.