@beam0, you just gave me an idea for the 1st light.

Thank you. Do you think there would be a way to gut the switch and put the e-switch there?