Rework of everything

Broke the generation lighting