Halogen Light Upgrades?

[F15DOC]

So, I spotted an old post awhile back with a discussion on upgrading the headlights.

The dealer cost was ridiculous, I think I read around $1800 per side!

What I don't like is that the fog lights are halogen and are bright white and the headlights are that older warm yellowish light (dont know the actual freqs)

Has anyone found a simple bulb swapout that will at least match the color without the expense of swapping out the entire lighting system?