More customLight changes