diff --git a/examples/html/entityProperties.html b/examples/html/entityProperties.html
index cffca523d7..a8eff20df7 100644
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@@ -328,6 +328,7 @@
             var elZoneSections = document.querySelectorAll(".zone-section");
             allSections.push(elZoneSections);
             var elZoneStageSunModelEnabled = document.getElementById("property-zone-stage-sun-model-enabled");
+
             var elZoneKeyLightColor = document.getElementById("property-zone-key-light-color");
             var elZoneKeyLightColorRed = document.getElementById("property-zone-key-light-color-red");
             var elZoneKeyLightColorGreen = document.getElementById("property-zone-key-light-color-green");
@@ -337,6 +338,7 @@
             var elZoneKeyLightDirectionX = document.getElementById("property-zone-key-light-direction-x");
             var elZoneKeyLightDirectionY = document.getElementById("property-zone-key-light-direction-y");
             var elZoneKeyLightDirectionZ = document.getElementById("property-zone-key-light-direction-z");
+            var elZoneKeyLightAmbientURL = document.getElementById("property-zone-key-ambient-url");
 
             var elZoneStageLatitude = document.getElementById("property-zone-stage-latitude");
             var elZoneStageLongitude = document.getElementById("property-zone-stage-longitude");
@@ -568,15 +570,17 @@
                                 }
 
                                 elZoneStageSunModelEnabled.checked = properties.stage.sunModelEnabled;
-                                elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLightColor.red  + "," + properties.keyLightColor.green + "," + properties.keyLightColor.blue + ")";
-                                elZoneKeyLightColorRed.value = properties.keyLightColor.red;
-                                elZoneKeyLightColorGreen.value = properties.keyLightColor.green;
-                                elZoneKeyLightColorBlue.value = properties.keyLightColor.blue;
-                                elZoneKeyLightIntensity.value = properties.keyLightIntensity.toFixed(2);
-                                elZoneKeyLightAmbientIntensity.value = properties.keyLightAmbientIntensity.toFixed(2);
-                                elZoneKeyLightDirectionX.value = properties.keyLightDirection.x.toFixed(2);
-                                elZoneKeyLightDirectionY.value = properties.keyLightDirection.y.toFixed(2);
-                                elZoneKeyLightDirectionZ.value = properties.keyLightDirection.z.toFixed(2);
+                                elZoneKeyLightColor.style.backgroundColor = "rgb(" + properties.keyLight.color.red  + "," + properties.keyLight.color.green + "," + properties.keyLight.color.blue + ")";
+                                elZoneKeyLightColorRed.value = properties.keyLight.color.red;
+                                elZoneKeyLightColorGreen.value = properties.keyLight.color.green;
+                                elZoneKeyLightColorBlue.value = properties.keyLight.color.blue;
+                                elZoneKeyLightIntensity.value = properties.keyLight.intensity.toFixed(2);
+                                elZoneKeyLightAmbientIntensity.value = properties.keyLight.ambientIntensity.toFixed(2);
+                                elZoneKeyLightDirectionX.value = properties.keyLight.direction.x.toFixed(2);
+                                elZoneKeyLightDirectionY.value = properties.keyLight.direction.y.toFixed(2);
+                                elZoneKeyLightDirectionZ.value = properties.keyLight.direction.z.toFixed(2);
+                                elZoneKeyLightAmbientURL.value = properties.keyLight.ambientURL;
+
 
                                 elZoneStageLatitude.value = properties.stage.latitude.toFixed(2);
                                 elZoneStageLongitude.value = properties.stage.longitude.toFixed(2);
@@ -819,21 +823,20 @@
                 onSubmit: function(hsb, hex, rgb, el) {
                     $(el).css('background-color', '#'+hex);
                     $(el).colpickHide();
-                    emitColorPropertyUpdate('keyLightColor', rgb.r, rgb.g, rgb.b);
+                    emitColorPropertyUpdate('color', rgb.r, rgb.g, rgb.b, 'keyLight');
                 }
             });
-            var zoneKeyLightColorChangeFunction = createEmitColorPropertyUpdateFunction(
-                'keyLightColor', elZoneKeyLightColorRed, elZoneKeyLightColorGreen, elZoneKeyLightColorBlue);
+            var zoneKeyLightColorChangeFunction = createEmitGroupColorPropertyUpdateFunction('keyLight','color', elZoneKeyLightColorRed, elZoneKeyLightColorGreen, elZoneKeyLightColorBlue);
             elZoneKeyLightColorRed.addEventListener('change', zoneKeyLightColorChangeFunction);
             elZoneKeyLightColorGreen.addEventListener('change', zoneKeyLightColorChangeFunction);
             elZoneKeyLightColorBlue.addEventListener('change', zoneKeyLightColorChangeFunction);
-            elZoneKeyLightIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('keyLightIntensity'));
-            elZoneKeyLightAmbientIntensity.addEventListener('change', createEmitNumberPropertyUpdateFunction('keyLightAmbientIntensity'));
-            var zoneKeyLightDirectionChangeFunction = createEmitVec3PropertyUpdateFunction(
-                'keyLightDirection', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY, elZoneKeyLightDirectionZ);
+            elZoneKeyLightIntensity.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('intensity','keyLight'));
+            elZoneKeyLightAmbientIntensity.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('keyLight','ambientIntensity'));
+            var zoneKeyLightDirectionChangeFunction = createEmitGroupVec3PropertyUpdateFunction('keyLight','direction', elZoneKeyLightDirectionX, elZoneKeyLightDirectionY, elZoneKeyLightDirectionZ);
             elZoneKeyLightDirectionX.addEventListener('change', zoneKeyLightDirectionChangeFunction);
             elZoneKeyLightDirectionY.addEventListener('change', zoneKeyLightDirectionChangeFunction);
             elZoneKeyLightDirectionZ.addEventListener('change', zoneKeyLightDirectionChangeFunction);
+            elZoneKeyLightAmbientURL.addEventListener('change', createEmitGroupTextPropertyUpdateFunction('keyLight','ambientURL'));
 
             elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','latitude'));
             elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage','longitude'));