Most everything is interchangeable, except for the fried egg which will need a different fender and bumper.
The newer 996 is the fried egg lights. Like this:
http://cgi.ebay.com/ebaymotors/ws/eBayISAPI.dll?ViewItem&rd=1&item=2487444077&category=10156#ebayphotohosting