Revert "Revert "More lighting stuff""

This reverts commit e77ea1d0e642152c44d689a6e832162b192f08ee.

Revert "More lighting stuff"

This reverts commit
e56b4bc07c6a02fd2cc2d66d0df6df92a6d6dc45.

Revert "More lighting stuff"

This reverts commit
e56b4bc07c6a02fd2cc2d66d0df6df92a6d6dc45.