Built lighting and mats
Merge branch 'master' into UserInterface