What doorcards and arm rests should my car have?

I have a 1983 mk1 gti. Im currently trying to sort my interior out as it's abit of a mess. At the minute i have doorcards with the speaker pods and the door handles are the long ones that go up at an angle (so there are 3 holes in the doorcard) like this:



but with door handles like this



I've no idea if this is the correct setup? or are they from a cabby?

If so then what do i need? 

My '83 GTI is the same, door pockets with speakers, long armrest that goes up at the handle bit 

Yep thats right.