Reworked lights under the hood, better decoupling and less API calls