I found the exact lights! I ordered the additional yellow lenses instead of reusing the original. Had to splice the new one into the existing wires. Word of caution : use a razor blade or similar to cut the paint edge around the original light so it will not peal a larger area of paint when removing the old light.
Hopefully this helps make it easier for someone else.
I was hoping to find a light with a socket and not the built in circuit board but oh well, glad to find 5he exact ones!
Now to get her inspected!