Not the best thread title in the world I know but did not know what else to put

Did subaru change the connectors for all the front lamps between MY98 and MY99?

In rebuilding the front end of my car I have found the connectors on my MY98 car do not natch the connectors on the new indicators and fog lamps I have bought.

Any ideas how I can get the connectors I need? the originals from the indicators and fog lamps got mashed in the crash

also where would be the best place to get the bulb holders for the side lights as it would appear you do not get new ones when you order replacments

please help, I need these to be able to put my car back together