Thanks for your help, window switches are soldered with the t5 bulbs and looking much better,
Just headlight adjuster, instrument panel, lock switch and heater then done.
Don't suppose you know any easyish way to get the heater out as in struggling a bit
Sent from my Pixel 3 XL using Micra...