Readded Universal Wires

I've spent few hours and readded the universal wires. Tested them on TE and a couple of machines and they all work.

Consider merging this PR. :)