diff --git a/applications/materialDataCreator/appMaterialDataCreator.js b/applications/materialDataCreator/appMaterialDataCreator.js
index 2735c97..d9d11be 100644
--- a/applications/materialDataCreator/appMaterialDataCreator.js
+++ b/applications/materialDataCreator/appMaterialDataCreator.js
@@ -4,6 +4,7 @@
 //
 //  Created by Alezia Kurdis, April 12th, 2020.
 //  Copyright 2020 Vircadia and contributors.
+//  Copyright 2022 Overte e.V.
 //
 //  A tool to generate materialData.
 //
@@ -19,7 +20,7 @@
     var APP_ICON_INACTIVE = ROOT + "images/icon_materialDate_inactive.png";
     var APP_ICON_ACTIVE = ROOT + "images/icon_materialDate_active.png"; 
     var appStatus = false;
-    var channel = "materialDataCreator.ak.vircadia";
+    var channel = "materialDataCreator.ak.overte";
     var nightmode = false;
     var demoID, materialID;
     var currentMaterialRecord;
@@ -250,10 +251,10 @@
                 position: prop.position
             };
         }         
-        if (shape === "vircadia"){
+        if (shape === "brand"){
             newDemoDefinition = {
                 type: "Model", 
-                modelURL: ROOT + "models/vircadia.fbx",
+                modelURL: ROOT + "models/brand.fbx",
                 name: "MATERIAL DEMO",
                 grab: {
                     grabbable: true
diff --git a/applications/materialDataCreator/images/demo_brand.png b/applications/materialDataCreator/images/demo_brand.png
new file mode 100644
index 0000000..7d73726
Binary files /dev/null and b/applications/materialDataCreator/images/demo_brand.png differ
diff --git a/applications/materialDataCreator/images/demo_vircadia.png b/applications/materialDataCreator/images/demo_vircadia.png
deleted file mode 100644
index a87ab0d..0000000
Binary files a/applications/materialDataCreator/images/demo_vircadia.png and /dev/null differ
diff --git a/applications/materialDataCreator/images/trottoire.png b/applications/materialDataCreator/images/trottoire.png
index 43c7adb..6f2918d 100644
Binary files a/applications/materialDataCreator/images/trottoire.png and b/applications/materialDataCreator/images/trottoire.png differ
diff --git a/applications/materialDataCreator/images/zoneDayAmbient.jpg b/applications/materialDataCreator/images/zoneDayAmbient.jpg
index 365c179..eb79d63 100644
Binary files a/applications/materialDataCreator/images/zoneDayAmbient.jpg and b/applications/materialDataCreator/images/zoneDayAmbient.jpg differ
diff --git a/applications/materialDataCreator/images/zoneNightAmbient.jpg b/applications/materialDataCreator/images/zoneNightAmbient.jpg
index 2a38a46..94a7e06 100644
Binary files a/applications/materialDataCreator/images/zoneNightAmbient.jpg and b/applications/materialDataCreator/images/zoneNightAmbient.jpg differ
diff --git a/applications/materialDataCreator/materialDataCreator.html b/applications/materialDataCreator/materialDataCreator.html
index eef8498..255cf46 100644
--- a/applications/materialDataCreator/materialDataCreator.html
+++ b/applications/materialDataCreator/materialDataCreator.html
@@ -4,6 +4,7 @@
 //
 //  Created by Alezia Kurdis, April 12th, 2020.
 //  Copyright 2020 Vircadia and contributors.
+//  Copyright 2022 Overte e.V.
 //
 //  A tool to generate materialData.
 //
@@ -118,7 +119,7 @@
                                     "name": "untitled",
                                     "albedo": "#ffffff",
                                     "metallic": 0.001,
-                                    "roughness": 0.5,
+                                    "roughness": 1.0,
                                     "opacity": 1,
                                     "emissive": "#000000",
                                     "bloom": 1,
@@ -133,7 +134,8 @@
                                     "emissiveMap": "",
                                     "scatteringMap": "",
                                     "occlusionMap": "",
-                                    "cullFaceMode": "CULL_BACK"
+                                    "cullFaceMode": "CULL_BACK",
+                                    "defaultFallthrough": false
                                 }; 
 
 
@@ -142,7 +144,7 @@
                                     "name": "untitled",
                                     "albedo": "#ffffff",
                                     "metallic": 0.001,
-                                    "roughness": 0.5,
+                                    "roughness": 1.0,
                                     "opacity": 1,
                                     "emissive": "#000000",
                                     "bloom": 1,
@@ -157,7 +159,8 @@
                                     "emissiveMap": "",
                                     "scatteringMap": "",
                                     "occlusionMap": "",
-                                    "cullFaceMode": "CULL_BACK"
+                                    "cullFaceMode": "CULL_BACK",
+                                    "defaultFallthrough": false
                                 };   
                                 
                 document.materialEditor.reset();
@@ -166,7 +169,7 @@
                 document.materialEditor.metallic.value = 1;
                 document.materialEditor.metallic_value.value = 0.001;
                 document.materialEditor.roughness.value = 500;
-                document.materialEditor.roughness_value.value = 0.5;
+                document.materialEditor.roughness_value.value = 1.0;
                 document.materialEditor.opacity.value = 1000;
                 document.materialEditor.opacity_value.value = 1;
                 document.materialEditor.emissive.value = "#000000";
@@ -185,6 +188,7 @@
                 document.materialEditor.scatteringMap.value = "";
                 document.materialEditor.occlusionMap.value = "";
                 document.materialEditor.cullFaceMode.value = "CULL_BACK";
+                document.materialEditor.defaultFallthrough.checked = false;
                 generateMaterialJSON();                
             }
                 
@@ -219,6 +223,7 @@
                 document.materialEditor.scatteringMap.value = material.scatteringMap;
                 document.materialEditor.occlusionMap.value = material.occlusionMap;
                 document.materialEditor.cullFaceMode.value = material.cullFaceMode;
+                document.materialEditor.defaultFallthrough.value = material.defaultFallthrough;
                 
             }
             
