Back to OE

Guys, i have a 1985 GTi cab, currently sporting four lamps with no red surround trim and 15" P slot alloys. I am trying to get it back to original, so-

1. Would it have come with single lamps and red grill trim as standard as the cab model?
2 Would it have come with tarantula alloys? Looking at the p-slots it has AA on the wheels so i take it they are from a mk2?

Thanks in advance,
Neil.