Dodge neon headlights swap

Ok, i've got a 2000 Peon now and i am gettin a billet grill made for between the lights. my question is does anyone know if the newer style lights bolt right into my model? i've included the pics of both, i know they both look the exact same shape but i love the turn signal being built into the light. and also, are they both 9007 bulbs? if anyone knows any of these answers that would be lots of help....