@@ -232,7 +237,11 @@
                         if (attribute === "unlit") {
                             material[attribute] = valueContainer.checked;
                         } else {
-                            material[attribute] = valueContainer.value;
+                            if (attribute === "defaultFallthrough") {
+                                material[attribute] = valueContainer.checked;
+                            } else {
+                                material[attribute] = valueContainer.value;
+                            }
                         }
                     }
                 }
@@ -268,64 +277,104 @@
             function generateMaterialJSON() {
                 
                 var materialData = "";
+                var fstMaterialData = "";
+                
                 
                 materialData += '{' + "\n";
                 materialData += '    "materialVersion": 1,' + "\n";
                 materialData += '    "materials": [' + "\n";
-                materialData += '        {' + "\n";               
+                materialData += '        {' + "\n";
+                
+                fstMaterialData += '{"mat::' + material.name.escapeJSON() + '": {"materials":[{ "name": "' + material.name.escapeJSON() + '"';
+                    
                 if (material.name !== "") {
                     materialData += '            "name": "' + material.name.escapeJSON() + '",' + "\n";
-                } 
+                }
+                
+                
                 materialData += '            "albedo": ' + hexToRgb(material.albedo, 1) + ',' + "\n";
+                fstMaterialData += ', "albedo": ' + hexToRgb(material.albedo, 1);
+                
                 if (material.metallicMap === "") {
                     materialData += '            "metallic": ' + material.metallic + ',' + "\n";
+                    fstMaterialData += ', "metallic": ' + material.metallic;
                 }
