Factory terminals to re-pin connectors?

So I've already yanked my entire engine bay and have rewired it using a scrap harness I got from work with a new modern style bulkhead connector. I'm now looking at the interior and thinking about doing the same thing as I still have a big box of wire left over. The wire I have is really nice stuff with much better style insulation that stays nice and flexible, and I already have it and a fuse panel, so the only cost I'd incur would be terminals, so I'm not necessarily looking to get an aftermarket full universal kit. My question is what style terminals do the factory plugs tend to use? Stuff like the ignition and wiper switches and whatnot. I thought about just cutting them off the factory harness and soldering on my new wires, but I figured if I can get the terminals and go all new that would probably be my preference. I think I remember hearing the bulkhead connector was a Packard 56 at least, but is the same true of other interior pieces?