Revert "Revert "More messing with lighting""

This reverts commit a91ccca8855358829699a254bc429a50f288c49b.