Revert "Revert "Lights changes from ronasimi and paulicat""

This reverts commit 7fe90ef9e1db348edcdc46744287ebf44f36d14c.