revert updates for mr1.1
Revert "revert updates for mr1.1"

This reverts commit c836a2046a479e10f923445ffb975d7012c406d0.
fixup capacitive lights...
testing some changes