-                if (material.roughnessMap === "") {                
+                if (material.roughnessMap === "" && material.roughness !== 1.0) {                
                     materialData += '            "roughness": ' + material.roughness + ',' + "\n";
+                    fstMaterialData += ', "roughness": ' + material.roughness;
                 }
-                if (material.opacityMap === "DO NOT USE") {
+                if (material.opacityMap === "DO NOT USE" && material.opacity !== 1.0) {
                     materialData += '            "opacity": ' + material.opacity + ',' + "\n";
+                    fstMaterialData += ', "opacity": ' + material.opacity;
                 }
-                materialData += '            "emissive": ' + hexToRgb(material.emissive, material.bloom) + ',' + "\n";
-                if (material.scatteringMap === "") {
+                if (material.emissive !== "#000000") {
+                    materialData += '            "emissive": ' + hexToRgb(material.emissive, material.bloom) + ',' + "\n";
+                    fstMaterialData += ', "emissive": ' + hexToRgb(material.emissive, material.bloom);
+                }
+                if (material.scatteringMap === "" && material.scattering !== 0) {
                     materialData += '            "scattering": ' + material.scattering + ',' + "\n";
-                } 
-                materialData += '            "unlit": ' + material.unlit + ',' + "\n";
+                    fstMaterialData += ', "scattering": ' + material.scattering;
+                }
+                if (material.unlit === true) {
+                    materialData += '            "unlit": ' + material.unlit + ',' + "\n";
+                    fstMaterialData += ', "unlit": ' + material.unlit;
+                }
                 if (material.normalMap !== "") {
                     materialData += '            "normalMap": "' + material.normalMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "normalMap": "' + material.normalMap.escapeJSON() + '"';
                 }
                 if (material.albedoMap !== "") {
                     materialData += '            "albedoMap": "' + material.albedoMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "albedoMap": "' + material.albedoMap.escapeJSON() + '"';
                 }
                 if (material.metallicMap !== "") {
                     materialData += '            "metallicMap": "' + material.metallicMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "metallicMap": "' + material.metallicMap.escapeJSON() + '"';
                 }
                 if (material.roughnessMap !== "") {
                     materialData += '            "roughnessMap": "' + material.roughnessMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "roughnessMap": "' + material.roughnessMap.escapeJSON() + '"';
                 }
                 if (material.opacityMap === "OPACITY_MAP_MASK" || material.opacityMap === "OPACITY_MAP_BLEND") {
                     materialData += '            "opacityMap": "' + material.albedoMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "opacityMap": "' + material.albedoMap.escapeJSON() + '"';
                     materialData += '            "opacityMapMode": "' + material.opacityMap + '",' + "\n";
+                    fstMaterialData += ', "opacityMapMode": "' + material.opacityMap + '"';
                     if (material.opacityMap === "OPACITY_MAP_MASK") {
                         materialData += '            "opacityCutoff": ' + material.opacityCutoff + ',' + "\n";
+                        fstMaterialData += ', "opacityCutoff": ' + material.opacityCutoff;
                     }
                 }  
                 if (material.emissiveMap !== "") {
                     materialData += '            "emissiveMap": "' + material.emissiveMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "emissiveMap": "' + material.emissiveMap.escapeJSON() + '"';
                 }                 
                 if (material.scatteringMap !== "") {
                     materialData += '            "scatteringMap": "' + material.scatteringMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "scatteringMap": "' + material.scatteringMap.escapeJSON() + '"';
                 }
                 if (material.occlusionMap !== "") {
                     materialData += '            "occlusionMap": "' + material.occlusionMap.escapeJSON() + '",' + "\n";
+                    fstMaterialData += ', "occlusionMap": "' + material.occlusionMap.escapeJSON() + '"';
                 }
                 materialData += '            "cullFaceMode": "' + material.cullFaceMode + '",' + "\n";
+                fstMaterialData += ', "cullFaceMode": "' + material.cullFaceMode + '"';
+                if (material.defaultFallthrough === true) {
+                    materialData += '            "defaultFallthrough": ' + material.defaultFallthrough + ',' + "\n";
+                    fstMaterialData += ', "defaultFallthrough": ' + material.defaultFallthrough;
+                }
                 materialData += '            "model": "hifi_pbr"' + "\n";
+                fstMaterialData += ', "model": "hifi_pbr"';
                 materialData += '        }' + "\n";
                 materialData += '    ]' + "\n";
                 materialData += '}';
                 
+                
+                fstMaterialData += '}]}}';
+                
                 document.materialEditor.output.value = materialData;
+                document.materialEditor.fstoutput.value = fstMaterialData;
+                
                 var message = {
                     "channel": channel,
                     "action": "updateMaterialData",
@@ -362,7 +411,7 @@
                 return result;
             };
             
-            var channel = "materialDataCreator.ak.vircadia";
+            var channel = "materialDataCreator.ak.overte";
 
 
 			function copyToClipboard(data) {
@@ -437,7 +486,7 @@
                 <td style= 'width: 10%;'><a href='#' onclick='demo("cube");'><img class='demo' src="images/demo_cube.png"></a></td>
                 <td style= 'width: 10%;'><a href='#' onclick='demo("sphere");'><img class='demo' src="images/demo_sphere.png"></a></td>
                 <td style= 'width: 10%;'><a href='#' onclick='demo("teapot");'><img class='demo' src="images/demo_teapot.png"></a></td>
-                <td style= 'width: 10%;'><a href='#' onclick='demo("vircadia");'><img class='demo' src="images/demo_vircadia.png"></a></td>
+                <td style= 'width: 10%;'><a href='#' onclick='demo("brand");'><img class='demo' src="images/demo_brand.png"></a></td>
                 <td style= 'width: 5%;'>&nbsp;</td>
                 <td style= 'width: 10%;'><a href='#' onclick='teleportToServerless();'><img class='studio' src="images/studio.png"></a></td>
                 <td style= 'width: 10%;'><a href='#' onclick='toggleDayNight();'><img class='studio' src="images/toggle_day_night.png"></a></td>
@@ -520,8 +569,16 @@
             <input type="radio" name = 'cullFaceMode' value = 'CULL_NONE' oninput="save('cullFaceMode', this);">Both<br>
             </div>
 
+            <div class='group'>
+            <font class='label'>Keep other existing material's properties: </font><br> 
+            <font class='label'>defaultFallthrough:</font> <input type="checkbox" name = 'defaultFallthrough' oninput="save('defaultFallthrough', this);">
+            </div>
+
             <input type='button' class = 'copybtn' name='copy' value = 'Copy' onclick='copyToClipboard(document.materialEditor.output.value);'><br>
             <textarea name='output' id='output' rows = '21' class='output'></textarea>
+            <br><br>
+            <input type='button' class = 'copybtn' name='copy-fst' value = 'Copy for .fst materialMap array' onclick='copyToClipboard(document.materialEditor.fstoutput.value);'><br>
+            <textarea name='fstoutput' id='fstoutput' rows = '6' class='output'></textarea>            
         
         </td><td style=' background-image: url("images/trottoire.png"); background-repeat: repeat;'>&nbsp;</td></tr></table>
         
@@ -578,7 +635,7 @@
             <div style='text-align:right; font-size:14px; color:#999999; width:95%;'>&#10006;</div><br><br>
             <div style='width:95%;'>
                 <img class='demo' src="images/demo_cube.png"> <img class='demo' src="images/demo_sphere.png"> 
-                <img class='demo' src="images/demo_teapot.png"> <img class='demo' src="images/demo_vircadia.png"><br>
+                <img class='demo' src="images/demo_teapot.png"> <img class='demo' src="images/demo_brand.png"><br>
                 You can use these buttons to change the shape of the demonstration entity.
                 <br><hr>
                 <img class='studio' src="images/studio.png"><br>
diff --git a/applications/materialDataCreator/models/BRAND_LOGO_NIGHT.fbx b/applications/materialDataCreator/models/BRAND_LOGO_NIGHT.fbx
new file mode 100644
index 0000000..797d368
Binary files /dev/null and b/applications/materialDataCreator/models/BRAND_LOGO_NIGHT.fbx differ
diff --git a/applications/materialDataCreator/models/VIRCADIA_LOGO_NIGHT.fbx b/applications/materialDataCreator/models/VIRCADIA_LOGO_NIGHT.fbx
deleted file mode 100644
index bccd754..0000000
Binary files a/applications/materialDataCreator/models/VIRCADIA_LOGO_NIGHT.fbx and /dev/null differ
diff --git a/applications/materialDataCreator/models/brand.fbx b/applications/materialDataCreator/models/brand.fbx
new file mode 100644
index 0000000..1359646
Binary files /dev/null and b/applications/materialDataCreator/models/brand.fbx differ
diff --git a/applications/materialDataCreator/models/vircadia.fbx b/applications/materialDataCreator/models/vircadia.fbx
deleted file mode 100644
index 93fc6b4..0000000
Binary files a/applications/materialDataCreator/models/vircadia.fbx and /dev/null differ
diff --git a/applications/materialDataCreator/serverless.json b/applications/materialDataCreator/serverless.json
index 78bd5ba..401b0c9 100644
--- a/applications/materialDataCreator/serverless.json
+++ b/applications/materialDataCreator/serverless.json
@@ -89,7 +89,7 @@
          },
          "ambientLight":{
             "ambientIntensity":0.80000001192093,
-            "ambientURL":"https://cdn.vircadia.com/community-apps/applications/materialDataCreator/images/zoneDayAmbient.jpg"
+            "ambientURL":"https://more.overte.org/applications/materialDataCreator/images/zoneDayAmbient.jpg"
          },
          "skybox":{
             "color":{
@@ -97,7 +97,7 @@
                "green":255,
                "blue":255
             },
-            "url":"https://cdn.vircadia.com/community-apps/applications/materialDataCreator/images/zoneDaySky.png"
+            "url":"https://more.overte.org/applications/materialDataCreator/images/zoneDaySky.png"
          },
          "haze":{
             "hazeRange":800,
@@ -175,7 +175,7 @@
          },
          "ambientLight":{
             "ambientIntensity":0.25,
-            "ambientURL":"https://cdn.vircadia.com/community-apps/applications/materialDataCreator/images/zoneNightAmbient.jpg"
+            "ambientURL":"https://more.overte.org/applications/materialDataCreator/images/zoneNightAmbient.jpg"
          },
          "skybox":{
             "color":{
@@ -183,7 +183,7 @@
                "green":255,
                "blue":255
             },
-            "url":"https://cdn.vircadia.com/community-apps/applications/materialDataCreator/images/zoneNightSky.png"
+            "url":"https://more.overte.org/applications/materialDataCreator/images/zoneNightSky.png"
          },
          "haze":{
             "hazeRange":800,
@@ -216,16 +216,16 @@
     {
         "id": "{b4d3fdbb-6fcc-4333-bf76-3dd4d0f9c64d}",
         "type": "Model",
-        "name": "VIRCADIA LOGO",
+        "name": "BRAND LOGO",
         "position": {
             "x": -18.6195,
             "y": 3.5842,
             "z": -10.7500
         },
         "dimensions": {
-            "x": 16.0391902923584,
-            "y": 2.659592866897583,
-            "z": 0.5929432511329651
+            "x": 9.42,
+            "y": 2.48,
+            "z": 0.34
         },
         "rotation": {
             "x": 0,
@@ -236,7 +236,7 @@
         "grab": {
             "grabbable": false
         },
-        "modelURL": "https://cdn.vircadia.com/community-apps/applications/materialDataCreator/models/VIRCADIA_LOGO_NIGHT.fbx",
+        "modelURL": "https://more.overte.org/applications/materialDataCreator/models/BRAND_LOGO_NIGHT.fbx",
         "animation": {
             "allowTranslation": false
     }
@@ -244,16 +244,16 @@
         {
         "id": "{28a9cae1-ef3f-4e24-84ef-a954d48bd84f}",
         "type": "Model",
-        "name": "VIRCADIA LOGO",
+        "name": "BRAND LOGO",
         "position": {
             "x": 18.6195,
             "y": 3.5842,
             "z": -10.7500
         },
         "dimensions": {
-            "x": 16.0391902923584,
-            "y": 2.659592866897583,
-            "z": 0.5929432511329651
+            "x": 9.42,
+            "y": 2.48,
+            "z": 0.34
         },
         "rotation": {
             "x": 0,
@@ -264,7 +264,7 @@
         "grab": {
             "grabbable": false
         },
-        "modelURL": "https://cdn.vircadia.com/community-apps/applications/materialDataCreator/models/VIRCADIA_LOGO_NIGHT.fbx",
+        "modelURL": "https://more.overte.org/applications/materialDataCreator/models/BRAND_LOGO_NIGHT.fbx",
         "animation": {
             "allowTranslation": false
         }