Renaming light "color" to "intensities"
Merge remote-tracking branch 'upstream/master'