300EC Wiring Harnes

[300gg]

I have just purchased an 06 300ec. The rear subframe was removed to be repaired and the wires unplugged & I was not positive which plug together.

Both on CDI
Orange <-> Black should these be plugged into each other ?

Conections at rear of tank
CDI <-> Wiring harnes
Blk/Yel <-> Blk/Yel ( Female Round )
Blk/Wht <-> Yel/Grn ( Male Flat )
Wht/Dark Blue <-> Wht/Light Blue (Male Flat )
? Yel ( Male Round ) on harnes - Not used ?