Replacement connectors for engine bay

Does anybody know the best place to buy the correct connectors for the Mk1 GTi tintop engine bay, particularly the brown one which attaches to the water outlet flange I believe and also the green one which I think goes to the WUR?  I believe these are referred to as junior timer or junior power timer connectors, but I want to make sure I am getting the right thing.

 

I've got bits from here before. 

http://www.vehicle-wiring-products.eu/section.php/114/1/junior-timer-and-power-timer-connectors/17a832f574fce19ee4c1a745372f017e

Cheers for that, I've been on their website lots before so the answer was right under my nose!!!

I've ordered some 2 pin and 4 pin junior power timers, connector boots plus terminals and heat shrink.