Separate lightshaft from sun
Rename variable + bugfix