@ GadgetUk
I've just done the mod's to my 138 in 1 cart - took ages to come from AliExpress and the quality is not as good as the 161 in 1 either.
That aside, I set about applying your cap fixes, etc. Then decided to house the dipswitch on the top front of the case - minimising trailing wires...