Everything but the scripts

* All the remaining visual elements

* Some lighting work

* Merged the two scene files