connectors and contacts supply?

NAPA stores have the OEM type terminals for the bulkhead but not the plastic connectors they're in. I think the plastic connector at the headlight switch is the same for umpteen years so a good used one should be easy to get from parts wanted form here.