John H posted:
It is much easier to disconnect the wires from the switch. I extend the wires with 4 conductor phone cable using terminal strips in between. I have short pigtails of phone wire with a phone connector on each switch and use a double female phone coupler to connect to the extension wire. If the switch needs to come out I can just unplug it under the layout. The phone cable wire colors match the controller wire to make it simpler.
I like your way of wiring and will use your method in the future, simple and easy