Your diagram is good but I would just like to add that I have fitted after market electric windows to various mk2s and mk3s in the past and have found that some aftermarket switches do not have the same terminal pattern as your diagram (which looks like the O.E switches ), ie the terminals are lined up in parallel ( one below the other ) .
They were the dealer fit kits but I think they were made by an Italian firm (and the insructions were not translated very well .

)
Hope this info helps as some might get confused if they have got the switches that I have described .

Oli
